Hook up global function and variable handling. We can now compile:
int X, bar(int,int,int);
short Y;
double foo() {
return bar(X, Y, 3);
}
into:
@X = external global i32 ; <i32*> [#uses=1]
@Y = external global i16 ; <i16*> [#uses=1]
define double @foo() {
entry:
%tmp = load i32* @X ; <i32> [#uses=1]
%tmp1 = load i16* @Y ; <i16> [#uses=1]
%promote = sext i16 %tmp1 to i32 ; <i32> [#uses=1]
%call = tail call i32 @bar( i32 %tmp, i32 %promote, i32 3 ) ; <i32> [#uses=1]
%conv = sitofp i32 %call to double ; <double> [#uses=1]
ret double %conv
}
declare i32 @bar(i32, i32, i32)
llvm-svn: 39663
diff --git a/clang/CodeGen/CodeGenModule.cpp b/clang/CodeGen/CodeGenModule.cpp
index 6ec9b79..d4068c6 100644
--- a/clang/CodeGen/CodeGenModule.cpp
+++ b/clang/CodeGen/CodeGenModule.cpp
@@ -15,6 +15,9 @@
#include "CodeGenFunction.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
+#include "llvm/DerivedTypes.h"
+#include "llvm/Function.h"
+#include "llvm/GlobalVariable.h"
using namespace clang;
using namespace CodeGen;
@@ -22,6 +25,27 @@
CodeGenModule::CodeGenModule(ASTContext &C, llvm::Module &M)
: Context(C), TheModule(M), Types(C.Target) {}
+llvm::Constant *CodeGenModule::GetAddrOfGlobalDecl(const Decl *D) {
+ // See if it is already in the map.
+ llvm::Constant *&Entry = GlobalDeclMap[D];
+ if (Entry) return Entry;
+
+ QualType ASTTy = cast<ValueDecl>(D)->getType();
+ const llvm::Type *Ty = getTypes().ConvertType(ASTTy, D->getLocation());
+ if (isa<FunctionDecl>(D)) {
+ const llvm::FunctionType *FTy = cast<llvm::FunctionType>(Ty);
+ // FIXME: param attributes for sext/zext etc.
+ return Entry = new llvm::Function(FTy, llvm::Function::ExternalLinkage,
+ D->getName(), &getModule());
+ }
+
+ assert(isa<FileVarDecl>(D) && "Unknown global decl!");
+
+ return Entry = new llvm::GlobalVariable(Ty, false,
+ llvm::GlobalValue::ExternalLinkage,
+ 0, D->getName(), &getModule());
+}
+
void CodeGenModule::EmitFunction(FunctionDecl *FD) {
// If this is not a prototype, emit the body.
if (FD->getBody())