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 #78

Closed
wants to merge 130 commits into from
Closed

Merge jdk #78

Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
e97c5f4
8196094: javax/swing/JFileChooser/8002077/bug8002077.java fails
Jun 1, 2020
b4943a3
8237243: [macOS] java/awt/event/KeyEvent/DisabledTargetF10/DisabledTa…
Jun 2, 2020
5aea3f0
8245668: closed test javax/swing/JComboBox/4765319/bug4765319.java fa…
prsadhuk Jun 3, 2020
827c886
8246451: Reduce overhead of normalizing file paths with trailing slash
cl4es Jun 3, 2020
7d1eb8f
8246260: JFR: Write event size field without padding
egahlin Jun 3, 2020
2bfc64a
8245283: JFR: Can't handle constant dynamic used by Jacoco agent
egahlin Jun 3, 2020
bcbe46b
8246397: Use KnownOIDs for known OIDs
wangweij Jun 4, 2020
62d1de3
Added tag jdk-15+26 for changeset 0a32396f7a69
JesperIRL Jun 4, 2020
4365c2b
8246572: Always pass java.library.path when running micro benchmarks
JornVernee Jun 4, 2020
e1b8e91
8246478: Remove src/utils/reorder
magicus Jun 4, 2020
a351ebd
8245043: Simplified contention benchmark
Jun 4, 2020
dd016c3
8227647: [Graal] Test8009761.java fails due to "RuntimeException: sta…
Jun 4, 2020
9cadf1a
8246282: [REDO] JDK-8245121 (bf) XBuffer.put(Xbuffer src) can give un…
Jun 4, 2020
1b59097
8246612: Shenandoah: add timing tracking to ShenandoahStringDedupRoots
zhengyu123 Jun 4, 2020
9a88048
8246274: G1 old gen allocation tracking is not in a separate class
ziyiluo Jun 4, 2020
b94314a
8087327: CipherStream produces new byte array on every update or doFi…
Jun 4, 2020
0db1be2
8246486: javac doesn't allow a subclass to be declared before a seale…
Jun 4, 2020
507816d
8244565: Accept PKCS #8 with version number 1
wangweij Jun 4, 2020
9a7f519
8245321: refactor the redefine check that an attribute consisting of …
Jun 5, 2020
9d5f388
8245512: CRC32 optimization using AVX512 instructions
Jun 5, 2020
aee7490
8246593: Shenandoah: string dedup roots should be processed during co…
zhengyu123 Jun 5, 2020
1c27ce3
8246405: Add GCLogPrecious functionality to log and report debug errors
stefank Jun 5, 2020
8384f7f
8246406: ZGC: Generate crash reports in debug builds for a few import…
stefank Jun 5, 2020
4d75aef
8238585: JvmtiEventControllerPrivate::enter_interp_only_mode() should…
reinrich Feb 13, 2020
d071ed0
8244582: Remove terminally deprecated Solaris-specific SO_FLOW_SLA so…
pconcannon Jun 5, 2020
0963050
8246557: test_os_linux.cpp uses NULL instead of MAP_FAILED to check f…
Jun 5, 2020
6c3bc71
8243380: Update Graal
dean-long Jun 5, 2020
5f0f4d7
8246377: [PPC64] Further improvements for assembler stop function
TheRealMDoerr Jun 2, 2020
f833afa
8246640: @systemproperty should be @systemProperty in java.security.jgss
wangweij Jun 5, 2020
cb960ee
8245487: Potential double-free of interfaces array
coleenp Jun 5, 2020
4de4200
8230743: StringJoiner does not handle too large strings correctly
JimLaskey Jun 5, 2020
45fa5aa
8242088: Replace mutually exclusive lists with concurrent alternatives
Jun 5, 2020
c66bef0
8233705: Let artifact iteration running time be a function of increme…
Jun 5, 2020
06e47d0
8246622: Remove CollectedHeap::print_gc_threads_on()
pliden Jun 5, 2020
498b0e6
8246340: Move SystemDictionary GC roots into OopStorage
coleenp Jun 5, 2020
0b02c5b
8245981: Upgrade to jQuery 3.5.1
pavelrappo Jun 5, 2020
efffff1
8245874: requires.extraPropDefns.vmOpts doesn't need -Xbootclasspath/…
iignatev Jun 5, 2020
ec4240b
8246696: Test: java/util/StringJoiner/StringJoinerTest.java failing w…
JimLaskey Jun 5, 2020
13d3023
8244683: A TSA server used by tests
Jun 5, 2020
97fc959
8246132: AsynchronousSocketChannelNAPITest failing with a NotYetConne…
pconcannon Jun 5, 2020
9c3be78
8246429: Javadoc comparators are not module-aware
hns Jun 5, 2020
8d19eca
8222241: Example in ServiceLoader API docs should have one provides d…
fguallini Jun 5, 2020
a46a94c
8245068: Implement Deprecation of RMI Activation
Jun 5, 2020
71c926c
8246697: Test: java/util/StringJoiner/StringJoinerTest.java failing w…
JimLaskey Jun 5, 2020
2048bcb
8244621: [macos10.15] Garbled FX printing plus CoreText warnings on C…
Jun 5, 2020
cd651b9
8246435: Replace Javascript implementation of pandoc filters with Java
magicus Jun 6, 2020
2625942
8246484: Verify patch at start of COMPARE_BUILD=PATCH run
magicus Jun 6, 2020
ff8c6d5
8246709: sun/security/tools/jarsigner/TsacertOptionTest.java compilat…
Jun 6, 2020
be14526
8196450: Deprecate JDWP/JDI canUnrestrictedlyRedefineClasses to match…
Jun 6, 2020
35ceac0
8243597: AArch64: Add support for integer vector abs
Jun 8, 2020
a98bad2
8246453: TestClone crashes with "all collected exceptions must come f…
TobiHartmann Jun 8, 2020
7d6c1cf
8246648: issue with OperatingSystemImpl getFreeSwapSpaceSize in docke…
MBaesken Jun 8, 2020
9149f10
8241439: jdk.NativeLibraryEvent hooks all opened regular files
YaSuenag Jun 8, 2020
086c5f1
8246442: nmethod::can_convert_to_zombie() asserts when not called by …
fisk Jun 8, 2020
045d61b
8246624: Refactor JLinkBundlerHelper and StandardBundlerParam classes
Jun 8, 2020
28d2cdf
8246627: Consolidate app image bundlers
Jun 8, 2020
f87ef60
8238204: run_tests.sh fails on macOS when called from test_jpackage.sh
Jun 8, 2020
2845c3d
8245938: Remove unused print_stack(void) method from XToolkit.c
Jun 8, 2020
3943f9d
8246431: java/net/httpclient/PathSubscriber tests fail due to missing…
FrauBoes Jun 8, 2020
358714b
8246353: Sealed types not supported by jshell
Jun 8, 2020
e90621c
8246199: 'permits' is a restricted identifier
Jun 8, 2020
b073038
8246751: Mac OS build settings should use -O3
magicus Jun 8, 2020
ea9aeda
8131745: java/lang/management/ThreadMXBean/AllThreadIds.java still fa…
Jun 8, 2020
5805cbe
8081652: [TESTBUG] java/lang/management/ThreadMXBean/ThreadMXBeanStat…
Jun 8, 2020
a043bd0
8246632: StringConcatFactory::makeConcatWithConstants no longer throw…
cl4es Jun 8, 2020
785b914
8243424: Signature and SignatureSpi get parameter methods may return …
Jun 8, 2020
a748779
8246770: Atomic::add() with 64 bit value fails to link on 32-bit plat…
Jun 8, 2020
46f4bf9
8246750: Docs bundle should be published to common dir
erikj79 Jun 8, 2020
63ade9c
8236697: Stack overflow with cyclic hierarchy in class file
Jun 8, 2020
1786701
8246729: MappedByteBuffer.force() throws IndexOutOfBoundsException
Jun 8, 2020
9cd41b6
8246592: Simplify checking of boolean file attributes
cl4es Jun 8, 2020
6fc6476
8246719: remove LambdaStableNameTest from problem list
dean-long Jun 8, 2020
71d646a
8235521: Replacement API for Unsafe::ensureClassInitialized
Jun 8, 2020
976c469
8236282: [macos] Find permanent solution to macOS test timeout proble…
Jun 9, 2020
b37d806
8246706: [macos] Allow SigningPackageTest to be built with real certi…
Jun 9, 2020
dc91b06
8244614: cleanup keywords used/available in hotspot testbase
iignatev Jun 9, 2020
8dc6643
8243535: NMT may show wrong numbers for CDS and CCS
tstuefe Jun 9, 2020
82e3640
8246330: Add TLS Tests for Legacy ECDSA curves
Jun 9, 2020
4d8189b
8245203: ZGC: Don't track size in ZPhysicalMemoryBacking
pliden Jun 9, 2020
63a3d8f
8245204: ZGC: Introduce ZListRemoveIterator
pliden Jun 9, 2020
cd16b56
8246265: ZGC: Introduce ZConditionLock
pliden Jun 9, 2020
d7e68f3
8245208: ZGC: Don't hold the ZPageAllocator lock while committing/unc…
pliden Jun 9, 2020
9d0ba7a
8246220: ZGC: Introduce ZUnmapper to asynchronous unmap pages
pliden Jun 9, 2020
41c5a07
Merge
prsadhuk Jun 9, 2020
022d7a1
8236108: tools/javac/lambda/LambdaParserTest.java timed out
Jun 9, 2020
c47f27e
8236469: macOS devkit needs 64-bit SetFile for Catalina
erikj79 Jun 9, 2020
ac90616
8243999: DatagramSocket and MulticastSocket constructors don't specif…
pconcannon Jun 9, 2020
59428f4
8245958: j.l.Record need to mention that canonical constructor may no…
Jun 9, 2020
5b6f050
8245828: Remove unnecessary NetworkPermission checks from jdk/net/Ext…
pconcannon Jun 9, 2020
3df95aa
8247212: Use assistant markup in java.lang.module.ModuleDescriptor
pavelrappo Jun 9, 2020
6e43cdd
8247115: Fix typos in java.lang.invoke and java.lang
pavelrappo Jun 9, 2020
9a8ace2
8246837: Rename WeakHandle<vm_class_loader_data> to better reflect it…
fisk Jun 9, 2020
ac2828d
8164408: Add module support for @see, @link and @linkplain javadoc tags
hns Jun 9, 2020
f160c80
8244920: Access violation in frames::interpreter_frame_method
fisk Jun 9, 2020
6cbd66b
8242240: JfrStacktrace_lock rank not special enough
fisk Jun 9, 2020
201d0a4
8246689: Enable independent compressed oops/class ptrs on Aarch64
Jun 8, 2020
140a797
8237456: Transform filtered through SAX filter mishandles character e…
JoeWang-Java Jun 9, 2020
27e1686
8246662: Test java/time/test/java/time/format/TestUnicodeExtension.ja…
naotoj Jun 9, 2020
0bf3ba4
8246718: ParallelGC should not check for forward objects for copy tas…
Jun 9, 2020
b6a9f30
8241680: crypto microbenchmarks need updating for disabled EC curves
Jun 9, 2020
ee45294
8245686: Ed25519 and Ed448 present in handshake messages
Jun 10, 2020
80ae89b
8247284: Zero VM is broken after JDK-8244920 ('class JavaFrameAnchor'…
DamonFool Jun 10, 2020
56abdc1
8246712: doclint incorrectly reports some HTML elements as empty
jonathan-gibbons Jun 10, 2020
0652a78
8246705: javadoc gives "misleading" and incomplete warning message
jonathan-gibbons Jun 10, 2020
07e6b75
8242607: -Xdoclint doesn't report missing/unexpected comments
jonathan-gibbons Jun 10, 2020
8e865fc
8246926: Clean up newlines and whitespaces in hs_err files
stefank Jun 10, 2020
c58aaca
8247201: Print potential pointer value of readable stack memory in hs…
stefank Jun 10, 2020
81685b2
8247214: ZGC: ZUncommit initialization should use precious logging
stefank Jun 10, 2020
b4d09cc
8247236: fieldDescriptor::print_on_for prints extra newline after NULL
stefank Jun 10, 2020
a6df9ae
Merge
prsadhuk Jun 10, 2020
90a774b
8246272: Make use of GCLogPrecious for G1, Parallel and Serial
stefank Jun 10, 2020
0e770d1
8243655: Map.replace javadoc code snippet typo
c-cleary Jun 10, 2020
a5e03e2
8235564: javac crashes while compiling incorrect method invocation wi…
Jun 10, 2020
c4985fb
8237210: Modify the header to include Oracle copyright line
Jun 10, 2020
2e8356e
8244933: DatagramSocket.connect does not specify that it may cause da…
pconcannon Jun 10, 2020
19be497
8237354: Add option to jcmd to write a gzipped heap dump
schmelter-sap Jun 10, 2020
1dc7929
8247269: JFR: Reduce allocation when using AnnotationElement
egahlin Jun 10, 2020
7e3d4f8
8247266: Speed up test\jdk\jdk\jfr\event\gc\detailed\TestZUncommitEve…
egahlin Jun 10, 2020
65c461e
8247320: JFR: Reduce logging overhead
egahlin Jun 10, 2020
f3c2a17
8247220: Make OopHandle constructor explicit
coleenp Jun 10, 2020
d36a55d
8246591: Shenandoah: move string dedup roots scanning to concurrent p…
zhengyu123 Jun 10, 2020
191fe75
8233215: jpackage doesn't allow enough flexibility for file type binding
Jun 10, 2020
714b345
8247310: Shenandoah: pacer should not affect interrupt status
shipilev Jun 10, 2020
268d870
8231283: Add support to jpackage to create install Linux packages in …
Jun 10, 2020
847a3ba
8198698: Support Lambda proxy classes in dynamic CDS archive
calvinccheung Jun 10, 2020
bf22f82
8244719: CTW: C2 compilation fails with "assert(!VerifyHashTableKeys …
chhagedorn Jun 10, 2020
e47b2bc
8246387: switch to jtreg 5.1
iignatev Jun 10, 2020
d97168a
Merge tag 'jdk-15+27' into lworld_merge_jdk_15_27
MrSimms Jun 11, 2020
a0bc3c6
Bad merge
MrSimms Jun 11, 2020
bb22d4e
set_java_mirror_handle API changed
MrSimms Jun 11, 2020
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
@@ -644,3 +644,4 @@ f143729ca00ec14a98ea5c7f73acba88da97746e jdk-15+23
58833044988772ca06c97ab2f142474a8627af80 jdk-15+25
58833044988772ca06c97ab2f142474a8627af80 jdk-15+25
90b266a84c06f1b3dc0ed8767856793e8c1c357e jdk-15+25
0a32396f7a690015d22ca3328ac441a358295d90 jdk-15+26
@@ -103,8 +103,8 @@ ifeq ($(ENABLE_PANDOC), true)
SOURCE_FILES := $(TOPDIR)/make/scripts/pandoc-troff-manpage-filter.sh.template, \
OUTPUT_FILE := $(PANDOC_TROFF_MANPAGE_FILTER), \
REPLACEMENTS := \
@@JJS@@ => $(JJS) ; \
@@TOPDIR@@ => $(TOPDIR) ; \
@@JAVA_SMALL@@ => $(JAVA_SMALL) ; \
@@BUILDTOOLS_OUTPUTDIR@@ => $(BUILDTOOLS_OUTPUTDIR) ; \
))

# Created script must be made executable
@@ -126,8 +126,8 @@ ifeq ($(ENABLE_PANDOC), true)
SOURCE_FILES := $(TOPDIR)/make/scripts/pandoc-html-manpage-filter.sh.template, \
OUTPUT_FILE := $(PANDOC_HTML_MANPAGE_FILTER), \
REPLACEMENTS := \
@@JJS@@ => $(JJS) ; \
@@TOPDIR@@ => $(TOPDIR) ; \
@@JAVA_SMALL@@ => $(JAVA_SMALL) ; \
@@BUILDTOOLS_OUTPUTDIR@@ => $(BUILDTOOLS_OUTPUTDIR) ; \
))

# Created script must be made executable
@@ -611,9 +611,9 @@ ifeq ($(ENABLE_PANDOC), true)
# PANDOC_HTML_MANPAGE_FILTER, a wrapper around
# PANDOC_HTML_MANPAGE_FILTER_JAVASCRIPT. This is created by buildtools-jdk.

# We should also depend on the source javascript filter
PANDOC_HTML_MANPAGE_FILTER_JAVASCRIPT := \
$(TOPDIR)/make/scripts/pandoc-html-manpage-filter.js
# We should also depend on the source code for the filter
PANDOC_HTML_MANPAGE_FILTER_SOURCE := $(call FindFiles, \
$(TOPDIR)/make/jdk/src/classes/build/tools/pandocfilter)

$(foreach m, $(ALL_MODULES), \
$(eval MAN_$m := $(call FindModuleManDirs, $m)) \
@@ -633,7 +633,7 @@ ifeq ($(ENABLE_PANDOC), true)
OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
POST_PROCESS := $(TOOL_FIXUPPANDOC), \
EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
$(PANDOC_HTML_MANPAGE_FILTER_JAVASCRIPT), \
$(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \
)) \
$(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \
) \
@@ -372,6 +372,10 @@ else # $(HAS_SPEC)=true
else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
endif
PATCH_DRY_RUN := $$(shell cd $$(topdir) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
ifeq ($$(PATCH_DRY_RUN), FAILED)
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
endif
endif
ifneq ($$(COMPARE_BUILD_FAIL), true)
COMPARE_BUILD_IGNORE_RESULT := || true
@@ -687,13 +687,15 @@ define SetupRunMicroTestBody
$1_MICRO_BASIC_OPTIONS += -rff $$($1_TEST_RESULTS_DIR)/jmh-result.$(MICRO_RESULTS_FORMAT)
endif

# Set library path for native dependencies
$1_JMH_JVM_ARGS := -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native

ifneq ($$(MICRO_VM_OPTIONS)$$(MICRO_JAVA_OPTIONS), )
JMH_JVM_ARGS := $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS)
# Set library path for native dependencies
JMH_JVM_ARGS += -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native
$1_MICRO_VM_OPTIONS := -jvmArgs $(call ShellQuote,$$(JMH_JVM_ARGS))
$1_JMH_JVM_ARGS += $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS)
endif

$1_MICRO_VM_OPTIONS := -jvmArgs $(call ShellQuote,$$($1_JMH_JVM_ARGS))

ifneq ($$(MICRO_ITER), )
$1_MICRO_ITER := -i $$(MICRO_ITER)
endif
@@ -381,22 +381,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
BOOTJDK_USE_LOCAL_CDS=false
AC_MSG_RESULT([no, -XX:SharedArchiveFile not supported])
fi
# Check for jjs in bootjdk
UTIL_SETUP_TOOL(JJS,
[
AC_MSG_CHECKING([for jjs in Boot JDK])
JJS=$BOOT_JDK/bin/jjs
if test ! -x $JJS; then
AC_MSG_RESULT(not found)
JJS=""
AC_MSG_NOTICE([Cannot use pandoc without jjs])
ENABLE_PANDOC=false
else
AC_MSG_RESULT(ok)
fi
AC_SUBST(JJS)
])
])

AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
@@ -239,21 +239,11 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
C_O_FLAG_NONE="${C_O_FLAG_NONE} ${DISABLE_FORTIFY_CFLAGS}"
fi
elif test "x$TOOLCHAIN_TYPE" = xclang; then
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# On MacOSX we optimize for size, something
# we should do for all platforms?
C_O_FLAG_HIGHEST_JVM="-Os"
C_O_FLAG_HIGHEST="-Os"
C_O_FLAG_HI="-Os"
C_O_FLAG_NORM="-Os"
C_O_FLAG_DEBUG_JVM=""
else
C_O_FLAG_HIGHEST_JVM="-O3"
C_O_FLAG_HIGHEST="-O3"
C_O_FLAG_HI="-O3"
C_O_FLAG_NORM="-O2"
C_O_FLAG_DEBUG_JVM="-O0"
fi
C_O_FLAG_HIGHEST_JVM="-O3"
C_O_FLAG_HIGHEST="-O3"
C_O_FLAG_HI="-O3"
C_O_FLAG_NORM="-O2"
C_O_FLAG_DEBUG_JVM="-O0"
C_O_FLAG_SIZE="-Os"
C_O_FLAG_DEBUG="-O0"
C_O_FLAG_NONE="-O0"
@@ -625,7 +625,6 @@ JAR_CMD:=@JAR@
JLINK_CMD := @JLINK@
JMOD_CMD := @JMOD@
JARSIGNER_CMD:=@JARSIGNER@
JJS_CMD:=@JJS@
# These variables are meant to be used. They are defined with = instead of := to make
# it possible to override only the *_CMD variables.
JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
@@ -637,7 +636,6 @@ JAR=@FIXPATH@ $(JAR_CMD)
JLINK = @FIXPATH@ $(JLINK_CMD)
JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
JJS=@FIXPATH@ $(JJS_CMD) $(JAVA_TOOL_FLAGS_SMALL)

BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
@@ -199,9 +199,9 @@ ifeq ($(call isTargetOsType, unix), true)
# PANDOC_TROFF_MANPAGE_FILTER, a wrapper around
# PANDOC_TROFF_MANPAGE_FILTER_JAVASCRIPT. This is created by buildtools-jdk.

# We should also depend on the source javascript filter
PANDOC_TROFF_MANPAGE_FILTER_JAVASCRIPT := \
$(TOPDIR)/make/scripts/pandoc-troff-manpage-filter.js
# We should also depend on the source code for the filter
PANDOC_TROFF_MANPAGE_FILTER_SOURCE := $(call FindFiles, \
$(TOPDIR)/make/jdk/src/classes/build/tools/pandocfilter)

# The norm in man pages is to display code literals as bold, but pandoc
# "correctly" converts these constructs (encoded in markdown using `...`
@@ -231,7 +231,7 @@ ifeq ($(call isTargetOsType, unix), true)
@@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
EXTRA_DEPS := $(PANDOC_TROFF_MANPAGE_FILTER) \
$(PANDOC_TROFF_MANPAGE_FILTER_JAVASCRIPT), \
$(PANDOC_TROFF_MANPAGE_FILTER_SOURCE), \
))

TARGETS += $(BUILD_MAN_PAGES)
@@ -426,7 +426,10 @@ var getJibProfilesProfiles = function (input, common, data) {
target_cpu: "x64",
dependencies: ["devkit", "gtest", "pandoc", "graalunit_lib"],
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
"--with-macosx-version-max=10.9.0"),
"--with-macosx-version-max=10.9.0",
// Use system SetFile instead of the one in the devkit as the
// devkit one may not work on Catalina.
"SETFILE=/usr/bin/SetFile"),
},

"windows-x64": {
@@ -604,10 +607,6 @@ var getJibProfilesProfiles = function (input, common, data) {
dependencies: [ name + ".jdk" ],
configure_args: [
"--with-boot-jdk=" + input.get(name + ".jdk", "home_path"),
// Full docs do not currently work with bootcycle build
// since Nashorn was removed. This negates the
// --enable-full-docs from the main profile.
"--enable-full-docs=auto",
]
}
profiles[bootcyclePrebuiltName] = concatObjects(profiles[name],
@@ -688,7 +687,7 @@ var getJibProfilesProfiles = function (input, common, data) {
local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)",
remote: [
"bundles/common/jdk-" + data.version + "_doc-api-spec.tar.gz",
"bundles/linux-x64/\\1"
"bundles/common/\\1"
],
},
}
@@ -765,7 +764,7 @@ var getJibProfilesProfiles = function (input, common, data) {
profiles[cmpBaselineName].make_args = [ "COMPARE_BUILD=CONF=" ];
profiles[cmpBaselineName].configure_args = concat(
profiles[cmpBaselineName].configure_args,
"--with-hotspot-build-time=n/a",
"--with-hotspot-build-time=n/a",
"--disable-precompiled-headers");
// Do not inherit artifact definitions from base profile
delete profiles[cmpBaselineName].artifacts;
@@ -1046,10 +1045,10 @@ var getJibProfilesDependencies = function (input, common) {
jtreg: {
server: "jpg",
product: "jtreg",
version: "5.0",
version: "5.1",
build_number: "b01",
checksum_file: "MD5_VALUES",
file: "bundles/jtreg_bin-5.0.zip",
file: "bundles/jtreg_bin-5.1.zip",
environment_name: "JT_HOME",
environment_path: input.get("jtreg", "home_path") + "/bin",
configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),
@@ -393,11 +393,14 @@ JDWP "Java(tm) Debug Wire Protocol"
(boolean canRedefineClasses
"Can the VM redefine classes?")
(boolean canAddMethod
"Can the VM add methods when redefining "
"classes?")
"Can the VM add methods when redefining classes? "
"<p>@Deprecated(since=\"15\") A JVM TI based JDWP back-end "
"will never set this capability to true.")
(boolean canUnrestrictedlyRedefineClasses
"Can the VM redefine classes "
"in ways that are normally restricted?")
"in ways that are normally restricted?"
"<p>@Deprecated(since=\"15\") A JVM TI based JDWP back-end "
"will never set this capability to true.")
(boolean canPopFrames
"Can the VM pop stack frames?")
(boolean canUseInstanceFilters
@@ -467,6 +470,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"<p>"
"Requires canRedefineClasses capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"<p>@Deprecated(since=\"15\") "
"In addition to the canRedefineClasses capability, the target VM must "
"have the canAddMethod capability to add methods when redefining classes, "
"or the canUnrestrictedlyRedefineClasses capability to redefine classes in ways "
@@ -143,6 +143,8 @@ JVM_InternString
JVM_Interrupt
JVM_InvokeMethod
JVM_IsArrayClass
JVM_IsCDSDumpingEnabled
JVM_IsCDSSharingEnabled
JVM_IsConstructorIx
JVM_IsHiddenClass
JVM_IsInterface
@@ -155,6 +157,7 @@ JVM_IsVMGeneratedMethodIx
JVM_LatestUserDefinedLoader
JVM_LoadLibrary
JVM_LookupDefineClass
JVM_LookupLambdaProxyClassFromArchive
JVM_MaxMemory
JVM_MaxObjectInspectionAge
JVM_MonitorNotify
@@ -171,6 +174,7 @@ JVM_RawMonitorCreate
JVM_RawMonitorDestroy
JVM_RawMonitorEnter
JVM_RawMonitorExit
JVM_RegisterLambdaProxyClassForArchiving
JVM_RegisterSignal
JVM_ReleaseUTF
JVM_ResumeThread
@@ -0,0 +1,108 @@
package build.tools.pandocfilter;

import build.tools.pandocfilter.json.JSON;
import build.tools.pandocfilter.json.JSONArray;
import build.tools.pandocfilter.json.JSONObject;
import build.tools.pandocfilter.json.JSONString;
import build.tools.pandocfilter.json.JSONValue;

import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.InputStreamReader;
import java.util.Map;

public class PandocFilter {
/**
* Traverse a tree of pandoc format objects, calling callback on each
* element, and replacing it if callback returns a new object.
* <p>
* Inspired by the walk method in
* https://github.com/jgm/pandocfilters/blob/master/pandocfilters.py
*/
public JSONValue traverse(JSONValue obj, Callback callback, boolean deep) {
if (obj instanceof JSONArray) {
JSONArray array = (JSONArray) obj;

JSONArray processed_array = new JSONArray();
for (JSONValue elem : array) {
if (elem instanceof JSONObject && elem.contains("t")) {
JSONValue replacement = callback.invoke(elem.get("t").asString(), elem.contains("c") ? elem.get("c") : new JSONArray());
if (replacement == null) {
// no replacement object returned, use original
processed_array.add(traverse(elem, callback, deep));
} else if (replacement instanceof JSONArray) {
// array of objects returned, splice all elements into array
JSONArray replacement_array = (JSONArray) replacement;
for (JSONValue repl_elem : replacement_array) {
processed_array.add(traverse(repl_elem, callback, deep));
}
} else {
// replacement object given, traverse it
processed_array.add(traverse(replacement, callback, deep));
}
} else {
processed_array.add(traverse(elem, callback, deep));
}
}
return processed_array;
} else if (obj instanceof JSONObject) {
if (deep && obj.contains("t")) {
JSONValue replacement = callback.invoke(obj.get("t").asString(), obj.contains("c") ? obj.get("c") : new JSONArray());
if (replacement != null) {
return replacement;
}
} JSONObject obj_obj = (JSONObject) obj;
var processed_obj = new JSONObject();
for (String key : obj_obj.keys()) {
processed_obj.put(key, traverse(obj_obj.get(key), callback, deep));
}
return processed_obj;
} else {
return obj;
}
}

public JSONValue createPandocNode(String type, JSONValue content) {
if (content == null) {
return new JSONObject(Map.of(
"t", new JSONString(type)));
} else {
return new JSONObject(Map.of(
"t", new JSONString(type),
"c", content));
}
}

public JSONValue createPandocNode(String type) {
return createPandocNode(type, null);
}

/*
* Helper constructors to create pandoc format objects
*/
public JSONValue createSpace() {
return createPandocNode("Space");
}

public JSONValue createStr(String string) {
return createPandocNode("Str", new JSONString(string));
}

public static JSONValue loadJson(String[] args) throws FileNotFoundException {
StringBuffer input = new StringBuffer();
InputStreamReader reader;
if (args.length > 0)
reader = new FileReader(args[0]);
else {
reader = new InputStreamReader(System.in);
}
new BufferedReader(reader).lines().forEach(line -> input.append(line));

return JSON.parse(input.toString());
}

public interface Callback {
JSONValue invoke(String type, JSONValue value);
}
}