Skip to content

Commit 31cccbe

Browse files
prsadhukprsadhuk
committedAug 29, 2020
Merge
·
JEP-429-branchpoint
2 parents 33ee441 + c8b6cfb commit 31cccbe

36 files changed

+286
-282
lines changed
 

‎make/Bundles.gmk

+1-11
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,6 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
242242
)
243243

244244
JDK_SYMBOLS_BUNDLE_FILES := \
245-
$(filter \
246-
$(JDK_SYMBOLS_EXCLUDE_PATTERN) \
247-
$(SYMBOLS_EXCLUDE_PATTERN) \
248-
, \
249-
$(filter-out \
250-
$(JDK_IMAGE_HOMEDIR)/demo/% %.stripped.pdb \
251-
, \
252-
$(ALL_JDK_SYMBOLS_FILES) \
253-
) \
254-
) \
255245
$(call FindFiles, $(SYMBOLS_IMAGE_DIR))
256246

257247
TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
@@ -383,7 +373,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
383373
$(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
384374
BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
385375
FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
386-
BASE_DIRS := $(JDK_SYMBOLS_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \
376+
BASE_DIRS := $(SYMBOLS_IMAGE_DIR), \
387377
SUBDIR := $(JDK_BUNDLE_SUBDIR), \
388378
UNZIP_DEBUGINFO := true, \
389379
))

‎make/Images.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ endif
238238
ALL_JDK_MODULES := $(JDK_MODULES)
239239
ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
240240
$(call FindTransitiveDepsForModule, $m)))
241+
ALL_SYMBOLS_MODULES := $(JDK_MODULES)
241242

242243
ifeq ($(call isTargetOs, windows), true)
243244
LIBS_TARGET_SUBDIR := bin
@@ -293,6 +294,7 @@ SetupCopyDebuginfo = \
293294
# implementation above.
294295
$(call SetupCopyDebuginfo,JDK)
295296
$(call SetupCopyDebuginfo,JRE)
297+
$(call SetupCopyDebuginfo,SYMBOLS)
296298

297299
################################################################################
298300

‎make/MacBundles.gmk

+10-11
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ ifeq ($(call isTargetOs, macosx), true)
3838

3939
MACOSX_PLIST_SRC := $(TOPDIR)/make/data/bundle
4040

41-
BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT)
4241
BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_SHORT)
4342
BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_STRING)
44-
BUNDLE_PLATFORM_VERSION := $(VERSION_FEATURE).$(VERSION_INTERIM)
45-
BUNDLE_VERSION := $(VERSION_NUMBER)
4643
ifeq ($(COMPANY_NAME), N/A)
4744
BUNDLE_VENDOR := UNDEFINED
4845
else
@@ -75,24 +72,26 @@ ifeq ($(call isTargetOs, macosx), true)
7572
SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist, \
7673
OUTPUT_FILE := $(JDK_MACOSX_CONTENTS_DIR)/Info.plist, \
7774
REPLACEMENTS := \
78-
@@ID@@ => $(BUNDLE_ID).jdk ; \
75+
@@ID@@ => $(MACOSX_BUNDLE_ID_BASE).jdk ; \
7976
@@NAME@@ => $(BUNDLE_NAME) ; \
8077
@@INFO@@ => $(BUNDLE_INFO) ; \
81-
@@PLATFORM_VERSION@@ => $(BUNDLE_PLATFORM_VERSION) ; \
82-
@@VERSION@@ => $(BUNDLE_VERSION) ; \
83-
@@VENDOR@@ => $(BUNDLE_VENDOR) , \
78+
@@VERSION@@ => $(VERSION_NUMBER) ; \
79+
@@BUILD_VERSION@@ => $(MACOSX_BUNDLE_BUILD_VERSION) ; \
80+
@@VENDOR@@ => $(BUNDLE_VENDOR) ; \
81+
@@MACOSX_VERSION_MIN@@ => $(MACOSX_VERSION_MIN) , \
8482
))
8583

8684
$(eval $(call SetupTextFileProcessing, BUILD_JRE_PLIST, \
8785
SOURCE_FILES := $(MACOSX_PLIST_SRC)/JRE-Info.plist, \
8886
OUTPUT_FILE := $(JRE_MACOSX_CONTENTS_DIR)/Info.plist, \
8987
REPLACEMENTS := \
90-
@@ID@@ => $(BUNDLE_ID).jre ; \
88+
@@ID@@ => $(MACOSX_BUNDLE_ID_BASE).jre ; \
9189
@@NAME@@ => $(BUNDLE_NAME) ; \
9290
@@INFO@@ => $(BUNDLE_INFO) ; \
93-
@@PLATFORM_VERSION@@ => $(BUNDLE_PLATFORM_VERSION) ; \
94-
@@VERSION@@ => $(BUNDLE_VERSION) ; \
95-
@@VENDOR@@ => $(BUNDLE_VENDOR) , \
91+
@@VERSION@@ => $(VERSION_NUMBER) ; \
92+
@@BUILD_VERSION@@ => $(BUNDLE_BUILD_VERSION) ; \
93+
@@VENDOR@@ => $(BUNDLE_VENDOR) ; \
94+
@@MACOSX_VERSION_MIN@@ => $(MACOSX_VERSION_MIN) , \
9695
))
9796

9897
$(SUPPORT_OUTPUTDIR)/images/_jdk_bundle_attribute_set: $(COPY_JDK_IMAGE)

‎make/autoconf/jdk-version.m4

+54-28
Original file line numberDiff line numberDiff line change
@@ -67,34 +67,6 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
6767
AC_SUBST(JDK_RC_PLATFORM_NAME)
6868
AC_SUBST(HOTSPOT_VM_DISTRO)
6969
70-
# Set the MACOSX Bundle Name base
71-
AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base],
72-
[Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names.
73-
@<:@not specified@:>@])])
74-
if test "x$with_macosx_bundle_name_base" = xyes; then
75-
AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value])
76-
elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then
77-
AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base])
78-
elif test "x$with_macosx_bundle_name_base" != x; then
79-
# Set MACOSX_BUNDLE_NAME_BASE to the configured value.
80-
MACOSX_BUNDLE_NAME_BASE="$with_macosx_bundle_name_base"
81-
fi
82-
AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
83-
84-
# Set the MACOSX Bundle ID base
85-
AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base],
86-
[Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs.
87-
@<:@not specified@:>@])])
88-
if test "x$with_macosx_bundle_id_base" = xyes; then
89-
AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value])
90-
elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then
91-
AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base])
92-
elif test "x$with_macosx_bundle_id_base" != x; then
93-
# Set MACOSX_BUNDLE_ID_BASE to the configured value.
94-
MACOSX_BUNDLE_ID_BASE="$with_macosx_bundle_id_base"
95-
fi
96-
AC_SUBST(MACOSX_BUNDLE_ID_BASE)
97-
9870
# Set the JDK RC name
9971
AC_ARG_WITH(jdk-rc-name, [AS_HELP_STRING([--with-jdk-rc-name],
10072
[Set JDK RC name. This is used for FileDescription and ProductName properties
@@ -502,6 +474,60 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
502474
VENDOR_VERSION_STRING="$with_vendor_version_string"
503475
fi
504476
477+
# Set the MACOSX Bundle Name base
478+
AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base],
479+
[Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names.
480+
@<:@not specified@:>@])])
481+
if test "x$with_macosx_bundle_name_base" = xyes; then
482+
AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value])
483+
elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then
484+
AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base])
485+
elif test "x$with_macosx_bundle_name_base" != x; then
486+
# Set MACOSX_BUNDLE_NAME_BASE to the configured value.
487+
MACOSX_BUNDLE_NAME_BASE="$with_macosx_bundle_name_base"
488+
fi
489+
AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
490+
491+
# Set the MACOSX Bundle ID base
492+
AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base],
493+
[Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs.
494+
@<:@not specified@:>@])])
495+
if test "x$with_macosx_bundle_id_base" = xyes; then
496+
AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value])
497+
elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then
498+
AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base])
499+
elif test "x$with_macosx_bundle_id_base" != x; then
500+
# Set MACOSX_BUNDLE_ID_BASE to the configured value.
501+
MACOSX_BUNDLE_ID_BASE="$with_macosx_bundle_id_base"
502+
else
503+
# If using the default value, append the VERSION_PRE if there is one
504+
# to make it possible to tell official builds apart from developer builds
505+
if test "x$VERSION_PRE" != x; then
506+
MACOSX_BUNDLE_ID_BASE="$MACOSX_BUNDLE_ID_BASE-$VERSION_PRE"
507+
fi
508+
fi
509+
AC_SUBST(MACOSX_BUNDLE_ID_BASE)
510+
511+
# Set the MACOSX CFBundleVersion field
512+
AC_ARG_WITH(macosx-bundle-build-version, [AS_HELP_STRING([--with-macosx-bundle-build-version],
513+
[Set the MacOSX Bundle CFBundleVersion field. This key is a machine-readable
514+
string composed of one to three period-separated integers and should represent the
515+
build version. Defaults to the build number.])])
516+
if test "x$with_macosx_bundle_build_version" = xyes; then
517+
AC_MSG_ERROR([--with-macosx-bundle-build-version must have a value])
518+
elif [ ! [[ $with_macosx_bundle_build_version =~ ^[0-9\.]*$ ]] ]; then
519+
AC_MSG_ERROR([--with-macosx-bundle-build-version contains non numbers and periods: $with_macosx_bundle_build_version])
520+
elif test "x$with_macosx_bundle_build_version" != x; then
521+
MACOSX_BUNDLE_BUILD_VERSION="$with_macosx_bundle_build_version"
522+
else
523+
MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
524+
# If VERSION_OPT consists of only numbers and periods, add it.
525+
if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
526+
MACOSX_BUNDLE_BUILD_VERSION+=".$VERSION_OPT"
527+
fi
528+
fi
529+
AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION)
530+
505531
# We could define --with flags for these, if really needed
506532
VERSION_CLASSFILE_MAJOR="$DEFAULT_VERSION_CLASSFILE_MAJOR"
507533
VERSION_CLASSFILE_MINOR="$DEFAULT_VERSION_CLASSFILE_MINOR"

‎make/autoconf/spec.gmk.in

+1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ COMPANY_NAME:=@COMPANY_NAME@
170170
HOTSPOT_VM_DISTRO:=@HOTSPOT_VM_DISTRO@
171171
MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
172172
MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
173+
MACOSX_BUNDLE_BUILD_VERSION=@MACOSX_BUNDLE_BUILD_VERSION@
173174
USERNAME:=@USERNAME@
174175
VENDOR_URL:=@VENDOR_URL@
175176
VENDOR_URL_BUG:=@VENDOR_URL_BUG@

‎make/common/modules/LauncherCommon.gmk

+9-5
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,19 @@ define SetupBuildLauncherBody
102102

103103
ifeq ($(call isTargetOs, macosx), true)
104104
ifeq ($$($1_MACOSX_PRIVILEGED), true)
105-
$1_PLIST_SRC_FILE := Info-privileged.plist
106-
else
107-
$1_PLIST_SRC_FILE := Info-cmdline.plist
105+
$1_PLIST_EXTRA := <key>SecTaskAccess</key><string>allowed</string>
108106
endif
109107

110108
$1_PLIST_FILE := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/$1/Info.plist
111109

112110
$$(eval $$(call SetupTextFileProcessing, BUILD_PLIST_$1, \
113-
SOURCE_FILES := $$(TOPDIR)/src/java.base/macosx/native/launcher/$$($1_PLIST_SRC_FILE), \
111+
SOURCE_FILES := $(TOPDIR)/make/data/bundle/cmdline-Info.plist, \
114112
OUTPUT_FILE := $$($1_PLIST_FILE), \
115113
REPLACEMENTS := \
116-
@@ID@@ => $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT).$1 ; \
114+
@@ID@@ => $(MACOSX_BUNDLE_ID_BASE).$1 ; \
117115
@@VERSION@@ => $(VERSION_NUMBER) ; \
116+
@@BUILD_VERSION@@ => $(MACOSX_BUNDLE_BUILD_VERSION) ; \
117+
@@EXTRA@@ => $$($1_PLIST_EXTRA), \
118118
))
119119

120120
$1_LDFLAGS += -sectcreate __TEXT __info_plist $$($1_PLIST_FILE)
@@ -187,6 +187,10 @@ define SetupBuildLauncherBody
187187
$$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, java, /libjava) \
188188
$$($1_WINDOWS_JLI_LIB)
189189
endif
190+
191+
ifeq ($(call isTargetOs, macosx), true)
192+
$$(BUILD_LAUNCHER_$1): $$($1_PLIST_FILE)
193+
endif
190194
endef
191195

192196
################################################################################

‎make/conf/jib-profiles.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -1339,13 +1339,17 @@ var versionArgs = function(input, common) {
13391339
"--with-version-pre=" + version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE"),
13401340
"--without-version-opt");
13411341
} else if (input.build_type == "ci") {
1342-
var optString = input.build_id_data.ciBuildNumber;
1342+
var ciBuildNumber = input.build_id_data.ciBuildNumber;
13431343
var preString = input.build_id_data.projectName;
13441344
if (preString == "jdk") {
13451345
preString = version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE");
13461346
}
13471347
args = concat(args, "--with-version-pre=" + preString,
1348-
"--with-version-opt=" + optString);
1348+
"--with-version-opt=" + ciBuildNumber);
1349+
if (input.target_os == "macosx") {
1350+
args = concat(args, "--with-macosx-bundle-build-version="
1351+
+ common.build_number + "." + ciBuildNumber);
1352+
}
13491353
} else {
13501354
args = concat(args, "--with-version-opt=" + common.build_id);
13511355
}

‎make/data/bundle/JDK-Info.plist

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>BNDL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.0</string>
20+
<string>@@VERSION@@</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>@@VERSION@@</string>
24+
<string>@@BUILD_VERSION@@</string>
2525
<key>NSMicrophoneUsageDescription</key>
2626
<string>The application is requesting access to the microphone.</string>
2727
<key>JavaVM</key>
@@ -33,9 +33,9 @@
3333
<key>JVMMinimumFrameworkVersion</key>
3434
<string>13.2.9</string>
3535
<key>JVMMinimumSystemVersion</key>
36-
<string>10.6.0</string>
36+
<string>@@MACOSX_VERSION_MIN@@</string>
3737
<key>JVMPlatformVersion</key>
38-
<string>@@PLATFORM_VERSION@@</string>
38+
<string>@@VERSION@@</string>
3939
<key>JVMVendor</key>
4040
<string>@@VENDOR@@</string>
4141
<key>JVMVersion</key>

‎make/data/bundle/JRE-Info.plist

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
<key>CFBundlePackageType</key>
1818
<string>BNDL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.0</string>
20+
<string>@@VERSION@@</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>@@VERSION@@</string>
24+
<string>@@BUILD_VERSION@@</string>
2525
<key>NSMicrophoneUsageDescription</key>
2626
<string>The application is requesting access to the microphone.</string>
2727
<key>JavaVM</key>
2828
<dict>
2929
<key>JVMMinimumFrameworkVersion</key>
3030
<string>13.2.9</string>
3131
<key>JVMMinimumSystemVersion</key>
32-
<string>10.6.0</string>
32+
<string>@@MACOSX_VERSION_MIN@@</string>
3333
<key>JVMPlatformVersion</key>
34-
<string>@@PLATFORM_VERSION@@</string>
34+
<string>@@VERSION@@</string>
3535
<key>JVMVendor</key>
3636
<string>@@VENDOR@@</string>
3737
<key>JVMVersion</key>

‎src/java.base/macosx/native/launcher/Info-cmdline.plist ‎make/data/bundle/cmdline-Info.plist

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
<key>CFBundleInfoDictionaryVersion</key>
88
<string>6.0</string>
99
<key>CFBundleShortVersionString</key>
10-
<string>1.0</string>
11-
<key>CFBundleVersion</key>
1210
<string>@@VERSION@@</string>
11+
<key>CFBundleVersion</key>
12+
<string>@@BUILD_VERSION@@</string>
1313
<key>NSMicrophoneUsageDescription</key>
1414
<string>The application is requesting access to the microphone.</string>
15+
@@EXTRA@@
1516
</dict>
1617
</plist>

‎src/hotspot/share/gc/serial/defNewGeneration.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,6 @@ void DefNewGeneration::FastEvacuateFollowersClosure::do_void() {
105105
guarantee(_heap->young_gen()->promo_failure_scan_is_complete(), "Failed to finish scan");
106106
}
107107

108-
ScanClosure::ScanClosure(DefNewGeneration* g, bool gc_barrier) :
109-
OopsInClassLoaderDataOrGenClosure(g), _g(g), _gc_barrier(gc_barrier)
110-
{
111-
_boundary = _g->reserved().end();
112-
}
113-
114108
FastScanClosure::FastScanClosure(DefNewGeneration* g, bool gc_barrier) :
115109
OopsInClassLoaderDataOrGenClosure(g), _g(g), _gc_barrier(gc_barrier)
116110
{
@@ -430,10 +424,6 @@ void DefNewGeneration::compute_new_size() {
430424
}
431425
}
432426

433-
void DefNewGeneration::younger_refs_iterate(OopsInGenClosure* cl, uint n_threads) {
434-
assert(false, "NYI -- are you sure you want to call this?");
435-
}
436-
437427

438428
size_t DefNewGeneration::capacity() const {
439429
return eden()->capacity()

‎src/hotspot/share/gc/serial/defNewGeneration.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "utilities/stack.hpp"
3636

3737
class ContiguousSpace;
38-
class ScanClosure;
3938
class STWGCTimer;
4039
class CSpaceCounters;
4140
class ScanWeakRefClosure;
@@ -242,8 +241,6 @@ class DefNewGeneration: public Generation {
242241
// Iteration
243242
void object_iterate(ObjectClosure* blk);
244243

245-
void younger_refs_iterate(OopsInGenClosure* cl, uint n_threads);
246-
247244
void space_iterate(SpaceClosure* blk, bool usedOnly = false);
248245

249246
// Allocation support

‎src/hotspot/share/gc/serial/genMarkSweep.cpp

-12
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,6 @@ void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
178178

179179
GenCollectedHeap* gch = GenCollectedHeap::heap();
180180

181-
// Because follow_root_closure is created statically, cannot
182-
// use OopsInGenClosure constructor which takes a generation,
183-
// as the Universe has not been created when the static constructors
184-
// are run.
185-
follow_root_closure.set_orig_generation(gch->old_gen());
186-
187181
// Need new claim bits before marking starts.
188182
ClassLoaderDataGraph::clear_claimed_marks();
189183

@@ -277,12 +271,6 @@ void GenMarkSweep::mark_sweep_phase3() {
277271
// Need new claim bits for the pointer adjustment tracing.
278272
ClassLoaderDataGraph::clear_claimed_marks();
279273

280-
// Because the closure below is created statically, we cannot
281-
// use OopsInGenClosure constructor which takes a generation,
282-
// as the Universe has not been created when the static constructors
283-
// are run.
284-
adjust_pointer_closure.set_orig_generation(gch->old_gen());
285-
286274
{
287275
StrongRootsScope srs(1);
288276

‎src/hotspot/share/gc/serial/markSweep.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class MarkSweep : AllStatic {
5656
//
5757
// Inline closure decls
5858
//
59-
class FollowRootClosure: public BasicOopsInGenClosure {
59+
class FollowRootClosure: public BasicOopIterateClosure {
6060
public:
6161
virtual void do_oop(oop* p);
6262
virtual void do_oop(narrowOop* p);
@@ -185,7 +185,7 @@ class MarkAndPushClosure: public OopIterateClosure {
185185
}
186186
};
187187

188-
class AdjustPointerClosure: public BasicOopsInGenClosure {
188+
class AdjustPointerClosure: public BasicOopIterateClosure {
189189
public:
190190
template <typename T> void do_oop_work(T* p);
191191
virtual void do_oop(oop* p);

‎src/hotspot/share/gc/serial/serialHeap.cpp

+22
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "gc/serial/serialHeap.hpp"
2828
#include "gc/serial/tenuredGeneration.inline.hpp"
2929
#include "gc/shared/genMemoryPools.hpp"
30+
#include "gc/shared/strongRootsScope.hpp"
3031
#include "memory/universe.hpp"
3132
#include "services/memoryManager.hpp"
3233

@@ -87,3 +88,24 @@ GrowableArray<MemoryPool*> SerialHeap::memory_pools() {
8788
memory_pools.append(_old_pool);
8889
return memory_pools;
8990
}
91+
92+
void SerialHeap::young_process_roots(StrongRootsScope* scope,
93+
OopsInGenClosure* root_closure,
94+
OopsInGenClosure* old_gen_closure,
95+
CLDClosure* cld_closure) {
96+
MarkingCodeBlobClosure mark_code_closure(root_closure, CodeBlobToOopClosure::FixRelocations);
97+
98+
process_roots(scope, SO_ScavengeCodeCache, root_closure,
99+
cld_closure, cld_closure, &mark_code_closure);
100+
101+
if (_process_strong_tasks->try_claim_task(GCH_PS_younger_gens)) {
102+
root_closure->reset_generation();
103+
}
104+
105+
old_gen_closure->set_generation(_old_gen);
106+
rem_set()->at_younger_refs_iterate();
107+
old_gen()->younger_refs_iterate(old_gen_closure, scope->n_threads());
108+
old_gen_closure->reset_generation();
109+
110+
_process_strong_tasks->all_tasks_completed(scope->n_threads());
111+
}

‎src/hotspot/share/gc/serial/serialHeap.hpp

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
class GCMemoryManager;
3434
class MemoryPool;
35+
class OopsInGenClosure;
3536
class TenuredGeneration;
3637

3738
class SerialHeap : public GenCollectedHeap {
@@ -75,6 +76,11 @@ class SerialHeap : public GenCollectedHeap {
7576
template <typename OopClosureType1, typename OopClosureType2>
7677
void oop_since_save_marks_iterate(OopClosureType1* cur,
7778
OopClosureType2* older);
79+
80+
void young_process_roots(StrongRootsScope* scope,
81+
OopsInGenClosure* root_closure,
82+
OopsInGenClosure* old_gen_closure,
83+
CLDClosure* cld_closure);
7884
};
7985

8086
#endif // SHARE_GC_SERIAL_SERIALHEAP_HPP

‎src/hotspot/share/gc/shared/cardGeneration.cpp

+9-4
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,13 @@ void CardGeneration::space_iterate(SpaceClosure* blk,
307307
blk->do_space(space());
308308
}
309309

310-
void CardGeneration::younger_refs_iterate(OopsInGenClosure* blk, uint n_threads) {
311-
blk->set_generation(this);
312-
younger_refs_in_space_iterate(space(), blk, n_threads);
313-
blk->reset_generation();
310+
void CardGeneration::younger_refs_iterate(OopIterateClosure* blk, uint n_threads) {
311+
// Apply "cl->do_oop" to (the address of) (exactly) all the ref fields in
312+
// "sp" that point into younger generations.
313+
// The iteration is only over objects allocated at the start of the
314+
// iterations; objects allocated as a result of applying the closure are
315+
// not included.
316+
317+
HeapWord* gen_boundary = reserved().start();
318+
_rs->younger_refs_in_space_iterate(space(), gen_boundary, blk, n_threads);
314319
}

‎src/hotspot/share/gc/shared/cardGeneration.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class CardGeneration: public Generation {
8989

9090
void space_iterate(SpaceClosure* blk, bool usedOnly = false);
9191

92-
void younger_refs_iterate(OopsInGenClosure* blk, uint n_threads);
92+
void younger_refs_iterate(OopIterateClosure* blk, uint n_threads);
9393

9494
bool is_in(const void* p) const;
9595

‎src/hotspot/share/gc/shared/cardTableRS.cpp

+8-9
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,10 @@ void CardTableRS::prepare_for_younger_refs_iterate(bool parallel) {
112112
}
113113
}
114114

115-
void CardTableRS::younger_refs_iterate(Generation* g,
116-
OopsInGenClosure* blk,
117-
uint n_threads) {
115+
void CardTableRS::at_younger_refs_iterate() {
118116
// The indexing in this array is slightly odd. We want to access
119117
// the old generation record here, which is at index 2.
120118
_last_cur_val_in_gen[2] = cur_youngergen_card_val();
121-
g->younger_refs_iterate(blk, n_threads);
122119
}
123120

124121
inline bool ClearNoncleanCardWrapper::clear_card(CardValue* entry) {
@@ -245,12 +242,13 @@ void ClearNoncleanCardWrapper::do_MemRegion(MemRegion mr) {
245242
}
246243

247244
void CardTableRS::younger_refs_in_space_iterate(Space* sp,
248-
OopsInGenClosure* cl,
245+
HeapWord* gen_boundary,
246+
OopIterateClosure* cl,
249247
uint n_threads) {
250248
verify_used_region_at_save_marks(sp);
251249

252250
const MemRegion urasm = sp->used_region_at_save_marks();
253-
non_clean_card_iterate_possibly_parallel(sp, urasm, cl, this, n_threads);
251+
non_clean_card_iterate_possibly_parallel(sp, gen_boundary, urasm, cl, this, n_threads);
254252
}
255253

256254
#ifdef ASSERT
@@ -624,8 +622,9 @@ bool CardTableRS::card_may_have_been_dirty(CardValue cv) {
624622

625623
void CardTableRS::non_clean_card_iterate_possibly_parallel(
626624
Space* sp,
625+
HeapWord* gen_boundary,
627626
MemRegion mr,
628-
OopsInGenClosure* cl,
627+
OopIterateClosure* cl,
629628
CardTableRS* ct,
630629
uint n_threads)
631630
{
@@ -638,7 +637,7 @@ void CardTableRS::non_clean_card_iterate_possibly_parallel(
638637
// This is the single-threaded version used by DefNew.
639638
const bool parallel = false;
640639

641-
DirtyCardToOopClosure* dcto_cl = sp->new_dcto_cl(cl, precision(), cl->gen_boundary(), parallel);
640+
DirtyCardToOopClosure* dcto_cl = sp->new_dcto_cl(cl, precision(), gen_boundary, parallel);
642641
ClearNoncleanCardWrapper clear_cl(dcto_cl, ct, parallel);
643642

644643
clear_cl.do_MemRegion(mr);
@@ -647,7 +646,7 @@ void CardTableRS::non_clean_card_iterate_possibly_parallel(
647646
}
648647

649648
void CardTableRS::non_clean_card_iterate_parallel_work(Space* sp, MemRegion mr,
650-
OopsInGenClosure* cl, CardTableRS* ct,
649+
OopIterateClosure* cl, CardTableRS* ct,
651650
uint n_threads) {
652651
fatal("Parallel gc not supported here.");
653652
}

‎src/hotspot/share/gc/shared/cardTableRS.hpp

+7-10
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
class DirtyCardToOopClosure;
3333
class Generation;
3434
class Space;
35-
class OopsInGenClosure;
3635

3736
// Helper to remember modified oops in all clds.
3837
class CLDRemSet {
@@ -104,17 +103,15 @@ class CardTableRS: public CardTable {
104103

105104
CLDRemSet* cld_rem_set() { return &_cld_rem_set; }
106105

107-
void younger_refs_in_space_iterate(Space* sp, OopsInGenClosure* cl, uint n_threads);
106+
void younger_refs_in_space_iterate(Space* sp, HeapWord* gen_boundary, OopIterateClosure* cl, uint n_threads);
108107

109108
virtual void verify_used_region_at_save_marks(Space* sp) const NOT_DEBUG_RETURN;
110109

111110
// Override.
112111
void prepare_for_younger_refs_iterate(bool parallel);
113112

114-
// Card table entries are cleared before application; "blk" is
115-
// responsible for dirtying if the oop is still older-to-younger after
116-
// closure application.
117-
void younger_refs_iterate(Generation* g, OopsInGenClosure* blk, uint n_threads);
113+
// Card table entries are cleared before application;
114+
void at_younger_refs_iterate();
118115

119116
void inline_write_ref_field_gc(void* field, oop new_val) {
120117
CardValue* byte = byte_for(field);
@@ -165,14 +162,14 @@ class CardTableRS: public CardTable {
165162
// Iterate over the portion of the card-table which covers the given
166163
// region mr in the given space and apply cl to any dirty sub-regions
167164
// of mr. Clears the dirty cards as they are processed.
168-
void non_clean_card_iterate_possibly_parallel(Space* sp, MemRegion mr,
169-
OopsInGenClosure* cl, CardTableRS* ct,
170-
uint n_threads);
165+
void non_clean_card_iterate_possibly_parallel(Space* sp, HeapWord* gen_boundary,
166+
MemRegion mr, OopIterateClosure* cl,
167+
CardTableRS* ct, uint n_threads);
171168

172169
// Work method used to implement non_clean_card_iterate_possibly_parallel()
173170
// above in the parallel case.
174171
virtual void non_clean_card_iterate_parallel_work(Space* sp, MemRegion mr,
175-
OopsInGenClosure* cl, CardTableRS* ct,
172+
OopIterateClosure* cl, CardTableRS* ct,
176173
uint n_threads);
177174

178175
// This is an array, one element per covered region of the card table.

‎src/hotspot/share/gc/shared/genCollectedHeap.cpp

+1-23
Original file line numberDiff line numberDiff line change
@@ -850,33 +850,11 @@ void GenCollectedHeap::process_roots(StrongRootsScope* scope,
850850
}
851851
}
852852

853-
void GenCollectedHeap::young_process_roots(StrongRootsScope* scope,
854-
OopsInGenClosure* root_closure,
855-
OopsInGenClosure* old_gen_closure,
856-
CLDClosure* cld_closure) {
857-
MarkingCodeBlobClosure mark_code_closure(root_closure, CodeBlobToOopClosure::FixRelocations);
858-
859-
process_roots(scope, SO_ScavengeCodeCache, root_closure,
860-
cld_closure, cld_closure, &mark_code_closure);
861-
862-
if (_process_strong_tasks->try_claim_task(GCH_PS_younger_gens)) {
863-
root_closure->reset_generation();
864-
}
865-
866-
// When collection is parallel, all threads get to cooperate to do
867-
// old generation scanning.
868-
old_gen_closure->set_generation(_old_gen);
869-
rem_set()->younger_refs_iterate(_old_gen, old_gen_closure, scope->n_threads());
870-
old_gen_closure->reset_generation();
871-
872-
_process_strong_tasks->all_tasks_completed(scope->n_threads());
873-
}
874-
875853
void GenCollectedHeap::full_process_roots(StrongRootsScope* scope,
876854
bool is_adjust_phase,
877855
ScanningOption so,
878856
bool only_strong_roots,
879-
OopsInGenClosure* root_closure,
857+
OopClosure* root_closure,
880858
CLDClosure* cld_closure) {
881859
MarkingCodeBlobClosure mark_code_closure(root_closure, is_adjust_phase);
882860
CLDClosure* weak_cld_closure = only_strong_roots ? NULL : cld_closure;

‎src/hotspot/share/gc/shared/genCollectedHeap.hpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -371,16 +371,11 @@ class GenCollectedHeap : public CollectedHeap {
371371
virtual void gc_epilogue(bool full);
372372

373373
public:
374-
void young_process_roots(StrongRootsScope* scope,
375-
OopsInGenClosure* root_closure,
376-
OopsInGenClosure* old_gen_closure,
377-
CLDClosure* cld_closure);
378-
379374
void full_process_roots(StrongRootsScope* scope,
380375
bool is_adjust_phase,
381376
ScanningOption so,
382377
bool only_strong_roots,
383-
OopsInGenClosure* root_closure,
378+
OopClosure* root_closure,
384379
CLDClosure* cld_closure);
385380

386381
// Apply "root_closure" to all the weak roots of the system.

‎src/hotspot/share/gc/shared/genOopClosures.hpp

+3-33
Original file line numberDiff line numberDiff line change
@@ -58,28 +58,16 @@ class OopsInGenClosure : public OopIterateClosure {
5858
template <class T> void do_barrier(T* p);
5959

6060
public:
61-
OopsInGenClosure() : OopIterateClosure(NULL),
62-
_orig_gen(NULL), _gen(NULL), _gen_boundary(NULL), _rs(NULL) {};
63-
6461
OopsInGenClosure(Generation* gen);
6562
void set_generation(Generation* gen);
6663

6764
void reset_generation() { _gen = _orig_gen; }
6865

69-
// Problem with static closures: must have _gen_boundary set at some point,
70-
// but cannot do this until after the heap is initialized.
71-
void set_orig_generation(Generation* gen) {
72-
_orig_gen = gen;
73-
set_generation(gen);
74-
}
75-
7666
HeapWord* gen_boundary() { return _gen_boundary; }
77-
7867
};
7968

8069
class BasicOopsInGenClosure: public OopsInGenClosure {
8170
public:
82-
BasicOopsInGenClosure() : OopsInGenClosure() {}
8371
BasicOopsInGenClosure(Generation* gen);
8472

8573
virtual bool do_metadata() { return false; }
@@ -102,27 +90,10 @@ class OopsInClassLoaderDataOrGenClosure: public BasicOopsInGenClosure {
10290

10391
#if INCLUDE_SERIALGC
10492

105-
// Closure for scanning DefNewGeneration.
106-
//
107-
// This closure will perform barrier store calls for ALL
108-
// pointers in scanned oops.
109-
class ScanClosure: public OopsInClassLoaderDataOrGenClosure {
110-
private:
111-
DefNewGeneration* _g;
112-
HeapWord* _boundary;
113-
bool _gc_barrier;
114-
template <class T> inline void do_oop_work(T* p);
115-
public:
116-
ScanClosure(DefNewGeneration* g, bool gc_barrier);
117-
virtual void do_oop(oop* p);
118-
virtual void do_oop(narrowOop* p);
119-
};
120-
12193
// Closure for scanning DefNewGeneration.
12294
//
12395
// This closure only performs barrier store calls on
124-
// pointers into the DefNewGeneration. This is less
125-
// precise, but faster, than a ScanClosure
96+
// pointers into the DefNewGeneration.
12697
class FastScanClosure: public OopsInClassLoaderDataOrGenClosure {
12798
protected:
12899
DefNewGeneration* _g;
@@ -168,9 +139,8 @@ class FilteringClosure: public OopIterateClosure {
168139
#if INCLUDE_SERIALGC
169140

170141
// Closure for scanning DefNewGeneration's weak references.
171-
// NOTE: very much like ScanClosure but not derived from
172-
// OopsInGenClosure -- weak references are processed all
173-
// at once, with no notion of which generation they were in.
142+
// -- weak references are processed all at once,
143+
// with no notion of which generation they were in.
174144
class ScanWeakRefClosure: public OopClosure {
175145
protected:
176146
DefNewGeneration* _g;

‎src/hotspot/share/gc/shared/genOopClosures.inline.hpp

+1-29
Original file line numberDiff line numberDiff line change
@@ -74,34 +74,6 @@ inline void OopsInClassLoaderDataOrGenClosure::do_cld_barrier() {
7474

7575
#if INCLUDE_SERIALGC
7676

77-
// NOTE! Any changes made here should also be made
78-
// in FastScanClosure::do_oop_work()
79-
template <class T> inline void ScanClosure::do_oop_work(T* p) {
80-
T heap_oop = RawAccess<>::oop_load(p);
81-
// Should we copy the obj?
82-
if (!CompressedOops::is_null(heap_oop)) {
83-
oop obj = CompressedOops::decode_not_null(heap_oop);
84-
if (cast_from_oop<HeapWord*>(obj) < _boundary) {
85-
assert(!_g->to()->is_in_reserved(obj), "Scanning field twice?");
86-
oop new_obj = obj->is_forwarded() ? obj->forwardee()
87-
: _g->copy_to_survivor_space(obj);
88-
RawAccess<IS_NOT_NULL>::oop_store(p, new_obj);
89-
}
90-
91-
if (is_scanning_a_cld()) {
92-
do_cld_barrier();
93-
} else if (_gc_barrier) {
94-
// Now call parent closure
95-
do_barrier(p);
96-
}
97-
}
98-
}
99-
100-
inline void ScanClosure::do_oop(oop* p) { ScanClosure::do_oop_work(p); }
101-
inline void ScanClosure::do_oop(narrowOop* p) { ScanClosure::do_oop_work(p); }
102-
103-
// NOTE! Any changes made here should also be made
104-
// in ScanClosure::do_oop_work()
10577
template <class T> inline void FastScanClosure::do_oop_work(T* p) {
10678
T heap_oop = RawAccess<>::oop_load(p);
10779
// Should we copy the obj?
@@ -142,7 +114,7 @@ inline void FilteringClosure::do_oop(narrowOop* p) { FilteringClosure::do_oop_wo
142114

143115
#if INCLUDE_SERIALGC
144116

145-
// Note similarity to ScanClosure; the difference is that
117+
// Note similarity to FastScanClosure; the difference is that
146118
// the barrier set is taken care of outside this closure.
147119
template <class T> inline void ScanWeakRefClosure::do_oop_work(T* p) {
148120
oop obj = RawAccess<IS_NOT_NULL>::oop_load(p);

‎src/hotspot/share/gc/shared/generation.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,6 @@ void Generation::oop_iterate(OopIterateClosure* cl) {
264264
space_iterate(&blk);
265265
}
266266

267-
void Generation::younger_refs_in_space_iterate(Space* sp,
268-
OopsInGenClosure* cl,
269-
uint n_threads) {
270-
CardTableRS* rs = GenCollectedHeap::heap()->rem_set();
271-
rs->younger_refs_in_space_iterate(sp, cl, n_threads);
272-
}
273-
274267
class GenerationObjIterateClosure : public SpaceClosure {
275268
private:
276269
ObjectClosure* _cl;

‎src/hotspot/share/gc/shared/generation.hpp

-15
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ class GenerationSpec;
5555
class CompactibleSpace;
5656
class ContiguousSpace;
5757
class CompactPoint;
58-
class OopsInGenClosure;
5958
class OopClosure;
60-
class ScanClosure;
6159
class FastScanClosure;
6260
class GenCollectedHeap;
6361
class GCStats;
@@ -103,13 +101,6 @@ class Generation: public CHeapObj<mtGC> {
103101
// Initialize the generation.
104102
Generation(ReservedSpace rs, size_t initial_byte_size);
105103

106-
// Apply "cl->do_oop" to (the address of) (exactly) all the ref fields in
107-
// "sp" that point into younger generations.
108-
// The iteration is only over objects allocated at the start of the
109-
// iterations; objects allocated as a result of applying the closure are
110-
// not included.
111-
void younger_refs_in_space_iterate(Space* sp, OopsInGenClosure* cl, uint n_threads);
112-
113104
public:
114105
// The set of possible generation kinds.
115106
enum Name {
@@ -450,12 +441,6 @@ class Generation: public CHeapObj<mtGC> {
450441
// each.
451442
virtual void object_iterate(ObjectClosure* cl);
452443

453-
// Apply "cl->do_oop" to (the address of) all and only all the ref fields
454-
// in the current generation that contain pointers to objects in younger
455-
// generations. Objects allocated since the last "save_marks" call are
456-
// excluded.
457-
virtual void younger_refs_iterate(OopsInGenClosure* cl, uint n_threads) = 0;
458-
459444
// Inform a generation that it longer contains references to objects
460445
// in any younger generation. [e.g. Because younger gens are empty,
461446
// clear the card table.]

‎src/hotspot/share/oops/oop.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
// Forward declarations.
4444
class OopClosure;
45-
class ScanClosure;
4645
class FastScanClosure;
4746
class FilteringClosure;
4847

‎src/java.base/macosx/native/launcher/Info-privileged.plist

-18
This file was deleted.

‎src/java.base/share/classes/java/net/URI.java

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -34,14 +34,14 @@
3434
import java.nio.ByteBuffer;
3535
import java.nio.CharBuffer;
3636
import java.nio.charset.CharsetDecoder;
37+
import java.nio.charset.CharsetEncoder;
3738
import java.nio.charset.CoderResult;
3839
import java.nio.charset.CodingErrorAction;
3940
import java.nio.charset.CharacterCodingException;
4041
import java.nio.file.Path;
4142
import java.text.Normalizer;
4243
import jdk.internal.access.JavaNetUriAccess;
4344
import jdk.internal.access.SharedSecrets;
44-
import sun.nio.cs.ThreadLocalCoders;
4545
import sun.nio.cs.UTF_8;
4646

4747
import java.lang.Character; // for javadoc
@@ -2761,11 +2761,10 @@ private static void appendEscape(StringBuilder sb, byte b) {
27612761
sb.append(hexDigits[(b >> 0) & 0x0f]);
27622762
}
27632763

2764-
private static void appendEncoded(StringBuilder sb, char c) {
2764+
private static void appendEncoded(CharsetEncoder encoder, StringBuilder sb, char c) {
27652765
ByteBuffer bb = null;
27662766
try {
2767-
bb = ThreadLocalCoders.encoderFor(UTF_8.INSTANCE)
2768-
.encode(CharBuffer.wrap("" + c));
2767+
bb = encoder.encode(CharBuffer.wrap("" + c));
27692768
} catch (CharacterCodingException x) {
27702769
assert false;
27712770
}
@@ -2783,6 +2782,7 @@ private static void appendEncoded(StringBuilder sb, char c) {
27832782
//
27842783
private static String quote(String s, long lowMask, long highMask) {
27852784
StringBuilder sb = null;
2785+
CharsetEncoder encoder = null;
27862786
boolean allowNonASCII = ((lowMask & L_ESCAPED) != 0);
27872787
for (int i = 0; i < s.length(); i++) {
27882788
char c = s.charAt(i);
@@ -2800,11 +2800,13 @@ private static String quote(String s, long lowMask, long highMask) {
28002800
} else if (allowNonASCII
28012801
&& (Character.isSpaceChar(c)
28022802
|| Character.isISOControl(c))) {
2803+
if (encoder == null)
2804+
encoder = UTF_8.INSTANCE.newEncoder();
28032805
if (sb == null) {
28042806
sb = new StringBuilder();
28052807
sb.append(s, 0, i);
28062808
}
2807-
appendEncoded(sb, c);
2809+
appendEncoded(encoder, sb, c);
28082810
} else {
28092811
if (sb != null)
28102812
sb.append(c);
@@ -2832,8 +2834,9 @@ private static String encode(String s) {
28322834
String ns = Normalizer.normalize(s, Normalizer.Form.NFC);
28332835
ByteBuffer bb = null;
28342836
try {
2835-
bb = ThreadLocalCoders.encoderFor(UTF_8.INSTANCE)
2837+
bb = UTF_8.INSTANCE.newEncoder()
28362838
.encode(CharBuffer.wrap(ns));
2839+
28372840
} catch (CharacterCodingException x) {
28382841
assert false;
28392842
}
@@ -2890,9 +2893,9 @@ private static String decode(String s, boolean ignorePercentInBrackets) {
28902893
StringBuilder sb = new StringBuilder(n);
28912894
ByteBuffer bb = ByteBuffer.allocate(n);
28922895
CharBuffer cb = CharBuffer.allocate(n);
2893-
CharsetDecoder dec = ThreadLocalCoders.decoderFor(UTF_8.INSTANCE)
2894-
.onMalformedInput(CodingErrorAction.REPLACE)
2895-
.onUnmappableCharacter(CodingErrorAction.REPLACE);
2896+
CharsetDecoder dec = UTF_8.INSTANCE.newDecoder()
2897+
.onMalformedInput(CodingErrorAction.REPLACE)
2898+
.onUnmappableCharacter(CodingErrorAction.REPLACE);
28962899

28972900
// This is not horribly efficient, but it will do for now
28982901
char c = s.charAt(0);

‎src/jdk.compiler/share/classes/com/sun/source/doctree/AttributeTree.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ enum ValueKind {
5555
Name getName();
5656

5757
/**
58-
* Returns the kind of the attribute.
59-
* @return the kind of the attribute
58+
* Returns the kind of the attribute value.
59+
* @return the kind of the attribute value
6060
*/
6161
ValueKind getValueKind();
6262

‎src/jdk.compiler/share/classes/com/sun/source/util/DocTreeFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public interface DocTreeFactory {
8181
/**
8282
* Creates a new {@code AttributeTree} object, to represent an HTML attribute in an HTML tag.
8383
* @param name the name of the attribute
84-
* @param vkind the kind of attribute value
84+
* @param vkind the kind of the attribute value
8585
* @param value the value, if any, of the attribute
8686
* @return an {@code AttributeTree} object
8787
*/

‎src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java

+3-8
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import com.sun.tools.javac.util.DefinedBy.Api;
3737

3838
/**
39-
* Prints out a doc comment tree.
39+
* Prints out a doc-comment tree.
4040
*
4141
* <p><b>This is NOT part of any supported API.
4242
* If you write code that depends on this, you do so at your own risk.
@@ -50,11 +50,6 @@ public class DocPretty implements DocTreeVisitor<Void,Void> {
5050
*/
5151
final Writer out;
5252

53-
/**
54-
* The left margin.
55-
*/
56-
int lmargin = 0;
57-
5853
public DocPretty(Writer out) {
5954
this.out = out;
6055
}
@@ -90,7 +85,7 @@ public void print(List<? extends DocTree> list) throws IOException {
9085
}
9186

9287
/**
93-
* Print list., with separators
88+
* Print list with separators.
9489
*/
9590
protected void print(List<? extends DocTree> list, String sep) throws IOException {
9691
if (list.isEmpty())
@@ -497,7 +492,7 @@ public Void visitStartElement(StartElementTree node, Void p) {
497492
List<? extends DocTree> attrs = node.getAttributes();
498493
if (!attrs.isEmpty()) {
499494
print(" ");
500-
print(attrs);
495+
print(attrs, " ");
501496
DocTree last = node.getAttributes().get(attrs.size() - 1);
502497
if (node.isSelfClosing() && last instanceof AttributeTree
503498
&& ((AttributeTree) last).getValueKind() == ValueKind.UNQUOTED)

‎test/langtools/tools/javac/doctree/AttrTest.java

+40-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -305,5 +305,44 @@ void unterminated_attr_block() { }
305305
Text[TEXT, pos:26, jjg]
306306
]
307307
]
308+
*/
309+
310+
/**
311+
* <a name1="val1" name2='val2' name3=val3 name4>
312+
*/
313+
void multiple_attr() { }
314+
/*
315+
DocComment[DOC_COMMENT, pos:1
316+
firstSentence: 1
317+
StartElement[START_ELEMENT, pos:1
318+
name:a
319+
attributes: 4
320+
Attribute[ATTRIBUTE, pos:4
321+
name: name1
322+
vkind: DOUBLE
323+
value: 1
324+
Text[TEXT, pos:11, val1]
325+
]
326+
Attribute[ATTRIBUTE, pos:17
327+
name: name2
328+
vkind: SINGLE
329+
value: 1
330+
Text[TEXT, pos:24, val2]
331+
]
332+
Attribute[ATTRIBUTE, pos:30
333+
name: name3
334+
vkind: UNQUOTED
335+
value: 1
336+
Text[TEXT, pos:36, val3]
337+
]
338+
Attribute[ATTRIBUTE, pos:41
339+
name: name4
340+
vkind: EMPTY
341+
value: null
342+
]
343+
]
344+
body: empty
345+
block tags: empty
346+
]
308347
*/
309348
}

‎test/langtools/tools/javac/doctree/DocCommentTester.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@ public DocCommentTester(boolean useBreakIterator) {
6666
this.useBreakIterator = useBreakIterator;
6767
}
6868
public static void main(String... args) throws Exception {
69-
ArrayList<String> list = new ArrayList(Arrays.asList(args));
69+
ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
7070
if (!list.isEmpty() && "-useBreakIterator".equals(list.get(0))) {
7171
list.remove(0);
7272
new DocCommentTester(true).run(list);
@@ -255,7 +255,7 @@ void check(TreePath path, Name name) {
255255
* changes are approved, the new files can be used to replace the old.
256256
*/
257257
public static void main(String... args) throws Exception {
258-
List<File> files = new ArrayList<File>();
258+
List<File> files = new ArrayList<>();
259259
File o = null;
260260
for (int i = 0; i < args.length; i++) {
261261
String arg = args[i];
@@ -305,11 +305,8 @@ public Void visitCompilationUnit(CompilationUnitTree tree, Void ignore) {
305305
File f = new File(tree.getSourceFile().getName());
306306
File outFile = new File(outDir, f.getName());
307307
try {
308-
FileWriter out = new FileWriter(outFile);
309-
try {
308+
try (FileWriter out = new FileWriter(outFile)) {
310309
out.write(source);
311-
} finally {
312-
out.close();
313310
}
314311
} catch (IOException e) {
315312
System.err.println("Can't write " + tree.getSourceFile().getName()
@@ -701,7 +698,7 @@ public Void visitOther(DocTree node, Void p) {
701698

702699
/*
703700
* Use this method to start printing a multi-line representation of a
704-
* DocTree node. The representation should be termintated by calling
701+
* DocTree node. The representation should be terminated by calling
705702
* out.println("]").
706703
*/
707704
void header(DocTree node) {
@@ -804,7 +801,7 @@ void check(TreePath path, Name name) throws Exception {
804801
final DCDocComment dc = (DCDocComment) trees.getDocCommentTree(path);
805802
DCTree t = (DCTree) trees.getDocCommentTree(path);
806803

807-
DocTreeScanner scanner = new DocTreeScanner<Void,Void>() {
804+
DocTreeScanner<Void, Void> scanner = new DocTreeScanner<>() {
808805
@Override
809806
public Void scan(DocTree node, Void ignore) {
810807
if (node != null) {

‎test/lib/jdk/test/lib/Utils.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,12 @@ public final class Utils {
117117
*/
118118
public static final String TEST_NAME = System.getProperty("test.name", ".");
119119

120-
/**
120+
/**
121+
* Returns the value of 'test.nativepath' system property
122+
*/
123+
public static final String TEST_NATIVE_PATH = System.getProperty("test.nativepath", ".");
124+
125+
/**
121126
* Defines property name for seed value.
122127
*/
123128
public static final String SEED_PROPERTY_NAME = "jdk.test.lib.random.seed";

‎test/micro/org/openjdk/bench/java/net/ThreadLocalURI.java

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
package org.openjdk.bench.java.net;
25+
26+
import org.openjdk.jmh.annotations.State;
27+
import org.openjdk.jmh.annotations.Scope;
28+
import org.openjdk.jmh.annotations.Benchmark;
29+
import org.openjdk.jmh.annotations.CompilerControl;
30+
import org.openjdk.jmh.annotations.BenchmarkMode;
31+
import org.openjdk.jmh.annotations.Mode;
32+
import org.openjdk.jmh.annotations.OutputTimeUnit;
33+
import java.net.URI;
34+
import java.net.URISyntaxException;
35+
import java.util.concurrent.TimeUnit;
36+
37+
@BenchmarkMode(Mode.AverageTime)
38+
@OutputTimeUnit(TimeUnit.NANOSECONDS)
39+
@State(Scope.Thread)
40+
public class ThreadLocalURI {
41+
42+
@Benchmark
43+
@CompilerControl(CompilerControl.Mode.DONT_INLINE)
44+
public URI uriEncoderTest() throws URISyntaxException {
45+
return new URI("http", "\u00A0", "\u00A0");
46+
}
47+
48+
@Benchmark
49+
@CompilerControl(CompilerControl.Mode.DONT_INLINE)
50+
public URI uriDecoderBaseline() throws URISyntaxException {
51+
return new URI("https", "example.com", "/xyz/abc/def?query=", "#30");
52+
}
53+
54+
@Benchmark
55+
@CompilerControl(CompilerControl.Mode.DONT_INLINE)
56+
public String uriDecoderTest() throws URISyntaxException {
57+
return new URI("https", "example.com", "/xyz/abc/def?query=", "#30")
58+
.getPath();
59+
}
60+
}

0 commit comments

Comments
 (0)
Please sign in to comment.