# HG changeset patch # User twisti # Date 1449104397 36000 # Node ID 307de49e6b2a179d74b11f23c2075a553f45cf6b # Parent f3f38d88223edf7b0fa7f1a2390065be9485fae8 8144529: [JVMCI] compiler/jvmci/errors/TestInvalidCompilationResult.java fails to compile after JDK-8143730 Reviewed-by: kvn diff -r f3f38d88223e -r 307de49e6b2a hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java --- a/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java Wed Dec 02 11:40:18 2015 -1000 +++ b/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java Wed Dec 02 14:59:57 2015 -1000 @@ -68,6 +68,7 @@ } protected void installCode(CompilationResult result) { + result.close(); codeCache.addCode(dummyMethod, result, null, null); } diff -r f3f38d88223e -r 307de49e6b2a hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java --- a/hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java Wed Dec 02 11:40:18 2015 -1000 +++ b/hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java Wed Dec 02 14:59:57 2015 -1000 @@ -219,13 +219,6 @@ } @Test(expected = JVMCIError.class) - public void testUnknownInfopointReason() { - CompilationResult result = createEmptyCompilationResult(); - result.addInfopoint(new Infopoint(0, null, InfopointReason.UNKNOWN)); - installCode(result); - } - - @Test(expected = JVMCIError.class) public void testInfopointMissingDebugInfo() { CompilationResult result = createEmptyCompilationResult(); result.addInfopoint(new Infopoint(0, null, InfopointReason.METHOD_START)); diff -r f3f38d88223e -r 307de49e6b2a hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java --- a/hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java Wed Dec 02 11:40:18 2015 -1000 +++ b/hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java Wed Dec 02 14:59:57 2015 -1000 @@ -106,13 +106,12 @@ HotSpotCompilationRequest compRequest = new HotSpotCompilationRequest(method, -1, 0L); // to pass sanity check of default -1 compResult.setTotalFrameSize(0); + compResult.close(); codeCache.installCode(compRequest, compResult, /* installedCode = */ null, /* speculationLog = */ null, /* isDefault = */ false); Asserts.assertEQ(gotInstallNotification, 1, "Got unexpected event count after 1st install attempt"); // since "empty" compilation result is ok, a second attempt should be ok - compResult = new CompilationResult(METHOD_NAME); // create another instance with fresh state - compResult.setTotalFrameSize(0); codeCache.installCode(compRequest, compResult, /* installedCode = */ null, /* speculationLog = */ null, /* isDefault = */ false); Asserts.assertEQ(gotInstallNotification, 2,