[llvm-commits] CVS: llvm-java/lib/Compiler/Compiler.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.232 -> 1.233
---
Log message:

Use new ConstantExpr::getPtrPtrFromArrayPtr() function.


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

 Compiler.cpp |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)


Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.232 llvm-java/lib/Compiler/Compiler.cpp:1.233
--- llvm-java/lib/Compiler/Compiler.cpp:1.232	Sat Mar 19 04:56:30 2005
+++ llvm-java/lib/Compiler/Compiler.cpp	Sat Mar 19 07:05:54 2005
@@ -600,9 +600,7 @@
 
        return std::make_pair(
          vi.superVtables.size(),
-         ConstantExpr::getGetElementPtr(
-           vtablesArray,
-           std::vector<llvm::Constant*>(2, ConstantUInt::get(Type::UIntTy, 0))));
+         ConstantExpr::getPtrPtrFromArrayPtr(vtablesArray));
      }
 
      /// Builds an interface VTable for the specified <class,interface>
@@ -731,9 +729,7 @@
 
       return std::make_pair(
         int(vtables.size())-1,
-        ConstantExpr::getGetElementPtr(
-          interfacesArray,
-          std::vector<llvm::Constant*>(2, ConstantUInt::get(Type::UIntTy, 0))));
+        ConstantExpr::getPtrPtrFromArrayPtr(interfacesArray));
     }
 
     /// Given the classfile and its corresponding VTableInfo,
@@ -952,10 +948,7 @@
         elementTy->getDescription() + "[]<superclassesvtables>",
         &module_);
 
-      typeInfoInit.push_back(
-        ConstantExpr::getGetElementPtr(
-          vtablesArray,
-          std::vector<llvm::Constant*>(2, ConstantUInt::get(Type::UIntTy, 0))));
+      typeInfoInit.push_back(ConstantExpr::getPtrPtrFromArrayPtr(vtablesArray));
       typeInfoInit.push_back(ConstantSInt::get(Type::IntTy, 0));
       typeInfoInit.push_back(
         llvm::Constant::getNullValue(
@@ -1058,9 +1051,7 @@
         ConstantArray::get(vtablesArrayTy, vi.superVtables),
         "java/lang/Object[]<superclassesvtables>",
         &module_);
-      init.push_back(ConstantExpr::getGetElementPtr(
-                       vtablesArray,
-                       std::vector<llvm::Constant*>(2, ConstantUInt::get(Type::UIntTy, 0))));
+      init.push_back(ConstantExpr::getPtrPtrFromArrayPtr(vtablesArray));
 
       // last interface index
       init.push_back(llvm::ConstantSInt::get(Type::IntTy, -1));
@@ -1179,9 +1170,7 @@
         className + "[]<superclassesvtables>",
         &module_);
 
-      typeInfoInit.push_back(ConstantExpr::getGetElementPtr(
-                               vtablesArray,
-                               std::vector<llvm::Constant*>(2, ConstantUInt::get(Type::UIntTy, 0))));
+      typeInfoInit.push_back(ConstantExpr::getPtrPtrFromArrayPtr(vtablesArray));
       // last interface index
       typeInfoInit.push_back(llvm::ConstantSInt::get(Type::IntTy, -1));
       // interfaces vtable pointers