diff options
| -rw-r--r-- | lldb/include/lldb/Expression/IRForTarget.h | 3 | ||||
| -rw-r--r-- | lldb/include/lldb/Expression/IRToDWARF.h | 9 | ||||
| -rw-r--r-- | lldb/source/Expression/ClangExpression.cpp | 4 | ||||
| -rw-r--r-- | lldb/source/Expression/IRForTarget.cpp | 7 | ||||
| -rw-r--r-- | lldb/source/Expression/IRToDWARF.cpp | 7 |
5 files changed, 13 insertions, 17 deletions
diff --git a/lldb/include/lldb/Expression/IRForTarget.h b/lldb/include/lldb/Expression/IRForTarget.h index 0ee779f2c01..57158b92a79 100644 --- a/lldb/include/lldb/Expression/IRForTarget.h +++ b/lldb/include/lldb/Expression/IRForTarget.h @@ -61,8 +61,7 @@ public: /// 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); //------------------------------------------------------------------ diff --git a/lldb/include/lldb/Expression/IRToDWARF.h b/lldb/include/lldb/Expression/IRToDWARF.h index 50179bb9632..d57ff1bf785 100644 --- a/lldb/include/lldb/Expression/IRToDWARF.h +++ b/lldb/include/lldb/Expression/IRToDWARF.h @@ -50,10 +50,6 @@ public: //------------------------------------------------------------------ /// 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 @@ public: /// @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 @@ private: lldb_private::StreamString &m_strm; ///< The stream to write bytecode to }; -#endif
\ No newline at end of file +#endif 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) |
