summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--clang/include/clang/Basic/LangOptions.h7
-rw-r--r--clang/include/clang/Driver/Options.def1
-rw-r--r--clang/lib/CodeGen/CGExprScalar.cpp20
-rw-r--r--clang/tools/clang-cc/clang-cc.cpp10
4 files changed, 32 insertions, 6 deletions
diff --git a/clang/include/clang/Basic/LangOptions.h b/clang/include/clang/Basic/LangOptions.h
index 818ccda48bc..3587e8b39c1 100644
--- a/clang/include/clang/Basic/LangOptions.h
+++ b/clang/include/clang/Basic/LangOptions.h
@@ -59,8 +59,12 @@ public:
unsigned MathErrno : 1; // Math functions must respect errno
// (modulo the platform support).
+ unsigned UnsignedOverflowChecking : 1;
+ // Extension to call a handler function when
+ // unsigned and signed integer arithmetic overflows.
+
unsigned OverflowChecking : 1; // Extension to call a handler function when
- // integer arithmetic overflows.
+ // signed integer arithmetic overflows.
unsigned HeinousExtensions : 1; // Extensions that we really don't like and
// may be ripped out at any time.
@@ -90,6 +94,7 @@ public:
EmitAllDecls = 0;
MathErrno = 1;
+ UnsignedOverflowChecking = 0;
OverflowChecking = 0;
InstantiationDepth = 99;
diff --git a/clang/include/clang/Driver/Options.def b/clang/include/clang/Driver/Options.def
index 33b24f63dd7..e49e611a547 100644
--- a/clang/include/clang/Driver/Options.def
+++ b/clang/include/clang/Driver/Options.def
@@ -448,6 +448,7 @@ OPTION("-ftemplate-depth-", ftemplate_depth_, Joined, f_Group, INVALID, "", 0, 0
OPTION("-fterminated-vtables", fterminated_vtables, Flag, f_Group, INVALID, "", 0, 0, 0)
OPTION("-ftime-report", ftime_report, Flag, clang_f_Group, INVALID, "", 0, 0, 0)
OPTION("-ftraditional", ftraditional, Flag, f_Group, INVALID, "", 0, 0, 0)
+OPTION("-ftrapu", ftrapu, Flag, clang_f_Group, INVALID, "", 0, 0, 0)
OPTION("-ftrapv", ftrapv, Flag, clang_f_Group, INVALID, "", 0, 0, 0)
OPTION("-funwind-tables", funwind_tables, Flag, f_Group, INVALID, "", 0, 0, 0)
OPTION("-fverbose-asm", fverbose_asm, Flag, f_Group, INVALID, "", 0, 0, 0)
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index b47d5787346..1d2da0ddf89 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -262,7 +262,9 @@ public:
// Binary Operators.
Value *EmitMul(const BinOpInfo &Ops) {
- if (CGF.getContext().getLangOptions().OverflowChecking)
+ if (CGF.getContext().getLangOptions().UnsignedOverflowChecking
+ || (CGF.getContext().getLangOptions().OverflowChecking
+ && Ops.Ty->isSignedIntegerType()))
return EmitOverflowCheckedBinOp(Ops);
return Builder.CreateMul(Ops.LHS, Ops.RHS, "mul");
}
@@ -834,21 +836,26 @@ Value *ScalarExprEmitter::EmitRem(const BinOpInfo &Ops) {
Value *ScalarExprEmitter::EmitOverflowCheckedBinOp(const BinOpInfo &Ops) {
unsigned IID;
unsigned OpID = 0;
+
if (Ops.Ty->isSignedIntegerType()) {
switch (Ops.E->getOpcode()) {
case BinaryOperator::Add:
+ case BinaryOperator::AddAssign:
OpID = 1;
IID = llvm::Intrinsic::sadd_with_overflow;
break;
case BinaryOperator::Sub:
+ case BinaryOperator::SubAssign:
OpID = 2;
IID = llvm::Intrinsic::ssub_with_overflow;
break;
case BinaryOperator::Mul:
+ case BinaryOperator::MulAssign:
OpID = 3;
IID = llvm::Intrinsic::smul_with_overflow;
break;
default:
+ fprintf(stderr, "Opcode: %d\n", Ops.E->getOpcode());
assert(false && "Unsupported operation for overflow detection");
}
OpID <<= 1;
@@ -859,14 +866,17 @@ Value *ScalarExprEmitter::EmitOverflowCheckedBinOp(const BinOpInfo &Ops) {
"Must be either a signed or unsigned integer op");
switch (Ops.E->getOpcode()) {
case BinaryOperator::Add:
+ case BinaryOperator::AddAssign:
OpID = 1;
IID = llvm::Intrinsic::uadd_with_overflow;
break;
case BinaryOperator::Sub:
+ case BinaryOperator::SubAssign:
OpID = 2;
IID = llvm::Intrinsic::usub_with_overflow;
break;
case BinaryOperator::Mul:
+ case BinaryOperator::MulAssign:
OpID = 3;
IID = llvm::Intrinsic::umul_with_overflow;
break;
@@ -935,7 +945,9 @@ Value *ScalarExprEmitter::EmitOverflowCheckedBinOp(const BinOpInfo &Ops) {
Value *ScalarExprEmitter::EmitAdd(const BinOpInfo &Ops) {
if (!Ops.Ty->isPointerType()) {
- if (CGF.getContext().getLangOptions().OverflowChecking)
+ if (CGF.getContext().getLangOptions().UnsignedOverflowChecking
+ || (CGF.getContext().getLangOptions().OverflowChecking
+ && Ops.Ty->isSignedIntegerType()))
return EmitOverflowCheckedBinOp(Ops);
return Builder.CreateAdd(Ops.LHS, Ops.RHS, "add");
}
@@ -986,7 +998,9 @@ Value *ScalarExprEmitter::EmitAdd(const BinOpInfo &Ops) {
Value *ScalarExprEmitter::EmitSub(const BinOpInfo &Ops) {
if (!isa<llvm::PointerType>(Ops.LHS->getType())) {
- if (CGF.getContext().getLangOptions().OverflowChecking)
+ if (CGF.getContext().getLangOptions().UnsignedOverflowChecking
+ || (CGF.getContext().getLangOptions().OverflowChecking
+ && Ops.Ty->isSignedIntegerType()))
return EmitOverflowCheckedBinOp(Ops);
return Builder.CreateSub(Ops.LHS, Ops.RHS, "sub");
}
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index b149a1da92b..1a7d2df7087 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -676,12 +676,18 @@ void InitializeGCMode(LangOptions &Options) {
}
static llvm::cl::opt<bool>
+UnsignedOverflowChecking("ftrapu",
+ llvm::cl::desc("Trap on unsigned and signed integer overflow"),
+ llvm::cl::init(false));
+
+static llvm::cl::opt<bool>
OverflowChecking("ftrapv",
- llvm::cl::desc("Trap on integer overflow"),
+ llvm::cl::desc("Trap on signed integer overflow"),
llvm::cl::init(false));
void InitializeOverflowChecking(LangOptions &Options) {
- Options.OverflowChecking = OverflowChecking;
+ Options.OverflowChecking = OverflowChecking | UnsignedOverflowChecking;
+ Options.UnsignedOverflowChecking = UnsignedOverflowChecking;
}
//===----------------------------------------------------------------------===//
// Target Triple Processing.
OpenPOWER on IntegriCloud