diff options
| -rw-r--r-- | llvm/include/llvm/IR/Statepoint.h | 6 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/llvm/include/llvm/IR/Statepoint.h b/llvm/include/llvm/IR/Statepoint.h index 689f93155d7..035509c11e6 100644 --- a/llvm/include/llvm/IR/Statepoint.h +++ b/llvm/include/llvm/IR/Statepoint.h @@ -129,7 +129,13 @@ class StatepointBase { #ifndef NDEBUG + /// Asserts if this statepoint is malformed. Common cases for failure + /// include incorrect length prefixes for variable length sections or + /// illegal values for parameters. void verify() { + assert(numCallArgs() >= 0 && + "number of arguments to actually callee can't be negative"); + // The internal asserts in the iterator accessors do the rest. (void)call_args_begin(); (void)call_args_end(); diff --git a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp index 137403fc274..972aa9c4c8d 100644 --- a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp @@ -228,10 +228,6 @@ static SDNode *lowerCallFromStatepoint(const CallInst &CI, dyn_cast<IntrinsicInst>(&CI)->getIntrinsicID() && "function called must be the statepoint function"); - int NumCallArgs = dyn_cast<ConstantInt>(CI.getArgOperand(1))->getZExtValue(); - assert(NumCallArgs >= 0 && "non-negative"); - (void)NumCallArgs; - ImmutableStatepoint StatepointOperands(&CI); // Lower the actual call itself - This is a bit of a hack, but we want to @@ -240,9 +236,6 @@ static SDNode *lowerCallFromStatepoint(const CallInst &CI, // differently. Hopefully, this is slightly more robust w.r.t. calling // convention, return values, and other function attributes. Value *ActualCallee = const_cast<Value *>(StatepointOperands.actualCallee()); -#ifndef NDEBUG - StatepointOperands.verify(); -#endif std::vector<Value *> Args; CallInst::const_op_iterator arg_begin = StatepointOperands.call_args_begin(); @@ -500,6 +493,13 @@ void SelectionDAGBuilder::visitStatepoint(const CallInst &CI) { #endif ImmutableStatepoint ISP(&CI); +#ifndef NDEBUG + // If this is a malformed statepoint, report it early to simplify debugging. + // This should catch any IR level mistake that's made when constructing or + // transforming statepoints. + ISP.verify(); +#endif + // Lower statepoint vmstate and gcstate arguments SmallVector<SDValue, 10> LoweredArgs; |
