[lworld] RFR: 8315412 [lworld] Preparing code for lw5 [v2]

[Tobias Hartmann]

On Thu, 31 Aug 2023 19:46:01 GMT, Frederic Parain <fparain at openjdk.org> wrote:

>> Quite a big patch, but it is mostly made of renaming and mechanical replacement without really changing the logic of the code.
>> 
>> The patch includes changes to make the VM code less dependent on Q-descriptors by encoding the presence of null-free inline types fields in FieldInfo.
>> 
>> The patch also includes a lot of renaming, in an effort to have uniformed naming of flat fields and flat arrays across the VM. The renaming has not been applied to the heap dumper and C2. They will be addressed in follow up patches.
>> 
>> Tested with Mach5, tiers 1 to 3.
>> 
>> Thank you
>> 
>> Fred
>
> Frederic Parain has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Addresing Lois' comments

Nice cleanup! I only found some indentation issues.

src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp line 289:

> 287: 
> 288: void InterpreterMacroAssembler::read_flat_field(Register holder_klass,
> 289:                                                    Register field_index, Register field_offset,

Indentation needs to be fixed.

src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp line 158:

> 156:   //   - assumes holder_klass and valueKlass field klass have both been resolved
> 157:   void read_flat_field(Register holder_klass,
> 158:                           Register field_index, Register field_offset,

Indentation needs to be fixed.

src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp line 167:

> 165:   void read_flat_element(Register array, Register index,
> 166:                               Register t1, Register t2,
> 167:                               Register obj = r0);

Indentation needs to be fixed.

src/hotspot/cpu/x86/interp_masm_x86.cpp line 1250:

> 1248: 
> 1249: void InterpreterMacroAssembler::read_flat_field(Register holder_klass,
> 1250:                                                      Register field_index, Register field_offset,

Indentation needs to be fixed.

src/hotspot/cpu/x86/interp_masm_x86.cpp line 1297:

> 1295: void InterpreterMacroAssembler::read_flat_element(Register array, Register index,
> 1296:                                                        Register t1, Register t2,
> 1297:                                                        Register obj) {

Indentation needs to be fixed.

src/hotspot/cpu/x86/interp_masm_x86.hpp line 244:

> 242:   //   - 32 bits: kills rdi and rsi
> 243:   void read_flat_field(Register holder_klass,
> 244:                             Register field_index, Register field_offset,

Indentation needs to be fixed.

src/hotspot/cpu/x86/interp_masm_x86.hpp line 253:

> 251:   //   - 32 bits: kills rdi and rsi
> 252:   void read_flat_element(Register array, Register index,
> 253:                               Register t1, Register t2,

Indentation needs to be fixed.

src/hotspot/cpu/x86/macroAssembler_x86.cpp line 2944:

> 2942: 
> 2943: void MacroAssembler::test_flat_array_oop(Register oop, Register temp_reg,
> 2944:                                               Label& is_flat_array) {

Indentation needs to be fixed.

src/hotspot/cpu/x86/macroAssembler_x86.cpp line 2955:

> 2953: 
> 2954: void MacroAssembler::test_non_flat_array_oop(Register oop, Register temp_reg,
> 2955:                                                   Label& is_non_flat_array) {

Indentation needs to be fixed.

src/hotspot/share/c1/c1_LIRGenerator.cpp line 2360:

> 2358: 
> 2359:     access_flat_array(true, array, index, obj_item,
> 2360:                            x->delayed() == nullptr ? 0 : x->delayed()->field(),

Indentation needs to be fixed.

src/hotspot/share/c1/c1_Runtime1.hpp line 58:

> 56:   stub(new_multi_array)              \
> 57:   stub(load_flat_array)         \
> 58:   stub(store_flat_array)        \

Indentation needs to be fixed.

src/hotspot/share/ci/ciInstanceKlass.cpp line 811:

> 809:         InstanceKlass* holder = fd->field_holder();
> 810:         InstanceKlass* k = SystemDictionary::find_instance_klass(THREAD, name,
> 811:                                                                 Handle(THREAD, holder->class_loader()),

Indentation needs to be fixed.

src/hotspot/share/interpreter/interpreterRuntime.cpp line 366:

> 364:         if (cpe->is_null_free_inline_type())  {
> 365:           if (!cpe->is_flat()) {
> 366:               if (ref_h() == nullptr) {

Indentation needs to be fixed.

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

Marked as reviewed by thartmann (Committer).

PR Review: https://git.openjdk.org/valhalla/pull/922#pullrequestreview-1609095614
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314651684
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314651801
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314651906
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314652538
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314652601
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314651263
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314651362
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314650915
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314651024
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314654712
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314655307
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314656771
PR Review Comment: https://git.openjdk.org/valhalla/pull/922#discussion_r1314658667