[vmkit-commits] [vmkit] r74998 - /vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Jul  8 05:08:06 2009
New Revision: 74998

URL: http://llvm.org/viewvc/llvm-project?rev=74998&view=rev
Log:
Fix naming of LLVM types.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Wed Jul  8 05:08:06 2009
@@ -219,23 +219,26 @@
     copyDefinitions(module, globalModule);
   }
   
-  module->addTypeName("JavaObject", JavaObjectType);
-  module->addTypeName("JavaArray", JavaArrayType);
-  module->addTypeName("JavaCommonClass", JavaCommonClassType);
-  module->addTypeName("JavaClass", JavaClassType);
-  module->addTypeName("JavaClassPrimitive", JavaClassPrimitiveType);
-  module->addTypeName("JavaClassArray", JavaClassArrayType);
-  module->addTypeName("ArrayUInt8", JavaArrayUInt8Type);
-  module->addTypeName("ArraySInt8", JavaArraySInt8Type);
-  module->addTypeName("ArrayUInt16", JavaArrayUInt16Type);
-  module->addTypeName("ArraySInt16", JavaArraySInt16Type);
-  module->addTypeName("ArraySInt32", JavaArraySInt32Type);
-  module->addTypeName("ArrayLong", JavaArrayLongType);
-  module->addTypeName("ArrayFloat", JavaArrayFloatType);
-  module->addTypeName("ArrayDouble", JavaArrayDoubleType);
-  module->addTypeName("ArrayObject", JavaArrayObjectType);
-  module->addTypeName("CacheNode", CacheNodeType); 
-  module->addTypeName("Enveloppe", EnveloppeType);
+  module->addTypeName("JavaObject", JavaObjectType->getContainedType(0));
+  module->addTypeName("JavaArray", JavaArrayType->getContainedType(0));
+  module->addTypeName("JavaCommonClass",
+                      JavaCommonClassType->getContainedType(0));
+  module->addTypeName("JavaClass", JavaClassType->getContainedType(0));
+  module->addTypeName("JavaClassPrimitive",
+                      JavaClassPrimitiveType->getContainedType(0));
+  module->addTypeName("JavaClassArray",
+                      JavaClassArrayType->getContainedType(0));
+  module->addTypeName("ArrayUInt8", JavaArrayUInt8Type->getContainedType(0));
+  module->addTypeName("ArraySInt8", JavaArraySInt8Type->getContainedType(0));
+  module->addTypeName("ArrayUInt16", JavaArrayUInt16Type->getContainedType(0));
+  module->addTypeName("ArraySInt16", JavaArraySInt16Type->getContainedType(0));
+  module->addTypeName("ArraySInt32", JavaArraySInt32Type->getContainedType(0));
+  module->addTypeName("ArrayLong", JavaArrayLongType->getContainedType(0));
+  module->addTypeName("ArrayFloat", JavaArrayFloatType->getContainedType(0));
+  module->addTypeName("ArrayDouble", JavaArrayDoubleType->getContainedType(0));
+  module->addTypeName("ArrayObject", JavaArrayObjectType->getContainedType(0));
+  module->addTypeName("CacheNode", CacheNodeType->getContainedType(0)); 
+  module->addTypeName("Enveloppe", EnveloppeType->getContainedType(0));
    
   InterfaceLookupFunction = module->getFunction("jnjvmInterfaceLookup");
   MultiCallNewFunction = module->getFunction("jnjvmMultiCallNew");