dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ubsan] Mark overflow checks with !nosanitize 

Sanitizer instrumentation generally needs to be marked with !nosanitize,
but we're not doing this properly for ubsan's overflow checks.

r213291 has more information about why this is needed.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@302598 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Vedant Kumar 2017-05-09 23:34:49 +00:00
parent dc34277308
commit d9b4d2283a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CodeGen/CGExprScalar.cpp
View File

@ -2552,6 +2552,7 @@ Value *ScalarExprEmitter::EmitOverflowCheckedBinOp(const BinOpInfo &Ops) {
if (isSigned)
OpID |= 1;
CodeGenFunction::SanitizerScope SanScope(&CGF);
llvm::Type *opTy = CGF.CGM.getTypes().ConvertType(Ops.Ty);
llvm::Function *intrinsic = CGF.CGM.getIntrinsic(IID, opTy);
@ -2567,7 +2568,6 @@ Value *ScalarExprEmitter::EmitOverflowCheckedBinOp(const BinOpInfo &Ops) {
// If the signed-integer-overflow sanitizer is enabled, emit a call to its
// runtime. Otherwise, this is a -ftrapv check, so just emit a trap.
if (!isSigned || CGF.SanOpts.has(SanitizerKind::SignedIntegerOverflow)) {
CodeGenFunction::SanitizerScope SanScope(&CGF);
llvm::Value *NotOverflow = Builder.CreateNot(overflow);
SanitizerMask Kind = isSigned ? SanitizerKind::SignedIntegerOverflow
: SanitizerKind::UnsignedIntegerOverflow;

10
test/CodeGen/sanitize-recover.c
View File

@ -7,12 +7,12 @@
void test() {
extern volatile unsigned x, y, z;
// RECOVER: uadd.with.overflow.i32
// RECOVER: ubsan_handle_add_overflow(
// RECOVER: uadd.with.overflow.i32{{.*}}, !nosanitize
// RECOVER: ubsan_handle_add_overflow({{.*}}, !nosanitize
// RECOVER-NOT: unreachable
// ABORT: uadd.with.overflow.i32
// ABORT: ubsan_handle_add_overflow_abort(
// ABORT: unreachable
// ABORT: uadd.with.overflow.i32{{.*}}, !nosanitize
// ABORT: ubsan_handle_add_overflow_abort({{.*}}, !nosanitize
// ABORT: unreachable{{.*}}, !nosanitize
x = y + z;
}