Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new build flag to split value object feature from Valhalla #17394

Merged
merged 1 commit into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions buildspecs/aix_ppc-64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/aix_ppc-64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/aix_ppc.spec
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
8 changes: 6 additions & 2 deletions buildspecs/j9.flags
Original file line number Diff line number Diff line change
Expand Up @@ -1833,8 +1833,12 @@ Only available on zOS</description>
<ifRemoved>No support for Foreign Linker API</ifRemoved>
</flag>
<flag id="opt_valhallaValueTypes">
<description>Enables support for Project Valhalla L-World Value Types</description>
<ifRemoved>No support for Project Valhalla L-World Value Types</ifRemoved>
<description>Enables support for Project Valhalla Value Objects</description>
<ifRemoved>No support for Project Valhalla Value Objects</ifRemoved>
</flag>
<flag id="opt_valhallaFlattenableValueTypes">
<description>Enables support for Project Valhalla L-World Flattenable Value Types</description>
<ifRemoved>No support for Project Valhalla L-World Flattenable Value Types</ifRemoved>
</flag>
<flag id="opt_phpSupport">
<description>Support for PHP interpreter.</description>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_390-64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_390-64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_390.spec
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_aarch64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zero" value="true"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_aarch64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zero" value="true"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_aarch64_cmprssptrs_cross.spec
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zero" value="true"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_aarch64_cross.spec
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zero" value="true"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_arm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zero" value="true"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_arm_linaro.spec
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zero" value="true"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_ppc-64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_ppc-64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_ppc-64_cmprssptrs_le.spec
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_ppc-64_le.spec
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_ppc.spec
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_riscv64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_riscv64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_riscv64_cmprssptrs_cross.spec
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_riscv64_cross.spec
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_x86-64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_x86-64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/linux_ztpf_390-64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_srpAvlTreeSupport" value="true"/>
<flag id="opt_stringCompression" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_zipSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/osx_x86-64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/osx_x86-64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/win_x86-64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/win_x86-64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/win_x86.spec
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zero" value="true"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/zos_390-64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/zos_390-64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_useFfi" value="true"/>
<flag id="opt_useFfiOnly" value="true"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_zipSupport" value="true"/>
<flag id="opt_zlibCompression" value="true"/>
<flag id="opt_zlibSupport" value="true"/>
Expand Down
1 change: 1 addition & 0 deletions buildspecs/zos_390.spec
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="opt_multiVm" value="true"/>
<flag id="opt_panama" value="false"/>
<flag id="opt_valhallaValueTypes" value="false"/>
<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
<flag id="opt_reflect" value="true"/>
<flag id="opt_sharedClasses" value="true"/>
<flag id="opt_sidecar" value="true"/>
Expand Down
10 changes: 5 additions & 5 deletions runtime/bcutil/ClassFileOracle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1170,19 +1170,19 @@ ClassFileOracle::computeSendSlotCount(U_16 methodIndex)
++index;
}
if ((index >= count)
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
|| (('L' != bytes[index]) && ('Q' != bytes[index]))
#else
#else /* J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES */
|| ('L' != bytes[index])
#endif /* J9VM_OPT_VALHALLA_VALUE_TYPES */
#endif /* J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES */
) {
break;
}
/* fall through */
case 'L':
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
case 'Q':
#endif /* J9VM_OPT_VALHALLA_VALUE_TYPES */
#endif /* J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES */
++index;
while ((index < count) && (';' != bytes[index])) {
++index;
Expand Down
4 changes: 2 additions & 2 deletions runtime/bcutil/ClassFileWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1255,9 +1255,9 @@ ClassFileWriter::computeArgsCount(U_16 methodRefIndex)
}
/* fall through */
case 'L':
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
case 'Q':
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
index += 1;
while ((index < count) && (';' != sig[index])) {
index += 1;
Expand Down
2 changes: 1 addition & 1 deletion runtime/bcutil/ConstantPoolMap.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ class ConstantPoolMap
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
void markClassAsUsedByAconst_init(U_16 classCfrCPIndex) { mark(classCfrCPIndex, ACONST_INIT); }
void markFieldRefAsUsedByWithField(U_16 fieldRefCfrCPIndex) { mark(fieldRefCfrCPIndex, WITH_FIELD); }
#endif
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */

void markFieldRefAsUsedByGetStatic(U_16 fieldRefCfrCPIndex) { mark(fieldRefCfrCPIndex, GET_STATIC); }
void markFieldRefAsUsedByPutStatic(U_16 fieldRefCfrCPIndex) { mark(fieldRefCfrCPIndex, PUT_STATIC); }
Expand Down
8 changes: 4 additions & 4 deletions runtime/bcutil/ROMClassBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -384,16 +384,16 @@ ROMClassBuilder::handleAnonClassName(J9CfrClassFile *classfile, bool *isLambda,
if (newCPEntry) {
anonClassName->slot2 = 0;
anonClassName->tag = CFR_CONSTANT_Utf8;
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
/**
* The following line should be put inside if (classfile->majorVersion > 61) according to the SPEC. However, the current
* OpenJDK Valhalla implementation is not updated on this yet. There are cases that the new VT form is used in old classes
* from OpenJDK Valhalla JCL.
*/
anonClassName->flags1 |= CFR_CLASS_FILE_VERSION_SUPPORT_VALUE_TYPE;
#else /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
anonClassName->flags1 |= CFR_CLASS_FILE_VERSION_SUPPORT_FLATTENABLE_VALUE_TYPE;
#else /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
anonClassName->flags1 = 0;
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
anonClassName->nextCPIndex = 0;
anonClassName->romAddress = 0;
}
Expand Down
Loading