From d8a190a17cd9dd54976f89cf4b25be14eedc4295 Mon Sep 17 00:00:00 2001 From: Shuxin Yang Date: Fri, 19 Oct 2012 23:00:20 +0000 Subject: [PATCH] 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. llvm-svn: 166350 --- include/llvm/Intrinsics.td | 2 +- lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td index cf33a265d6e..2e1597fe6f6 100644 --- a/include/llvm/Intrinsics.td +++ b/include/llvm/Intrinsics.td @@ -420,7 +420,7 @@ def int_flt_rounds : Intrinsic<[llvm_i32_ty]>, GCCBuiltin<"__builtin_flt_rounds">; def int_trap : Intrinsic<[], [], [IntrNoReturn]>, GCCBuiltin<"__builtin_trap">; -def int_debugtrap : Intrinsic<[], [], [IntrNoReturn]>, +def int_debugtrap : Intrinsic<[]>, GCCBuiltin<"__builtin_debugtrap">; // NOP: calls/invokes to this intrinsic are removed by codegen diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index c46df309356..abf40b77a18 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -1245,8 +1245,8 @@ void SelectionDAGLegalize::LegalizeOp(SDNode *Node) { if (Action == TargetLowering::Expand) { // replace ISD::DEBUGTRAP with ISD::TRAP SDValue NewVal; - NewVal = DAG.getNode (ISD::TRAP, Node->getDebugLoc(), Node->getVTList(), - Node->getOperand(0)); + NewVal = DAG.getNode(ISD::TRAP, Node->getDebugLoc(), Node->getVTList(), + Node->getOperand(0)); ReplaceNode(Node, NewVal.getNode()); LegalizeOp(NewVal.getNode()); return;