Make target info available to clang code generator.
This is far from complete but this helps clang codegen module
make progress.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43536 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CodeGen/CodeGenModule.cpp b/CodeGen/CodeGenModule.cpp
index a596c08..8bb4c2e 100644
--- a/CodeGen/CodeGenModule.cpp
+++ b/CodeGen/CodeGenModule.cpp
@@ -24,8 +24,10 @@
using namespace CodeGen;
-CodeGenModule::CodeGenModule(ASTContext &C, llvm::Module &M)
- : Context(C), TheModule(M), Types(C, M), CFConstantStringClassRef(0) {}
+CodeGenModule::CodeGenModule(ASTContext &C, llvm::Module &M,
+ const llvm::TargetData &TD)
+ : Context(C), TheModule(M), TheTargetData(TD),
+ Types(C, M, TD), CFConstantStringClassRef(0) {}
llvm::Constant *CodeGenModule::GetAddrOfGlobalDecl(const ValueDecl *D) {
// See if it is already in the map.
diff --git a/CodeGen/CodeGenModule.h b/CodeGen/CodeGenModule.h
index 4ca4f8c..a044c0d 100644
--- a/CodeGen/CodeGenModule.h
+++ b/CodeGen/CodeGenModule.h
@@ -23,6 +23,7 @@
class Constant;
class Function;
class GlobalVariable;
+ class TargetData;
}
namespace clang {
@@ -39,6 +40,7 @@
class CodeGenModule {
ASTContext &Context;
llvm::Module &TheModule;
+ const llvm::TargetData &TheTargetData;
CodeGenTypes Types;
llvm::Function *MemCpyFn;
@@ -49,7 +51,7 @@
std::vector<llvm::Function *> BuiltinFunctions;
public:
- CodeGenModule(ASTContext &C, llvm::Module &M);
+ CodeGenModule(ASTContext &C, llvm::Module &M, const llvm::TargetData &TD);
ASTContext &getContext() const { return Context; }
llvm::Module &getModule() const { return TheModule; }
diff --git a/CodeGen/CodeGenTypes.cpp b/CodeGen/CodeGenTypes.cpp
index 017b65c..b65d596 100644
--- a/CodeGen/CodeGenTypes.cpp
+++ b/CodeGen/CodeGenTypes.cpp
@@ -60,8 +60,9 @@
};
}
-CodeGenTypes::CodeGenTypes(ASTContext &Ctx, llvm::Module& M)
- : Context(Ctx), Target(Ctx.Target), TheModule(M) {
+CodeGenTypes::CodeGenTypes(ASTContext &Ctx, llvm::Module& M,
+ const llvm::TargetData &TD)
+ : Context(Ctx), Target(Ctx.Target), TheModule(M), TheTargetData(TD) {
}
CodeGenTypes::~CodeGenTypes() {
diff --git a/CodeGen/CodeGenTypes.h b/CodeGen/CodeGenTypes.h
index 95aea85..fe012f7 100644
--- a/CodeGen/CodeGenTypes.h
+++ b/CodeGen/CodeGenTypes.h
@@ -21,6 +21,7 @@
class Module;
class Type;
class PATypeHolder;
+ class TargetData;
}
namespace clang {
@@ -61,6 +62,7 @@
ASTContext &Context;
TargetInfo &Target;
llvm::Module& TheModule;
+ const llvm::TargetData& TheTargetData;
llvm::DenseMap<const TagDecl*, llvm::Type*> TagDeclTypes;
@@ -91,7 +93,7 @@
/// interface to convert type T into a llvm::Type.
const llvm::Type *ConvertNewType(QualType T);
public:
- CodeGenTypes(ASTContext &Ctx, llvm::Module &M);
+ CodeGenTypes(ASTContext &Ctx, llvm::Module &M, const llvm::TargetData &TD);
~CodeGenTypes();
TargetInfo &getTarget() const { return Target; }
diff --git a/CodeGen/ModuleBuilder.cpp b/CodeGen/ModuleBuilder.cpp
index 4a5a470..a7586b6 100644
--- a/CodeGen/ModuleBuilder.cpp
+++ b/CodeGen/ModuleBuilder.cpp
@@ -18,8 +18,9 @@
/// Init - Create an ModuleBuilder with the specified ASTContext.
clang::CodeGen::BuilderTy *
-clang::CodeGen::Init(ASTContext &Context, llvm::Module &M) {
- return new CodeGenModule(Context, M);
+clang::CodeGen::Init(ASTContext &Context, llvm::Module &M,
+ const llvm::TargetData &TD) {
+ return new CodeGenModule(Context, M, TD);
}
void clang::CodeGen::Terminate(BuilderTy *B) {