RFR (S): 8144529: [JVMCI] compiler/jvmci/errors/TestInvalidCompilationResult.java fails to compile after JDK-8143730

Vladimir Kozlov vladimir.kozlov at oracle.com
Thu Dec 3 00:44:12 UTC 2015


Good.

Thanks,
Vladimir

On 12/2/15 1:53 PM, Christian Thalinger wrote:
> https://bugs.openjdk.java.net/browse/JDK-8144529
>
> I forgot to fix some tests.
>
> diff -r 8578909eeef4 test/compiler/jvmci/errors/CodeInstallerTest.java
> --- a/test/compiler/jvmci/errors/CodeInstallerTest.javaThu Nov 26
> 10:38:33 2015 +0000
> +++ b/test/compiler/jvmci/errors/CodeInstallerTest.javaWed Dec 02
> 10:59:39 2015 -1000
> @@ -68,6 +68,7 @@ public class CodeInstallerTest {
>       }
>
>
>       protected void installCode(CompilationResult result) {
> +        result.close();
>           codeCache.addCode(dummyMethod, result, null, null);
>       }
>
>
> diff -r 8578909eeef4
> test/compiler/jvmci/errors/TestInvalidCompilationResult.java
> --- a/test/compiler/jvmci/errors/TestInvalidCompilationResult.javaThu
> Nov 26 10:38:33 2015 +0000
> +++ b/test/compiler/jvmci/errors/TestInvalidCompilationResult.javaWed
> Dec 02 10:59:39 2015 -1000
> @@ -219,13 +219,6 @@ public class TestInvalidCompilationResul
>       }
>
>
>       @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 8578909eeef4
> test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java
> --- a/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.javaThu Nov
> 26 10:38:33 2015 +0000
> +++ b/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.javaWed Dec
> 02 10:59:39 2015 -1000
> @@ -106,13 +106,12 @@ public class JvmciNotifyInstallEventTest
>           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,
>


More information about the hotspot-compiler-dev mailing list