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

Merge jdk #70

Closed
wants to merge 107 commits into from
Closed

Merge jdk #70

wants to merge 107 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Jun 9, 2020

Merge tag 'jdk-15+24' into lworld_merge_jdk_15_24
Added tag jdk-15+24 for changeset 497fd9f9129c

Conflicts:

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

src/hotspot/share/classfile/javaClasses.hpp

src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp

src/hotspot/share/memory/oopFactory.hpp

src/hotspot/share/oops/access.hpp

src/hotspot/share/oops/accessBackend.hpp

src/hotspot/share/oops/accessDecorators.hpp

src/hotspot/share/runtime/init.cpp

src/hotspot/share/runtime/thread.hpp

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java

src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java

src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c

src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c

src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c

src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c

src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c

src/jdk.jdwp.agent/share/native/libjdwp/invoker.c

src/jdk.jdwp.agent/share/native/libjdwp/util.c

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java


Progress

  • Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/valhalla pull/70/head:pull/70
$ git checkout pull/70

Bob Vandette and others added 30 commits May 13, 2020
…ate all flags related to biased-locking

Changed default value of UseBiasedLocking to false and deprecated related flags.

Reviewed-by: dholmes, dcubed
Use (nonvirtual) min/max_gen_size consistently, and remove duplicates.

Reviewed-by: stefank, sjohanss
…s with AttachNotSupportedException: Unable to open socket file

Reviewed-by: sspitsyn, ysuenaga
Reviewed-by: rriggs, joehw
…RS_DEPENDS_ON_COMPRESSED_OOPS not defined)

Reviewed-by: dholmes
New ScannerTask and PartialArrayScanTask, initially used by G1

Reviewed-by: tschatzl, sjohanss
Generate ct.sym in a reproducible way

Reviewed-by: ihse
…s "stderr was not empty"

Reviewed-by: dholmes, sspitsyn
Reviewed-by: pchilanomate, dholmes, dcubed
…e JDK doesn't have default CDS archive

Generate a default CDS archive when necessary before running AppCDS dynamic tests.

Reviewed-by: iklam
Reviewed-by: alanb, sspitsyn
coleenp and others added 11 commits May 20, 2020
Reviewed-by: stuefe, dholmes
Correcting paths in the NetBeans-specific langtools ant build.

Reviewed-by: mcimadamore
Reviewed-by: coleenp, iklam, rehn, dholmes
Http2TestExchangeImpl.java updated to support HEAD responses; ForbiddenHeadTest.java added.

Reviewed-by: chegar, michaelm
Initialize BlockBegin block id in constructor rather than operator new

Reviewed-by: kbarrett, thartmann
Added tag jdk-15+24 for changeset 497fd9f9129c

# Conflicts:
#	src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
#	src/hotspot/share/classfile/javaClasses.hpp
#	src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
#	src/hotspot/share/memory/oopFactory.hpp
#	src/hotspot/share/oops/access.hpp
#	src/hotspot/share/oops/accessBackend.hpp
#	src/hotspot/share/oops/accessDecorators.hpp
#	src/hotspot/share/runtime/init.cpp
#	src/hotspot/share/runtime/thread.hpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
#	src/jdk.jdi/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
#	src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c
#	src/jdk.jdwp.agent/share/native/libjdwp/ArrayTypeImpl.c
#	src/jdk.jdwp.agent/share/native/libjdwp/ClassTypeImpl.c
#	src/jdk.jdwp.agent/share/native/libjdwp/ObjectReferenceImpl.c
#	src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
#	src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
#	src/jdk.jdwp.agent/share/native/libjdwp/util.c
#	test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 9, 2020

👋 Welcome back dsimms! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Jun 9, 2020

@MrSimms This change now passes all automated pre-integration checks, type /integrate in a new comment to proceed. After integration, the commit message will be:

Merge jdk
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 106 commits pushed to the lworld branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge lworld into your branch, and then specify the current head hash when integrating, like this: /integrate 8e35838223e41ce353199c5ca9a1ed15a4d10c76.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 9, 2020

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jun 9, 2020

Test issues, on hold

@MrSimms MrSimms marked this pull request as draft Jun 9, 2020
@openjdk openjdk bot removed the rfr label Jun 9, 2020
@MrSimms MrSimms marked this pull request as ready for review Jun 10, 2020
@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jun 10, 2020

Filed JDK-8247298 and JDK-8247299 to address use of bias locking at a later date, re-enabled UseBiasedLocking as default as temporary work-around.

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jun 10, 2020

/integrate

@openjdk openjdk bot added the rfr label Jun 10, 2020
@openjdk openjdk bot closed this Jun 10, 2020
@openjdk openjdk bot added integrated and removed ready labels Jun 10, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jun 10, 2020

@MrSimms
Pushed as commit 8e35838.

@openjdk openjdk bot removed the rfr label Jun 10, 2020
@MrSimms MrSimms deleted the lworld_merge_jdk_15_24 branch Jun 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment