From 325c6cdcab632a6824be8ca9a926f4c4573adbdb Mon Sep 17 00:00:00 2001 From: Daniel Schemmel Date: Thu, 1 Feb 2024 14:51:37 +0000 Subject: drop llvm 9 and 10 --- runtime/Sanitizer/ubsan/ubsan_checks.inc | 10 ---------- runtime/Sanitizer/ubsan/ubsan_handlers.cpp | 28 ---------------------------- 2 files changed, 38 deletions(-) (limited to 'runtime') diff --git a/runtime/Sanitizer/ubsan/ubsan_checks.inc b/runtime/Sanitizer/ubsan/ubsan_checks.inc index 35c64f41..4edc0992 100644 --- a/runtime/Sanitizer/ubsan/ubsan_checks.inc +++ b/runtime/Sanitizer/ubsan/ubsan_checks.inc @@ -26,17 +26,13 @@ UBSAN_CHECK(GenericUB, "undefined-behavior", "undefined") UBSAN_CHECK(NullPointerUse, "null-pointer-use", "null") -#if LLVM_VERSION_MAJOR >= 11 UBSAN_CHECK(NullPointerUseWithNullability, "null-pointer-use", "nullability-assign") -#endif -#if LLVM_VERSION_MAJOR >= 10 UBSAN_CHECK(NullptrWithOffset, "nullptr-with-offset", "pointer-overflow") UBSAN_CHECK(NullptrWithNonZeroOffset, "nullptr-with-nonzero-offset", "pointer-overflow") UBSAN_CHECK(NullptrAfterNonZeroOffset, "nullptr-after-nonzero-offset", "pointer-overflow") -#endif UBSAN_CHECK(PointerOverflow, "pointer-overflow", "pointer-overflow") UBSAN_CHECK(MisalignedPointerUse, "misaligned-pointer-use", "alignment") UBSAN_CHECK(AlignmentAssumption, "alignment-assumption", "alignment") @@ -49,9 +45,7 @@ UBSAN_CHECK(IntegerDivideByZero, "integer-divide-by-zero", "integer-divide-by-zero") UBSAN_CHECK(FloatDivideByZero, "float-divide-by-zero", "float-divide-by-zero") UBSAN_CHECK(InvalidBuiltin, "invalid-builtin-use", "invalid-builtin-use") -#if LLVM_VERSION_MAJOR >= 11 UBSAN_CHECK(InvalidObjCCast, "invalid-objc-cast", "invalid-objc-cast") -#endif UBSAN_CHECK(ImplicitUnsignedIntegerTruncation, "implicit-unsigned-integer-truncation", "implicit-unsigned-integer-truncation") @@ -76,14 +70,10 @@ UBSAN_CHECK(InvalidEnumLoad, "invalid-enum-load", "enum") UBSAN_CHECK(FunctionTypeMismatch, "function-type-mismatch", "function") UBSAN_CHECK(InvalidNullReturn, "invalid-null-return", "returns-nonnull-attribute") -#if LLVM_VERSION_MAJOR >= 11 UBSAN_CHECK(InvalidNullReturnWithNullability, "invalid-null-return", "nullability-return") -#endif UBSAN_CHECK(InvalidNullArgument, "invalid-null-argument", "nonnull-attribute") -#if LLVM_VERSION_MAJOR >= 11 UBSAN_CHECK(InvalidNullArgumentWithNullability, "invalid-null-argument", "nullability-arg") -#endif UBSAN_CHECK(DynamicTypeMismatch, "dynamic-type-mismatch", "vptr") UBSAN_CHECK(CFIBadType, "cfi-bad-type", "cfi") diff --git a/runtime/Sanitizer/ubsan/ubsan_handlers.cpp b/runtime/Sanitizer/ubsan/ubsan_handlers.cpp index 0213836b..c1f94beb 100644 --- a/runtime/Sanitizer/ubsan/ubsan_handlers.cpp +++ b/runtime/Sanitizer/ubsan/ubsan_handlers.cpp @@ -45,14 +45,10 @@ static const char *get_suffix(ErrorType ET) { // It should never happen in KLEE runtime. return "exec.err"; case ErrorType::NullPointerUse: -#if LLVM_VERSION_MAJOR >= 11 case ErrorType::NullPointerUseWithNullability: -#endif -#if LLVM_VERSION_MAJOR >= 10 case ErrorType::NullptrWithOffset: case ErrorType::NullptrWithNonZeroOffset: case ErrorType::NullptrAfterNonZeroOffset: -#endif case ErrorType::PointerOverflow: case ErrorType::MisalignedPointerUse: case ErrorType::AlignmentAssumption: @@ -69,12 +65,10 @@ static const char *get_suffix(ErrorType ET) { return "div.err"; case ErrorType::InvalidBuiltin: return "invalid_builtin_use.err"; -#if LLVM_VERSION_MAJOR >= 11 case ErrorType::InvalidObjCCast: // Option `fsanitize=objc-cast` is not supported due to the requirement for // Darwin system. return "exec.err"; -#endif case ErrorType::ImplicitUnsignedIntegerTruncation: case ErrorType::ImplicitSignedIntegerTruncation: return "implicit_truncation.err"; @@ -101,13 +95,9 @@ static const char *get_suffix(ErrorType ET) { // This check is unsupported return "exec.err"; case ErrorType::InvalidNullReturn: -#if LLVM_VERSION_MAJOR >= 11 case ErrorType::InvalidNullReturnWithNullability: -#endif case ErrorType::InvalidNullArgument: -#if LLVM_VERSION_MAJOR >= 11 case ErrorType::InvalidNullArgumentWithNullability: -#endif return "nullable_attribute.err"; case ErrorType::DynamicTypeMismatch: case ErrorType::CFIBadType: @@ -122,7 +112,6 @@ __attribute__((noreturn)) static void report_error_type(ErrorType ET) { report_error(ConvertTypeToString(ET), get_suffix(ET)); } -#if LLVM_VERSION_MAJOR >= 11 /// Situations in which we might emit a check for the suitability of a /// pointer or glvalue. Needs to be kept in sync with CodeGenFunction.h in /// clang. @@ -161,20 +150,15 @@ enum TypeCheckKind { /// null or an object within its lifetime. TCK_DynamicOperation }; -#endif static void handleTypeMismatchImpl(TypeMismatchData *Data, ValueHandle Pointer) { uptr Alignment = (uptr)1 << Data->LogAlignment; ErrorType ET; if (!Pointer) -#if LLVM_VERSION_MAJOR >= 11 ET = (Data->TypeCheckKind == TCK_NonnullAssign) ? ErrorType::NullPointerUseWithNullability : ErrorType::NullPointerUse; -#else - ET = ErrorType::NullPointerUse; -#endif else if (Pointer & (Alignment - 1)) ET = ErrorType::MisalignedPointerUse; else @@ -440,12 +424,8 @@ extern "C" void __ubsan_handle_invalid_builtin_abort(InvalidBuiltinData *Data) { static void handleNonNullReturn(NonNullReturnData * /*Data*/, SourceLocation * /*LocPtr*/, bool IsAttr) { -#if LLVM_VERSION_MAJOR >= 11 ErrorType ET = IsAttr ? ErrorType::InvalidNullReturn : ErrorType::InvalidNullReturnWithNullability; -#else - ErrorType ET = ErrorType::InvalidNullReturn; -#endif report_error_type(ET); } @@ -471,12 +451,8 @@ __ubsan_handle_nullability_return_v1_abort(NonNullReturnData *Data, } static void handleNonNullArg(NonNullArgData * /*Data*/, bool IsAttr) { -#if LLVM_VERSION_MAJOR >= 11 ErrorType ET = IsAttr ? ErrorType::InvalidNullArgument : ErrorType::InvalidNullArgumentWithNullability; -#else - ErrorType ET = ErrorType::InvalidNullArgument; -#endif report_error_type(ET); } @@ -499,7 +475,6 @@ extern "C" void __ubsan_handle_nullability_arg_abort(NonNullArgData *Data) { static void handlePointerOverflowImpl(PointerOverflowData * /*Data*/, ValueHandle Base, ValueHandle Result) { -#if LLVM_VERSION_MAJOR >= 10 ErrorType ET; if (Base == 0 && Result == 0) ET = ErrorType::NullptrWithOffset; @@ -509,9 +484,6 @@ static void handlePointerOverflowImpl(PointerOverflowData * /*Data*/, ET = ErrorType::NullptrAfterNonZeroOffset; else ET = ErrorType::PointerOverflow; -#else - ErrorType ET = ErrorType::PointerOverflow; -#endif report_error_type(ET); } -- cgit 1.4.1