From c200d5e99fbc3eb0cacbb579fa9e2636153dd4db Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Fri, 22 Jan 2010 23:04:39 +0000 Subject: [PATCH] Make OProfile support compile again after r93630 removed DebugLocTuple. Also use an AssertingVH to ensure that MDNodes aren't destroyed while the FilenameCache is using them. llvm-svn: 94245 --- .../JIT/OProfileJITEventListener.cpp | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp b/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp index d01c4b2db54..2baf97911d5 100644 --- a/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp +++ b/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp @@ -18,10 +18,12 @@ #define DEBUG_TYPE "oprofile-jit-event-listener" #include "llvm/Function.h" +#include "llvm/Metadata.h" #include "llvm/Analysis/DebugInfo.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/ExecutionEngine/JITEventListener.h" #include "llvm/Support/Debug.h" +#include "llvm/Support/ValueHandle.h" #include "llvm/Support/raw_ostream.h" #include "llvm/System/Errno.h" #include "llvm/Config/config.h" @@ -70,15 +72,15 @@ OProfileJITEventListener::~OProfileJITEventListener() { class FilenameCache { // Holds the filename of each Scope, so that we can pass a null-terminated - // string into oprofile. - DenseMap Filenames; + // string into oprofile. Use an AssertingVH rather than a ValueMap because we + // shouldn't be modifying any MDNodes while this map is alive. + DenseMap, std::string> Filenames; public: - const char *getFilename(MDNode *Scope) { - std::string &Filename = Filenames[Scope]; + const char *getFilename(DIScope Scope) { + std::string &Filename = Filenames[Scope.getNode()]; if (Filename.empty()) { - DIScope S(Scope); - Filename = S.getFilename(); + Filename = Scope.getFilename(); } return Filename.c_str(); } @@ -89,9 +91,9 @@ static debug_line_info LineStartToOProfileFormat( uintptr_t Address, DebugLoc Loc) { debug_line_info Result; Result.vma = Address; - const DebugLocTuple &tuple = MF.getDebugLocTuple(Loc); - Result.lineno = tuple.Line; - Result.filename = Filenames.getFilename(tuple.Scope); + DILocation DILoc = MF.getDILocation(Loc); + Result.lineno = DILoc.getLineNumber(); + Result.filename = Filenames.getFilename(DILoc.getScope()); DEBUG(dbgs() << "Mapping " << reinterpret_cast(Result.vma) << " to " << Result.filename << ":" << Result.lineno << "\n"); return Result;