From 8b1903c0b36e9469a087f5ba179f7bcf906b14a7 Mon Sep 17 00:00:00 2001
From: Christian Kamm <kamm@incasoftware.de>
Date: Sun, 10 Aug 2008 21:09:23 +0200
Subject: [PATCH] Make llvmdc work with llvm 2.4svn revision 54614. Breaks
 compatibility with llvm 2.3.

---
 gen/irstate.cpp | 4 ++--
 gen/irstate.h   | 4 ++--
 gen/toobj.cpp   | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gen/irstate.cpp b/gen/irstate.cpp
index ace554fb..c50a6fd3 100644
--- a/gen/irstate.cpp
+++ b/gen/irstate.cpp
@@ -162,9 +162,9 @@ CallOrInvoke* IRState::CreateCallOrInvoke4(LLValue* Callee, LLValue* Arg1, LLVal
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-IRBuilder* IRBuilderHelper::operator->()
+IRBuilder<>* IRBuilderHelper::operator->()
 {
-    IRBuilder& b = state->scope().builder;
+    IRBuilder<>& b = state->scope().builder;
     assert(b.GetInsertBlock() != NULL);
     return &b;
 }
diff --git a/gen/irstate.h b/gen/irstate.h
index a3a76381..8aca094f 100644
--- a/gen/irstate.h
+++ b/gen/irstate.h
@@ -32,7 +32,7 @@ struct IRScope
 {
     llvm::BasicBlock* begin;
     llvm::BasicBlock* end;
-    IRBuilder builder;
+    IRBuilder<> builder;
 
     IRScope();
     IRScope(llvm::BasicBlock* b, llvm::BasicBlock* e);
@@ -56,7 +56,7 @@ struct IRLoopScope : IRScope
 struct IRBuilderHelper
 {
     IRState* state;
-    IRBuilder* operator->();
+    IRBuilder<>* operator->();
 };
 
 struct IRAsmStmt
diff --git a/gen/toobj.cpp b/gen/toobj.cpp
index db0af373..67e42f86 100644
--- a/gen/toobj.cpp
+++ b/gen/toobj.cpp
@@ -229,7 +229,7 @@ static llvm::Function* build_module_ctor()
     fn->setCallingConv(llvm::CallingConv::Fast);
 
     llvm::BasicBlock* bb = llvm::BasicBlock::Create("entry", fn);
-    IRBuilder builder(bb);
+    IRBuilder<> builder(bb);
 
     for (size_t i=0; i<n; i++) {
         llvm::Function* f = gIR->ctors[i]->ir.irFunc->func;
@@ -263,7 +263,7 @@ static llvm::Function* build_module_dtor()
     fn->setCallingConv(llvm::CallingConv::Fast);
 
     llvm::BasicBlock* bb = llvm::BasicBlock::Create("entry", fn);
-    IRBuilder builder(bb);
+    IRBuilder<> builder(bb);
 
     for (size_t i=0; i<n; i++) {
         llvm::Function* f = gIR->dtors[i]->ir.irFunc->func;
@@ -297,7 +297,7 @@ static llvm::Function* build_module_unittest()
     fn->setCallingConv(llvm::CallingConv::Fast);
 
     llvm::BasicBlock* bb = llvm::BasicBlock::Create("entry", fn);
-    IRBuilder builder(bb);
+    IRBuilder<> builder(bb);
 
     for (size_t i=0; i<n; i++) {
         llvm::Function* f = gIR->unitTests[i]->ir.irFunc->func;
@@ -343,7 +343,7 @@ static LLFunction* build_module_reference_and_ctor(LLConstant* moduleinfo)
 
     // make the function insert this moduleinfo as the beginning of the _Dmodule_ref linked list
     llvm::BasicBlock* bb = llvm::BasicBlock::Create("moduleinfoCtorEntry", ctor);
-    IRBuilder builder(bb);
+    IRBuilder<> builder(bb);
 
     // get current beginning
     LLValue* curbeg = builder.CreateLoad(mref, "current");