# HG changeset patch # User Doug Simon # Date 1432631699 -7200 # Node ID 78f0792aa8901c9de8a5bc7ec5d23e1a15575d8b # Parent 7306a4dba8ce7df2a061d5a42518965aa3bd8a5c fixed expected exception type in some TestResolvedJavaType tests diff -r 7306a4dba8ce -r 78f0792aa890 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java --- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java Tue May 26 00:40:36 2015 +0200 +++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java Tue May 26 11:14:59 2015 +0200 @@ -36,6 +36,7 @@ import com.oracle.graal.api.meta.Assumptions.AssumptionResult; import com.oracle.graal.api.meta.*; +import com.oracle.jvmci.common.*; /** * Tests for {@link ResolvedJavaType}. @@ -416,13 +417,13 @@ assertEquals(aSai2, iSai2.getSingleImplementor()); } - @Test(expected = InternalError.class) + @Test(expected = JVMCIError.class) public void getSingleImplementorTestClassReceiver() { ResolvedJavaType base = metaAccess.lookupJavaType(Base.class); base.getSingleImplementor(); } - @Test(expected = InternalError.class) + @Test(expected = JVMCIError.class) public void getSingleImplementorTestPrimitiveReceiver() { ResolvedJavaType primitive = metaAccess.lookupJavaType(int.class); primitive.getSingleImplementor(); diff -r 7306a4dba8ce -r 78f0792aa890 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotResolvedJavaMethodImpl.java diff -r 7306a4dba8ce -r 78f0792aa890 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotVMConfig.java