[8u] 8247570: Build failure with -JFR after JDK-8233197 backport

[Andrew Hughes]

On 15/06/2020 09:26, Severin Gehwolf wrote:
> Hi Aleksey,
> 
> On Mon, 2020-06-15 at 10:04 +0200, Aleksey Shipilev wrote:
>> 8u-specific bug, recently introduced:
>>   https://bugs.openjdk.java.net/browse/JDK-8247570
> 
> jdk8u/jdk8u-dev specific, actually :-)
> 
>> Look at this block to spot the issue:
>>   https://hg.openjdk.java.net/jdk8u/jdk8u-dev/hotspot/rev/26d1803768c7#l11.22
>>
>> I believe the trailing "}" is excessive, so I removed it and unindented the block back:
>>
>> diff -r 26d1803768c7 src/share/vm/runtime/thread.cpp
>> --- a/src/share/vm/runtime/thread.cpp   Thu Jun 11 12:17:25 2020 +0200
>> +++ b/src/share/vm/runtime/thread.cpp   Mon Jun 15 09:56:30 2020 +0200
>> @@ -3490,19 +3490,18 @@
>>      MetaspaceShared::preload_and_dump(CHECK_0);
>>      ShouldNotReachHere();
>>    }
>>
>>  #if !INCLUDE_JFR
>> -    // if JFR is not enabled at the build time keep the original JvmtiExport location
>> -
>> -    // Always call even when there are not JVMTI environments yet, since environments
>> -    // may be attached late and JVMTI must track phases of VM execution
>> -    JvmtiExport::enter_start_phase();
>> -
>> -    // Notify JVMTI agents that VM has started (JNI is up) - nop if no agents.
>> -    JvmtiExport::post_vm_start();
>> -  }
>> +  // if JFR is not enabled at the build time keep the original JvmtiExport location
>> +
>> +  // Always call even when there are not JVMTI environments yet, since environments
>> +  // may be attached late and JVMTI must track phases of VM execution
>> +  JvmtiExport::enter_start_phase();
>> +
>> +  // Notify JVMTI agents that VM has started (JNI is up) - nop if no agents.
>> +  JvmtiExport::post_vm_start();
>>  #endif
>>
>>    {
>>      TraceTime timer("Initialize java.lang classes", TraceStartupTime);
>>
>>
>> Testing: x86_64 {server,zero} builds
> 
> Seems to be the same fix than Andrew Hughes did for jdk8u/jdk8u[1]. 
> 
> Looks good. Please coordinate with him to get this pushed.
> 
> Thanks,
> Severin
> 
> [1] https://bugs.openjdk.java.net/browse/JDK-8247448
>     http://mail.openjdk.java.net/pipermail/jdk8u-dev/2020-June/011954.html
> 

Nothing needs to be pushed. This will be fixed when b07 is merged back
into 8u-dev, as I said here:

https://mail.openjdk.java.net/pipermail/jdk8u-dev/2020-June/011954.html
-- 
Andrew :)

Senior Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222