Mercurial > hg > graal-compiler
changeset 4566:74d27feb9038
bugfix
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Fri, 10 Feb 2012 16:56:01 -0800 |
parents | e0f4a398fb11 |
children | 716fa6564c55 |
files | graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotRuntime.java graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotTypePrimitive.java |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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