1. Remove noreturn attribute from __builtin_debugtrap().

(The change at Clang side was committed in r166345)

2. Cosmetic change in order to conform to coding standards. 


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166350 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Shuxin Yang 2012-10-19 23:00:20 +00:00
parent ab450e42f1
commit cfc6cb0c61
2 changed files with 3 additions and 3 deletions

View File

@ -420,7 +420,7 @@ def int_flt_rounds : Intrinsic<[llvm_i32_ty]>,
GCCBuiltin<"__builtin_flt_rounds">; GCCBuiltin<"__builtin_flt_rounds">;
def int_trap : Intrinsic<[], [], [IntrNoReturn]>, def int_trap : Intrinsic<[], [], [IntrNoReturn]>,
GCCBuiltin<"__builtin_trap">; GCCBuiltin<"__builtin_trap">;
def int_debugtrap : Intrinsic<[], [], [IntrNoReturn]>, def int_debugtrap : Intrinsic<[]>,
GCCBuiltin<"__builtin_debugtrap">; GCCBuiltin<"__builtin_debugtrap">;
// NOP: calls/invokes to this intrinsic are removed by codegen // NOP: calls/invokes to this intrinsic are removed by codegen

View File

@ -1245,8 +1245,8 @@ void SelectionDAGLegalize::LegalizeOp(SDNode *Node) {
if (Action == TargetLowering::Expand) { if (Action == TargetLowering::Expand) {
// replace ISD::DEBUGTRAP with ISD::TRAP // replace ISD::DEBUGTRAP with ISD::TRAP
SDValue NewVal; SDValue NewVal;
NewVal = DAG.getNode (ISD::TRAP, Node->getDebugLoc(), Node->getVTList(), NewVal = DAG.getNode(ISD::TRAP, Node->getDebugLoc(), Node->getVTList(),
Node->getOperand(0)); Node->getOperand(0));
ReplaceNode(Node, NewVal.getNode()); ReplaceNode(Node, NewVal.getNode());
LegalizeOp(NewVal.getNode()); LegalizeOp(NewVal.getNode());
return; return;