update to follow mainline llvm API change.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49607 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index b5c755a582f6f29c9775c8768d9abd5af528962f..f91c39253ca0a0a52e685aa27d994eb88a25225a 100644 (file)
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -29,7 +29,7 @@ using namespace CodeGen;
 namespace  {
 class VISIBILITY_HIDDEN AggExprEmitter : public StmtVisitor<AggExprEmitter> {
   CodeGenFunction &CGF;
-  llvm::LLVMFoldingBuilder &Builder;
+  llvm::IRBuilder &Builder;
   llvm::Value *DestPtr;
   bool VolatileDest;
 public:

diff --git a/lib/CodeGen/CGExprComplex.cpp b/lib/CodeGen/CGExprComplex.cpp
index a486d6ae15dc4ac6c47753129febb36abe6819d0..45c0a40c90bea2f9d1232c3f00287d485361b26e 100644 (file)
--- a/lib/CodeGen/CGExprComplex.cpp
+++ b/lib/CodeGen/CGExprComplex.cpp
@@ -31,7 +31,7 @@ namespace  {
 class VISIBILITY_HIDDEN ComplexExprEmitter
   : public StmtVisitor<ComplexExprEmitter, ComplexPairTy> {
   CodeGenFunction &CGF;
-  llvm::LLVMFoldingBuilder &Builder;
+  llvm::IRBuilder &Builder;
 public:
   ComplexExprEmitter(CodeGenFunction &cgf) : CGF(cgf), Builder(CGF.Builder) {
   }

diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 2f03f88ebf2e92e069b98634609523c8704288d5..a6bd604bbc2393052aa7e29bdf00c2d2d56f7907 100644 (file)
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -40,7 +40,7 @@ namespace {
 class VISIBILITY_HIDDEN ScalarExprEmitter
   : public StmtVisitor<ScalarExprEmitter, Value*> {
   CodeGenFunction &CGF;
-  llvm::LLVMFoldingBuilder &Builder;
+  llvm::IRBuilder &Builder;
   CGObjCRuntime *Runtime;
 
 

diff --git a/lib/CodeGen/CGObjCEtoile.cpp b/lib/CodeGen/CGObjCEtoile.cpp
index efd5fac3293c2cdf5d2faaf140a62d805e9ee564..4ff48f12b6be4b21d1ec8533d05b58c769c80fc3 100644 (file)
--- a/lib/CodeGen/CGObjCEtoile.cpp
+++ b/lib/CodeGen/CGObjCEtoile.cpp
@@ -14,7 +14,7 @@
 #include "CGObjCRuntime.h"
 #include "llvm/Module.h"
 #include "llvm/Support/Compiler.h"
-#include "llvm/Support/LLVMBuilder.h"
+#include "llvm/Support/IRBuilder.h"
 #include "llvm/ADT/SmallVector.h"
 
 namespace {
@@ -36,14 +36,14 @@ public:
   CGObjCEtoile(llvm::Module &Mp,
     const llvm::Type *LLVMIntType,
     const llvm::Type *LLVMLongType);
-  virtual llvm::Value *generateMessageSend(llvm::LLVMFoldingBuilder &Builder,
+  virtual llvm::Value *generateMessageSend(llvm::IRBuilder &Builder,
                                            const llvm::Type *ReturnTy,
                                            llvm::Value *Sender,
                                            llvm::Value *Receiver,
                                            llvm::Value *Selector,
                                            llvm::Value** ArgV,
                                            unsigned ArgC);
-  llvm::Value *getSelector(llvm::LLVMFoldingBuilder &Builder,
+  llvm::Value *getSelector(llvm::IRBuilder &Builder,
       llvm::Value *SelName,
       llvm::Value *SelTypes);
   virtual llvm::Function *MethodPreamble(const llvm::Type *ReturnTy,
@@ -117,7 +117,7 @@ CGObjCEtoile::CGObjCEtoile(llvm::Module &M,
 }
 
 /// Looks up the selector for the specified name / type pair.
-llvm::Value *CGObjCEtoile::getSelector(llvm::LLVMFoldingBuilder &Builder,
+llvm::Value *CGObjCEtoile::getSelector(llvm::IRBuilder &Builder,
     llvm::Value *SelName,
     llvm::Value *SelTypes)
 {
@@ -137,23 +137,20 @@ llvm::Value *CGObjCEtoile::getSelector(llvm::LLVMFoldingBuilder &Builder,
   return Builder.CreateCall(SelFunction, Args.begin(), Args.end());
 }
 
-static void SetField(llvm::LLVMFoldingBuilder &Builder,
-                     llvm::Value *Structure, 
-                     unsigned Index, 
-                     llvm::Value *Value) {
+static void SetField(llvm::IRBuilder &Builder, llvm::Value *Structure, 
+                     unsigned Index,  llvm::Value *Value) {
     llvm::Value *element_ptr = Builder.CreateStructGEP(Structure, Index);
     Builder.CreateStore(Value, element_ptr);
 }
 // Generate code for a message send expression on the Etoile runtime.
 // BIG FAT WARNING: Much of this code will need factoring out later.
-llvm::Value *CGObjCEtoile::generateMessageSend(
-                                            llvm::LLVMFoldingBuilder &Builder,
-                                            const llvm::Type *ReturnTy,
-                                            llvm::Value *Sender,
-                                            llvm::Value *Receiver,
-                                            llvm::Value *Selector,
-                                            llvm::Value** ArgV,
-                                            unsigned ArgC) {
+llvm::Value *CGObjCEtoile::generateMessageSend(llvm::IRBuilder &Builder,
+                                               const llvm::Type *ReturnTy,
+                                               llvm::Value *Sender,
+                                               llvm::Value *Receiver,
+                                               llvm::Value *Selector,
+                                               llvm::Value** ArgV,
+                                               unsigned ArgC) {
   // FIXME: Selectors should be statically cached, not looked up on every call.
   llvm::Value *cmd = getSelector(Builder, Selector, 0);
   // TODO: [Polymorphic] inline caching

diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp
index 7fc3eca6cebf6ccdc5679b91087a8343054b6c50..5bb8fac73b29dc448ebc372e7aaace05aefde380 100644 (file)
--- a/lib/CodeGen/CGObjCGNU.cpp
+++ b/lib/CodeGen/CGObjCGNU.cpp
@@ -14,7 +14,7 @@
 #include "CGObjCRuntime.h"
 #include "llvm/Module.h"
 #include "llvm/Support/Compiler.h"
-#include "llvm/Support/LLVMBuilder.h"
+#include "llvm/Support/IRBuilder.h"
 #include "llvm/ADT/SmallVector.h"
 
 namespace {
@@ -33,14 +33,14 @@ public:
   CGObjCGNU(llvm::Module &Mp,
     const llvm::Type *LLVMIntType,
     const llvm::Type *LLVMLongType);
-  virtual llvm::Value *generateMessageSend(llvm::LLVMFoldingBuilder &Builder,
+  virtual llvm::Value *generateMessageSend(llvm::IRBuilder &Builder,
                                            const llvm::Type *ReturnTy,
                                            llvm::Value *Sender,
                                            llvm::Value *Receiver,
                                            llvm::Value *Selector,
                                            llvm::Value** ArgV,
                                            unsigned ArgC);
-  llvm::Value *getSelector(llvm::LLVMFoldingBuilder &Builder,
+  llvm::Value *getSelector(llvm::IRBuilder &Builder,
       llvm::Value *SelName,
       llvm::Value *SelTypes);
   virtual llvm::Function *MethodPreamble(const llvm::Type *ReturnTy,
@@ -88,7 +88,7 @@ CGObjCGNU::CGObjCGNU(llvm::Module &M,
 
 /// Looks up the selector for the specified name / type pair.
 // FIXME: Selectors should be statically cached, not looked up on every call.
-llvm::Value *CGObjCGNU::getSelector(llvm::LLVMFoldingBuilder &Builder,
+llvm::Value *CGObjCGNU::getSelector(llvm::IRBuilder &Builder,
     llvm::Value *SelName,
     llvm::Value *SelTypes)
 {
@@ -119,7 +119,7 @@ llvm::Value *CGObjCGNU::getSelector(llvm::LLVMFoldingBuilder &Builder,
 // FIXME: Much of this code will need factoring out later.
 // TODO: This should take a sender argument (pointer to self in the calling
 // context)
-llvm::Value *CGObjCGNU::generateMessageSend(llvm::LLVMFoldingBuilder &Builder,
+llvm::Value *CGObjCGNU::generateMessageSend(llvm::IRBuilder &Builder,
                                             const llvm::Type *ReturnTy,
                                             llvm::Value *Sender,
                                             llvm::Value *Receiver,

diff --git a/lib/CodeGen/CGObjCRuntime.h b/lib/CodeGen/CGObjCRuntime.h
index 749984d9f17d0d8dac0e60b59bf3518d503e8b29..9ee067bb2101fd5a8c703dc82f20d9e7a42ec9c2 100644 (file)
--- a/lib/CodeGen/CGObjCRuntime.h
+++ b/lib/CodeGen/CGObjCRuntime.h
@@ -17,7 +17,7 @@
 #define CLANG_CODEGEN_OBCJRUNTIME_H
 
 namespace llvm {
-  class LLVMFoldingBuilder;
+  class IRBuilder;
   class Constant;
   class Type;
   class Value;
@@ -35,7 +35,7 @@ public:
   virtual ~CGObjCRuntime();
   
   /// Generate an Objective-C message send operation
-  virtual llvm::Value *generateMessageSend(llvm::LLVMFoldingBuilder &Builder,
+  virtual llvm::Value *generateMessageSend(llvm::IRBuilder &Builder,
                                            const llvm::Type *ReturnTy,
                                            llvm::Value *Sender,
                                            llvm::Value *Receiver,

diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 61a0d744f6020f1bbb8fd7601acfb4b62bb3c1f6..df2c8b2331c4075c28c9cb4d4170021fbd10620c 100644 (file)
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -17,7 +17,7 @@
 #include "clang/AST/Type.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/LLVMBuilder.h"
+#include "llvm/Support/IRBuilder.h"
 #include <vector>
 
 namespace llvm {
@@ -244,7 +244,7 @@ public:
   TargetInfo &Target;
   
   typedef std::pair<llvm::Value *, llvm::Value *> ComplexPairTy;
-  llvm::LLVMFoldingBuilder Builder;
+  llvm::IRBuilder Builder;
   
   // Holds the Decl for the current function or method
   const Decl *CurFuncDecl;