Skip to content

Commit

Permalink
[Blocks] Inherit sanitizer options from parent decl
Browse files Browse the repository at this point in the history
There is no way to apply sanitizer suppressions to ObjC blocks. A
reasonable default is to have blocks inherit their parent's sanitizer
options.

rdar://32769634

Differential Revision: https://reviews.llvm.org/D40668

llvm-svn: 320132
  • Loading branch information
vedantk committed Dec 8, 2017
1 parent 1c30924 commit 29477dc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion clang/lib/CodeGen/CGBlocks.cpp
Expand Up @@ -784,7 +784,9 @@ llvm::Value *CodeGenFunction::EmitBlockLiteral(const CGBlockInfo &blockInfo,
8);
// Using the computed layout, generate the actual block function.
bool isLambdaConv = blockInfo.getBlockDecl()->isConversionFromLambda();
auto *InvokeFn = CodeGenFunction(CGM, true).GenerateBlockFunction(
CodeGenFunction BlockCGF{CGM, true};
BlockCGF.SanOpts = SanOpts;
auto *InvokeFn = BlockCGF.GenerateBlockFunction(
CurGD, blockInfo, LocalDeclMap, isLambdaConv, blockInfo.CanBeGlobal);
if (InvokeF)
*InvokeF = InvokeFn;
Expand Down
3 changes: 2 additions & 1 deletion clang/test/CodeGenObjC/no-sanitize.m
@@ -1,8 +1,9 @@
// RUN: %clang_cc1 %s -emit-llvm -fsanitize=address -o - | FileCheck %s
// RUN: %clang_cc1 %s -emit-llvm -fsanitize=address -fblocks -o - | FileCheck %s

@interface I0 @end
@implementation I0
// CHECK-NOT: sanitize_address
- (void) im0: (int) a0 __attribute__((no_sanitize("address"))) {
int (^blockName)() = ^int() { return 0; };
}
@end

0 comments on commit 29477dc

Please sign in to comment.