[llvm-commits] CVS: reopt/lib/LightWtProfiling/SecondTrigger.cpp

[Brian Gaeke]

Changes in directory reopt/lib/LightWtProfiling:

SecondTrigger.cpp updated: 1.30 -> 1.31

---
Log message:

Fix a bug with --skip-trace: If we skip a trace, try to avoid looping
infinitely (e.g., by reentering optimizeTrace() through the
instrumentation routines) by cancelling out the SLI trace.


---
Diffs of the changes:  (+3 -1)

Index: reopt/lib/LightWtProfiling/SecondTrigger.cpp
diff -u reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.30 reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.31
--- reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.30	Fri Jun 25 01:07:26 2004
+++ reopt/lib/LightWtProfiling/SecondTrigger.cpp	Sun Jun 27 21:28:06 2004
@@ -526,7 +526,9 @@
     //use path 0 to form vBB
     std::vector<BasicBlock *> vBB;
     constructVBB (paths[0], start, vBB);
-    if (!vBB.empty()) { optimizeTrace (vBB, firstLevelTraceStartAddr); }
+    if (vBB.empty()) return;
+    if (!optimizeTrace (vBB, firstLevelTraceStartAddr))
+      tr->patchTrace(firstLevelTraceStartAddr);
     return;
   }