Implement codegen for the following static var init.
void g() {
static char a[10];
static char *b = a;
}
Now we can compile wget!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47627 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CodeGen/CGDecl.cpp b/CodeGen/CGDecl.cpp
index cd31fa7..c80cecc 100644
--- a/CodeGen/CGDecl.cpp
+++ b/CodeGen/CGDecl.cpp
@@ -77,7 +77,7 @@
if (D.getInit() == 0) {
Init = llvm::Constant::getNullValue(LTy);
} else {
- Init = CGM.EmitGlobalInit(D.getInit());
+ Init = CGM.EmitConstantExpr(D.getInit(), this);
}
assert(Init && "Unable to create initialiser for static decl");
diff --git a/CodeGen/CGExprConstant.cpp b/CodeGen/CGExprConstant.cpp
index 1a60cae..ec16b16 100644
--- a/CodeGen/CGExprConstant.cpp
+++ b/CodeGen/CGExprConstant.cpp
@@ -25,9 +25,10 @@
class VISIBILITY_HIDDEN ConstExprEmitter :
public StmtVisitor<ConstExprEmitter, llvm::Constant*> {
CodeGenModule &CGM;
+ CodeGenFunction *CGF;
public:
- ConstExprEmitter(CodeGenModule &cgm)
- : CGM(cgm) {
+ ConstExprEmitter(CodeGenModule &cgm, CodeGenFunction *cgf)
+ : CGM(cgm), CGF(cgf) {
}
//===--------------------------------------------------------------------===//
@@ -534,8 +535,10 @@
return CGM.GetAddrOfFunctionDecl(FD, false);
if (const FileVarDecl* VD = dyn_cast<FileVarDecl>(Decl))
return CGM.GetAddrOfGlobalVar(VD, false);
- // We can end up here with static block-scope variables (and others?)
- // FIXME: How do we implement block-scope variables?!
+ if (const BlockVarDecl* BVD = dyn_cast<BlockVarDecl>(Decl)) {
+ assert(CGF && "Can't access static local vars without CGF");
+ return CGF->GetAddrOfStaticLocalVar(BVD);
+ }
break;
}
case Expr::MemberExprClass: {
@@ -604,7 +607,8 @@
} // end anonymous namespace.
-llvm::Constant *CodeGenModule::EmitConstantExpr(const Expr *E)
+llvm::Constant *CodeGenModule::EmitConstantExpr(const Expr *E,
+ CodeGenFunction *CGF)
{
QualType type = E->getType().getCanonicalType();
@@ -616,5 +620,5 @@
}
}
- return ConstExprEmitter(*this).Visit(const_cast<Expr*>(E));
+ return ConstExprEmitter(*this, CGF).Visit(const_cast<Expr*>(E));
}
diff --git a/CodeGen/CodeGenFunction.cpp b/CodeGen/CodeGenFunction.cpp
index dc31a27..c2a303c 100644
--- a/CodeGen/CodeGenFunction.cpp
+++ b/CodeGen/CodeGenFunction.cpp
@@ -40,6 +40,10 @@
return BB = new llvm::BasicBlock(S->getName());
}
+llvm::Constant *
+CodeGenFunction::GetAddrOfStaticLocalVar(const BlockVarDecl *BVD) {
+ return cast<llvm::Constant>(LocalDeclMap[BVD]);
+}
const llvm::Type *CodeGenFunction::ConvertType(QualType T) {
return CGM.getTypes().ConvertType(T);
diff --git a/CodeGen/CodeGenFunction.h b/CodeGen/CodeGenFunction.h
index e885752..b136c2b 100644
--- a/CodeGen/CodeGenFunction.h
+++ b/CodeGen/CodeGenFunction.h
@@ -335,6 +335,9 @@
/// getCGRecordLayout - Return record layout info.
const CGRecordLayout *getCGRecordLayout(CodeGenTypes &CGT, QualType RTy);
+
+ /// GetAddrOfStaticLocalVar - Return the address of a static local variable.
+ llvm::Constant *GetAddrOfStaticLocalVar(const BlockVarDecl *BVD);
//===--------------------------------------------------------------------===//
// Declaration Emission
//===--------------------------------------------------------------------===//
diff --git a/CodeGen/CodeGenModule.h b/CodeGen/CodeGenModule.h
index 48283c5..7ea6ef9 100644
--- a/CodeGen/CodeGenModule.h
+++ b/CodeGen/CodeGenModule.h
@@ -41,6 +41,8 @@
namespace CodeGen {
+ class CodeGenFunction;
+
/// CodeGenModule - This class organizes the cross-module state that is used
/// while generating LLVM code.
class CodeGenModule {
@@ -95,7 +97,7 @@
void EmitGlobalVarDeclarator(const FileVarDecl *D);
void UpdateCompletedType(const TagDecl *D);
llvm::Constant *EmitGlobalInit(const Expr *E);
- llvm::Constant *EmitConstantExpr(const Expr *E);
+ llvm::Constant *EmitConstantExpr(const Expr *E, CodeGenFunction *CGF = 0);
/// WarnUnsupported - Print out a warning that codegen doesn't support the
/// specified stmt yet.