changeset 22535:f5a43c861150

Use proper stamp for read in HotSpotResolvedObjectTypeTest
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Fri, 28 Aug 2015 15:31:33 -0700
parents dec0a93f86b6
children 259e2b52b72f
files graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java	Fri Aug 28 14:22:03 2015 -0700
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java	Fri Aug 28 15:31:33 2015 -0700
@@ -27,7 +27,7 @@
 
 import org.junit.*;
 
-import com.oracle.graal.hotspot.nodes.type.*;
+import com.oracle.graal.compiler.common.type.*;
 
 /**
  * Tests {@link HotSpotResolvedJavaMethod} functionality.
@@ -40,13 +40,12 @@
         Assert.assertEquals("HotSpotResolvedObjectTypeTest.java", HotSpotResolvedObjectTypeImpl.fromObjectClass(this.getClass()).getSourceFileName());
     }
 
-    @Ignore("triggers bug in CompilerToVM.getResolvedJavaType")
     @Test
     public void testKlassLayoutHelper() {
         JavaConstant klass = HotSpotResolvedObjectTypeImpl.fromObjectClass(this.getClass()).klass();
         MemoryAccessProvider memoryAccess = getProviders().getConstantReflection().getMemoryAccessProvider();
         HotSpotVMConfig config = runtime().getConfig();
-        Constant c = KlassPointerStamp.klassNonNull().readConstant(memoryAccess, klass, config.klassLayoutHelperOffset);
+        Constant c = StampFactory.forKind(Kind.Int).readConstant(memoryAccess, klass, config.klassLayoutHelperOffset);
         assertTrue(c.toString(), c.getClass() == PrimitiveConstant.class);
         PrimitiveConstant pc = (PrimitiveConstant) c;
         assertTrue(pc.toString(), pc.getKind() == Kind.Int);