[GR-9404] Enable the Stamp.readConstant tests.

PullRequest: graal/1346
Utowoo · Apr 17, 2018 · ca071b9 · ca071b9
2 parents 6e1067e + 6e479e4
commit ca071b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/....graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java b/....graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java
@@ -24,7 +24,6 @@
 
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import jdk.vm.ci.meta.JavaConstant;
@@ -36,21 +35,23 @@
  */
 public class StampMemoryAccessTest extends GraalCompilerTest {
 
-    @Ignore("not all JVMCI versions are safe yet")
     @Test
     public void testReadPrimitive() {
         MemoryAccessProvider memory = getConstantReflection().getMemoryAccessProvider();
-        JavaConstant base = getSnippetReflection().forObject("");
         Stamp stamp = StampFactory.forKind(JavaKind.Long);
-        assertTrue(stamp.readConstant(memory, base, 128) == null);
+        JavaConstant objectBase = getSnippetReflection().forObject("");
+        assertTrue(stamp.readConstant(memory, objectBase, 128) == null);
+        JavaConstant arrayBase = getSnippetReflection().forObject(new int[]{});
+        assertTrue(stamp.readConstant(memory, arrayBase, 128) == null);
     }
 
-    @Ignore("not all JVMCI versions are safe yet")
     @Test
     public void testReadObject() {
         MemoryAccessProvider memory = getConstantReflection().getMemoryAccessProvider();
-        JavaConstant base = getSnippetReflection().forObject("");
         Stamp stamp = StampFactory.forKind(JavaKind.Object);
-        assertTrue(stamp.readConstant(memory, base, 128) == null);
+        JavaConstant objectBase = getSnippetReflection().forObject("");
+        assertTrue(stamp.readConstant(memory, objectBase, 128) == null);
+        JavaConstant arrayBase = getSnippetReflection().forObject(new int[]{});
+        assertTrue(stamp.readConstant(memory, arrayBase, 128) == null);
     }
 }
diff --git a/...iler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java b/...iler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java
@@ -28,7 +28,6 @@
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp;
 import org.junit.Assume;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import jdk.vm.ci.meta.JavaConstant;
@@ -37,7 +36,6 @@
 
 public class HotSpotStampMemoryAccessTest extends HotSpotGraalCompilerTest {
 
-    @Ignore("not all versions are safe yet")
     @Test
     public void testReadNarrowObject() {
         CompressEncoding oopEncoding = runtime().getVMConfig().getOopEncoding();