[vmkit-commits] [vmkit] r61691 - /vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Jan  5 06:23:25 2009
New Revision: 61691

URL: http://llvm.org/viewvc/llvm-project?rev=61691&view=rev
Log:
Give an initializer to external arrays, and don't add UTF8s in the static
initializer. Precompiled classes will add them.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=61691&r1=61690&r2=61691&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Mon Jan  5 06:23:25 2009
@@ -153,8 +153,8 @@
         const llvm::Type* Ty = JavaClassArrayType; 
       
         GlobalVariable* varGV = 
-          new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage, 0,
-                             "", this);
+          new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage,
+                             Constant::getNullValue(Ty), "", this);
       
         arrayClasses.insert(std::make_pair((ClassArray*)classDef, varGV));
         return varGV;
@@ -2246,9 +2246,6 @@
   Function* LoadClass = Function::Create(FTy, GlobalValue::ExternalLinkage,
                                          "vmjcLoadClass", this);
 
-  Function* AddUTF8 = Function::Create(FTy, GlobalValue::ExternalLinkage,
-                                       "vmjcAddUTF8", this);
-  
   llvmArgs.clear();
   llvmArgs.push_back(ptrType); // class loader
   llvmArgs.push_back(strings.begin()->second->getType()); // val
@@ -2262,12 +2259,6 @@
 
   Value* Args[3];
   
-  for (utf8_iterator i = utf8s.begin(), e = utf8s.end(); i != e; ++i) {
-    Args[0] = loader;
-    Args[1] = i->second;
-    CallInst::Create(AddUTF8, Args, Args + 2, "", currentBlock);
-  }
-  
   for (string_iterator i = strings.begin(), e = strings.end(); i != e; ++i) {
     Args[0] = loader;
     Args[1] = i->second;