Move function codegen data from IrFunction to new FuncGen.

This change reduces memory consumption significantly by releasing the
memory held by the STL containers that are now inside FuncGen.

ir/irfunction.cpp

@@ -93,6 +93,37 @@ void IrFuncTy::getParam(Type* dty, int idx, DValue* val, llvm::Value* lval)
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
+FuncGen::FuncGen()
+{
+    landingPad = NULL;
+    nextUnique.push(0);
+}
+
+std::string FuncGen::getScopedLabelName(const char* ident)
+{
+    if(labelScopes.empty())
+        return std::string(ident);
+
+    std::string result = "__";
+    for(unsigned int i = 0; i < labelScopes.size(); ++i)
+        result += labelScopes[i] + "_";
+    return result + ident;
+}
+
+void FuncGen::pushUniqueLabelScope(const char* name)
+{
+    std::ostringstream uniquename;
+    uniquename << name << nextUnique.top()++;
+    nextUnique.push(0);
+    labelScopes.push_back(uniquename.str());
+}
+
+void FuncGen::popLabelScope()
+{
+    labelScopes.pop_back();
+    nextUnique.pop();
+}
+
 IrFunction::IrFunction(FuncDeclaration* fd)
 {
     decl = fd;
@@ -116,35 +147,6 @@ IrFunction::IrFunction(FuncDeclaration* fd)
     
     _arguments = NULL;
     _argptr = NULL;
-    
-    landingPad = NULL;
-    
-    nextUnique.push(0);
-}
-
-std::string IrFunction::getScopedLabelName(const char* ident)
-{
-    if(labelScopes.empty())
-        return std::string(ident);
-
-    std::string result = "__";
-    for(unsigned int i = 0; i < labelScopes.size(); ++i)
-        result += labelScopes[i] + "_";
-    return result + ident;
-}
-
-void IrFunction::pushUniqueLabelScope(const char* name)
-{
-    std::ostringstream uniquename;
-    uniquename << name << nextUnique.top()++;
-    nextUnique.push(0);
-    labelScopes.push_back(uniquename.str());
-}
-
-void IrFunction::popLabelScope()
-{
-    labelScopes.pop_back();
-    nextUnique.pop();
 }
 
 void IrFunction::setNeverInline()

ir/irfunction.h

@@ -29,14 +29,58 @@ struct IRTargetScope
     IRTargetScope(Statement* s, EnclosingHandler* enclosinghandler, llvm::BasicBlock* continueTarget, llvm::BasicBlock* breakTarget);
 };
 
+struct FuncGen
+{
+    FuncGen();
+
+    // pushes a unique label scope of the given name
+    void pushUniqueLabelScope(const char* name);
+    // pops a label scope
+    void popLabelScope();
+
+    // gets the string under which the label's BB
+    // is stored in the labelToBB map.
+    // essentially prefixes ident by the strings in labelScopes
+    std::string getScopedLabelName(const char* ident);
+
+    // label to basic block lookup
+    typedef std::map<std::string, llvm::BasicBlock*> LabelToBBMap;
+    LabelToBBMap labelToBB;
+
+    // loop blocks
+    typedef std::vector<IRTargetScope> TargetScopeVec;
+    TargetScopeVec targetScopes;
+
+    // landing pads for try statements
+    IRLandingPad landingPadInfo;
+    llvm::BasicBlock* landingPad;
+
+private:
+    // prefix for labels and gotos
+    // used for allowing labels to be emitted twice
+    std::vector<std::string> labelScopes;
+
+    // next unique id stack
+    std::stack<int> nextUnique;
+};
+
 // represents a function
 struct IrFunction : IrBase
 {
+    // constructor
+    IrFunction(FuncDeclaration* fd);
+    
+    // annotations
+    void setNeverInline();
+    void setAlwaysInline();
+
     llvm::Function* func;
     llvm::Instruction* allocapoint;
     FuncDeclaration* decl;
     TypeFunction* type;
 
+    FuncGen* gen;
+
     bool queued;
     bool defined;
     
@@ -54,43 +98,6 @@ struct IrFunction : IrBase
     llvm::Value* _argptr;
     
     llvm::DISubprogram diSubprogram;
-
-    // pushes a unique label scope of the given name
-    void pushUniqueLabelScope(const char* name);
-    // pops a label scope
-    void popLabelScope();
-
-    // gets the string under which the label's BB
-    // is stored in the labelToBB map.
-    // essentially prefixes ident by the strings in labelScopes
-    std::string getScopedLabelName(const char* ident);
-
-    // label to basic block lookup
-    typedef std::map<std::string, llvm::BasicBlock*> LabelToBBMap;
-    LabelToBBMap labelToBB;
-
-    // landing pads for try statements
-    IRLandingPad landingPadInfo;
-    llvm::BasicBlock* landingPad;
-
-    // loop blocks
-    typedef std::vector<IRTargetScope> TargetScopeVec;
-    TargetScopeVec targetScopes;
-
-    // constructor
-    IrFunction(FuncDeclaration* fd);
-
-    // annotations
-    void setNeverInline();
-    void setAlwaysInline();
-
-private:
-    // prefix for labels and gotos
-    // used for allowing labels to be emitted twice
-    std::vector<std::string> labelScopes;
-
-    // next unique id stack
-    std::stack<int> nextUnique;
 };
 
 #endif

ir/irlandingpad.cpp

@@ -24,7 +24,7 @@ IRLandingPadInfo::IRLandingPadInfo(Catch* catchstmt, llvm::BasicBlock* end)
     #endif
             assert(!catchstmt->var->ir.irLocal);
             catchstmt->var->ir.irLocal = new IrLocal(catchstmt->var);
-            LLValue* catch_var = gIR->func()->landingPadInfo.getExceptionStorage();
+            LLValue* catch_var = gIR->func()->gen->landingPadInfo.getExceptionStorage();
             catchstmt->var->ir.irLocal->value = gIR->ir->CreateBitCast(catch_var, getPtrToType(DtoType(catchstmt->var->type)));
         }
 
@@ -32,8 +32,8 @@ IRLandingPadInfo::IRLandingPadInfo(Catch* catchstmt, llvm::BasicBlock* end)
         DtoDeclarationExp(catchstmt->var);
 
         // the exception will only be stored in catch_var. copy it over if necessary
-        if(catchstmt->var->ir.irLocal->value != gIR->func()->landingPadInfo.getExceptionStorage()) {
-            LLValue* exc = gIR->ir->CreateBitCast(DtoLoad(gIR->func()->landingPadInfo.getExceptionStorage()), DtoType(catchstmt->var->type));
+        if(catchstmt->var->ir.irLocal->value != gIR->func()->gen->landingPadInfo.getExceptionStorage()) {
+            LLValue* exc = gIR->ir->CreateBitCast(DtoLoad(gIR->func()->gen->landingPadInfo.getExceptionStorage()), DtoType(catchstmt->var->type));
             DtoStore(exc, catchstmt->var->ir.irLocal->value);
         }
     }
@@ -172,9 +172,9 @@ void IRLandingPad::constructLandingPad(llvm::BasicBlock* inBB)
 
             // since this may be emitted multiple times
             // give the labels a new scope
-            gIR->func()->pushUniqueLabelScope("finally");
+            gIR->func()->gen->pushUniqueLabelScope("finally");
             rit->finallyBody->toIR(gIR);
-            gIR->func()->popLabelScope();
+            gIR->func()->gen->popLabelScope();
         }
         // otherwise it's a catch and we'll add a switch case
         else