diff options
author | Micah Villmow <villmow@gmail.com> | 2012-10-08 16:21:06 +0000 |
---|---|---|
committer | Micah Villmow <villmow@gmail.com> | 2012-10-08 16:21:06 +0000 |
commit | cb7a4c6c52563589ef7c832bd4c87390b3a3a919 (patch) | |
tree | 1e22135b8938a0c8942fbe9543a0c2e353fb96d7 /lib/Module | |
parent | 215c1587aab5fa94fd805fe8e0b5fbacc51f1c8e (diff) | |
download | klee-cb7a4c6c52563589ef7c832bd4c87390b3a3a919.tar.gz |
Move TargetData to DataLayout.
git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@165394 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Module')
-rw-r--r-- | lib/Module/Checks.cpp | 2 | ||||
-rw-r--r-- | lib/Module/IntrinsicCleaner.cpp | 4 | ||||
-rw-r--r-- | lib/Module/KModule.cpp | 4 | ||||
-rw-r--r-- | lib/Module/Optimize.cpp | 6 | ||||
-rw-r--r-- | lib/Module/Passes.h | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/lib/Module/Checks.cpp b/lib/Module/Checks.cpp index c2f98c0f..125e807a 100644 --- a/lib/Module/Checks.cpp +++ b/lib/Module/Checks.cpp @@ -26,7 +26,7 @@ #include "llvm/Type.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "llvm/Target/TargetData.h" +#include "llvm/Target/DataLayout.h" using namespace llvm; using namespace klee; diff --git a/lib/Module/IntrinsicCleaner.cpp b/lib/Module/IntrinsicCleaner.cpp index 8b0be35a..41dc5724 100644 --- a/lib/Module/IntrinsicCleaner.cpp +++ b/lib/Module/IntrinsicCleaner.cpp @@ -26,7 +26,7 @@ #include "llvm/Support/IRBuilder.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "llvm/Target/TargetData.h" +#include "llvm/Target/DataLayout.h" using namespace llvm; @@ -45,7 +45,7 @@ bool IntrinsicCleanerPass::runOnModule(Module &M) { bool IntrinsicCleanerPass::runOnBasicBlock(BasicBlock &b) { bool dirty = false; - unsigned WordSize = TargetData.getPointerSizeInBits() / 8; + unsigned WordSize = DataLayout.getPointerSizeInBits() / 8; for (BasicBlock::iterator i = b.begin(), ie = b.end(); i != ie;) { IntrinsicInst *ii = dyn_cast<IntrinsicInst>(&*i); // increment now since LowerIntrinsic deletion makes iterator invalid. diff --git a/lib/Module/KModule.cpp b/lib/Module/KModule.cpp index a569242e..eeaa10cf 100644 --- a/lib/Module/KModule.cpp +++ b/lib/Module/KModule.cpp @@ -40,7 +40,7 @@ #else #include "llvm/Support/Path.h" #endif -#include "llvm/Target/TargetData.h" +#include "llvm/Target/DataLayout.h" #include "llvm/Transforms/Scalar.h" #include <sstream> @@ -90,7 +90,7 @@ namespace { KModule::KModule(Module *_module) : module(_module), - targetData(new TargetData(module)), + targetData(new DataLayout(module)), dbgStopPointFn(0), kleeMergeFn(0), infos(0), diff --git a/lib/Module/Optimize.cpp b/lib/Module/Optimize.cpp index d988a74c..fc37c1a9 100644 --- a/lib/Module/Optimize.cpp +++ b/lib/Module/Optimize.cpp @@ -27,7 +27,7 @@ #else #include "llvm/Support/DynamicLibrary.h" #endif -#include "llvm/Target/TargetData.h" +#include "llvm/Target/DataLayout.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" @@ -178,8 +178,8 @@ void Optimize(Module* M) { if (VerifyEach) Passes.add(createVerifierPass()); - // Add an appropriate TargetData instance for this module... - addPass(Passes, new TargetData(M)); + // Add an appropriate DataLayout instance for this module... + addPass(Passes, new DataLayout(M)); // DWD - Run the opt standard pass list as well. AddStandardCompilePasses(Passes); diff --git a/lib/Module/Passes.h b/lib/Module/Passes.h index 6257da8f..721a61ea 100644 --- a/lib/Module/Passes.h +++ b/lib/Module/Passes.h @@ -22,7 +22,7 @@ namespace llvm { class Function; class Instruction; class Module; - class TargetData; + class DataLayout; class TargetLowering; class Type; } @@ -64,20 +64,20 @@ public: // variables (via intrinsic lowering). class IntrinsicCleanerPass : public llvm::ModulePass { static char ID; - const llvm::TargetData &TargetData; + const llvm::DataLayout &DataLayout; llvm::IntrinsicLowering *IL; bool LowerIntrinsics; bool runOnBasicBlock(llvm::BasicBlock &b); public: - IntrinsicCleanerPass(const llvm::TargetData &TD, + IntrinsicCleanerPass(const llvm::DataLayout &TD, bool LI=true) #if LLVM_VERSION_CODE < LLVM_VERSION(2, 8) : llvm::ModulePass((intptr_t) &ID), #else : llvm::ModulePass(ID), #endif - TargetData(TD), + DataLayout(TD), IL(new llvm::IntrinsicLowering(TD)), LowerIntrinsics(LI) {} ~IntrinsicCleanerPass() { delete IL; } |