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

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.87 -> 1.88
---
Log message:

emitStaticInitializes should be called after the ClassInfo object is
initialized because it can potentially reference it.


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

Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.87 llvm-java/lib/Compiler/Compiler.cpp:1.88
--- llvm-java/lib/Compiler/Compiler.cpp:1.87	Sun Aug 15 05:12:05 2004
+++ llvm-java/lib/Compiler/Compiler.cpp	Sun Aug 15 05:42:34 2004
@@ -242,7 +242,6 @@
 
       DEBUG(std::cerr << "Building ClassInfo for: " << className << '\n');
       ClassFile* cf = ClassFile::getClassFile(className);
-      emitStaticInitializers(cf);
       ClassInfo& ci = c2ciMap_[className];
       assert(!ci.type && ci.f2iMap.empty() &&
              "got already initialized ClassInfo!");
@@ -280,6 +279,7 @@
       module_->addTypeName(className, ci.type);
 
       assert(ci.type && "ClassInfo not initialized properly!");
+      emitStaticInitializers(cf);
       return ci;
     }