Changes in directory llvm/lib/Debugger:
ProgramInfo.cpp updated: 1.14 -> 1.15
---
Log message:
Handle new forms of llvm.dbg intrinsics.
---
Diffs of the changes: (+6 -8)
ProgramInfo.cpp | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.14
llvm/lib/Debugger/ProgramInfo.cpp:1.15
--- llvm/lib/Debugger/ProgramInfo.cpp:1.14 Mon Mar 13 07:07:37 2006
+++ llvm/lib/Debugger/ProgramInfo.cpp Thu Mar 23 12:06:46 2006
@@ -16,6 +16,7 @@
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Intrinsics.h"
+#include "llvm/IntrinsicInst.h"
#include "llvm/Instructions.h"
#include "llvm/Module.h"
#include "llvm/Debugger/SourceFile.h"
@@ -57,17 +58,15 @@
// Infinite loops == bad, ignore PHI nodes.
ShouldRecurse = false;
} else if (const CallInst *CI = dyn_cast<CallInst>(*UI)) {
+
// If we found a stop point, check to see if it is earlier than what we
// already have. If so, remember it.
if (const Function *F = CI->getCalledFunction())
- if (F->getIntrinsicID() == Intrinsic::dbg_stoppoint) {
- unsigned CurLineNo = ~0, CurColNo = ~0;
+ if (const DbgStopPointInst *SPI = dyn_cast<DbgStopPointInst>(CI)) {
+ unsigned CurLineNo = SPI->getLine();
+ unsigned CurColNo = SPI->getColumn();
const GlobalVariable *CurDesc = 0;
- if (const ConstantInt *C = dyn_cast<ConstantInt>(CI->getOperand(1)))
- CurLineNo = C->getRawValue();
- if (const ConstantInt *C = dyn_cast<ConstantInt>(CI->getOperand(2)))
- CurColNo = C->getRawValue();
- const Value *Op = CI->getOperand(3);
+ const Value *Op = SPI->getContext();
if ((CurDesc = dyn_cast<GlobalVariable>(Op)) &&
(LineNo < LastLineNo ||
@@ -78,7 +77,6 @@
}
ShouldRecurse = false;
}
-
}
// If this is not a phi node or a stopping point, recursively scan the
users
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
