diff options
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGen/object-size.c | 22 |
2 files changed, 24 insertions, 4 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index f1a446ef6e..9992b6944e 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -884,7 +884,11 @@ bool IntExprEvaluator::VisitCallExpr(const CallExpr *E) { if (const DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(LVBase)) { if (const VarDecl *VD = dyn_cast<VarDecl>(DRE->getDecl())) { uint64_t Size = Info.Ctx.getTypeSize(VD->getType()) / 8; - Size -= Base.Val.getLValueOffset(); + uint64_t Offset = Base.Val.getLValueOffset(); + if (Offset <= Size) + Size -= Base.Val.getLValueOffset(); + else + Size = 0; return Success(Size, E); } } diff --git a/test/CodeGen/object-size.c b/test/CodeGen/object-size.c index b686116989..36dc341e93 100644 --- a/test/CodeGen/object-size.c +++ b/test/CodeGen/object-size.c @@ -21,13 +21,29 @@ void test2() { strcpy(gbuf, "Hi there"); } +void test3() { + // CHECK: movabsq $0, %rdx + // CHECK-NEXT: movq %rax, %rdi + // CHECK-NEXT: movq %rcx, %rsi + // CHECK-NEXT: call ___strcpy_chk + strcpy(&gbuf[100], "Hi there"); +} + void test4() { + // CHECK: movabsq $0, %rdx + // CHECK-NEXT: movq %rax, %rdi + // CHECK-NEXT: movq %rcx, %rsi + // CHECK-NEXT: call ___strcpy_chk + strcpy((char*)(void*)&gbuf[-1], "Hi there"); +} + +void test5() { // CHECK: call ___inline_strcpy_chk - strcpy(gp, "Hi"); + strcpy(gp, "Hi there"); } -void test3() { +void test6() { int i; // CHECK: call ___inline_strcpy_chk - strcpy((++i, gbuf), "Hi"); + strcpy((++i, gbuf), "Hi there"); } |