# HG changeset patch # User Christian Haeubl # Date 1328921761 28800 # Node ID 74d27feb90385d84a38a02788814030b18b4d4d9 # Parent e0f4a398fb11dba9d9808aba3c13417676493baf bugfix diff -r e0f4a398fb11 -r 74d27feb9038 graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotRuntime.java --- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotRuntime.java Fri Feb 10 14:37:38 2012 -0800 +++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotRuntime.java Fri Feb 10 16:56:01 2012 -0800 @@ -361,7 +361,7 @@ LocalNode receiver = graph.unique(new LocalNode(CiKind.Object, 0)); SafeReadNode klassOop = safeRead(graph, CiKind.Object, receiver, config.klassOopOffset); graph.start().setNext(klassOop); - // TODO(tw): Care about primitive classes! + // TODO(tw): Care about primitive classes! Crashes for primitive classes at the moment (klassOop == null) ReadNode result = graph.add(new ReadNode(CiKind.Int, klassOop, LocationNode.create(LocationNode.FINAL_LOCATION, CiKind.Int, config.klassModifierFlagsOffset, graph))); ReturnNode ret = graph.add(new ReturnNode(result)); klassOop.setNext(ret); diff -r e0f4a398fb11 -r 74d27feb9038 graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotTypePrimitive.java --- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotTypePrimitive.java Fri Feb 10 14:37:38 2012 -0800 +++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotTypePrimitive.java Fri Feb 10 16:56:01 2012 -0800 @@ -23,6 +23,7 @@ package com.oracle.max.graal.hotspot.ri; import java.lang.annotation.*; +import java.lang.reflect.*; import com.oracle.max.cri.ci.*; import com.oracle.max.cri.ri.*; @@ -49,7 +50,8 @@ @Override public int accessFlags() { - return kind.toJavaClass().getModifiers(); + assert kind != null && kind.toJavaClass() != null; + return Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC; } @Override