diff options
| author | Mitch Phillips <31459023+hctim@users.noreply.github.com> | 2023-02-02 15:48:50 -0800 |
|---|---|---|
| committer | Mitch Phillips <31459023+hctim@users.noreply.github.com> | 2023-02-02 15:48:50 -0800 |
| commit | b88ebb3d94cbd2bdf6ffd17fa7c5559579a249a2 (patch) | |
| tree | a39f7d0a4dd8b9534ef16a56fd0758c9d131bdd1 /clang/lib/CodeGen/CodeGenModule.cpp | |
| parent | 10939d1d580b9d3c9c2f3539c6bdb39f408179c0 (diff) | |
Revert "Add CFI integer types normalization"
This reverts commit b1e9ab7438a098a18fecda88fc87ef4ccadfcf1e.
Reason: Looks like it broke the MSan buildbot, more details in the
phabricator review: https://reviews.llvm.org/D139395
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 5535fd54605b..24b63372500b 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1727,11 +1727,7 @@ llvm::ConstantInt *CodeGenModule::CreateKCFITypeId(QualType T) { std::string OutName; llvm::raw_string_ostream Out(OutName); - getCXXABI().getMangleContext().mangleTypeName( - T, Out, getCodeGenOpts().SanitizeCfiICallNormalizeIntegers); - - if (getCodeGenOpts().SanitizeCfiICallNormalizeIntegers) - Out << ".normalized"; + getCXXABI().getMangleContext().mangleTypeName(T, Out); return llvm::ConstantInt::get(Int32Ty, static_cast<uint32_t>(llvm::xxHash64(OutName))); @@ -6949,12 +6945,7 @@ CodeGenModule::CreateMetadataIdentifierImpl(QualType T, MetadataTypeMap &Map, if (isExternallyVisible(T->getLinkage())) { std::string OutName; llvm::raw_string_ostream Out(OutName); - getCXXABI().getMangleContext().mangleTypeName( - T, Out, getCodeGenOpts().SanitizeCfiICallNormalizeIntegers); - - if (getCodeGenOpts().SanitizeCfiICallNormalizeIntegers) - Out << ".normalized"; - + getCXXABI().getMangleContext().mangleTypeName(T, Out); Out << Suffix; InternalId = llvm::MDString::get(getLLVMContext(), Out.str()); |