[llvm] r250068 - Don't call PrepareEHLandingPad on non EH pads

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Mon Oct 12 10:42:32 PDT 2015


Author: rnk
Date: Mon Oct 12 12:42:32 2015
New Revision: 250068

URL: http://llvm.org/viewvc/llvm-project?rev=250068&view=rev
Log:
Don't call PrepareEHLandingPad on non EH pads

This was a minor bug in r249492. Calling PrepareEHLandingPad on a
non-landingpad was a no-op, but it attempted to get the generic pointer
register class, which apparently doesn't exist for some targets.

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=250068&r1=250067&r2=250068&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Mon Oct 12 12:42:32 2015
@@ -1153,8 +1153,9 @@ void SelectionDAGISel::SelectAllBasicBlo
     // Setup an EH landing-pad block.
     FuncInfo->ExceptionPointerVirtReg = 0;
     FuncInfo->ExceptionSelectorVirtReg = 0;
-    if (!PrepareEHLandingPad())
-      continue;
+    if (LLVMBB->isEHPad())
+      if (!PrepareEHLandingPad())
+        continue;
 
     // Before doing SelectionDAG ISel, see if FastISel has been requested.
     if (FastIS) {




More information about the llvm-commits mailing list