parent
cc841a3810
commit
d3e3885f2d
|
@ -59,10 +59,6 @@ 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
|
||||
// signed integer arithmetic overflows.
|
||||
|
||||
|
@ -94,7 +90,6 @@ public:
|
|||
EmitAllDecls = 0;
|
||||
MathErrno = 1;
|
||||
|
||||
UnsignedOverflowChecking = 0;
|
||||
OverflowChecking = 0;
|
||||
|
||||
InstantiationDepth = 99;
|
||||
|
|
|
@ -448,7 +448,6 @@ 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)
|
||||
|
|
|
@ -262,9 +262,8 @@ public:
|
|||
|
||||
// Binary Operators.
|
||||
Value *EmitMul(const BinOpInfo &Ops) {
|
||||
if (CGF.getContext().getLangOptions().UnsignedOverflowChecking
|
||||
|| (CGF.getContext().getLangOptions().OverflowChecking
|
||||
&& Ops.Ty->isSignedIntegerType()))
|
||||
if (CGF.getContext().getLangOptions().OverflowChecking
|
||||
&& Ops.Ty->isSignedIntegerType())
|
||||
return EmitOverflowCheckedBinOp(Ops);
|
||||
return Builder.CreateMul(Ops.LHS, Ops.RHS, "mul");
|
||||
}
|
||||
|
@ -837,54 +836,28 @@ 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;
|
||||
OpID |= 1;
|
||||
}
|
||||
else {
|
||||
assert(Ops.Ty->isUnsignedIntegerType() &&
|
||||
"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;
|
||||
default:
|
||||
assert(false && "Unsupported operation for overflow detection");
|
||||
}
|
||||
OpID <<= 1;
|
||||
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:
|
||||
assert(false && "Unsupported operation for overflow detection");
|
||||
}
|
||||
OpID <<= 1;
|
||||
OpID |= 1;
|
||||
|
||||
const llvm::Type *opTy = CGF.CGM.getTypes().ConvertType(Ops.Ty);
|
||||
|
||||
llvm::Function *intrinsic = CGF.CGM.getIntrinsic(IID, &opTy, 1);
|
||||
|
@ -945,9 +918,8 @@ Value *ScalarExprEmitter::EmitOverflowCheckedBinOp(const BinOpInfo &Ops) {
|
|||
|
||||
Value *ScalarExprEmitter::EmitAdd(const BinOpInfo &Ops) {
|
||||
if (!Ops.Ty->isPointerType()) {
|
||||
if (CGF.getContext().getLangOptions().UnsignedOverflowChecking
|
||||
|| (CGF.getContext().getLangOptions().OverflowChecking
|
||||
&& Ops.Ty->isSignedIntegerType()))
|
||||
if (CGF.getContext().getLangOptions().OverflowChecking
|
||||
&& Ops.Ty->isSignedIntegerType())
|
||||
return EmitOverflowCheckedBinOp(Ops);
|
||||
return Builder.CreateAdd(Ops.LHS, Ops.RHS, "add");
|
||||
}
|
||||
|
@ -998,9 +970,8 @@ Value *ScalarExprEmitter::EmitAdd(const BinOpInfo &Ops) {
|
|||
|
||||
Value *ScalarExprEmitter::EmitSub(const BinOpInfo &Ops) {
|
||||
if (!isa<llvm::PointerType>(Ops.LHS->getType())) {
|
||||
if (CGF.getContext().getLangOptions().UnsignedOverflowChecking
|
||||
|| (CGF.getContext().getLangOptions().OverflowChecking
|
||||
&& Ops.Ty->isSignedIntegerType()))
|
||||
if (CGF.getContext().getLangOptions().OverflowChecking
|
||||
&& Ops.Ty->isSignedIntegerType())
|
||||
return EmitOverflowCheckedBinOp(Ops);
|
||||
return Builder.CreateSub(Ops.LHS, Ops.RHS, "sub");
|
||||
}
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
// RUN: clang-cc -ftrapu %s -emit-llvm -o %t &&
|
||||
// RUN: grep "__overflow_handler" %t | count 3
|
||||
|
||||
unsigned int ui, uj, uk;
|
||||
int i, j, k;
|
||||
|
||||
void foo() {
|
||||
ui = uj + uk;
|
||||
i = j + k;
|
||||
}
|
|
@ -679,19 +679,13 @@ void InitializeGCMode(LangOptions &Options) {
|
|||
Options.setGCMode(LangOptions::HybridGC);
|
||||
}
|
||||
|
||||
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 signed integer overflow"),
|
||||
llvm::cl::desc("Trap on integer overflow"),
|
||||
llvm::cl::init(false));
|
||||
|
||||
void InitializeOverflowChecking(LangOptions &Options) {
|
||||
Options.OverflowChecking = OverflowChecking | UnsignedOverflowChecking;
|
||||
Options.UnsignedOverflowChecking = UnsignedOverflowChecking;
|
||||
Options.OverflowChecking = OverflowChecking;
|
||||
}
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Target Triple Processing.
|
||||
|
|
Loading…
Reference in New Issue