diff options
| author | Julian Lettner <jlettner@apple.com> | 2019-01-24 18:04:21 +0000 |
|---|---|---|
| committer | Julian Lettner <jlettner@apple.com> | 2019-01-24 18:04:21 +0000 |
| commit | b62e9dc46b353f8832516f60c9ea13c82d1ea183 (patch) | |
| tree | 653fe1ed67d8ccfeaf394f7e8a889dfddbd9c4f2 /llvm/lib/Bitcode/Reader/BitcodeReader.cpp | |
| parent | 1fa239f5002934f36b3de53989052bc9071e15fd (diff) | |
| download | bcm5719-llvm-b62e9dc46b353f8832516f60c9ea13c82d1ea183.tar.gz bcm5719-llvm-b62e9dc46b353f8832516f60c9ea13c82d1ea183.zip | |
Revert "[Sanitizers] UBSan unreachable incompatible with ASan in the presence of `noreturn` calls"
This reverts commit cea84ab93aeb079a358ab1c8aeba6d9140ef8b47.
llvm-svn: 352069
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index d377b6ae515..0b93a61dc40 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1186,8 +1186,8 @@ static uint64_t getRawAttributeMask(Attribute::AttrKind Val) { case Attribute::NoCfCheck: return 1ULL << 57; case Attribute::OptForFuzzing: return 1ULL << 58; case Attribute::ShadowCallStack: return 1ULL << 59; - case Attribute::SpeculativeLoadHardening: return 1ULL << 60; - case Attribute::ExpectNoReturn: return 1ULL << 61; + case Attribute::SpeculativeLoadHardening: + return 1ULL << 60; case Attribute::Dereferenceable: llvm_unreachable("dereferenceable attribute not supported in raw format"); break; @@ -1366,8 +1366,6 @@ static Attribute::AttrKind getAttrFromCode(uint64_t Code) { return Attribute::NoRedZone; case bitc::ATTR_KIND_NO_RETURN: return Attribute::NoReturn; - case bitc::ATTR_KIND_EXPECT_NO_RETURN: - return Attribute::ExpectNoReturn; case bitc::ATTR_KIND_NOCF_CHECK: return Attribute::NoCfCheck; case bitc::ATTR_KIND_NO_UNWIND: |
