On Mon, 28 Oct 2024 10:37:21 GMT, Yudi Zheng <yzh...@openjdk.org> wrote:

>> Patricio Chilano Mateo has updated the pull request incrementally with two 
>> additional commits since the last revision:
>> 
>>  - Restore use of atPointA in test StopThreadTest.java
>>  - remove interruptible check from conditional in Object::wait
>
> src/hotspot/share/jvmci/vmStructs_jvmci.cpp line 329:
> 
>> 327:   nonstatic_field(ObjArrayKlass,               _element_klass,          
>>                       Klass*)                                \
>> 328:                                                                         
>>                                                              \
>> 329:   unchecked_nonstatic_field(ObjectMonitor,     _owner,                  
>>                       int64_t)                               \
> 
> to make the type assert more precise:
> 
> diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp 
> b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
> index 20b9609cdbf..f2b8a69c03f 100644
> --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
> +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
> @@ -326,7 +326,7 @@
>                                                                               
>                                                         \
>    nonstatic_field(ObjArrayKlass,               _element_klass,               
>                  Klass*)                                \
>                                                                               
>                                                         \
> -  unchecked_nonstatic_field(ObjectMonitor,     _owner,                       
>                  int64_t)                               \
> +  volatile_nonstatic_field(ObjectMonitor,      _owner,                       
>                  int64_t)                               \
>    volatile_nonstatic_field(ObjectMonitor,      _recursions,                  
>                  intptr_t)                              \
>    volatile_nonstatic_field(ObjectMonitor,      _cxq,                         
>                  ObjectWaiter*)                         \
>    volatile_nonstatic_field(ObjectMonitor,      _EntryList,                   
>                  ObjectWaiter*)                         \
> diff --git a/src/hotspot/share/runtime/vmStructs.cpp 
> b/src/hotspot/share/runtime/vmStructs.cpp
> index 86d7277f88b..0492f28e15b 100644
> --- a/src/hotspot/share/runtime/vmStructs.cpp
> +++ b/src/hotspot/share/runtime/vmStructs.cpp
> @@ -786,8 +786,8 @@
>                                                                               
>                                                         \
>    volatile_nonstatic_field(ObjectMonitor,      _metadata,                    
>                  uintptr_t)                             \
>    unchecked_nonstatic_field(ObjectMonitor,     _object,                      
>                  sizeof(void *)) /*...

Fixed.

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/21565#discussion_r1819746890

Reply via email to