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

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.133 -> 1.134
---
Log message:

When copying method pointers to the vtable from the super class'
vtable skip the typeinfo pointer.


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

Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.133 llvm-java/lib/Compiler/Compiler.cpp:1.134
--- llvm-java/lib/Compiler/Compiler.cpp:1.133	Thu Oct 28 15:45:55 2004
+++ llvm-java/lib/Compiler/Compiler.cpp	Tue Nov  2 14:00:11 2004
@@ -643,8 +643,8 @@
       // Use a null typeinfo struct for now.
       init[0] = llvm::Constant::getNullValue(VTableInfo::TypeInfoTy);
       // Fill in the function pointers as they are in the super
-      // class. overriden methods will be replaced later.
-      for (unsigned i = 0, e = superInit->getNumOperands(); i != e; ++i)
+      // class. Overriden methods will be replaced later.
+      for (unsigned i = 1, e = superInit->getNumOperands(); i != e; ++i)
 	init[i] = superInit->getOperand(i);
       vi.m2iMap = superVI.m2iMap;
 
@@ -720,8 +720,8 @@
       // Use a null typeinfo struct for now.
       init[0] = llvm::Constant::getNullValue(VTableInfo::TypeInfoTy);
       // Fill in the function pointers as they are in the super
-      // class. overriden methods will be replaced later.
-      for (unsigned i = 0, e = superInit->getNumOperands(); i != e; ++i)
+      // class. Overriden methods will be replaced later.
+      for (unsigned i = 1, e = superInit->getNumOperands(); i != e; ++i)
 	init[i] = superInit->getOperand(i);
       vi.m2iMap = superVI.m2iMap;