Mercurial > hg > truffle

changeset 6325:2691e320d37c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle void type when resolving a signature type.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 06 Sep 2012 19:21:37 +0200
parents 2529d4ebb5e2
children adf529654318 13d534a47ba3
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypeUnresolved.java src/share/vm/graal/graalCompilerToVM.cpp
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypeUnresolved.java	Thu Sep 06 19:20:28 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypeUnresolved.java	Thu Sep 06 19:21:37 2012 +0200
@@ -115,7 +115,8 @@
 
     @Override
     public ResolvedJavaType resolve(ResolvedJavaType accessingClass) {
-        return (ResolvedJavaType) HotSpotGraalRuntime.getInstance().lookupType(name, (HotSpotResolvedJavaType) accessingClass, true);
+        JavaType type = HotSpotGraalRuntime.getInstance().lookupType(name, (HotSpotResolvedJavaType) accessingClass, true);
+        return (ResolvedJavaType) type;
     }
 
     @Override
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Thu Sep 06 19:20:28 2012 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Thu Sep 06 19:21:37 2012 +0200
@@ -291,6 +291,8 @@
     result = VMToCompiler::createPrimitiveJavaType((int) T_DOUBLE, THREAD);
   } else if (nameSymbol == vmSymbols::float_signature()) {
     result = VMToCompiler::createPrimitiveJavaType((int) T_FLOAT, THREAD);
+  } else if (nameSymbol == vmSymbols::void_signature()) {
+    result = VMToCompiler::createPrimitiveJavaType((int) T_VOID, THREAD);
   } else {
     klassOop resolved_type = NULL;
     // if the name isn't in the symbol table then the class isn't loaded anyway...