[lworld] RFR: Merge jdk [v2]
David Simms
dsimms at openjdk.java.net
Thu Feb 4 13:23:22 UTC 2021
> Merge tag 'jdk-17+8' into lworld_merge_jdk_17_8
> Logical merge compilation fixes
David Simms has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 1083 commits:
- Logical merge compilation fixes
- Merge tag 'jdk-17+8' into lworld_merge_jdk_17_8
Added tag jdk-17+8 for changeset f025bc1d
# Conflicts:
# src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
# src/hotspot/share/c1/c1_Compilation.cpp
# src/hotspot/share/c1/c1_LIRAssembler.cpp
# src/hotspot/share/ci/ciInstanceKlass.cpp
# src/hotspot/share/classfile/classFileParser.cpp
# src/hotspot/share/classfile/placeholders.hpp
# src/hotspot/share/classfile/systemDictionary.cpp
# src/hotspot/share/classfile/systemDictionary.hpp
# src/hotspot/share/classfile/verificationType.cpp
# src/hotspot/share/compiler/compileBroker.cpp
# src/hotspot/share/memory/metaspaceClosure.hpp
# src/hotspot/share/memory/universe.cpp
# src/hotspot/share/oops/arrayKlass.cpp
# src/hotspot/share/oops/objArrayKlass.cpp
# src/hotspot/share/opto/parse2.cpp
# src/hotspot/share/prims/jvm.cpp
# test/hotspot/jtreg/vmTestbase/jit/tiered/Test.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
# test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
# test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
- 8260363: [lworld] C2 compilation fails with assert(n->Opcode() != Op_Phi) failed: cannot match
Reviewed-by: thartmann
- Merge jdk
Merge to 20210119
- [lworld] code cleanup reverting some old leftover change
- [lworld] Field::get should return default value instead of null on non-flattened inline field
Reviewed-by: rriggs
- 8260375: [lworld] ValueTearing fails with -XX:FlatArrayElementMaxSize=0 -XX:InlineFieldMaxFlatSize=0
Reviewed-by: thartmann
- Remove unused field from Method
Reviewed-by: hseigel, lfoltan
- 8260283: [lworld] C1's EliminateFieldAccess optimization fails with "wrong types"
Reviewed-by: fparain
- 8260225: [lworld] C1's delayed load indexed optimization sets incorrect type
Reviewed-by: fparain
- ... and 1073 more: https://git.openjdk.java.net/valhalla/compare/f025bc1d...604b0cb2
-------------
Changes: https://git.openjdk.java.net/valhalla/pull/319/files
Webrev: https://webrevs.openjdk.java.net/?repo=valhalla&pr=319&range=01
Stats: 144118 lines in 1307 files changed: 137496 ins; 2036 del; 4586 mod
Patch: https://git.openjdk.java.net/valhalla/pull/319.diff
Fetch: git fetch https://git.openjdk.java.net/valhalla pull/319/head:pull/319
PR: https://git.openjdk.java.net/valhalla/pull/319
More information about the valhalla-dev
mailing list