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

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.109 -> 1.110
---
Log message:

Add static ObjectBaseTy field in ClassInfo.


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

Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.109 llvm-java/lib/Compiler/Compiler.cpp:1.110
--- llvm-java/lib/Compiler/Compiler.cpp:1.109	Tue Sep 21 17:49:11 2004
+++ llvm-java/lib/Compiler/Compiler.cpp	Wed Sep 22 17:48:02 2004
@@ -158,6 +158,7 @@
       Field2IndexMap f2iMap;
 
       static unsigned InterfaceCount;
+      static Type* ObjectBaseTy;
     };
     typedef std::map<ClassFile*, ClassInfo> Class2ClassInfoMap;
     Class2ClassInfoMap c2ciMap_;
@@ -286,10 +287,10 @@
 
       // because this is java/lang/Object, we add the opaque
       // llvm_java_object_base type first
-      Type* base = OpaqueType::get();
-      module_->addTypeName(LLVM_JAVA_OBJECT_BASE, base);
+      ClassInfo::ObjectBaseTy = OpaqueType::get();
+      module_->addTypeName(LLVM_JAVA_OBJECT_BASE, ClassInfo::ObjectBaseTy);
       ci.f2iMap.insert(std::make_pair(LLVM_JAVA_OBJECT_BASE, elements.size()));
-      elements.push_back(base);
+      elements.push_back(ClassInfo::ObjectBaseTy);
 
       const Fields& fields = cf->getFields();
       for (unsigned i = 0, e = fields.size(); i != e; ++i) {
@@ -1515,6 +1516,7 @@
   };
 
   unsigned CompilerImpl::ClassInfo::InterfaceCount = 0;
+  Type* CompilerImpl::ClassInfo::ObjectBaseTy;
   StructType* CompilerImpl::VTableInfo::VTableTy;
   StructType* CompilerImpl::VTableInfo::TypeInfoTy;