diff options
author | Oliver Hunt <oliver@apple.com> | 2025-07-14 19:32:18 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-07-14 19:32:18 -0700 |
commit | 451a9ce9ffcf18db365f32a5a01dd025ab26c1d0 (patch) | |
tree | 79013dc921b35ef8be969689052648ec318c9b15 /clang/lib/CodeGen/CGBlocks.cpp | |
parent | 90ef114a33805b67eea29564193ad6d4c6975a30 (diff) | |
download | llvm-451a9ce9ffcf18db365f32a5a01dd025ab26c1d0.zip llvm-451a9ce9ffcf18db365f32a5a01dd025ab26c1d0.tar.gz llvm-451a9ce9ffcf18db365f32a5a01dd025ab26c1d0.tar.bz2 |
[clang][ObjC][PAC] Add ptrauth protections to objective-c (#147899)
This PR introduces the use of pointer authentication to objective-c[++].
This includes:
* __ptrauth qualifier support for ivars
* protection of isa and super fields
* protection of SEL typed ivars
* protection of class_ro_t data
* protection of methodlist pointers and content
Diffstat (limited to 'clang/lib/CodeGen/CGBlocks.cpp')
-rw-r--r-- | clang/lib/CodeGen/CGBlocks.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp index f3ddf7b..1aba841 100644 --- a/clang/lib/CodeGen/CGBlocks.cpp +++ b/clang/lib/CodeGen/CGBlocks.cpp @@ -853,9 +853,24 @@ llvm::Value *CodeGenFunction::EmitBlockLiteral(const CGBlockInfo &blockInfo) { offset += size; index++; }; + auto addSignedHeaderField = + [&](llvm::Value *Value, const PointerAuthSchema &Schema, + GlobalDecl Decl, QualType Type, CharUnits Size, const Twine &Name) { + auto StorageAddress = projectField(index, Name); + if (Schema) { + auto AuthInfo = EmitPointerAuthInfo( + Schema, StorageAddress.emitRawPointer(*this), Decl, Type); + Value = EmitPointerAuthSign(AuthInfo, Value); + } + Builder.CreateStore(Value, StorageAddress); + offset += Size; + index++; + }; if (!IsOpenCL) { - addHeaderField(isa, getPointerSize(), "block.isa"); + addSignedHeaderField( + isa, CGM.getCodeGenOpts().PointerAuth.ObjCIsaPointers, GlobalDecl(), + QualType(), getPointerSize(), "block.isa"); addHeaderField(llvm::ConstantInt::get(IntTy, flags.getBitMask()), getIntSize(), "block.flags"); addHeaderField(llvm::ConstantInt::get(IntTy, 0), getIntSize(), @@ -1285,7 +1300,9 @@ static llvm::Constant *buildGlobalBlock(CodeGenModule &CGM, if (IsWindows) fields.addNullPointer(CGM.Int8PtrPtrTy); else - fields.add(CGM.getNSConcreteGlobalBlock()); + fields.addSignedPointer(CGM.getNSConcreteGlobalBlock(), + CGM.getCodeGenOpts().PointerAuth.ObjCIsaPointers, + GlobalDecl(), QualType()); // __flags BlockFlags flags = BLOCK_IS_GLOBAL; |