maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

hwasan, codegen: Keep more lifetime markers used for hwasan 

Reviewers: eugenis

Subscribers: cfe-commits

Tags: #clang

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

llvm-svn: 369980
This commit is contained in:
Vitaly Buka 2019-08-26 22:16:05 +00:00
parent aeca56964f
commit 669d111c52
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/lib/CodeGen/CGExpr.cpp
View File

@ -521,6 +521,7 @@ EmitMaterializeTemporaryExpr(const MaterializeTemporaryExpr *M) {
ConditionalEvaluation *OldConditional = nullptr; ConditionalEvaluation *OldConditional = nullptr;
CGBuilderTy::InsertPoint OldIP; CGBuilderTy::InsertPoint OldIP;
if (isInConditionalBranch() && !E->getType().isDestructedType() && if (isInConditionalBranch() && !E->getType().isDestructedType() &&
!SanOpts.has(SanitizerKind::HWAddress) &&
!SanOpts.has(SanitizerKind::Memory) && !SanOpts.has(SanitizerKind::Memory) &&
!CGM.getCodeGenOpts().SanitizeAddressUseAfterScope) { !CGM.getCodeGenOpts().SanitizeAddressUseAfterScope) {
OldConditional = OutermostConditional; OldConditional = OutermostConditional;

1
clang/lib/CodeGen/CodeGenFunction.cpp
View File

@ -49,6 +49,7 @@ static bool shouldEmitLifetimeMarkers(const CodeGenOptions &CGOpts,
// Sanitizers may use markers. // Sanitizers may use markers.
if (CGOpts.SanitizeAddressUseAfterScope || if (CGOpts.SanitizeAddressUseAfterScope ||
LangOpts.Sanitize.has(SanitizerKind::HWAddress) ||
LangOpts.Sanitize.has(SanitizerKind::Memory)) LangOpts.Sanitize.has(SanitizerKind::Memory))
return true; return true;

3
clang/test/CodeGen/lifetime-sanitizer.c
View File

@ -5,6 +5,9 @@
// RUN: %clang -target x86_64-linux-gnu -S -emit-llvm -o - -O0 \ // RUN: %clang -target x86_64-linux-gnu -S -emit-llvm -o - -O0 \
// RUN: -fsanitize=memory %s | \ // RUN: -fsanitize=memory %s | \
// RUN: FileCheck %s -check-prefix=LIFETIME // RUN: FileCheck %s -check-prefix=LIFETIME
// RUN: %clang -target aarch64-linux-gnu -S -emit-llvm -o - -O0 \
// RUN: -fsanitize=hwaddress %s | \
// RUN: FileCheck %s -check-prefix=LIFETIME
extern int bar(char *A, int n); extern int bar(char *A, int n);

3
clang/test/CodeGenCXX/lifetime-sanitizer.cpp
View File

@ -6,6 +6,9 @@
// RUN: %clang -w -target x86_64-linux-gnu -S -emit-llvm -o - -fno-exceptions -O0 \ // RUN: %clang -w -target x86_64-linux-gnu -S -emit-llvm -o - -fno-exceptions -O0 \
// RUN: -fsanitize=memory %s | \ // RUN: -fsanitize=memory %s | \
// RUN: FileCheck %s -check-prefixes=CHECK,LIFETIME // RUN: FileCheck %s -check-prefixes=CHECK,LIFETIME
// RUN: %clang -w -target aarch64-linux-gnu -S -emit-llvm -o - -fno-exceptions -O0 \
// RUN: -fsanitize=hwaddress %s | \
// RUN: FileCheck %s -check-prefixes=CHECK,LIFETIME
extern int bar(char *A, int n); extern int bar(char *A, int n);