Move TargetData to DataLayout.

llvm-svn: 165396

4 files changed, 11 insertions, 11 deletions

diff --git a/lldb/include/lldb/Expression/IRDynamicChecks.h b/lldb/include/lldb/Expression/IRDynamicChecks.h
index ba50c23ef38..5a3b05f91f1 100644
--- a/lldb/include/lldb/Expression/IRDynamicChecks.h
+++ b/lldb/include/lldb/Expression/IRDynamicChecks.h
@@ -20,7 +20,7 @@ namespace llvm {
     class Function;
     class Instruction;
     class Module;
-    class TargetData;
+    class DataLayout;
     class Value;
 }
 
diff --git a/lldb/include/lldb/Expression/IRForTarget.h b/lldb/include/lldb/Expression/IRForTarget.h
index 4fcbdd7d584..61c8deac5e0 100644
--- a/lldb/include/lldb/Expression/IRForTarget.h
+++ b/lldb/include/lldb/Expression/IRForTarget.h
@@ -28,7 +28,7 @@ namespace llvm {
     class Instruction;
     class Module;
     class StoreInst;
-    class TargetData;
+    class DataLayout;
     class Type;
     class Value;
 }
@@ -661,7 +661,7 @@ private:
     lldb_private::ConstString               m_result_name;              ///< The name of the result variable ($0, $1, ...)
     lldb_private::TypeFromParser            m_result_type;              ///< The type of the result variable.
     llvm::Module                           *m_module;                   ///< The module being processed, or NULL if that has not been determined yet.
-    std::auto_ptr<llvm::TargetData>         m_target_data;              ///< The target data for the module being processed, or NULL if there is no module.
+    std::auto_ptr<llvm::DataLayout>         m_target_data;              ///< The target data for the module being processed, or NULL if there is no module.
     lldb_private::ClangExpressionDeclMap   *m_decl_map;                 ///< The DeclMap containing the Decls 
     StaticDataAllocator                    *m_data_allocator;           ///< If non-NULL, the allocator to use for constant strings
     llvm::Constant                         *m_CFStringCreateWithBytes;  ///< The address of the function CFStringCreateWithBytes, cast to the appropriate function pointer type
diff --git a/lldb/source/Expression/IRForTarget.cpp b/lldb/source/Expression/IRForTarget.cpp
index b74e9f97aa7..dedb625a19f 100644
--- a/lldb/source/Expression/IRForTarget.cpp
+++ b/lldb/source/Expression/IRForTarget.cpp
@@ -11,12 +11,12 @@
 
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Constants.h"
+#include "llvm/DataLayout.h"
 #include "llvm/InstrTypes.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
-#include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/ValueSymbolTable.h"
 
@@ -2686,7 +2686,7 @@ IRForTarget::runOnModule (Module &llvm_module)
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     
     m_module = &llvm_module;
-    m_target_data.reset(new TargetData(m_module));
+    m_target_data.reset(new DataLayout(m_module));
     
     Function* function = m_module->getFunction(StringRef(m_func_name.c_str()));
     
diff --git a/lldb/source/Expression/IRInterpreter.cpp b/lldb/source/Expression/IRInterpreter.cpp
index 5c09e6da753..926def69c0a 100644
--- a/lldb/source/Expression/IRInterpreter.cpp
+++ b/lldb/source/Expression/IRInterpreter.cpp
@@ -20,7 +20,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetData.h"
+#include "llvm/DataLayout.h"
 
 #include <map>
 
@@ -176,7 +176,7 @@ private:
     MemoryMap           m_memory;
     lldb::ByteOrder     m_byte_order;
     lldb::addr_t        m_addr_byte_size;
-    TargetData         &m_target_data;
+    DataLayout         &m_target_data;
     
     lldb_private::ClangExpressionDeclMap   &m_decl_map;
     
@@ -195,7 +195,7 @@ private:
     }
     
 public:
-    Memory (TargetData &target_data,
+    Memory (DataLayout &target_data,
             lldb_private::ClangExpressionDeclMap &decl_map,
             lldb::addr_t alloc_start,
             lldb::addr_t alloc_max) :
@@ -408,7 +408,7 @@ public:
 
     ValueMap                                m_values;
     Memory                                 &m_memory;
-    TargetData                             &m_target_data;
+    DataLayout                             &m_target_data;
     lldb_private::ClangExpressionDeclMap   &m_decl_map;
     const BasicBlock                       *m_bb;
     BasicBlock::const_iterator              m_ii;
@@ -417,7 +417,7 @@ public:
     lldb::ByteOrder                         m_byte_order;
     size_t                                  m_addr_byte_size;
     
-    InterpreterStackFrame (TargetData &target_data,
+    InterpreterStackFrame (DataLayout &target_data,
                            Memory &memory,
                            lldb_private::ClangExpressionDeclMap &decl_map) :
         m_memory (memory),
@@ -1041,7 +1041,7 @@ IRInterpreter::runOnFunction (lldb::ClangExpressionVariableSP &result,
         break;
     }
     
-    TargetData target_data(&llvm_module);
+    DataLayout target_data(&llvm_module);
     if (target_data.getPointerSize() != target_info.address_byte_size)
     {
         err.SetErrorToGenericError();