[Lldb-commits] [lldb] r111388 - in /lldb/trunk: include/lldb/Expression/IRForTarget.h include/lldb/Expression/IRToDWARF.h source/Expression/ClangExpression.cpp source/Expression/IRForTarget.cpp source/Expression/IRToDWARF.cpp

[Sean Callanan]

Author: spyffe
Date: Wed Aug 18 13:50:51 2010
New Revision: 111388

URL: http://llvm.org/viewvc/llvm-project?rev=111388&view=rev
Log:
Patch by Bill Lynch fixing handling of the pid
in the IR transformation passes.

Modified:
    lldb/trunk/include/lldb/Expression/IRForTarget.h
    lldb/trunk/include/lldb/Expression/IRToDWARF.h
    lldb/trunk/source/Expression/ClangExpression.cpp
    lldb/trunk/source/Expression/IRForTarget.cpp
    lldb/trunk/source/Expression/IRToDWARF.cpp

Modified: lldb/trunk/include/lldb/Expression/IRForTarget.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRForTarget.h?rev=111388&r1=111387&r2=111388&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/IRForTarget.h (original)
+++ lldb/trunk/include/lldb/Expression/IRForTarget.h Wed Aug 18 13:50:51 2010
@@ -61,8 +61,7 @@
     ///     used to determine the sizes of types that have been lowered into
     ///     IR types.
     //------------------------------------------------------------------
-    IRForTarget(const void *pid,
-                lldb_private::ClangExpressionDeclMap *decl_map,
+    IRForTarget(lldb_private::ClangExpressionDeclMap *decl_map,
                 const llvm::TargetData *target_data);
     
     //------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Expression/IRToDWARF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRToDWARF.h?rev=111388&r1=111387&r2=111388&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/IRToDWARF.h (original)
+++ lldb/trunk/include/lldb/Expression/IRToDWARF.h Wed Aug 18 13:50:51 2010
@@ -50,10 +50,6 @@
     //------------------------------------------------------------------
     /// Constructor
     ///
-    /// @param[in] pid
-    ///     A unique identifier for this pass.  I'm not sure what this does;
-    ///     it just gets passed down to ModulePass's constructor.
-    ///
     /// @param[in] variable_list
     ///     A list of variables to populate with the local variables this
     ///     expression uses.
@@ -65,8 +61,7 @@
     /// @param[in] stream
     ///     The stream to dump DWARF bytecode onto.
     //------------------------------------------------------------------
-    IRToDWARF(const void *pid,
-              lldb_private::ClangExpressionVariableList &variable_list, 
+    IRToDWARF(lldb_private::ClangExpressionVariableList &variable_list, 
               lldb_private::ClangExpressionDeclMap *decl_map,
               lldb_private::StreamString &strm);
     
@@ -118,4 +113,4 @@
     lldb_private::StreamString &m_strm;                         ///< The stream to write bytecode to
 };
 
-#endif
\ No newline at end of file
+#endif

Modified: lldb/trunk/source/Expression/ClangExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpression.cpp?rev=111388&r1=111387&r2=111388&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpression.cpp Wed Aug 18 13:50:51 2010
@@ -455,7 +455,7 @@
         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 @@
     
     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);
 }

Modified: lldb/trunk/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRForTarget.cpp?rev=111388&r1=111387&r2=111388&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRForTarget.cpp (original)
+++ lldb/trunk/source/Expression/IRForTarget.cpp Wed Aug 18 13:50:51 2010
@@ -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)

Modified: lldb/trunk/source/Expression/IRToDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRToDWARF.cpp?rev=111388&r1=111387&r2=111388&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRToDWARF.cpp (original)
+++ lldb/trunk/source/Expression/IRToDWARF.cpp Wed Aug 18 13:50:51 2010
@@ -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)