[foreign-abi] FYI: Merge foreign-memaccess
J.Duke
duke at openjdk.java.net
Wed Apr 22 14:54:28 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch
`foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
The following files contains merge conflicts:
- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/Foreign.java
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/InternalForeign.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-abi
$ git pull https://github.com/openjdk/panama-foreign foreign-abi
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign +26:openjdk-bot-26
$ git checkout openjdk-bot-26
# Merge the target branch
$ git merge foreign-abi
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-memaccess'
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-26:26
_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 'abi+segmentRestricted' into openjdk-bot-26
- Merge branch 'foreign-abi' into openjdk-bot-26
- All tests pass
- Merge branch 'uncheckedSegment' into abi+segmentRestricted
- * simplified API to take Runnable instead of AutoCloseable
- Remove Foreign, and add new method on MemorySegment to create unsafe native segments.
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- Merge foreign-memaccess
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- Revert "JDK-8242127: reorganize ABI-dependent layout constants"
- Automatic merge of foreign-memaccess into foreign-abi
- JDK-8242127: reorganize ABI-dependent layout constants
- JDK-8242102: foreign-abi build is broken
- Automatic merge of foreign-memaccess into foreign-abi
- JDK-8242061: AllocationScope is too general
- Merge
- Automatic merge of foreign-memaccess into foreign-abi
- Merge
- Merge address combinator changes
- 8242028: Remove C string to/from Java string utilities from Foreign class
- JDK-8241998: Revisit Foreign::ofNativeUnchecked
- 8241994: Missing SystemABI.layoutFor mappings for LONG_DOUBLE
- Automatic merge of foreign-memaccess into foreign-abi
- Merge
- Merge
- Automatic merge of foreign-memaccess into foreign-abi
- 8241816: foreign-abi and foreign-jextract panama branches fail to build and test
- 8241712: AArch64: TestDowncall fails with IllegalArgumentException: No ABI attribute present
- Automatic merge of foreign-memaccess into foreign-abi
- 8241504: Expose MemoryLayout annotations/attributes in the public API
- Backport 8237573 to foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- Miscellaneous cleanups
- 8241309: foreign-abi branch has javadoc errors
- 8237585: Dismantle ForeignUnsafe
- 8241148: need a way to create MemorySegment with contents from java String and a way to read a C char* as java String
- 8241017: Enhance AllocationScope to support "unbounded" mode
- Automatic merge of foreign-memaccess into foreign-abi
- Merge
- 8240874: Add finer-grained access control for memory segments (#47)
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- 8240173: Confusing overflow error when trying to dereference a nothing segment
- 8239784: Circular initialization causes C_XXX constants to be null
- Automatic merge of foreign-memaccess into foreign-abi
- 8239345: need an enum for standard C types and a way to get a memory layout for those C types
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- 8238192: Reimplement MemoryAddress memory access handles on top of var handle combinators
- 8238226: Revisit FunctionDescriptor
- Merge
- 8238837: AArch64: TestUpcall failures after JDK-8237358
- 8237359: Clean up Binding
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- 8237360: Add tests that test binding recipe generation directly
- Merge remote-tracking branch 'remotes/origin/foreign-memaccess' into foreign-abi
- Manual merge with foreign-memaccess
- 8238217: panama fails to build because of use of x87 instructions in 64 bit mode
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- 8237357: Add verification code for binding recipes
- Automatic merge with foreign-memaccess
- 8237358: Split the DEREFERENCE binding operator into a load/store + move
- 8237899: Add support for scoped allocation
- 8237899: Add support for scoped allocation
- 8237356: Refactor shared code in CallArranger
- 8237762: Add platform dependent MemoryLayout constants
- 8237761: Add way to determine the current ABI
- Manual merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- 8237351: Add method to SystemABI for explicitly freeing upcall stubs
- Manual merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Manual merge with foreign-memaccess
- Manual merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- 8236453: Test for wrong memory address value
- 8236454: Use MethodHandle.linkToStatic to call MemoryAddress.ofLong
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- 8236004: Memory access var handles should support MemoryAddress carrier
- Automatic merge with foreign-memaccess
- Manual merge with foreign-memaccess
- 8235258: Add support for empty segments and rebased addresses
- Manual merge with foreign-memaccess
- Manual merge with foreign-memaccess
- Manual merge with foreign-memaccess
- Manual merge with foreign-memacess
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Manual merge with foreign-memaccess
- 8233317: Add the ProgrammableInvoker
- 8232907: NPE in FunctionDescriptor::hashCode for function without return type (void)
- 8232628: foreign-abi usability issues
- Manual merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Manual merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- 8230806: Use libTestUpcall in TestUpcall
- Automatic merge with foreign-memaccess
- 8229918: Fix clash between recent CallingSequenceTest patch and Windows varargs support patch
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- [foreign-abi] 8228762: import CallingSequenceBuilder unit tests
- 8228509: Add support for binding varargs functions on Windows
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- 8228486: Add ABI-specific layout constants
- Manual merge with foreign-memaccess
- Manual merge with foreign-memaccess
- 8227718: Add support for SystemABI
- Automatic merge with foreign-memaccess
- Automatic merge with foreign-memaccess
- Add dependency file for branch foreign-abi
- Create foreign-abi branch
Changes: https://git.openjdk.java.net/panama-foreign/pull/124/files
Webrev: https://webrevs.openjdk.java.net/panama-foreign/124/webrev.00
The following webrevs contain only the adjustments done while merging with regards to each parent branch:
- foreign-abi: https://webrevs.openjdk.java.net/panama-foreign/124/webrev.00.0
- foreign-memaccess: https://webrevs.openjdk.java.net/panama-foreign/124/webrev.00.1
Stats: 59671 lines in 102 files changed: 59606 ins; 41 del; 24 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/124.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/124/head:pull/124
PR: https://git.openjdk.java.net/panama-foreign/pull/124
More information about the panama-dev
mailing list