[llvm-commits] CVS: llvm/lib/Bytecode/Reader/Reader.cpp ReaderWrappers.cpp

[Chris Lattner]

Changes in directory llvm/lib/Bytecode/Reader:

Reader.cpp updated: 1.155 -> 1.156
ReaderWrappers.cpp updated: 1.43 -> 1.44
---
Log message:

This mega patch converts us from using Function::a{iterator|begin|end} to
using Function::arg_{iterator|begin|end}.  Likewise Module::g* -> Module::global_*.

This patch is contributed by Gabor Greif, thanks!



---
Diffs of the changes:  (+5 -5)

 Reader.cpp         |    2 +-
 ReaderWrappers.cpp |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


Index: llvm/lib/Bytecode/Reader/Reader.cpp
diff -u llvm/lib/Bytecode/Reader/Reader.cpp:1.155 llvm/lib/Bytecode/Reader/Reader.cpp:1.156
--- llvm/lib/Bytecode/Reader/Reader.cpp:1.155	Sat Mar  5 13:05:00 2005
+++ llvm/lib/Bytecode/Reader/Reader.cpp	Mon Mar 14 22:54:18 2005
@@ -536,7 +536,7 @@
 /// Insert the arguments of a function as new values in the reader.
 void BytecodeReader::insertArguments(Function* F) {
   const FunctionType *FT = F->getFunctionType();
-  Function::aiterator AI = F->abegin();
+  Function::arg_iterator AI = F->arg_begin();
   for (FunctionType::param_iterator It = FT->param_begin();
        It != FT->param_end(); ++It, ++AI)
     insertValue(AI, getTypeSlot(AI->getType()), FunctionValues);


Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.43 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.44
--- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.43	Sun Feb 13 12:12:20 2005
+++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp	Mon Mar 14 22:54:18 2005
@@ -171,7 +171,7 @@
   // If the user is making use of obsolete varargs intrinsics, adjust them for
   // the user.
   if (Function *F = M->getNamedFunction("llvm.va_start")) {
-    assert(F->asize() == 1 && "Obsolete va_start takes 1 argument!");
+    assert(F->arg_size() == 1 && "Obsolete va_start takes 1 argument!");
         
     const Type *RetTy = F->getFunctionType()->getParamType(0);
     RetTy = cast<PointerType>(RetTy)->getElementType();
@@ -187,7 +187,7 @@
   }
 
   if (Function *F = M->getNamedFunction("llvm.va_end")) {
-    assert(F->asize() == 1 && "Obsolete va_end takes 1 argument!");
+    assert(F->arg_size() == 1 && "Obsolete va_end takes 1 argument!");
     const Type *ArgTy = F->getFunctionType()->getParamType(0);
     ArgTy = cast<PointerType>(ArgTy)->getElementType();
     Function *NF = M->getOrInsertFunction("llvm.va_end", Type::VoidTy,
@@ -203,7 +203,7 @@
   }
       
   if (Function *F = M->getNamedFunction("llvm.va_copy")) {
-    assert(F->asize() == 2 && "Obsolete va_copy takes 2 argument!");
+    assert(F->arg_size() == 2 && "Obsolete va_copy takes 2 argument!");
     const Type *ArgTy = F->getFunctionType()->getParamType(0);
     ArgTy = cast<PointerType>(ArgTy)->getElementType();
     Function *NF = M->getOrInsertFunction("llvm.va_copy", ArgTy,
@@ -330,7 +330,7 @@
 
 static void getSymbols(Module*M, std::vector<std::string>& symbols) {
   // Loop over global variables
-  for (Module::giterator GI = M->gbegin(), GE=M->gend(); GI != GE; ++GI)
+  for (Module::global_iterator GI = M->global_begin(), GE=M->global_end(); GI != GE; ++GI)
     if (!GI->isExternal() && !GI->hasInternalLinkage())
       if (!GI->getName().empty())
         symbols.push_back(GI->getName());