[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

[Jim Laskey]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.205 -> 1.206
---
Log message:

Bullet proof against undefined args produced by upgrading ols-style debug info.


---
Diffs of the changes:  (+5 -4)

 SelectionDAGISel.cpp |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.205 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.206
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.205	Fri Mar 24 16:49:42 2006
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Sun Mar 26 16:46:27 2006
@@ -1114,7 +1114,7 @@
   case Intrinsic::dbg_stoppoint: {
     MachineDebugInfo *DebugInfo = DAG.getMachineDebugInfo();
     DbgStopPointInst &SPI = cast<DbgStopPointInst>(I);
-    if (DebugInfo &&  DebugInfo->Verify(SPI.getContext())) {
+    if (DebugInfo && SPI.getContext() && DebugInfo->Verify(SPI.getContext())) {
       std::vector<SDOperand> Ops;
 
       Ops.push_back(getRoot());
@@ -1136,7 +1136,7 @@
   case Intrinsic::dbg_region_start: {
     MachineDebugInfo *DebugInfo = DAG.getMachineDebugInfo();
     DbgRegionStartInst &RSI = cast<DbgRegionStartInst>(I);
-    if (DebugInfo && DebugInfo->Verify(RSI.getContext())) {
+    if (DebugInfo && RSI.getContext() && DebugInfo->Verify(RSI.getContext())) {
       std::vector<SDOperand> Ops;
 
       unsigned LabelID = DebugInfo->RecordRegionStart(RSI.getContext());
@@ -1152,7 +1152,7 @@
   case Intrinsic::dbg_region_end: {
     MachineDebugInfo *DebugInfo = DAG.getMachineDebugInfo();
     DbgRegionEndInst &REI = cast<DbgRegionEndInst>(I);
-    if (DebugInfo && DebugInfo->Verify(REI.getContext())) {
+    if (DebugInfo && REI.getContext() && DebugInfo->Verify(REI.getContext())) {
       std::vector<SDOperand> Ops;
 
       unsigned LabelID = DebugInfo->RecordRegionEnd(REI.getContext());
@@ -1168,7 +1168,8 @@
   case Intrinsic::dbg_func_start: {
     MachineDebugInfo *DebugInfo = DAG.getMachineDebugInfo();
     DbgFuncStartInst &FSI = cast<DbgFuncStartInst>(I);
-    if (DebugInfo && DebugInfo->Verify(FSI.getSubprogram())) {
+    if (DebugInfo && FSI.getSubprogram() &&
+        DebugInfo->Verify(FSI.getSubprogram())) {
       std::vector<SDOperand> Ops;
 
       unsigned LabelID = DebugInfo->RecordRegionStart(FSI.getSubprogram());