[foreign-jextract] Merge foreign-abi
J.Duke
duke at openjdk.java.net
Fri Apr 17 13:18:41 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 115 commits from the branch
`foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
The following file contains merge conflicts:
- src/java.base/share/classes/module-info.java
All Committers in this [project](https://openjdk.java.net/census#Optional[panama]) have access to my [personal
fork](https://github.com/openjdk-bot/panama-foreign) and can therefore help resolve these merge conflicts (you may want
to coordinate who should do this). The following paragraphs will give an example on how to solve these merge conflicts
and push the resulting merge commit to this pull request. The below commands should be run in a local clone of your
[personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
[openjdk/panama-foreign](https://github.com/openjdk/panama-foreign) repository.
# Ensure target branch is up to date
$ git checkout foreign-jextract
$ git pull https://github.com/openjdk/panama-foreign foreign-jextract
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign +25:openjdk-bot-25
$ git checkout openjdk-bot-25
# Merge the target branch
$ git merge foreign-jextract
When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create
a merge commit:
$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge foreign-abi'
When you have created the merge commit, run the following command to push the merge commit to this pull request:
$ git push https://github.com/openjdk-bot/panama-foreign openjdk-bot-25:25
_Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
Thanks,
J. Duke
-------------
Commit messages:
- Merge branch 'foreign-jextract' into 25
- Automatic merge of foreign-memaccess into foreign-abi
- Merge master
- Automatic merge of jdk:master into master
- 8242860: test/jdk/tools/jlink/ModuleNamesOrderTest.java uses nashorn module
- 8242596: Improve JarFile.getEntry performance for multi-release jar files
- 8242626: enhance posix print_rlimit_info
- 8242931: Few more tests that use nashorn have been missed
- 8240904: Screen flashes on test failures when running tests from make
- 8241055: Regex Grapheme Matcher Performance Depends too much on Total Input Sequence Size
- 8242844: JFR: Clean up typos and log format
- 8243008: Shenandoah: TestVolatilesShenandoah test failed on aarch64
- 8237949: CTW: C1 compilation fails with "too many stack slots used"
- 8232935: jpackage failed with NPE whenever --file-associations provided
- 8230731: SA tests fail with "Windbg Error: ReadVirtual failed
- 8242565: Policy initialization issues when the denyAfter constraint is enabled
- 8242808: Fix all remaining deprecation warnings in jdk.hotspot.agent
- 8242804: Fix trivial deprecation issues in jdk.hotspot.agent
- 8241234: Unify monitor enter/exit runtime entries
- 8242913: Bump the SPECIAL_FLAG_VALIDATION_BUILD to 25
- 8241749: Remove the Nashorn JavaScript Engine
- 8242260: Add forRemoval=true to already deprecated ContentSigner
- 8242631: Missing but used special functions for some classes
- Added tag jdk-15+19 for changeset 7cc27caabe6e
- 8210012: Implement Unified Logging Option for -XX:+TraceMethodHandles and -XX:+TraceInvokeDynamic
- 8242008: SSLSession inconsistencies
- 8242366: Fix JavaDoc warnings
- 8242842: Avoid reallocating name when checking for trailing slash in ZipFile.getEntryPos
- 8242629: Remove references to deprecated java.util.Observer and Observable
- 8242597: Remove GenericTaskQueue<>::push_slow
- 8241618: Fix trivial unchecked warnings for jdk.hotspot.agent
- 8242485: Null _file checking in fileStream::flush()
- 8242643: Shenandoah: split concurrent weak and strong root processing
- 8242602: Shenandoah: allow earlier recycle of trashed regions during concurrent root processing
- Merge
- 8172680: Support SHA-3 based Hmac algorithms
- 8242556: Cannot load RSASSA-PSS public key with non-null params from byte array
- 8242078: G1: Improve concurrent refinement analytics and logging
- 8242641: Shenandoah: clear live data and update TAMS optimistically
- 8242039: Improve jlink VersionPropsPlugin
- 8241142: Shenandoah: should not use parallel reference processing with single GC thread
- 8238665: Add JFR event for direct memory statistics
- 8241982: Make TestSearchScript.java run with GraalJS
- 8242468: VS2019 build missing vcruntime140_1.dll
- 8242463: ProcessTools.createNativeTestProcessBuilder() in testlib needs jdk/bin on PATH on Windows
- 8237474: Default SSLEngine should create in server role
- 8242638: Shenandoah: restore heap logging for uncommit
- 8242625: Shenandoah: restore heap logging for Degenerated/Full cycles
- 8242448: Change HeapRegionManager::guarantee_contiguous_range to be assert_contiguous_range
- 8231572: Use -lobjc instead of -fobjc-link-runtime in libosxsecurity
- 8242330: Arrays should be cloned in several JAAS Callback classes
- 8242283: Can't start JVM when java home path includes non-ASCII character
- 8237250: pmap and pstack should do a better of making it clear that they are not supported on Mac OS X
- 8242327: List spec should state that unmodifiable lists implement RandomAccess
- 8174768: Make ProcessTools print executed process output into a separate file
- 8235220: ClhsdbScanOops.java fails with sun.jvm.hotspot.types.WrongTypeException
- 8242311: use reproducible random in hotspot runtime tests
- 8242313: use reproducible random in hotspot svc tests
- 8242471: remove "temporarily" restrictions of nsk/jdi/Argument/value/value004
- 8242241: add assert to ClassUnloadEventImpl::className
- 8242326: use new "summary-list" CSS class instead of general "block-list" for list of summary sections
- 8241952: (fs) FileChannel.write(ByteBuffer src, long position) does not check for the FileChannel being closed first
- 8242292: (fs) FileSystems.getFileSystem(URI) should throw IAE if the URI scheme is null
- 8242155: Enhance automated macos signing tests
- Merge
- Merge
- 8242325: Remove VIS version of medialib
- 8223090: Clean up obsolete logic & reference to Amble fonts
- 8239819: XToolkit: Misread of screen information memory
- 8240877: NPE at javax.swing.text.html.FormView.appendBuffer with null option values
- 8238567: SoftMainMixer.processAudioBuffers(): Wrong handling of stoppedMixers
- 8241829: Cleanup the code for PrinterJob on windows
- 7105119: [TEST_BUG] [macosx] In test UIDefaults.toString() must be called with the invokeLater()
- 8196019: java/awt/Window/Grab/GrabTest.java fails on Windows
- 8241798: Allow enums to have more constants
- 8184249: SA: clhsdb 'intConstant' throws a NullPointerException when not attached to a VM
- 8242462: Residual Cleanup of rmic removal
- 8241883: (zipfs) SeekableByteChannel:close followed by SeekableByteChannel:close will throw an NPE coverage
- 8242282: Test sun/tools/jps/TestJps.java fails after JDK-8237572
- 8242470: Update Xerces to Version 2.12.1
- 8242430: Correct links in javadoc of OperatingSystemMXBean
- 8238960: linux-i586 builds are inconsistent as the newly build jdk is not able to reserve enough space for object heap
- 8239429: AbsPathsInImage.java fails in JDK 11u and 14u on Windows
- 8239124: Minimize the usage of AwtGraphicsConfigDataPtr in native
- 8220150: macos10.14 Mojave returns anti-aliased glyphs instead of aliased B&W glyphs
- 8240342: Custom composite is ignored when printing an opaque image to a page
- 8241797: Add some tests to the problem list
- 8241808: [TESTBUG] The JDK-8039467 bug appeared on macOS
- 8241791: [TESTBUG] Test failing with exception "java.lang.UnsupportedOperationException"
- 8238719: [macOS] Delete the property which use deprecated prefix "com.apple.macos."
- 8240690: Race condition between EDT and BasicDirectoryModel.FilesLoader.run0()
- 8239312: [macos] javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java
- 8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873
- 8236201: Better Scanner conversions
- 8225603: Enhancement for big integers
- 8224549: Less Blocking Array Queues
- 8224541: Better mapping of serial ENUMs
- 8233250: Better X11 rendering
- 8234841: Enhance buffering of byte buffers
- 8235691: Enhance TLS connectivity
- 8234825: Better Headings for HTTP Servers
- 8235274: Enhance typing of methods
- 8226346: Build better binary builders
- 8233410: Better Build Scripting
- 8234027: Better JCEKS key support
- 8233245: More adaptive sockets
- 8227467: Better class method invocations
- 8234408: Improve TLS session handling
- 8223904: Improve Nashorn matching
- 8227542: Manifest improved jar headers
- 8223898: Forward references to Nashorn
- 8232581: Improve TLS verification
- 8232424: More constrained algorithms
- 8231785: Improved socket permissions
- 8229733: TLS message handling improvements
- 8231415: Better signatures in XML
Changes: https://git.openjdk.java.net/panama-foreign/pull/116/files
Webrev: https://webrevs.openjdk.java.net/panama-foreign/116/webrev.00
The following webrevs contain only the adjustments done while merging with regards to each parent branch:
- foreign-jextract: https://webrevs.openjdk.java.net/panama-foreign/116/webrev.00.0
- foreign-abi: https://webrevs.openjdk.java.net/panama-foreign/116/webrev.00.1
Stats: 840022 lines in 4179 files changed: 4996 ins; 832623 del; 2403 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/116.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/116/head:pull/116
PR: https://git.openjdk.java.net/panama-foreign/pull/116
More information about the panama-dev
mailing list