Integrated: 8314078: HotSpotConstantPool.lookupField() asserts due to field changes in ConstantPool.cpp

[Ioi Lam]

On Fri, 11 Aug 2023 01:15:01 GMT, Ioi Lam <iklam at openjdk.org> wrote:

> This PR updates Java code in JVMCI to match the C code changes in [JDK-8301996](https://bugs.openjdk.java.net/browse/JDK-8301996) that modified the constant pool layout. Essentially, the indices after a getfield/putfield/getstatic/putstatic bytecode is no longer a CpCacheIndex, but an index for `ConstantPool::resolved_field_entry_at(int field_index)`.
> 
> The assertion (and subsequent crash) happen only in debug builds. Out of pure luck, in product build JVMCI produces the correct output even after [JDK-8301996](https://bugs.openjdk.java.net/browse/JDK-8301996), although the code was doing the wrong thing.
> 
> This PR has (so far) two commits:
> 
> - 6527e67b1832087d180d2b50b65aaeca2e244c28 The actual functional change to use the `rawIndex` that follows a field bytecode.
> - c322b8e71d4d9e33bd065e64420101010f9127fc Fixed incorrectly named parameters and variables in the JVMCI code and JavaDoc. In most cases, `cpi` needs to be changed to `rawIndex` to reflect the correct type of the index.
> 
> To help reviewing, I am limiting the renaming to just those affected by the field changes (without the renames, it's hard to validate that I am actually doing the right thing).
> 
> There are still some cases of `cpi` that need to be changed to `rawIndex`. I will fix those in a separate RFE. E.g. in ConstantPool.java:
> 
> 
> default JavaMethod lookupMethod(int cpi, int opcode) {
>     return lookupMethod(cpi, opcode, null);
> }

This pull request has now been integrated.

Changeset: 911d1dbb
Author:    Ioi Lam <iklam at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/911d1dbbf7362693c736b905b42e5150fc4f8a96
Stats:     131 lines in 5 files changed: 70 ins; 8 del; 53 mod

8314078: HotSpotConstantPool.lookupField() asserts due to field changes in ConstantPool.cpp

Reviewed-by: dnsimon, coleenp

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

PR: https://git.openjdk.org/jdk/pull/15237