[llvm-commits] [llvm] r48373 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

[Duncan Sands]

Author: baldrick
Date: Fri Mar 14 16:36:24 2008
New Revision: 48373

URL: http://llvm.org/viewvc/llvm-project?rev=48373&view=rev
Log:
Do not generate special entries in the dwarf eh
table for nounwind calls.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=48373&r1=48372&r2=48373&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Fri Mar 14 16:36:24 2008
@@ -3134,11 +3134,7 @@
     Args.push_back(Entry);
   }
 
-  bool MarkTryRange = LandingPad ||
-    // C++ requires special handling of 'nounwind' calls.
-    (CS.doesNotThrow());
-
-  if (MarkTryRange && ExceptionHandling && MMI) {
+  if (LandingPad && ExceptionHandling && MMI) {
     // Insert a label before the invoke call to mark the try range.  This can be
     // used to detect deletion of the invoke via the MachineModuleInfo.
     BeginLabel = MMI->NextLabelID();
@@ -3157,7 +3153,7 @@
     setValue(CS.getInstruction(), Result.first);
   DAG.setRoot(Result.second);
 
-  if (MarkTryRange && ExceptionHandling && MMI) {
+  if (LandingPad && ExceptionHandling && MMI) {
     // Insert a label at the end of the invoke call to mark the try range.  This
     // can be used to detect deletion of the invoke via the MachineModuleInfo.
     EndLabel = MMI->NextLabelID();