Patch by Bill Lynch fixing handling of the pid

in the IR transformation passes.

llvm-svn: 111388

3 files changed, 10 insertions, 8 deletions

diff --git a/lldb/source/Expression/ClangExpression.cpp b/lldb/source/Expression/ClangExpression.cpp
index 0f5ad62e57b..416bd3e3733 100644
--- a/lldb/source/Expression/ClangExpression.cpp
+++ b/lldb/source/Expression/ClangExpression.cpp
@@ -455,7 +455,7 @@ ClangExpression::ConvertIRToDWARF (ClangExpressionVariableList &expr_local_varia
         return 1;
     }
     
-    IRToDWARF ir_to_dwarf("IR to DWARF", expr_local_variable_list, m_decl_map, dwarf_opcode_strm);
+    IRToDWARF ir_to_dwarf(expr_local_variable_list, m_decl_map, dwarf_opcode_strm);
     
     return ir_to_dwarf.runOnModule(*module);
 }
@@ -491,7 +491,7 @@ ClangExpression::PrepareIRForTarget ()
     
     std::auto_ptr<llvm::TargetMachine> target_machine(target->createTargetMachine(m_target_triple, ""));
     
-    IRForTarget ir_for_target("IR for target", m_decl_map, target_machine->getTargetData());
+    IRForTarget ir_for_target(m_decl_map, target_machine->getTargetData());
     
     return ir_for_target.runOnModule(*module);
 }
diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp
index 57604aadacd..c3fce6fbbb0 100644
--- a/lldb/source/Expression/IRForTarget.cpp
+++ b/lldb/source/Expression/IRForTarget.cpp
@@ -28,10 +28,11 @@
 
 using namespace llvm;
 
-IRForTarget::IRForTarget(const void *pid,
-                         lldb_private::ClangExpressionDeclMap *decl_map,
+static char ID;
+
+IRForTarget::IRForTarget(lldb_private::ClangExpressionDeclMap *decl_map,
                          const TargetData *target_data) :
-    ModulePass(pid),
+    ModulePass(ID),
     m_decl_map(decl_map),
     m_target_data(target_data),
     m_sel_registerName(NULL)
diff --git a/lldb/source/Expression/IRToDWARF.cpp b/lldb/source/Expression/IRToDWARF.cpp
index b6e0b4310fa..db38e8e53d2 100644
--- a/lldb/source/Expression/IRToDWARF.cpp
+++ b/lldb/source/Expression/IRToDWARF.cpp
@@ -24,11 +24,12 @@
 
 using namespace llvm;
 
-IRToDWARF::IRToDWARF(const void *pid,
-                     lldb_private::ClangExpressionVariableList &variable_list, 
+static char ID;
+
+IRToDWARF::IRToDWARF(lldb_private::ClangExpressionVariableList &variable_list, 
                      lldb_private::ClangExpressionDeclMap *decl_map,
                      lldb_private::StreamString &strm) :
-    ModulePass(pid),
+    ModulePass(ID),
     m_variable_list(variable_list),
     m_decl_map(decl_map),
     m_strm(strm)