[foreign-abi] RFR: Cannot automatically merge openjdk/panama-foreign:foreign-memaccess to foreign-abi
J.Duke
duke at openjdk.java.net
Fri Mar 13 12:05:19 UTC 2020
Could *not* automatically merge 109 commits from foreign-memaccess into foreign-abi.
The following files contains merge conflicts:
- src/java.base/share/classes/java/lang/ClassLoader.java
- src/java.base/share/classes/java/lang/Runtime.java
- src/java.base/share/classes/java/lang/System.java
- src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
- src/java.base/share/native/libjava/ClassLoader.c
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemorySegmentImpl.java
To manually resolve these merge conflicts, please create a personal fork of https://git.openjdk.java.net/panama-foreign
and execute the following commands:
$ git checkout foreign-abi
$ git pull https://git.openjdk.java.net/panama-foreign foreign-abi
$ git checkout --branch merge-foreign-memaccess-into-foreign-abi
$ git pull https://git.openjdk.java.net/panama-foreign foreign-memaccess
When you have resolved the conflicts resulting from the above commands, run:
$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge foreign-memaccess'
Push the merge commit to your personal fork:
$ git push -u origin merge-foreign-memaccess-into-foreign-abi
Now proceed to create a pull request towards this repository.
If you are using the [Skara](https://wiki.openjdk.java.net/display/skara#Skara-Skara)CLI tooling then you can run the
following command to create the pull request:
$ git pr create
This pull request will be closed automatically by a bot once the merge conflicts have been resolved.
-------------
Commit messages:
- Automatic merge of master into foreign-memaccess
- Automatic merge of jdk:master into master
- 8240980: Backout JDK-8240261
- 8240874: Add finer-grained access control for memory segments
- 8240854: [REDO] some jaotc failures of fastdebug build with specific flags
- 8240846: Zero VM is broken after JDK-8238681: UseSSE not defined
- 8238000: Crash in ClassLoader::record_result while dynamic dumping netty
- 8238566: java.security.Provider$Service.supportsParameter() is racy
- 8240555: Using env of JAVA_TOOL_OPTIONS and _JAVA_OPTIONS breaks QuietOption.java test
- 8240971: Fix CSS styles in some doc comments
- 8240972: macOS codesign fail on macOS 10.13.5 or older
- 8240242: improve the javadoc for Lookup::dropLookupModes w.r.t. dropping UNCONDITIONAL
- 8228336: Refactor native library loading implementation
- 8240950: Missing AC_SUBST after JDK-82408
- 8149110: Introduce DISABLED_WARNINGS for Java compilation
- 8240947: Change conflicting JVM features from warning to error
- 8059309: network tests fail with "java.net.SocketException: Couldn't obtain phys addr" when run as "root"
- 8240948: Shenandoah: cleanup not-forwarded-objects paths after JDK-8240868
- Merge
- 8240917: Shenandoah: Avoid scanning thread code roots twice in all root scanner
- 8239355: (dc) Initial value of SO_SNDBUF should allow sending large datagrams (macOS)
- 8240873: Shenandoah: Short-cut arraycopy barriers
- 8240872: Shenandoah: Avoid updating new regions from start of evacuation
- 8240563: [TESTBUG] WB_IsCDSIncludedInVmBuild should support uncompressed oops/klasses
- 8240957: Clarify BadAttributeValueExpException readObject method
- 8240704: CheckHandles.java failed "AssertionError: Handle use increased by more than 10 percent."
- 8216332: Grapheme regex does not work with emoji sequences
- 8239785: Cgroups: Incorrect detection logic on old systems in hotspot
- 8238696: x86: Enumerate all detected CPU features in VM_Version feature string
- 8240915: Shenandoah: Remove unused fields in init mark tasks
- 8240831: [JVMCI] Export missing vmStructs entries used by JVMCI compilers
- 8240669: Devirtualize Relocation::type
- 8240772: x86_64: Pre-generate Assembler::popa, pusha and vzeroupper
- 8234146: compiler/jsr292/ContinuousCallSiteTargetChange.java times out on SPARC
- 8240261: Use make/templates/gpl-cp-header in FieldGen.java
- 8225216: gc/logging/TestMetaSpaceLog.java doesn't work for Shenandoah
- 8240548: [TESTBUG] CDS NoClassToArchive.java fails with Graal
- Added tag jdk-15+14 for changeset 1d6ceb13e142
- 8234624: jstack mixed mode should refer DWARF
- 8240138: Cleanup HtmlTree
- 8240866: Typo in JDK-8240820 messes up configure --help
- 8240340: java/lang/management/ThreadMXBean/Locks.java is buggy
- 8240881: [BACKOUT] 8222489 jcmd VM.system_properties gives unusable paths on Windows
- 8239487: Better links generation for system properties found in HTML files
- 8230117: Remove unused JAR tool classes
- 8239798: SSLSocket closes socket both socket endpoints on a SocketTimeoutException
- Merge
- 8240868: Shenandoah: remove CM-with-UR piggybacking cycles
- 8240524: Remove explicit type argument in test jdk/java/lang/Boolean/MakeBooleanComparable.java
- 8240829: Use a fast O(1) algorithm for exact_log2
- 8240615: is_power_of_2() has Undefined Behaviour and is inconsistent
- 8240532: heap inspection prints trailing @ after name of module without version
- 8240529: CheckUnhandledOops breaks NULL check in Modules::define_module
- 8240530: CheckUnhandledOops breaks BacktraceBuilder::set_has_hidden_top_frame
- 8237566: FindTests.gmk should only include existing TEST.ROOT files
- 8240820: Replace AC_ARG_ENABLE with UTIL_ARG_ENABLE
- 8240725: Some functions might not work with CJK character
- 8239928: ec/ECDSAJavaVerify.java failed due to timeout
- 8222489: jcmd VM.system_properties gives unusable paths on Windows
- 8235216: typo in test filename
- 8240697: convert builders to high-level Content blocks
- 8240830: [BACKOUT] 8240195: some jaotc failures of fastdebug build with specific flags
- 8240840: Rollback whitebox.cpp in push 8240691
- 8240610: [JVMCI] Export VMVersion::_has_intel_jcc_erratum to JVMCI compiler
- 8240691: ClhsdbCDSJstackPrintAll incorrectly thinks CDS is in use
- 8239009: C2: Don't use PSHUF to load scalars from memory on x86
- 8239008: C2: Simplify Replicate support for sub-word types on x86
- 8238681: Make -XX:UseSSE flag x86-specific
- 8240778: JFR: Create timer task lazily
- 8240195: some jaotc failures of fastdebug build with specific flags
- 8240734: ModuleHashes attribute not reproducible between builds
- 8238180: RunThese30M failed "assert(t->jfr_thread_local()->shelved_buffer() == __null) failed: invariant"
- 8238740: java/net/httpclient/whitebox/FlowTestDriver.java would not specify a TLS protocol
- 8240668: G1 list of all PerRegionTable does not have to be a double linkedlist any more
- 8240794: [BACKOUT] 8238384 CTW: C2 compilation fails with "assert(store != load->find_exact_control(load->in(0))) failed: dependence cycle found"
- 8230853: Shenandoah: replace leftover assert(is_in(...)) with rich asserts
- 8240750: Shenandoah: remove leftover files and mentions of ShenandoahAllocTracker
- 8240749: Shenandoah: refactor ShenandoahUtils
- 8239584: EventStream::close should state that stream will be stopped
- 8222000: JFR: Process start event
- 8239836: ZoneRules.of() doesn't check transitionList/standardOffsetTL arguments validity
- 8240754: Instrument FlowTest.java to provide more debug traces
- 8240629: argfiles parsing broken for argfiles with comment cross 4096 bytes chunk
- 8240576: JVM crashes after transformation in C2 IdealLoopTree::merge_many_backedges
- 8240738: nested comment in JVM.java and other minor formatting errors
- 8240295: hs_err elapsed time in seconds is not accurate enough
- 8220503: Move ShenandoahTerminatorTerminator::should_exit_termination out of header
- 8239335: C2: assert((Value(phase) == t) || (t != TypeInt::CC_GT && t != TypeInt::CC_EQ)) failed: missing Value() optimization
- 8240722: [BACKOUT] G1DirtyCardQueue destructor has useless flush
- 8240686: 70 security tests are failing on Windows due to "Fetch artifact failed"
- 8240613: InstanceKlass::set_init_state failed with assert(good_state || state == allocated)
- 8240133: G1DirtyCardQueue destructor has useless flush
- 8239965: XMLEncoder/Test4625418.java fails due to "Error: Cp943 - can't read properly"
- 8239514: Build for arm-linux-gnueabihf fails with undefined reference read_polling_page
- 8238579: HttpsURLConnection drops the timeout and hangs forever in read
- 8240695: Build is broken when cds is disabled after JDK-8232081
- 8240137: Support chained use of Content.add
- 8240535: Add additional linux-aarch64 jib profiles
- 8240239: Replace ConcurrentGCPhaseManager
- 8232081: Try to link all classes during dynamic CDS dump
- 8240315: Shenandoah: Rename ShLBN::get_barrier_strength()
- 8239893: Windows handle Leak when starting processes using ProcessBuilder
- 4617266: (se spec) SelectionKey.OP_READ/OP_WRITE documentation errors
- 8240684: ProblemList 70 security tests that are failing on Windows due to "Fetch artifact failed"
- 8240671: Shenandoah: refactor ShenandoahPhaseTimings
- 8240189: [TESTBUG] Some cgroup tests are failing after JDK-8231111
- 8240440: Implement get_safepoint_workers() for parallel GC
- 8240592: HeapRegionManager::rebuild_free_list logs 0s for the estimated free regions before
- 8236981: Remove ShenandoahTraversalUpdateRefsClosure
Changes: https://git.openjdk.java.net/panama-foreign/pull/49/files
Webrev: https://webrevs.openjdk.java.net/panama-foreign/49/webrev.00
Stats: 16200 lines in 363 files changed: 8030 ins; 6195 del; 1975 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/49.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/49/head:pull/49
PR: https://git.openjdk.java.net/panama-foreign/pull/49
More information about the panama-dev
mailing list