[vmkit-commits] [vmkit] r72005 - /vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon May 18 10:39:06 2009
New Revision: 72005

URL: http://llvm.org/viewvc/llvm-project?rev=72005&view=rev
Log:
Fix naming in AOT generated objects, suitable for ld.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=72005&r1=72004&r2=72005&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Mon May 18 10:39:06 2009
@@ -97,7 +97,7 @@
       GlobalVariable* varGV = 
         new GlobalVariable(Ty, false, GlobalValue::InternalLinkage,
                            Constant::getNullValue(Ty),
-                           UTF8Buffer(classDef->name).cString(),
+                           UTF8Buffer(classDef->name).toClassName()->cString(),
                            getLLVMModule());
     
       arrayClasses.insert(std::make_pair(classDef->asArrayClass(), varGV));
@@ -279,7 +279,7 @@
     LLVMClassInfo* LCI = getClassInfo(classDef);
     const Type* Ty = LCI->getStaticType();
     Ty = Ty->getContainedType(0);
-    std::string name(UTF8Buffer(classDef->name).cString());
+    std::string name(UTF8Buffer(classDef->name).toClassName()->cString());
     name += "_static";
     GlobalVariable* varGV = 
       new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage,
@@ -319,7 +319,7 @@
       dyn_cast<ArrayType>(JnjvmModule::VTType->getContainedType(0));
     const PointerType* PTy = dyn_cast<PointerType>(ATy->getContainedType(0));
     ATy = ArrayType::get(PTy, size);
-    std::string name(UTF8Buffer(classDef->name).cString());
+    std::string name(UTF8Buffer(classDef->name).toClassName()->cString());
     name += "_VT";
     // Do not set a virtual table as a constant, because the runtime may
     // modify it.