[foreign-abi] [Rev 01] RFR: Merge foreign-memaccess

J.Duke duke at openjdk.java.net
Fri Apr 24 12:15:39 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 110 commits from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
> The following files contains merge conflicts:
> 
> - src/java.base/share/classes/java/lang/System.java
> - src/java.base/share/classes/jdk/internal/access/JavaLangAccess.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 +30:openjdk-bot-30
> $ git checkout openjdk-bot-30
> 
> # 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-30:30
> 
> _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

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes
the unrelated changes brought in by the merge/rebase. The pull request contains 126 additional commits since the last
revision:

 - Merge branch 'foreign-abi' into 30
 - Automatic merge of foreign-memaccess into foreign-abi
 - Automatic merge of foreign-memaccess into foreign-abi
 - Merge foreign-memaccess
   
   Reviewed-by: sundar
 - 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"
   
   Reviewed-by: jvernee
 - Automatic merge of foreign-memaccess into foreign-abi
 - JDK-8242127: reorganize ABI-dependent layout constants
   
   Reviewed-by: jvernee, sundar
 - JDK-8242102: foreign-abi build is broken
   
   Reviewed-by: sundar
 - Automatic merge of foreign-memaccess into foreign-abi
 - JDK-8242061: AllocationScope is too general
   
   Reviewed-by: jvernee
 - Merge
 - Automatic merge of foreign-memaccess into foreign-abi
 - Merge
   
   Reviewed-by: jvernee
 - Merge address combinator changes
 - 8242028: Remove C string to/from Java string utilities from Foreign class
   
   Reviewed-by: mcimadamore
 - JDK-8241998: Revisit Foreign::ofNativeUnchecked
   
   Reviewed-by: sundar
 - 8241994: Missing SystemABI.layoutFor mappings for LONG_DOUBLE
   
   Reviewed-by: sundar, mcimadamore
 - Automatic merge of foreign-memaccess into foreign-abi
 - Merge
 - Merge
   
   Reviewed-by: sundar, jvernee
 - Automatic merge of foreign-memaccess into foreign-abi
 - 8241816: foreign-abi and foreign-jextract panama branches fail to build and test
   
   Reviewed-by: mcimadamore
 - 8241712: AArch64: TestDowncall fails with IllegalArgumentException: No ABI attribute present
   
   Reviewed-by: jvernee
 - Automatic merge of foreign-memaccess into foreign-abi
 - 8241504: Expose MemoryLayout annotations/attributes in the public API
   
   Reviewed-by: mcimadamore
 - Backport 8237573 to foreign-abi
   
   Reviewed-by: mcimadamore, sundar
 - Automatic merge of foreign-memaccess into foreign-abi
 - Miscellaneous cleanups
   
   Reviewed-by: henryjen
 - 8241309: foreign-abi branch has javadoc errors
   
   Reviewed-by: sundar
 - 8237585: Dismantle ForeignUnsafe
   
   Reviewed-by: mcimadamore
 - 8241148: need a way to create MemorySegment with contents from java String and a way to read a C char* as java String
   
   Reviewed-by: mcimadamore
 - 8241017: Enhance AllocationScope to support "unbounded" mode
   
   Reviewed-by: jvernee, sundar
 - Automatic merge of foreign-memaccess into foreign-abi
 - Merge
   
   Reviewed-by: jvernee
 - 8240874: Add finer-grained access control for memory segments (#47)
   
   Reviewed-by: psandoz, jvernee
   
   Co-authored-by: Maurizio Cimadamore <mcimadamore at openjdk.org>
 - 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
   
   Reviewed-by: psandoz
 - 8239784: Circular initialization causes C_XXX constants to be null
   
   Reviewed-by: sundar
 - 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
   
   Reviewed-by: jvernee, mcimadamore
 - 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
   
   Reviewed-by: jvernee
 - 8238226: Revisit FunctionDescriptor
   8237580: Add a method for transforming varargs FunctionDescriptors into fixed-arity ones
   
   Reviewed-by: mcimadamore
 - Merge
   
   Manual merge of foreign-memaccess into foreign-abi
   
   Reviewed-by: mcimadamore
 - 8238837: AArch64: TestUpcall failures after JDK-8237358
   
   Reviewed-by: jvernee
 - 8237359: Clean up Binding
   8238227: The COPY_BUFFER operator should take a MemoryLayout
   8238235: Add extensive documentation to Binding
   
   Reviewed-by: mcimadamore
 - 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
   
   Reviewed-by: mcimadamore
 - 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
   
   Reviewed-by: mcimadamore, vlivanov
 - Automatic merge with foreign-memaccess
 - Automatic merge with foreign-memaccess
 - 8237357: Add verification code for binding recipes
   
   Reviewed-by: mcimadamore
 - Automatic merge with foreign-memaccess
 - 8237358: Split the DEREFERENCE binding operator into a load/store + move
   
   Reviewed-by: mcimadamore
 - 8237899: Add support for scoped allocation
   
   Changes:
   * Made AllocationScope::sp private
   * fix spurious alignment in copyright header in TestAllocationScope
   
   Reviewed-by: jvernee, sundar
 - 8237899: Add support for scoped allocation
   
   Reviewed-by: jvernee
 - 8237356: Refactor shared code in CallArranger
   
   Reviewed-by: mcimadamore
 - 8237762: Add platform dependent MemoryLayout constants
   
   Reviewed-by: forax, mcimadamore
 - 8237761: Add way to determine the current ABI
   
   Reviewed-by: mcimadamore
 - Manual merge with foreign-memaccess
 - Automatic merge with foreign-memaccess
 - 8237351: Add method to SystemABI for explicitly freeing upcall stubs
   
   Reviewed-by: mcimadamore
 - 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
   
   Reviewed-by: mcimadamore
 - 8236454: Use MethodHandle.linkToStatic to call MemoryAddress.ofLong
   
   Reviewed-by: mcimadamore
 - Automatic merge with foreign-memaccess
 - Automatic merge with foreign-memaccess
 - Automatic merge with foreign-memaccess
 - 8236004: Memory access var handles should support MemoryAddress carrier
   
   Reviewed-by: psandoz, jvernee
 - Automatic merge with foreign-memaccess
 - Manual merge with foreign-memaccess
 - 8235258: Add support for empty segments and rebased addresses
   
   Reviewed-by: jvernee
 - 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
   
   Contributed-by: jvernee, mcimadamore, Nick Gasson <nick.gasson at arm.com>
   
   Reviewed-by: mcimadamore
 - 8232907: NPE in FunctionDescriptor::hashCode for function without return type (void)
   
   Reviewed-by: mcimadamore
 - 8232628: foreign-abi usability issues
   
   Reviewed-by: jvernee
 - 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
   
   Reviewed-by: mcimadamore
 - Automatic merge with foreign-memaccess
 - 8229918: Fix clash between recent CallingSequenceTest patch and Windows varargs support patch
   
   Reviewed-by: henryjen, nick.gasson at arm.com
   
 - Automatic merge with foreign-memaccess
 - Automatic merge with foreign-memaccess
 - [foreign-abi] 8228762: import CallingSequenceBuilder unit tests
   
   Reviewed-by: mcimadamore, jvernee
 - 8228509: Add support for binding varargs functions on Windows
   
   Reviewed-by: mcimadamore
 - 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
   
   Initial push
   
 - Automatic merge with foreign-memaccess
 - Automatic merge with foreign-memaccess
 - Add dependency file for branch foreign-abi
 - Create foreign-abi branch

-------------

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/131/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/131/files/d9e1e9e5..abff3faa

Webrevs:
 - full: https://webrevs.openjdk.java.net/panama-foreign/131/webrev.01
 - incr: https://webrevs.openjdk.java.net/panama-foreign/131/webrev.00-01

  Stats: 59669 lines in 102 files changed: 59604 ins; 41 del; 24 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/131.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/131/head:pull/131

PR: https://git.openjdk.java.net/panama-foreign/pull/131


More information about the panama-dev mailing list