diff options
| author | Shuxin Yang <shuxin.llvm@gmail.com> | 2012-10-19 23:00:20 +0000 |
|---|---|---|
| committer | Shuxin Yang <shuxin.llvm@gmail.com> | 2012-10-19 23:00:20 +0000 |
| commit | cfc6cb0c61ef78aad2f63b634b0a6f377361858b (patch) | |
| tree | 4cb8f745b20d760080fd45f977e22c9fe56ebe37 | |
| parent | ab450e42f1ae00d221a86cd41361834dd2ab95bc (diff) | |
| download | llvm-cfc6cb0c61ef78aad2f63b634b0a6f377361858b.tar.gz llvm-cfc6cb0c61ef78aad2f63b634b0a6f377361858b.tar.bz2 llvm-cfc6cb0c61ef78aad2f63b634b0a6f377361858b.tar.xz | |
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
| -rw-r--r-- | include/llvm/Intrinsics.td | 2 | ||||
| -rw-r--r-- | 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 cf33a265d6..2e1597fe6f 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 c46df30935..abf40b77a1 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; |