diff options
| author | Akira Hatanaka <ahatanak@gmail.com> | 2024-03-26 07:37:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-26 07:37:57 -0700 |
| commit | b3117564508ce53b3af408bf2b8ab643a6030bc4 (patch) | |
| tree | c9e144169684f14d8684ea3298f50ddd4f8b91d5 /clang/lib/CodeGen/CGVTables.cpp | |
| parent | 2e38c50e5c53d66d4968fbd47b78e71a220a28ca (diff) | |
| download | llvm-b3117564508ce53b3af408bf2b8ab643a6030bc4.zip llvm-b3117564508ce53b3af408bf2b8ab643a6030bc4.tar.gz llvm-b3117564508ce53b3af408bf2b8ab643a6030bc4.tar.bz2 | |
Revert "[CodeGen][arm64e] Add methods and data members to Address, which are needed to authenticate signed pointers (#67454)" (#86674)
This reverts commit 8bd1f9116aab879183f34707e6d21c7051d083b6.
It appears that the commit broke msan bots.
Diffstat (limited to 'clang/lib/CodeGen/CGVTables.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGVTables.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp index 862369a..8dee3f7 100644 --- a/clang/lib/CodeGen/CGVTables.cpp +++ b/clang/lib/CodeGen/CGVTables.cpp @@ -201,13 +201,14 @@ CodeGenFunction::GenerateVarArgsThunk(llvm::Function *Fn, // Find the first store of "this", which will be to the alloca associated // with "this". - Address ThisPtr = makeNaturalAddressForPointer( - &*AI, MD->getFunctionObjectParameterType(), - CGM.getClassPointerAlignment(MD->getParent())); + Address ThisPtr = + Address(&*AI, ConvertTypeForMem(MD->getFunctionObjectParameterType()), + CGM.getClassPointerAlignment(MD->getParent())); llvm::BasicBlock *EntryBB = &Fn->front(); llvm::BasicBlock::iterator ThisStore = llvm::find_if(*EntryBB, [&](llvm::Instruction &I) { - return isa<llvm::StoreInst>(I) && I.getOperand(0) == &*AI; + return isa<llvm::StoreInst>(I) && + I.getOperand(0) == ThisPtr.getPointer(); }); assert(ThisStore != EntryBB->end() && "Store of this should be in entry block?"); |