[llvm-commits] [vector_llvm] CVS: llvm/lib/Transforms/IPO/GlobalOpt.cpp LowerSetJmp.cpp Makefile SimplifyLibCalls.cpp

[Robert Bocchino]

Changes in directory llvm/lib/Transforms/IPO:

GlobalOpt.cpp updated: 1.58.2.1 -> 1.58.2.2
LowerSetJmp.cpp updated: 1.27 -> 1.27.2.1
Makefile updated: 1.4 -> 1.4.6.1
SimplifyLibCalls.cpp updated: 1.54 -> 1.54.2.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+16 -11)

 GlobalOpt.cpp        |    6 ++++--
 LowerSetJmp.cpp      |   15 ++++++++-------
 Makefile             |    1 +
 SimplifyLibCalls.cpp |    5 +++--
 4 files changed, 16 insertions(+), 11 deletions(-)


Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.58.2.1 llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.58.2.2
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.58.2.1	Tue Oct 18 14:21:57 2005
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp	Wed Nov 16 12:32:48 2005
@@ -678,7 +678,7 @@
                                  (unsigned)NElements->getRawValue());
     MallocInst *NewMI =
       new MallocInst(NewTy, Constant::getNullValue(Type::UIntTy),
-                     MI->getName(), MI);
+                     MI->getAlignment(), MI->getName(), MI);
     std::vector<Value*> Indices;
     Indices.push_back(Constant::getNullValue(Type::IntTy));
     Indices.push_back(Indices[0]);
@@ -950,6 +950,7 @@
       DEBUG(std::cerr << "LOCALIZING GLOBAL: " << *GV);
       Instruction* FirstI = GS.AccessingFunction->getEntryBlock().begin();
       const Type* ElemTy = GV->getType()->getElementType();
+      // FIXME: Pass Global's alignment when globals have alignment
       AllocaInst* Alloca = new AllocaInst(ElemTy, NULL, GV->getName(), FirstI);
       if (!isa<UndefValue>(GV->getInitializer()))
         new StoreInst(GV->getInitializer(), Alloca, FirstI);
@@ -1113,7 +1114,8 @@
 /// FindGlobalCtors - Find the llvm.globalctors list, verifying that all
 /// initializers have an init priority of 65535.
 GlobalVariable *GlobalOpt::FindGlobalCtors(Module &M) {
-  for (Module::giterator I = M.global_begin(), E = M.global_end(); I != E; ++I)
+  for (Module::global_iterator I = M.global_begin(), E = M.global_end();
+       I != E; ++I)
     if (I->getName() == "llvm.global_ctors") {
       // Found it, verify it's an array of { int, void()* }.
       const ArrayType *ATy =dyn_cast<ArrayType>(I->getType()->getElementType());


Index: llvm/lib/Transforms/IPO/LowerSetJmp.cpp
diff -u llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.27 llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.27.2.1
--- llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.27	Wed Jun 15 17:49:30 2005
+++ llvm/lib/Transforms/IPO/LowerSetJmp.cpp	Wed Nov 16 12:32:48 2005
@@ -204,32 +204,33 @@
 
   // void __llvm_sjljeh_init_setjmpmap(void**)
   InitSJMap = M.getOrInsertFunction("__llvm_sjljeh_init_setjmpmap",
-                                    Type::VoidTy, SBPPTy, NULL);
+                                    Type::VoidTy, SBPPTy, (Type *)0);
   // void __llvm_sjljeh_destroy_setjmpmap(void**)
   DestroySJMap = M.getOrInsertFunction("__llvm_sjljeh_destroy_setjmpmap",
-                                       Type::VoidTy, SBPPTy, NULL);
+                                       Type::VoidTy, SBPPTy, (Type *)0);
 
   // void __llvm_sjljeh_add_setjmp_to_map(void**, void*, unsigned)
   AddSJToMap = M.getOrInsertFunction("__llvm_sjljeh_add_setjmp_to_map",
                                      Type::VoidTy, SBPPTy, SBPTy,
-                                     Type::UIntTy, NULL);
+                                     Type::UIntTy, (Type *)0);
 
   // void __llvm_sjljeh_throw_longjmp(int*, int)
   ThrowLongJmp = M.getOrInsertFunction("__llvm_sjljeh_throw_longjmp",
-                                       Type::VoidTy, SBPTy, Type::IntTy, NULL);
+                                       Type::VoidTy, SBPTy, Type::IntTy,
+                                       (Type *)0);
 
   // unsigned __llvm_sjljeh_try_catching_longjmp_exception(void **)
   TryCatchLJ =
     M.getOrInsertFunction("__llvm_sjljeh_try_catching_longjmp_exception",
-                          Type::UIntTy, SBPPTy, NULL);
+                          Type::UIntTy, SBPPTy, (Type *)0);
 
   // bool __llvm_sjljeh_is_longjmp_exception()
   IsLJException = M.getOrInsertFunction("__llvm_sjljeh_is_longjmp_exception",
-                                        Type::BoolTy, NULL);
+                                        Type::BoolTy, (Type *)0);
 
   // int __llvm_sjljeh_get_longjmp_value()
   GetLJValue = M.getOrInsertFunction("__llvm_sjljeh_get_longjmp_value",
-                                     Type::IntTy, NULL);
+                                     Type::IntTy, (Type *)0);
   return true;
 }
 


Index: llvm/lib/Transforms/IPO/Makefile
diff -u llvm/lib/Transforms/IPO/Makefile:1.4 llvm/lib/Transforms/IPO/Makefile:1.4.6.1
--- llvm/lib/Transforms/IPO/Makefile:1.4	Wed Oct 27 18:18:45 2004
+++ llvm/lib/Transforms/IPO/Makefile	Wed Nov 16 12:32:48 2005
@@ -6,6 +6,7 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
+
 LEVEL = ../../..
 LIBRARYNAME = LLVMipo
 BUILD_ARCHIVE = 1


Index: llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp
diff -u llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.54 llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.54.2.1
--- llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp:1.54	Thu Sep 29 01:17:27 2005
+++ llvm/lib/Transforms/IPO/SimplifyLibCalls.cpp	Wed Nov 16 12:32:48 2005
@@ -311,7 +311,8 @@
     if (!memcpy_func) {
       const Type *SBP = PointerType::get(Type::SByteTy);
       memcpy_func = M->getOrInsertFunction("llvm.memcpy", Type::VoidTy,SBP, SBP,
-                                           Type::UIntTy, Type::UIntTy, 0);
+                                           Type::UIntTy, Type::UIntTy,
+                                           (Type *)0);
     }
     return memcpy_func;
   }
@@ -319,7 +320,7 @@
   Function* get_floorf() {
     if (!floorf_func)
       floorf_func = M->getOrInsertFunction("floorf", Type::FloatTy,
-                                           Type::FloatTy, 0);
+                                           Type::FloatTy, (Type *)0);
     return floorf_func;
   }