--- a/.hgtags Tue Apr 02 10:55:20 2019 +0530
+++ b/.hgtags Tue Apr 02 10:57:57 2019 +0530
@@ -551,3 +551,4 @@
1d7aec80147a6d92b101a76aef92f3ddc88bedf4 jdk-13+12
b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12-ga
83cace4142c8563b6a921787db02388e1bc48d01 jdk-13+13
+46cf212cdccaf4fb064d913b12004007d3322b67 jdk-13+14
--- a/doc/testing.html Tue Apr 02 10:55:20 2019 +0530
+++ b/doc/testing.html Tue Apr 02 10:57:57 2019 +0530
@@ -39,7 +39,7 @@
<h2 id="using-make-test-the-run-test-framework">Using "make test" (the run-test framework)</h2>
<p>This new way of running tests is developer-centric. It assumes that you have built a JDK locally and want to test it. Running common test targets is simple, and more complex ad-hoc combination of tests is possible. The user interface is forgiving, and clearly report errors it cannot resolve.</p>
<p>The main target <code>test</code> uses the jdk-image as the tested product. There is also an alternate target <code>exploded-test</code> that uses the exploded image instead. Not all tests will run successfully on the exploded image, but using this target can greatly improve rebuild times for certain workflows.</p>
-<p>Previously, <code>make test</code> was used invoke an old system for running test, and <code>make run-test</code> was used for the new test framework. For backward compatibility with scripts and muscle memory, <code>run-test</code> (and variants like <code>exploded-run-test</code> or <code>run-test-tier1</code>) are kept as aliases. The old system can still be accessed for some time using <code>cd test && make</code>.</p>
+<p>Previously, <code>make test</code> was used to invoke an old system for running tests, and <code>make run-test</code> was used for the new test framework. For backward compatibility with scripts and muscle memory, <code>run-test</code> (and variants like <code>exploded-run-test</code> or <code>run-test-tier1</code>) are kept as aliases.</p>
<p>Some example command-lines:</p>
<pre><code>$ make test-tier1
$ make test-jdk_lang JTREG="JOBS=8"
--- a/doc/testing.md Tue Apr 02 10:55:20 2019 +0530
+++ b/doc/testing.md Tue Apr 02 10:57:57 2019 +0530
@@ -12,11 +12,10 @@
instead. Not all tests will run successfully on the exploded image, but using
this target can greatly improve rebuild times for certain workflows.
-Previously, `make test` was used invoke an old system for running test, and
+Previously, `make test` was used to invoke an old system for running tests, and
`make run-test` was used for the new test framework. For backward compatibility
with scripts and muscle memory, `run-test` (and variants like
-`exploded-run-test` or `run-test-tier1`) are kept as aliases. The old system
-can still be accessed for some time using `cd test && make`.
+`exploded-run-test` or `run-test-tier1`) are kept as aliases.
Some example command-lines:
--- a/make/Bundles.gmk Tue Apr 02 10:55:20 2019 +0530
+++ b/make/Bundles.gmk Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
include MakeBase.gmk
PRODUCT_TARGETS :=
+LEGACY_TARGETS :=
TEST_TARGETS :=
DOCS_TARGETS :=
@@ -146,19 +147,25 @@
# correct base directories.
ifeq ($(call isTargetOs, macosx)+$(DEBUG_LEVEL), true+release)
JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
+ JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
+ JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
JDK_BUNDLE_SUBDIR :=
+ JRE_BUNDLE_SUBDIR :=
else
JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
+ JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
+ JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
ifneq ($(DEBUG_LEVEL), release)
JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
+ JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
endif
endif
################################################################################
-ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
+ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), )
$(eval $(call FillCacheFind, $(IMAGES_OUTPUTDIR)))
SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map
@@ -198,6 +205,22 @@
TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
+ ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR))
+
+ # Create special filter rules when dealing with unzipped .dSYM directories on
+ # macosx
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
+ JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
+ $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
+ endif
+ endif
+
+ JRE_BUNDLE_FILES := $(filter-out \
+ $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
+ $(SYMBOLS_EXCLUDE_PATTERN), \
+ $(ALL_JRE_FILES))
+
$(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
FILES := $(JDK_BUNDLE_FILES), \
@@ -208,6 +231,15 @@
PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
+ $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
+ BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
+ FILES := $(JRE_BUNDLE_FILES), \
+ BASE_DIRS := $(JRE_IMAGE_DIR), \
+ SUBDIR := $(JRE_BUNDLE_SUBDIR), \
+ ))
+
+ LEGACY_TARGETS += $(BUILD_JRE_BUNDLE)
+
$(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
@@ -283,6 +315,7 @@
################################################################################
product-bundles: $(PRODUCT_TARGETS)
+legacy-bundles: $(LEGACY_TARGETS)
test-bundles: $(TEST_TARGETS)
docs-bundles: $(DOCS_TARGETS)
jcov-bundles: $(JCOV_TARGETS)
--- a/make/Main.gmk Tue Apr 02 10:55:20 2019 +0530
+++ b/make/Main.gmk Tue Apr 02 10:57:57 2019 +0530
@@ -581,6 +581,9 @@
product-bundles:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk product-bundles)
+legacy-bundles:
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk legacy-bundles)
+
test-bundles:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles)
@@ -592,7 +595,7 @@
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk jcov-bundles)
endif
-ALL_TARGETS += product-bundles test-bundles docs-bundles jcov-bundles
+ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles jcov-bundles
################################################################################
# Install targets
@@ -918,6 +921,8 @@
product-bundles: product-images
+ legacy-bundles: legacy-images
+
test-bundles: test-image
docs-bundles: docs-image
@@ -1020,6 +1025,9 @@
# (and possibly other, more specific versions)
product-images: jdk-image symbols-image exploded-image
+# This target builds the legacy images, e.g. the legacy JRE image
+legacy-images: legacy-jre-image
+
# zip-security is actually a bundle, but for now it needs to be considered
# an image until this can be cleaned up properly.
product-images: zip-security
@@ -1036,6 +1044,8 @@
ifeq ($(call isTargetOs, macosx), true)
product-images: mac-jdk-bundle
+
+ legacy-images: mac-legacy-jre-bundle
endif
# This target builds the documentation image
@@ -1070,7 +1080,7 @@
jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
exploded-image-base exploded-image \
create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
- docs-javase docs-reference docs-javadoc mac-bundles product-images \
+ docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \
docs-image test-image all-images \
all-bundles
--- a/make/autoconf/jdk-version.m4 Tue Apr 02 10:55:20 2019 +0530
+++ b/make/autoconf/jdk-version.m4 Tue Apr 02 10:57:57 2019 +0530
@@ -460,6 +460,7 @@
# We could define --with flags for these, if really needed
VERSION_CLASSFILE_MAJOR="$DEFAULT_VERSION_CLASSFILE_MAJOR"
VERSION_CLASSFILE_MINOR="$DEFAULT_VERSION_CLASSFILE_MINOR"
+ JDK_SOURCE_TARGET_VERSION="$DEFAULT_JDK_SOURCE_TARGET_VERSION"
AC_MSG_CHECKING([for version string])
AC_MSG_RESULT([$VERSION_STRING])
@@ -483,5 +484,5 @@
AC_SUBST(VENDOR_VERSION_STRING)
AC_SUBST(VERSION_CLASSFILE_MAJOR)
AC_SUBST(VERSION_CLASSFILE_MINOR)
-
+ AC_SUBST(JDK_SOURCE_TARGET_VERSION)
])
--- a/make/autoconf/lib-x11.m4 Tue Apr 02 10:55:20 2019 +0530
+++ b/make/autoconf/lib-x11.m4 Tue Apr 02 10:57:57 2019 +0530
@@ -119,7 +119,7 @@
if test "x$X11_HEADERS_OK" = xno; then
HELP_MSG_MISSING_DEPENDENCY([x11])
- AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h Xrander.h XTest.h Intrinsic.h). $HELP_MSG])
+ AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h Xrandr.h XTest.h Intrinsic.h). $HELP_MSG])
fi
# If XLinearGradient isn't available in Xrender.h, signal that it needs to be
--- a/make/autoconf/spec.gmk.in Tue Apr 02 10:55:20 2019 +0530
+++ b/make/autoconf/spec.gmk.in Tue Apr 02 10:57:57 2019 +0530
@@ -208,6 +208,8 @@
VERSION_CLASSFILE_MAJOR := @VERSION_CLASSFILE_MAJOR@
VERSION_CLASSFILE_MINOR := @VERSION_CLASSFILE_MINOR@
+JDK_SOURCE_TARGET_VERSION := @JDK_SOURCE_TARGET_VERSION@
+
# Convenience CFLAGS settings for passing version information into native programs.
VERSION_CFLAGS := \
-DVERSION_FEATURE=$(VERSION_FEATURE) \
@@ -904,6 +906,7 @@
JDK_BUNDLE_EXTENSION := tar.gz
endif
JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
+JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
@@ -911,6 +914,7 @@
JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
+JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
--- a/make/autoconf/toolchain_windows.m4 Tue Apr 02 10:55:20 2019 +0530
+++ b/make/autoconf/toolchain_windows.m4 Tue Apr 02 10:57:57 2019 +0530
@@ -87,6 +87,7 @@
VS_VS_PLATFORM_NAME_2017="v141"
VS_SDK_PLATFORM_NAME_2017=
VS_SUPPORTED_2017=true
+VS_TOOLSET_SUPPORTED_2017=true
################################################################################
@@ -177,6 +178,15 @@
# build environment and assigns it to VS_ENV_CMD
AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
[
+ # VS2017 provides the option to install previous minor versions of the MSVC
+ # toolsets. It is not possible to directly download earlier minor versions of
+ # VS2017 and in order to build with a previous minor compiler toolset version,
+ # it is now possible to compile with earlier minor versions by passing
+ # -vcvars_ver=<toolset_version> argument to vcvarsall.bat.
+ AC_ARG_WITH(msvc-toolset-version, [AS_HELP_STRING([--with-msvc-toolset-version],
+ [specific MSVC toolset version to use, passed as -vcvars_ver argument to
+ pass to vcvarsall.bat (Windows only)])])
+
VS_VERSION="$1"
eval VS_COMNTOOLS_VAR="\${VS_ENVVAR_${VS_VERSION}}"
eval VS_COMNTOOLS="\$${VS_COMNTOOLS_VAR}"
@@ -184,6 +194,7 @@
eval VS_EDITIONS="\${VS_EDITIONS_${VS_VERSION}}"
eval SDK_INSTALL_DIR="\${VS_SDK_INSTALLDIR_${VS_VERSION}}"
eval VS_ENV_ARGS="\${VS_ENV_ARGS_${VS_VERSION}}"
+ eval VS_TOOLSET_SUPPORTED="\${VS_TOOLSET_SUPPORTED_${VS_VERSION}}"
# When using --with-tools-dir, assume it points to the correct and default
# version of Visual Studio or that --with-toolchain-version was also set.
@@ -240,6 +251,12 @@
TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}],
[C:/Program Files (x86)/$SDK_INSTALL_DIR], [well-known name])
fi
+
+ if test "x$VS_TOOLSET_SUPPORTED" != x; then
+ if test "x$with_msvc_toolset_version" != x; then
+ VS_ENV_ARGS="$VS_ENV_ARGS -vcvars_ver=$with_msvc_toolset_version"
+ fi
+ fi
])
################################################################################
@@ -423,6 +440,8 @@
>> $EXTRACT_VC_ENV_BAT_FILE
$ECHO 'echo VCINSTALLDIR="%VCINSTALLDIR% " >> set-vs-env.sh' \
>> $EXTRACT_VC_ENV_BAT_FILE
+ $ECHO 'echo VCToolsRedistDir="%VCToolsRedistDir% " >> set-vs-env.sh' \
+ >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO 'echo WindowsSdkDir="%WindowsSdkDir% " >> set-vs-env.sh' \
>> $EXTRACT_VC_ENV_BAT_FILE
$ECHO 'echo WINDOWSSDKDIR="%WINDOWSSDKDIR% " >> set-vs-env.sh' \
@@ -440,6 +459,8 @@
>> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' \
>> $EXTRACT_VC_ENV_BAT_FILE
+ $ECHO "$WINPATH_BASH -c 'echo VCToolsRedistDir="'\"$VCToolsRedistDir \" >> set-vs-env.sh' \
+ >> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' \
>> $EXTRACT_VC_ENV_BAT_FILE
$ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' \
@@ -517,6 +538,7 @@
VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED -e 's/\\\\*;* *$//'`
VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\*;* *$//'`
VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
+ VCToolsRedistDir=`$ECHO "$VCToolsRedistDir" | $SED 's/\\\\* *$//'`
WindowsSdkDir=`$ECHO "$WindowsSdkDir" | $SED 's/\\\\* *$//'`
WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
if test -z "$WINDOWSSDKDIR"; then
@@ -638,11 +660,13 @@
POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
fi
else
+ CYGWIN_VC_TOOLS_REDIST_DIR="$VCToolsRedistDir"
+ BASIC_FIXUP_PATH(CYGWIN_VC_TOOLS_REDIST_DIR)
# Probe: Using well-known location from VS 2017
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
+ POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_TOOLS_REDIST_DIR/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
else
- POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
+ POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_TOOLS_REDIST_DIR/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
fi
fi
# In case any of the above finds more than one file, loop over them.
--- a/make/autoconf/version-numbers Tue Apr 02 10:55:20 2019 +0530
+++ b/make/autoconf/version-numbers Tue Apr 02 10:57:57 2019 +0530
@@ -35,7 +35,8 @@
DEFAULT_VERSION_DATE=2019-09-17
DEFAULT_VERSION_CLASSFILE_MAJOR=57 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_CLASSFILE_MINOR=0
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="11 12 13"
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="12 13"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=13
LAUNCHER_NAME=openjdk
PRODUCT_NAME=OpenJDK
--- a/make/common/FindTests.gmk Tue Apr 02 10:55:20 2019 +0530
+++ b/make/common/FindTests.gmk Tue Apr 02 10:57:57 2019 +0530
@@ -53,6 +53,7 @@
-e 's/^groups\w*=//p' $1/TEST.ROOT)
$1_JTREG_GROUP_FILES := $$(addprefix $1/, $$($1_JTREG_GROUP_FILENAMES))
$1_JTREG_TEST_GROUPS := $$(strip $$(shell $$(SED) -n \
+ -e 's/^\#.*//g' \
-e 's/\([^ ]*\)\w*=.*/\1/gp' $$(wildcard $$($1_JTREG_GROUP_FILES)) \
| $$(SORT) -u))
endif
--- a/make/common/RMICompilation.gmk Tue Apr 02 10:55:20 2019 +0530
+++ b/make/common/RMICompilation.gmk Tue Apr 02 10:57:57 2019 +0530
@@ -35,6 +35,7 @@
# RUN_V11:=Set to run rmic with -v1.1
# RUN_V12:=Set to run rmic with -v1.2
# KEEP_GENERATED:=Set to keep generated sources around
+# STUB_SOURCES_DIR:=Directory to put generated sources in
SetupRMICompilation = $(NamedParamsMacroTemplate)
define SetupRMICompilationBody
@@ -58,9 +59,16 @@
$1_TIE_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/org/omg/stub/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
$1_TIE_STDPKG_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
- ifneq (,$$($1_KEEP_GENERATED))
+ ifneq ($$($1_KEEP_GENERATED), )
$1_ARGS += -keepgenerated
- $1_TARGETS += $$(subst .class,.java,$$($1_TARGETS))
+ $1_JAVA_TARGETS := $$(subst .class,.java,$$($1_TARGETS))
+ ifneq ($$($1_STUB_SOURCES_DIR), )
+ # This is where the java files are created by rmic
+ $1_JAVA_TARGETS_REL := $$(subst $$($1_STUB_CLASSES_DIR),, $$($1_JAVA_TARGETS))
+ # This is where the caller wants the java files
+ $1_JAVA_TARGETS := $$(addprefix $$($1_STUB_SOURCES_DIR), $$($1_JAVA_TARGETS_REL))
+ endif
+ $1_TARGETS += $$($1_JAVA_TARGETS)
endif
$1_DOLLAR_SAFE_CLASSES := $$(subst $$$$,\$$$$,$$($1_CLASSES))
@@ -72,11 +80,12 @@
$$(call MakeDir, $$($1_STUB_CLASSES_DIR))
$(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
-d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
- if [ "x$$($1_ARGS2)" != "x" ]; then \
- $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) && \
- $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
- -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
- fi; \
+ $$(if $$($1_STUB_SOURCES_DIR), \
+ $$(foreach f, $$($1_JAVA_TARGETS_REL), \
+ $(MKDIR) -p $$(dir $$($1_STUB_SOURCES_DIR)/$$f) ; \
+ $(MV) $$($1_STUB_CLASSES_DIR)/$$f $$($1_STUB_SOURCES_DIR)/$$f ; \
+ ) \
+ ) \
$(TOUCH) $$@
--- a/make/common/SetupJavaCompilers.gmk Tue Apr 02 10:55:20 2019 +0530
+++ b/make/common/SetupJavaCompilers.gmk Tue Apr 02 10:57:57 2019 +0530
@@ -33,6 +33,9 @@
DISABLE_WARNINGS ?= -Xlint:all,-deprecation,-removal,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
+JDK_SOURCE_TARGET_FLAGS := -source $(JDK_SOURCE_TARGET_VERSION) \
+ -target $(JDK_SOURCE_TARGET_VERSION)
+
# If warnings needs to be non-fatal for testing purposes use a command like:
# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
JAVAC_WARNINGS ?= -Xlint:all -Werror
@@ -72,7 +75,7 @@
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
JVM := $(JAVA_JAVAC), \
JAVAC := $(NEW_JAVAC), \
- FLAGS := -source 13 -target 13 --doclint-format html5 \
+ FLAGS := $(JDK_SOURCE_TARGET_FLAGS) --doclint-format html5 \
-encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
@@ -82,7 +85,7 @@
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
JVM := $(JAVA_JAVAC), \
JAVAC := $(NEW_JAVAC), \
- FLAGS := -source 13 -target 13 \
+ FLAGS := $(JDK_SOURCE_TARGET_FLAGS) \
-encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
--- a/make/conf/jib-profiles.js Tue Apr 02 10:55:20 2019 +0530
+++ b/make/conf/jib-profiles.js Tue Apr 02 10:57:57 2019 +0530
@@ -365,7 +365,8 @@
};
};
- common.boot_jdk_version = "11";
+ common.boot_jdk_version = "12";
+ common.boot_jdk_build_number = "33";
common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
+ common.boot_jdk_version
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@@ -754,7 +755,11 @@
profiles[cmpBaselineName] = clone(profiles[name + suffix]);
// Only compare the images target. This should pressumably be expanded
// to include more build targets when possible.
- profiles[cmpBaselineName].default_make_targets = [ "images" ];
+ profiles[cmpBaselineName].default_make_targets = [ "images", "test-image" ];
+ if (name == "linux-x64") {
+ profiles[cmpBaselineName].default_make_targets
+ = concat(profiles[cmpBaselineName].default_make_targets, "docs");
+ }
profiles[cmpBaselineName].make_args = [ "COMPARE_BUILD=CONF=" ];
// Do not inherit artifact definitions from base profile
delete profiles[cmpBaselineName].artifacts;
@@ -980,7 +985,7 @@
server: "jpg",
product: "jdk",
version: common.boot_jdk_version,
- build_number: "28",
+ build_number: common.boot_jdk_build_number,
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
--- a/make/data/cldr/common/main/ja.xml Tue Apr 02 10:55:20 2019 +0530
+++ b/make/data/cldr/common/main/ja.xml Tue Apr 02 10:57:57 2019 +0530
@@ -3633,7 +3633,7 @@
<era type="233">大正</era>
<era type="234">昭和</era>
<era type="235">平成</era>
- <era type="236">元号</era> <!-- NewEra -->
+ <era type="236">令和</era>
</eraAbbr>
<eraNarrow>
<era type="0">大化</era>
@@ -3872,7 +3872,7 @@
<era type="233">T</era>
<era type="234">S</era>
<era type="235">H</era>
- <era type="236">N</era> <!-- NewEra -->
+ <era type="236">R</era>
</eraNarrow>
</eras>
<dateFormats>
--- a/make/data/cldr/common/main/root.xml Tue Apr 02 10:55:20 2019 +0530
+++ b/make/data/cldr/common/main/root.xml Tue Apr 02 10:57:57 2019 +0530
@@ -2030,7 +2030,7 @@
<era type="233">Taishō</era>
<era type="234">Shōwa</era>
<era type="235">Heisei</era>
- <era type="236">NewEra</era> <!-- NewEra -->
+ <era type="236">Reiwa</era>
</eraAbbr>
<eraNarrow>
<era type="0">Taika (645–650)</era>
@@ -2269,7 +2269,7 @@
<era type="233">T</era>
<era type="234">S</era>
<era type="235">H</era>
- <era type="236">N</era> <!-- NewEra -->
+ <era type="236">R</era>
</eraNarrow>
</eras>
<dateFormats>
--- a/make/data/publicsuffixlist/VERSION Tue Apr 02 10:55:20 2019 +0530
+++ b/make/data/publicsuffixlist/VERSION Tue Apr 02 10:57:57 2019 +0530
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/2225db8d9f4a2a27ec697c883360632fa0c16261/public_suffix_list.dat
-Date: 2018-05-24
+Github: https://raw.githubusercontent.com/publicsuffix/list/ce0d1a5fba657e55adea3abde4b7f1e50636ff10/public_suffix_list.dat
+Date: 2019-01-28
--- a/make/data/publicsuffixlist/public_suffix_list.dat Tue Apr 02 10:55:20 2019 +0530
+++ b/make/data/publicsuffixlist/public_suffix_list.dat Tue Apr 02 10:57:57 2019 +0530
@@ -381,8 +381,13 @@
net.bm
org.bm
-// bn : https://en.wikipedia.org/wiki/.bn
-*.bn
+// bn : http://www.bnnic.bn/faqs
+bn
+com.bn
+edu.bn
+gov.bn
+net.bn
+org.bn
// bo : https://nic.bo/delegacion2015.php#h-1.10
bo
@@ -546,6 +551,7 @@
not.br
ntr.br
odo.br
+ong.br
org.br
osasco.br
palmas.br
@@ -1239,7 +1245,7 @@
utazas.hu
video.hu
-// id : https://register.pandi.or.id/
+// id : https://pandi.id/en/domain/registration-requirements/
id
ac.id
biz.id
@@ -1250,6 +1256,7 @@
my.id
net.id
or.id
+ponpes.id
sch.id
web.id
@@ -1407,9 +1414,9 @@
tos.it
toscana.it
trentin-sud-tirol.it
-trentin-süd-tirol.it
+trentin-süd-tirol.it
trentin-sudtirol.it
-trentin-südtirol.it
+trentin-südtirol.it
trentin-sued-tirol.it
trentin-suedtirol.it
trentino-a-adige.it
@@ -1419,9 +1426,9 @@
trentino-s-tirol.it
trentino-stirol.it
trentino-sud-tirol.it
-trentino-süd-tirol.it
+trentino-süd-tirol.it
trentino-sudtirol.it
-trentino-südtirol.it
+trentino-südtirol.it
trentino-sued-tirol.it
trentino-suedtirol.it
trentino.it
@@ -1432,15 +1439,15 @@
trentinos-tirol.it
trentinostirol.it
trentinosud-tirol.it
-trentinosüd-tirol.it
+trentinosüd-tirol.it
trentinosudtirol.it
-trentinosüdtirol.it
+trentinosüdtirol.it
trentinosued-tirol.it
trentinosuedtirol.it
trentinsud-tirol.it
-trentinsüd-tirol.it
+trentinsüd-tirol.it
trentinsudtirol.it
-trentinsüdtirol.it
+trentinsüdtirol.it
trentinsued-tirol.it
trentinsuedtirol.it
tuscany.it
@@ -1457,13 +1464,13 @@
valled-aosta.it
valledaosta.it
vallee-aoste.it
-vallée-aoste.it
+vallée-aoste.it
vallee-d-aoste.it
-vallée-d-aoste.it
+vallée-d-aoste.it
valleeaoste.it
-valléeaoste.it
+valléeaoste.it
valleedaoste.it
-valléedaoste.it
+valléedaoste.it
vao.it
vda.it
ven.it
@@ -1497,7 +1504,7 @@
avellino.it
ba.it
balsan-sudtirol.it
-balsan-südtirol.it
+balsan-südtirol.it
balsan-suedtirol.it
balsan.it
bari.it
@@ -1516,7 +1523,7 @@
bolzano-altoadige.it
bolzano.it
bozen-sudtirol.it
-bozen-südtirol.it
+bozen-südtirol.it
bozen-suedtirol.it
bozen.it
br.it
@@ -1525,7 +1532,7 @@
bs.it
bt.it
bulsan-sudtirol.it
-bulsan-südtirol.it
+bulsan-südtirol.it
bulsan-suedtirol.it
bulsan.it
bz.it
@@ -1545,9 +1552,9 @@
cb.it
ce.it
cesena-forli.it
-cesena-forlì.it
+cesena-forlì.it
cesenaforli.it
-cesenaforlì.it
+cesenaforlì.it
ch.it
chieti.it
ci.it
@@ -1578,9 +1585,9 @@
fm.it
foggia.it
forli-cesena.it
-forlì-cesena.it
+forlì-cesena.it
forlicesena.it
-forlìcesena.it
+forlìcesena.it
fr.it
frosinone.it
ge.it
@@ -1711,7 +1718,7 @@
sr.it
ss.it
suedtirol.it
-südtirol.it
+südtirol.it
sv.it
ta.it
taranto.it
@@ -3692,8 +3699,16 @@
seoul.kr
ulsan.kr
-// kw : https://en.wikipedia.org/wiki/.kw
-*.kw
+// kw : https://www.nic.kw/policies/
+// Confirmed by registry <nic.tech@citra.gov.kw>
+kw
+com.kw
+edu.kw
+emb.kw
+gov.kw
+ind.kw
+net.kw
+org.kw
// ky : http://www.icta.ky/da_ky_reg_dom.php
// Confirmed by registry <kysupport@perimeterusa.com> 2008-06-17
@@ -3775,10 +3790,18 @@
org.lr
net.lr
-// ls : https://en.wikipedia.org/wiki/.ls
+// ls : http://www.nic.ls/
+// Confirmed by registry <lsadmin@nic.ls>
ls
+ac.ls
+biz.ls
co.ls
+edu.ls
+gov.ls
+info.ls
+net.ls
org.ls
+sc.ls
// lt : https://en.wikipedia.org/wiki/.lt
lt
@@ -4636,9 +4659,6 @@
// ccTLD for the Netherlands
nl
-// BV.nl will be a registry for dutch BV's (besloten vennootschap)
-bv.nl
-
// no : http://www.norid.no/regelverk/index.en.html
// The Norwegian registry has declined to notify us of updates. The web pages
// referenced below are the official source of the data. There is also an
@@ -8329,9 +8349,6 @@
// goo : 2014-12-18 NTT Resonant Inc.
goo
-// goodhands : 2015-07-31 Allstate Fire and Casualty Insurance Company
-goodhands
-
// goodyear : 2015-07-02 The Goodyear Tire & Rubber Company
goodyear
@@ -8608,9 +8625,6 @@
// iveco : 2015-09-03 CNH Industrial N.V.
iveco
-// iwc : 2014-06-23 Richemont DNS Inc.
-iwc
-
// jaguar : 2014-11-13 Jaguar Land Rover Ltd
jaguar
@@ -8635,9 +8649,6 @@
// jio : 2015-04-02 Reliance Industries Limited
jio
-// jlc : 2014-12-04 Richemont DNS Inc.
-jlc
-
// jll : 2015-04-02 Jones Lang LaSalle Incorporated
jll
@@ -8989,9 +9000,6 @@
// menu : 2013-09-11 Wedding TLD2, LLC
menu
-// meo : 2014-11-07 MEO Servicos de Comunicacoes e Multimedia, S.A.
-meo
-
// merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
merckmsd
@@ -9283,9 +9291,6 @@
// panasonic : 2015-07-30 Panasonic Corporation
panasonic
-// panerai : 2014-11-07 Richemont DNS Inc.
-panerai
-
// paris : 2014-01-30 City of Paris
paris
@@ -9634,9 +9639,6 @@
// sap : 2014-03-27 SAP AG
sap
-// sapo : 2014-11-07 MEO Servicos de Comunicacoes e Multimedia, S.A.
-sapo
-
// sarl : 2014-07-03 Binky Moon, LLC
sarl
@@ -9877,9 +9879,6 @@
// statefarm : 2015-07-30 State Farm Mutual Automobile Insurance Company
statefarm
-// statoil : 2014-12-04 Statoil ASA
-statoil
-
// stc : 2014-10-09 Saudi Telecom Company
stc
@@ -9991,9 +9990,6 @@
// technology : 2013-09-13 Binky Moon, LLC
technology
-// telecity : 2015-02-19 TelecityGroup International Limited
-telecity
-
// telefonica : 2014-10-16 Telefónica S.A.
telefonica
@@ -10201,9 +10197,6 @@
// vision : 2013-12-05 Binky Moon, LLC
vision
-// vista : 2014-09-18 Vistaprint Limited
-vista
-
// vistaprint : 2014-09-18 Vistaprint Limited
vistaprint
@@ -10642,9 +10635,6 @@
// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center
政务
-// xperia : 2015-05-14 Sony Mobile Communications AB
-xperia
-
// xyz : 2013-12-05 XYZ.COM LLC
xyz
@@ -10737,6 +10727,7 @@
// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
// Submitted by Luke Wells <psl-maintainers@amazon.com>
cn-north-1.eb.amazonaws.com.cn
+cn-northwest-1.eb.amazonaws.com.cn
elasticbeanstalk.com
ap-northeast-1.elasticbeanstalk.com
ap-northeast-2.elasticbeanstalk.com
@@ -10823,6 +10814,10 @@
t3l3p0rt.net
tele.amune.org
+// Apigee : https://apigee.com/
+// Submitted by Apigee Security Team <security@apigee.com>
+apigee.io
+
// Aptible : https://www.aptible.com/
// Submitted by Thomas Orozco <thomas@aptible.com>
on-aptible.com
@@ -10842,6 +10837,11 @@
// Submitted by Vincent Tseng <vincenttseng@asustor.com>
myasustor.com
+// Automattic Inc. : https://automattic.com/
+// Submitted by Alex Concha <alex.concha@automattic.com>
+go-vip.co
+wpcomstaging.com
+
// AVM : https://avm.de
// Submitted by Andreas Weise <a.weise@avm.de>
myfritz.net
@@ -10888,6 +10888,11 @@
// Submitted by Dave Tharp <browsersafetymark.io@quicinc.com>
browsersafetymark.io
+// Bytemark Hosting : https://www.bytemark.co.uk
+// Submitted by Paul Cammish <paul.cammish@bytemark.co.uk>
+dh.bytemark.co.uk
+vm.bytemark.co.uk
+
// callidomus : https://www.callidomus.com/
// Submitted by Marcus Popp <admin@callidomus.com>
mycd.eu
@@ -11080,6 +11085,11 @@
reg.dk
store.dk
+// dapps.earth : https://dapps.earth/
+// Submitted by Daniil Burdakov <icqkill@gmail.com>
+*.dapps.earth
+*.bzz.dapps.earth
+
// Debian : https://www.debian.org/
// Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
debian.net
@@ -11092,6 +11102,11 @@
// Submitted by Norbert Auler <mail@dnshome.de>
dnshome.de
+// DotArai : https://www.dotarai.com/
+// Submitted by Atsadawat Netcharadsang <atsadawat@dotarai.co.th>
+online.th
+shop.th
+
// DrayTek Corp. : https://www.draytek.com/
// Submitted by Paul Fang <mis@draytek.com>
drayddns.com
@@ -11648,6 +11663,10 @@
app.os.fedoraproject.org
app.os.stg.fedoraproject.org
+// Fermax : https://fermax.com/
+// submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
+mydobiss.com
+
// Filegear Inc. : https://www.filegear.com
// Submitted by Jason Zhu <jason@owtware.com>
filegear.me
@@ -11713,6 +11732,8 @@
// Google, Inc.
// Submitted by Eduardo Vela <evn@google.com>
+run.app
+a.run.app
*.0emm.com
appspot.com
blogspot.ae
@@ -11918,6 +11939,12 @@
lcube-server.de
svn-repos.de
+// Leadpages : https://www.leadpages.net
+// Submitted by Greg Dallavalle <domains@leadpages.net>
+leadpages.co
+lpages.co
+lpusercontent.com
+
// Lightmaker Property Manager, Inc. : https://app.lmpm.com/
// Submitted by Greg Holland <greg.holland@lmpm.com>
app.lmpm.com
@@ -11935,6 +11962,15 @@
// Submitted by Victor Velchev <admin@liquidnetlimited.com>
we.bs
+// LubMAN UMCS Sp. z o.o : https://lubman.pl/
+// Submitted by Ireneusz Maliszewski <ireneusz.maliszewski@lubman.pl>
+krasnik.pl
+leczna.pl
+lubartow.pl
+lublin.pl
+poniatowa.pl
+swidnik.pl
+
// Lug.org.uk : https://lug.org.uk
// Submitted by Jon Spriggs <admin@lug.org.uk>
uklugs.org
@@ -12322,6 +12358,10 @@
chirurgiens-dentistes-en-france.fr
byen.site
+// Redstar Consultants : https://www.redstarconsultants.com/
+// Submitted by Jons Slemmer <jons@redstarconsultants.com>
+instantcloud.cn
+
// Russian Academy of Sciences
// Submitted by Tech Support <support@rasnet.ru>
ras.ru
@@ -12350,6 +12390,10 @@
rackmaze.com
rackmaze.net
+// Read The Docs, Inc : https://www.readthedocs.org
+// Submitted by David Fischer <team@readthedocs.org>
+readthedocs.io
+
// Red Hat, Inc. OpenShift : https://openshift.redhat.com/
// Submitted by Tim Kramer <tkramer@rhcloud.com>
rhcloud.com
@@ -12426,6 +12470,10 @@
sinaapp.com
vipsinaapp.com
+// Siteleaf : https://www.siteleaf.com/
+// Submitted by Skylar Challand <support@siteleaf.com>
+siteleaf.net
+
// Skyhat : http://www.skyhat.io
// Submitted by Shante Adam <shante@skyhat.io>
bounty-full.com
@@ -12451,10 +12499,6 @@
// Submitted by Stefan Neufeind <info@speedpartner.de>
customer.speedpartner.de
-// Stackspace : https://www.stackspace.io/
-// Submitted by Lina He <info@stackspace.io>
-stackspace.space
-
// Storj Labs Inc. : https://storj.io/
// Submitted by Philip Hutchins <hostmaster@storj.io>
storj.farm
@@ -12495,6 +12539,12 @@
med.pl
sopot.pl
+// Telebit : https://telebit.cloud
+// Submitted by AJ ONeal <aj@telebit.cloud>
+telebit.app
+telebit.io
+*.telebit.xyz
+
// The Gwiddle Foundation : https://gwiddlefoundation.org.uk
// Submitted by Joshua Bayfield <joshua.bayfield@gwiddlefoundation.org.uk>
gwiddle.co.uk
@@ -12533,7 +12583,7 @@
webspace.rocks
lima.zone
-// TransIP : htts://www.transip.nl
+// TransIP : https://www.transip.nl
// Submitted by Rory Breuk <rbreuk@transip.nl>
*.transurl.be
*.transurl.eu
--- a/make/data/unicodedata/UnicodeData.txt Tue Apr 02 10:55:20 2019 +0530
+++ b/make/data/unicodedata/UnicodeData.txt Tue Apr 02 10:57:57 2019 +0530
@@ -11836,7 +11836,7 @@
32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
-32FF;SQUARE ERA NAME NEWERA;So;0;L;<square> 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;;
+32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME REIWA;;;;
3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
--- a/make/hotspot/lib/JvmFeatures.gmk Tue Apr 02 10:55:20 2019 +0530
+++ b/make/hotspot/lib/JvmFeatures.gmk Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,9 @@
ifeq ($(call check-jvm-feature, zero), true)
JVM_CFLAGS_FEATURES += -DZERO -DCC_INTERP -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
JVM_LIBS_FEATURES += $(LIBFFI_LIBS)
+ ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
+ JVM_LDFLAGS_FEATURES += $(call SET_EXECUTABLE_ORIGIN,/..)
+ endif
ifeq ($(call isTargetCpu, sparcv9), true)
BUILD_LIBJVM_EXTRA_FILES := $(TOPDIR)/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp
endif
@@ -123,7 +126,7 @@
JVM_CFLAGS_FEATURES += -DINCLUDE_NMT=0
JVM_EXCLUDE_FILES += \
memBaseline.cpp memReporter.cpp mallocTracker.cpp virtualMemoryTracker.cpp nmtCommon.cpp \
- memTracker.cpp nmtDCmd.cpp mallocSiteTable.cpp
+ memTracker.cpp nmtDCmd.cpp mallocSiteTable.cpp threadStackTracker.cpp
endif
ifneq ($(call check-jvm-feature, aot), true)
--- a/make/rmic/Rmic-java.management.rmi.gmk Tue Apr 02 10:55:20 2019 +0530
+++ b/make/rmic/Rmic-java.management.rmi.gmk Tue Apr 02 10:57:57 2019 +0530
@@ -40,23 +40,14 @@
$(eval $(call SetupRMICompilation,RMI_GEN, \
CLASSES := $(JMX_RMI_CLASSES), \
CLASSES_DIR := $(CLASSES_DIR)/java.management.rmi, \
- STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR)/java.management.rmi, \
+ STUB_CLASSES_DIR := $(STUB_CLASSES_DIR)/java.management.rmi, \
RUN_V12 := true, \
KEEP_GENERATED := true, \
+ STUB_SOURCES_DIR := $(RMIC_GENSRC_DIR)/java.management.rmi, \
))
-# Find all classes generated and move them from the gensrc dir to the stub classes dir
-$(RMIC_GENSRC_DIR)/_classes.moved: $(RMI_GEN)
- $(eval classfiles := $(shell $(FIND) $(RMIC_GENSRC_DIR) -name "*.class"))
- $(foreach src, $(classfiles), \
- $(eval target := $(patsubst $(RMIC_GENSRC_DIR)/%, \
- $(STUB_CLASSES_DIR)/%, $(src))) \
- $(call MakeDir, $(dir $(target))) \
- $(MV) $(src) $(target) $(NEWLINE))
- $(TOUCH) $@
-
##########################################################################################
-all: $(RMIC_GENSRC_DIR)/_classes.moved $(RMI_GEN)
+all: $(RMI_GEN)
.PHONY: all
--- a/make/scripts/compare.sh Tue Apr 02 10:55:20 2019 +0530
+++ b/make/scripts/compare.sh Tue Apr 02 10:57:57 2019 +0530
@@ -202,15 +202,20 @@
$SED -e '/[<>].*[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}.*/d')
fi
if test "x$SUFFIX" = "xhtml"; then
- # Some javadoc versions do not put quotes around font size
- HTML_FILTER="$SED \
+ # Some javadoc versions do not put quotes around font size
+ HTML_FILTER="$SED \
-e 's/<font size=-1>/<font size=\"-1\">/g'"
- $CAT $THIS_FILE | eval "$HTML_FILTER" > $THIS_FILE.filtered
- $CAT $OTHER_FILE | eval "$HTML_FILTER" > $OTHER_FILE.filtered
+ $CAT $THIS_FILE | eval "$HTML_FILTER" > $THIS_FILE.filtered
+ $CAT $OTHER_FILE | eval "$HTML_FILTER" > $OTHER_FILE.filtered
TMP=$(LC_ALL=C $DIFF $OTHER_FILE.filtered $THIS_FILE.filtered | \
$GREP '^[<>]' | \
$SED -e '/[<>] <!-- Generated by javadoc .* on .* -->/d' \
- -e '/[<>] <meta name="date" content=".*">/d' )
+ -e '/[<>] <meta name="date" content=".*">/d' )
+ fi
+ if test "$NAME" = "BenchmarkList"; then
+ $SORT $THIS_FILE > $THIS_FILE.sorted
+ $SORT $OTHER_FILE > $OTHER_FILE.sorted
+ TMP=$($DIFF $THIS_FILE.sorted $OTHER_FILE.sorted)
fi
if test -n "$TMP"; then
echo Files $OTHER_FILE and $THIS_FILE differ
@@ -382,17 +387,19 @@
! -name "*.zip" ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
! -name "modules" ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
! -name "*.cpl" ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
- ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" ! -name "*.jmod" \
- ! -name "*.obj" ! -name "*.o" ! -name "JavaControlPanelHelper" \
- ! -name "JavaUpdater" ! -name "JavaWSApplicationStub" \
- ! -name "jspawnhelper" ! -name "JavawsLauncher" ! -name "*.a" \
- ! -name "finish_installation" ! -name "Sparkle" ! -name "*.tar.gz" \
- ! -name "classes.jsa" \
+ ! -name "*.lib" ! -name "*.war" ! -name "*.jmod" ! -name "*.exe" \
+ ! -name "*.obj" ! -name "*.o" ! -name "jspawnhelper" ! -name "*.a" \
+ ! -name "*.tar.gz" ! -name "classes.jsa" ! -name "gtestLauncher" \
+ ! -name "*.map" \
| $GREP -v "./bin/" | $SORT | $FILTER)
echo Other files with binary differences...
for f in $GENERAL_FILES
do
+ # Skip all files in test/*/native
+ if [[ "$f" == */native/* ]]; then
+ continue
+ fi
if [ -e $OTHER_DIR/$f ]; then
SUFFIX="${f##*.}"
if [ "$(basename $f)" = "release" ]; then
@@ -431,7 +438,7 @@
$CAT $OTHER_DIR/$f | eval "$HTML_FILTER" > $OTHER_FILE &
$CAT $THIS_DIR/$f | eval "$HTML_FILTER" > $THIS_FILE &
wait
- elif [[ "$f" = *"/lib/classlist" ]]; then
+ elif [[ "$f" = *"/lib/classlist" ]] || [ "$SUFFIX" = "jar_contents" ]; then
# The classlist files may have some lines in random order
OTHER_FILE=$WORK_DIR/$f.other
THIS_FILE=$WORK_DIR/$f.this
@@ -792,14 +799,14 @@
export _NT_SYMBOL_PATH="$(echo $PDB_DIRS | tr ' ' ';')"
fi
- if [ -z "$SKIP_BIN_DIFF" ]; then
- if cmp $OTHER_FILE $THIS_FILE > /dev/null; then
+ if cmp $OTHER_FILE $THIS_FILE > /dev/null; then
# The files were bytewise identical.
- if [ -n "$VERBOSE" ]; then
- echo " : : : : : : $BIN_FILE"
- fi
- return 0
+ if [ -n "$VERBOSE" ]; then
+ echo " : : : : : : $BIN_FILE"
fi
+ return 0
+ fi
+ if [ -z "$SKIP_BIN_DIFF" ]; then
BIN_MSG=" diff "
if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then
DIFF_BIN=true
@@ -826,7 +833,8 @@
DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
- if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \
+ if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* || "$ACCEPTED_SMALL_SIZE_DIFF" = "true" ]] \
+ && [ "$DIFF_SIZE_REL" -gt 98 ] \
&& [ "$DIFF_SIZE_REL" -lt 102 ]; then
SIZE_MSG="($SIZE_MSG)"
DIFF_SIZE=
@@ -1440,13 +1448,8 @@
echo
fi
-
# Find the common images to compare, prioritizing later build stages
- if [ -d "$THIS/install/jdk" ] && [ -d "$OTHER/install/jdk" ]; then
- THIS_JDK="$THIS/install/jdk"
- OTHER_JDK="$OTHER/install/jdk"
- echo "Selecting install images for JDK compare"
- elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then
+ if [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then
THIS_JDK="$THIS/images/jdk"
OTHER_JDK="$OTHER/images/jdk"
echo "Selecting normal images for JDK compare"
@@ -1475,63 +1478,22 @@
echo " $OTHER_JDK"
if [ -d "$THIS/images/jdk-bundle" -o -d "$THIS/deploy/images/jdk-bundle" ] \
- && [ -d "$OTHER/images/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then
- if [ -d "$THIS/deploy/images/jdk-bundle" ]; then
+ && [ -d "$OTHER/images/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then
+ if [ -d "$THIS/deploy/images/jdk-bundle" ]; then
THIS_JDK_BUNDLE="$THIS/deploy/images/jdk-bundle"
- else
+ else
THIS_JDK_BUNDLE="$THIS/images/jdk-bundle"
- fi
- if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
+ fi
+ if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
OTHER_JDK_BUNDLE="$OTHER/deploy/images/jdk-bundle"
- else
+ else
OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle"
- fi
+ fi
echo "Also comparing jdk macosx bundles"
echo " $THIS_JDK_BUNDLE"
echo " $OTHER_JDK_BUNDLE"
fi
- if [ -d "$THIS/deploy/bundles" -o -d "$THIS/deploy/images/bundles" ] \
- && [ -d "$OTHER/deploy/bundles" -o -d "$OTHER/deploy/images/bundles" ]; then
- if [ -d "$THIS/deploy/images/bundles" ]; then
- THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/images/bundles"
- else
- THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/bundles"
- fi
- if [ -d "$OTHER/deploy/images/bundles" ]; then
- OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/images/bundles"
- else
- OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles"
- fi
- echo "Also comparing deploy javadoc bundles"
- fi
-
- if [ -d "$THIS/images/JavaAppletPlugin.plugin" ] \
- && [ -d "$OTHER/images/JavaAppletPlugin.plugin" -o -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then
- if [ -d "$THIS/images/JavaAppletPlugin.plugin" ]; then
- THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/images/JavaAppletPlugin.plugin"
- else
- THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/images/JavaAppletPlugin.plugin"
- fi
- if [ -d "$OTHER/images/JavaAppletPlugin.plugin" ]; then
- OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/images/JavaAppletPlugin.plugin"
- else
- OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin"
- fi
- echo "Also comparing deploy applet image"
- echo " $THIS_DEPLOY_APPLET_PLUGIN_DIR"
- echo " $OTHER_DEPLOY_APPLET_PLUGIN_DIR"
- fi
-
- if [ -d "$THIS/install/sparkle/Sparkle.framework" ] \
- && [ -d "$OTHER/install/sparkle/Sparkle.framework" ]; then
- THIS_SPARKLE_DIR="$THIS/install/sparkle/Sparkle.framework"
- OTHER_SPARKLE_DIR="$OTHER/install/sparkle/Sparkle.framework"
- echo "Also comparing install sparkle framework"
- echo " $THIS_SPARKLE_DIR"
- echo " $OTHER_SPARKLE_DIR"
- fi
-
THIS_SEC_DIR="$THIS/images"
OTHER_SEC_DIR="$OTHER/images"
if [ -f "$THIS_SEC_DIR/sec-bin.zip" ] && [ -f "$OTHER_SEC_DIR/sec-bin.zip" ]; then
@@ -1557,6 +1519,14 @@
else
echo "WARNING! Docs haven't been built and won't be compared."
fi
+
+ if [ -d "$THIS/images/test" ] && [ -d "$OTHER/images/test" ]; then
+ THIS_TEST="$THIS/images/test"
+ OTHER_TEST="$OTHER/images/test"
+ echo "Also comparing test image"
+ else
+ echo "WARNING! Test haven't been built and won't be compared."
+ fi
fi
################################################################################
@@ -1582,22 +1552,16 @@
echo -n "Docs "
compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
fi
+ if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
+ echo -n "Test "
+ compare_dirs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
+ echo -n "Test "
+ compare_files $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
+ fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
- if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
- echo -n "JavaAppletPlugin "
- compare_dirs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- echo -n "JavaAppletPlugin "
- compare_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- fi
- if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
- echo -n "Sparkle.framework "
- compare_dirs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
- echo -n "Sparkle.framework "
- compare_files $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
- fi
fi
if [ "$CMP_LIBS" = "true" ]; then
@@ -1605,34 +1569,38 @@
echo -n "JDK "
compare_all_libs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
fi
+ if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
+ echo -n "Test "
+ # Test native libs are never stripped so will not compare well.
+ SKIP_BIN_DIFF="true"
+ ACCEPTED_SMALL_SIZE_DIFF_bak="$ACCEPTED_SMALL_SIZE_DIFF"
+ if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
+ ACCEPTED_SMALL_SIZE_DIFF="true"
+ fi
+ compare_all_libs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
+ SKIP_BIN_DIFF="false"
+ ACCEPTED_SMALL_SIZE_DIFF="$ACCEPTED_SMALL_SIZE_DIFF_bak"
+ fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
- if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
- echo -n "JavaAppletPlugin "
- compare_all_libs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- fi
- if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
- echo -n "Sparkle.framework "
- compare_all_libs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
- fi
fi
if [ "$CMP_EXECS" = "true" ]; then
if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
+ echo -n "JDK "
compare_all_execs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
fi
+ if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
+ echo -n "Test "
+ # Test native executables are never stripped so will not compare well.
+ SKIP_BIN_DIFF="true"
+ compare_all_execs $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
+ SKIP_BIN_DIFF="false"
+ fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
- if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
- echo -n "JavaAppletPlugin "
- compare_all_execs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- fi
- if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
- echo -n "Sparkle.framework "
- compare_all_execs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
- fi
fi
if [ "$CMP_GENERAL" = "true" ]; then
@@ -1648,23 +1616,24 @@
echo -n "Docs "
compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
fi
+ if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
+ echo -n "Test "
+ compare_general_files $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
+ fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
- if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
- echo -n "JavaAppletPlugin "
- compare_general_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- fi
- if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
- echo -n "Sparkle.framework "
- compare_general_files $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
- fi
fi
if [ "$CMP_ZIPS" = "true" ]; then
if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
+ echo -n "JDK "
compare_all_zip_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
fi
+ if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
+ echo -n "Test "
+ compare_all_zip_files $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
+ fi
if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then
if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then
echo "sec-bin.zip..."
@@ -1686,24 +1655,20 @@
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
- if [ -n "$THIS_DEPLOY_BUNDLE_DIR" ] && [ -n "$OTHER_DEPLOY_BUNDLE_DIR" ]; then
- compare_all_zip_files $THIS_DEPLOY_BUNDLE_DIR $OTHER_DEPLOY_BUNDLE_DIR $COMPARE_ROOT/deploy-bundle
- fi
- if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
- compare_all_zip_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- fi
fi
if [ "$CMP_JARS" = "true" ]; then
if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
+ echo -n "JDK "
compare_all_jar_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
fi
+ if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
+ echo -n "Test "
+ compare_all_jar_files $THIS_TEST $OTHER_TEST $COMPARE_ROOT/test
+ fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
- if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
- compare_all_jar_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- fi
fi
if [ "$CMP_JMODS" = "true" ]; then
@@ -1723,14 +1688,6 @@
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
- if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
- echo -n "JavaAppletPlugin "
- compare_permissions $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- fi
- if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
- echo -n "Sparkle.framework "
- compare_permissions $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
- fi
fi
if [ "$CMP_TYPES" = "true" ]; then
@@ -1742,17 +1699,13 @@
echo -n "JDK Bundle "
compare_file_types $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
fi
+ if [ -n "$THIS_TEST" ] && [ -n "$OTHER_TEST" ]; then
+ echo -n "Test "
+ compare_file_types $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
+ fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
- if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
- echo -n "JavaAppletPlugin "
- compare_file_types $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
- fi
- if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
- echo -n "Sparkle.framework "
- compare_file_types $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
- fi
fi
echo
--- a/make/scripts/compare_exceptions.sh.incl Tue Apr 02 10:55:20 2019 +0530
+++ b/make/scripts/compare_exceptions.sh.incl Tue Apr 02 10:57:57 2019 +0530
@@ -38,6 +38,7 @@
if [ "$OPENJDK_TARGET_OS" = "linux" ]; then
ACCEPTED_BIN_DIFF="
./lib/server/libjvm.so
+ ./hotspot/gtest/server/libjvm.so
"
elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
SKIP_BIN_DIFF="true"
@@ -49,6 +50,7 @@
./lib/libunpack.so
./lib/server/libjvm.so
./bin/unpack200
+ ./hotspot/gtest/server/libjvm.so
"
KNOWN_DIS_DIFF="
./lib/libfontmanager.so
@@ -68,5 +70,6 @@
./lib/libosxapp.dylib
./lib/libosxui.dylib
./lib/server/libjvm.dylib
+ ./hotspot/gtest/server/libjvm.dylib
"
fi
--- a/src/hotspot/cpu/aarch64/aarch64.ad Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/aarch64.ad Tue Apr 02 10:57:57 2019 +0530
@@ -3445,7 +3445,7 @@
// markOop of object (disp_hdr) with the stack pointer.
__ mov(rscratch1, sp);
__ sub(disp_hdr, disp_hdr, rscratch1);
- __ mov(tmp, (address) (~(os::vm_page_size()-1) | markOopDesc::lock_mask_in_place));
+ __ mov(tmp, (address) (~(os::vm_page_size()-1) | (uintptr_t)markOopDesc::lock_mask_in_place));
// If condition is true we are cont and hence we can store 0 as the
// displaced header in the box, which indicates that it is a recursive lock.
__ ands(tmp/*==0?*/, disp_hdr, tmp); // Sets flags for result
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -72,15 +72,12 @@
}
void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
- Register start, Register end, Register scratch, RegSet saved_regs) {
+ Register start, Register count, Register scratch, RegSet saved_regs) {
__ push(saved_regs, sp);
- // must compute element count unless barrier set interface is changed (other platforms supply count)
- assert_different_registers(start, end, scratch);
- __ lea(scratch, Address(end, BytesPerHeapOop));
- __ sub(scratch, scratch, start); // subtract start to get #bytes
- __ lsr(scratch, scratch, LogBytesPerHeapOop); // convert to element count
+ assert_different_registers(start, count, scratch);
+ assert_different_registers(c_rarg0, count);
__ mov(c_rarg0, start);
- __ mov(c_rarg1, scratch);
+ __ mov(c_rarg1, count);
__ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry), 2);
__ pop(saved_regs, sp);
}
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -39,7 +39,7 @@
void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register addr, Register count, RegSet saved_regs);
void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
- Register start, Register end, Register tmp, RegSet saved_regs);
+ Register start, Register count, Register tmp, RegSet saved_regs);
void g1_write_barrier_pre(MacroAssembler* masm,
Register obj,
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -62,18 +62,22 @@
}
void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
- Register start, Register end, Register scratch, RegSet saved_regs) {
+ Register start, Register count, Register scratch, RegSet saved_regs) {
BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- Label L_loop;
+ Label L_loop, L_done;
+ const Register end = count;
+ __ cbz(count, L_done); // zero count - nothing to do
+
+ __ lea(end, Address(start, count, Address::lsl(LogBytesPerHeapOop))); // end = start + count << LogBytesPerHeapOop
+ __ sub(end, end, BytesPerHeapOop); // last element address to make inclusive
__ lsr(start, start, CardTable::card_shift);
__ lsr(end, end, CardTable::card_shift);
- __ sub(end, end, start); // number of bytes to copy
+ __ sub(count, end, start); // number of bytes to copy
- const Register count = end; // 'end' register contains bytes count now
__ load_byte_map_base(scratch);
__ add(start, start, scratch);
if (ct->scanned_concurrently()) {
@@ -83,6 +87,7 @@
__ strb(zr, Address(start, count));
__ subs(count, count, 1);
__ br(Assembler::GE, L_loop);
+ __ bind(L_done);
}
void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -33,7 +33,7 @@
void store_check(MacroAssembler* masm, Register obj, Address dst);
virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
- Register start, Register end, Register tmp, RegSet saved_regs);
+ Register start, Register count, Register tmp, RegSet saved_regs);
virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
Address dst, Register val, Register tmp1, Register tmp2);
--- a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -37,10 +37,10 @@
}
void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
- Register start, Register end, Register tmp,
+ Register start, Register count, Register tmp,
RegSet saved_regs) {
if (is_oop) {
- gen_write_ref_array_post_barrier(masm, decorators, start, end, tmp, saved_regs);
+ gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
}
}
--- a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -37,7 +37,7 @@
virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register addr, Register count, RegSet saved_regs) {}
virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
- Register start, Register end, Register tmp, RegSet saved_regs) {}
+ Register start, Register count, Register tmp, RegSet saved_regs) {}
virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
Address dst, Register val, Register tmp1, Register tmp2) = 0;
@@ -46,7 +46,7 @@
virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
Register addr, Register count, RegSet saved_regs);
virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
- Register start, Register end, Register tmp, RegSet saved_regs);
+ Register start, Register count, Register tmp, RegSet saved_regs);
virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
Address dst, Register val, Register tmp1, Register tmp2);
};
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -73,16 +73,13 @@
}
void ShenandoahBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
- Register start, Register end, Register scratch, RegSet saved_regs) {
+ Register start, Register count, Register scratch, RegSet saved_regs) {
if (is_oop) {
__ push(saved_regs, sp);
- // must compute element count unless barrier set interface is changed (other platforms supply count)
- assert_different_registers(start, end, scratch);
- __ lea(scratch, Address(end, BytesPerHeapOop));
- __ sub(scratch, scratch, start); // subtract start to get #bytes
- __ lsr(scratch, scratch, LogBytesPerHeapOop); // convert to element count
+ assert_different_registers(start, count, scratch);
+ assert_different_registers(c_rarg0, count);
__ mov(c_rarg0, start);
- __ mov(c_rarg1, scratch);
+ __ mov(c_rarg1, count);
__ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_array_post_entry), 2);
__ pop(saved_regs, sp);
}
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -78,7 +78,7 @@
virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
Register addr, Register count, RegSet saved_regs);
virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
- Register start, Register end, Register tmp, RegSet saved_regs);
+ Register start, Register count, Register tmp, RegSet saved_regs);
virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
Register dst, Address src, Register tmp1, Register tmp_thread);
virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1375,8 +1375,6 @@
__ pop(RegSet::of(d, count), sp);
if (VerifyOops)
verify_oop_array(size, d, count, r16);
- __ sub(count, count, 1); // make an inclusive end pointer
- __ lea(count, Address(d, count, Address::lsl(exact_log2(size))));
}
bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1, RegSet());
@@ -1448,8 +1446,6 @@
__ pop(RegSet::of(d, count), sp);
if (VerifyOops)
verify_oop_array(size, d, count, r16);
- __ sub(count, count, 1); // make an inclusive end pointer
- __ lea(count, Address(d, count, Address::lsl(exact_log2(size))));
}
bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, rscratch1, RegSet());
__ leave();
@@ -1842,8 +1838,7 @@
__ br(Assembler::EQ, L_done_pop);
__ BIND(L_do_card_marks);
- __ add(to, to, -heapOopSize); // make an inclusive end pointer
- bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, to, rscratch1, wb_post_saved_regs);
+ bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, count_save, rscratch1, wb_post_saved_regs);
__ bind(L_done_pop);
__ pop(RegSet::of(r18, r19, r20, r21), sp);
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -2885,7 +2885,7 @@
{
Label notVolatile;
__ tbz(r5, ConstantPoolCacheEntry::is_volatile_shift, notVolatile);
- __ membar(MacroAssembler::StoreLoad);
+ __ membar(MacroAssembler::StoreLoad | MacroAssembler::StoreStore);
__ bind(notVolatile);
}
}
@@ -3029,7 +3029,7 @@
{
Label notVolatile;
__ tbz(r3, ConstantPoolCacheEntry::is_volatile_shift, notVolatile);
- __ membar(MacroAssembler::StoreLoad);
+ __ membar(MacroAssembler::StoreLoad | MacroAssembler::StoreStore);
__ bind(notVolatile);
}
}
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1455,13 +1455,11 @@
break;
}
} else {
- if (opr2->is_address()) {
- DEBUG_ONLY( Unimplemented(); ) // Seems to be unused at the moment.
- LIR_Address *addr = opr2->as_address_ptr();
- BasicType type = addr->type();
- if (type == T_OBJECT) { __ ld(R0, index_or_disp(addr), addr->base()->as_register()); }
- else { __ lwa(R0, index_or_disp(addr), addr->base()->as_register()); }
- __ cmpd(BOOL_RESULT, opr1->as_register(), R0);
+ assert(opr1->type() != T_ADDRESS && opr2->type() != T_ADDRESS, "currently unsupported");
+ if (opr1->type() == T_OBJECT || opr1->type() == T_ARRAY) {
+ // There are only equal/notequal comparisons on objects.
+ assert(condition == lir_cond_equal || condition == lir_cond_notEqual, "oops");
+ __ cmpd(BOOL_RESULT, opr1->as_register(), opr2->as_register());
} else {
if (unsigned_comp) {
__ cmplw(BOOL_RESULT, opr1->as_register(), opr2->as_register());
@@ -1497,14 +1495,6 @@
} else {
ShouldNotReachHere();
}
- } else if (opr1->is_address()) {
- DEBUG_ONLY( Unimplemented(); ) // Seems to be unused at the moment.
- LIR_Address * addr = opr1->as_address_ptr();
- BasicType type = addr->type();
- assert (opr2->is_constant(), "Checking");
- if (type == T_OBJECT) { __ ld(R0, index_or_disp(addr), addr->base()->as_register()); }
- else { __ lwa(R0, index_or_disp(addr), addr->base()->as_register()); }
- __ cmpdi(BOOL_RESULT, R0, opr2->as_constant_ptr()->as_jint());
} else {
ShouldNotReachHere();
}
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -27,6 +27,7 @@
#include "asm/macroAssembler.inline.hpp"
#include "gc/shared/barrierSetAssembler.hpp"
#include "interpreter/interp_masm.hpp"
+#include "runtime/jniHandles.hpp"
#define __ masm->
--- a/src/hotspot/cpu/x86/crc32c.h Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/x86/crc32c.h Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,9 @@
*
*/
+#ifndef CPU_X86_CRC32C_H
+#define CPU_X86_CRC32C_H
+
enum {
// S. Gueron / Information Processing Letters 112 (2012) 184
// shows than anything above 6K and below 32K is a good choice
@@ -64,3 +67,5 @@
// a) constants table generation (hotspot/src/cpu/x86/vm/stubRoutines_x86.cpp)
// b) constant fetch from that table (macroAssembler_x86.cpp)
// c) unrolled for loop (macroAssembler_x86.cpp)
+
+#endif /* !CPU_X86_CRC32C_H */
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -901,11 +901,15 @@
FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
}
+#ifdef _LP64
+ // These are only supported on 64-bit
if (UseSHA && supports_avx2() && supports_bmi2()) {
if (FLAG_IS_DEFAULT(UseSHA512Intrinsics)) {
FLAG_SET_DEFAULT(UseSHA512Intrinsics, true);
}
- } else if (UseSHA512Intrinsics) {
+ } else
+#endif
+ if (UseSHA512Intrinsics) {
warning("Intrinsics for SHA-384 and SHA-512 crypto hash functions not available on this CPU.");
FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
}
--- a/src/hotspot/os/aix/os_aix.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os/aix/os_aix.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -37,6 +37,7 @@
#include "compiler/compileBroker.hpp"
#include "interpreter/interpreter.hpp"
#include "logging/log.hpp"
+#include "logging/logStream.hpp"
#include "libo4.hpp"
#include "libperfstat_aix.hpp"
#include "libodm_aix.hpp"
@@ -923,6 +924,11 @@
char buf[64];
log_warning(os, thread)("Failed to start thread - pthread_create failed (%d=%s) for attributes: %s.",
ret, os::errno_name(ret), os::Posix::describe_pthread_attr(buf, sizeof(buf), &attr));
+ // Log some OS information which might explain why creating the thread failed.
+ log_info(os, thread)("Number of threads approx. running in the VM: %d", Threads::number_of_threads());
+ LogStream st(Log(os, thread)::info());
+ os::Posix::print_rlimit_info(&st);
+ os::print_memory_info(&st);
}
pthread_attr_destroy(&attr);
--- a/src/hotspot/os/bsd/os_bsd.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os/bsd/os_bsd.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -33,6 +33,7 @@
#include "compiler/disassembler.hpp"
#include "interpreter/interpreter.hpp"
#include "logging/log.hpp"
+#include "logging/logStream.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
#include "oops/oop.inline.hpp"
@@ -743,6 +744,11 @@
} else {
log_warning(os, thread)("Failed to start thread - pthread_create failed (%s) for attributes: %s.",
os::errno_name(ret), os::Posix::describe_pthread_attr(buf, sizeof(buf), &attr));
+ // Log some OS information which might explain why creating the thread failed.
+ log_info(os, thread)("Number of threads approx. running in the VM: %d", Threads::number_of_threads());
+ LogStream st(Log(os, thread)::info());
+ os::Posix::print_rlimit_info(&st);
+ os::print_memory_info(&st);
}
pthread_attr_destroy(&attr);
--- a/src/hotspot/os/linux/os_linux.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os/linux/os_linux.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -780,6 +780,13 @@
} else {
log_warning(os, thread)("Failed to start thread - pthread_create failed (%s) for attributes: %s.",
os::errno_name(ret), os::Posix::describe_pthread_attr(buf, sizeof(buf), &attr));
+ // Log some OS information which might explain why creating the thread failed.
+ log_info(os, thread)("Number of threads approx. running in the VM: %d", Threads::number_of_threads());
+ LogStream st(Log(os, thread)::info());
+ os::Posix::print_rlimit_info(&st);
+ os::print_memory_info(&st);
+ os::Linux::print_proc_sys_info(&st);
+ os::Linux::print_container_info(&st);
}
pthread_attr_destroy(&attr);
--- a/src/hotspot/os/solaris/os_solaris.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os/solaris/os_solaris.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -33,6 +33,7 @@
#include "compiler/disassembler.hpp"
#include "interpreter/interpreter.hpp"
#include "logging/log.hpp"
+#include "logging/logStream.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
#include "oops/oop.inline.hpp"
@@ -992,6 +993,11 @@
} else {
log_warning(os, thread)("Failed to start thread - thr_create failed (%s) for attributes: %s.",
os::errno_name(status), describe_thr_create_attributes(buf, sizeof(buf), stack_size, flags));
+ // Log some OS information which might explain why creating the thread failed.
+ log_info(os, thread)("Number of threads approx. running in the VM: %d", Threads::number_of_threads());
+ LogStream st(Log(os, thread)::info());
+ os::Posix::print_rlimit_info(&st);
+ os::print_memory_info(&st);
}
if (status != 0) {
--- a/src/hotspot/os/windows/os_windows.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os/windows/os_windows.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -36,6 +36,7 @@
#include "compiler/disassembler.hpp"
#include "interpreter/interpreter.hpp"
#include "logging/log.hpp"
+#include "logging/logStream.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
#include "oops/oop.inline.hpp"
@@ -669,6 +670,10 @@
} else {
log_warning(os, thread)("Failed to start thread - _beginthreadex failed (%s) for attributes: %s.",
os::errno_name(errno), describe_beginthreadex_attributes(buf, sizeof(buf), stack_size, initflag));
+ // Log some OS information which might explain why creating the thread failed.
+ log_info(os, thread)("Number of threads approx. running in the VM: %d", Threads::number_of_threads());
+ LogStream st(Log(os, thread)::info());
+ os::print_memory_info(&st);
}
if (thread_handle == NULL) {
--- a/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -77,6 +77,8 @@
inline void OrderAccess::acquire() { inlasm_lwsync(); }
inline void OrderAccess::release() { inlasm_lwsync(); }
inline void OrderAccess::fence() { inlasm_sync(); }
+inline void OrderAccess::cross_modify_fence()
+ { inlasm_isync(); }
template<size_t byte_size>
struct OrderAccess::PlatformOrderedLoad<byte_size, X_ACQUIRE>
--- a/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -59,6 +59,11 @@
compiler_barrier();
}
+inline void OrderAccess::cross_modify_fence() {
+ int idx = 0;
+ __asm__ volatile ("cpuid " : "+a" (idx) : : "ebx", "ecx", "edx", "memory");
+}
+
template<>
struct OrderAccess::PlatformOrderedStore<1, RELEASE_X_FENCE>
{
--- a/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -73,5 +73,6 @@
inline void OrderAccess::acquire() { LIGHT_MEM_BARRIER; }
inline void OrderAccess::release() { LIGHT_MEM_BARRIER; }
inline void OrderAccess::fence() { FULL_MEM_BARRIER; }
+inline void OrderAccess::cross_modify_fence() { }
#endif // OS_CPU_BSD_ZERO_ORDERACCESS_BSD_ZERO_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -49,6 +49,8 @@
FULL_MEM_BARRIER;
}
+inline void OrderAccess::cross_modify_fence() { }
+
template<size_t byte_size>
struct OrderAccess::PlatformOrderedLoad<byte_size, X_ACQUIRE>
{
--- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -101,5 +101,6 @@
inline void OrderAccess::storeload() { dmb_sy(); }
inline void OrderAccess::release() { dmb_sy(); }
inline void OrderAccess::fence() { dmb_sy(); }
+inline void OrderAccess::cross_modify_fence() { }
#endif // OS_CPU_LINUX_ARM_ORDERACCESS_LINUX_ARM_HPP
--- a/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -79,7 +79,8 @@
inline void OrderAccess::acquire() { inlasm_lwsync(); }
inline void OrderAccess::release() { inlasm_lwsync(); }
inline void OrderAccess::fence() { inlasm_sync(); }
-
+inline void OrderAccess::cross_modify_fence()
+ { inlasm_isync(); }
template<size_t byte_size>
struct OrderAccess::PlatformOrderedLoad<byte_size, X_ACQUIRE>
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -132,6 +132,10 @@
return NULL;
}
+static unsigned long ucontext_get_trap(const ucontext_t * uc) {
+ return uc->uc_mcontext.regs->trap;
+}
+
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
intptr_t** ret_sp, intptr_t** ret_fp) {
@@ -304,9 +308,22 @@
// Handle ALL stack overflow variations here
if (sig == SIGSEGV) {
- // Si_addr may not be valid due to a bug in the linux-ppc64 kernel (see
+ // si_addr may not be valid due to a bug in the linux-ppc64 kernel (see
// comment below). Use get_stack_bang_address instead of si_addr.
- address addr = ((NativeInstruction*)pc)->get_stack_bang_address(uc);
+ // If SIGSEGV is caused due to a branch to an invalid address an
+ // "Instruction Storage" interruption is generated and 'pc' (NIP) already
+ // contains the invalid address. Otherwise, the SIGSEGV is caused due to
+ // load/store instruction trying to load/store from/to an invalid address
+ // and causing a "Data Storage" interruption, so we inspect the intruction
+ // in order to extract the faulty data addresss.
+ address addr;
+ if ((ucontext_get_trap(uc) & 0x0F00 /* no IRQ reply bits */) == 0x0400) {
+ // Instruction interruption
+ addr = pc;
+ } else {
+ // Data interruption (0x0300): extract faulty data address
+ addr = ((NativeInstruction*)pc)->get_stack_bang_address(uc);
+ }
// Check if fault address is within thread stack.
if (thread->on_local_stack(addr)) {
--- a/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -74,6 +74,7 @@
inline void OrderAccess::acquire() { inlasm_zarch_acquire(); }
inline void OrderAccess::release() { inlasm_zarch_release(); }
inline void OrderAccess::fence() { inlasm_zarch_sync(); }
+inline void OrderAccess::cross_modify_fence() { inlasm_zarch_sync(); }
template<size_t byte_size>
struct OrderAccess::PlatformOrderedLoad<byte_size, X_ACQUIRE>
--- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@
if (ret_frame.is_interpreted_frame()) {
frame::z_ijava_state* istate = ret_frame.ijava_state_unchecked();
- if (!((Method*)(istate->method))->is_metaspace_object()) {
+ if ((stack_base() >= (address)istate && (address)istate > stack_end()) || !((Method*)(istate->method))->is_metaspace_object()) {
return false;
}
uint64_t reg_bcp = uc->uc_mcontext.gregs[13/*Z_BCP*/];
--- a/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -48,4 +48,6 @@
__asm__ volatile ("membar #StoreLoad" : : : "memory");
}
+inline void OrderAccess::cross_modify_fence() { }
+
#endif // OS_CPU_LINUX_SPARC_ORDERACCESS_LINUX_SPARC_HPP
--- a/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -55,6 +55,11 @@
compiler_barrier();
}
+inline void OrderAccess::cross_modify_fence() {
+ int idx = 0;
+ __asm__ volatile ("cpuid " : "+a" (idx) : : "ebx", "ecx", "edx", "memory");
+}
+
template<>
struct OrderAccess::PlatformOrderedStore<1, RELEASE_X_FENCE>
{
--- a/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -82,5 +82,6 @@
inline void OrderAccess::release() { LIGHT_MEM_BARRIER; }
inline void OrderAccess::fence() { FULL_MEM_BARRIER; }
+inline void OrderAccess::cross_modify_fence() { }
#endif // OS_CPU_LINUX_ZERO_ORDERACCESS_LINUX_ZERO_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -51,4 +51,6 @@
__asm__ volatile ("membar #StoreLoad" : : : "memory");
}
+inline void OrderAccess::cross_modify_fence() { }
+
#endif // OS_CPU_SOLARIS_SPARC_ORDERACCESS_SOLARIS_SPARC_HPP
--- a/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -54,4 +54,9 @@
compiler_barrier();
}
+inline void OrderAccess::cross_modify_fence() {
+ int idx = 0;
+ __asm__ volatile ("cpuid " : "+a" (idx) : : "ebx", "ecx", "edx", "memory");
+}
+
#endif // OS_CPU_SOLARIS_X86_ORDERACCESS_SOLARIS_X86_HPP
--- a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -69,6 +69,11 @@
compiler_barrier();
}
+inline void OrderAccess::cross_modify_fence() {
+ int regs[4];
+ __cpuid(regs, 0);
+}
+
#ifndef AMD64
template<>
struct OrderAccess::PlatformOrderedStore<1, RELEASE_X_FENCE>
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -465,6 +465,9 @@
}
#ifndef AMD64
+// Ignore "C4172: returning address of local variable or temporary" on 32bit
+PRAGMA_DIAG_PUSH
+PRAGMA_DISABLE_MSVC_WARNING(4172)
// Returns an estimate of the current stack pointer. Result must be guaranteed
// to point into the calling threads stack, and be no lower than the current
// stack pointer.
@@ -473,6 +476,7 @@
address sp = (address)&dummy;
return sp;
}
+PRAGMA_DIAG_POP
#else
// Returns the current stack pointer. Accurate value needed for
// os::verify_stack_alignment().
--- a/src/hotspot/share/aot/aotCompiledMethod.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/aot/aotCompiledMethod.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -206,8 +206,6 @@
// AOT compiled methods do not get into zombie state
virtual bool can_convert_to_zombie() { return false; }
- // Evol dependent methods already marked.
- virtual bool is_evol_dependent() { return false; }
virtual bool is_dependent_on_method(Method* dependee) { return true; }
virtual void clear_inline_caches();
--- a/src/hotspot/share/ci/ciReplay.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/ci/ciReplay.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -40,6 +40,7 @@
#include "runtime/handles.inline.hpp"
#include "utilities/copy.hpp"
#include "utilities/macros.hpp"
+#include "utilities/utf8.hpp"
#ifndef PRODUCT
--- a/src/hotspot/share/classfile/classFileParser.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/classFileParser.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -32,6 +32,7 @@
#include "classfile/dictionary.hpp"
#include "classfile/javaClasses.inline.hpp"
#include "classfile/moduleEntry.hpp"
+#include "classfile/packageEntry.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/verificationType.hpp"
@@ -77,6 +78,8 @@
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
#include "utilities/resourceHash.hpp"
+#include "utilities/utf8.hpp"
+
#if INCLUDE_CDS
#include "classfile/systemDictionaryShared.hpp"
#endif
@@ -312,7 +315,7 @@
const char* const str = java_lang_String::as_utf8_string(patch());
// (could use java_lang_String::as_symbol instead, but might as well batch them)
utf8_buffer = (const u1*) str;
- utf8_length = (int) strlen(str);
+ utf8_length = (u2) strlen(str);
}
unsigned int hash;
@@ -6113,7 +6116,7 @@
// For the boot and platform class loaders, skip classes that are not found in the
// java runtime image, such as those found in the --patch-module entries.
// These classes can't be loaded from the archive during runtime.
- if (!ClassLoader::is_modules_image(stream->source()) && strncmp(stream->source(), "jrt:", 4) != 0) {
+ if (!stream->from_boot_loader_modules_image() && strncmp(stream->source(), "jrt:", 4) != 0) {
skip = true;
}
--- a/src/hotspot/share/classfile/classFileStream.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/classFileStream.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,12 +38,14 @@
ClassFileStream::ClassFileStream(const u1* buffer,
int length,
const char* source,
- bool verify_stream) :
+ bool verify_stream,
+ bool from_boot_loader_modules_image) :
_buffer_start(buffer),
_buffer_end(buffer + length),
_current(buffer),
_source(source),
- _need_verify(verify_stream) {}
+ _need_verify(verify_stream),
+ _from_boot_loader_modules_image(from_boot_loader_modules_image) {}
const u1* ClassFileStream::clone_buffer() const {
u1* const new_buffer_start = NEW_RESOURCE_ARRAY(u1, length());
@@ -69,7 +71,8 @@
return new ClassFileStream(new_buffer_start,
length(),
clone_source(),
- need_verify());
+ need_verify(),
+ from_boot_loader_modules_image());
}
uint64_t ClassFileStream::compute_fingerprint() const {
--- a/src/hotspot/share/classfile/classFileStream.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/classFileStream.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -44,7 +44,7 @@
mutable const u1* _current; // Current buffer position
const char* const _source; // Source of stream (directory name, ZIP/JAR archive name)
bool _need_verify; // True if verification is on for the class file
-
+ bool _from_boot_loader_modules_image; // True if this was created by ClassPathImageEntry.
void truncated_file_error(TRAPS) const ;
protected:
@@ -57,7 +57,8 @@
ClassFileStream(const u1* buffer,
int length,
const char* source,
- bool verify_stream = verify); // to be verified by default
+ bool verify_stream = verify, // to be verified by default
+ bool from_boot_loader_modules_image = false);
virtual const ClassFileStream* clone() const;
@@ -77,6 +78,7 @@
const char* source() const { return _source; }
bool need_verify() const { return _need_verify; }
void set_verify(bool flag) { _need_verify = flag; }
+ bool from_boot_loader_modules_image() const { return _from_boot_loader_modules_image; }
void check_truncated_file(bool b, TRAPS) const {
if (b) {
--- a/src/hotspot/share/classfile/classLoader.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/classLoader.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -361,6 +361,8 @@
}
}
+DEBUG_ONLY(ClassPathImageEntry* ClassPathImageEntry::_singleton = NULL;)
+
void ClassPathImageEntry::close_jimage() {
if (_jimage != NULL) {
(*JImageClose)(_jimage);
@@ -373,12 +375,17 @@
_jimage(jimage) {
guarantee(jimage != NULL, "jimage file is null");
guarantee(name != NULL, "jimage file name is null");
+ assert(_singleton == NULL, "VM supports only one jimage");
+ DEBUG_ONLY(_singleton = this);
size_t len = strlen(name) + 1;
_name = NEW_C_HEAP_ARRAY(const char, len, mtClass);
strncpy((char *)_name, name, len);
}
ClassPathImageEntry::~ClassPathImageEntry() {
+ assert(_singleton == this, "must be");
+ DEBUG_ONLY(_singleton = NULL);
+
if (_name != NULL) {
FREE_C_HEAP_ARRAY(const char, _name);
_name = NULL;
@@ -389,6 +396,10 @@
}
}
+ClassFileStream* ClassPathImageEntry::open_stream(const char* name, TRAPS) {
+ return open_stream_for_loader(name, ClassLoaderData::the_null_class_loader_data(), THREAD);
+}
+
// For a class in a named module, look it up in the jimage file using this syntax:
// /<module-name>/<package-name>/<base-class>
//
@@ -396,7 +407,7 @@
// 1. There are no unnamed modules in the jimage file.
// 2. A package is in at most one module in the jimage file.
//
-ClassFileStream* ClassPathImageEntry::open_stream(const char* name, TRAPS) {
+ClassFileStream* ClassPathImageEntry::open_stream_for_loader(const char* name, ClassLoaderData* loader_data, TRAPS) {
jlong size;
JImageLocationRef location = (*JImageFindResource)(_jimage, "", get_jimage_version_string(), name, &size);
@@ -407,20 +418,8 @@
if (pkg_name != NULL) {
if (!Universe::is_module_initialized()) {
location = (*JImageFindResource)(_jimage, JAVA_BASE_NAME, get_jimage_version_string(), name, &size);
-#if INCLUDE_CDS
- // CDS uses the boot class loader to load classes whose packages are in
- // modules defined for other class loaders. So, for now, get their module
- // names from the "modules" jimage file.
- if (DumpSharedSpaces && location == 0) {
- const char* module_name = (*JImagePackageToModule)(_jimage, pkg_name);
- if (module_name != NULL) {
- location = (*JImageFindResource)(_jimage, module_name, get_jimage_version_string(), name, &size);
- }
- }
-#endif
-
} else {
- PackageEntry* package_entry = ClassLoader::get_package_entry(name, ClassLoaderData::the_null_class_loader_data(), CHECK_NULL);
+ PackageEntry* package_entry = ClassLoader::get_package_entry(name, loader_data, CHECK_NULL);
if (package_entry != NULL) {
ResourceMark rm;
// Get the module name
@@ -442,10 +441,12 @@
char* data = NEW_RESOURCE_ARRAY(char, size);
(*JImageGetResource)(_jimage, location, data, size);
// Resource allocated
+ assert(this == (ClassPathImageEntry*)ClassLoader::get_jrt_entry(), "must be");
return new ClassFileStream((u1*)data,
(int)size,
_name,
- ClassFileStream::verify);
+ ClassFileStream::verify,
+ true); // from_boot_loader_modules_image
}
return NULL;
@@ -459,7 +460,9 @@
}
bool ClassPathImageEntry::is_modules_image() const {
- return ClassLoader::is_modules_image(name());
+ assert(this == _singleton, "VM supports a single jimage");
+ assert(this == (ClassPathImageEntry*)ClassLoader::get_jrt_entry(), "must be used for jrt entry");
+ return true;
}
#if INCLUDE_CDS
@@ -737,8 +740,8 @@
// Check for a jimage
if (Arguments::has_jimage()) {
assert(_jrt_entry == NULL, "should not setup bootstrap class search path twice");
+ _jrt_entry = new_entry;
assert(new_entry != NULL && new_entry->is_modules_image(), "No java runtime image present");
- _jrt_entry = new_entry;
assert(_jrt_entry->jimage() != NULL, "No java runtime image");
}
} else {
@@ -1499,7 +1502,7 @@
}
// for index 0 and the stream->source() is the modules image or has the jrt: protocol.
// The class must be from the runtime modules image.
- if (i == 0 && (is_modules_image(src) || string_starts_with(src, "jrt:"))) {
+ if (i == 0 && (stream->from_boot_loader_modules_image() || string_starts_with(src, "jrt:"))) {
classpath_index = i;
break;
}
@@ -1515,7 +1518,7 @@
// The shared path table is set up after module system initialization.
// The path table contains no entry before that. Any classes loaded prior
// to the setup of the shared path table must be from the modules image.
- assert(is_modules_image(src), "stream must be from modules image");
+ assert(stream->from_boot_loader_modules_image(), "stream must be loaded by boot loader from modules image");
assert(FileMapInfo::get_number_of_shared_paths() == 0, "shared path table must not have been setup");
classpath_index = 0;
}
--- a/src/hotspot/share/classfile/classLoader.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/classLoader.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -61,6 +61,10 @@
// Attempt to locate file_name through this class path entry.
// Returns a class file parsing stream if successfull.
virtual ClassFileStream* open_stream(const char* name, TRAPS) = 0;
+ // Open the stream for a specific class loader
+ virtual ClassFileStream* open_stream_for_loader(const char* name, ClassLoaderData* loader_data, TRAPS) {
+ return open_stream(name, THREAD);
+ }
};
class ClassPathDirEntry: public ClassPathEntry {
@@ -114,6 +118,7 @@
private:
JImageFile* _jimage;
const char* _name;
+ DEBUG_ONLY(static ClassPathImageEntry* _singleton;)
public:
bool is_modules_image() const;
bool is_jar_file() const { return false; }
@@ -124,6 +129,7 @@
ClassPathImageEntry(JImageFile* jimage, const char* name);
virtual ~ClassPathImageEntry();
ClassFileStream* open_stream(const char* name, TRAPS);
+ ClassFileStream* open_stream_for_loader(const char* name, ClassLoaderData* loader_data, TRAPS);
};
// ModuleClassPathList contains a linked list of ClassPathEntry's
@@ -439,8 +445,6 @@
// distinguish from a class_name with no package name, as both cases have a NULL return value
static const char* package_from_name(const char* const class_name, bool* bad_class_name = NULL);
- static bool is_modules_image(const char* name) { return string_ends_with(name, MODULES_IMAGE_NAME); }
-
// Debugging
static void verify() PRODUCT_RETURN;
};
--- a/src/hotspot/share/classfile/classLoaderData.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/classLoaderData.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -288,7 +288,7 @@
// it is being defined, therefore _keep_alive is not volatile or atomic.
void ClassLoaderData::inc_keep_alive() {
if (is_unsafe_anonymous()) {
- assert(_keep_alive >= 0, "Invalid keep alive increment count");
+ assert(_keep_alive > 0, "Invalid keep alive increment count");
_keep_alive++;
}
}
--- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -163,7 +163,7 @@
// TODO: have redefinition clean old methods out of the code cache. They still exist in some places.
bool walk_all_metadata = InstanceKlass::has_previous_versions_and_reset();
- MetadataOnStackMark md_on_stack(walk_all_metadata);
+ MetadataOnStackMark md_on_stack(walk_all_metadata, /*redefinition_walk*/false);
clean_deallocate_lists(walk_all_metadata);
}
--- a/src/hotspot/share/classfile/javaClasses.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/javaClasses.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -65,6 +65,7 @@
#include "runtime/vframe.inline.hpp"
#include "utilities/align.hpp"
#include "utilities/preserveException.hpp"
+#include "utilities/utf8.hpp"
#if INCLUDE_JVMCI
#include "jvmci/jvmciJavaClasses.hpp"
#endif
--- a/src/hotspot/share/classfile/javaClasses.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/javaClasses.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -29,7 +29,6 @@
#include "jvmtifiles/jvmti.h"
#include "oops/oop.hpp"
#include "runtime/os.hpp"
-#include "utilities/utf8.hpp"
// Interface for manipulating the basic Java classes.
//
--- a/src/hotspot/share/classfile/klassFactory.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/klassFactory.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -58,7 +58,7 @@
// Post the CFLH
JvmtiCachedClassFileData* cached_class_file = NULL;
if (cfs == NULL) {
- cfs = FileMapInfo::open_stream_for_jvmti(ik, CHECK_NULL);
+ cfs = FileMapInfo::open_stream_for_jvmti(ik, class_loader, CHECK_NULL);
}
unsigned char* ptr = (unsigned char*)cfs->buffer();
unsigned char* end_ptr = ptr + cfs->length();
--- a/src/hotspot/share/classfile/metadataOnStackMark.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/metadataOnStackMark.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -50,18 +50,25 @@
// it. Class unloading only deletes in-error class files, methods created by
// the relocator and dummy constant pools. None of these appear anywhere except
// in metadata Handles.
-MetadataOnStackMark::MetadataOnStackMark(bool redefinition_walk) {
+MetadataOnStackMark::MetadataOnStackMark(bool walk_all_metadata, bool redefinition_walk) {
assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
assert(_used_buffers == NULL, "sanity check");
assert(!_is_active, "MetadataOnStackMarks do not nest");
+ assert(!redefinition_walk || walk_all_metadata,
+ "walk_all_metadata must be true for redefinition_walk");
NOT_PRODUCT(_is_active = true;)
Threads::metadata_handles_do(Metadata::mark_on_stack);
- if (redefinition_walk) {
+ if (walk_all_metadata) {
MetadataOnStackClosure md_on_stack;
Threads::metadata_do(&md_on_stack);
- CodeCache::metadata_do(&md_on_stack);
+ if (redefinition_walk) {
+ // We have to walk the whole code cache during redefinition.
+ CodeCache::metadata_do(&md_on_stack);
+ } else {
+ CodeCache::old_nmethods_do(&md_on_stack);
+ }
CompileBroker::mark_on_stack();
JvmtiCurrentBreakpoints::metadata_do(Metadata::mark_on_stack);
ThreadService::metadata_do(Metadata::mark_on_stack);
--- a/src/hotspot/share/classfile/metadataOnStackMark.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/metadataOnStackMark.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -48,7 +48,7 @@
static void retire_buffer(MetadataOnStackBuffer* buffer);
public:
- MetadataOnStackMark(bool redefinition_walk);
+ MetadataOnStackMark(bool walk_all_metadata, bool redefinition_walk);
~MetadataOnStackMark();
static void record(Metadata* m);
--- a/src/hotspot/share/classfile/moduleEntry.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/moduleEntry.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "jni.h"
+#include "classfile/classLoader.hpp"
#include "classfile/classLoaderData.inline.hpp"
#include "classfile/javaClasses.inline.hpp"
#include "classfile/moduleEntry.hpp"
--- a/src/hotspot/share/classfile/stringTable.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/stringTable.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -52,6 +52,7 @@
#include "utilities/concurrentHashTable.inline.hpp"
#include "utilities/concurrentHashTableTasks.inline.hpp"
#include "utilities/macros.hpp"
+#include "utilities/utf8.hpp"
// We prefer short chains of avg 2
const double PREF_AVG_LIST_LEN = 2.0;
--- a/src/hotspot/share/classfile/symbolTable.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/symbolTable.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -38,6 +38,7 @@
#include "services/diagnosticCommand.hpp"
#include "utilities/concurrentHashTable.inline.hpp"
#include "utilities/concurrentHashTableTasks.inline.hpp"
+#include "utilities/utf8.hpp"
// We used to not resize at all, so let's be conservative
// and not set it too short before we decide to resize,
--- a/src/hotspot/share/classfile/systemDictionary.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/systemDictionary.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -25,11 +25,12 @@
#ifndef SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
#define SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
-#include "classfile/classLoader.hpp"
+#include "classfile/classLoaderData.hpp"
#include "jvmci/systemDictionary_jvmci.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/symbol.hpp"
#include "runtime/java.hpp"
+#include "runtime/mutexLocker.hpp"
#include "runtime/reflectionUtils.hpp"
#include "runtime/signature.hpp"
#include "utilities/hashtable.hpp"
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -27,6 +27,7 @@
#include "oops/klass.hpp"
#include "classfile/dictionary.hpp"
+#include "classfile/packageEntry.hpp"
#include "classfile/systemDictionary.hpp"
#include "memory/filemap.hpp"
--- a/src/hotspot/share/classfile/verifier.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/verifier.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -25,6 +25,7 @@
#include "precompiled.hpp"
#include "jvm.h"
#include "classfile/classFileStream.hpp"
+#include "classfile/classLoader.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/stackMapTable.hpp"
#include "classfile/stackMapFrame.hpp"
@@ -574,7 +575,7 @@
ClassVerifier::ClassVerifier(
InstanceKlass* klass, TRAPS)
: _thread(THREAD), _previous_symbol(NULL), _symbols(NULL), _exception_type(NULL),
- _message(NULL), _klass(klass) {
+ _message(NULL), _method_signatures_table(NULL), _klass(klass) {
_this_type = VerificationType::reference_type(klass->name());
}
@@ -601,6 +602,13 @@
void ClassVerifier::verify_class(TRAPS) {
log_info(verification)("Verifying class %s with new format", _klass->external_name());
+ // Either verifying both local and remote classes or just remote classes.
+ assert(BytecodeVerificationRemote, "Should not be here");
+
+ // Create hash table containing method signatures.
+ method_signatures_table_type method_signatures_table;
+ set_method_signatures_table(&method_signatures_table);
+
Array<Method*>* methods = _klass->methods();
int num_methods = methods->length();
@@ -625,6 +633,55 @@
}
}
+// Translate the signature entries into verification types and save them in
+// the growable array. Also, save the count of arguments.
+void ClassVerifier::translate_signature(Symbol* const method_sig,
+ sig_as_verification_types* sig_verif_types,
+ TRAPS) {
+ SignatureStream sig_stream(method_sig);
+ VerificationType sig_type[2];
+ int sig_i = 0;
+ GrowableArray<VerificationType>* verif_types = sig_verif_types->sig_verif_types();
+
+ // Translate the signature arguments into verification types.
+ while (!sig_stream.at_return_type()) {
+ int n = change_sig_to_verificationType(&sig_stream, sig_type, CHECK_VERIFY(this));
+ assert(n <= 2, "Unexpected signature type");
+
+ // Store verification type(s). Longs and Doubles each have two verificationTypes.
+ for (int x = 0; x < n; x++) {
+ verif_types->push(sig_type[x]);
+ }
+ sig_i += n;
+ sig_stream.next();
+ }
+
+ // Set final arg count, not including the return type. The final arg count will
+ // be compared with sig_verify_types' length to see if there is a return type.
+ sig_verif_types->set_num_args(sig_i);
+
+ // Store verification type(s) for the return type, if there is one.
+ if (sig_stream.type() != T_VOID) {
+ int n = change_sig_to_verificationType(&sig_stream, sig_type, CHECK_VERIFY(this));
+ assert(n <= 2, "Unexpected signature return type");
+ for (int y = 0; y < n; y++) {
+ verif_types->push(sig_type[y]);
+ }
+ }
+}
+
+void ClassVerifier::create_method_sig_entry(sig_as_verification_types* sig_verif_types,
+ int sig_index, TRAPS) {
+ // Translate the signature into verification types.
+ ConstantPool* cp = _klass->constants();
+ Symbol* const method_sig = cp->symbol_at(sig_index);
+ translate_signature(method_sig, sig_verif_types, CHECK_VERIFY(this));
+
+ // Add the list of this signature's verification types to the table.
+ bool is_unique = method_signatures_table()->put(sig_index, sig_verif_types);
+ assert(is_unique, "Duplicate entries in method_signature_table");
+}
+
void ClassVerifier::verify_method(const methodHandle& m, TRAPS) {
HandleMark hm(THREAD);
_method = m; // initialize _method
@@ -2734,44 +2791,28 @@
ref_class_type = cp_ref_index_to_type(index, cp, CHECK_VERIFY(this));
}
- // For a small signature length, we just allocate 128 bytes instead
- // of parsing the signature once to find its size.
- // -3 is for '(', ')' and return descriptor; multiply by 2 is for
- // longs/doubles to be consertive.
assert(sizeof(VerificationType) == sizeof(uintptr_t),
"buffer type must match VerificationType size");
- uintptr_t on_stack_sig_types_buffer[128];
- // If we make a VerificationType[128] array directly, the compiler calls
- // to the c-runtime library to do the allocation instead of just
- // stack allocating it. Plus it would run constructors. This shows up
- // in performance profiles.
+
+ // Get the UTF8 index for this signature.
+ int sig_index = cp->signature_ref_index_at(cp->name_and_type_ref_index_at(index));
- VerificationType* sig_types;
- int size = (method_sig->utf8_length() - 3) * 2;
- if (size > 128) {
- // Long and double occupies two slots here.
- ArgumentSizeComputer size_it(method_sig);
- size = size_it.size();
- sig_types = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, VerificationType, size);
- } else{
- sig_types = (VerificationType*)on_stack_sig_types_buffer;
+ // Get the signature's verification types.
+ sig_as_verification_types* mth_sig_verif_types;
+ sig_as_verification_types** mth_sig_verif_types_ptr = method_signatures_table()->get(sig_index);
+ if (mth_sig_verif_types_ptr != NULL) {
+ // Found the entry for the signature's verification types in the hash table.
+ mth_sig_verif_types = *mth_sig_verif_types_ptr;
+ assert(mth_sig_verif_types != NULL, "Unexpected NULL sig_as_verification_types value");
+ } else {
+ // Not found, add the entry to the table.
+ GrowableArray<VerificationType>* verif_types = new GrowableArray<VerificationType>(10);
+ mth_sig_verif_types = new sig_as_verification_types(verif_types);
+ create_method_sig_entry(mth_sig_verif_types, sig_index, CHECK_VERIFY(this));
}
- SignatureStream sig_stream(method_sig);
- int sig_i = 0;
- while (!sig_stream.at_return_type()) {
- sig_i += change_sig_to_verificationType(
- &sig_stream, &sig_types[sig_i], CHECK_VERIFY(this));
- sig_stream.next();
- }
- int nargs = sig_i;
-#ifdef ASSERT
- {
- ArgumentSizeComputer size_it(method_sig);
- assert(nargs == size_it.size(), "Argument sizes do not match");
- assert(nargs <= (method_sig->utf8_length() - 3) * 2, "estimate of max size isn't conservative enough");
- }
-#endif
+ // Get the number of arguments for this signature.
+ int nargs = mth_sig_verif_types->num_args();
// Check instruction operands
u2 bci = bcs->bci();
@@ -2844,10 +2885,16 @@
}
}
+
+ // Get the verification types for the method's arguments.
+ GrowableArray<VerificationType>* sig_verif_types = mth_sig_verif_types->sig_verif_types();
+ assert(sig_verif_types != NULL, "Missing signature's array of verification types");
// Match method descriptor with operand stack
- for (int i = nargs - 1; i >= 0; i--) { // Run backwards
- current_frame->pop_stack(sig_types[i], CHECK_VERIFY(this));
+ // The arguments are on the stack in descending order.
+ for (int i = nargs - 1; i >= 0; i--) { // Run backwards
+ current_frame->pop_stack(sig_verif_types->at(i), CHECK_VERIFY(this));
}
+
// Check objectref on operand stack
if (opcode != Bytecodes::_invokestatic &&
opcode != Bytecodes::_invokedynamic) {
@@ -2919,7 +2966,8 @@
}
}
// Push the result type.
- if (sig_stream.type() != T_VOID) {
+ int sig_verif_types_len = sig_verif_types->length();
+ if (sig_verif_types_len > nargs) { // There's a return type
if (method_name == vmSymbols::object_initializer_name()) {
// <init> method must have a void return type
/* Unreachable? Class file parser verifies that methods with '<' have
@@ -2928,11 +2976,13 @@
"Return type must be void in <init> method");
return;
}
- VerificationType return_type[2];
- int n = change_sig_to_verificationType(
- &sig_stream, return_type, CHECK_VERIFY(this));
- for (int i = 0; i < n; i++) {
- current_frame->push_stack(return_type[i], CHECK_VERIFY(this)); // push types backwards
+
+ assert(sig_verif_types_len <= nargs + 2,
+ "Signature verification types array return type is bogus");
+ for (int i = nargs; i < sig_verif_types_len; i++) {
+ assert(i == nargs || sig_verif_types->at(i).is_long2() ||
+ sig_verif_types->at(i).is_double2(), "Unexpected return verificationType");
+ current_frame->push_stack(sig_verif_types->at(i), CHECK_VERIFY(this));
}
}
}
--- a/src/hotspot/share/classfile/verifier.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/verifier.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -31,6 +31,7 @@
#include "runtime/handles.hpp"
#include "utilities/exceptions.hpp"
#include "utilities/growableArray.hpp"
+#include "utilities/resourceHash.hpp"
// The verifier class
class Verifier : AllStatic {
@@ -246,6 +247,33 @@
void stackmap_details(outputStream* ss, const Method* method) const;
};
+class sig_as_verification_types : public ResourceObj {
+ private:
+ int _num_args; // Number of arguments, not including return type.
+ GrowableArray<VerificationType>* _sig_verif_types;
+
+ public:
+
+ sig_as_verification_types(GrowableArray<VerificationType>* sig_verif_types) :
+ _num_args(0), _sig_verif_types(sig_verif_types) {
+ }
+
+ int num_args() const { return _num_args; }
+ void set_num_args(int num_args) { _num_args = num_args; }
+
+ GrowableArray<VerificationType>* sig_verif_types() { return _sig_verif_types; }
+ void set_sig_verif_types(GrowableArray<VerificationType>* sig_verif_types) {
+ _sig_verif_types = sig_verif_types;
+ }
+
+};
+
+// This hashtable is indexed by the Utf8 constant pool indexes pointed to
+// by constant pool (Interface)Method_refs' NameAndType signature entries.
+typedef ResourceHashtable<int, sig_as_verification_types*,
+ primitive_hash<int>, primitive_equals<int>, 1007>
+ method_signatures_table_type;
+
// A new instance of this class is created for each class being verified
class ClassVerifier : public StackObj {
private:
@@ -257,6 +285,8 @@
Symbol* _exception_type;
char* _message;
+ method_signatures_table_type* _method_signatures_table;
+
ErrorContext _error_context; // contains information about an error
void verify_method(const methodHandle& method, TRAPS);
@@ -383,6 +413,13 @@
// the message_buffer will be filled in with the exception message.
void verify_class(TRAPS);
+ // Translates method signature entries into verificationTypes and saves them
+ // in the growable array.
+ void translate_signature(Symbol* const method_sig, sig_as_verification_types* sig_verif_types, TRAPS);
+
+ // Initializes a sig_as_verification_types entry and puts it in the hash table.
+ void create_method_sig_entry(sig_as_verification_types* sig_verif_types, int sig_index, TRAPS);
+
// Return status modes
Symbol* result() const { return _exception_type; }
bool has_error() const { return result() != NULL; }
@@ -400,6 +437,14 @@
Klass* load_class(Symbol* name, TRAPS);
+ method_signatures_table_type* method_signatures_table() const {
+ return _method_signatures_table;
+ }
+
+ void set_method_signatures_table(method_signatures_table_type* method_signatures_table) {
+ _method_signatures_table = method_signatures_table;
+ }
+
int change_sig_to_verificationType(
SignatureStream* sig_type, VerificationType* inference_type, TRAPS);
--- a/src/hotspot/share/classfile/vmSymbols.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/classfile/vmSymbols.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -25,7 +25,6 @@
#ifndef SHARE_CLASSFILE_VMSYMBOLS_HPP
#define SHARE_CLASSFILE_VMSYMBOLS_HPP
-#include "classfile/moduleEntry.hpp"
#include "jfr/support/jfrIntrinsics.hpp"
#include "jvmci/vmSymbols_jvmci.hpp"
#include "memory/iterator.hpp"
@@ -52,7 +51,7 @@
#define VM_SYMBOLS_DO(template, do_alias) \
/* commonly used class, package, module names */ \
- template(java_base, JAVA_BASE_NAME) \
+ template(java_base, "java.base") \
template(java_lang_System, "java/lang/System") \
template(java_lang_Object, "java/lang/Object") \
template(java_lang_Class, "java/lang/Class") \
--- a/src/hotspot/share/code/codeCache.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/code/codeCache.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1032,43 +1032,77 @@
#endif
}
+#ifdef INCLUDE_JVMTI
+// RedefineClasses support for unloading nmethods that are dependent on "old" methods.
+// We don't really expect this table to grow very large. If it does, it can become a hashtable.
+static GrowableArray<CompiledMethod*>* old_compiled_method_table = NULL;
+
+static void add_to_old_table(CompiledMethod* c) {
+ if (old_compiled_method_table == NULL) {
+ old_compiled_method_table = new (ResourceObj::C_HEAP, mtCode) GrowableArray<CompiledMethod*>(100, true);
+ }
+ old_compiled_method_table->push(c);
+}
+
+static void reset_old_method_table() {
+ if (old_compiled_method_table != NULL) {
+ delete old_compiled_method_table;
+ old_compiled_method_table = NULL;
+ }
+}
+
+// Remove this method when zombied or unloaded.
+void CodeCache::unregister_old_nmethod(CompiledMethod* c) {
+ assert_locked_or_safepoint(CodeCache_lock);
+ if (old_compiled_method_table != NULL) {
+ int index = old_compiled_method_table->find(c);
+ if (index != -1) {
+ old_compiled_method_table->delete_at(index);
+ }
+ }
+}
+
+void CodeCache::old_nmethods_do(MetadataClosure* f) {
+ // Walk old method table and mark those on stack.
+ int length = 0;
+ if (old_compiled_method_table != NULL) {
+ length = old_compiled_method_table->length();
+ for (int i = 0; i < length; i++) {
+ old_compiled_method_table->at(i)->metadata_do(f);
+ }
+ }
+ log_debug(redefine, class, nmethod)("Walked %d nmethods for mark_on_stack", length);
+}
+
// Just marks the methods in this class as needing deoptimization
void CodeCache::mark_for_evol_deoptimization(InstanceKlass* dependee) {
- MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-
- // Deoptimize all methods of the evolving class itself
- Array<Method*>* old_methods = dependee->methods();
- for (int i = 0; i < old_methods->length(); i++) {
- ResourceMark rm;
- Method* old_method = old_methods->at(i);
- CompiledMethod* nm = old_method->code();
- if (nm != NULL) {
- nm->mark_for_deoptimization();
- }
- }
+ assert(SafepointSynchronize::is_at_safepoint(), "Can only do this at a safepoint!");
// Mark dependent AOT nmethods, which are only found via the class redefined.
+ // TODO: add dependencies to aotCompiledMethod's metadata section so this isn't
+ // needed.
AOTLoader::mark_evol_dependent_methods(dependee);
}
+
// Walk compiled methods and mark dependent methods for deoptimization.
int CodeCache::mark_dependents_for_evol_deoptimization() {
+ assert(SafepointSynchronize::is_at_safepoint(), "Can only do this at a safepoint!");
+ // Each redefinition creates a new set of nmethods that have references to "old" Methods
+ // So delete old method table and create a new one.
+ reset_old_method_table();
+
int number_of_marked_CodeBlobs = 0;
CompiledMethodIterator iter(CompiledMethodIterator::only_alive_and_not_unloading);
while(iter.next()) {
CompiledMethod* nm = iter.method();
- if (nm->is_marked_for_deoptimization()) {
- // ...Already marked in the previous pass; count it here.
- // Also counts AOT compiled methods, already marked.
+ // Walk all alive nmethods to check for old Methods.
+ // This includes methods whose inline caches point to old methods, so
+ // inline cache clearing is unnecessary.
+ if (nm->has_evol_metadata()) {
+ nm->mark_for_deoptimization();
+ add_to_old_table(nm);
number_of_marked_CodeBlobs++;
- } else if (nm->has_evol_metadata()) {
- ResourceMark rm;
- nm->mark_for_deoptimization();
- number_of_marked_CodeBlobs++;
- } else {
- // Inline caches that refer to an nmethod are deoptimized already, because
- // the Method* is walked in the metadata section of the nmethod.
- assert(!nm->is_evol_dependent(), "should no longer be necessary");
}
}
@@ -1077,6 +1111,46 @@
return number_of_marked_CodeBlobs;
}
+void CodeCache::mark_all_nmethods_for_evol_deoptimization() {
+ assert(SafepointSynchronize::is_at_safepoint(), "Can only do this at a safepoint!");
+ CompiledMethodIterator iter(CompiledMethodIterator::only_alive_and_not_unloading);
+ while(iter.next()) {
+ CompiledMethod* nm = iter.method();
+ if (!nm->method()->is_method_handle_intrinsic()) {
+ nm->mark_for_deoptimization();
+ if (nm->has_evol_metadata()) {
+ add_to_old_table(nm);
+ }
+ }
+ }
+}
+
+// Flushes compiled methods dependent on redefined classes, that have already been
+// marked for deoptimization.
+void CodeCache::flush_evol_dependents() {
+ assert(SafepointSynchronize::is_at_safepoint(), "Can only do this at a safepoint!");
+
+ // CodeCache can only be updated by a thread_in_VM and they will all be
+ // stopped during the safepoint so CodeCache will be safe to update without
+ // holding the CodeCache_lock.
+
+ // At least one nmethod has been marked for deoptimization
+
+ // All this already happens inside a VM_Operation, so we'll do all the work here.
+ // Stuff copied from VM_Deoptimize and modified slightly.
+
+ // We do not want any GCs to happen while we are in the middle of this VM operation
+ ResourceMark rm;
+ DeoptimizationMarker dm;
+
+ // Deoptimize all activations depending on marked nmethods
+ Deoptimization::deoptimize_dependents();
+
+ // Make the dependent methods not entrant
+ make_marked_nmethods_not_entrant();
+}
+#endif // INCLUDE_JVMTI
+
// Deoptimize all methods
void CodeCache::mark_all_nmethods_for_deoptimization() {
MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
@@ -1137,32 +1211,6 @@
}
}
-// Flushes compiled methods dependent on redefined classes, that have already been
-// marked for deoptimization.
-void CodeCache::flush_evol_dependents() {
- // --- Compile_lock is not held. However we are at a safepoint.
- assert_locked_or_safepoint(Compile_lock);
-
- // CodeCache can only be updated by a thread_in_VM and they will all be
- // stopped during the safepoint so CodeCache will be safe to update without
- // holding the CodeCache_lock.
-
- // At least one nmethod has been marked for deoptimization
-
- // All this already happens inside a VM_Operation, so we'll do all the work here.
- // Stuff copied from VM_Deoptimize and modified slightly.
-
- // We do not want any GCs to happen while we are in the middle of this VM operation
- ResourceMark rm;
- DeoptimizationMarker dm;
-
- // Deoptimize all activations depending on marked nmethods
- Deoptimization::deoptimize_dependents();
-
- // Make the dependent methods not entrant
- make_marked_nmethods_not_entrant();
-}
-
// Flushes compiled methods dependent on dependee
void CodeCache::flush_dependents_on_method(const methodHandle& m_h) {
// --- Compile_lock is not held. However we are at a safepoint.
--- a/src/hotspot/share/code/codeCache.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/code/codeCache.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -270,10 +270,16 @@
// Flushing and deoptimization
static void flush_dependents_on(InstanceKlass* dependee);
+
+ // RedefineClasses support
// Flushing and deoptimization in case of evolution
static void mark_for_evol_deoptimization(InstanceKlass* dependee);
static int mark_dependents_for_evol_deoptimization();
+ static void mark_all_nmethods_for_evol_deoptimization();
static void flush_evol_dependents();
+ static void old_nmethods_do(MetadataClosure* f);
+ static void unregister_old_nmethod(CompiledMethod* c);
+
// Support for fullspeed debugging
static void flush_dependents_on_method(const methodHandle& dependee);
--- a/src/hotspot/share/code/compiledMethod.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/code/compiledMethod.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -368,7 +368,6 @@
int verify_icholder_relocations();
void verify_oop_relocations();
- virtual bool is_evol_dependent() = 0;
bool has_evol_metadata();
// Fast breakpoint support. Tells if this compiled method is
--- a/src/hotspot/share/code/nmethod.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/code/nmethod.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1089,7 +1089,6 @@
if (_method->code() == this) {
_method->clear_code(); // Break a cycle
}
- _method = NULL; // Clear the method of this dead nmethod
}
// Make the class unloaded - i.e., change state and notify sweeper
@@ -1107,8 +1106,12 @@
MutexLockerEx ml(SafepointSynchronize::is_at_safepoint() ? NULL : CodeCache_lock,
Mutex::_no_safepoint_check_flag);
Universe::heap()->unregister_nmethod(this);
+ CodeCache::unregister_old_nmethod(this);
}
+ // Clear the method of this dead nmethod
+ set_method(NULL);
+
// Log the unloading.
log_state_change();
@@ -1289,6 +1292,7 @@
MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
if (nmethod_needs_unregister) {
Universe::heap()->unregister_nmethod(this);
+ CodeCache::unregister_old_nmethod(this);
}
flush_dependencies(/*delete_immediately*/true);
}
@@ -1986,32 +1990,6 @@
return found_check;
}
-bool nmethod::is_evol_dependent() {
- for (Dependencies::DepStream deps(this); deps.next(); ) {
- if (deps.type() == Dependencies::evol_method) {
- Method* method = deps.method_argument(0);
- if (method->is_old()) {
- if (log_is_enabled(Debug, redefine, class, nmethod)) {
- ResourceMark rm;
- log_debug(redefine, class, nmethod)
- ("Found evol dependency of nmethod %s.%s(%s) compile_id=%d on method %s.%s(%s)",
- _method->method_holder()->external_name(),
- _method->name()->as_C_string(),
- _method->signature()->as_C_string(),
- compile_id(),
- method->method_holder()->external_name(),
- method->name()->as_C_string(),
- method->signature()->as_C_string());
- }
- if (TraceDependencies || LogCompilation)
- deps.log_dependency(method->method_holder());
- return true;
- }
- }
- }
- return false;
-}
-
// Called from mark_for_deoptimization, when dependee is invalidated.
bool nmethod::is_dependent_on_method(Method* dependee) {
for (Dependencies::DepStream deps(this); deps.next(); ) {
--- a/src/hotspot/share/code/nmethod.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/code/nmethod.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -565,11 +565,6 @@
// and the changes have invalidated it
bool check_dependency_on(DepChange& changes);
- // Evolution support. Tells if this compiled method is dependent on any of
- // redefined methods, such that if m() is replaced,
- // this compiled method will have to be deoptimized.
- bool is_evol_dependent();
-
// Fast breakpoint support. Tells if this compiled method is
// dependent on the given method. Returns true if this nmethod
// corresponds to the given method as well.
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -24,8 +24,6 @@
#include "precompiled.hpp"
#include "classfile/classLoaderDataGraph.hpp"
-#include "classfile/stringTable.hpp"
-#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "gc/cms/cmsCollectorPolicy.hpp"
@@ -54,7 +52,6 @@
#include "gc/shared/genCollectedHeap.hpp"
#include "gc/shared/genOopClosures.inline.hpp"
#include "gc/shared/isGCActiveMark.hpp"
-#include "gc/shared/oopStorageParState.hpp"
#include "gc/shared/owstTaskTerminator.hpp"
#include "gc/shared/referencePolicy.hpp"
#include "gc/shared/referenceProcessorPhaseTimes.hpp"
@@ -2771,12 +2768,10 @@
protected:
CMSCollector* _collector;
uint _n_workers;
- OopStorage::ParState<false, false> _par_state_string;
CMSParMarkTask(const char* name, CMSCollector* collector, uint n_workers) :
AbstractGangTask(name),
_collector(collector),
- _n_workers(n_workers),
- _par_state_string(StringTable::weak_storage()) {}
+ _n_workers(n_workers) {}
// Work method in support of parallel rescan ... of young gen spaces
void do_young_space_rescan(OopsInGenClosure* cl,
ContiguousSpace* space,
--- a/src/hotspot/share/gc/cms/parNewGeneration.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -582,8 +582,7 @@
_young_gen(young_gen), _old_gen(old_gen),
_young_old_boundary(young_old_boundary),
_state_set(state_set),
- _strong_roots_scope(strong_roots_scope),
- _par_state_string(StringTable::weak_storage())
+ _strong_roots_scope(strong_roots_scope)
{}
void ParNewGenTask::work(uint worker_id) {
--- a/src/hotspot/share/gc/cms/parNewGeneration.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/cms/parNewGeneration.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -235,7 +235,6 @@
HeapWord* _young_old_boundary;
class ParScanThreadStateSet* _state_set;
StrongRootsScope* _strong_roots_scope;
- OopStorage::ParState<false, false> _par_state_string;
public:
ParNewGenTask(ParNewGeneration* young_gen,
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -129,6 +129,12 @@
virtual void print_gc_threads_on(outputStream* st) const {}
virtual void gc_threads_do(ThreadClosure* tc) const {}
+ // No nmethod handling
+ virtual void register_nmethod(nmethod* nm) {}
+ virtual void unregister_nmethod(nmethod* nm) {}
+ virtual void flush_nmethod(nmethod* nm) {}
+ virtual void verify_nmethod(nmethod* nm) {}
+
// No heap verification
virtual void prepare_for_verify() {}
virtual void verify(VerifyOption option) {}
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -58,7 +58,8 @@
_satb_mark_queue_buffer_allocator("SATB Buffer Allocator", G1SATBBufferSize),
_dirty_card_queue_buffer_allocator("DC Buffer Allocator", G1UpdateBufferSize),
_satb_mark_queue_set(),
- _dirty_card_queue_set()
+ _dirty_card_queue_set(),
+ _shared_dirty_card_queue(&_dirty_card_queue_set)
{}
void G1BarrierSet::enqueue(oop pre_val) {
@@ -147,24 +148,7 @@
// If we are creating the thread during a marking cycle, we should
// set the active field of the SATB queue to true. That involves
- // copying the global is_active value to this thread's queue, which
- // is done without any direct synchronization here.
- //
- // The activation and deactivation of the SATB queues occurs at the
- // beginning / end of a marking cycle, and is done during
- // safepoints. This function is called just before a thread is
- // added to its corresponding threads list (for Java or non-Java
- // threads, respectively).
- //
- // For Java threads, that's done while holding the Threads_lock,
- // which ensures we're not at a safepoint, so reading the global
- // is_active state is synchronized against update.
- assert(!thread->is_Java_thread() || !SafepointSynchronize::is_at_safepoint(),
- "Should not be at a safepoint");
- // For non-Java threads, thread creation (and list addition) may,
- // and indeed usually does, occur during a safepoint. But such
- // creation isn't concurrent with updating the global SATB active
- // state.
+ // copying the global is_active value to this thread's queue.
bool is_satb_active = _satb_mark_queue_set.is_active();
G1ThreadLocalData::satb_mark_queue(thread).set_active(is_satb_active);
}
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -27,6 +27,7 @@
#include "gc/g1/g1DirtyCardQueue.hpp"
#include "gc/g1/g1SATBMarkQueueSet.hpp"
+#include "gc/g1/g1SharedDirtyCardQueue.hpp"
#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
@@ -42,6 +43,7 @@
BufferNode::Allocator _dirty_card_queue_buffer_allocator;
G1SATBMarkQueueSet _satb_mark_queue_set;
G1DirtyCardQueueSet _dirty_card_queue_set;
+ G1SharedDirtyCardQueue _shared_dirty_card_queue;
static G1BarrierSet* g1_barrier_set() {
return barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
@@ -91,6 +93,10 @@
return g1_barrier_set()->_dirty_card_queue_set;
}
+ static G1SharedDirtyCardQueue& shared_dirty_card_queue() {
+ return g1_barrier_set()->_shared_dirty_card_queue;
+ }
+
// Callbacks for runtime accesses.
template <DecoratorSet decorators, typename BarrierSetT = G1BarrierSet>
class AccessBarrier: public ModRefBarrierSet::AccessBarrier<decorators, BarrierSetT> {
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1575,7 +1575,10 @@
// And ReservedSpace calls it 'special'. If we failed to set 'special',
// we reserved memory without large page.
if (os::can_commit_large_page_memory() || rs.special()) {
- page_size = rs.alignment();
+ // An alignment at ReservedSpace comes from preferred page size or
+ // heap alignment, and if the alignment came from heap alignment, it could be
+ // larger than large pages size. So need to cap with the large page size.
+ page_size = MIN2(rs.alignment(), os::large_page_size());
}
}
@@ -1682,12 +1685,10 @@
// later, based on the concurrent refinement object.
G1BarrierSet::dirty_card_queue_set().initialize(DirtyCardQ_CBL_mon,
&bs->dirty_card_queue_buffer_allocator(),
- Shared_DirtyCardQ_lock,
true); // init_free_ids
dirty_card_queue_set().initialize(DirtyCardQ_CBL_mon,
- &bs->dirty_card_queue_buffer_allocator(),
- Shared_DirtyCardQ_lock);
+ &bs->dirty_card_queue_buffer_allocator());
// Create the hot card cache.
_hot_card_cache = new G1HotCardCache(this);
@@ -2537,7 +2538,7 @@
// Update common counters.
increment_total_collections(full /* full gc */);
- if (full) {
+ if (full || collector_state()->in_initial_mark_gc()) {
increment_old_marking_cycles_started();
}
@@ -2863,16 +2864,92 @@
};
void G1CollectedHeap::start_new_collection_set() {
+ double start = os::elapsedTime();
+
collection_set()->start_incremental_building();
clear_cset_fast_test();
guarantee(_eden.length() == 0, "eden should have been cleared");
policy()->transfer_survivors_to_cset(survivor());
+
+ // We redo the verification but now wrt to the new CSet which
+ // has just got initialized after the previous CSet was freed.
+ _cm->verify_no_collection_set_oops();
+
+ phase_times()->record_start_new_cset_time_ms((os::elapsedTime() - start) * 1000.0);
}
-bool
-G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
+void G1CollectedHeap::calculate_collection_set(G1EvacuationInfo& evacuation_info, double target_pause_time_ms){
+ policy()->finalize_collection_set(target_pause_time_ms, &_survivor);
+ evacuation_info.set_collectionset_regions(collection_set()->region_length());
+
+ _cm->verify_no_collection_set_oops();
+
+ if (_hr_printer.is_active()) {
+ G1PrintCollectionSetClosure cl(&_hr_printer);
+ _collection_set.iterate(&cl);
+ }
+}
+
+G1HeapVerifier::G1VerifyType G1CollectedHeap::young_collection_verify_type() const {
+ if (collector_state()->in_initial_mark_gc()) {
+ return G1HeapVerifier::G1VerifyConcurrentStart;
+ } else if (collector_state()->in_young_only_phase()) {
+ return G1HeapVerifier::G1VerifyYoungNormal;
+ } else {
+ return G1HeapVerifier::G1VerifyMixed;
+ }
+}
+
+void G1CollectedHeap::verify_before_young_collection(G1HeapVerifier::G1VerifyType type) {
+ if (VerifyRememberedSets) {
+ log_info(gc, verify)("[Verifying RemSets before GC]");
+ VerifyRegionRemSetClosure v_cl;
+ heap_region_iterate(&v_cl);
+ }
+ _verifier->verify_before_gc(type);
+ _verifier->check_bitmaps("GC Start");
+}
+
+void G1CollectedHeap::verify_after_young_collection(G1HeapVerifier::G1VerifyType type) {
+ if (VerifyRememberedSets) {
+ log_info(gc, verify)("[Verifying RemSets after GC]");
+ VerifyRegionRemSetClosure v_cl;
+ heap_region_iterate(&v_cl);
+ }
+ _verifier->verify_after_gc(type);
+ _verifier->check_bitmaps("GC End");
+}
+
+void G1CollectedHeap::expand_heap_after_young_collection(){
+ size_t expand_bytes = _heap_sizing_policy->expansion_amount();
+ if (expand_bytes > 0) {
+ // No need for an ergo logging here,
+ // expansion_amount() does this when it returns a value > 0.
+ double expand_ms;
+ if (!expand(expand_bytes, _workers, &expand_ms)) {
+ // We failed to expand the heap. Cannot do anything about it.
+ }
+ phase_times()->record_expand_heap_time(expand_ms);
+ }
+}
+
+const char* G1CollectedHeap::young_gc_name() const {
+ if (collector_state()->in_initial_mark_gc()) {
+ return "Pause Young (Concurrent Start)";
+ } else if (collector_state()->in_young_only_phase()) {
+ if (collector_state()->in_young_gc_before_mixed()) {
+ return "Pause Young (Prepare Mixed)";
+ } else {
+ return "Pause Young (Normal)";
+ }
+ } else {
+ return "Pause Young (Mixed)";
+ }
+}
+
+bool G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
assert_at_safepoint_on_vm_thread();
guarantee(!is_gc_active(), "collection is not reentrant");
@@ -2880,16 +2957,16 @@
return false;
}
- _gc_timer_stw->register_gc_start();
-
GCIdMark gc_id_mark;
- _gc_tracer_stw->report_gc_start(gc_cause(), _gc_timer_stw->gc_start());
SvcGCMarker sgcm(SvcGCMarker::MINOR);
ResourceMark rm;
policy()->note_gc_start();
+ _gc_timer_stw->register_gc_start();
+ _gc_tracer_stw->report_gc_start(gc_cause(), _gc_timer_stw->gc_start());
+
wait_for_root_region_scanning();
print_heap_before_gc();
@@ -2909,8 +2986,7 @@
// We do not allow initial-mark to be piggy-backed on a mixed GC.
assert(!collector_state()->in_initial_mark_gc() ||
- collector_state()->in_young_only_phase(), "sanity");
-
+ collector_state()->in_young_only_phase(), "sanity");
// We also do not allow mixed GCs during marking.
assert(!collector_state()->mark_or_rebuild_in_progress() || collector_state()->in_young_only_phase(), "sanity");
@@ -2918,39 +2994,19 @@
// thread has completed its logging output and it's safe to signal
// the CM thread, the flag's value in the policy has been reset.
bool should_start_conc_mark = collector_state()->in_initial_mark_gc();
+ if (should_start_conc_mark) {
+ _cm->gc_tracer_cm()->set_gc_cause(gc_cause());
+ }
// Inner scope for scope based logging, timers, and stats collection
{
G1EvacuationInfo evacuation_info;
- if (collector_state()->in_initial_mark_gc()) {
- // We are about to start a marking cycle, so we increment the
- // full collection counter.
- increment_old_marking_cycles_started();
- _cm->gc_tracer_cm()->set_gc_cause(gc_cause());
- }
-
_gc_tracer_stw->report_yc_type(collector_state()->yc_type());
GCTraceCPUTime tcpu;
- G1HeapVerifier::G1VerifyType verify_type;
- FormatBuffer<> gc_string("Pause Young ");
- if (collector_state()->in_initial_mark_gc()) {
- gc_string.append("(Concurrent Start)");
- verify_type = G1HeapVerifier::G1VerifyConcurrentStart;
- } else if (collector_state()->in_young_only_phase()) {
- if (collector_state()->in_young_gc_before_mixed()) {
- gc_string.append("(Prepare Mixed)");
- } else {
- gc_string.append("(Normal)");
- }
- verify_type = G1HeapVerifier::G1VerifyYoungNormal;
- } else {
- gc_string.append("(Mixed)");
- verify_type = G1HeapVerifier::G1VerifyMixed;
- }
- GCTraceTime(Info, gc) tm(gc_string, NULL, gc_cause(), true);
+ GCTraceTime(Info, gc) tm(young_gc_name(), NULL, gc_cause(), true);
uint active_workers = WorkerPolicy::calc_active_workers(workers()->total_workers(),
workers()->active_workers(),
@@ -2965,88 +3021,43 @@
G1HeapTransition heap_transition(this);
size_t heap_used_bytes_before_gc = used();
- // Don't dynamically change the number of GC threads this early. A value of
- // 0 is used to indicate serial work. When parallel work is done,
- // it will be set.
-
- { // Call to jvmpi::post_class_unload_events must occur outside of active GC
+ {
IsGCActiveMark x;
gc_prologue(false);
- if (VerifyRememberedSets) {
- log_info(gc, verify)("[Verifying RemSets before GC]");
- VerifyRegionRemSetClosure v_cl;
- heap_region_iterate(&v_cl);
- }
-
- _verifier->verify_before_gc(verify_type);
-
- _verifier->check_bitmaps("GC Start");
-
-#if COMPILER2_OR_JVMCI
- DerivedPointerTable::clear();
-#endif
-
- // Please see comment in g1CollectedHeap.hpp and
- // G1CollectedHeap::ref_processing_init() to see how
- // reference processing currently works in G1.
-
- // Enable discovery in the STW reference processor
- _ref_processor_stw->enable_discovery();
+ G1HeapVerifier::G1VerifyType verify_type = young_collection_verify_type();
+ verify_before_young_collection(verify_type);
{
+ // The elapsed time induced by the start time below deliberately elides
+ // the possible verification above.
+ double sample_start_time_sec = os::elapsedTime();
+
+ // Please see comment in g1CollectedHeap.hpp and
+ // G1CollectedHeap::ref_processing_init() to see how
+ // reference processing currently works in G1.
+ _ref_processor_stw->enable_discovery();
+
// We want to temporarily turn off discovery by the
// CM ref processor, if necessary, and turn it back on
// on again later if we do. Using a scoped
// NoRefDiscovery object will do this.
NoRefDiscovery no_cm_discovery(_ref_processor_cm);
- // Forget the current alloc region (we might even choose it to be part
+ policy()->record_collection_pause_start(sample_start_time_sec);
+
+ // Forget the current allocation region (we might even choose it to be part
// of the collection set!).
_allocator->release_mutator_alloc_region();
- // This timing is only used by the ergonomics to handle our pause target.
- // It is unclear why this should not include the full pause. We will
- // investigate this in CR 7178365.
- //
- // Preserving the old comment here if that helps the investigation:
- //
- // The elapsed time induced by the start time below deliberately elides
- // the possible verification above.
- double sample_start_time_sec = os::elapsedTime();
-
- policy()->record_collection_pause_start(sample_start_time_sec);
-
- if (collector_state()->in_initial_mark_gc()) {
- concurrent_mark()->pre_initial_mark();
- }
-
- policy()->finalize_collection_set(target_pause_time_ms, &_survivor);
-
- evacuation_info.set_collectionset_regions(collection_set()->region_length());
-
- register_humongous_regions_with_cset();
-
- assert(_verifier->check_cset_fast_test(), "Inconsistency in the InCSetState table.");
-
- // We call this after finalize_cset() to
- // ensure that the CSet has been finalized.
- _cm->verify_no_cset_oops();
-
- if (_hr_printer.is_active()) {
- G1PrintCollectionSetClosure cl(&_hr_printer);
- _collection_set.iterate(&cl);
- }
-
- // Initialize the GC alloc regions.
- _allocator->init_gc_alloc_regions(evacuation_info);
+ calculate_collection_set(evacuation_info, target_pause_time_ms);
G1ParScanThreadStateSet per_thread_states(this,
workers()->active_workers(),
collection_set()->young_region_length(),
collection_set()->optional_region_length());
- pre_evacuate_collection_set();
+ pre_evacuate_collection_set(evacuation_info);
// Actually do the work...
evacuate_collection_set(&per_thread_states);
@@ -3054,39 +3065,12 @@
post_evacuate_collection_set(evacuation_info, &per_thread_states);
- const size_t* surviving_young_words = per_thread_states.surviving_young_words();
- free_collection_set(&_collection_set, evacuation_info, surviving_young_words);
-
- eagerly_reclaim_humongous_regions();
-
- record_obj_copy_mem_stats();
+ start_new_collection_set();
+
_survivor_evac_stats.adjust_desired_plab_sz();
_old_evac_stats.adjust_desired_plab_sz();
- double start = os::elapsedTime();
- start_new_collection_set();
- phase_times()->record_start_new_cset_time_ms((os::elapsedTime() - start) * 1000.0);
-
- if (evacuation_failed()) {
- double recalculate_used_start = os::elapsedTime();
- set_used(recalculate_used());
- phase_times()->record_evac_fail_recalc_used_time((os::elapsedTime() - recalculate_used_start) * 1000.0);
-
- if (_archive_allocator != NULL) {
- _archive_allocator->clear_used();
- }
- for (uint i = 0; i < ParallelGCThreads; i++) {
- if (_evacuation_failed_info_array[i].has_failed()) {
- _gc_tracer_stw->report_evacuation_failed(_evacuation_failed_info_array[i]);
- }
- }
- } else {
- // The "used" of the the collection set have already been subtracted
- // when they were freed. Add in the bytes evacuated.
- increase_used(policy()->bytes_copied_during_gc());
- }
-
- if (collector_state()->in_initial_mark_gc()) {
+ if (should_start_conc_mark) {
// We have to do this before we notify the CM threads that
// they can start working to make sure that all the
// appropriate initialization is done on the CM object.
@@ -3100,50 +3084,16 @@
_allocator->init_mutator_alloc_region();
- {
- size_t expand_bytes = _heap_sizing_policy->expansion_amount();
- if (expand_bytes > 0) {
- size_t bytes_before = capacity();
- // No need for an ergo logging here,
- // expansion_amount() does this when it returns a value > 0.
- double expand_ms;
- if (!expand(expand_bytes, _workers, &expand_ms)) {
- // We failed to expand the heap. Cannot do anything about it.
- }
- phase_times()->record_expand_heap_time(expand_ms);
- }
- }
-
- // We redo the verification but now wrt to the new CSet which
- // has just got initialized after the previous CSet was freed.
- _cm->verify_no_cset_oops();
-
- // This timing is only used by the ergonomics to handle our pause target.
- // It is unclear why this should not include the full pause. We will
- // investigate this in CR 7178365.
+ expand_heap_after_young_collection();
+
double sample_end_time_sec = os::elapsedTime();
double pause_time_ms = (sample_end_time_sec - sample_start_time_sec) * MILLIUNITS;
size_t total_cards_scanned = phase_times()->sum_thread_work_items(G1GCPhaseTimes::ScanRS, G1GCPhaseTimes::ScanRSScannedCards);
policy()->record_collection_pause_end(pause_time_ms, total_cards_scanned, heap_used_bytes_before_gc);
-
- evacuation_info.set_collectionset_used_before(collection_set()->bytes_used_before());
- evacuation_info.set_bytes_copied(policy()->bytes_copied_during_gc());
-
- if (VerifyRememberedSets) {
- log_info(gc, verify)("[Verifying RemSets after GC]");
- VerifyRegionRemSetClosure v_cl;
- heap_region_iterate(&v_cl);
- }
-
- _verifier->verify_after_gc(verify_type);
- _verifier->check_bitmaps("GC End");
-
- assert(!_ref_processor_stw->discovery_enabled(), "Postcondition");
- _ref_processor_stw->verify_no_references_recorded();
-
- // CM reference discovery will be re-enabled if necessary.
}
+ verify_after_young_collection(verify_type);
+
#ifdef TRACESPINNING
ParallelTaskTerminator::print_termination_counts();
#endif
@@ -3159,11 +3109,6 @@
policy()->print_phases();
heap_transition.print();
- // It is not yet to safe to tell the concurrent mark to
- // start as we have some optional output below. We don't want the
- // output from the concurrent mark thread interfering with this
- // logging output either.
-
_hrm->verify_optional();
_verifier->verify_region_sets_optional();
@@ -3190,13 +3135,11 @@
// that came from the pause.
if (should_start_conc_mark) {
- // CAUTION: after the doConcurrentMark() call below,
- // the concurrent marking thread(s) could be running
- // concurrently with us. Make sure that anything after
- // this point does not assume that we are the only GC thread
- // running. Note: of course, the actual marking work will
- // not start until the safepoint itself is released in
- // SuspendibleThreadSet::desynchronize().
+ // CAUTION: after the doConcurrentMark() call below, the concurrent marking
+ // thread(s) could be running concurrently with us. Make sure that anything
+ // after this point does not assume that we are the only GC thread running.
+ // Note: of course, the actual marking work will not start until the safepoint
+ // itself is released in SuspendibleThreadSet::desynchronize().
do_concurrent_mark();
}
@@ -3677,6 +3620,7 @@
make_pending_list_reachable();
+ assert(!rp->discovery_enabled(), "Postcondition");
rp->verify_no_references_recorded();
double ref_proc_time = os::elapsedTime() - ref_proc_start;
@@ -3699,7 +3643,7 @@
phase_times()->record_merge_pss_time_ms((os::elapsedTime() - merge_pss_time_start) * 1000.0);
}
-void G1CollectedHeap::pre_evacuate_collection_set() {
+void G1CollectedHeap::pre_evacuate_collection_set(G1EvacuationInfo& evacuation_info) {
_expand_heap_after_alloc_failure = true;
_evacuation_failed = false;
@@ -3707,11 +3651,23 @@
_hot_card_cache->reset_hot_cache_claimed_index();
_hot_card_cache->set_use_cache(false);
+ // Initialize the GC alloc regions.
+ _allocator->init_gc_alloc_regions(evacuation_info);
+
+ register_humongous_regions_with_cset();
+ assert(_verifier->check_cset_fast_test(), "Inconsistency in the InCSetState table.");
+
rem_set()->prepare_for_oops_into_collection_set_do();
_preserved_marks_set.assert_empty();
+#if COMPILER2_OR_JVMCI
+ DerivedPointerTable::clear();
+#endif
+
// InitialMark needs claim bits to keep track of the marked-through CLDs.
if (collector_state()->in_initial_mark_gc()) {
+ concurrent_mark()->pre_initial_mark();
+
double start_clear_claimed_marks = os::elapsedTime();
ClassLoaderDataGraph::clear_claimed_marks();
@@ -3918,19 +3874,34 @@
phase_times()->record_string_deduplication_time(string_cleanup_time_ms);
}
+ _allocator->release_gc_alloc_regions(evacuation_info);
+
if (evacuation_failed()) {
restore_after_evac_failure();
// Reset the G1EvacuationFailureALot counters and flags
- // Note: the values are reset only when an actual
- // evacuation failure occurs.
NOT_PRODUCT(reset_evacuation_should_fail();)
+
+ double recalculate_used_start = os::elapsedTime();
+ set_used(recalculate_used());
+ phase_times()->record_evac_fail_recalc_used_time((os::elapsedTime() - recalculate_used_start) * 1000.0);
+
+ if (_archive_allocator != NULL) {
+ _archive_allocator->clear_used();
+ }
+ for (uint i = 0; i < ParallelGCThreads; i++) {
+ if (_evacuation_failed_info_array[i].has_failed()) {
+ _gc_tracer_stw->report_evacuation_failed(_evacuation_failed_info_array[i]);
+ }
+ }
+ } else {
+ // The "used" of the the collection set have already been subtracted
+ // when they were freed. Add in the bytes evacuated.
+ increase_used(policy()->bytes_copied_during_gc());
}
_preserved_marks_set.assert_empty();
- _allocator->release_gc_alloc_regions(evacuation_info);
-
merge_per_thread_state_info(per_thread_states);
// Reset and re-enable the hot card cache.
@@ -3942,6 +3913,16 @@
purge_code_root_memory();
redirty_logged_cards();
+
+ free_collection_set(&_collection_set, evacuation_info, per_thread_states->surviving_young_words());
+
+ eagerly_reclaim_humongous_regions();
+
+ record_obj_copy_mem_stats();
+
+ evacuation_info.set_collectionset_used_before(collection_set()->bytes_used_before());
+ evacuation_info.set_bytes_copied(policy()->bytes_copied_during_gc());
+
#if COMPILER2_OR_JVMCI
double start = os::elapsedTime();
DerivedPointerTable::update_pointers();
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -357,6 +357,8 @@
assert(Thread::current()->is_VM_thread(), "current thread is not VM thread"); \
} while (0)
+ const char* young_gc_name() const;
+
// The young region list.
G1EdenRegions _eden;
G1SurvivorRegions _survivor;
@@ -730,14 +732,21 @@
// to the GC locker being active, true otherwise
bool do_collection_pause_at_safepoint(double target_pause_time_ms);
+ G1HeapVerifier::G1VerifyType young_collection_verify_type() const;
+ void verify_before_young_collection(G1HeapVerifier::G1VerifyType type);
+ void verify_after_young_collection(G1HeapVerifier::G1VerifyType type);
+
+ void calculate_collection_set(G1EvacuationInfo& evacuation_info, double target_pause_time_ms);
+
// Actually do the work of evacuating the collection set.
void evacuate_collection_set(G1ParScanThreadStateSet* per_thread_states);
void evacuate_optional_collection_set(G1ParScanThreadStateSet* per_thread_states);
void evacuate_optional_regions(G1ParScanThreadStateSet* per_thread_states, G1OptionalCSet* ocset);
- void pre_evacuate_collection_set();
+ void pre_evacuate_collection_set(G1EvacuationInfo& evacuation_info);
void post_evacuate_collection_set(G1EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* pss);
+ void expand_heap_after_young_collection();
// Update object copying statistics.
void record_obj_copy_mem_stats();
@@ -1313,6 +1322,12 @@
// Unregister the given nmethod from the G1 heap.
virtual void unregister_nmethod(nmethod* nm);
+ // No nmethod flushing needed.
+ virtual void flush_nmethod(nmethod* nm) {}
+
+ // No nmethod verification implemented.
+ virtual void verify_nmethod(nmethod* nm) {}
+
// Free up superfluous code root memory.
void purge_code_root_memory();
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -734,7 +734,9 @@
};
void G1ConcurrentMark::pre_initial_mark() {
- // Initialize marking structures. This has to be done in a STW phase.
+ assert_at_safepoint_on_vm_thread();
+
+ // Reset marking state.
reset();
// For each region note start of marking.
@@ -1944,7 +1946,7 @@
}
};
-void G1ConcurrentMark::verify_no_cset_oops() {
+void G1ConcurrentMark::verify_no_collection_set_oops() {
assert(SafepointSynchronize::is_at_safepoint(), "should be at a safepoint");
if (!_g1h->collector_state()->mark_or_rebuild_in_progress()) {
return;
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -579,7 +579,7 @@
// Verify that there are no collection set oops on the stacks (taskqueues /
// global mark stack) and fingers (global / per-task).
// If marking is not in progress, it's a no-op.
- void verify_no_cset_oops() PRODUCT_RETURN;
+ void verify_no_collection_set_oops() PRODUCT_RETURN;
inline bool do_yield_check();
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -56,21 +56,18 @@
}
};
-G1DirtyCardQueue::G1DirtyCardQueue(G1DirtyCardQueueSet* qset, bool permanent) :
+G1DirtyCardQueue::G1DirtyCardQueue(G1DirtyCardQueueSet* qset) :
// Dirty card queues are always active, so we create them with their
// active field set to true.
- PtrQueue(qset, permanent, true /* active */)
+ PtrQueue(qset, true /* active */)
{ }
G1DirtyCardQueue::~G1DirtyCardQueue() {
- if (!is_permanent()) {
- flush();
- }
+ flush();
}
G1DirtyCardQueueSet::G1DirtyCardQueueSet(bool notify_when_complete) :
PtrQueueSet(notify_when_complete),
- _shared_dirty_card_queue(this, true /* permanent */),
_free_ids(NULL),
_processed_buffers_mut(0),
_processed_buffers_rs_thread(0),
@@ -90,10 +87,8 @@
void G1DirtyCardQueueSet::initialize(Monitor* cbl_mon,
BufferNode::Allocator* allocator,
- Mutex* lock,
bool init_free_ids) {
PtrQueueSet::initialize(cbl_mon, allocator);
- _shared_dirty_card_queue.set_lock(lock);
if (init_free_ids) {
_free_ids = new G1FreeIdSet(0, num_par_ids());
}
@@ -217,13 +212,7 @@
} closure;
Threads::threads_do(&closure);
- shared_dirty_card_queue()->reset();
-}
-
-void G1DirtyCardQueueSet::concatenate_log(G1DirtyCardQueue& dcq) {
- if (!dcq.is_empty()) {
- dcq.flush();
- }
+ G1BarrierSet::shared_dirty_card_queue().reset();
}
void G1DirtyCardQueueSet::concatenate_logs() {
@@ -234,16 +223,16 @@
size_t old_limit = max_completed_buffers();
set_max_completed_buffers(MaxCompletedBuffersUnlimited);
- class ConcatenateThreadLogClosure : public ThreadClosure {
- G1DirtyCardQueueSet* _qset;
- public:
- ConcatenateThreadLogClosure(G1DirtyCardQueueSet* qset) : _qset(qset) {}
+ struct ConcatenateThreadLogClosure : public ThreadClosure {
virtual void do_thread(Thread* t) {
- _qset->concatenate_log(G1ThreadLocalData::dirty_card_queue(t));
+ G1DirtyCardQueue& dcq = G1ThreadLocalData::dirty_card_queue(t);
+ if (!dcq.is_empty()) {
+ dcq.flush();
+ }
}
- } closure(this);
+ } closure;
Threads::threads_do(&closure);
- concatenate_log(_shared_dirty_card_queue);
+ G1BarrierSet::shared_dirty_card_queue().flush();
set_max_completed_buffers(old_limit);
}
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -48,7 +48,7 @@
// A ptrQueue whose elements are "oops", pointers to object heads.
class G1DirtyCardQueue: public PtrQueue {
public:
- G1DirtyCardQueue(G1DirtyCardQueueSet* qset, bool permanent = false);
+ G1DirtyCardQueue(G1DirtyCardQueueSet* qset);
// Flush before destroying; queue may be used to capture pending work while
// doing something else, with auto-flush on completion.
@@ -70,11 +70,7 @@
};
-
-
class G1DirtyCardQueueSet: public PtrQueueSet {
- G1DirtyCardQueue _shared_dirty_card_queue;
-
// Apply the closure to the elements of "node" from it's index to
// buffer_size. If all closure applications return true, then
// returns true. Stops processing after the first closure
@@ -116,15 +112,12 @@
// Current buffer node used for parallel iteration.
BufferNode* volatile _cur_par_buffer_node;
- void concatenate_log(G1DirtyCardQueue& dcq);
-
public:
G1DirtyCardQueueSet(bool notify_when_complete = true);
~G1DirtyCardQueueSet();
void initialize(Monitor* cbl_mon,
BufferNode::Allocator* allocator,
- Mutex* lock,
bool init_free_ids = false);
// The number of parallel ids that can be claimed to allow collector or
@@ -147,10 +140,6 @@
// by reset_for_par_iteration.
void par_apply_closure_to_all_completed_buffers(G1CardTableEntryClosure* cl);
- G1DirtyCardQueue* shared_dirty_card_queue() {
- return &_shared_dirty_card_queue;
- }
-
// If a full collection is happening, reset partial logs, and ignore
// completed ones: the full collection will make them all irrelevant.
void abandon_logs();
--- a/src/hotspot/share/gc/g1/g1Policy.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1188,9 +1188,11 @@
return (uint) result;
}
-void G1Policy::finalize_collection_set(double target_pause_time_ms, G1SurvivorRegions* survivor) {
+uint G1Policy::finalize_collection_set(double target_pause_time_ms, G1SurvivorRegions* survivor) {
double time_remaining_ms = _collection_set->finalize_young_part(target_pause_time_ms, survivor);
_collection_set->finalize_old_part(time_remaining_ms);
+
+ return _collection_set->region_length();
}
void G1Policy::transfer_survivors_to_cset(const G1SurvivorRegions* survivors) {
--- a/src/hotspot/share/gc/g1/g1Policy.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -344,7 +344,7 @@
bool next_gc_should_be_mixed(const char* true_action_str,
const char* false_action_str) const;
- void finalize_collection_set(double target_pause_time_ms, G1SurvivorRegions* survivor);
+ uint finalize_collection_set(double target_pause_time_ms, G1SurvivorRegions* survivor);
private:
// Set the state to start a concurrent marking cycle and clear
// _initiate_conc_mark_if_possible because it has now been
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -205,8 +205,10 @@
MemoryType type) :
G1RegionToSpaceMapper(rs, actual_size, page_size, alloc_granularity, commit_factor, type),
_rs(rs),
+ _dram_mapper(NULL),
_num_committed_dram(0),
_num_committed_nvdimm(0),
+ _start_index_of_dram(0),
_page_size(page_size),
_commit_factor(commit_factor),
_type(type) {
@@ -248,7 +250,6 @@
_dram_mapper = new G1RegionsSmallerThanCommitSizeMapper(rs_dram, rs_dram.size(), _page_size, _region_granularity, _commit_factor, _type);
}
- _start_index_of_nvdimm = 0;
_start_index_of_dram = (uint)(rs_nvdimm.size() / _region_granularity);
return true;
}
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -101,12 +101,10 @@
// part of space is mapped to dram and part to nv-dimm
class G1RegionToHeteroSpaceMapper : public G1RegionToSpaceMapper {
private:
- size_t _pages_per_region;
ReservedSpace _rs;
G1RegionToSpaceMapper* _dram_mapper;
uint _num_committed_dram;
uint _num_committed_nvdimm;
- uint _start_index_of_nvdimm;
uint _start_index_of_dram;
size_t _page_size;
size_t _commit_factor;
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -35,6 +35,7 @@
#include "gc/g1/g1OopClosures.inline.hpp"
#include "gc/g1/g1RootClosures.hpp"
#include "gc/g1/g1RemSet.hpp"
+#include "gc/g1/g1SharedDirtyCardQueue.hpp"
#include "gc/g1/heapRegion.inline.hpp"
#include "gc/g1/heapRegionManager.inline.hpp"
#include "gc/g1/heapRegionRemSet.hpp"
@@ -519,9 +520,7 @@
}
void G1RemSet::prepare_for_oops_into_collection_set_do() {
- G1DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
- dcqs.concatenate_logs();
-
+ G1BarrierSet::dirty_card_queue_set().concatenate_logs();
_scan_state->reset();
}
@@ -660,29 +659,30 @@
assert(!dirty_region.is_empty(), "sanity");
G1ConcurrentRefineOopClosure conc_refine_cl(_g1h, worker_i);
-
- bool card_processed =
- r->oops_on_card_seq_iterate_careful<false>(dirty_region, &conc_refine_cl);
+ if (r->oops_on_card_seq_iterate_careful<false>(dirty_region, &conc_refine_cl)) {
+ _num_conc_refined_cards++; // Unsynchronized update, only used for logging.
+ return;
+ }
// If unable to process the card then we encountered an unparsable
- // part of the heap (e.g. a partially allocated object) while
- // processing a stale card. Despite the card being stale, redirty
- // and re-enqueue, because we've already cleaned the card. Without
- // this we could incorrectly discard a non-stale card.
- if (!card_processed) {
- // The card might have gotten re-dirtied and re-enqueued while we
- // worked. (In fact, it's pretty likely.)
- if (*card_ptr != G1CardTable::dirty_card_val()) {
- *card_ptr = G1CardTable::dirty_card_val();
- MutexLockerEx x(Shared_DirtyCardQ_lock,
- Mutex::_no_safepoint_check_flag);
- G1DirtyCardQueue* sdcq =
- G1BarrierSet::dirty_card_queue_set().shared_dirty_card_queue();
- sdcq->enqueue(card_ptr);
- }
- } else {
- _num_conc_refined_cards++; // Unsynchronized update, only used for logging.
+ // part of the heap (e.g. a partially allocated object, so only
+ // temporarily a problem) while processing a stale card. Despite
+ // the card being stale, we can't simply ignore it, because we've
+ // already marked the card cleaned, so taken responsibility for
+ // ensuring the card gets scanned.
+ //
+ // However, the card might have gotten re-dirtied and re-enqueued
+ // while we worked. (In fact, it's pretty likely.)
+ if (*card_ptr == G1CardTable::dirty_card_val()) {
+ return;
}
+
+ // Re-dirty the card and enqueue in the *shared* queue. Can't use
+ // the thread-local queue, because that might be the queue that is
+ // being processed by us; we could be a Java thread conscripted to
+ // perform refinement on our queue's current buffer.
+ *card_ptr = G1CardTable::dirty_card_val();
+ G1BarrierSet::shared_dirty_card_queue().enqueue(card_ptr);
}
bool G1RemSet::refine_card_during_gc(CardValue* card_ptr,
--- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -38,7 +38,6 @@
#include "gc/g1/g1RootClosures.hpp"
#include "gc/g1/g1RootProcessor.hpp"
#include "gc/g1/heapRegion.inline.hpp"
-#include "gc/shared/oopStorageParState.hpp"
#include "gc/shared/referenceProcessor.hpp"
#include "memory/allocation.inline.hpp"
#include "runtime/mutex.hpp"
@@ -71,7 +70,6 @@
_g1h(g1h),
_process_strong_tasks(G1RP_PS_NumElements),
_srs(n_workers),
- _par_state_string(StringTable::weak_storage()),
_lock(Mutex::leaf, "G1 Root Scanning barrier lock", false, Monitor::_safepoint_check_never),
_n_workers_discovered_strong_classes(0) {}
--- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -25,7 +25,6 @@
#ifndef SHARE_GC_G1_G1ROOTPROCESSOR_HPP
#define SHARE_GC_G1_G1ROOTPROCESSOR_HPP
-#include "gc/shared/oopStorageParState.hpp"
#include "gc/shared/strongRootsScope.hpp"
#include "memory/allocation.hpp"
#include "runtime/mutex.hpp"
@@ -50,7 +49,6 @@
G1CollectedHeap* _g1h;
SubTasksDone _process_strong_tasks;
StrongRootsScope _srs;
- OopStorage::ParState<false, false> _par_state_string;
// Used to implement the Thread work barrier.
Monitor _lock;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/g1/g1SharedDirtyCardQueue.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/g1/g1DirtyCardQueue.hpp"
+#include "gc/g1/g1SharedDirtyCardQueue.hpp"
+#include "gc/shared/ptrQueue.hpp"
+#include "runtime/mutex.hpp"
+#include "runtime/mutexLocker.hpp"
+
+G1SharedDirtyCardQueue::G1SharedDirtyCardQueue(G1DirtyCardQueueSet* qset) :
+ _qset(qset),
+ _buffer(NULL),
+ _index(0)
+{}
+
+G1SharedDirtyCardQueue::~G1SharedDirtyCardQueue() {
+ flush();
+}
+
+void G1SharedDirtyCardQueue::enqueue(void* card_ptr) {
+ MutexLockerEx ml(Shared_DirtyCardQ_lock, Mutex::_no_safepoint_check_flag);
+ if (_index == 0) {
+ flush();
+ _buffer = _qset->allocate_buffer();
+ _index = _qset->buffer_size();
+ assert(_index != 0, "invariant");
+ }
+ _buffer[--_index] = card_ptr;
+}
+
+void G1SharedDirtyCardQueue::flush() {
+ if (_buffer != NULL) {
+ BufferNode* node = BufferNode::make_node_from_buffer(_buffer, _index);
+ _buffer = NULL;
+ _index = 0;
+ if (node->index() == _qset->buffer_size()) {
+ _qset->deallocate_buffer(node);
+ } else {
+ _qset->enqueue_completed_buffer(node);
+ }
+ }
+ assert(_index == 0, "invariant");
+}
+
+void G1SharedDirtyCardQueue::reset() {
+ if (_buffer == NULL) {
+ _index = 0;
+ } else {
+ _index = _qset->buffer_size();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/g1/g1SharedDirtyCardQueue.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_G1_G1SHAREDDIRTYCARDQUEUE_HPP
+#define SHARE_GC_G1_G1SHAREDDIRTYCARDQUEUE_HPP
+
+#include "utilities/globalDefinitions.hpp"
+
+class G1DirtyCardQueueSet;
+
+// A dirty card queue providing thread-safe enqueue. A shared global
+// instance can be used for cases where a thread-local dirty card can't
+// be used.
+class G1SharedDirtyCardQueue {
+ G1DirtyCardQueueSet* const _qset;
+ void** _buffer;
+ size_t _index;
+
+ // Noncopyable
+ G1SharedDirtyCardQueue(const G1SharedDirtyCardQueue&);
+ G1SharedDirtyCardQueue& operator=(const G1SharedDirtyCardQueue&);
+
+public:
+ G1SharedDirtyCardQueue(G1DirtyCardQueueSet* qset);
+ ~G1SharedDirtyCardQueue(); // flushes the queue.
+
+ // Thread-safe addition to shared logging buffer.
+ void enqueue(void* card_ptr);
+
+ // Flush any pending entries to the qset and remove the buffer.
+ // Not thread-safe.
+ void flush();
+
+ // Discard any pending entries.
+ // Not thread-safe.
+ void reset();
+};
+
+#endif // SHARE_GC_G1_G1SHAREDDIRTYCARDQUEUE_HPP
--- a/src/hotspot/share/gc/parallel/adjoiningGenerations.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/adjoiningGenerations.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -119,7 +119,7 @@
}
}
-AdjoiningGenerations::AdjoiningGenerations() { }
+AdjoiningGenerations::AdjoiningGenerations(): _young_gen(NULL), _old_gen(NULL), _virtual_spaces(NULL) { }
size_t AdjoiningGenerations::reserved_byte_size() {
return virtual_spaces()->reserved_space().size();
--- a/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -50,6 +50,7 @@
bool request_young_gen_expansion(size_t desired_change_in_bytes);
protected:
+ AdjoiningGenerations();
// The young generation and old generation, respectively
PSYoungGen* _young_gen;
PSOldGen* _old_gen;
@@ -59,7 +60,6 @@
public:
AdjoiningGenerations(ReservedSpace rs, GenerationSizer* policy, size_t alignment);
- AdjoiningGenerations();
// Accessors
PSYoungGen* young_gen() { return _young_gen; }
--- a/src/hotspot/share/gc/parallel/gcTaskThread.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/gcTaskThread.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -167,7 +167,6 @@
// so that a task can complete without waiting for idle tasks.
// They have to be terminated separately.
IdleGCTask::destroy((IdleGCTask*)task);
- set_is_working(true);
}
// Check if we should release our inner resources.
--- a/src/hotspot/share/gc/parallel/gcTaskThread.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/gcTaskThread.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -47,8 +47,6 @@
GCTaskTimeStamp* time_stamp_at(uint index);
void add_task_timestamp(const char* name, jlong t_entry, jlong t_exit);
- bool _is_working; // True if participating in GC tasks
-
// Factory create and destroy methods.
static GCTaskThread* create(GCTaskManager* manager,
uint which,
@@ -85,7 +83,6 @@
uint processor_id() const {
return _processor_id;
}
- void set_is_working(bool v) { _is_working = v; }
};
class GCTaskTimeStamp : public CHeapObj<mtGC>
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -93,7 +93,15 @@
public:
ParallelScavengeHeap(GenerationSizer* policy) :
- CollectedHeap(), _collector_policy(policy), _death_march_count(0) { }
+ CollectedHeap(),
+ _collector_policy(policy),
+ _gens(NULL),
+ _death_march_count(0),
+ _young_manager(NULL),
+ _old_manager(NULL),
+ _eden_pool(NULL),
+ _survivor_pool(NULL),
+ _old_pool(NULL) { }
// For use by VM operations
enum CollectionType {
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,34 +49,25 @@
init_survivor_size,
gc_pause_goal_sec,
gc_cost_ratio),
+ _avg_major_pause(new AdaptivePaddedAverage(AdaptiveTimeWeight, PausePadding)),
+ _avg_base_footprint(new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight)),
+ _gc_stats(),
_collection_cost_margin_fraction(AdaptiveSizePolicyCollectionCostMargin / 100.0),
+ _major_pause_old_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)),
+ _major_pause_young_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)),
_latest_major_mutator_interval_seconds(0),
_space_alignment(space_alignment),
_gc_minor_pause_goal_sec(gc_minor_pause_goal_sec),
_live_at_last_full_gc(init_promo_size),
- _young_gen_change_for_major_pause_count(0)
+ _change_old_gen_for_min_pauses(0),
+ _change_young_gen_for_maj_pauses(0),
+ _old_gen_policy_is_ready(false),
+ _young_gen_size_increment_supplement(YoungGenerationSizeSupplement),
+ _old_gen_size_increment_supplement(TenuredGenerationSizeSupplement),
+ _bytes_absorbed_from_eden(0)
{
- // Sizing policy statistics
- _avg_major_pause =
- new AdaptivePaddedAverage(AdaptiveTimeWeight, PausePadding);
- _avg_minor_interval = new AdaptiveWeightedAverage(AdaptiveTimeWeight);
- _avg_major_interval = new AdaptiveWeightedAverage(AdaptiveTimeWeight);
-
- _avg_base_footprint = new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight);
- _major_pause_old_estimator =
- new LinearLeastSquareFit(AdaptiveSizePolicyWeight);
- _major_pause_young_estimator =
- new LinearLeastSquareFit(AdaptiveSizePolicyWeight);
- _major_collection_estimator =
- new LinearLeastSquareFit(AdaptiveSizePolicyWeight);
-
- _young_gen_size_increment_supplement = YoungGenerationSizeSupplement;
- _old_gen_size_increment_supplement = TenuredGenerationSizeSupplement;
-
// Start the timers
_major_timer.start();
-
- _old_gen_policy_is_ready = false;
}
size_t PSAdaptiveSizePolicy::calculate_free_based_on_live(size_t live, uintx ratio_as_percentage) {
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -75,7 +75,6 @@
// Statistical data gathered for GC
GCStats _gc_stats;
- size_t _survivor_size_limit; // Limit in bytes of survivor size
const double _collection_cost_margin_fraction;
// Variable for estimating the major and minor pause times.
@@ -111,13 +110,6 @@
// Flag indicating that the adaptive policy is ready to use
bool _old_gen_policy_is_ready;
- // Changing the generation sizing depends on the data that is
- // gathered about the effects of changes on the pause times and
- // throughput. These variable count the number of data points
- // gathered. The policy may use these counters as a threshold
- // for reliable data.
- julong _young_gen_change_for_major_pause_count;
-
// To facilitate faster growth at start up, supplement the normal
// growth percentage for the young gen eden and the
// old gen space for promotion with these value which decay
--- a/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,10 +51,6 @@
return true;
}
-PSFileBackedVirtualSpace::PSFileBackedVirtualSpace(ReservedSpace rs, const char* path) {
- PSFileBackedVirtualSpace(rs, os::vm_page_size(), path);
-}
-
bool PSFileBackedVirtualSpace::expand_by(size_t bytes) {
assert(special(), "Since entire space is committed at initialization, _special should always be true for PSFileBackedVirtualSpace");
--- a/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -34,7 +34,6 @@
bool _mapping_succeeded;
public:
PSFileBackedVirtualSpace(ReservedSpace rs, size_t alignment, const char* file_path);
- PSFileBackedVirtualSpace(ReservedSpace rs, const char* file_path);
bool initialize();
bool expand_by(size_t bytes);
--- a/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -52,7 +52,11 @@
public:
PSMarkSweepDecorator(MutableSpace* space, ObjectStartArray* start_array,
size_t allowed_dead_ratio) :
- _space(space), _start_array(start_array),
+ _space(space),
+ _start_array(start_array),
+ _first_dead(NULL),
+ _end_of_live(NULL),
+ _compaction_top(NULL),
_allowed_dead_ratio(allowed_dead_ratio) { }
// During a compacting collection, we need to collapse objects into
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -406,19 +406,16 @@
size_t mark_bitmap_size;
#endif // #ifdef ASSERT
-ParallelCompactData::ParallelCompactData()
-{
- _region_start = 0;
-
- _region_vspace = 0;
- _reserved_byte_size = 0;
- _region_data = 0;
- _region_count = 0;
-
- _block_vspace = 0;
- _block_data = 0;
- _block_count = 0;
-}
+ParallelCompactData::ParallelCompactData() :
+ _region_start(NULL),
+ DEBUG_ONLY(_region_end(NULL) COMMA)
+ _region_vspace(NULL),
+ _reserved_byte_size(0),
+ _region_data(NULL),
+ _region_count(0),
+ _block_vspace(NULL),
+ _block_data(NULL),
+ _block_count(0) {}
bool ParallelCompactData::initialize(MemRegion covered_region)
{
--- a/src/hotspot/share/gc/parallel/psVirtualspace.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,13 @@
}
// Deprecated.
-PSVirtualSpace::PSVirtualSpace(): _alignment(os::vm_page_size()) {
+PSVirtualSpace::PSVirtualSpace():
+ _alignment(os::vm_page_size()),
+ _reserved_low_addr(NULL),
+ _reserved_high_addr(NULL),
+ _committed_low_addr(NULL),
+ _committed_high_addr(NULL),
+ _special(false) {
}
// Deprecated.
--- a/src/hotspot/share/gc/parallel/psVirtualspace.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -64,7 +64,14 @@
// Eventually all instances should be created with the above 1- or 2-arg
// constructors. Then the 1st constructor below should become protected and
// the 2nd ctor and initialize() removed.
- PSVirtualSpace(size_t alignment): _alignment(alignment) { }
+ PSVirtualSpace(size_t alignment):
+ _alignment(alignment),
+ _reserved_low_addr(NULL),
+ _reserved_high_addr(NULL),
+ _committed_low_addr(NULL),
+ _committed_high_addr(NULL),
+ _special(false) {
+ }
PSVirtualSpace();
bool initialize(ReservedSpace rs, size_t commit_size);
--- a/src/hotspot/share/gc/parallel/psYoungGen.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/parallel/psYoungGen.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,12 +35,22 @@
#include "runtime/java.hpp"
#include "utilities/align.hpp"
-PSYoungGen::PSYoungGen(size_t initial_size,
- size_t min_size,
- size_t max_size) :
+PSYoungGen::PSYoungGen(size_t initial_size, size_t min_size, size_t max_size) :
+ _reserved(),
+ _virtual_space(NULL),
+ _eden_space(NULL),
+ _from_space(NULL),
+ _to_space(NULL),
+ _eden_mark_sweep(NULL),
+ _from_mark_sweep(NULL),
+ _to_mark_sweep(NULL),
_init_gen_size(initial_size),
_min_gen_size(min_size),
- _max_gen_size(max_size)
+ _max_gen_size(max_size),
+ _gen_counters(NULL),
+ _eden_counters(NULL),
+ _from_counters(NULL),
+ _to_counters(NULL)
{}
void PSYoungGen::initialize_virtual_space(ReservedSpace rs, size_t alignment) {
--- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -48,40 +48,38 @@
_eden_size(init_eden_size),
_promo_size(init_promo_size),
_survivor_size(init_survivor_size),
+ _avg_minor_pause(new AdaptivePaddedAverage(AdaptiveTimeWeight, PausePadding)),
+ _avg_minor_interval(new AdaptiveWeightedAverage(AdaptiveTimeWeight)),
+ _avg_minor_gc_cost(new AdaptiveWeightedAverage(AdaptiveTimeWeight)),
+ _avg_major_interval(new AdaptiveWeightedAverage(AdaptiveTimeWeight)),
+ _avg_major_gc_cost(new AdaptiveWeightedAverage(AdaptiveTimeWeight)),
+ _avg_young_live(new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight)),
+ _avg_eden_live(new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight)),
+ _avg_old_live(new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight)),
+ _avg_survived(new AdaptivePaddedAverage(AdaptiveSizePolicyWeight, SurvivorPadding)),
+ _avg_pretenured(new AdaptivePaddedNoZeroDevAverage(AdaptiveSizePolicyWeight, SurvivorPadding)),
+ _minor_pause_old_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)),
+ _minor_pause_young_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)),
+ _minor_collection_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)),
+ _major_collection_estimator(new LinearLeastSquareFit(AdaptiveSizePolicyWeight)),
_latest_minor_mutator_interval_seconds(0),
_threshold_tolerance_percent(1.0 + ThresholdTolerance/100.0),
_gc_pause_goal_sec(gc_pause_goal_sec),
+ _young_gen_policy_is_ready(false),
+ _change_young_gen_for_min_pauses(0),
+ _change_old_gen_for_maj_pauses(0),
+ _change_old_gen_for_throughput(0),
+ _change_young_gen_for_throughput(0),
+ _increment_tenuring_threshold_for_gc_cost(false),
+ _decrement_tenuring_threshold_for_gc_cost(false),
+ _decrement_tenuring_threshold_for_survivor_limit(false),
+ _decrease_for_footprint(0),
+ _decide_at_full_gc(0),
_young_gen_change_for_minor_throughput(0),
_old_gen_change_for_major_throughput(0) {
- _avg_minor_pause =
- new AdaptivePaddedAverage(AdaptiveTimeWeight, PausePadding);
- _avg_minor_interval = new AdaptiveWeightedAverage(AdaptiveTimeWeight);
- _avg_minor_gc_cost = new AdaptiveWeightedAverage(AdaptiveTimeWeight);
- _avg_major_gc_cost = new AdaptiveWeightedAverage(AdaptiveTimeWeight);
-
- _avg_young_live = new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight);
- _avg_old_live = new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight);
- _avg_eden_live = new AdaptiveWeightedAverage(AdaptiveSizePolicyWeight);
-
- _avg_survived = new AdaptivePaddedAverage(AdaptiveSizePolicyWeight,
- SurvivorPadding);
- _avg_pretenured = new AdaptivePaddedNoZeroDevAverage(
- AdaptiveSizePolicyWeight,
- SurvivorPadding);
-
- _minor_pause_old_estimator =
- new LinearLeastSquareFit(AdaptiveSizePolicyWeight);
- _minor_pause_young_estimator =
- new LinearLeastSquareFit(AdaptiveSizePolicyWeight);
- _minor_collection_estimator =
- new LinearLeastSquareFit(AdaptiveSizePolicyWeight);
- _major_collection_estimator =
- new LinearLeastSquareFit(AdaptiveSizePolicyWeight);
// Start the timers
_minor_timer.start();
-
- _young_gen_policy_is_ready = false;
}
bool AdaptiveSizePolicy::tenuring_threshold_change() const {
--- a/src/hotspot/share/gc/shared/barrierSet.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/barrierSet.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -130,8 +130,18 @@
virtual void on_slowpath_allocation_exit(JavaThread* thread, oop new_obj) {}
virtual void on_thread_create(Thread* thread) {}
virtual void on_thread_destroy(Thread* thread) {}
+
+ // These perform BarrierSet-related initialization/cleanup before the thread
+ // is added to or removed from the corresponding set of threads. The
+ // argument thread is the current thread. These are called either holding
+ // the Threads_lock (for a JavaThread) and so not at a safepoint, or holding
+ // the NonJavaThreadsList_lock (for a NonJavaThread) locked by the
+ // caller. That locking ensures the operation is "atomic" with the list
+ // modification wrto operations that hold the NJTList_lock and either also
+ // hold the Threads_lock or are at a safepoint.
virtual void on_thread_attach(Thread* thread) {}
virtual void on_thread_detach(Thread* thread) {}
+
virtual void make_parsable(JavaThread* thread) {}
#ifdef CHECK_UNHANDLED_OOPS
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -510,11 +510,11 @@
void print_heap_after_gc();
// Registering and unregistering an nmethod (compiled code) with the heap.
- // Override with specific mechanism for each specialized heap type.
- virtual void register_nmethod(nmethod* nm) {}
- virtual void unregister_nmethod(nmethod* nm) {}
- virtual void flush_nmethod(nmethod* nm) {}
- virtual void verify_nmethod(nmethod* nmethod) {}
+ virtual void register_nmethod(nmethod* nm) = 0;
+ virtual void unregister_nmethod(nmethod* nm) = 0;
+ // Callback for when nmethod is about to be deleted.
+ virtual void flush_nmethod(nmethod* nm) = 0;
+ virtual void verify_nmethod(nmethod* nm) = 0;
void trace_heap_before_gc(const GCTracer* gc_tracer);
void trace_heap_after_gc(const GCTracer* gc_tracer);
--- a/src/hotspot/share/gc/shared/concurrentGCThread.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/concurrentGCThread.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,79 +23,58 @@
*/
#include "precompiled.hpp"
-#include "classfile/systemDictionary.hpp"
#include "gc/shared/concurrentGCThread.hpp"
-#include "oops/instanceRefKlass.hpp"
-#include "oops/oop.inline.hpp"
#include "runtime/init.hpp"
-#include "runtime/java.hpp"
-#include "runtime/javaCalls.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/orderAccess.hpp"
#include "runtime/os.hpp"
ConcurrentGCThread::ConcurrentGCThread() :
- _should_terminate(false), _has_terminated(false) {
-};
+ _should_terminate(false),
+ _has_terminated(false) {}
void ConcurrentGCThread::create_and_start(ThreadPriority prio) {
if (os::create_thread(this, os::cgc_thread)) {
- // XXX: need to set this to low priority
- // unless "aggressive mode" set; priority
- // should be just less than that of VMThread.
os::set_priority(this, prio);
- if (!_should_terminate) {
- os::start_thread(this);
- }
- }
-}
-
-void ConcurrentGCThread::initialize_in_thread() {
- this->set_active_handles(JNIHandleBlock::allocate_block());
- // From this time Thread::current() should be working.
- assert(this == Thread::current(), "just checking");
-}
-
-void ConcurrentGCThread::wait_for_universe_init() {
- MutexLockerEx x(CGC_lock, Mutex::_no_safepoint_check_flag);
- while (!is_init_completed() && !_should_terminate) {
- CGC_lock->wait(Mutex::_no_safepoint_check_flag, 1);
- }
-}
-
-void ConcurrentGCThread::terminate() {
- assert(_should_terminate, "Should only be called on terminate request.");
- // Signal that it is terminated
- {
- MutexLockerEx mu(Terminator_lock,
- Mutex::_no_safepoint_check_flag);
- _has_terminated = true;
- Terminator_lock->notify();
+ os::start_thread(this);
}
}
void ConcurrentGCThread::run() {
- initialize_in_thread();
- wait_for_universe_init();
+ // Setup handle area
+ set_active_handles(JNIHandleBlock::allocate_block());
+
+ // Wait for initialization to complete
+ wait_init_completed();
run_service();
- terminate();
+ // Signal thread has terminated
+ MonitorLockerEx ml(Terminator_lock);
+ OrderAccess::release_store(&_has_terminated, true);
+ ml.notify_all();
}
void ConcurrentGCThread::stop() {
- // it is ok to take late safepoints here, if needed
- {
- MutexLockerEx mu(Terminator_lock);
- assert(!_has_terminated, "stop should only be called once");
- assert(!_should_terminate, "stop should only be called once");
- _should_terminate = true;
- }
+ assert(!should_terminate(), "Invalid state");
+ assert(!has_terminated(), "Invalid state");
+
+ // Signal thread to terminate
+ OrderAccess::release_store_fence(&_should_terminate, true);
stop_service();
- {
- MutexLockerEx mu(Terminator_lock);
- while (!_has_terminated) {
- Terminator_lock->wait();
- }
+ // Wait for thread to terminate
+ MonitorLockerEx ml(Terminator_lock);
+ while (!_has_terminated) {
+ ml.wait();
}
}
+
+bool ConcurrentGCThread::should_terminate() const {
+ return OrderAccess::load_acquire(&_should_terminate);
+}
+
+bool ConcurrentGCThread::has_terminated() const {
+ return OrderAccess::load_acquire(&_has_terminated);
+}
--- a/src/hotspot/share/gc/shared/concurrentGCThread.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/concurrentGCThread.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -26,48 +26,28 @@
#define SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP
#include "runtime/thread.hpp"
-#include "utilities/macros.hpp"
class ConcurrentGCThread: public NamedThread {
- friend class VMStructs;
-
- bool volatile _should_terminate;
- bool _has_terminated;
-
- // Do initialization steps in the thread: record stack base and size,
- // init thread local storage, set JNI handle block.
- void initialize_in_thread();
-
- // Wait until Universe::is_fully_initialized();
- void wait_for_universe_init();
-
- // Record that the current thread is terminating, and will do more
- // concurrent work.
- void terminate();
+private:
+ volatile bool _should_terminate;
+ volatile bool _has_terminated;
protected:
- // Create and start the thread (setting it's priority.)
void create_and_start(ThreadPriority prio = NearMaxPriority);
- // Do the specific GC work. Called by run() after initialization complete.
virtual void run_service() = 0;
-
- // Shut down the specific GC work. Called by stop() as part of termination protocol.
- virtual void stop_service() = 0;
+ virtual void stop_service() = 0;
public:
ConcurrentGCThread();
- // Tester
- bool is_ConcurrentGC_thread() const { return true; }
+ virtual bool is_ConcurrentGC_thread() const { return true; }
virtual void run();
-
- // shutdown following termination protocol
virtual void stop();
- bool should_terminate() { return _should_terminate; }
- bool has_terminated() { return _has_terminated; }
+ bool should_terminate() const;
+ bool has_terminated() const;
};
#endif // SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP
--- a/src/hotspot/share/gc/shared/gcStats.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/gcStats.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,4 @@
#include "gc/shared/gcStats.hpp"
#include "gc/shared/gcUtil.inline.hpp"
-GCStats::GCStats() {
- _avg_promoted = new AdaptivePaddedNoZeroDevAverage(
- AdaptiveSizePolicyWeight,
- PromotedPadding);
-}
+GCStats::GCStats() : _avg_promoted(new AdaptivePaddedNoZeroDevAverage(AdaptiveSizePolicyWeight, PromotedPadding)) {}
--- a/src/hotspot/share/gc/shared/ptrQueue.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/ptrQueue.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -36,18 +36,16 @@
#include <new>
-PtrQueue::PtrQueue(PtrQueueSet* qset, bool permanent, bool active) :
+PtrQueue::PtrQueue(PtrQueueSet* qset, bool active) :
_qset(qset),
_active(active),
- _permanent(permanent),
_index(0),
_capacity_in_bytes(0),
- _buf(NULL),
- _lock(NULL)
+ _buf(NULL)
{}
PtrQueue::~PtrQueue() {
- assert(_permanent || (_buf == NULL), "queue must be flushed before delete");
+ assert(_buf == NULL, "queue must be flushed before delete");
}
void PtrQueue::flush_impl() {
@@ -271,23 +269,13 @@
return;
}
- if (_lock) {
- assert(_lock->owned_by_self(), "Required.");
-
- BufferNode* node = BufferNode::make_node_from_buffer(_buf, index());
- _buf = NULL; // clear shared _buf field
-
- qset()->enqueue_completed_buffer(node);
- assert(_buf == NULL, "multiple enqueuers appear to be racing");
- } else {
- BufferNode* node = BufferNode::make_node_from_buffer(_buf, index());
- if (qset()->process_or_enqueue_completed_buffer(node)) {
- // Recycle the buffer. No allocation.
- assert(_buf == BufferNode::make_buffer_from_node(node), "invariant");
- assert(capacity() == qset()->buffer_size(), "invariant");
- reset();
- return;
- }
+ BufferNode* node = BufferNode::make_node_from_buffer(_buf, index());
+ if (qset()->process_or_enqueue_completed_buffer(node)) {
+ // Recycle the buffer. No allocation.
+ assert(_buf == BufferNode::make_buffer_from_node(node), "invariant");
+ assert(capacity() == qset()->buffer_size(), "invariant");
+ reset();
+ return;
}
}
// Set capacity in case this is the first allocation.
--- a/src/hotspot/share/gc/shared/ptrQueue.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/ptrQueue.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -54,11 +54,6 @@
// Whether updates should be logged.
bool _active;
- // If true, the queue is permanent, and doesn't need to deallocate
- // its buffer in the destructor (since that obtains a lock which may not
- // be legally locked by then.
- const bool _permanent;
-
// The (byte) index at which an object was last enqueued. Starts at
// capacity_in_bytes (indicating an empty buffer) and goes towards zero.
// Value is always pointer-size aligned.
@@ -111,27 +106,20 @@
return byte_index_to_index(capacity_in_bytes());
}
- // If there is a lock associated with this buffer, this is that lock.
- Mutex* _lock;
-
PtrQueueSet* qset() { return _qset; }
- bool is_permanent() const { return _permanent; }
// Process queue entries and release resources.
void flush_impl();
// Initialize this queue to contain a null buffer, and be part of the
// given PtrQueueSet.
- PtrQueue(PtrQueueSet* qset, bool permanent = false, bool active = false);
+ PtrQueue(PtrQueueSet* qset, bool active = false);
- // Requires queue flushed or permanent.
+ // Requires queue flushed.
~PtrQueue();
public:
- // Associate a lock with a ptr queue.
- void set_lock(Mutex* lock) { _lock = lock; }
-
// Forcibly set empty.
void reset() {
if (_buf != NULL) {
--- a/src/hotspot/share/gc/shared/satbMarkQueue.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -35,14 +35,14 @@
#include "runtime/threadSMR.hpp"
#include "runtime/vmThread.hpp"
-SATBMarkQueue::SATBMarkQueue(SATBMarkQueueSet* qset, bool permanent) :
+SATBMarkQueue::SATBMarkQueue(SATBMarkQueueSet* qset) :
// SATB queues are only active during marking cycles. We create
// them with their active field set to false. If a thread is
// created during a cycle and its SATB queue needs to be activated
// before the thread starts running, we'll need to set its active
// field to true. This must be done in the collector-specific
// BarrierSet thread attachment protocol.
- PtrQueue(qset, permanent, false /* active */)
+ PtrQueue(qset, false /* active */)
{ }
void SATBMarkQueue::flush() {
@@ -170,7 +170,11 @@
#ifdef ASSERT
verify_active_states(expected_active);
#endif // ASSERT
- _all_active = active;
+ // Update the global state, synchronized with threads list management.
+ {
+ MutexLockerEx ml(NonJavaThreadsList_lock, Mutex::_no_safepoint_check_flag);
+ _all_active = active;
+ }
class SetThreadActiveClosure : public ThreadClosure {
SATBMarkQueueSet* _qset;
--- a/src/hotspot/share/gc/shared/satbMarkQueue.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -55,7 +55,7 @@
inline void apply_filter(Filter filter_out);
public:
- SATBMarkQueue(SATBMarkQueueSet* qset, bool permanent = false);
+ SATBMarkQueue(SATBMarkQueueSet* qset);
// Process queue entries and free resources.
void flush();
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -682,7 +682,7 @@
return TypeNode::hash() + _allow_fromspace;
}
-uint ShenandoahBarrierNode::cmp(const Node& n) const {
+bool ShenandoahBarrierNode::cmp(const Node& n) const {
return _allow_fromspace == ((ShenandoahBarrierNode&) n)._allow_fromspace
&& TypeNode::cmp(n);
}
@@ -3400,6 +3400,7 @@
int ShenandoahEnqueueBarrierNode::needed(Node* n) {
if (n == NULL ||
n->is_Allocate() ||
+ n->Opcode() == Op_ShenandoahEnqueueBarrier ||
n->bottom_type() == TypePtr::NULL_PTR ||
(n->bottom_type()->make_oopptr() != NULL && n->bottom_type()->make_oopptr()->const_oop() != NULL)) {
return NotNeeded;
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -120,7 +120,7 @@
protected:
uint hash() const;
- uint cmp(const Node& n) const;
+ bool cmp(const Node& n) const;
uint size_of() const;
private:
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -135,18 +135,6 @@
FLAG_SET_DEFAULT(ShenandoahAlwaysPreTouch, true);
}
- // Shenandoah C2 optimizations apparently dislike the shape of thread-local handshakes.
- // Disable it by default, unless we enable it specifically for debugging.
- if (FLAG_IS_DEFAULT(ThreadLocalHandshakes)) {
- if (ThreadLocalHandshakes) {
- FLAG_SET_DEFAULT(ThreadLocalHandshakes, false);
- }
- } else {
- if (ThreadLocalHandshakes) {
- warning("Thread-local handshakes are not working correctly with Shenandoah at the moment. Enable at your own risk.");
- }
- }
-
// Record more information about previous cycles for improved debugging pleasure
if (FLAG_IS_DEFAULT(LogEventsBufferEntries)) {
FLAG_SET_DEFAULT(LogEventsBufferEntries, 250);
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -36,7 +36,7 @@
#include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp"
#include "gc/shenandoah/shenandoahMarkCompact.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
-#include "gc/shenandoah/shenandoahRootProcessor.hpp"
+#include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
#include "gc/shenandoah/shenandoahOopClosures.inline.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "gc/shenandoah/shenandoahTimingTracker.hpp"
@@ -120,11 +120,10 @@
CLDToOopClosure clds_cl(oops, ClassLoaderData::_claim_strong);
MarkingCodeBlobClosure blobs_cl(oops, ! CodeBlobToOopClosure::FixRelocations);
- OopClosure* weak_oops = _process_refs ? NULL : oops;
ResourceMark m;
if (heap->unload_classes()) {
- _rp->process_strong_roots(oops, weak_oops, &clds_cl, NULL, &blobs_cl, NULL, worker_id);
+ _rp->process_strong_roots(oops, &clds_cl, &blobs_cl, NULL, worker_id);
} else {
if (ShenandoahConcurrentScanCodeRoots) {
CodeBlobClosure* code_blobs = NULL;
@@ -137,9 +136,9 @@
code_blobs = &assert_to_space;
}
#endif
- _rp->process_all_roots(oops, weak_oops, &clds_cl, code_blobs, NULL, worker_id);
+ _rp->process_all_roots(oops, &clds_cl, code_blobs, NULL, worker_id);
} else {
- _rp->process_all_roots(oops, weak_oops, &clds_cl, &blobs_cl, NULL, worker_id);
+ _rp->process_all_roots(oops, &clds_cl, &blobs_cl, NULL, worker_id);
}
}
}
@@ -177,7 +176,7 @@
DEBUG_ONLY(&assert_to_space)
NOT_DEBUG(NULL);
}
- _rp->process_all_roots(&cl, &cl, &cldCl, code_blobs, NULL, worker_id);
+ _rp->update_all_roots<AlwaysTrueClosure>(&cl, &cldCl, code_blobs, NULL, worker_id);
}
};
@@ -446,11 +445,16 @@
weak_refs_work(full_gc);
}
+ weak_roots_work();
+
// And finally finish class unloading
if (_heap->unload_classes()) {
_heap->unload_classes_and_cleanup_tables(full_gc);
+ } else if (ShenandoahStringDedup::is_enabled()) {
+ ShenandoahIsAliveSelector alive;
+ BoolObjectClosure* is_alive = alive.is_alive_closure();
+ ShenandoahStringDedup::unlink_or_oops_do(is_alive, NULL, false);
}
-
assert(task_queues()->is_empty(), "Should be empty");
TASKQUEUE_STATS_ONLY(task_queues()->print_taskqueue_stats());
TASKQUEUE_STATS_ONLY(task_queues()->reset_taskqueue_stats());
@@ -555,11 +559,13 @@
private:
template <class T>
inline void do_oop_work(T* p) {
+#ifdef ASSERT
T o = RawAccess<>::oop_load(p);
if (!CompressedOops::is_null(o)) {
oop obj = CompressedOops::decode_not_null(o);
shenandoah_assert_not_forwarded(p, obj);
}
+#endif
}
public:
@@ -648,6 +654,23 @@
}
+// Process leftover weak oops: update them, if needed or assert they do not
+// need updating otherwise.
+// Weak processor API requires us to visit the oops, even if we are not doing
+// anything to them.
+void ShenandoahConcurrentMark::weak_roots_work() {
+ WorkGang* workers = _heap->workers();
+ ShenandoahIsAliveSelector is_alive;
+
+ if (_heap->has_forwarded_objects()) {
+ ShenandoahWeakUpdateClosure cl;
+ WeakProcessor::weak_oops_do(workers, is_alive.is_alive_closure(), &cl, 1);
+ } else {
+ ShenandoahWeakAssertNotForwardedClosure cl;
+ WeakProcessor::weak_oops_do(workers, is_alive.is_alive_closure(), &cl, 1);
+ }
+}
+
void ShenandoahConcurrentMark::weak_refs_work_doit(bool full_gc) {
ReferenceProcessor* rp = _heap->ref_processor();
@@ -689,26 +712,18 @@
ShenandoahGCPhase phase(phase_process);
ShenandoahTerminationTracker phase_term(phase_process_termination);
- // Process leftover weak oops: update them, if needed (using parallel version),
- // or assert they do not need updating (using serial version) otherwise.
- // Weak processor API requires us to visit the oops, even if we are not doing
- // anything to them.
if (_heap->has_forwarded_objects()) {
ShenandoahCMKeepAliveUpdateClosure keep_alive(get_queue(serial_worker_id));
rp->process_discovered_references(is_alive.is_alive_closure(), &keep_alive,
&complete_gc, &executor,
&pt);
- ShenandoahWeakUpdateClosure cl;
- WeakProcessor::weak_oops_do(workers, is_alive.is_alive_closure(), &cl, 1);
} else {
ShenandoahCMKeepAliveClosure keep_alive(get_queue(serial_worker_id));
rp->process_discovered_references(is_alive.is_alive_closure(), &keep_alive,
&complete_gc, &executor,
&pt);
- ShenandoahWeakAssertNotForwardedClosure cl;
- WeakProcessor::weak_oops_do(is_alive.is_alive_closure(), &cl);
}
pt.print_all_references();
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -86,6 +86,8 @@
void weak_refs_work(bool full_gc);
void weak_refs_work_doit(bool full_gc);
+ void weak_roots_work();
+
public:
void preclean_weak_refs();
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1127,16 +1127,6 @@
#endif
}
-void ShenandoahHeap::roots_iterate(OopClosure* cl) {
- assert(ShenandoahSafepoint::is_at_shenandoah_safepoint(), "Only iterate roots while world is stopped");
-
- CodeBlobToOopClosure blobsCl(cl, false);
- CLDToOopClosure cldCl(cl, ClassLoaderData::_claim_strong);
-
- ShenandoahRootProcessor rp(this, 1, ShenandoahPhaseTimings::_num_phases);
- rp.process_all_roots(cl, NULL, &cldCl, &blobsCl, NULL, 0);
-}
-
// Returns size in bytes
size_t ShenandoahHeap::unsafe_max_tlab_alloc(Thread *thread) const {
if (ShenandoahElasticTLAB) {
@@ -1337,7 +1327,7 @@
ObjectIterateScanRootClosure oops(&_aux_bit_map, &oop_stack);
CLDToOopClosure clds(&oops, ClassLoaderData::_claim_none);
CodeBlobToOopClosure blobs(&oops, false);
- rp.process_all_roots(&oops, &oops, &clds, &blobs, NULL, 0);
+ rp.process_all_roots(&oops, &clds, &blobs, NULL, 0);
// Work through the oop stack to traverse heap.
while (! oop_stack.is_empty()) {
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -584,6 +584,8 @@
public:
void register_nmethod(nmethod* nm);
void unregister_nmethod(nmethod* nm);
+ void flush_nmethod(nmethod* nm) {}
+ void verify_nmethod(nmethod* nm) {}
// ---------- Pinning hooks
//
@@ -742,8 +744,6 @@
void stop_concurrent_marking();
- void roots_iterate(OopClosure* cl);
-
private:
void trash_cset_regions();
void update_heap_references(bool concurrent);
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -35,7 +35,7 @@
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeuristics.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
-#include "gc/shenandoah/shenandoahRootProcessor.hpp"
+#include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
#include "gc/shenandoah/shenandoahTraversalGC.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "gc/shenandoah/shenandoahUtils.hpp"
@@ -572,9 +572,9 @@
MarkingCodeBlobClosure adjust_code_closure(&cl,
CodeBlobToOopClosure::FixRelocations);
- _rp->process_all_roots(&cl, &cl,
- &adjust_cld_closure,
- &adjust_code_closure, NULL, worker_id);
+ _rp->update_all_roots<AlwaysTrueClosure>(&cl,
+ &adjust_cld_closure,
+ &adjust_code_closure, NULL, worker_id);
}
};
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -119,14 +119,9 @@
Management::oops_do(oops);
JvmtiExport::oops_do(oops);
JNIHandles::oops_do(oops);
- WeakProcessor::oops_do(oops);
ObjectSynchronizer::oops_do(oops);
SystemDictionary::oops_do(oops);
- if (ShenandoahStringDedup::is_enabled()) {
- ShenandoahStringDedup::oops_do_slow(oops);
- }
-
// Do thread roots the last. This allows verification code to find
// any broken objects from those special roots first, not the accidental
// dangling reference from the thread root.
@@ -134,21 +129,18 @@
}
void ShenandoahRootProcessor::process_strong_roots(OopClosure* oops,
- OopClosure* weak_oops,
CLDClosure* clds,
- CLDClosure* weak_clds,
CodeBlobClosure* blobs,
ThreadClosure* thread_cl,
uint worker_id) {
- process_java_roots(oops, clds, weak_clds, blobs, thread_cl, worker_id);
- process_vm_roots(oops, NULL, weak_oops, worker_id);
+ process_java_roots(oops, clds, NULL, blobs, thread_cl, worker_id);
+ process_vm_roots(oops, worker_id);
_process_strong_tasks->all_tasks_completed(n_workers());
}
void ShenandoahRootProcessor::process_all_roots(OopClosure* oops,
- OopClosure* weak_oops,
CLDClosure* clds,
CodeBlobClosure* blobs,
ThreadClosure* thread_cl,
@@ -156,7 +148,7 @@
ShenandoahWorkerTimings* worker_times = ShenandoahHeap::heap()->phase_timings()->worker_times();
process_java_roots(oops, clds, clds, blobs, thread_cl, worker_id);
- process_vm_roots(oops, oops, weak_oops, worker_id);
+ process_vm_roots(oops, worker_id);
if (blobs != NULL) {
ShenandoahWorkerTimingsTracker timer(worker_times, ShenandoahPhaseTimings::CodeCacheRoots, worker_id);
@@ -164,6 +156,7 @@
}
_process_strong_tasks->all_tasks_completed(n_workers());
+
}
class ShenandoahParallelOopsDoThreadClosure : public ThreadClosure {
@@ -209,10 +202,7 @@
}
void ShenandoahRootProcessor::process_vm_roots(OopClosure* strong_roots,
- OopClosure* weak_roots,
- OopClosure* jni_weak_roots,
- uint worker_id)
-{
+ uint worker_id) {
ShenandoahWorkerTimings* worker_times = ShenandoahHeap::heap()->phase_timings()->worker_times();
if (_process_strong_tasks->try_claim_task(SHENANDOAH_RP_PS_Universe_oops_do)) {
ShenandoahWorkerTimingsTracker timer(worker_times, ShenandoahPhaseTimings::UniverseRoots, worker_id);
@@ -235,15 +225,6 @@
ShenandoahWorkerTimingsTracker timer(worker_times, ShenandoahPhaseTimings::SystemDictionaryRoots, worker_id);
SystemDictionary::oops_do(strong_roots);
}
- if (jni_weak_roots != NULL) {
- AlwaysTrueClosure always_true;
- _weak_processor_task.work<AlwaysTrueClosure, OopClosure>(worker_id, &always_true, jni_weak_roots);
- _processed_weak_roots = true;
- }
-
- if (ShenandoahStringDedup::is_enabled() && weak_roots != NULL) {
- ShenandoahStringDedup::parallel_oops_do(weak_roots, worker_id);
- }
{
ShenandoahWorkerTimingsTracker timer(worker_times, ShenandoahPhaseTimings::ObjectSynchronizerRoots, worker_id);
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -73,8 +73,6 @@
uint worker_i);
void process_vm_roots(OopClosure* scan_non_heap_roots,
- OopClosure* scan_non_heap_weak_roots,
- OopClosure* weak_jni_roots,
uint worker_i);
void weak_processor_timing_to_shenandoah_timing(const WeakProcessorPhases::Phase wpp,
@@ -86,21 +84,30 @@
ShenandoahPhaseTimings::Phase phase);
~ShenandoahRootProcessor();
- // Apply oops, clds and blobs to all strongly reachable roots in the system
- void process_strong_roots(OopClosure* oops, OopClosure* weak_oops,
+ // Apply oops, clds and blobs to all strongly reachable roots in the system.
+ // Optionally, apply class loader closure to weak clds, depending on class unloading
+ // for the particular GC cycles.
+ void process_strong_roots(OopClosure* oops,
CLDClosure* clds,
- CLDClosure* weak_clds,
CodeBlobClosure* blobs,
ThreadClosure* thread_cl,
uint worker_id);
- // Apply oops, clds and blobs to strongly and weakly reachable roots in the system
- void process_all_roots(OopClosure* oops, OopClosure* weak_oops,
+ // Apply oops, clds and blobs to strongly reachable roots in the system
+ void process_all_roots(OopClosure* oops,
CLDClosure* clds,
CodeBlobClosure* blobs,
ThreadClosure* thread_cl,
uint worker_id);
+ // Apply oops, clds and blobs to strongly and weakly reachable roots in the system
+ template <typename IsAlive>
+ void update_all_roots(OopClosure* oops,
+ CLDClosure* clds,
+ CodeBlobClosure* blobs,
+ ThreadClosure* thread_cl,
+ uint worker_id);
+
// For slow debug/verification code
void process_all_roots_slow(OopClosure* oops);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_INLINE_HPP
+
+#include "gc/shenandoah/shenandoahRootProcessor.hpp"
+
+template <typename IsAlive>
+void ShenandoahRootProcessor::update_all_roots(OopClosure* oops,
+ CLDClosure* clds,
+ CodeBlobClosure* blobs,
+ ThreadClosure* thread_cl,
+ uint worker_id) {
+ process_all_roots(oops, clds, blobs, thread_cl, worker_id);
+
+ IsAlive is_alive;
+ _weak_processor_task.work<IsAlive, OopClosure>(worker_id, &is_alive, oops);
+ _processed_weak_roots = true;
+
+ if (ShenandoahStringDedup::is_enabled()) {
+ ShenandoahStringDedup::parallel_oops_do(&is_alive, oops, worker_id);
+ }
+}
+
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -31,7 +31,7 @@
class ShenandoahSATBMarkQueue: public SATBMarkQueue {
public:
- ShenandoahSATBMarkQueue(SATBMarkQueueSet* qset) : SATBMarkQueue(qset, /* permanent = */ false) {}
+ ShenandoahSATBMarkQueue(SATBMarkQueueSet* qset) : SATBMarkQueue(qset) {}
virtual bool should_enqueue_buffer();
};
--- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -71,13 +71,13 @@
StringDedupTable::deduplicate(java_string, &dummy);
}
-void ShenandoahStringDedup::parallel_oops_do(OopClosure* cl, uint worker_id) {
+void ShenandoahStringDedup::parallel_oops_do(BoolObjectClosure* is_alive, OopClosure* cl, uint worker_id) {
assert(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint");
assert(is_enabled(), "String deduplication not enabled");
ShenandoahWorkerTimings* worker_times = ShenandoahHeap::heap()->phase_timings()->worker_times();
- StringDedupUnlinkOrOopsDoClosure sd_cl(NULL, cl);
+ StringDedupUnlinkOrOopsDoClosure sd_cl(is_alive, cl);
{
ShenandoahWorkerTimingsTracker x(worker_times, ShenandoahPhaseTimings::StringDedupQueueRoots, worker_id);
--- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -38,11 +38,11 @@
// Deduplicate a string, the call is lock-free
static void deduplicate(oop java_string);
- static void parallel_oops_do(OopClosure* cl, uint worker_id);
+ static void parallel_oops_do(BoolObjectClosure* is_alive, OopClosure* cl, uint worker_id);
static void oops_do_slow(OopClosure* cl);
static inline bool is_candidate(oop obj);
-private:
+
static void unlink_or_oops_do(BoolObjectClosure* is_alive,
OopClosure* keep_alive,
bool allow_resize_and_rehash);
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -40,7 +40,7 @@
#include "gc/shenandoah/shenandoahHeuristics.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
#include "gc/shenandoah/shenandoahOopClosures.inline.hpp"
-#include "gc/shenandoah/shenandoahRootProcessor.hpp"
+#include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
#include "gc/shenandoah/shenandoahStringDedup.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "gc/shenandoah/shenandoahTimingTracker.hpp"
@@ -188,13 +188,13 @@
ShenandoahMarkCLDClosure cld_cl(&roots_cl);
MarkingCodeBlobClosure code_cl(&roots_cl, CodeBlobToOopClosure::FixRelocations);
if (unload_classes) {
- _rp->process_strong_roots(&roots_cl, process_refs ? NULL : &roots_cl, &cld_cl, NULL, NULL, NULL, worker_id);
+ _rp->process_strong_roots(&roots_cl, &cld_cl, NULL, NULL, worker_id);
// Need to pre-evac code roots here. Otherwise we might see from-space constants.
ShenandoahWorkerTimings* worker_times = _heap->phase_timings()->worker_times();
ShenandoahWorkerTimingsTracker timer(worker_times, ShenandoahPhaseTimings::CodeCacheRoots, worker_id);
_cset_coderoots->possibly_parallel_blobs_do(&code_cl);
} else {
- _rp->process_all_roots(&roots_cl, process_refs ? NULL : &roots_cl, &cld_cl, &code_cl, NULL, worker_id);
+ _rp->process_all_roots(&roots_cl, &cld_cl, &code_cl, NULL, worker_id);
}
}
}
@@ -269,20 +269,20 @@
CLDToOopClosure cld_cl(&roots_cl, ClassLoaderData::_claim_strong);
ShenandoahTraversalSATBThreadsClosure tc(&satb_cl);
if (unload_classes) {
- ShenandoahRemarkCLDClosure weak_cld_cl(&roots_cl);
- _rp->process_strong_roots(&roots_cl, process_refs ? NULL : &roots_cl, &cld_cl, &weak_cld_cl, NULL, &tc, worker_id);
+ ShenandoahRemarkCLDClosure remark_cld_cl(&roots_cl);
+ _rp->process_strong_roots(&roots_cl, &remark_cld_cl, NULL, &tc, worker_id);
} else {
- _rp->process_all_roots(&roots_cl, process_refs ? NULL : &roots_cl, &cld_cl, NULL, &tc, worker_id);
+ _rp->process_all_roots(&roots_cl, &cld_cl, NULL, &tc, worker_id);
}
} else {
ShenandoahTraversalDegenClosure roots_cl(q, rp);
CLDToOopClosure cld_cl(&roots_cl, ClassLoaderData::_claim_strong);
ShenandoahTraversalSATBThreadsClosure tc(&satb_cl);
if (unload_classes) {
- ShenandoahRemarkCLDClosure weak_cld_cl(&roots_cl);
- _rp->process_strong_roots(&roots_cl, process_refs ? NULL : &roots_cl, &cld_cl, &weak_cld_cl, NULL, &tc, worker_id);
+ ShenandoahRemarkCLDClosure remark_cld_cl(&roots_cl);
+ _rp->process_strong_roots(&roots_cl, &remark_cld_cl, NULL, &tc, worker_id);
} else {
- _rp->process_all_roots(&roots_cl, process_refs ? NULL : &roots_cl, &cld_cl, NULL, &tc, worker_id);
+ _rp->process_all_roots(&roots_cl, &cld_cl, NULL, &tc, worker_id);
}
}
@@ -594,8 +594,11 @@
weak_refs_work();
}
- if (!_heap->cancelled_gc() && _heap->unload_classes()) {
- _heap->unload_classes_and_cleanup_tables(false);
+ if (!_heap->cancelled_gc()) {
+ if (_heap->unload_classes()) {
+ _heap->unload_classes_and_cleanup_tables(false);
+ }
+
fixup_roots();
}
@@ -691,14 +694,16 @@
public:
ShenandoahTraversalFixRootsTask(ShenandoahRootProcessor* rp) :
AbstractGangTask("Shenandoah traversal fix roots"),
- _rp(rp) {}
+ _rp(rp) {
+ assert(ShenandoahHeap::heap()->has_forwarded_objects(), "Must be");
+ }
void work(uint worker_id) {
ShenandoahParallelWorkerSession worker_session(worker_id);
ShenandoahTraversalFixRootsClosure cl;
MarkingCodeBlobClosure blobsCl(&cl, CodeBlobToOopClosure::FixRelocations);
CLDToOopClosure cldCl(&cl, ClassLoaderData::_claim_strong);
- _rp->process_all_roots(&cl, &cl, &cldCl, &blobsCl, NULL, worker_id);
+ _rp->update_all_roots<ShenandoahForwardedIsAliveClosure>(&cl, &cldCl, &blobsCl, NULL, worker_id);
}
};
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -194,9 +194,9 @@
return sizeof(*this);
}
-uint LoadBarrierNode::cmp(const Node& n) const {
+bool LoadBarrierNode::cmp(const Node& n) const {
ShouldNotReachHere();
- return 0;
+ return false;
}
const Type *LoadBarrierNode::bottom_type() const {
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -63,7 +63,7 @@
virtual int Opcode() const;
virtual uint size_of() const;
- virtual uint cmp(const Node& n) const;
+ virtual bool cmp(const Node& n) const;
virtual const Type *bottom_type() const;
virtual const TypePtr* adr_type() const;
virtual const Type *Value(PhaseGVN *phase) const;
--- a/src/hotspot/share/gc/z/zForwarding.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zForwarding.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -58,7 +58,7 @@
for (ZForwardingCursor i = 0; i < _entries.length(); i++) {
const ZForwardingEntry entry = at(&i);
- if (entry.is_empty()) {
+ if (!entry.populated()) {
// Skip empty entries
continue;
}
--- a/src/hotspot/share/gc/z/zForwarding.inline.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zForwarding.inline.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -119,9 +119,9 @@
inline ZForwardingEntry ZForwarding::find(uintptr_t from_index, ZForwardingCursor* cursor) const {
// Reading entries in the table races with the atomic CAS done for
// insertion into the table. This is safe because each entry is at
- // most updated once (from -1 to something else).
+ // most updated once (from zero to something else).
ZForwardingEntry entry = first(from_index, cursor);
- while (!entry.is_empty()) {
+ while (entry.populated()) {
if (entry.from_index() == from_index) {
// Match found, return matching entry
return entry;
@@ -140,14 +140,14 @@
for (;;) {
const ZForwardingEntry prev_entry = Atomic::cmpxchg(new_entry, entries() + *cursor, old_entry);
- if (prev_entry.is_empty()) {
+ if (!prev_entry.populated()) {
// Success
return to_offset;
}
// Find next empty or matching entry
ZForwardingEntry entry = at(cursor);
- while (!entry.is_empty()) {
+ while (entry.populated()) {
if (entry.from_index() == from_index) {
// Match found, return already inserted address
return entry.to_offset();
--- a/src/hotspot/share/gc/z/zForwardingEntry.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zForwardingEntry.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -32,40 +32,40 @@
// Forwarding entry layout
// -----------------------
//
-// 6 4 4 0
-// 3 2 1 0
-// +------------------------+-----------------------------------------------+
-// |11111111 11111111 111111|11 11111111 11111111 11111111 11111111 11111111|
-// +------------------------+-----------------------------------------------+
-// | |
-// | * 41-0 To Object Offset (42-bits)
+// 6 4 4
+// 3 6 5 1 0
+// +--------------------+--------------------------------------------------+-+
+// |11111111 11111111 11|111111 11111111 11111111 11111111 11111111 1111111|1|
+// +--------------------+--------------------------------------------------+-+
+// | | |
+// | | 0-0 Populated Flag (1-bits) *
+// | |
+// | * 45-1 To Object Offset (45-bits)
// |
-// * 63-42 From Object Index (22-bits)
+// * 63-46 From Object Index (18-bits)
//
class ZForwardingEntry {
friend struct PrimitiveConversions;
private:
- typedef ZBitField<uint64_t, size_t, 0, 42> field_to_offset;
- typedef ZBitField<uint64_t, size_t, 42, 22> field_from_index;
+ typedef ZBitField<uint64_t, bool, 0, 1> field_populated;
+ typedef ZBitField<uint64_t, size_t, 1, 45> field_to_offset;
+ typedef ZBitField<uint64_t, size_t, 46, 18> field_from_index;
uint64_t _entry;
- static uintptr_t empty() {
- return (uintptr_t)-1;
- }
-
public:
ZForwardingEntry() :
- _entry(empty()) {}
+ _entry(0) {}
ZForwardingEntry(size_t from_index, size_t to_offset) :
- _entry(field_from_index::encode(from_index) |
- field_to_offset::encode(to_offset)) {}
+ _entry(field_populated::encode(true) |
+ field_to_offset::encode(to_offset) |
+ field_from_index::encode(from_index)) {}
- bool is_empty() const {
- return _entry == empty();
+ bool populated() const {
+ return field_populated::decode(_entry);
}
size_t to_offset() const {
--- a/src/hotspot/share/gc/z/zHeap.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zHeap.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -540,16 +540,19 @@
class ZVerifyRootsTask : public ZTask {
private:
+ ZStatTimerDisable _disable;
ZRootsIterator _strong_roots;
ZWeakRootsIterator _weak_roots;
public:
ZVerifyRootsTask() :
ZTask("ZVerifyRootsTask"),
+ _disable(),
_strong_roots(),
_weak_roots() {}
virtual void work() {
+ ZStatTimerDisable disable;
ZVerifyOopClosure cl;
_strong_roots.oops_do(&cl);
_weak_roots.oops_do(&cl);
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -28,6 +28,7 @@
#include "gc/z/zHeapIterator.hpp"
#include "gc/z/zOop.inline.hpp"
#include "gc/z/zRootsIterator.hpp"
+#include "gc/z/zStat.hpp"
#include "memory/iterator.inline.hpp"
#include "utilities/bitMap.inline.hpp"
#include "utilities/stack.inline.hpp"
@@ -170,6 +171,7 @@
// If we didn't do this the application would have expected to see
// ObjectFree events for phantom reachable objects in the tag map.
+ ZStatTimerDisable disable;
ZHeapIteratorRootOopClosure root_cl(this);
// Push strong roots onto stack
--- a/src/hotspot/share/gc/z/zNMethodTableEntry.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zNMethodTableEntry.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -37,13 +37,11 @@
// |11111111 11111111 11111111 11111111 11111111 11111111 11111111 111111|1|1|
// +---------------------------------------------------------------------+-+-+
// | | |
-// | | |
-// | | |
// | 1-1 Unregistered Flag (1-bits) * |
// | |
// | 0-0 Registered Flag (1-bits) *
// |
-// * 63-3 NMethod Address (61-bits)
+// * 63-2 NMethod Address (62-bits)
//
class nmethod;
--- a/src/hotspot/share/gc/z/zObjectAllocator.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -186,10 +186,6 @@
ZAllocationFlags flags;
flags.set_no_reserve();
- if (!ZStallOnOutOfMemory) {
- flags.set_non_blocking();
- }
-
return alloc_object(size, flags);
}
--- a/src/hotspot/share/gc/z/zRelocate.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zRelocate.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -88,7 +88,7 @@
// Lookup forwarding entry
const ZForwardingEntry entry = forwarding->find(from_index, &cursor);
- if (entry.from_index() == from_index) {
+ if (entry.populated() && entry.from_index() == from_index) {
// Already relocated, return new address
return entry.to_offset();
}
@@ -150,7 +150,9 @@
const uintptr_t from_index = (from_offset - forwarding->start()) >> forwarding->object_alignment_shift();
const ZForwardingEntry entry = forwarding->find(from_index);
+ assert(entry.populated(), "Should be forwarded");
assert(entry.from_index() == from_index, "Should be forwarded");
+
return ZAddress::good(entry.to_offset());
}
--- a/src/hotspot/share/gc/z/zRelocationSetSelector.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -103,6 +103,7 @@
const size_t npages = _registered_pages.size();
size_t selected_from = 0;
size_t selected_to = 0;
+ size_t selected_from_size = 0;
size_t from_size = 0;
semi_sort();
@@ -127,6 +128,7 @@
if (diff_reclaimable > ZFragmentationLimit) {
selected_from = from;
selected_to = to;
+ selected_from_size = from_size;
}
log_trace(gc, reloc)("Candidate Relocation Set (%s Pages): "
@@ -138,7 +140,7 @@
_nselected = selected_from;
// Update statistics
- _relocating = from_size;
+ _relocating = selected_from_size;
for (size_t i = _nselected; i < npages; i++) {
ZPage* const page = _sorted_pages[i];
_fragmentation += page->size() - page->live_bytes();
--- a/src/hotspot/share/gc/z/zStat.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zStat.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -749,6 +749,11 @@
}
//
+// Stat timer
+//
+__thread uint32_t ZStatTimerDisable::_active = 0;
+
+//
// Stat sample/inc
//
void ZStatSample(const ZStatSampler& sampler, uint64_t value, bool trace) {
--- a/src/hotspot/share/gc/z/zStat.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/zStat.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -269,21 +269,45 @@
//
// Stat timer
//
+class ZStatTimerDisable : public StackObj {
+private:
+ static __thread uint32_t _active;
+
+public:
+ ZStatTimerDisable() {
+ _active++;
+ }
+
+ ~ZStatTimerDisable() {
+ _active--;
+ }
+
+ static bool is_active() {
+ return _active > 0;
+ }
+};
+
class ZStatTimer : public StackObj {
private:
+ const bool _enabled;
const ZStatPhase& _phase;
const Ticks _start;
public:
ZStatTimer(const ZStatPhase& phase) :
+ _enabled(!ZStatTimerDisable::is_active()),
_phase(phase),
_start(Ticks::now()) {
- _phase.register_start(_start);
+ if (_enabled) {
+ _phase.register_start(_start);
+ }
}
~ZStatTimer() {
- const Ticks end = Ticks::now();
- _phase.register_end(_start, end);
+ if (_enabled) {
+ const Ticks end = Ticks::now();
+ _phase.register_end(_start, end);
+ }
}
};
--- a/src/hotspot/share/gc/z/z_globals.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/gc/z/z_globals.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -39,28 +39,24 @@
constraint, \
writeable) \
\
- product(ccstr, ZPath, NULL, \
+ experimental(ccstr, ZPath, NULL, \
"Filesystem path for Java heap backing storage " \
"(must be a tmpfs or a hugetlbfs filesystem)") \
\
- product(double, ZAllocationSpikeTolerance, 2.0, \
+ experimental(double, ZAllocationSpikeTolerance, 2.0, \
"Allocation spike tolerance factor") \
\
- product(double, ZFragmentationLimit, 25.0, \
+ experimental(double, ZFragmentationLimit, 25.0, \
"Maximum allowed heap fragmentation") \
\
- product(bool, ZStallOnOutOfMemory, true, \
- "Allow Java threads to stall and wait for GC to complete " \
- "instead of immediately throwing an OutOfMemoryError") \
- \
- product(size_t, ZMarkStackSpaceLimit, 8*G, \
+ experimental(size_t, ZMarkStackSpaceLimit, 8*G, \
"Maximum number of bytes allocated for mark stacks") \
range(32*M, 1024*G) \
\
- product(uint, ZCollectionInterval, 0, \
+ experimental(uint, ZCollectionInterval, 0, \
"Force GC at a fixed time interval (in seconds)") \
\
- product(uint, ZStatisticsInterval, 10, \
+ diagnostic(uint, ZStatisticsInterval, 10, \
"Time between statistics print outs (in seconds)") \
range(1, (uint)-1) \
\
--- a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,13 +46,9 @@
return _chunkstate != NULL;
}
-static fio_fd open_existing(const char* path) {
- return os::open(path, O_RDWR, S_IREAD | S_IWRITE);
-}
-
static fio_fd open_chunk(const char* path) {
assert(JfrStream_lock->owned_by_self(), "invariant");
- return path != NULL ? open_existing(path) : invalid_fd;
+ return path != NULL ? os::open(path, O_CREAT | O_RDWR, S_IREAD | S_IWRITE) : invalid_fd;
}
bool JfrChunkWriter::open() {
--- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -24,17 +24,315 @@
#include "precompiled.hpp"
#include "jfr/jfrEvents.hpp"
+#include "jfr/jni/jfrJavaSupport.hpp"
#include "jfr/leakprofiler/leakProfiler.hpp"
#include "jfr/recorder/repository/jfrEmergencyDump.hpp"
#include "jfr/recorder/service/jfrPostBox.hpp"
#include "jfr/recorder/service/jfrRecorderService.hpp"
#include "jfr/utilities/jfrTypes.hpp"
+#include "logging/log.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/globals.hpp"
#include "runtime/mutexLocker.hpp"
-#include "runtime/thread.hpp"
+#include "runtime/os.hpp"
+#include "runtime/thread.inline.hpp"
+#include "utilities/growableArray.hpp"
+
+static const char vm_error_filename_fmt[] = "hs_err_pid%p.jfr";
+static const char vm_oom_filename_fmt[] = "hs_oom_pid%p.jfr";
+static const char vm_soe_filename_fmt[] = "hs_soe_pid%p.jfr";
+static const char chunk_file_jfr_ext[] = ".jfr";
+static const size_t iso8601_len = 19; // "YYYY-MM-DDTHH:MM:SS"
+
+static fio_fd open_exclusivly(const char* path) {
+ return os::open(path, O_CREAT | O_RDWR, S_IREAD | S_IWRITE);
+}
+
+static int file_sort(const char** const file1, const char** file2) {
+ assert(NULL != *file1 && NULL != *file2, "invariant");
+ int cmp = strncmp(*file1, *file2, iso8601_len);
+ if (0 == cmp) {
+ const char* const dot1 = strchr(*file1, '.');
+ assert(NULL != dot1, "invariant");
+ const char* const dot2 = strchr(*file2, '.');
+ assert(NULL != dot2, "invariant");
+ ptrdiff_t file1_len = dot1 - *file1;
+ ptrdiff_t file2_len = dot2 - *file2;
+ if (file1_len < file2_len) {
+ return -1;
+ }
+ if (file1_len > file2_len) {
+ return 1;
+ }
+ assert(file1_len == file2_len, "invariant");
+ cmp = strncmp(*file1, *file2, file1_len);
+ }
+ assert(cmp != 0, "invariant");
+ return cmp;
+}
+
+static void iso8601_to_date_time(char* iso8601_str) {
+ assert(iso8601_str != NULL, "invariant");
+ assert(strlen(iso8601_str) == iso8601_len, "invariant");
+ // "YYYY-MM-DDTHH:MM:SS"
+ for (size_t i = 0; i < iso8601_len; ++i) {
+ switch (iso8601_str[i]) {
+ case 'T':
+ case '-':
+ case ':':
+ iso8601_str[i] = '_';
+ break;
+ }
+ }
+ // "YYYY_MM_DD_HH_MM_SS"
+}
+
+static void date_time(char* buffer, size_t buffer_len) {
+ assert(buffer != NULL, "invariant");
+ assert(buffer_len >= iso8601_len, "buffer too small");
+ os::iso8601_time(buffer, buffer_len);
+ assert(strlen(buffer) >= iso8601_len + 1, "invariant");
+ // "YYYY-MM-DDTHH:MM:SS"
+ buffer[iso8601_len] = '\0';
+ iso8601_to_date_time(buffer);
+}
+
+static int64_t file_size(fio_fd fd) {
+ assert(fd != invalid_fd, "invariant");
+ const int64_t current_offset = os::current_file_offset(fd);
+ const int64_t size = os::lseek(fd, 0, SEEK_END);
+ os::seek_to_file_offset(fd, current_offset);
+ return size;
+}
+
+class RepositoryIterator : public StackObj {
+ private:
+ const char* const _repo;
+ const size_t _repository_len;
+ GrowableArray<const char*>* _files;
+ const char* const fully_qualified(const char* entry) const;
+ mutable int _iterator;
+
+ public:
+ RepositoryIterator(const char* repository, size_t repository_len);
+ ~RepositoryIterator() {}
+ const char* const filter(const char* entry) const;
+ bool has_next() const;
+ const char* const next() const;
+};
+
+const char* const RepositoryIterator::fully_qualified(const char* entry) const {
+ assert(NULL != entry, "invariant");
+ char* file_path_entry = NULL;
+ // only use files that have content, not placeholders
+ const char* const file_separator = os::file_separator();
+ if (NULL != file_separator) {
+ const size_t entry_len = strlen(entry);
+ const size_t file_separator_length = strlen(file_separator);
+ const size_t file_path_entry_length = _repository_len + file_separator_length + entry_len;
+ file_path_entry = NEW_RESOURCE_ARRAY_RETURN_NULL(char, file_path_entry_length + 1);
+ if (NULL == file_path_entry) {
+ return NULL;
+ }
+ int position = 0;
+ position += jio_snprintf(&file_path_entry[position], _repository_len + 1, "%s", _repo);
+ position += jio_snprintf(&file_path_entry[position], file_separator_length + 1, "%s", os::file_separator());
+ position += jio_snprintf(&file_path_entry[position], entry_len + 1, "%s", entry);
+ file_path_entry[position] = '\0';
+ assert((size_t)position == file_path_entry_length, "invariant");
+ assert(strlen(file_path_entry) == (size_t)position, "invariant");
+ }
+ return file_path_entry;
+}
+
+const char* const RepositoryIterator::filter(const char* entry) const {
+ if (entry == NULL) {
+ return NULL;
+ }
+ const size_t entry_len = strlen(entry);
+ if (entry_len <= 2) {
+ // for "." and ".."
+ return NULL;
+ }
+ char* entry_name = NEW_RESOURCE_ARRAY_RETURN_NULL(char, entry_len + 1);
+ if (entry_name == NULL) {
+ return NULL;
+ }
+ strncpy(entry_name, entry, entry_len + 1);
+ const char* const fully_qualified_path_entry = fully_qualified(entry_name);
+ if (NULL == fully_qualified_path_entry) {
+ return NULL;
+ }
+ const fio_fd entry_fd = open_exclusivly(fully_qualified_path_entry);
+ if (invalid_fd == entry_fd) {
+ return NULL;
+ }
+ const int64_t entry_size = file_size(entry_fd);
+ os::close(entry_fd);
+ if (0 == entry_size) {
+ return NULL;
+ }
+ return entry_name;
+}
+
+RepositoryIterator::RepositoryIterator(const char* repository, size_t repository_len) :
+ _repo(repository),
+ _repository_len(repository_len),
+ _files(NULL),
+ _iterator(0) {
+ if (NULL != _repo) {
+ assert(strlen(_repo) == _repository_len, "invariant");
+ _files = new GrowableArray<const char*>(10);
+ DIR* dirp = os::opendir(_repo);
+ if (dirp == NULL) {
+ log_error(jfr, system)("Unable to open repository %s", _repo);
+ return;
+ }
+ struct dirent* dentry;
+ while ((dentry = os::readdir(dirp)) != NULL) {
+ const char* const entry_path = filter(dentry->d_name);
+ if (NULL != entry_path) {
+ _files->append(entry_path);
+ }
+ }
+ os::closedir(dirp);
+ if (_files->length() > 1) {
+ _files->sort(file_sort);
+ }
+ }
+}
+
+bool RepositoryIterator::has_next() const {
+ return (_files != NULL && _iterator < _files->length());
+}
+
+const char* const RepositoryIterator::next() const {
+ return _iterator >= _files->length() ? NULL : fully_qualified(_files->at(_iterator++));
+}
+
+static void write_emergency_file(fio_fd emergency_fd, const RepositoryIterator& iterator) {
+ assert(emergency_fd != invalid_fd, "invariant");
+ const size_t size_of_file_copy_block = 1 * M; // 1 mb
+ jbyte* const file_copy_block = NEW_RESOURCE_ARRAY_RETURN_NULL(jbyte, size_of_file_copy_block);
+ if (file_copy_block == NULL) {
+ return;
+ }
+ while (iterator.has_next()) {
+ fio_fd current_fd = invalid_fd;
+ const char* const fqn = iterator.next();
+ if (fqn != NULL) {
+ current_fd = open_exclusivly(fqn);
+ if (current_fd != invalid_fd) {
+ const int64_t current_filesize = file_size(current_fd);
+ assert(current_filesize > 0, "invariant");
+ int64_t bytes_read = 0;
+ int64_t bytes_written = 0;
+ while (bytes_read < current_filesize) {
+ const ssize_t read_result = os::read_at(current_fd, file_copy_block, size_of_file_copy_block, bytes_read);
+ if (-1 == read_result) {
+ log_info(jfr)( // For user, should not be "jfr, system"
+ "Unable to recover JFR data");
+ break;
+ }
+ bytes_read += (int64_t)read_result;
+ assert(bytes_read - bytes_written <= (int64_t)size_of_file_copy_block, "invariant");
+ bytes_written += (int64_t)os::write(emergency_fd, file_copy_block, bytes_read - bytes_written);
+ assert(bytes_read == bytes_written, "invariant");
+ }
+ os::close(current_fd);
+ }
+ }
+ }
+}
+
+static const char* create_emergency_dump_path() {
+ assert(JfrStream_lock->owned_by_self(), "invariant");
+ char* buffer = NEW_RESOURCE_ARRAY_RETURN_NULL(char, JVM_MAXPATHLEN);
+ if (NULL == buffer) {
+ return NULL;
+ }
+ const char* const cwd = os::get_current_directory(buffer, JVM_MAXPATHLEN);
+ if (NULL == cwd) {
+ return NULL;
+ }
+ size_t pos = strlen(cwd);
+ const int fsep_len = jio_snprintf(&buffer[pos], JVM_MAXPATHLEN - pos, "%s", os::file_separator());
+ const char* filename_fmt = NULL;
+ // fetch specific error cause
+ switch (JfrJavaSupport::cause()) {
+ case JfrJavaSupport::OUT_OF_MEMORY:
+ filename_fmt = vm_oom_filename_fmt;
+ break;
+ case JfrJavaSupport::STACK_OVERFLOW:
+ filename_fmt = vm_soe_filename_fmt;
+ break;
+ default:
+ filename_fmt = vm_error_filename_fmt;
+ }
+ char* emergency_dump_path = NULL;
+ pos += fsep_len;
+ if (Arguments::copy_expand_pid(filename_fmt, strlen(filename_fmt), &buffer[pos], JVM_MAXPATHLEN - pos)) {
+ const size_t emergency_filename_length = strlen(buffer);
+ emergency_dump_path = NEW_RESOURCE_ARRAY_RETURN_NULL(char, emergency_filename_length + 1);
+ if (NULL == emergency_dump_path) {
+ return NULL;
+ }
+ strncpy(emergency_dump_path, buffer, emergency_filename_length + 1);
+ }
+ if (emergency_dump_path != NULL) {
+ log_info(jfr)( // For user, should not be "jfr, system"
+ "Attempting to recover JFR data, emergency jfr file: %s", emergency_dump_path);
+ }
+ return emergency_dump_path;
+}
+
+// Caller needs ResourceMark
+static const char* create_emergency_chunk_path(const char* repository_path) {
+ assert(repository_path != NULL, "invariant");
+ assert(JfrStream_lock->owned_by_self(), "invariant");
+ const size_t repository_path_len = strlen(repository_path);
+ // date time
+ char date_time_buffer[32] = { 0 };
+ date_time(date_time_buffer, sizeof(date_time_buffer));
+ size_t date_time_len = strlen(date_time_buffer);
+ size_t chunkname_max_len = repository_path_len // repository_base_path
+ + 1 // "/"
+ + date_time_len // date_time
+ + strlen(chunk_file_jfr_ext) // .jfr
+ + 1;
+ char* chunk_path = NEW_RESOURCE_ARRAY_RETURN_NULL(char, chunkname_max_len);
+ if (chunk_path == NULL) {
+ return NULL;
+ }
+ // append the individual substrings
+ jio_snprintf(chunk_path, chunkname_max_len, "%s%s%s%s", repository_path_len, os::file_separator(), date_time_buffer, chunk_file_jfr_ext);
+ return chunk_path;
+}
+
+static fio_fd emergency_dump_file_descriptor() {
+ assert(JfrStream_lock->owned_by_self(), "invariant");
+ ResourceMark rm;
+ const char* const emergency_dump_path = create_emergency_dump_path();
+ return emergency_dump_path != NULL ? open_exclusivly(emergency_dump_path) : invalid_fd;
+}
+
+const char* JfrEmergencyDump::build_dump_path(const char* repository_path) {
+ return repository_path == NULL ? create_emergency_dump_path() : create_emergency_chunk_path(repository_path);
+}
+
+void JfrEmergencyDump::on_vm_error(const char* repository_path) {
+ assert(repository_path != NULL, "invariant");
+ ResourceMark rm;
+ MutexLockerEx stream_lock(JfrStream_lock, Mutex::_no_safepoint_check_flag);
+ const fio_fd emergency_fd = emergency_dump_file_descriptor();
+ if (emergency_fd != invalid_fd) {
+ RepositoryIterator iterator(repository_path, strlen(repository_path));
+ write_emergency_file(emergency_fd, iterator);
+ os::close(emergency_fd);
+ }
+}
/*
* We are just about to exit the VM, so we will be very aggressive
--- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -33,6 +33,8 @@
class JfrEmergencyDump : AllStatic {
public:
static void on_vm_shutdown(bool exception_handler);
+ static void on_vm_error(const char* repository_path);
+ static const char* build_dump_path(const char* repository_path);
};
#endif // SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP
--- a/src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -28,12 +28,11 @@
#include "jfr/recorder/jfrRecorder.hpp"
#include "jfr/recorder/repository/jfrChunkState.hpp"
#include "jfr/recorder/repository/jfrChunkWriter.hpp"
+#include "jfr/recorder/repository/jfrEmergencyDump.hpp"
#include "jfr/recorder/repository/jfrRepository.hpp"
#include "jfr/recorder/service/jfrPostBox.hpp"
-#include "logging/log.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/mutex.hpp"
-#include "runtime/os.hpp"
#include "runtime/thread.inline.hpp"
static JfrRepository* _instance = NULL;
@@ -84,321 +83,13 @@
_instance = NULL;
}
-static const char vm_error_filename_fmt[] = "hs_err_pid%p.jfr";
-static const char vm_oom_filename_fmt[] = "hs_oom_pid%p.jfr";
-static const char vm_soe_filename_fmt[] = "hs_soe_pid%p.jfr";
-static const char chunk_file_jfr_ext[] = ".jfr";
-static const size_t iso8601_len = 19; // "YYYY-MM-DDTHH:MM:SS"
-
-static fio_fd open_exclusivly(const char* path) {
- return os::open(path, O_CREAT | O_WRONLY, S_IREAD | S_IWRITE);
-}
-
-static fio_fd open_existing(const char* path) {
- return os::open(path, O_RDWR, S_IREAD | S_IWRITE);
-}
-
-static int file_sort(const char** const file1, const char** file2) {
- assert(NULL != *file1 && NULL != *file2, "invariant");
- int cmp = strncmp(*file1, *file2, iso8601_len);
- if (0 == cmp) {
- const char* const dot1 = strchr(*file1, '.');
- assert(NULL != dot1, "invariant");
- const char* const dot2 = strchr(*file2, '.');
- assert(NULL != dot2, "invariant");
- ptrdiff_t file1_len = dot1 - *file1;
- ptrdiff_t file2_len = dot2 - *file2;
- if (file1_len < file2_len) {
- return -1;
- }
- if (file1_len > file2_len) {
- return 1;
- }
- assert(file1_len == file2_len, "invariant");
- cmp = strncmp(*file1, *file2, file1_len);
- }
- assert(cmp != 0, "invariant");
- return cmp;
-}
-
-static void iso8601_to_date_time(char* iso8601_str) {
- assert(iso8601_str != NULL, "invariant");
- assert(strlen(iso8601_str) == iso8601_len, "invariant");
- // "YYYY-MM-DDTHH:MM:SS"
- for (size_t i = 0; i < iso8601_len; ++i) {
- switch(iso8601_str[i]) {
- case 'T' :
- case '-' :
- case ':' :
- iso8601_str[i] = '_';
- break;
- }
- }
- // "YYYY_MM_DD_HH_MM_SS"
-}
-
-static void date_time(char* buffer, size_t buffer_len) {
- assert(buffer != NULL, "invariant");
- assert(buffer_len >= iso8601_len, "buffer too small");
- os::iso8601_time(buffer, buffer_len);
- assert(strlen(buffer) >= iso8601_len + 1, "invariant");
- // "YYYY-MM-DDTHH:MM:SS"
- buffer[iso8601_len] = '\0';
- iso8601_to_date_time(buffer);
-}
-
-static int64_t file_size(fio_fd fd) {
- assert(fd != invalid_fd, "invariant");
- const int64_t current_offset = os::current_file_offset(fd);
- const int64_t size = os::lseek(fd, 0, SEEK_END);
- os::seek_to_file_offset(fd, current_offset);
- return size;
-}
-
-class RepositoryIterator : public StackObj {
- private:
- const char* const _repo;
- const size_t _repository_len;
- GrowableArray<const char*>* _files;
- const char* const fully_qualified(const char* entry) const;
- mutable int _iterator;
-
- public:
- RepositoryIterator(const char* repository, size_t repository_len);
- ~RepositoryIterator() {}
- debug_only(void print_repository_files() const;)
- const char* const filter(const char* entry) const;
- bool has_next() const;
- const char* const next() const;
-};
-
-const char* const RepositoryIterator::fully_qualified(const char* entry) const {
- assert(NULL != entry, "invariant");
- char* file_path_entry = NULL;
- // only use files that have content, not placeholders
- const char* const file_separator = os::file_separator();
- if (NULL != file_separator) {
- const size_t entry_len = strlen(entry);
- const size_t file_separator_length = strlen(file_separator);
- const size_t file_path_entry_length = _repository_len + file_separator_length + entry_len;
- file_path_entry = NEW_RESOURCE_ARRAY_RETURN_NULL(char, file_path_entry_length + 1);
- if (NULL == file_path_entry) {
- return NULL;
- }
- int position = 0;
- position += jio_snprintf(&file_path_entry[position], _repository_len + 1, "%s", _repo);
- position += jio_snprintf(&file_path_entry[position], file_separator_length + 1, "%s", os::file_separator());
- position += jio_snprintf(&file_path_entry[position], entry_len + 1, "%s", entry);
- file_path_entry[position] = '\0';
- assert((size_t)position == file_path_entry_length, "invariant");
- assert(strlen(file_path_entry) == (size_t)position, "invariant");
- }
- return file_path_entry;
-}
-
-const char* const RepositoryIterator::filter(const char* entry) const {
- if (entry == NULL) {
- return NULL;
- }
- const size_t entry_len = strlen(entry);
- if (entry_len <= 2) {
- // for "." and ".."
- return NULL;
- }
- char* entry_name = NEW_RESOURCE_ARRAY_RETURN_NULL(char, entry_len + 1);
- if (entry_name == NULL) {
- return NULL;
- }
- strncpy(entry_name, entry, entry_len + 1);
- const char* const fully_qualified_path_entry = fully_qualified(entry_name);
- if (NULL == fully_qualified_path_entry) {
- return NULL;
- }
- const fio_fd entry_fd = open_existing(fully_qualified_path_entry);
- if (invalid_fd == entry_fd) {
- return NULL;
- }
- const int64_t entry_size = file_size(entry_fd);
- os::close(entry_fd);
- if (0 == entry_size) {
- return NULL;
- }
- return entry_name;
-}
-
-RepositoryIterator::RepositoryIterator(const char* repository, size_t repository_len) :
- _repo(repository),
- _repository_len(repository_len),
- _files(NULL),
- _iterator(0) {
- if (NULL != _repo) {
- assert(strlen(_repo) == _repository_len, "invariant");
- _files = new GrowableArray<const char*>(10);
- DIR* dirp = os::opendir(_repo);
- if (dirp == NULL) {
- log_error(jfr, system)("Unable to open repository %s", _repo);
- return;
- }
- struct dirent* dentry;
- while ((dentry = os::readdir(dirp)) != NULL) {
- const char* const entry_path = filter(dentry->d_name);
- if (NULL != entry_path) {
- _files->append(entry_path);
- }
- }
- os::closedir(dirp);
- if (_files->length() > 1) {
- _files->sort(file_sort);
- }
- }
-}
-
-#ifdef ASSERT
-void RepositoryIterator::print_repository_files() const {
- while (has_next()) {
- log_error(jfr, system)( "%s", next());
- }
-}
-#endif
-
-bool RepositoryIterator::has_next() const {
- return (_files != NULL && _iterator < _files->length());
-}
-
-const char* const RepositoryIterator::next() const {
- return _iterator >= _files->length() ? NULL : fully_qualified(_files->at(_iterator++));
-}
-
-static void write_emergency_file(fio_fd emergency_fd, const RepositoryIterator& iterator) {
- assert(emergency_fd != invalid_fd, "invariant");
- const size_t size_of_file_copy_block = 1 * M; // 1 mb
- jbyte* const file_copy_block = NEW_RESOURCE_ARRAY_RETURN_NULL(jbyte, size_of_file_copy_block);
- if (file_copy_block == NULL) {
- return;
- }
- int64_t bytes_written_total = 0;
- while (iterator.has_next()) {
- fio_fd current_fd = invalid_fd;
- const char* const fqn = iterator.next();
- if (fqn != NULL) {
- current_fd = open_existing(fqn);
- if (current_fd != invalid_fd) {
- const int64_t current_filesize = file_size(current_fd);
- assert(current_filesize > 0, "invariant");
- int64_t bytes_read = 0;
- int64_t bytes_written = 0;
- while (bytes_read < current_filesize) {
- const ssize_t read_result = os::read_at(current_fd, file_copy_block, size_of_file_copy_block, bytes_read);
- if (-1 == read_result) {
- log_info(jfr) ( // For user, should not be "jfr, system"
- "Unable to recover JFR data");
- break;
- }
- bytes_read += (int64_t)read_result;
- assert(bytes_read - bytes_written <= (int64_t)size_of_file_copy_block, "invariant");
- bytes_written += (int64_t)os::write(emergency_fd, file_copy_block, bytes_read - bytes_written);
- assert(bytes_read == bytes_written, "invariant");
- }
- os::close(current_fd);
- bytes_written_total += bytes_written;
- }
- }
- }
-}
-
-static const char* create_emergency_dump_path() {
- assert(JfrStream_lock->owned_by_self(), "invariant");
- char* buffer = NEW_RESOURCE_ARRAY_RETURN_NULL(char, O_BUFLEN);
- if (NULL == buffer) {
- return NULL;
- }
- const char* const cwd = os::get_current_directory(buffer, O_BUFLEN);
- if (NULL == cwd) {
- return NULL;
- }
- size_t pos = strlen(cwd);
- const int fsep_len = jio_snprintf(&buffer[pos], O_BUFLEN - pos, "%s", os::file_separator());
- const char* filename_fmt = NULL;
- // fetch specific error cause
- switch (JfrJavaSupport::cause()) {
- case JfrJavaSupport::OUT_OF_MEMORY:
- filename_fmt = vm_oom_filename_fmt;
- break;
- case JfrJavaSupport::STACK_OVERFLOW:
- filename_fmt = vm_soe_filename_fmt;
- break;
- default:
- filename_fmt = vm_error_filename_fmt;
- }
- char* emergency_dump_path = NULL;
- pos += fsep_len;
- if (Arguments::copy_expand_pid(filename_fmt, strlen(filename_fmt), &buffer[pos], O_BUFLEN - pos)) {
- const size_t emergency_filename_length = strlen(buffer);
- emergency_dump_path = NEW_RESOURCE_ARRAY_RETURN_NULL(char, emergency_filename_length + 1);
- if (NULL == emergency_dump_path) {
- return NULL;
- }
- strncpy(emergency_dump_path, buffer, emergency_filename_length + 1);
- }
- return emergency_dump_path;
-}
-
-// Caller needs ResourceMark
-static const char* create_emergency_chunk_path(const char* repository_base, size_t repository_len) {
- assert(repository_base != NULL, "invariant");
- assert(JfrStream_lock->owned_by_self(), "invariant");
- // date time
- char date_time_buffer[32] = {0};
- date_time(date_time_buffer, sizeof(date_time_buffer));
- size_t date_time_len = strlen(date_time_buffer);
- size_t chunkname_max_len = repository_len // repository_base
- + 1 // "/"
- + date_time_len // date_time
- + strlen(chunk_file_jfr_ext) // .jfr
- + 1;
- char* chunk_path = NEW_RESOURCE_ARRAY_RETURN_NULL(char, chunkname_max_len);
- if (chunk_path == NULL) {
- return NULL;
- }
- // append the individual substrings
- jio_snprintf(chunk_path, chunkname_max_len, "%s%s%s%s", repository_base, os::file_separator(), date_time_buffer, chunk_file_jfr_ext);
- return chunk_path;
-}
-
-static fio_fd emergency_dump_file() {
- assert(JfrStream_lock->owned_by_self(), "invariant");
- ResourceMark rm;
- const char* const emergency_dump_path = create_emergency_dump_path();
- if (emergency_dump_path == NULL) {
- return invalid_fd;
- }
- const fio_fd fd = open_exclusivly(emergency_dump_path);
- if (fd != invalid_fd) {
- log_info(jfr)( // For user, should not be "jfr, system"
- "Attempting to recover JFR data, emergency jfr file: %s", emergency_dump_path);
- }
- return fd;
-}
-
-static const char* emergency_path(const char* repository, size_t repository_len) {
- return repository == NULL ? create_emergency_dump_path() : create_emergency_chunk_path(repository, repository_len);
-}
-
void JfrRepository::on_vm_error() {
assert(!JfrStream_lock->owned_by_self(), "invariant");
- const char* path = _path;
- if (path == NULL) {
+ if (_path == NULL) {
// completed already
return;
}
- ResourceMark rm;
- MutexLockerEx stream_lock(JfrStream_lock, Mutex::_no_safepoint_check_flag);
- const fio_fd emergency_fd = emergency_dump_file();
- if (emergency_fd != invalid_fd) {
- RepositoryIterator iterator(path, strlen(path));
- write_emergency_file(emergency_fd, iterator);
- os::close(emergency_fd);
- }
+ JfrEmergencyDump::on_vm_error(_path);
}
bool JfrRepository::set_path(const char* path) {
@@ -467,10 +158,7 @@
assert(JfrStream_lock->owned_by_self(), "invariant");
if (vm_error) {
ResourceMark rm;
- const char* repository_path = _path;
- const size_t repository_path_len = repository_path != NULL ? strlen(repository_path) : 0;
- const char* const path = emergency_path(repository_path, repository_path_len);
- _chunkwriter->set_chunk_path(path);
+ _chunkwriter->set_chunk_path(JfrEmergencyDump::build_dump_path(_path));
}
return _chunkwriter->open();
}
--- a/src/hotspot/share/memory/filemap.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/memory/filemap.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -24,7 +24,9 @@
#include "precompiled.hpp"
#include "jvm.h"
+#include "classfile/classFileStream.hpp"
#include "classfile/classLoader.inline.hpp"
+#include "classfile/classLoaderData.inline.hpp"
#include "classfile/classLoaderExt.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionaryShared.hpp"
@@ -1489,7 +1491,7 @@
return ent;
}
-ClassFileStream* FileMapInfo::open_stream_for_jvmti(InstanceKlass* ik, TRAPS) {
+ClassFileStream* FileMapInfo::open_stream_for_jvmti(InstanceKlass* ik, Handle class_loader, TRAPS) {
int path_index = ik->shared_classpath_index();
assert(path_index >= 0, "should be called for shared built-in classes only");
assert(path_index < (int)_shared_path_table_size, "sanity");
@@ -1501,7 +1503,12 @@
const char* const class_name = name->as_C_string();
const char* const file_name = ClassLoader::file_name_for_class_name(class_name,
name->utf8_length());
- return cpe->open_stream(file_name, THREAD);
+ ClassLoaderData* loader_data = ClassLoaderData::class_loader_data(class_loader());
+ ClassFileStream* cfs = cpe->open_stream_for_loader(file_name, loader_data, THREAD);
+ assert(cfs != NULL, "must be able to read the classfile data of shared classes for built-in loaders.");
+ log_debug(cds, jvmti)("classfile data for %s [%d: %s] = %d bytes", class_name, path_index,
+ cfs->source(), cfs->length());
+ return cfs;
}
#endif
--- a/src/hotspot/share/memory/filemap.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/memory/filemap.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -303,7 +303,7 @@
static void update_shared_classpath(ClassPathEntry *cpe, SharedClassPathEntry* ent, TRAPS);
#if INCLUDE_JVMTI
- static ClassFileStream* open_stream_for_jvmti(InstanceKlass* ik, TRAPS);
+ static ClassFileStream* open_stream_for_jvmti(InstanceKlass* ik, Handle class_loader, TRAPS);
#endif
static SharedClassPathEntry* shared_path(int index) {
--- a/src/hotspot/share/memory/heapInspection.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/memory/heapInspection.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -121,6 +121,11 @@
}
KlassInfoEntry* KlassInfoBucket::lookup(Klass* const k) {
+ // Can happen if k is an archived class that we haven't loaded yet.
+ if (k->java_mirror() == NULL) {
+ return NULL;
+ }
+
KlassInfoEntry* elt = _list;
while (elt != NULL) {
if (elt->is_equal(k)) {
@@ -202,7 +207,8 @@
assert(_buckets != NULL, "Allocation failure should have been caught");
KlassInfoEntry* e = _buckets[idx].lookup(k);
// Lookup may fail if this is a new klass for which we
- // could not allocate space for an new entry.
+ // could not allocate space for an new entry, or if it's
+ // an archived class that we haven't loaded yet.
assert(e == NULL || k == e->klass(), "must be equal");
return e;
}
--- a/src/hotspot/share/memory/heapShared.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/memory/heapShared.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -68,6 +68,7 @@
{"java/lang/Byte$ByteCache", "archivedCache"},
{"java/lang/Short$ShortCache", "archivedCache"},
{"java/lang/Character$CharacterCache", "archivedCache"},
+ {"java/util/jar/Attributes$Name", "KNOWN_NAMES"},
};
// Entry fields for subgraphs archived in the open archive heap region.
static ArchivableStaticFieldInfo open_archive_subgraph_entry_fields[] = {
--- a/src/hotspot/share/memory/metaspace.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/memory/metaspace.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -534,6 +534,23 @@
}
}
+static void print_basic_switches(outputStream* out, size_t scale) {
+ out->print("MaxMetaspaceSize: ");
+ if (MaxMetaspaceSize >= (max_uintx) - (2 * os::vm_page_size())) {
+ // aka "very big". Default is max_uintx, but due to rounding in arg parsing the real
+ // value is smaller.
+ out->print("unlimited");
+ } else {
+ print_human_readable_size(out, MaxMetaspaceSize, scale);
+ }
+ out->cr();
+ if (Metaspace::using_class_space()) {
+ out->print("CompressedClassSpaceSize: ");
+ print_human_readable_size(out, CompressedClassSpaceSize, scale);
+ }
+ out->cr();
+}
+
// This will print out a basic metaspace usage report but
// unlike print_report() is guaranteed not to lock or to walk the CLDG.
void MetaspaceUtils::print_basic_report(outputStream* out, size_t scale) {
@@ -614,6 +631,12 @@
Metaspace::chunk_manager_metadata()->free_chunks_total_bytes(), scale);
out->cr();
}
+
+ out->cr();
+
+ // Print basic settings
+ print_basic_switches(out, scale);
+
out->cr();
}
@@ -805,19 +828,11 @@
// Print some interesting settings
out->cr();
out->cr();
- out->print("MaxMetaspaceSize: ");
- print_human_readable_size(out, MaxMetaspaceSize, scale);
+ print_basic_switches(out, scale);
+
out->cr();
out->print("InitialBootClassLoaderMetaspaceSize: ");
print_human_readable_size(out, InitialBootClassLoaderMetaspaceSize, scale);
- out->cr();
-
- out->print("UseCompressedClassPointers: %s", UseCompressedClassPointers ? "true" : "false");
- out->cr();
- if (Metaspace::using_class_space()) {
- out->print("CompressedClassSpaceSize: ");
- print_human_readable_size(out, CompressedClassSpaceSize, scale);
- }
out->cr();
out->cr();
--- a/src/hotspot/share/memory/metaspaceShared.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/memory/metaspaceShared.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -36,6 +36,7 @@
#include "classfile/systemDictionary.hpp"
#include "classfile/systemDictionaryShared.hpp"
#include "code/codeCache.hpp"
+#include "gc/shared/softRefPolicy.hpp"
#include "interpreter/bytecodeStream.hpp"
#include "interpreter/bytecodes.hpp"
#include "logging/log.hpp"
--- a/src/hotspot/share/memory/oopFactory.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/memory/oopFactory.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
#include "oops/oop.inline.hpp"
#include "oops/typeArrayOop.inline.hpp"
#include "runtime/handles.inline.hpp"
+#include "utilities/utf8.hpp"
typeArrayOop oopFactory::new_charArray(const char* utf8_str, TRAPS) {
--- a/src/hotspot/share/oops/arrayKlass.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/oops/arrayKlass.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.hpp"
+#include "classfile/moduleEntry.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
--- a/src/hotspot/share/oops/instanceKlass.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/oops/instanceKlass.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -2438,6 +2438,23 @@
return (old_state != is_in_error_state());
}
+void InstanceKlass::set_class_loader_type(s2 loader_type) {
+ switch (loader_type) {
+ case ClassLoader::BOOT_LOADER:
+ _misc_flags |= _misc_is_shared_boot_class;
+ break;
+ case ClassLoader::PLATFORM_LOADER:
+ _misc_flags |= _misc_is_shared_platform_class;
+ break;
+ case ClassLoader::APP_LOADER:
+ _misc_flags |= _misc_is_shared_app_class;
+ break;
+ default:
+ ShouldNotReachHere();
+ break;
+ }
+}
+
#if INCLUDE_JVMTI
static void clear_all_breakpoints(Method* m) {
m->clear_all_breakpoints();
@@ -3367,7 +3384,9 @@
if (cfs != NULL) {
if (cfs->source() != NULL) {
if (module_name != NULL) {
- if (ClassLoader::is_modules_image(cfs->source())) {
+ // When the boot loader created the stream, it didn't know the module name
+ // yet. Let's format it now.
+ if (cfs->from_boot_loader_modules_image()) {
info_stream.print(" source: jrt:/%s", module_name);
} else {
info_stream.print(" source: %s", cfs->source());
--- a/src/hotspot/share/oops/instanceKlass.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/oops/instanceKlass.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -25,10 +25,7 @@
#ifndef SHARE_OOPS_INSTANCEKLASS_HPP
#define SHARE_OOPS_INSTANCEKLASS_HPP
-#include "classfile/classLoader.hpp"
#include "classfile/classLoaderData.hpp"
-#include "classfile/moduleEntry.hpp"
-#include "classfile/packageEntry.hpp"
#include "memory/referenceType.hpp"
#include "oops/annotations.hpp"
#include "oops/constMethod.hpp"
@@ -63,6 +60,7 @@
class BreakpointInfo;
#endif
class ClassFileParser;
+class ClassFileStream;
class KlassDepChange;
class DependencyContext;
class fieldDescriptor;
@@ -70,9 +68,10 @@
class JNIid;
class JvmtiCachedClassFieldMap;
class nmethodBucket;
-class SuperTypeClosure;
class OopMapCache;
class InterpreterOopMap;
+class PackageEntry;
+class ModuleEntry;
// This is used in iterators below.
class FieldClosure: public StackObj {
@@ -349,22 +348,7 @@
_misc_flags &= ~loader_type_bits();
}
- void set_class_loader_type(s2 loader_type) {
- switch (loader_type) {
- case ClassLoader::BOOT_LOADER:
- _misc_flags |= _misc_is_shared_boot_class;
- break;
- case ClassLoader::PLATFORM_LOADER:
- _misc_flags |= _misc_is_shared_platform_class;
- break;
- case ClassLoader::APP_LOADER:
- _misc_flags |= _misc_is_shared_app_class;
- break;
- default:
- ShouldNotReachHere();
- break;
- }
- }
+ void set_class_loader_type(s2 loader_type);
bool has_nonstatic_fields() const {
return (_misc_flags & _misc_has_nonstatic_fields) != 0;
@@ -1025,7 +1009,6 @@
void methods_do(void f(Method* method));
void array_klasses_do(void f(Klass* k));
void array_klasses_do(void f(Klass* k, TRAPS), TRAPS);
- bool super_types_do(SuperTypeClosure* blk);
static InstanceKlass* cast(Klass* k) {
return const_cast<InstanceKlass*>(cast(const_cast<const Klass*>(k)));
--- a/src/hotspot/share/oops/klass.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/oops/klass.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -27,6 +27,7 @@
#include "classfile/classLoaderDataGraph.inline.hpp"
#include "classfile/dictionary.hpp"
#include "classfile/javaClasses.hpp"
+#include "classfile/moduleEntry.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
--- a/src/hotspot/share/oops/markOop.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/oops/markOop.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -138,23 +138,15 @@
epoch_mask_in_place = epoch_mask << epoch_shift,
cms_mask = right_n_bits(cms_bits),
cms_mask_in_place = cms_mask << cms_shift
-#ifndef _WIN64
- ,hash_mask = right_n_bits(hash_bits),
- hash_mask_in_place = (address_word)hash_mask << hash_shift
-#endif
};
+ const static uintptr_t hash_mask = right_n_bits(hash_bits);
+ const static uintptr_t hash_mask_in_place = hash_mask << hash_shift;
+
// Alignment of JavaThread pointers encoded in object header required by biased locking
enum { biased_lock_alignment = 2 << (epoch_shift + epoch_bits)
};
-#ifdef _WIN64
- // These values are too big for Win64
- const static uintptr_t hash_mask = right_n_bits(hash_bits);
- const static uintptr_t hash_mask_in_place =
- (address_word)hash_mask << hash_shift;
-#endif
-
enum { locked_value = 0,
unlocked_value = 1,
monitor_value = 2,
--- a/src/hotspot/share/oops/symbol.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/oops/symbol.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -34,6 +34,7 @@
#include "oops/symbol.hpp"
#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
+#include "utilities/utf8.hpp"
uint32_t Symbol::pack_length_and_refcount(int length, int refcount) {
STATIC_ASSERT(max_symbol_length == ((1 << 16) - 1));
--- a/src/hotspot/share/oops/symbol.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/oops/symbol.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -28,7 +28,6 @@
#include "memory/allocation.hpp"
#include "utilities/exceptions.hpp"
#include "utilities/macros.hpp"
-#include "utilities/utf8.hpp"
// A Symbol is a canonicalized string.
// All Symbols reside in global SymbolTable and are reference counted.
--- a/src/hotspot/share/opto/callnode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/callnode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -49,7 +49,7 @@
//=============================================================================
uint StartNode::size_of() const { return sizeof(*this); }
-uint StartNode::cmp( const Node &n ) const
+bool StartNode::cmp( const Node &n ) const
{ return _domain == ((StartNode&)n)._domain; }
const Type *StartNode::bottom_type() const { return _domain; }
const Type* StartNode::Value(PhaseGVN* phase) const { return _domain; }
@@ -666,7 +666,7 @@
}
//=============================================================================
-uint CallNode::cmp( const Node &n ) const
+bool CallNode::cmp( const Node &n ) const
{ return _tf == ((CallNode&)n)._tf && _jvms == ((CallNode&)n)._jvms; }
#ifndef PRODUCT
void CallNode::dump_req(outputStream *st) const {
@@ -962,7 +962,7 @@
//=============================================================================
uint CallJavaNode::size_of() const { return sizeof(*this); }
-uint CallJavaNode::cmp( const Node &n ) const {
+bool CallJavaNode::cmp( const Node &n ) const {
CallJavaNode &call = (CallJavaNode&)n;
return CallNode::cmp(call) && _method == call._method &&
_override_symbolic_info == call._override_symbolic_info;
@@ -999,7 +999,7 @@
//=============================================================================
uint CallStaticJavaNode::size_of() const { return sizeof(*this); }
-uint CallStaticJavaNode::cmp( const Node &n ) const {
+bool CallStaticJavaNode::cmp( const Node &n ) const {
CallStaticJavaNode &call = (CallStaticJavaNode&)n;
return CallJavaNode::cmp(call);
}
@@ -1056,7 +1056,7 @@
//=============================================================================
uint CallDynamicJavaNode::size_of() const { return sizeof(*this); }
-uint CallDynamicJavaNode::cmp( const Node &n ) const {
+bool CallDynamicJavaNode::cmp( const Node &n ) const {
CallDynamicJavaNode &call = (CallDynamicJavaNode&)n;
return CallJavaNode::cmp(call);
}
@@ -1069,7 +1069,7 @@
//=============================================================================
uint CallRuntimeNode::size_of() const { return sizeof(*this); }
-uint CallRuntimeNode::cmp( const Node &n ) const {
+bool CallRuntimeNode::cmp( const Node &n ) const {
CallRuntimeNode &call = (CallRuntimeNode&)n;
return CallNode::cmp(call) && !strcmp(_name,call._name);
}
@@ -1118,7 +1118,7 @@
}
uint SafePointNode::size_of() const { return sizeof(*this); }
-uint SafePointNode::cmp( const Node &n ) const {
+bool SafePointNode::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
@@ -1314,7 +1314,7 @@
// Do not allow value-numbering for SafePointScalarObject node.
uint SafePointScalarObjectNode::hash() const { return NO_HASH; }
-uint SafePointScalarObjectNode::cmp( const Node &n ) const {
+bool SafePointScalarObjectNode::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
@@ -2084,4 +2084,3 @@
return true;
}
-
--- a/src/hotspot/share/opto/callnode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/callnode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -63,7 +63,7 @@
//------------------------------StartNode--------------------------------------
// The method start node
class StartNode : public MultiNode {
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
public:
const TypeTuple *_domain;
@@ -321,7 +321,7 @@
// potential code sharing) only - conceptually it is independent of
// the Node semantics.
class SafePointNode : public MultiNode {
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
public:
@@ -497,7 +497,7 @@
DEBUG_ONLY(AllocateNode* _alloc;)
virtual uint hash() const ; // { return NO_HASH; }
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
uint first_index() const { return _first_index; }
@@ -598,7 +598,7 @@
virtual const Type* Value(PhaseGVN* phase) const;
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
virtual Node* Identity(PhaseGVN* phase) { return this; }
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const = 0;
virtual void calling_convention( BasicType* sig_bt, VMRegPair *parm_regs, uint argcnt ) const;
virtual Node *match( const ProjNode *proj, const Matcher *m );
@@ -654,7 +654,7 @@
class CallJavaNode : public CallNode {
friend class VMStructs;
protected:
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
bool _optimized_virtual;
@@ -696,7 +696,7 @@
// calls and optimized virtual calls, plus calls to wrappers for run-time
// routines); generates static stub.
class CallStaticJavaNode : public CallJavaNode {
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
public:
CallStaticJavaNode(Compile* C, const TypeFunc* tf, address addr, ciMethod* method, int bci)
@@ -750,7 +750,7 @@
//------------------------------CallDynamicJavaNode----------------------------
// Make a dispatched call using Java calling convention.
class CallDynamicJavaNode : public CallJavaNode {
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
public:
CallDynamicJavaNode( const TypeFunc *tf , address addr, ciMethod* method, int vtable_index, int bci ) : CallJavaNode(tf,addr,method,bci), _vtable_index(vtable_index) {
@@ -767,7 +767,7 @@
//------------------------------CallRuntimeNode--------------------------------
// Make a direct subroutine call node into compiled C++ code.
class CallRuntimeNode : public CallNode {
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
public:
CallRuntimeNode(const TypeFunc* tf, address addr, const char* name,
--- a/src/hotspot/share/opto/castnode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/castnode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -81,7 +81,7 @@
return (in(0) && remove_dead_region(phase, can_reshape)) ? this : NULL;
}
-uint ConstraintCastNode::cmp(const Node &n) const {
+bool ConstraintCastNode::cmp(const Node &n) const {
return TypeNode::cmp(n) && ((ConstraintCastNode&)n)._carry_dependency == _carry_dependency;
}
@@ -262,7 +262,7 @@
return NULL;
}
-uint CastIINode::cmp(const Node &n) const {
+bool CastIINode::cmp(const Node &n) const {
return ConstraintCastNode::cmp(n) && ((CastIINode&)n)._range_check_dependency == _range_check_dependency;
}
--- a/src/hotspot/share/opto/castnode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/castnode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -35,7 +35,7 @@
protected:
// Can this node be removed post CCP or does it carry a required dependency?
const bool _carry_dependency;
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const;
public:
@@ -65,7 +65,7 @@
protected:
// Is this node dependent on a range check?
const bool _range_check_dependency;
- virtual uint cmp(const Node &n) const;
+ virtual bool cmp(const Node &n) const;
virtual uint size_of() const;
public:
--- a/src/hotspot/share/opto/cfgnode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/cfgnode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -883,7 +883,7 @@
const Type* at = _adr_type;
return TypeNode::hash() + (at ? at->hash() : 0);
}
-uint PhiNode::cmp( const Node &n ) const {
+bool PhiNode::cmp( const Node &n ) const {
return TypeNode::cmp(n) && _adr_type == ((PhiNode&)n)._adr_type;
}
static inline
@@ -2353,7 +2353,7 @@
//=============================================================================
uint PCTableNode::hash() const { return Node::hash() + _size; }
-uint PCTableNode::cmp( const Node &n ) const
+bool PCTableNode::cmp( const Node &n ) const
{ return _size == ((PCTableNode&)n)._size; }
const Type *PCTableNode::bottom_type() const {
@@ -2383,7 +2383,7 @@
return Node::hash() + _dest_bci;
}
-uint JumpProjNode::cmp( const Node &n ) const {
+bool JumpProjNode::cmp( const Node &n ) const {
return ProjNode::cmp(n) &&
_dest_bci == ((JumpProjNode&)n)._dest_bci;
}
@@ -2446,7 +2446,7 @@
}
-uint CatchProjNode::cmp( const Node &n ) const {
+bool CatchProjNode::cmp( const Node &n ) const {
return ProjNode::cmp(n) &&
_handler_bci == ((CatchProjNode&)n)._handler_bci;
}
--- a/src/hotspot/share/opto/cfgnode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/cfgnode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -131,7 +131,7 @@
const int _inst_offset; // Offset of the instance memory slice.
// Size is bigger to hold the _adr_type field.
virtual uint hash() const; // Check the type
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const { return sizeof(*this); }
// Determine if CMoveNode::is_cmove_id can be used at this join point.
@@ -465,7 +465,7 @@
// Undefined behavior if passed-in index is not inside the table.
class PCTableNode : public MultiBranchNode {
virtual uint hash() const; // Target count; table size
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const { return sizeof(*this); }
public:
@@ -507,7 +507,7 @@
class JumpProjNode : public JProjNode {
virtual uint hash() const;
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const { return sizeof(*this); }
private:
@@ -550,7 +550,7 @@
// the projection doesn't lead to an exception handler.
class CatchProjNode : public CProjNode {
virtual uint hash() const;
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const { return sizeof(*this); }
private:
--- a/src/hotspot/share/opto/graphKit.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/graphKit.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -2450,6 +2450,8 @@
Node* parm2, Node* parm3,
Node* parm4, Node* parm5,
Node* parm6, Node* parm7) {
+ assert(call_addr != NULL, "must not call NULL targets");
+
// Slow-path call
bool is_leaf = !(flags & RC_NO_LEAF);
bool has_io = (!is_leaf && !(flags & RC_NO_IO));
--- a/src/hotspot/share/opto/library_call.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/library_call.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -6353,6 +6353,9 @@
}
if (state == NULL) return false;
+ assert(stubAddr != NULL, "Stub is generated");
+ if (stubAddr == NULL) return false;
+
// Call the stub.
Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::sha_implCompress_Type(),
stubAddr, stubName, TypePtr::BOTTOM,
@@ -6425,6 +6428,9 @@
fatal("unknown SHA intrinsic predicate: %d", predicate);
}
if (klass_SHA_name != NULL) {
+ assert(stub_addr != NULL, "Stub is generated");
+ if (stub_addr == NULL) return false;
+
// get DigestBase klass to lookup for SHA klass
const TypeInstPtr* tinst = _gvn.type(digestBase_obj)->isa_instptr();
assert(tinst != NULL, "digestBase_obj is not instance???");
--- a/src/hotspot/share/opto/locknode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/locknode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -55,7 +55,7 @@
}
//------------------------------cmp--------------------------------------------
-uint BoxLockNode::cmp( const Node &n ) const {
+bool BoxLockNode::cmp( const Node &n ) const {
if (EliminateNestedLocks)
return (&n == this); // Always fail except on self
const BoxLockNode &bn = (const BoxLockNode &)n;
@@ -139,7 +139,7 @@
uint FastLockNode::size_of() const { return sizeof(*this); }
//------------------------------cmp--------------------------------------------
-uint FastLockNode::cmp( const Node &n ) const {
+bool FastLockNode::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
@@ -148,7 +148,7 @@
uint FastUnlockNode::hash() const { return NO_HASH; }
//------------------------------cmp--------------------------------------------
-uint FastUnlockNode::cmp( const Node &n ) const {
+bool FastUnlockNode::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
--- a/src/hotspot/share/opto/locknode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/locknode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -47,7 +47,7 @@
virtual const RegMask &out_RegMask() const;
virtual uint size_of() const;
virtual uint hash() const;
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual const class Type *bottom_type() const { return TypeRawPtr::BOTTOM; }
virtual uint ideal_reg() const { return Op_RegP; }
@@ -94,7 +94,7 @@
// LockNode/UnLockNode to avoid creating Phi's.
virtual uint hash() const ; // { return NO_HASH; }
virtual uint size_of() const;
- virtual uint cmp( const Node &n ) const ; // Always fail, except on self
+ virtual bool cmp( const Node &n ) const ; // Always fail, except on self
virtual int Opcode() const;
virtual const Type* Value(PhaseGVN* phase) const { return TypeInt::CC; }
const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;}
@@ -121,7 +121,7 @@
// FastLock and FastUnlockNode do not hash, we need one for each correspoding
// LockNode/UnLockNode to avoid creating Phi's.
virtual uint hash() const ; // { return NO_HASH; }
- virtual uint cmp( const Node &n ) const ; // Always fail, except on self
+ virtual bool cmp( const Node &n ) const ; // Always fail, except on self
virtual int Opcode() const;
virtual const Type* Value(PhaseGVN* phase) const { return TypeInt::CC; }
const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;}
--- a/src/hotspot/share/opto/machnode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/machnode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -93,7 +93,7 @@
//------------------------------cmp--------------------------------------------
// Print any per-operand special info
-uint MachOper::cmp( const MachOper &oper ) const {
+bool MachOper::cmp( const MachOper &oper ) const {
ShouldNotCallThis();
return opcode() == oper.opcode();
}
@@ -106,7 +106,7 @@
//------------------------------cmp--------------------------------------------
// Print any per-operand special info
-uint labelOper::cmp( const MachOper &oper ) const {
+bool labelOper::cmp( const MachOper &oper ) const {
return (opcode() == oper.opcode()) && (_label == oper.label());
}
@@ -118,7 +118,7 @@
//------------------------------cmp--------------------------------------------
// Print any per-operand special info
-uint methodOper::cmp( const MachOper &oper ) const {
+bool methodOper::cmp( const MachOper &oper ) const {
return (opcode() == oper.opcode()) && (_method == oper.method());
}
@@ -167,15 +167,15 @@
}
//-----------------------------cmp---------------------------------------------
-uint MachNode::cmp( const Node &node ) const {
+bool MachNode::cmp( const Node &node ) const {
MachNode& n = *((Node&)node).as_Mach();
uint no = num_opnds();
- if( no != n.num_opnds() ) return 0;
- if( rule() != n.rule() ) return 0;
+ if( no != n.num_opnds() ) return false;
+ if( rule() != n.rule() ) return false;
for( uint i=0; i<no; i++ ) // All operands must match
if( !_opnds[i]->cmp( *n._opnds[i] ) )
- return 0; // mis-matched operands
- return 1; // match
+ return false; // mis-matched operands
+ return true; // match
}
// Return an equivalent instruction using memory for cisc_operand position
@@ -651,7 +651,7 @@
//=============================================================================
-uint MachCallNode::cmp( const Node &n ) const
+bool MachCallNode::cmp( const Node &n ) const
{ return _tf == ((MachCallNode&)n)._tf; }
const Type *MachCallNode::bottom_type() const { return tf()->range(); }
const Type* MachCallNode::Value(PhaseGVN* phase) const { return tf()->range(); }
@@ -707,7 +707,7 @@
//=============================================================================
uint MachCallJavaNode::size_of() const { return sizeof(*this); }
-uint MachCallJavaNode::cmp( const Node &n ) const {
+bool MachCallJavaNode::cmp( const Node &n ) const {
MachCallJavaNode &call = (MachCallJavaNode&)n;
return MachCallNode::cmp(call) && _method->equals(call._method) &&
_override_symbolic_info == call._override_symbolic_info;
@@ -745,7 +745,7 @@
//=============================================================================
uint MachCallStaticJavaNode::size_of() const { return sizeof(*this); }
-uint MachCallStaticJavaNode::cmp( const Node &n ) const {
+bool MachCallStaticJavaNode::cmp( const Node &n ) const {
MachCallStaticJavaNode &call = (MachCallStaticJavaNode&)n;
return MachCallJavaNode::cmp(call) && _name == call._name;
}
@@ -791,7 +791,7 @@
#endif
//=============================================================================
uint MachCallRuntimeNode::size_of() const { return sizeof(*this); }
-uint MachCallRuntimeNode::cmp( const Node &n ) const {
+bool MachCallRuntimeNode::cmp( const Node &n ) const {
MachCallRuntimeNode &call = (MachCallRuntimeNode&)n;
return MachCallNode::cmp(call) && !strcmp(_name,call._name);
}
--- a/src/hotspot/share/opto/machnode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/machnode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -161,7 +161,7 @@
// Hash and compare over operands are currently identical
virtual uint hash() const;
- virtual uint cmp( const MachOper &oper ) const;
+ virtual bool cmp( const MachOper &oper ) const;
// Virtual clone, since I do not know how big the MachOper is.
virtual MachOper *clone() const = 0;
@@ -292,7 +292,7 @@
// Hash and compare over operands. Used to do GVN on machine Nodes.
virtual uint hash() const;
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
// Expand method for MachNode, replaces nodes representing pseudo
// instructions with a set of nodes which represent real machine
@@ -861,7 +861,7 @@
class MachCallNode : public MachSafePointNode {
protected:
virtual uint hash() const { return NO_HASH; } // CFG nodes do not hash
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const = 0; // Size is bigger
public:
const TypeFunc *_tf; // Function type
@@ -904,7 +904,7 @@
// "Base" class for machine-specific versions of subroutine calls
class MachCallJavaNode : public MachCallNode {
protected:
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
public:
ciMethod* _method; // Method being direct called
@@ -937,7 +937,7 @@
//------------------------------MachCallStaticJavaNode------------------------
// Machine-specific versions of monomorphic subroutine calls
class MachCallStaticJavaNode : public MachCallJavaNode {
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
public:
const char *_name; // Runtime wrapper name
@@ -973,7 +973,7 @@
//------------------------------MachCallRuntimeNode----------------------------
// Machine-specific versions of subroutine calls
class MachCallRuntimeNode : public MachCallNode {
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
public:
const char *_name; // Printable name, if _method is NULL
@@ -1066,7 +1066,7 @@
virtual uint opcode() const;
virtual uint hash() const;
- virtual uint cmp( const MachOper &oper ) const;
+ virtual bool cmp( const MachOper &oper ) const;
#ifndef PRODUCT
virtual const char *Name() const { return "Label";}
@@ -1093,7 +1093,7 @@
virtual uint opcode() const;
virtual uint hash() const;
- virtual uint cmp( const MachOper &oper ) const;
+ virtual bool cmp( const MachOper &oper ) const;
#ifndef PRODUCT
virtual const char *Name() const { return "Method";}
--- a/src/hotspot/share/opto/matcher.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/matcher.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -416,14 +416,20 @@
return rms;
}
-//---------------------------init_first_stack_mask-----------------------------
+#define NOF_STACK_MASKS (3*6+5)
+
// Create the initial stack mask used by values spilling to the stack.
// Disallow any debug info in outgoing argument areas by setting the
// initial mask accordingly.
void Matcher::init_first_stack_mask() {
// Allocate storage for spill masks as masks for the appropriate load type.
- RegMask *rms = (RegMask*)C->comp_arena()->Amalloc_D(sizeof(RegMask) * (3*6+5));
+ RegMask *rms = (RegMask*)C->comp_arena()->Amalloc_D(sizeof(RegMask) * NOF_STACK_MASKS);
+
+ // Initialize empty placeholder masks into the newly allocated arena
+ for (int i = 0; i < NOF_STACK_MASKS; i++) {
+ new (rms + i) RegMask();
+ }
idealreg2spillmask [Op_RegN] = &rms[0];
idealreg2spillmask [Op_RegI] = &rms[1];
--- a/src/hotspot/share/opto/memnode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/memnode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -758,7 +758,7 @@
return true;
}
uint LoadNode::size_of() const { return sizeof(*this); }
-uint LoadNode::cmp( const Node &n ) const
+bool LoadNode::cmp( const Node &n ) const
{ return !Type::cmp( _type, ((LoadNode&)n)._type ); }
const Type *LoadNode::bottom_type() const { return _type; }
uint LoadNode::ideal_reg() const {
@@ -2627,7 +2627,7 @@
//------------------------------cmp--------------------------------------------
// Do not common stores up together. They generally have to be split
// back up anyways, so do not bother.
-uint StoreNode::cmp( const Node &n ) const {
+bool StoreNode::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
@@ -3057,7 +3057,7 @@
//------------------------------cmp--------------------------------------------
uint MemBarNode::hash() const { return NO_HASH; }
-uint MemBarNode::cmp( const Node &n ) const {
+bool MemBarNode::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
@@ -4438,7 +4438,7 @@
//------------------------------cmp--------------------------------------------
uint MergeMemNode::hash() const { return NO_HASH; }
-uint MergeMemNode::cmp( const Node &n ) const {
+bool MergeMemNode::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
--- a/src/hotspot/share/opto/memnode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/memnode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -183,7 +183,7 @@
const MemOrd _mo;
protected:
- virtual uint cmp(const Node &n) const;
+ virtual bool cmp(const Node &n) const;
virtual uint size_of() const; // Size is bigger
// Should LoadNode::Ideal() attempt to remove control edges?
virtual bool can_remove_control() const;
@@ -373,7 +373,7 @@
// Load a long from memory
class LoadLNode : public LoadNode {
virtual uint hash() const { return LoadNode::hash() + _require_atomic_access; }
- virtual uint cmp( const Node &n ) const {
+ virtual bool cmp( const Node &n ) const {
return _require_atomic_access == ((LoadLNode&)n)._require_atomic_access
&& LoadNode::cmp(n);
}
@@ -425,7 +425,7 @@
// Load a double (64 bits) from memory
class LoadDNode : public LoadNode {
virtual uint hash() const { return LoadNode::hash() + _require_atomic_access; }
- virtual uint cmp( const Node &n ) const {
+ virtual bool cmp( const Node &n ) const {
return _require_atomic_access == ((LoadDNode&)n)._require_atomic_access
&& LoadNode::cmp(n);
}
@@ -535,7 +535,7 @@
// Needed for proper cloning.
virtual uint size_of() const { return sizeof(*this); }
protected:
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual bool depends_only_on_test() const { return false; }
Node *Ideal_masked_input (PhaseGVN *phase, uint mask);
@@ -650,7 +650,7 @@
// Store long to memory
class StoreLNode : public StoreNode {
virtual uint hash() const { return StoreNode::hash() + _require_atomic_access; }
- virtual uint cmp( const Node &n ) const {
+ virtual bool cmp( const Node &n ) const {
return _require_atomic_access == ((StoreLNode&)n)._require_atomic_access
&& StoreNode::cmp(n);
}
@@ -686,7 +686,7 @@
// Store double to memory
class StoreDNode : public StoreNode {
virtual uint hash() const { return StoreNode::hash() + _require_atomic_access; }
- virtual uint cmp( const Node &n ) const {
+ virtual bool cmp( const Node &n ) const {
return _require_atomic_access == ((StoreDNode&)n)._require_atomic_access
&& StoreNode::cmp(n);
}
@@ -746,7 +746,7 @@
class StoreCMNode : public StoreNode {
private:
virtual uint hash() const { return StoreNode::hash() + _oop_alias_idx; }
- virtual uint cmp( const Node &n ) const {
+ virtual bool cmp( const Node &n ) const {
return _oop_alias_idx == ((StoreCMNode&)n)._oop_alias_idx
&& StoreNode::cmp(n);
}
@@ -1142,7 +1142,7 @@
// separate it from any following volatile-load.
class MemBarNode: public MultiNode {
virtual uint hash() const ; // { return NO_HASH; }
- virtual uint cmp( const Node &n ) const ; // Always fail, except on self
+ virtual bool cmp( const Node &n ) const ; // Always fail, except on self
virtual uint size_of() const { return sizeof(*this); }
// Memory type this node is serializing. Usually either rawptr or bottom.
@@ -1399,7 +1399,7 @@
// (See comment in memnode.cpp near MergeMemNode::MergeMemNode for semantics.)
class MergeMemNode: public Node {
virtual uint hash() const ; // { return NO_HASH; }
- virtual uint cmp( const Node &n ) const ; // Always fail, except on self
+ virtual bool cmp( const Node &n ) const ; // Always fail, except on self
friend class MergeMemStream;
MergeMemNode(Node* def); // clients use MergeMemNode::make
--- a/src/hotspot/share/opto/multnode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/multnode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -76,7 +76,7 @@
// only one input
return (uintptr_t)in(TypeFunc::Control) + (_con << 1) + (_is_io_use ? 1 : 0);
}
-uint ProjNode::cmp( const Node &n ) const { return _con == ((ProjNode&)n)._con && ((ProjNode&)n)._is_io_use == _is_io_use; }
+bool ProjNode::cmp( const Node &n ) const { return _con == ((ProjNode&)n)._con && ((ProjNode&)n)._is_io_use == _is_io_use; }
uint ProjNode::size_of() const { return sizeof(ProjNode); }
// Test if we propagate interesting control along this projection
--- a/src/hotspot/share/opto/multnode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/multnode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -58,7 +58,7 @@
class ProjNode : public Node {
protected:
virtual uint hash() const;
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const;
void check_con() const; // Called from constructor.
const Type* proj_type(const Type* t) const;
--- a/src/hotspot/share/opto/node.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/node.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1433,8 +1433,8 @@
//------------------------------cmp--------------------------------------------
// Compare special parts of simple Nodes
-uint Node::cmp( const Node &n ) const {
- return 1; // Must be same
+bool Node::cmp( const Node &n ) const {
+ return true; // Must be same
}
//------------------------------rematerialize-----------------------------------
@@ -2452,7 +2452,7 @@
uint TypeNode::hash() const {
return Node::hash() + _type->hash();
}
-uint TypeNode::cmp( const Node &n ) const
+bool TypeNode::cmp( const Node &n ) const
{ return !Type::cmp( _type, ((TypeNode&)n)._type ); }
const Type *TypeNode::bottom_type() const { return _type; }
const Type* TypeNode::Value(PhaseGVN* phase) const { return _type; }
--- a/src/hotspot/share/opto/node.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/node.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -1003,7 +1003,7 @@
// won't go into the table and we'll lose a little optimization.
enum { NO_HASH = 0 };
virtual uint hash() const;
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
// Operation appears to be iteratively computed (such as an induction variable)
// It is possible for this operation to return false for a loop-varying
@@ -1718,7 +1718,7 @@
class TypeNode : public Node {
protected:
virtual uint hash() const; // Check the type
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
const Type* const _type;
public:
--- a/src/hotspot/share/opto/opaquenode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/opaquenode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -29,7 +29,7 @@
//=============================================================================
// Do not allow value-numbering
uint Opaque1Node::hash() const { return NO_HASH; }
-uint Opaque1Node::cmp( const Node &n ) const {
+bool Opaque1Node::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
@@ -56,7 +56,7 @@
// Do not allow value-numbering
uint Opaque2Node::hash() const { return NO_HASH; }
-uint Opaque2Node::cmp( const Node &n ) const {
+bool Opaque2Node::cmp( const Node &n ) const {
return (&n == this); // Always fail except on self
}
@@ -67,7 +67,7 @@
//=============================================================================
uint ProfileBooleanNode::hash() const { return NO_HASH; }
-uint ProfileBooleanNode::cmp( const Node &n ) const {
+bool ProfileBooleanNode::cmp( const Node &n ) const {
return (&n == this);
}
--- a/src/hotspot/share/opto/opaquenode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/opaquenode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -33,7 +33,7 @@
// Stops value-numbering, Ideal calls or Identity functions.
class Opaque1Node : public Node {
virtual uint hash() const ; // { return NO_HASH; }
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
public:
Opaque1Node(Compile* C, Node *n) : Node(NULL, n) {
// Put it on the Macro nodes list to removed during macro nodes expansion.
@@ -64,7 +64,7 @@
// it's OK to be slightly sloppy on optimizations here.
class Opaque2Node : public Node {
virtual uint hash() const ; // { return NO_HASH; }
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
public:
Opaque2Node( Compile* C, Node *n ) : Node(0,n) {
// Put it on the Macro nodes list to removed during macro nodes expansion.
@@ -117,7 +117,7 @@
bool _consumed;
bool _delay_removal;
virtual uint hash() const ; // { return NO_HASH; }
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
public:
ProfileBooleanNode(Node *n, uint false_cnt, uint true_cnt) : Node(0, n),
_false_cnt(false_cnt), _true_cnt(true_cnt), _consumed(false), _delay_removal(true) {}
--- a/src/hotspot/share/opto/subnode.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/subnode.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1279,7 +1279,7 @@
uint BoolNode::size_of() const { return sizeof(BoolNode); }
//------------------------------operator==-------------------------------------
-uint BoolNode::cmp( const Node &n ) const {
+bool BoolNode::cmp( const Node &n ) const {
const BoolNode *b = (const BoolNode *)&n; // Cast up
return (_test._test == b->_test._test);
}
--- a/src/hotspot/share/opto/subnode.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/opto/subnode.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -300,7 +300,7 @@
// A Node to convert a Condition Codes to a Logical result.
class BoolNode : public Node {
virtual uint hash() const;
- virtual uint cmp( const Node &n ) const;
+ virtual bool cmp( const Node &n ) const;
virtual uint size_of() const;
// Try to optimize signed integer comparison
--- a/src/hotspot/share/prims/jvmtiEnv.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -74,6 +74,7 @@
#include "services/threadService.hpp"
#include "utilities/exceptions.hpp"
#include "utilities/preserveException.hpp"
+#include "utilities/utf8.hpp"
#define FIXLATER 0 // REMOVE this when completed.
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/classLoaderDataGraph.hpp"
+#include "classfile/moduleEntry.hpp"
#include "classfile/systemDictionary.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "memory/resourceArea.hpp"
--- a/src/hotspot/share/prims/jvmtiExport.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/prims/jvmtiExport.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.inline.hpp"
+#include "classfile/moduleEntry.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/nmethod.hpp"
#include "code/pcDesc.hpp"
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -207,7 +207,7 @@
// Mark methods seen on stack and everywhere else so old methods are not
// cleaned up if they're on the stack.
- MetadataOnStackMark md_on_stack(true);
+ MetadataOnStackMark md_on_stack(/*walk_all_metadata*/true, /*redefinition_walk*/true);
HandleMark hm(thread); // make sure any handles created are deleted
// before the stack walk again.
@@ -3842,7 +3842,7 @@
// This is the first redefinition, mark all the nmethods for deoptimization
if (!JvmtiExport::all_dependencies_are_recorded()) {
log_debug(redefine, class, nmethod)("Marked all nmethods for deopt");
- CodeCache::mark_all_nmethods_for_deoptimization();
+ CodeCache::mark_all_nmethods_for_evol_deoptimization();
deopt_needed = true;
} else {
int deopt = CodeCache::mark_dependents_for_evol_deoptimization();
--- a/src/hotspot/share/prims/nativeLookup.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/prims/nativeLookup.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -43,6 +43,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "utilities/macros.hpp"
+#include "utilities/utf8.hpp"
#if INCLUDE_JFR
#include "jfr/jfr.hpp"
#endif
--- a/src/hotspot/share/prims/unsafe.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/prims/unsafe.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -26,6 +26,7 @@
#include "jni.h"
#include "jvm.h"
#include "classfile/classFileStream.hpp"
+#include "classfile/classLoader.hpp"
#include "classfile/vmSymbols.hpp"
#include "jfr/jfrEvents.hpp"
#include "memory/allocation.inline.hpp"
--- a/src/hotspot/share/runtime/arguments.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/arguments.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -2875,6 +2875,20 @@
if (FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true) != JVMFlag::SUCCESS) {
return JNI_EINVAL;
}
+ } else if (match_option(option, "-XX:+ErrorFileToStderr")) {
+ if (FLAG_SET_CMDLINE(bool, ErrorFileToStdout, false) != JVMFlag::SUCCESS) {
+ return JNI_EINVAL;
+ }
+ if (FLAG_SET_CMDLINE(bool, ErrorFileToStderr, true) != JVMFlag::SUCCESS) {
+ return JNI_EINVAL;
+ }
+ } else if (match_option(option, "-XX:+ErrorFileToStdout")) {
+ if (FLAG_SET_CMDLINE(bool, ErrorFileToStderr, false) != JVMFlag::SUCCESS) {
+ return JNI_EINVAL;
+ }
+ if (FLAG_SET_CMDLINE(bool, ErrorFileToStdout, true) != JVMFlag::SUCCESS) {
+ return JNI_EINVAL;
+ }
} else if (match_option(option, "-XX:+ExtendedDTraceProbes")) {
#if defined(DTRACE_ENABLED)
if (FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true) != JVMFlag::SUCCESS) {
--- a/src/hotspot/share/runtime/frame.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/frame.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/moduleEntry.hpp"
#include "code/codeCache.hpp"
#include "code/vmreg.inline.hpp"
#include "compiler/abstractCompiler.hpp"
--- a/src/hotspot/share/runtime/globals.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/globals.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -371,6 +371,10 @@
"Generate a lot of safepoints. This works with " \
"GuaranteedSafepointInterval") \
\
+ diagnostic(bool, HandshakeALot, false, \
+ "Generate a lot of handshakes. This works with " \
+ "GuaranteedSafepointInterval") \
+ \
product_pd(bool, BackgroundCompilation, \
"A thread requesting compilation is not blocked during " \
"compilation") \
@@ -1263,6 +1267,12 @@
product(bool, DisplayVMOutputToStdout, false, \
"If DisplayVMOutput is true, display all VM output to stdout") \
\
+ product(bool, ErrorFileToStderr, false, \
+ "If true, error data is printed to stderr instead of a file") \
+ \
+ product(bool, ErrorFileToStdout, false, \
+ "If true, error data is printed to stdout instead of a file") \
+ \
product(bool, UseHeavyMonitors, false, \
"use heavyweight instead of lightweight Java monitors") \
\
--- a/src/hotspot/share/runtime/handshake.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/handshake.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -281,7 +281,7 @@
void HandshakeState::clear_handshake(JavaThread* target) {
_operation = NULL;
- SafepointMechanism::disarm_local_poll_release(target);
+ SafepointMechanism::disarm_if_needed(target, true /* release */);
}
void HandshakeState::process_self_inner(JavaThread* thread) {
--- a/src/hotspot/share/runtime/init.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/init.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -36,6 +36,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/icache.hpp"
#include "runtime/init.hpp"
+#include "runtime/orderAccess.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/sharedRuntime.hpp"
#include "services/memTracker.hpp"
@@ -186,11 +187,19 @@
static volatile bool _init_completed = false;
bool is_init_completed() {
- return _init_completed;
+ return OrderAccess::load_acquire(&_init_completed);
}
+void wait_init_completed() {
+ MonitorLockerEx ml(InitCompleted_lock, Monitor::_no_safepoint_check_flag);
+ while (!_init_completed) {
+ ml.wait(Monitor::_no_safepoint_check_flag);
+ }
+}
void set_init_completed() {
assert(Universe::is_fully_initialized(), "Should have completed initialization");
- _init_completed = true;
+ MonitorLockerEx ml(InitCompleted_lock, Monitor::_no_safepoint_check_flag);
+ OrderAccess::release_store(&_init_completed, true);
+ ml.notify_all();
}
--- a/src/hotspot/share/runtime/init.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/init.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -40,6 +40,7 @@
void exit_globals(); // call destructors before exit
bool is_init_completed(); // returns true when bootstrapping has completed
+void wait_init_completed(); // wait until set_init_completed() has been called
void set_init_completed(); // set basic init to completed
#endif // SHARE_RUNTIME_INIT_HPP
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -34,6 +34,7 @@
#include "runtime/thread.hpp"
#include "runtime/vmOperations.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/histogram.hpp"
#include "utilities/macros.hpp"
#include "utilities/preserveException.hpp"
@@ -282,6 +283,7 @@
}
~ThreadBlockInVM() {
trans_and_fence(_thread_blocked, _thread_in_vm);
+ OrderAccess::cross_modify_fence();
// We don't need to clear_walkable because it will happen automagically when we return to java
}
};
@@ -336,6 +338,8 @@
_thread->set_thread_state(_thread_in_vm);
CHECK_UNHANDLED_OOPS_ONLY(_thread->clear_unhandled_oops();)
+
+ OrderAccess::cross_modify_fence();
}
};
--- a/src/hotspot/share/runtime/mutex.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/mutex.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -27,8 +27,6 @@
#include "memory/allocation.hpp"
#include "runtime/os.hpp"
-#include "utilities/histogram.hpp"
-
// A Mutex/Monitor is a simple wrapper around a native lock plus condition
// variable that supports lock ownership tracking, lock ranking for deadlock
--- a/src/hotspot/share/runtime/mutexLocker.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/mutexLocker.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -76,6 +76,7 @@
Monitor* SerializePage_lock = NULL;
Monitor* Threads_lock = NULL;
Mutex* NonJavaThreadsList_lock = NULL;
+Mutex* NonJavaThreadsListSync_lock = NULL;
Monitor* CGC_lock = NULL;
Monitor* STS_lock = NULL;
Monitor* FullGCCount_lock = NULL;
@@ -97,6 +98,7 @@
Mutex* DirectivesStack_lock = NULL;
Mutex* MultiArray_lock = NULL;
Monitor* Terminator_lock = NULL;
+Monitor* InitCompleted_lock = NULL;
Monitor* BeforeExit_lock = NULL;
Monitor* Notify_lock = NULL;
Mutex* ProfilePrint_lock = NULL;
@@ -278,11 +280,13 @@
def(Threads_lock , PaddedMonitor, barrier, true, Monitor::_safepoint_check_sometimes);
def(NonJavaThreadsList_lock , PaddedMutex, leaf, true, Monitor::_safepoint_check_never);
+ def(NonJavaThreadsListSync_lock , PaddedMutex, leaf, true, Monitor::_safepoint_check_never);
def(VMOperationQueue_lock , PaddedMonitor, nonleaf, true, Monitor::_safepoint_check_sometimes); // VM_thread allowed to block on these
def(VMOperationRequest_lock , PaddedMonitor, nonleaf, true, Monitor::_safepoint_check_sometimes);
def(RetData_lock , PaddedMutex , nonleaf, false, Monitor::_safepoint_check_always);
def(Terminator_lock , PaddedMonitor, nonleaf, true, Monitor::_safepoint_check_sometimes);
+ def(InitCompleted_lock , PaddedMonitor, leaf, true, Monitor::_safepoint_check_never);
def(VtableStubs_lock , PaddedMutex , nonleaf, true, Monitor::_safepoint_check_never);
def(Notify_lock , PaddedMonitor, nonleaf, true, Monitor::_safepoint_check_always);
def(JNIGlobalAlloc_lock , PaddedMutex , nonleaf, true, Monitor::_safepoint_check_never);
--- a/src/hotspot/share/runtime/mutexLocker.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/mutexLocker.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -72,6 +72,7 @@
extern Monitor* Threads_lock; // a lock on the Threads table of active Java threads
// (also used by Safepoints too to block threads creation/destruction)
extern Mutex* NonJavaThreadsList_lock; // a lock on the NonJavaThreads list
+extern Mutex* NonJavaThreadsListSync_lock; // a lock for NonJavaThreads list synchronization
extern Monitor* CGC_lock; // used for coordination between
// fore- & background GC threads.
extern Monitor* STS_lock; // used for joining/leaving SuspendibleThreadSet.
@@ -96,6 +97,7 @@
extern Mutex* DirectivesStack_lock; // a lock held when mutating the dirstack and ref counting directives
extern Mutex* MultiArray_lock; // a lock used to guard allocation of multi-dim arrays
extern Monitor* Terminator_lock; // a lock used to guard termination of the vm
+extern Monitor* InitCompleted_lock; // a lock used to signal threads waiting on init completed
extern Monitor* BeforeExit_lock; // a lock used to guard cleanups and shutdown hooks
extern Monitor* Notify_lock; // a lock used to synchronize the start-up of the vm
extern Mutex* ProfilePrint_lock; // a lock used to serialize the printing of profiles
--- a/src/hotspot/share/runtime/orderAccess.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/orderAccess.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -266,6 +266,8 @@
static void release();
static void fence();
+ static void cross_modify_fence();
+
template <typename T>
static T load_acquire(const volatile T* p);
--- a/src/hotspot/share/runtime/os.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/os.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -704,12 +704,15 @@
// Wrap memory with guard
GuardedMemory guarded(ptr, size + nmt_header_size);
ptr = guarded.get_user_ptr();
-#endif
+
if ((intptr_t)ptr == (intptr_t)MallocCatchPtr) {
log_warning(malloc, free)("os::malloc caught, " SIZE_FORMAT " bytes --> " PTR_FORMAT, size, p2i(ptr));
breakpoint();
}
- debug_only(if (paranoid) verify_memory(ptr));
+ if (paranoid) {
+ verify_memory(ptr);
+ }
+#endif
// we do not track guard memory
return MemTracker::record_malloc((address)ptr, size, memflags, stack, level);
@@ -760,10 +763,8 @@
// Guard's user data contains NMT header
size_t memblock_size = guarded.get_user_size() - MemTracker::malloc_header_size(memblock);
memcpy(ptr, memblock, MIN2(size, memblock_size));
- if (paranoid) verify_memory(MemTracker::malloc_base(ptr));
- if ((intptr_t)ptr == (intptr_t)MallocCatchPtr) {
- log_warning(malloc, free)("os::realloc caught, " SIZE_FORMAT " bytes --> " PTR_FORMAT, size, p2i(ptr));
- breakpoint();
+ if (paranoid) {
+ verify_memory(MemTracker::malloc_base(ptr));
}
os::free(memblock);
}
--- a/src/hotspot/share/runtime/safepoint.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/safepoint.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -477,7 +477,8 @@
assert(!cur_state->is_running(), "Thread not suspended at safepoint");
cur_state->restart(); // TSS _running
assert(cur_state->is_running(), "safepoint state has not been reset");
- SafepointMechanism::disarm_local_poll(current);
+
+ SafepointMechanism::disarm_if_needed(current, false /* NO release */);
}
} // ~JavaThreadIteratorWithHandle
@@ -716,8 +717,6 @@
}
bool SafepointSynchronize::handshake_safe(JavaThread *thread) {
- // The polls must be armed otherwise the safe state can change to unsafe at any time.
- assert(SafepointMechanism::should_block(thread), "Must be armed");
// This function must be called with the Threads_lock held so an externally
// suspended thread cannot be resumed thus it is safe.
assert(Threads_lock->owned_by_self() && Thread::current()->is_VM_thread(),
@@ -851,6 +850,9 @@
thread->handle_special_runtime_exit_condition(
!thread->is_at_poll_safepoint() && (state != _thread_in_native_trans));
}
+
+ // cross_modify_fence is done by SafepointMechanism::block_if_requested_slow
+ // which is the only caller here.
}
// ------------------------------------------------------------------------------------------------------
--- a/src/hotspot/share/runtime/safepointMechanism.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/safepointMechanism.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -83,8 +83,7 @@
}
}
-void SafepointMechanism::block_if_requested_slow(JavaThread *thread) {
- // local poll already checked, if used.
+void SafepointMechanism::block_or_handshake(JavaThread *thread) {
if (global_poll()) {
// Any load in ::block must not pass the global poll load.
// Otherwise we might load an old safepoint counter (for example).
@@ -92,10 +91,31 @@
SafepointSynchronize::block(thread);
}
if (uses_thread_local_poll() && thread->has_handshake()) {
- thread->handshake_process_by_self();
+ thread->handshake_process_by_self();
}
}
+void SafepointMechanism::block_if_requested_slow(JavaThread *thread) {
+ // Read global poll and has_handshake after local poll
+ OrderAccess::loadload();
+
+ // local poll already checked, if used.
+ block_or_handshake(thread);
+
+ OrderAccess::loadload();
+
+ if (uses_thread_local_poll() && local_poll_armed(thread)) {
+ disarm_local_poll_release(thread);
+ // We might have disarmed next safepoint/handshake
+ OrderAccess::storeload();
+ if (global_poll() || thread->has_handshake()) {
+ arm_local_poll(thread);
+ }
+ }
+
+ OrderAccess::cross_modify_fence();
+}
+
void SafepointMechanism::initialize_header(JavaThread* thread) {
disarm_local_poll(thread);
}
--- a/src/hotspot/share/runtime/safepointMechanism.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/safepointMechanism.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -46,9 +46,13 @@
static inline bool local_poll_armed(JavaThread* thread);
+ static inline void disarm_local_poll(JavaThread* thread);
+ static inline void disarm_local_poll_release(JavaThread* thread);
+
static inline bool local_poll(Thread* thread);
static inline bool global_poll();
+ static void block_or_handshake(JavaThread *thread);
static void block_if_requested_slow(JavaThread *thread);
static void default_initialize();
@@ -80,10 +84,10 @@
// Caller is responsible for using a memory barrier if needed.
static inline void arm_local_poll(JavaThread* thread);
- static inline void disarm_local_poll(JavaThread* thread);
-
+ // Release semantics
static inline void arm_local_poll_release(JavaThread* thread);
- static inline void disarm_local_poll_release(JavaThread* thread);
+ // Optional release
+ static inline void disarm_if_needed(JavaThread* thread, bool memory_order_release);
// Setup the selected safepoint mechanism
static void initialize();
--- a/src/hotspot/share/runtime/safepointMechanism.inline.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/safepointMechanism.inline.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -56,7 +56,7 @@
}
void SafepointMechanism::block_if_requested(JavaThread *thread) {
- if (uses_thread_local_poll() && !SafepointMechanism::local_poll_armed(thread)) {
+ if (uses_thread_local_poll() && !local_poll_armed(thread)) {
return;
}
block_if_requested_slow(thread);
@@ -70,6 +70,19 @@
thread->set_polling_page(poll_disarmed_value());
}
+void SafepointMechanism::disarm_if_needed(JavaThread* thread, bool memory_order_release) {
+ JavaThreadState jts = thread->thread_state();
+ if (jts == _thread_in_native || jts == _thread_in_native_trans) {
+ // JavaThread will disarm itself and execute cross_modify_fence() before continuing
+ return;
+ }
+ if (memory_order_release) {
+ thread->set_polling_page_release(poll_disarmed_value());
+ } else {
+ thread->set_polling_page(poll_disarmed_value());
+ }
+}
+
void SafepointMechanism::arm_local_poll_release(JavaThread* thread) {
thread->set_polling_page_release(poll_armed_value());
}
--- a/src/hotspot/share/runtime/synchronizer.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/synchronizer.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1270,6 +1270,21 @@
}
Thread::muxRelease(&gListLock);
+
+ LogStreamHandle(Debug, monitorinflation) lsh_debug;
+ LogStreamHandle(Info, monitorinflation) lsh_info;
+ LogStream * ls = NULL;
+ if (log_is_enabled(Debug, monitorinflation)) {
+ ls = &lsh_debug;
+ } else if ((tally != 0 || inUseTally != 0) &&
+ log_is_enabled(Info, monitorinflation)) {
+ ls = &lsh_info;
+ }
+ if (ls != NULL) {
+ ls->print_cr("omFlush: jt=" INTPTR_FORMAT ", free_monitor_tally=%d"
+ ", in_use_monitor_tally=%d" ", omFreeProvision=%d",
+ p2i(Self), tally, inUseTally, Self->omFreeProvision);
+ }
}
static void post_monitor_inflate_event(EventJavaMonitorInflate* event,
@@ -1665,24 +1680,18 @@
// than a beginning to end measurement of the phase.
log_info(safepoint, cleanup)("deflating per-thread idle monitors, %3.7f secs, monitors=%d", counters->perThreadTimes, counters->perThreadScavenged);
- LogStreamHandle(Debug, monitorinflation) lsh_debug;
- LogStreamHandle(Info, monitorinflation) lsh_info;
- LogStream * ls = NULL;
- if (log_is_enabled(Debug, monitorinflation)) {
- ls = &lsh_debug;
- } else if (counters->perThreadScavenged != 0 && log_is_enabled(Info, monitorinflation)) {
- ls = &lsh_info;
- }
- if (ls != NULL) {
- ls->print_cr("deflating per-thread idle monitors, %3.7f secs, %d monitors", counters->perThreadTimes, counters->perThreadScavenged);
- }
-
gMonitorFreeCount += counters->nScavenged;
if (log_is_enabled(Debug, monitorinflation)) {
// exit_globals()'s call to audit_and_print_stats() is done
// at the Info level.
ObjectSynchronizer::audit_and_print_stats(false /* on_exit */);
+ } else if (log_is_enabled(Info, monitorinflation)) {
+ Thread::muxAcquire(&gListLock, "finish_deflate_idle_monitors");
+ log_info(monitorinflation)("gMonitorPopulation=%d, gOmInUseCount=%d, "
+ "gMonitorFreeCount=%d", gMonitorPopulation,
+ gOmInUseCount, gMonitorFreeCount);
+ Thread::muxRelease(&gListLock);
}
ForceMonitorScavenge = 0; // Reset
@@ -1708,8 +1717,6 @@
int deflated_count = deflate_monitor_list(thread->omInUseList_addr(), &freeHeadp, &freeTailp);
- timer.stop();
-
Thread::muxAcquire(&gListLock, "deflate_thread_local_monitors");
// Adjust counters
@@ -1718,8 +1725,6 @@
counters->nScavenged += deflated_count;
counters->nInuse += thread->omInUseCount;
counters->perThreadScavenged += deflated_count;
- // For now, we only care about cumulative per-thread deflation time.
- counters->perThreadTimes += timer.seconds();
// Move the scavenged monitors back to the global free list.
if (freeHeadp != NULL) {
@@ -1730,7 +1735,26 @@
freeTailp->FreeNext = gFreeList;
gFreeList = freeHeadp;
}
+
+ timer.stop();
+ // Safepoint logging cares about cumulative perThreadTimes and
+ // we'll capture most of the cost, but not the muxRelease() which
+ // should be cheap.
+ counters->perThreadTimes += timer.seconds();
+
Thread::muxRelease(&gListLock);
+
+ LogStreamHandle(Debug, monitorinflation) lsh_debug;
+ LogStreamHandle(Info, monitorinflation) lsh_info;
+ LogStream * ls = NULL;
+ if (log_is_enabled(Debug, monitorinflation)) {
+ ls = &lsh_debug;
+ } else if (deflated_count != 0 && log_is_enabled(Info, monitorinflation)) {
+ ls = &lsh_info;
+ }
+ if (ls != NULL) {
+ ls->print_cr("jt=" INTPTR_FORMAT ": deflating per-thread idle monitors, %3.7f secs, %d monitors", p2i(thread), timer.seconds(), deflated_count);
+ }
}
// Monitor cleanup on JavaThread::exit
@@ -1839,13 +1863,13 @@
// Check gMonitorPopulation:
if (gMonitorPopulation == chkMonitorPopulation) {
- ls->print_cr("gMonitorPopulation=%d equals chkMonitorPopulation=%d",
- gMonitorPopulation, chkMonitorPopulation);
+ ls->print_cr("gMonitorPopulation=%d equals chkMonitorPopulation=%d",
+ gMonitorPopulation, chkMonitorPopulation);
} else {
- ls->print_cr("ERROR: gMonitorPopulation=%d is not equal to "
- "chkMonitorPopulation=%d", gMonitorPopulation,
- chkMonitorPopulation);
- error_cnt++;
+ ls->print_cr("ERROR: gMonitorPopulation=%d is not equal to "
+ "chkMonitorPopulation=%d", gMonitorPopulation,
+ chkMonitorPopulation);
+ error_cnt++;
}
// Check gOmInUseList and gOmInUseCount:
--- a/src/hotspot/share/runtime/synchronizer.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/synchronizer.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -199,11 +199,11 @@
static u_char* get_gvars_stwRandom_addr();
};
-// ObjectLocker enforced balanced locking and can never thrown an
+// ObjectLocker enforces balanced locking and can never throw an
// IllegalMonitorStateException. However, a pending exception may
// have to pass through, and we must also be able to deal with
// asynchronous exceptions. The caller is responsible for checking
-// the threads pending exception if needed.
+// the thread's pending exception if needed.
class ObjectLocker : public StackObj {
private:
Thread* _thread;
--- a/src/hotspot/share/runtime/thread.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/thread.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1291,29 +1291,35 @@
NonJavaThread::~NonJavaThread() { }
void NonJavaThread::add_to_the_list() {
- MutexLockerEx lock(NonJavaThreadsList_lock, Mutex::_no_safepoint_check_flag);
- _next = _the_list._head;
+ MutexLockerEx ml(NonJavaThreadsList_lock, Mutex::_no_safepoint_check_flag);
+ // Initialize BarrierSet-related data before adding to list.
+ BarrierSet::barrier_set()->on_thread_attach(this);
+ OrderAccess::release_store(&_next, _the_list._head);
OrderAccess::release_store(&_the_list._head, this);
}
void NonJavaThread::remove_from_the_list() {
- MutexLockerEx lock(NonJavaThreadsList_lock, Mutex::_no_safepoint_check_flag);
- NonJavaThread* volatile* p = &_the_list._head;
- for (NonJavaThread* t = *p; t != NULL; p = &t->_next, t = *p) {
- if (t == this) {
- *p = this->_next;
- // Wait for any in-progress iterators. Concurrent synchronize is
- // not allowed, so do it while holding the list lock.
- _the_list._protect.synchronize();
- break;
+ {
+ MutexLockerEx ml(NonJavaThreadsList_lock, Mutex::_no_safepoint_check_flag);
+ // Cleanup BarrierSet-related data before removing from list.
+ BarrierSet::barrier_set()->on_thread_detach(this);
+ NonJavaThread* volatile* p = &_the_list._head;
+ for (NonJavaThread* t = *p; t != NULL; p = &t->_next, t = *p) {
+ if (t == this) {
+ *p = _next;
+ break;
+ }
}
}
+ // Wait for any in-progress iterators. Concurrent synchronize is not
+ // allowed, so do it while holding a dedicated lock. Outside and distinct
+ // from NJTList_lock in case an iteration attempts to lock it.
+ MutexLockerEx ml(NonJavaThreadsListSync_lock, Mutex::_no_safepoint_check_flag);
+ _the_list._protect.synchronize();
+ _next = NULL; // Safe to drop the link now.
}
void NonJavaThread::pre_run() {
- // Initialize BarrierSet-related data before adding to list.
- assert(BarrierSet::barrier_set() != NULL, "invariant");
- BarrierSet::barrier_set()->on_thread_attach(this);
add_to_the_list();
// This is slightly odd in that NamedThread is a subclass, but
@@ -1324,8 +1330,6 @@
void NonJavaThread::post_run() {
JFR_ONLY(Jfr::on_thread_exit(this);)
- // Clean up BarrierSet data before removing from list.
- BarrierSet::barrier_set()->on_thread_detach(this);
remove_from_the_list();
// Ensure thread-local-storage is cleared before termination.
Thread::clear_thread_current();
@@ -1506,7 +1510,7 @@
{
MutexLockerEx mu(Terminator_lock, Mutex::_no_safepoint_check_flag);
_watcher_thread = NULL;
- Terminator_lock->notify();
+ Terminator_lock->notify_all();
}
}
@@ -1836,6 +1840,10 @@
// Thread is now sufficiently initialized to be handled by the safepoint code as being
// in the VM. Change thread state from _thread_new to _thread_in_vm
ThreadStateTransition::transition_and_fence(this, _thread_new, _thread_in_vm);
+ // Before a thread is on the threads list it is always safe, so after leaving the
+ // _thread_new we should emit a instruction barrier. The distance to modified code
+ // from here is probably far enough, but this is consistent and safe.
+ OrderAccess::cross_modify_fence();
assert(JavaThread::current() == this, "sanity check");
assert(!Thread::current()->owns_locks(), "sanity check");
@@ -2264,48 +2272,19 @@
void JavaThread::handle_special_runtime_exit_condition(bool check_asyncs) {
//
- // Check for pending external suspend. Internal suspend requests do
- // not use handle_special_runtime_exit_condition().
+ // Check for pending external suspend.
// If JNIEnv proxies are allowed, don't self-suspend if the target
// thread is not the current thread. In older versions of jdbx, jdbx
// threads could call into the VM with another thread's JNIEnv so we
// can be here operating on behalf of a suspended thread (4432884).
bool do_self_suspend = is_external_suspend_with_lock();
if (do_self_suspend && (!AllowJNIEnvProxy || this == JavaThread::current())) {
- //
- // Because thread is external suspended the safepoint code will count
- // thread as at a safepoint. This can be odd because we can be here
- // as _thread_in_Java which would normally transition to _thread_blocked
- // at a safepoint. We would like to mark the thread as _thread_blocked
- // before calling java_suspend_self like all other callers of it but
- // we must then observe proper safepoint protocol. (We can't leave
- // _thread_blocked with a safepoint in progress). However we can be
- // here as _thread_in_native_trans so we can't use a normal transition
- // constructor/destructor pair because they assert on that type of
- // transition. We could do something like:
- //
- // JavaThreadState state = thread_state();
- // set_thread_state(_thread_in_vm);
- // {
- // ThreadBlockInVM tbivm(this);
- // java_suspend_self()
- // }
- // set_thread_state(_thread_in_vm_trans);
- // if (safepoint) block;
- // set_thread_state(state);
- //
- // but that is pretty messy. Instead we just go with the way the
- // code has worked before and note that this is the only path to
- // java_suspend_self that doesn't put the thread in _thread_blocked
- // mode.
-
frame_anchor()->make_walkable(this);
- java_suspend_self();
-
- // We might be here for reasons in addition to the self-suspend request
- // so check for other async requests.
- }
-
+ java_suspend_self_with_safepoint_check();
+ }
+
+ // We might be here for reasons in addition to the self-suspend request
+ // so check for other async requests.
if (check_asyncs) {
check_and_handle_async_exceptions();
}
@@ -2424,6 +2403,7 @@
// to complete an external suspend request.
//
int JavaThread::java_suspend_self() {
+ assert(thread_state() == _thread_blocked, "wrong state for java_suspend_self()");
int ret = 0;
// we are in the process of exiting so don't suspend
@@ -2467,10 +2447,42 @@
this->SR_lock()->wait(Mutex::_no_safepoint_check_flag);
}
}
-
return ret;
}
+// Helper routine to set up the correct thread state before calling java_suspend_self.
+// This is called when regular thread-state transition helpers can't be used because
+// we can be in various states, in particular _thread_in_native_trans.
+// Because this thread is external suspended the safepoint code will count it as at
+// a safepoint, regardless of what its actual current thread-state is. But
+// is_ext_suspend_completed() may be waiting to see a thread transition from
+// _thread_in_native_trans to _thread_blocked. So we set the thread state directly
+// to _thread_blocked. The problem with setting thread state directly is that a
+// safepoint could happen just after java_suspend_self() returns after being resumed,
+// and the VM thread will see the _thread_blocked state. So we must check for a safepoint
+// after restoring the state to make sure we won't leave while a safepoint is in progress.
+// However, not all initial-states are allowed when performing a safepoint check, as we
+// should never be blocking at a safepoint whilst in those states. Of these 'bad' states
+// only _thread_in_native is possible when executing this code (based on our two callers).
+// A thread that is _thread_in_native is already safepoint-safe and so it doesn't matter
+// whether the VMThread sees the _thread_blocked state, or the _thread_in_native state,
+// and so we don't need the explicit safepoint check.
+
+void JavaThread::java_suspend_self_with_safepoint_check() {
+ assert(this == Thread::current(), "invariant");
+ JavaThreadState state = thread_state();
+ set_thread_state(_thread_blocked);
+ java_suspend_self();
+ set_thread_state(state);
+ // Since we are not using a regular thread-state transition helper here,
+ // we must manually emit the instruction barrier after leaving a safe state.
+ OrderAccess::cross_modify_fence();
+ InterfaceSupport::serialize_thread_state_with_handler(this);
+ if (state != _thread_in_native) {
+ SafepointMechanism::block_if_requested(this);
+ }
+}
+
#ifdef ASSERT
// Verify the JavaThread has not yet been published in the Threads::list, and
// hence doesn't need protection from concurrent access at this stage.
@@ -2502,32 +2514,10 @@
// threads could call into the VM with another thread's JNIEnv so we
// can be here operating on behalf of a suspended thread (4432884).
if (do_self_suspend && (!AllowJNIEnvProxy || curJT == thread)) {
- JavaThreadState state = thread->thread_state();
-
- // We mark this thread_blocked state as a suspend-equivalent so
- // that a caller to is_ext_suspend_completed() won't be confused.
- // The suspend-equivalent state is cleared by java_suspend_self().
- thread->set_suspend_equivalent();
-
- // If the safepoint code sees the _thread_in_native_trans state, it will
- // wait until the thread changes to other thread state. There is no
- // guarantee on how soon we can obtain the SR_lock and complete the
- // self-suspend request. It would be a bad idea to let safepoint wait for
- // too long. Temporarily change the state to _thread_blocked to
- // let the VM thread know that this thread is ready for GC. The problem
- // of changing thread state is that safepoint could happen just after
- // java_suspend_self() returns after being resumed, and VM thread will
- // see the _thread_blocked state. We must check for safepoint
- // after restoring the state and make sure we won't leave while a safepoint
- // is in progress.
- thread->set_thread_state(_thread_blocked);
- thread->java_suspend_self();
- thread->set_thread_state(state);
-
- InterfaceSupport::serialize_thread_state_with_handler(thread);
- }
-
- SafepointMechanism::block_if_requested(curJT);
+ thread->java_suspend_self_with_safepoint_check();
+ } else {
+ SafepointMechanism::block_if_requested(curJT);
+ }
if (thread->is_deopt_suspend()) {
thread->clear_deopt_suspend();
@@ -2948,9 +2938,21 @@
}
}
+#ifdef ASSERT
+void JavaThread::verify_states_for_handshake() {
+ // This checks that the thread has a correct frame state during a handshake.
+ assert((!has_last_Java_frame() && java_call_counter() == 0) ||
+ (has_last_Java_frame() && java_call_counter() > 0),
+ "unexpected frame info: has_last_frame=%d, java_call_counter=%d",
+ has_last_Java_frame(), java_call_counter());
+}
+#endif
+
void JavaThread::nmethods_do(CodeBlobClosure* cf) {
assert((!has_last_Java_frame() && java_call_counter() == 0) ||
- (has_last_Java_frame() && java_call_counter() > 0), "wrong java_sp info!");
+ (has_last_Java_frame() && java_call_counter() > 0),
+ "unexpected frame info: has_last_frame=%d, java_call_counter=%d",
+ has_last_Java_frame(), java_call_counter());
if (has_last_Java_frame()) {
// Traverse the execution stack
@@ -4457,7 +4459,7 @@
void Threads::remove(JavaThread* p) {
- // Reclaim the objectmonitors from the omInUseList and omFreeList of the moribund thread.
+ // Reclaim the ObjectMonitors from the omInUseList and omFreeList of the moribund thread.
ObjectSynchronizer::omFlush(p);
// Extra scope needed for Thread_lock, so we can check
--- a/src/hotspot/share/runtime/thread.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/thread.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -1348,10 +1348,16 @@
inline void clear_ext_suspended();
public:
- void java_suspend();
- void java_resume();
- int java_suspend_self();
+ void java_suspend(); // higher-level suspension logic called by the public APIs
+ void java_resume(); // higher-level resume logic called by the public APIs
+ int java_suspend_self(); // low-level self-suspension mechanics
+ private:
+ // mid-level wrapper around java_suspend_self to set up correct state and
+ // check for a pending safepoint at the end
+ void java_suspend_self_with_safepoint_check();
+
+ public:
void check_and_wait_while_suspended() {
assert(JavaThread::current() == this, "sanity check");
@@ -1868,6 +1874,9 @@
// RedefineClasses Support
void metadata_do(MetadataClosure* f);
+ // Debug method asserting thread states are correct during a handshake operation.
+ DEBUG_ONLY(void verify_states_for_handshake();)
+
// Misc. operations
char* name() const { return (char*)get_thread_name(); }
void print_on(outputStream* st, bool print_extended_info) const;
--- a/src/hotspot/share/runtime/vmThread.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/vmThread.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -434,22 +434,35 @@
static VM_None safepointALot_op("SafepointALot");
static VM_Cleanup cleanup_op;
-VM_Operation* VMThread::no_op_safepoint(bool check_time) {
+class HandshakeALotTC : public ThreadClosure {
+ public:
+ virtual void do_thread(Thread* thread) {
+#ifdef ASSERT
+ assert(thread->is_Java_thread(), "must be");
+ JavaThread* jt = (JavaThread*)thread;
+ jt->verify_states_for_handshake();
+#endif
+ }
+};
+
+VM_Operation* VMThread::no_op_safepoint() {
+ // Check for handshakes first since we may need to return a VMop.
+ if (HandshakeALot) {
+ HandshakeALotTC haltc;
+ Handshake::execute(&haltc);
+ }
+ // Check for a cleanup before SafepointALot to keep stats correct.
+ long interval_ms = SafepointTracing::time_since_last_safepoint_ms();
+ bool max_time_exceeded = GuaranteedSafepointInterval != 0 &&
+ (interval_ms >= GuaranteedSafepointInterval);
+ if (max_time_exceeded && SafepointSynchronize::is_cleanup_needed()) {
+ return &cleanup_op;
+ }
if (SafepointALot) {
return &safepointALot_op;
}
- if (!SafepointSynchronize::is_cleanup_needed()) {
- return NULL;
- }
- if (check_time) {
- long interval_ms = SafepointTracing::time_since_last_safepoint_ms();
- bool max_time_exceeded = GuaranteedSafepointInterval != 0 &&
- (interval_ms > GuaranteedSafepointInterval);
- if (!max_time_exceeded) {
- return NULL;
- }
- }
- return &cleanup_op;
+ // Nothing to be done.
+ return NULL;
}
void VMThread::loop() {
@@ -491,19 +504,22 @@
exit(-1);
}
- if (timedout && (_cur_vm_operation = VMThread::no_op_safepoint(false)) != NULL) {
- MutexUnlockerEx mul(VMOperationQueue_lock,
- Mutex::_no_safepoint_check_flag);
- // Force a safepoint since we have not had one for at least
- // 'GuaranteedSafepointInterval' milliseconds. This will run all
- // the clean-up processing that needs to be done regularly at a
- // safepoint
- SafepointSynchronize::begin();
- #ifdef ASSERT
+ if (timedout) {
+ // Have to unlock VMOperationQueue_lock just in case no_op_safepoint()
+ // has to do a handshake.
+ MutexUnlockerEx mul(VMOperationQueue_lock, Mutex::_no_safepoint_check_flag);
+ if ((_cur_vm_operation = VMThread::no_op_safepoint()) != NULL) {
+ // Force a safepoint since we have not had one for at least
+ // 'GuaranteedSafepointInterval' milliseconds and we need to clean
+ // something. This will run all the clean-up processing that needs
+ // to be done at a safepoint.
+ SafepointSynchronize::begin();
+ #ifdef ASSERT
if (GCALotAtAllSafepoints) InterfaceSupport::check_gc_alot();
- #endif
- SafepointSynchronize::end();
- _cur_vm_operation = NULL;
+ #endif
+ SafepointSynchronize::end();
+ _cur_vm_operation = NULL;
+ }
}
_cur_vm_operation = _vm_queue->remove_next();
@@ -615,10 +631,9 @@
VMOperationRequest_lock->notify_all();
}
- //
- // We want to make sure that we get to a safepoint regularly.
- //
- if ((_cur_vm_operation = VMThread::no_op_safepoint(false)) != NULL) {
+ // We want to make sure that we get to a safepoint regularly
+ // even when executing VMops that don't require safepoints.
+ if ((_cur_vm_operation = VMThread::no_op_safepoint()) != NULL) {
HandleMark hm(VMThread::vm_thread());
SafepointSynchronize::begin();
SafepointSynchronize::end();
--- a/src/hotspot/share/runtime/vmThread.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/runtime/vmThread.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -123,7 +123,7 @@
static VMOperationTimeoutTask* _timeout_task;
- static VM_Operation* no_op_safepoint(bool check_time);
+ static VM_Operation* no_op_safepoint();
void evaluate_operation(VM_Operation* op);
--- a/src/hotspot/share/services/heapDumper.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/services/heapDumper.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -958,6 +958,11 @@
// creates HPROF_GC_INSTANCE_DUMP record for the given object
void DumperSupport::dump_instance(DumpWriter* writer, oop o) {
Klass* k = o->klass();
+ if (k->java_mirror() == NULL) {
+ // Ignoring this object since the corresponding java mirror is not loaded.
+ // Might be a dormant archive object.
+ return;
+ }
writer->write_u1(HPROF_GC_INSTANCE_DUMP);
writer->write_objectID(o);
--- a/src/hotspot/share/services/management.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/services/management.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "jmm.h"
+#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
#include "compiler/compileBroker.hpp"
#include "memory/allocation.inline.hpp"
--- a/src/hotspot/share/services/memBaseline.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/services/memBaseline.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -156,6 +156,11 @@
return false;
}
+ // Walk simple thread stacks
+ if (!ThreadStackTracker::walk_simple_thread_stack_site(&malloc_walker)) {
+ return false;
+ }
+
_malloc_sites.move(malloc_walker.malloc_sites());
// The malloc sites are collected in size order
_malloc_sites_order = by_size;
--- a/src/hotspot/share/services/memReporter.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/services/memReporter.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -26,6 +26,7 @@
#include "memory/allocation.hpp"
#include "services/mallocTracker.hpp"
#include "services/memReporter.hpp"
+#include "services/threadStackTracker.hpp"
#include "services/virtualMemoryTracker.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -46,11 +47,13 @@
void MemReporterBase::print_malloc(size_t amount, size_t count, MEMFLAGS flag) const {
const char* scale = current_scale();
outputStream* out = output();
+ const char* alloc_type = (flag == mtThreadStack) ? "" : "malloc=";
+
if (flag != mtNone) {
- out->print("(malloc=" SIZE_FORMAT "%s type=%s",
+ out->print("(%s" SIZE_FORMAT "%s type=%s", alloc_type,
amount_in_current_scale(amount), scale, NMTUtil::flag_to_name(flag));
} else {
- out->print("(malloc=" SIZE_FORMAT "%s",
+ out->print("(%s" SIZE_FORMAT "%s", alloc_type,
amount_in_current_scale(amount), scale);
}
@@ -126,10 +129,17 @@
// Count thread's native stack in "Thread" category
if (flag == mtThread) {
- const VirtualMemory* thread_stack_usage =
- (const VirtualMemory*)_vm_snapshot->by_type(mtThreadStack);
- reserved_amount += thread_stack_usage->reserved();
- committed_amount += thread_stack_usage->committed();
+ if (ThreadStackTracker::track_as_vm()) {
+ const VirtualMemory* thread_stack_usage =
+ (const VirtualMemory*)_vm_snapshot->by_type(mtThreadStack);
+ reserved_amount += thread_stack_usage->reserved();
+ committed_amount += thread_stack_usage->committed();
+ } else {
+ const MallocMemory* thread_stack_usage =
+ (const MallocMemory*)_malloc_snapshot->by_type(mtThreadStack);
+ reserved_amount += thread_stack_usage->malloc_size();
+ committed_amount += thread_stack_usage->malloc_size();
+ }
} else if (flag == mtNMT) {
// Count malloc headers in "NMT" category
reserved_amount += _malloc_snapshot->malloc_overhead()->size();
@@ -150,12 +160,22 @@
out->print_cr("%27s ( instance classes #" SIZE_FORMAT ", array classes #" SIZE_FORMAT ")",
" ", _instance_class_count, _array_class_count);
} else if (flag == mtThread) {
- // report thread count
- out->print_cr("%27s (thread #" SIZE_FORMAT ")", " ", _malloc_snapshot->thread_count());
- const VirtualMemory* thread_stack_usage =
- _vm_snapshot->by_type(mtThreadStack);
- out->print("%27s (stack: ", " ");
- print_total(thread_stack_usage->reserved(), thread_stack_usage->committed());
+ if (ThreadStackTracker::track_as_vm()) {
+ const VirtualMemory* thread_stack_usage =
+ _vm_snapshot->by_type(mtThreadStack);
+ // report thread count
+ out->print_cr("%27s (thread #" SIZE_FORMAT ")", " ", ThreadStackTracker::thread_count());
+ out->print("%27s (stack: ", " ");
+ print_total(thread_stack_usage->reserved(), thread_stack_usage->committed());
+ } else {
+ MallocMemory* thread_stack_memory = _malloc_snapshot->by_type(mtThreadStack);
+ const char* scale = current_scale();
+ // report thread count
+ assert(ThreadStackTracker::thread_count() == 0, "Not used");
+ out->print_cr("%27s (thread #" SIZE_FORMAT ")", " ", thread_stack_memory->malloc_count());
+ out->print("%27s (Stack: " SIZE_FORMAT "%s", " ",
+ amount_in_current_scale(thread_stack_memory->malloc_size()), scale);
+ }
out->print_cr(")");
}
@@ -368,10 +388,11 @@
size_t early_amount, size_t early_count, MEMFLAGS flags) const {
const char* scale = current_scale();
outputStream* out = output();
+ const char* alloc_type = (flags == mtThread) ? "" : "malloc=";
- out->print("malloc=" SIZE_FORMAT "%s", amount_in_current_scale(current_amount), scale);
- // Report type only if it is valid
- if (flags != mtNone) {
+ out->print("%s" SIZE_FORMAT "%s", alloc_type, amount_in_current_scale(current_amount), scale);
+ // Report type only if it is valid and not under "thread" category
+ if (flags != mtNone && flags != mtThread) {
out->print(" type=%s", NMTUtil::flag_to_name(flags));
}
@@ -497,15 +518,25 @@
}
out->print_cr(")");
- // report thread stack
- const VirtualMemory* current_thread_stack =
+ out->print("%27s (stack: ", " ");
+ if (ThreadStackTracker::track_as_vm()) {
+ // report thread stack
+ const VirtualMemory* current_thread_stack =
_current_baseline.virtual_memory(mtThreadStack);
- const VirtualMemory* early_thread_stack =
- _early_baseline.virtual_memory(mtThreadStack);
+ const VirtualMemory* early_thread_stack =
+ _early_baseline.virtual_memory(mtThreadStack);
- out->print("%27s (stack: ", " ");
- print_virtual_memory_diff(current_thread_stack->reserved(), current_thread_stack->committed(),
- early_thread_stack->reserved(), early_thread_stack->committed());
+ print_virtual_memory_diff(current_thread_stack->reserved(), current_thread_stack->committed(),
+ early_thread_stack->reserved(), early_thread_stack->committed());
+ } else {
+ const MallocMemory* current_thread_stack =
+ _current_baseline.malloc_memory(mtThreadStack);
+ const MallocMemory* early_thread_stack =
+ _early_baseline.malloc_memory(mtThreadStack);
+
+ print_malloc_diff(current_thread_stack->malloc_size(), current_thread_stack->malloc_count(),
+ early_thread_stack->malloc_size(), early_thread_stack->malloc_count(), flag);
+ }
out->print_cr(")");
}
--- a/src/hotspot/share/services/memTracker.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/services/memTracker.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
#include "services/memReporter.hpp"
#include "services/mallocTracker.inline.hpp"
#include "services/memTracker.hpp"
+#include "services/threadStackTracker.hpp"
#include "utilities/debug.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/vmError.hpp"
@@ -92,7 +93,8 @@
void MemTracker::init() {
NMT_TrackingLevel level = tracking_level();
if (level >= NMT_summary) {
- if (!VirtualMemoryTracker::late_initialize(level)) {
+ if (!VirtualMemoryTracker::late_initialize(level) ||
+ !ThreadStackTracker::late_initialize(level)) {
shutdown();
return;
}
@@ -164,6 +166,7 @@
OrderAccess::fence();
VirtualMemoryTracker::transition(current_level, level);
MallocTracker::transition(current_level, level);
+ ThreadStackTracker::transition(current_level, level);
} else {
// Upgrading tracking level is not supported and has never been supported.
// Allocating and deallocating malloc tracking structures is not thread safe and
--- a/src/hotspot/share/services/memTracker.hpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/services/memTracker.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -82,6 +82,7 @@
#include "runtime/mutexLocker.hpp"
#include "runtime/threadCritical.hpp"
#include "services/mallocTracker.hpp"
+#include "services/threadStackTracker.hpp"
#include "services/virtualMemoryTracker.hpp"
extern volatile bool NMT_stack_walkable;
@@ -241,31 +242,19 @@
}
}
-#ifdef _AIX
- // See JDK-8202772 - temporarily disable thread stack tracking on AIX.
- static inline void record_thread_stack(void* addr, size_t size) {}
- static inline void release_thread_stack(void* addr, size_t size) {}
-#else
- static inline void record_thread_stack(void* addr, size_t size) {
+ static void record_thread_stack(void* addr, size_t size) {
if (tracking_level() < NMT_summary) return;
if (addr != NULL) {
- // uses thread stack malloc slot for book keeping number of threads
- MallocMemorySummary::record_malloc(0, mtThreadStack);
- record_virtual_memory_reserve(addr, size, CALLER_PC, mtThreadStack);
+ ThreadStackTracker::new_thread_stack((address)addr, size, CALLER_PC);
}
}
static inline void release_thread_stack(void* addr, size_t size) {
if (tracking_level() < NMT_summary) return;
if (addr != NULL) {
- // uses thread stack malloc slot for book keeping number of threads
- MallocMemorySummary::record_free(0, mtThreadStack);
- ThreadCritical tc;
- if (tracking_level() < NMT_summary) return;
- VirtualMemoryTracker::remove_released_region((address)addr, size);
+ ThreadStackTracker::delete_thread_stack((address)addr, size);
}
}
-#endif
// Query lock is used to synchronize the access to tracking data.
// So far, it is only used by JCmd query, but it may be used by
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/services/threadStackTracker.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+
+#include "runtime/atomic.hpp"
+#include "runtime/threadCritical.hpp"
+#include "services/mallocTracker.hpp"
+#include "services/memTracker.hpp"
+#include "services/virtualMemoryTracker.hpp"
+#include "services/threadStackTracker.hpp"
+
+volatile size_t ThreadStackTracker::_thread_count = 0;
+SortedLinkedList<SimpleThreadStackSite, ThreadStackTracker::compare_thread_stack_base>* ThreadStackTracker::_simple_thread_stacks = NULL;
+
+bool ThreadStackTracker::late_initialize(NMT_TrackingLevel level) {
+ if (level == NMT_detail && !track_as_vm()) {
+ _simple_thread_stacks = new (std::nothrow, ResourceObj::C_HEAP, mtNMT)
+ SortedLinkedList<SimpleThreadStackSite, ThreadStackTracker::compare_thread_stack_base>();
+ return (_simple_thread_stacks != NULL);
+ }
+ return true;
+}
+
+bool ThreadStackTracker::transition(NMT_TrackingLevel from, NMT_TrackingLevel to) {
+ assert (from != NMT_minimal, "cannot convert from the lowest tracking level to anything");
+ if (to == NMT_minimal) {
+ assert(from == NMT_summary || from == NMT_detail, "Just check");
+ ThreadCritical tc;
+ if (_simple_thread_stacks != NULL) {
+ delete _simple_thread_stacks;
+ _simple_thread_stacks = NULL;
+ }
+ }
+ return true;
+}
+
+int ThreadStackTracker::compare_thread_stack_base(const SimpleThreadStackSite& s1, const SimpleThreadStackSite& s2) {
+ return s1.base() - s2.base();
+}
+
+void ThreadStackTracker::new_thread_stack(void* base, size_t size, const NativeCallStack& stack) {
+ assert(MemTracker::tracking_level() >= NMT_summary, "Must be");
+ assert(base != NULL, "Should have been filtered");
+ if (track_as_vm()) {
+ ThreadCritical tc;
+ VirtualMemoryTracker::add_reserved_region((address)base, size, stack, mtThreadStack);
+ _thread_count ++;
+ } else {
+ // Use a slot in mallocMemorySummary for thread stack bookkeeping
+ MallocMemorySummary::record_malloc(size, mtThreadStack);
+ if (MemTracker::tracking_level() == NMT_detail) {
+ ThreadCritical tc;
+ assert(_simple_thread_stacks != NULL, "Must be initialized");
+ SimpleThreadStackSite site((address)base, size, stack);
+ _simple_thread_stacks->add(site);
+ }
+ }
+}
+
+void ThreadStackTracker::delete_thread_stack(void* base, size_t size) {
+ assert(MemTracker::tracking_level() >= NMT_summary, "Must be");
+ assert(base != NULL, "Should have been filtered");
+ if(track_as_vm()) {
+ ThreadCritical tc;
+ VirtualMemoryTracker::remove_released_region((address)base, size);
+ _thread_count--;
+ } else {
+ // Use a slot in mallocMemorySummary for thread stack bookkeeping
+ MallocMemorySummary::record_free(size, mtThreadStack);
+ if (MemTracker::tracking_level() == NMT_detail) {
+ ThreadCritical tc;
+ assert(_simple_thread_stacks != NULL, "Must be initialized");
+ SimpleThreadStackSite site((address)base, size);
+ bool removed = _simple_thread_stacks->remove(site);
+ assert(removed, "Must exist");
+ }
+ }
+}
+
+bool ThreadStackTracker::walk_simple_thread_stack_site(MallocSiteWalker* walker) {
+ if (!track_as_vm()) {
+ LinkedListImpl<MallocSite> _sites;
+ {
+ ThreadCritical tc;
+ assert(_simple_thread_stacks != NULL, "Must be initialized");
+ LinkedListIterator<SimpleThreadStackSite> itr(_simple_thread_stacks->head());
+ const SimpleThreadStackSite* ts = itr.next();
+ // Consolidate sites and convert to MallocSites, so we can piggyback into
+ // malloc snapshot
+ while (ts != NULL) {
+ MallocSite site(*ts->call_stack(), mtThreadStack);
+ MallocSite* exist = _sites.find(site);
+ if (exist != NULL) {
+ exist->allocate(ts->size());
+ } else {
+ site.allocate(ts->size());
+ _sites.add(site);
+ }
+ ts = itr.next();
+ }
+ }
+
+ // Piggyback to malloc snapshot
+ LinkedListIterator<MallocSite> site_itr(_sites.head());
+ const MallocSite* s = site_itr.next();
+ while (s != NULL) {
+ walker->do_malloc_site(s);
+ s = site_itr.next();
+ }
+ }
+ return true;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/services/threadStackTracker.hpp Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_SERVICES_THREADSTACKTRACKER_HPP
+#define SHARE_SERVICES_THREADSTACKTRACKER_HPP
+
+#if INCLUDE_NMT
+
+#include "services/allocationSite.hpp"
+#include "services/mallocSiteTable.hpp"
+#include "services/nmtCommon.hpp"
+#include "utilities/nativeCallStack.hpp"
+#include "utilities/linkedlist.hpp"
+
+class SimpleThreadStackSite;
+
+class SimpleThreadStack {
+ friend class SimpleThreadStackSite;
+private:
+ address _base;
+ size_t _size;
+public:
+ SimpleThreadStack() : _base(NULL), _size(0) { }
+ bool equals(const SimpleThreadStack& s) const {
+ return base() == s.base();
+ }
+
+ size_t size() const { return _size; }
+ address base() const { return _base; }
+private:
+ void set_size(size_t size) { _size = size; }
+ void set_base(address base) { _base = base; }
+};
+
+class SimpleThreadStackSite : public AllocationSite<SimpleThreadStack> {
+public:
+ SimpleThreadStackSite(address base, size_t size, const NativeCallStack& stack) :
+ AllocationSite<SimpleThreadStack>(stack, mtThreadStack) {
+ data()->set_size(size);
+ data()->set_base(base);
+ }
+
+ SimpleThreadStackSite(address base, size_t size) :
+ AllocationSite<SimpleThreadStack>(NativeCallStack::empty_stack(), mtThreadStack) {
+ data()->set_base(base);
+ data()->set_size(size);
+ }
+
+ bool equals(const SimpleThreadStackSite& mts) const {
+ bool eq = base() == mts.base();
+ assert(!eq || size() == mts.size(), "Must match");
+ return eq;
+ }
+
+ size_t size() const { return peek()->size(); }
+ address base() const { return peek()->base(); }
+};
+
+ /*
+ * Most of platforms, that hotspot support, have their thread stacks backed by
+ * virtual memory by default. For these cases, thread stack tracker simply
+ * delegates tracking to virtual memory tracker.
+ * However, there are exceptions, (e.g. AIX), that platforms can provide stacks
+ * that are not page aligned. A hypothetical VM implementation, it can provide
+ * it own stacks. In these case, track_as_vm() should return false and manage
+ * stack tracking by this tracker internally.
+ * During memory snapshot, tracked thread stacks memory data is walked and stored
+ * along with malloc'd data inside baseline. The regions are not scanned and assumed
+ * all committed for now. Can add scanning phase when there is a need.
+ */
+class ThreadStackTracker : AllStatic {
+private:
+ static volatile size_t _thread_count;
+
+ static int compare_thread_stack_base(const SimpleThreadStackSite& s1, const SimpleThreadStackSite& s2);
+ static SortedLinkedList<SimpleThreadStackSite, compare_thread_stack_base>* _simple_thread_stacks;
+public:
+ // Late phase initialization
+ static bool late_initialize(NMT_TrackingLevel level);
+ static bool transition(NMT_TrackingLevel from, NMT_TrackingLevel to);
+
+ static void new_thread_stack(void* base, size_t size, const NativeCallStack& stack);
+ static void delete_thread_stack(void* base, size_t size);
+
+ static bool track_as_vm() { return AIX_ONLY(false) NOT_AIX(true); }
+ static size_t thread_count() { return _thread_count; }
+
+ // Snapshot support. Piggyback thread stack data in malloc slot, NMT always handles
+ // thread stack slot specially since beginning.
+ static bool walk_simple_thread_stack_site(MallocSiteWalker* walker);
+};
+
+#endif // INCLUDE_NMT
+#endif // SHARE_SERVICES_THREADSTACKTRACKER_HPP
--- a/src/hotspot/share/services/virtualMemoryTracker.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/services/virtualMemoryTracker.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
#include "runtime/os.hpp"
#include "runtime/threadCritical.hpp"
#include "services/memTracker.hpp"
+#include "services/threadStackTracker.hpp"
#include "services/virtualMemoryTracker.hpp"
size_t VirtualMemorySummary::_snapshot[CALC_OBJ_SIZE_IN_TYPE(VirtualMemorySnapshot, size_t)];
@@ -40,9 +41,12 @@
}
void VirtualMemorySummary::snapshot(VirtualMemorySnapshot* s) {
- // Snapshot current thread stacks
- VirtualMemoryTracker::snapshot_thread_stacks();
- as_snapshot()->copy_to(s);
+ // Only if thread stack is backed by virtual memory
+ if (ThreadStackTracker::track_as_vm()) {
+ // Snapshot current thread stacks
+ VirtualMemoryTracker::snapshot_thread_stacks();
+ as_snapshot()->copy_to(s);
+ }
}
SortedLinkedList<ReservedMemoryRegion, compare_reserved_region_base>* VirtualMemoryTracker::_reserved_regions;
--- a/src/hotspot/share/utilities/vmError.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/hotspot/share/utilities/vmError.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1445,9 +1445,13 @@
}
}
- // print to screen
+ // Part 1: print an abbreviated version (the '#' section) to stdout.
if (!out_done) {
- report(&out, false);
+ // Suppress this output if we plan to print Part 2 to stdout too.
+ // No need to have the "#" section twice.
+ if (!(ErrorFileToStdout && out.fd() == 1)) {
+ report(&out, false);
+ }
out_done = true;
@@ -1455,21 +1459,27 @@
_current_step_info = "";
}
+ // Part 2: print a full error log file (optionally to stdout or stderr).
// print to error log file
if (!log_done) {
// see if log file is already open
if (!log.is_open()) {
// open log file
- fd_log = prepare_log_file(ErrorFile, "hs_err_pid%p.log", buffer, sizeof(buffer));
- if (fd_log != -1) {
- out.print_raw("# An error report file with more information is saved as:\n# ");
- out.print_raw_cr(buffer);
-
- log.set_fd(fd_log);
+ if (ErrorFileToStdout) {
+ fd_log = 1;
+ } else if (ErrorFileToStderr) {
+ fd_log = 2;
} else {
- out.print_raw_cr("# Can not save log file, dump to screen..");
- log.set_fd(fd_out);
+ fd_log = prepare_log_file(ErrorFile, "hs_err_pid%p.log", buffer, sizeof(buffer));
+ if (fd_log != -1) {
+ out.print_raw("# An error report file with more information is saved as:\n# ");
+ out.print_raw_cr(buffer);
+ } else {
+ out.print_raw_cr("# Can not save log file, dump to screen..");
+ fd_log = 1;
+ }
}
+ log.set_fd(fd_log);
}
report(&log, true);
@@ -1477,7 +1487,7 @@
_current_step = 0;
_current_step_info = "";
- if (fd_log != -1) {
+ if (fd_log > 3) {
close(fd_log);
fd_log = -1;
}
@@ -1725,7 +1735,16 @@
const char* const eol = os::line_separator();
const char* const msg = "this message should be truncated during formatting";
char * const dataPtr = NULL; // bad data pointer
- const void (*funcPtr)(void) = (const void(*)()) 0xF; // bad function pointer
+ const void (*funcPtr)(void); // bad function pointer
+
+#if defined(PPC64) && !defined(ABI_ELFv2)
+ struct FunctionDescriptor functionDescriptor;
+
+ functionDescriptor.set_entry((address) 0xF);
+ funcPtr = (const void(*)()) &functionDescriptor;
+#else
+ funcPtr = (const void(*)()) 0xF;
+#endif
// Keep this in sync with test/hotspot/jtreg/runtime/ErrorHandling/ErrorHandler.java
// which tests cases 1 thru 13.
--- a/src/java.base/share/classes/java/io/DataOutputStream.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/io/DataOutputStream.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -317,7 +317,10 @@
* thrice the length of <code>str</code>.
*
* @param str a string to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws UTFDataFormatException if the modified UTF-8 encoding of
+ * {@code str} would exceed 65535 bytes in length
+ * @throws IOException if some other I/O error occurs.
+ * @see #writeChars(String)
*/
public final void writeUTF(String str) throws IOException {
writeUTF(str, this);
@@ -341,55 +344,49 @@
* @param str a string to be written.
* @param out destination to write to
* @return The number of bytes written out.
- * @exception IOException if an I/O error occurs.
+ * @throws UTFDataFormatException if the modified UTF-8 encoding of
+ * {@code str} would exceed 65535 bytes in length
+ * @throws IOException if some other I/O error occurs.
*/
static int writeUTF(String str, DataOutput out) throws IOException {
- int strlen = str.length();
- int utflen = 0;
- int c, count = 0;
+ final int strlen = str.length();
+ int utflen = strlen; // optimized for ASCII
- /* use charAt instead of copying String to char array */
for (int i = 0; i < strlen; i++) {
- c = str.charAt(i);
- if ((c >= 0x0001) && (c <= 0x007F)) {
- utflen++;
- } else if (c > 0x07FF) {
- utflen += 3;
- } else {
- utflen += 2;
- }
+ int c = str.charAt(i);
+ if (c >= 0x80 || c == 0)
+ utflen += (c >= 0x800) ? 2 : 1;
}
- if (utflen > 65535)
- throw new UTFDataFormatException(
- "encoded string too long: " + utflen + " bytes");
+ if (utflen > 65535 || /* overflow */ utflen < strlen)
+ throw new UTFDataFormatException(tooLongMsg(str, utflen));
- byte[] bytearr = null;
+ final byte[] bytearr;
if (out instanceof DataOutputStream) {
DataOutputStream dos = (DataOutputStream)out;
- if(dos.bytearr == null || (dos.bytearr.length < (utflen+2)))
+ if (dos.bytearr == null || (dos.bytearr.length < (utflen + 2)))
dos.bytearr = new byte[(utflen*2) + 2];
bytearr = dos.bytearr;
} else {
- bytearr = new byte[utflen+2];
+ bytearr = new byte[utflen + 2];
}
+ int count = 0;
bytearr[count++] = (byte) ((utflen >>> 8) & 0xFF);
bytearr[count++] = (byte) ((utflen >>> 0) & 0xFF);
- int i=0;
- for (i=0; i<strlen; i++) {
- c = str.charAt(i);
- if (!((c >= 0x0001) && (c <= 0x007F))) break;
- bytearr[count++] = (byte) c;
+ int i = 0;
+ for (i = 0; i < strlen; i++) { // optimized for initial run of ASCII
+ int c = str.charAt(i);
+ if (c >= 0x80 || c == 0) break;
+ bytearr[count++] = (byte) c;
}
- for (;i < strlen; i++){
- c = str.charAt(i);
- if ((c >= 0x0001) && (c <= 0x007F)) {
+ for (; i < strlen; i++) {
+ int c = str.charAt(i);
+ if (c < 0x80 && c != 0) {
bytearr[count++] = (byte) c;
-
- } else if (c > 0x07FF) {
+ } else if (c >= 0x800) {
bytearr[count++] = (byte) (0xE0 | ((c >> 12) & 0x0F));
bytearr[count++] = (byte) (0x80 | ((c >> 6) & 0x3F));
bytearr[count++] = (byte) (0x80 | ((c >> 0) & 0x3F));
@@ -398,10 +395,20 @@
bytearr[count++] = (byte) (0x80 | ((c >> 0) & 0x3F));
}
}
- out.write(bytearr, 0, utflen+2);
+ out.write(bytearr, 0, utflen + 2);
return utflen + 2;
}
+ private static String tooLongMsg(String s, int bits32) {
+ int slen = s.length();
+ String head = s.substring(0, 8);
+ String tail = s.substring(slen - 8, slen);
+ // handle int overflow with max 3x expansion
+ long actualLength = (long)slen + Integer.toUnsignedLong(bits32 - slen);
+ return "encoded string (" + head + "..." + tail + ") too long: "
+ + actualLength + " bytes";
+ }
+
/**
* Returns the current value of the counter <code>written</code>,
* the number of bytes written to this data output stream so far.
--- a/src/java.base/share/classes/java/io/InputStream.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/io/InputStream.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -237,7 +237,7 @@
* <code>b[off+len-1]</code> unaffected.
*
* <p> In every case, elements <code>b[0]</code> through
- * <code>b[off]</code> and elements <code>b[off+len]</code> through
+ * <code>b[off-1]</code> and elements <code>b[off+len]</code> through
* <code>b[b.length-1]</code> are unaffected.
*
* <p> The <code>read(b,</code> <code>off,</code> <code>len)</code> method
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Tue Apr 02 10:57:57 2019 +0530
@@ -422,6 +422,10 @@
* because the desired class member is missing, or because the
* desired class member is not accessible to the lookup class, or
* because the lookup object is not trusted enough to access the member.
+ * In the case of a field setter function on a {@code final} field,
+ * finality enforcement is treated as a kind of access control,
+ * and the lookup will fail, except in special cases of
+ * {@link Lookup#unreflectSetter Lookup.unreflectSetter}.
* In any of these cases, a {@code ReflectiveOperationException} will be
* thrown from the attempted lookup. The exact class will be one of
* the following:
@@ -1438,6 +1442,7 @@
* @return a method handle which can store values into the field
* @throws NoSuchFieldException if the field does not exist
* @throws IllegalAccessException if access checking fails, or if the field is {@code static}
+ * or {@code final}
* @exception SecurityException if a security manager is present and it
* <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
* @throws NullPointerException if any argument is null
@@ -1561,6 +1566,7 @@
* @return a method handle which can store values into the field
* @throws NoSuchFieldException if the field does not exist
* @throws IllegalAccessException if access checking fails, or if the field is not {@code static}
+ * or is {@code final}
* @exception SecurityException if a security manager is present and it
* <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
* @throws NullPointerException if any argument is null
@@ -1840,10 +1846,10 @@
* Produces a method handle giving read access to a reflected field.
* The type of the method handle will have a return type of the field's
* value type.
- * If the field is static, the method handle will take no arguments.
+ * If the field is {@code static}, the method handle will take no arguments.
* Otherwise, its single argument will be the instance containing
* the field.
- * If the field's {@code accessible} flag is not set,
+ * If the {@code Field} object's {@code accessible} flag is not set,
* access checking is performed immediately on behalf of the lookup class.
* <p>
* If the field is static, and
@@ -1857,8 +1863,43 @@
public MethodHandle unreflectGetter(Field f) throws IllegalAccessException {
return unreflectField(f, false);
}
+
+ /**
+ * Produces a method handle giving write access to a reflected field.
+ * The type of the method handle will have a void return type.
+ * If the field is {@code static}, the method handle will take a single
+ * argument, of the field's value type, the value to be stored.
+ * Otherwise, the two arguments will be the instance containing
+ * the field, and the value to be stored.
+ * If the {@code Field} object's {@code accessible} flag is not set,
+ * access checking is performed immediately on behalf of the lookup class.
+ * <p>
+ * If the field is {@code final}, write access will not be
+ * allowed and access checking will fail, except under certain
+ * narrow circumstances documented for {@link Field#set Field.set}.
+ * A method handle is returned only if a corresponding call to
+ * the {@code Field} object's {@code set} method could return
+ * normally. In particular, fields which are both {@code static}
+ * and {@code final} may never be set.
+ * <p>
+ * If the field is {@code static}, and
+ * if the returned method handle is invoked, the field's class will
+ * be initialized, if it has not already been initialized.
+ * @param f the reflected field
+ * @return a method handle which can store values into the reflected field
+ * @throws IllegalAccessException if access checking fails,
+ * or if the field is {@code final} and write access
+ * is not enabled on the {@code Field} object
+ * @throws NullPointerException if the argument is null
+ */
+ public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
+ return unreflectField(f, true);
+ }
+
private MethodHandle unreflectField(Field f, boolean isSetter) throws IllegalAccessException {
MemberName field = new MemberName(f, isSetter);
+ if (isSetter && field.isStatic() && field.isFinal())
+ throw field.makeAccessException("static final field has no write access", this);
assert(isSetter
? MethodHandleNatives.refKindIsSetter(field.getReferenceKind())
: MethodHandleNatives.refKindIsGetter(field.getReferenceKind()));
@@ -1868,28 +1909,6 @@
}
/**
- * Produces a method handle giving write access to a reflected field.
- * The type of the method handle will have a void return type.
- * If the field is static, the method handle will take a single
- * argument, of the field's value type, the value to be stored.
- * Otherwise, the two arguments will be the instance containing
- * the field, and the value to be stored.
- * If the field's {@code accessible} flag is not set,
- * access checking is performed immediately on behalf of the lookup class.
- * <p>
- * If the field is static, and
- * if the returned method handle is invoked, the field's class will
- * be initialized, if it has not already been initialized.
- * @param f the reflected field
- * @return a method handle which can store values into the reflected field
- * @throws IllegalAccessException if access checking fails
- * @throws NullPointerException if the argument is null
- */
- public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
- return unreflectField(f, true);
- }
-
- /**
* Produces a VarHandle giving access to a reflected field {@code f}
* of type {@code T} declared in a class of type {@code R}.
* The VarHandle's variable type is {@code T}.
--- a/src/java.base/share/classes/java/lang/module/Configuration.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/lang/module/Configuration.java Tue Apr 02 10:57:57 2019 +0530
@@ -575,7 +575,8 @@
}
Set<ResolvedModule> reads(ResolvedModule m) {
- return Collections.unmodifiableSet(graph.get(m));
+ // The sets stored in the graph are already immutable sets
+ return Set.copyOf(graph.get(m));
}
/**
--- a/src/java.base/share/classes/java/net/ServerSocket.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/net/ServerSocket.java Tue Apr 02 10:57:57 2019 +0530
@@ -749,14 +749,17 @@
* timeout must be {@code > 0}.
* A timeout of zero is interpreted as an infinite timeout.
* @param timeout the specified timeout, in milliseconds
- * @exception SocketException if there is an error in
- * the underlying protocol, such as a TCP error.
+ * @throws SocketException if there is an error in the underlying protocol,
+ * such as a TCP error
+ * @throws IllegalArgumentException if {@code timeout} is negative
* @since 1.1
* @see #getSoTimeout()
*/
public synchronized void setSoTimeout(int timeout) throws SocketException {
if (isClosed())
throw new SocketException("Socket is closed");
+ if (timeout < 0)
+ throw new IllegalArgumentException("timeout < 0");
getImpl().setOption(SocketOptions.SO_TIMEOUT, timeout);
}
--- a/src/java.base/share/classes/java/net/Socket.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/net/Socket.java Tue Apr 02 10:57:57 2019 +0530
@@ -581,7 +581,8 @@
* if this socket has an associated channel,
* and the channel is in non-blocking mode
* @throws IllegalArgumentException if endpoint is null or is a
- * SocketAddress subclass not supported by this socket
+ * SocketAddress subclass not supported by this socket, or
+ * if {@code timeout} is negative
* @since 1.4
* @spec JSR-51
*/
@@ -1212,8 +1213,9 @@
* A timeout of zero is interpreted as an infinite timeout.
*
* @param timeout the specified timeout, in milliseconds.
- * @exception SocketException if there is an error
- * in the underlying protocol, such as a TCP error.
+ * @throws SocketException if there is an error in the underlying protocol,
+ * such as a TCP error
+ * @throws IllegalArgumentException if {@code timeout} is negative
* @since 1.1
* @see #getSoTimeout()
*/
--- a/src/java.base/share/classes/java/text/CompactNumberFormat.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/text/CompactNumberFormat.java Tue Apr 02 10:57:57 2019 +0530
@@ -836,7 +836,8 @@
if (ch == QUOTE) {
ch = pattern.charAt(index++);
if (ch == MINUS_SIGN) {
- ch = symbols.getMinusSign();
+ sb.append(symbols.getMinusSignText());
+ continue;
}
}
sb.append(ch);
@@ -859,11 +860,14 @@
if (ch == QUOTE) {
ch = pattern.charAt(index++);
if (ch == MINUS_SIGN) {
- ch = symbols.getMinusSign();
+ String minusText = symbols.getMinusSignText();
FieldPosition fp = new FieldPosition(NumberFormat.Field.SIGN);
fp.setBeginIndex(stringIndex);
- fp.setEndIndex(stringIndex + 1);
+ fp.setEndIndex(stringIndex + minusText.length());
positions.add(fp);
+ stringIndex += minusText.length();
+ affix.append(minusText);
+ continue;
}
}
stringIndex++;
--- a/src/java.base/share/classes/java/text/DecimalFormat.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java Tue Apr 02 10:57:57 2019 +0530
@@ -54,20 +54,20 @@
import sun.util.locale.provider.ResourceBundleBasedAdapter;
/**
- * <code>DecimalFormat</code> is a concrete subclass of
- * <code>NumberFormat</code> that formats decimal numbers. It has a variety of
+ * {@code DecimalFormat} is a concrete subclass of
+ * {@code NumberFormat} that formats decimal numbers. It has a variety of
* features designed to make it possible to parse and format numbers in any
* locale, including support for Western, Arabic, and Indic digits. It also
* supports different kinds of numbers, including integers (123), fixed-point
* numbers (123.4), scientific notation (1.23E4), percentages (12%), and
* currency amounts ($123). All of these can be localized.
*
- * <p>To obtain a <code>NumberFormat</code> for a specific locale, including the
- * default locale, call one of <code>NumberFormat</code>'s factory methods, such
- * as <code>getInstance()</code>. In general, do not call the
- * <code>DecimalFormat</code> constructors directly, since the
- * <code>NumberFormat</code> factory methods may return subclasses other than
- * <code>DecimalFormat</code>. If you need to customize the format object, do
+ * <p>To obtain a {@code NumberFormat} for a specific locale, including the
+ * default locale, call one of {@code NumberFormat}'s factory methods, such
+ * as {@code getInstance()}. In general, do not call the
+ * {@code DecimalFormat} constructors directly, since the
+ * {@code NumberFormat} factory methods may return subclasses other than
+ * {@code DecimalFormat}. If you need to customize the format object, do
* something like this:
*
* <blockquote><pre>
@@ -77,16 +77,16 @@
* }
* </pre></blockquote>
*
- * <p>A <code>DecimalFormat</code> comprises a <em>pattern</em> and a set of
+ * <p>A {@code DecimalFormat} comprises a <em>pattern</em> and a set of
* <em>symbols</em>. The pattern may be set directly using
- * <code>applyPattern()</code>, or indirectly using the API methods. The
- * symbols are stored in a <code>DecimalFormatSymbols</code> object. When using
- * the <code>NumberFormat</code> factory methods, the pattern and symbols are
- * read from localized <code>ResourceBundle</code>s.
+ * {@code applyPattern()}, or indirectly using the API methods. The
+ * symbols are stored in a {@code DecimalFormatSymbols} object. When using
+ * the {@code NumberFormat} factory methods, the pattern and symbols are
+ * read from localized {@code ResourceBundle}s.
*
* <h2>Patterns</h2>
*
- * <code>DecimalFormat</code> patterns have the following syntax:
+ * {@code DecimalFormat} patterns have the following syntax:
* <blockquote><pre>
* <i>Pattern:</i>
* <i>PositivePattern</i>
@@ -123,26 +123,26 @@
* 0 <i>MinimumExponent<sub>opt</sub></i>
* </pre></blockquote>
*
- * <p>A <code>DecimalFormat</code> pattern contains a positive and negative
- * subpattern, for example, <code>"#,##0.00;(#,##0.00)"</code>. Each
+ * <p>A {@code DecimalFormat} pattern contains a positive and negative
+ * subpattern, for example, {@code "#,##0.00;(#,##0.00)"}. Each
* subpattern has a prefix, numeric part, and suffix. The negative subpattern
* is optional; if absent, then the positive subpattern prefixed with the
- * localized minus sign (<code>'-'</code> in most locales) is used as the
- * negative subpattern. That is, <code>"0.00"</code> alone is equivalent to
- * <code>"0.00;-0.00"</code>. If there is an explicit negative subpattern, it
+ * localized minus sign ({@code '-'} in most locales) is used as the
+ * negative subpattern. That is, {@code "0.00"} alone is equivalent to
+ * {@code "0.00;-0.00"}. If there is an explicit negative subpattern, it
* serves only to specify the negative prefix and suffix; the number of digits,
* minimal digits, and other characteristics are all the same as the positive
- * pattern. That means that <code>"#,##0.0#;(#)"</code> produces precisely
- * the same behavior as <code>"#,##0.0#;(#,##0.0#)"</code>.
+ * pattern. That means that {@code "#,##0.0#;(#)"} produces precisely
+ * the same behavior as {@code "#,##0.0#;(#,##0.0#)"}.
*
* <p>The prefixes, suffixes, and various symbols used for infinity, digits,
* thousands separators, decimal separators, etc. may be set to arbitrary
* values, and they will appear properly during formatting. However, care must
* be taken that the symbols and strings do not conflict, or parsing will be
* unreliable. For example, either the positive and negative prefixes or the
- * suffixes must be distinct for <code>DecimalFormat.parse()</code> to be able
+ * suffixes must be distinct for {@code DecimalFormat.parse()} to be able
* to distinguish positive from negative values. (If they are identical, then
- * <code>DecimalFormat</code> will behave as if no negative subpattern was
+ * {@code DecimalFormat} will behave as if no negative subpattern was
* specified.) Another example is that the decimal separator and thousands
* separator should be distinct characters, or parsing will be impossible.
*
@@ -151,8 +151,8 @@
* of digits between the grouping characters, such as 3 for 100,000,000 or 4 for
* 1,0000,0000. If you supply a pattern with multiple grouping characters, the
* interval between the last one and the end of the integer is the one that is
- * used. So <code>"#,##,###,####"</code> == <code>"######,####"</code> ==
- * <code>"##,####,####"</code>.
+ * used. So {@code "#,##,###,####"} == {@code "######,####"} ==
+ * {@code "##,####,####"}.
*
* <h3><a id="special_pattern_character">Special Pattern Characters</a></h3>
*
@@ -164,7 +164,7 @@
*
* <p>The characters listed here are used in non-localized patterns. Localized
* patterns use the corresponding characters taken from this formatter's
- * <code>DecimalFormatSymbols</code> object instead, and these characters lose
+ * {@code DecimalFormatSymbols} object instead, and these characters lose
* their special status. Two exceptions are the currency sign and quote, which
* are not localized.
*
@@ -180,53 +180,53 @@
* </thead>
* <tbody>
* <tr style="vertical-align:top">
- * <th scope="row"><code>0</code>
+ * <th scope="row">{@code 0}
* <td>Number
* <td>Yes
* <td>Digit
* <tr style="vertical-align: top">
- * <th scope="row"><code>#</code>
+ * <th scope="row">{@code #}
* <td>Number
* <td>Yes
* <td>Digit, zero shows as absent
* <tr style="vertical-align:top">
- * <th scope="row"><code>.</code>
+ * <th scope="row">{@code .}
* <td>Number
* <td>Yes
* <td>Decimal separator or monetary decimal separator
* <tr style="vertical-align: top">
- * <th scope="row"><code>-</code>
+ * <th scope="row">{@code -}
* <td>Number
* <td>Yes
* <td>Minus sign
* <tr style="vertical-align:top">
- * <th scope="row"><code>,</code>
+ * <th scope="row">{@code ,}
* <td>Number
* <td>Yes
* <td>Grouping separator
* <tr style="vertical-align: top">
- * <th scope="row"><code>E</code>
+ * <th scope="row">{@code E}
* <td>Number
* <td>Yes
* <td>Separates mantissa and exponent in scientific notation.
* <em>Need not be quoted in prefix or suffix.</em>
* <tr style="vertical-align:top">
- * <th scope="row"><code>;</code>
+ * <th scope="row">{@code ;}
* <td>Subpattern boundary
* <td>Yes
* <td>Separates positive and negative subpatterns
* <tr style="vertical-align: top">
- * <th scope="row"><code>%</code>
+ * <th scope="row">{@code %}
* <td>Prefix or suffix
* <td>Yes
* <td>Multiply by 100 and show as percentage
* <tr style="vertical-align:top">
- * <th scope="row"><code>\u2030</code>
+ * <th scope="row">{@code \u2030}
* <td>Prefix or suffix
* <td>Yes
* <td>Multiply by 1000 and show as per mille value
* <tr style="vertical-align: top">
- * <th scope="row"><code>¤</code> (<code>\u00A4</code>)
+ * <th scope="row">{@code ¤} ({@code \u00A4})
* <td>Prefix or suffix
* <td>No
* <td>Currency sign, replaced by currency symbol. If
@@ -234,13 +234,13 @@
* If present in a pattern, the monetary decimal separator
* is used instead of the decimal separator.
* <tr style="vertical-align:top">
- * <th scope="row"><code>'</code>
+ * <th scope="row">{@code '}
* <td>Prefix or suffix
* <td>No
* <td>Used to quote special characters in a prefix or suffix,
- * for example, <code>"'#'#"</code> formats 123 to
- * <code>"#123"</code>. To create a single quote
- * itself, use two in a row: <code>"# o''clock"</code>.
+ * for example, {@code "'#'#"} formats 123 to
+ * {@code "#123"}. To create a single quote
+ * itself, use two in a row: {@code "# o''clock"}.
* </tbody>
* </table>
* </blockquote>
@@ -251,18 +251,18 @@
* and a power of ten, for example, 1234 can be expressed as 1.234 x 10^3. The
* mantissa is often in the range 1.0 ≤ x {@literal <} 10.0, but it need not
* be.
- * <code>DecimalFormat</code> can be instructed to format and parse scientific
+ * {@code DecimalFormat} can be instructed to format and parse scientific
* notation <em>only via a pattern</em>; there is currently no factory method
* that creates a scientific notation format. In a pattern, the exponent
* character immediately followed by one or more digit characters indicates
- * scientific notation. Example: <code>"0.###E0"</code> formats the number
- * 1234 as <code>"1.234E3"</code>.
+ * scientific notation. Example: {@code "0.###E0"} formats the number
+ * 1234 as {@code "1.234E3"}.
*
* <ul>
* <li>The number of digit characters after the exponent character gives the
* minimum exponent digit count. There is no maximum. Negative exponents are
* formatted using the localized minus sign, <em>not</em> the prefix and suffix
- * from the pattern. This allows patterns such as <code>"0.###E0 m/s"</code>.
+ * from the pattern. This allows patterns such as {@code "0.###E0 m/s"}.
*
* <li>The minimum and maximum number of integer digits are interpreted
* together:
@@ -273,19 +273,19 @@
* number of integer digits, and the minimum number of integer digits to be
* interpreted as 1. The most common use of this is to generate
* <em>engineering notation</em>, in which the exponent is a multiple of three,
- * e.g., <code>"##0.#####E0"</code>. Using this pattern, the number 12345
- * formats to <code>"12.345E3"</code>, and 123456 formats to
- * <code>"123.456E3"</code>.
+ * e.g., {@code "##0.#####E0"}. Using this pattern, the number 12345
+ * formats to {@code "12.345E3"}, and 123456 formats to
+ * {@code "123.456E3"}.
*
* <li>Otherwise, the minimum number of integer digits is achieved by adjusting the
- * exponent. Example: 0.00123 formatted with <code>"00.###E0"</code> yields
- * <code>"12.3E-4"</code>.
+ * exponent. Example: 0.00123 formatted with {@code "00.###E0"} yields
+ * {@code "12.3E-4"}.
* </ul>
*
* <li>The number of significant digits in the mantissa is the sum of the
* <em>minimum integer</em> and <em>maximum fraction</em> digits, and is
* unaffected by the maximum integer digits. For example, 12345 formatted with
- * <code>"##0.##E0"</code> is <code>"12.3E3"</code>. To show all digits, set
+ * {@code "##0.##E0"} is {@code "12.3E3"}. To show all digits, set
* the significant digits count to zero. The number of significant digits
* does not affect parsing.
*
@@ -294,38 +294,38 @@
*
* <h3>Rounding</h3>
*
- * <code>DecimalFormat</code> provides rounding modes defined in
+ * {@code DecimalFormat} provides rounding modes defined in
* {@link java.math.RoundingMode} for formatting. By default, it uses
* {@link java.math.RoundingMode#HALF_EVEN RoundingMode.HALF_EVEN}.
*
* <h3>Digits</h3>
*
- * For formatting, <code>DecimalFormat</code> uses the ten consecutive
+ * For formatting, {@code DecimalFormat} uses the ten consecutive
* characters starting with the localized zero digit defined in the
- * <code>DecimalFormatSymbols</code> object as digits. For parsing, these
+ * {@code DecimalFormatSymbols} object as digits. For parsing, these
* digits as well as all Unicode decimal digits, as defined by
* {@link Character#digit Character.digit}, are recognized.
*
* <h4>Special Values</h4>
*
- * <p><code>NaN</code> is formatted as a string, which typically has a single character
- * <code>\uFFFD</code>. This string is determined by the
- * <code>DecimalFormatSymbols</code> object. This is the only value for which
+ * <p>{@code NaN} is formatted as a string, which typically has a single character
+ * {@code \uFFFD}. This string is determined by the
+ * {@code DecimalFormatSymbols} object. This is the only value for which
* the prefixes and suffixes are not used.
*
* <p>Infinity is formatted as a string, which typically has a single character
- * <code>\u221E</code>, with the positive or negative prefixes and suffixes
+ * {@code \u221E}, with the positive or negative prefixes and suffixes
* applied. The infinity string is determined by the
- * <code>DecimalFormatSymbols</code> object.
+ * {@code DecimalFormatSymbols} object.
*
- * <p>Negative zero (<code>"-0"</code>) parses to
+ * <p>Negative zero ({@code "-0"}) parses to
* <ul>
- * <li><code>BigDecimal(0)</code> if <code>isParseBigDecimal()</code> is
+ * <li>{@code BigDecimal(0)} if {@code isParseBigDecimal()} is
* true,
- * <li><code>Long(0)</code> if <code>isParseBigDecimal()</code> is false
- * and <code>isParseIntegerOnly()</code> is true,
- * <li><code>Double(-0.0)</code> if both <code>isParseBigDecimal()</code>
- * and <code>isParseIntegerOnly()</code> are false.
+ * <li>{@code Long(0)} if {@code isParseBigDecimal()} is false
+ * and {@code isParseIntegerOnly()} is true,
+ * <li>{@code Double(-0.0)} if both {@code isParseBigDecimal()}
+ * and {@code isParseIntegerOnly()} are false.
* </ul>
*
* <h3><a id="synchronization">Synchronization</a></h3>
@@ -425,7 +425,7 @@
* locale.
*
* @param pattern a non-localized pattern string.
- * @exception NullPointerException if <code>pattern</code> is null
+ * @exception NullPointerException if {@code pattern} is null
* @exception IllegalArgumentException if the given pattern is invalid.
* @see java.text.NumberFormat#getInstance
* @see java.text.NumberFormat#getNumberInstance
@@ -475,7 +475,7 @@
* <p>
* This implementation uses the maximum precision permitted.
* @param number the number to format
- * @param toAppendTo the <code>StringBuffer</code> to which the formatted
+ * @param toAppendTo the {@code StringBuffer} to which the formatted
* text is to be appended
* @param pos keeps track on the position of the field within the
* returned string. For example, for formatting a number
@@ -485,11 +485,11 @@
* and end index of {@code fieldPosition} will be set
* to 0 and 9, respectively for the output string
* {@code 1,234,567.89}.
- * @return the value passed in as <code>toAppendTo</code>
- * @exception IllegalArgumentException if <code>number</code> is
- * null or not an instance of <code>Number</code>.
- * @exception NullPointerException if <code>toAppendTo</code> or
- * <code>pos</code> is null
+ * @return the value passed in as {@code toAppendTo}
+ * @exception IllegalArgumentException if {@code number} is
+ * null or not an instance of {@code Number}.
+ * @exception NullPointerException if {@code toAppendTo} or
+ * {@code pos} is null
* @exception ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.FieldPosition
@@ -914,13 +914,13 @@
}
/**
- * Formats an Object producing an <code>AttributedCharacterIterator</code>.
- * You can use the returned <code>AttributedCharacterIterator</code>
+ * Formats an Object producing an {@code AttributedCharacterIterator}.
+ * You can use the returned {@code AttributedCharacterIterator}
* to build the resulting String, as well as to determine information
* about the resulting String.
* <p>
* Each attribute key of the AttributedCharacterIterator will be of type
- * <code>NumberFormat.Field</code>, with the attribute value being the
+ * {@code NumberFormat.Field}, with the attribute value being the
* same as the attribute key.
*
* @exception NullPointerException if obj is null.
@@ -1916,7 +1916,7 @@
if (negativeExponent) {
exponent = -exponent;
fieldStart = result.length();
- result.append(symbols.getMinusSign());
+ result.append(symbols.getMinusSignText());
delegate.formatted(Field.EXPONENT_SIGN, Field.EXPONENT_SIGN,
fieldStart, result.length(), result);
}
@@ -2042,17 +2042,17 @@
}
/**
- * Appends the String <code>string</code> to <code>result</code>.
- * <code>delegate</code> is notified of all the
- * <code>FieldPosition</code>s in <code>positions</code>.
+ * Appends the String {@code string} to {@code result}.
+ * {@code delegate} is notified of all the
+ * {@code FieldPosition}s in {@code positions}.
* <p>
- * If one of the <code>FieldPosition</code>s in <code>positions</code>
- * identifies a <code>SIGN</code> attribute, it is mapped to
- * <code>signAttribute</code>. This is used
- * to map the <code>SIGN</code> attribute to the <code>EXPONENT</code>
+ * If one of the {@code FieldPosition}s in {@code positions}
+ * identifies a {@code SIGN} attribute, it is mapped to
+ * {@code signAttribute}. This is used
+ * to map the {@code SIGN} attribute to the {@code EXPONENT}
* attribute as necessary.
* <p>
- * This is used by <code>subformat</code> to add the prefix/suffix.
+ * This is used by {@code subformat} to add the prefix/suffix.
*/
private void append(StringBuffer result, String string,
FieldDelegate delegate,
@@ -2078,60 +2078,60 @@
}
/**
- * Parses text from a string to produce a <code>Number</code>.
+ * Parses text from a string to produce a {@code Number}.
* <p>
* The method attempts to parse text starting at the index given by
- * <code>pos</code>.
- * If parsing succeeds, then the index of <code>pos</code> is updated
+ * {@code pos}.
+ * If parsing succeeds, then the index of {@code pos} is updated
* to the index after the last character used (parsing does not necessarily
* use all characters up to the end of the string), and the parsed
- * number is returned. The updated <code>pos</code> can be used to
+ * number is returned. The updated {@code pos} can be used to
* indicate the starting point for the next call to this method.
- * If an error occurs, then the index of <code>pos</code> is not
- * changed, the error index of <code>pos</code> is set to the index of
+ * If an error occurs, then the index of {@code pos} is not
+ * changed, the error index of {@code pos} is set to the index of
* the character where the error occurred, and null is returned.
* <p>
* The subclass returned depends on the value of {@link #isParseBigDecimal}
* as well as on the string being parsed.
* <ul>
- * <li>If <code>isParseBigDecimal()</code> is false (the default),
- * most integer values are returned as <code>Long</code>
- * objects, no matter how they are written: <code>"17"</code> and
- * <code>"17.000"</code> both parse to <code>Long(17)</code>.
- * Values that cannot fit into a <code>Long</code> are returned as
- * <code>Double</code>s. This includes values with a fractional part,
- * infinite values, <code>NaN</code>, and the value -0.0.
- * <code>DecimalFormat</code> does <em>not</em> decide whether to
- * return a <code>Double</code> or a <code>Long</code> based on the
+ * <li>If {@code isParseBigDecimal()} is false (the default),
+ * most integer values are returned as {@code Long}
+ * objects, no matter how they are written: {@code "17"} and
+ * {@code "17.000"} both parse to {@code Long(17)}.
+ * Values that cannot fit into a {@code Long} are returned as
+ * {@code Double}s. This includes values with a fractional part,
+ * infinite values, {@code NaN}, and the value -0.0.
+ * {@code DecimalFormat} does <em>not</em> decide whether to
+ * return a {@code Double} or a {@code Long} based on the
* presence of a decimal separator in the source string. Doing so
* would prevent integers that overflow the mantissa of a double,
- * such as <code>"-9,223,372,036,854,775,808.00"</code>, from being
+ * such as {@code "-9,223,372,036,854,775,808.00"}, from being
* parsed accurately.
* <p>
- * Callers may use the <code>Number</code> methods
- * <code>doubleValue</code>, <code>longValue</code>, etc., to obtain
+ * Callers may use the {@code Number} methods
+ * {@code doubleValue}, {@code longValue}, etc., to obtain
* the type they want.
- * <li>If <code>isParseBigDecimal()</code> is true, values are returned
- * as <code>BigDecimal</code> objects. The values are the ones
+ * <li>If {@code isParseBigDecimal()} is true, values are returned
+ * as {@code BigDecimal} objects. The values are the ones
* constructed by {@link java.math.BigDecimal#BigDecimal(String)}
* for corresponding strings in locale-independent format. The
* special cases negative and positive infinity and NaN are returned
- * as <code>Double</code> instances holding the values of the
- * corresponding <code>Double</code> constants.
+ * as {@code Double} instances holding the values of the
+ * corresponding {@code Double} constants.
* </ul>
* <p>
- * <code>DecimalFormat</code> parses all Unicode characters that represent
- * decimal digits, as defined by <code>Character.digit()</code>. In
- * addition, <code>DecimalFormat</code> also recognizes as digits the ten
+ * {@code DecimalFormat} parses all Unicode characters that represent
+ * decimal digits, as defined by {@code Character.digit()}. In
+ * addition, {@code DecimalFormat} also recognizes as digits the ten
* consecutive characters starting with the localized zero digit defined in
- * the <code>DecimalFormatSymbols</code> object.
+ * the {@code DecimalFormatSymbols} object.
*
* @param text the string to be parsed
- * @param pos A <code>ParsePosition</code> object with index and error
+ * @param pos A {@code ParsePosition} object with index and error
* index information as described above.
- * @return the parsed value, or <code>null</code> if the parse fails
- * @exception NullPointerException if <code>text</code> or
- * <code>pos</code> is null.
+ * @return the parsed value, or {@code null} if the parse fails
+ * @exception NullPointerException if {@code text} or
+ * {@code pos} is null.
*/
@Override
public Number parse(String text, ParsePosition pos) {
@@ -2475,7 +2475,7 @@
boolean[] stat = new boolean[STATUS_LENGTH];
DigitList exponentDigits = new DigitList();
- if (subparse(text, pos, "", Character.toString(symbols.getMinusSign()), exponentDigits, true, stat) &&
+ if (subparse(text, pos, "", symbols.getMinusSignText(), exponentDigits, true, stat) &&
exponentDigits.fitsIntoLong(stat[STATUS_POSITIVE], true)) {
position = pos.index; // Advance past the exponent
exponent = (int)exponentDigits.getLong();
@@ -2573,7 +2573,7 @@
/**
* Returns the FieldPositions of the fields in the prefix used for
* positive numbers. This is not used if the user has explicitly set
- * a positive prefix via <code>setPositivePrefix</code>. This is
+ * a positive prefix via {@code setPositivePrefix}. This is
* lazily created.
*
* @return FieldPositions in positive prefix
@@ -2614,7 +2614,7 @@
/**
* Returns the FieldPositions of the fields in the prefix used for
* negative numbers. This is not used if the user has explicitly set
- * a negative prefix via <code>setNegativePrefix</code>. This is
+ * a negative prefix via {@code setNegativePrefix}. This is
* lazily created.
*
* @return FieldPositions in positive prefix
@@ -2655,7 +2655,7 @@
/**
* Returns the FieldPositions of the fields in the suffix used for
* positive numbers. This is not used if the user has explicitly set
- * a positive suffix via <code>setPositiveSuffix</code>. This is
+ * a positive suffix via {@code setPositiveSuffix}. This is
* lazily created.
*
* @return FieldPositions in positive prefix
@@ -2696,7 +2696,7 @@
/**
* Returns the FieldPositions of the fields in the suffix used for
* negative numbers. This is not used if the user has explicitly set
- * a negative suffix via <code>setNegativeSuffix</code>. This is
+ * a negative suffix via {@code setNegativeSuffix}. This is
* lazily created.
*
* @return FieldPositions in positive prefix
@@ -2811,7 +2811,7 @@
/**
* Returns whether the {@link #parse(java.lang.String, java.text.ParsePosition)}
- * method returns <code>BigDecimal</code>. The default value is false.
+ * method returns {@code BigDecimal}. The default value is false.
*
* @return {@code true} if the parse method returns BigDecimal;
* {@code false} otherwise
@@ -2824,7 +2824,7 @@
/**
* Sets whether the {@link #parse(java.lang.String, java.text.ParsePosition)}
- * method returns <code>BigDecimal</code>.
+ * method returns {@code BigDecimal}.
*
* @param newValue {@code true} if the parse method returns BigDecimal;
* {@code false} otherwise
@@ -2991,14 +2991,14 @@
}
continue;
case PATTERN_PERCENT:
- c = symbols.getPercent();
- break;
+ buffer.append(symbols.getPercentText());
+ continue;
case PATTERN_PER_MILLE:
- c = symbols.getPerMill();
- break;
+ buffer.append(symbols.getPerMillText());
+ continue;
case PATTERN_MINUS:
- c = symbols.getMinusSign();
- break;
+ buffer.append(symbols.getMinusSignText());
+ continue;
}
}
buffer.append(c);
@@ -3027,12 +3027,11 @@
for (int i=0; i<pattern.length(); ) {
char c = pattern.charAt(i++);
if (c == QUOTE) {
- int field = -1;
Format.Field fieldID = null;
+ String string = null;
c = pattern.charAt(i++);
switch (c) {
case CURRENCY_SIGN:
- String string;
if (i<pattern.length() &&
pattern.charAt(i) == CURRENCY_SIGN) {
++i;
@@ -3040,41 +3039,32 @@
} else {
string = symbols.getCurrencySymbol();
}
- if (!string.isEmpty()) {
- if (positions == null) {
- positions = new ArrayList<>(2);
- }
- FieldPosition fp = new FieldPosition(Field.CURRENCY);
- fp.setBeginIndex(stringIndex);
- fp.setEndIndex(stringIndex + string.length());
- positions.add(fp);
- stringIndex += string.length();
- }
- continue;
+ fieldID = Field.CURRENCY;
+ break;
case PATTERN_PERCENT:
- c = symbols.getPercent();
- field = -1;
+ string = symbols.getPercentText();
fieldID = Field.PERCENT;
break;
case PATTERN_PER_MILLE:
- c = symbols.getPerMill();
- field = -1;
+ string = symbols.getPerMillText();
fieldID = Field.PERMILLE;
break;
case PATTERN_MINUS:
- c = symbols.getMinusSign();
- field = -1;
+ string = symbols.getMinusSignText();
fieldID = Field.SIGN;
break;
}
- if (fieldID != null) {
+
+ if (fieldID != null && !string.isEmpty()) {
if (positions == null) {
positions = new ArrayList<>(2);
}
- FieldPosition fp = new FieldPosition(fieldID, field);
+ FieldPosition fp = new FieldPosition(fieldID);
fp.setBeginIndex(stringIndex);
- fp.setEndIndex(stringIndex + 1);
+ fp.setEndIndex(stringIndex + string.length());
positions.add(fp);
+ stringIndex += string.length();
+ continue;
}
}
stringIndex++;
@@ -3129,14 +3119,14 @@
} else if (localized) {
switch (c) {
case PATTERN_PERCENT:
- c = symbols.getPercent();
- break;
+ buffer.append(symbols.getPercentText());
+ continue;
case PATTERN_PER_MILLE:
- c = symbols.getPerMill();
- break;
+ buffer.append(symbols.getPerMillText());
+ continue;
case PATTERN_MINUS:
- c = symbols.getMinusSign();
- break;
+ buffer.append(symbols.getMinusSignText());
+ continue;
}
}
buffer.append(c);
@@ -3155,11 +3145,11 @@
needQuote = affix.indexOf(symbols.getZeroDigit()) >= 0
|| affix.indexOf(symbols.getGroupingSeparator()) >= 0
|| affix.indexOf(symbols.getDecimalSeparator()) >= 0
- || affix.indexOf(symbols.getPercent()) >= 0
- || affix.indexOf(symbols.getPerMill()) >= 0
+ || affix.indexOf(symbols.getPercentText()) >= 0
+ || affix.indexOf(symbols.getPerMillText()) >= 0
|| affix.indexOf(symbols.getDigit()) >= 0
|| affix.indexOf(symbols.getPatternSeparator()) >= 0
- || affix.indexOf(symbols.getMinusSign()) >= 0
+ || affix.indexOf(symbols.getMinusSignText()) >= 0
|| affix.indexOf(CURRENCY_SIGN) >= 0;
} else {
needQuote = affix.indexOf(PATTERN_ZERO_DIGIT) >= 0
@@ -3235,7 +3225,7 @@
if ((negPrefixPattern != null && posPrefixPattern != null &&
negPrefixPattern.equals("'-" + posPrefixPattern)) ||
(negPrefixPattern == posPrefixPattern && // n == p == null
- negativePrefix.equals(symbols.getMinusSign() + positivePrefix)))
+ negativePrefix.equals(symbols.getMinusSignText() + positivePrefix)))
break;
}
result.append(localized ? symbols.getPatternSeparator() :
@@ -3255,16 +3245,16 @@
* by this routine, since that is the typical end-user desire;
* use setMaximumInteger if you want to set a real value.
* For negative numbers, use a second pattern, separated by a semicolon
- * <P>Example <code>"#,#00.0#"</code> → 1,234.56
+ * <P>Example {@code "#,#00.0#"} → 1,234.56
* <P>This means a minimum of 2 integer digits, 1 fraction digit, and
* a maximum of 2 fraction digits.
- * <p>Example: <code>"#,#00.0#;(#,#00.0#)"</code> for negatives in
+ * <p>Example: {@code "#,#00.0#;(#,#00.0#)"} for negatives in
* parentheses.
* <p>In negative patterns, the minimum and maximum counts are ignored;
* these are presumed to be set in the positive pattern.
*
* @param pattern a new pattern
- * @exception NullPointerException if <code>pattern</code> is null
+ * @exception NullPointerException if {@code pattern} is null
* @exception IllegalArgumentException if the given pattern is invalid.
*/
public void applyPattern(String pattern) {
@@ -3282,16 +3272,16 @@
* by this routine, since that is the typical end-user desire;
* use setMaximumInteger if you want to set a real value.
* For negative numbers, use a second pattern, separated by a semicolon
- * <P>Example <code>"#,#00.0#"</code> → 1,234.56
+ * <P>Example {@code "#,#00.0#"} → 1,234.56
* <P>This means a minimum of 2 integer digits, 1 fraction digit, and
* a maximum of 2 fraction digits.
- * <p>Example: <code>"#,#00.0#;(#,#00.0#)"</code> for negatives in
+ * <p>Example: {@code "#,#00.0#;(#,#00.0#)"} for negatives in
* parentheses.
* <p>In negative patterns, the minimum and maximum counts are ignored;
* these are presumed to be set in the positive pattern.
*
* @param pattern a new pattern
- * @exception NullPointerException if <code>pattern</code> is null
+ * @exception NullPointerException if {@code pattern} is null
* @exception IllegalArgumentException if the given pattern is invalid.
*/
public void applyLocalizedPattern(String pattern) {
@@ -3309,7 +3299,7 @@
char perMill = PATTERN_PER_MILLE;
char digit = PATTERN_DIGIT;
char separator = PATTERN_SEPARATOR;
- String exponent = PATTERN_EXPONENT;
+ String exponent = PATTERN_EXPONENT;
char minus = PATTERN_MINUS;
if (localized) {
zeroDigit = symbols.getZeroDigit();
@@ -3635,8 +3625,8 @@
/**
* Sets the maximum number of digits allowed in the integer portion of a
* number.
- * For formatting numbers other than <code>BigInteger</code> and
- * <code>BigDecimal</code> objects, the lower of <code>newValue</code> and
+ * For formatting numbers other than {@code BigInteger} and
+ * {@code BigDecimal} objects, the lower of {@code newValue} and
* 309 is used. Negative input values are replaced with 0.
* @see NumberFormat#setMaximumIntegerDigits
*/
@@ -3656,8 +3646,8 @@
/**
* Sets the minimum number of digits allowed in the integer portion of a
* number.
- * For formatting numbers other than <code>BigInteger</code> and
- * <code>BigDecimal</code> objects, the lower of <code>newValue</code> and
+ * For formatting numbers other than {@code BigInteger} and
+ * {@code BigDecimal} objects, the lower of {@code newValue} and
* 309 is used. Negative input values are replaced with 0.
* @see NumberFormat#setMinimumIntegerDigits
*/
@@ -3677,8 +3667,8 @@
/**
* Sets the maximum number of digits allowed in the fraction portion of a
* number.
- * For formatting numbers other than <code>BigInteger</code> and
- * <code>BigDecimal</code> objects, the lower of <code>newValue</code> and
+ * For formatting numbers other than {@code BigInteger} and
+ * {@code BigDecimal} objects, the lower of {@code newValue} and
* 340 is used. Negative input values are replaced with 0.
* @see NumberFormat#setMaximumFractionDigits
*/
@@ -3698,8 +3688,8 @@
/**
* Sets the minimum number of digits allowed in the fraction portion of a
* number.
- * For formatting numbers other than <code>BigInteger</code> and
- * <code>BigDecimal</code> objects, the lower of <code>newValue</code> and
+ * For formatting numbers other than {@code BigInteger} and
+ * {@code BigDecimal} objects, the lower of {@code newValue} and
* 340 is used. Negative input values are replaced with 0.
* @see NumberFormat#setMinimumFractionDigits
*/
@@ -3719,8 +3709,8 @@
/**
* Gets the maximum number of digits allowed in the integer portion of a
* number.
- * For formatting numbers other than <code>BigInteger</code> and
- * <code>BigDecimal</code> objects, the lower of the return value and
+ * For formatting numbers other than {@code BigInteger} and
+ * {@code BigDecimal} objects, the lower of the return value and
* 309 is used.
* @see #setMaximumIntegerDigits
*/
@@ -3732,8 +3722,8 @@
/**
* Gets the minimum number of digits allowed in the integer portion of a
* number.
- * For formatting numbers other than <code>BigInteger</code> and
- * <code>BigDecimal</code> objects, the lower of the return value and
+ * For formatting numbers other than {@code BigInteger} and
+ * {@code BigDecimal} objects, the lower of the return value and
* 309 is used.
* @see #setMinimumIntegerDigits
*/
@@ -3745,8 +3735,8 @@
/**
* Gets the maximum number of digits allowed in the fraction portion of a
* number.
- * For formatting numbers other than <code>BigInteger</code> and
- * <code>BigDecimal</code> objects, the lower of the return value and
+ * For formatting numbers other than {@code BigInteger} and
+ * {@code BigDecimal} objects, the lower of the return value and
* 340 is used.
* @see #setMaximumFractionDigits
*/
@@ -3758,8 +3748,8 @@
/**
* Gets the minimum number of digits allowed in the fraction portion of a
* number.
- * For formatting numbers other than <code>BigInteger</code> and
- * <code>BigDecimal</code> objects, the lower of the return value and
+ * For formatting numbers other than {@code BigInteger} and
+ * {@code BigDecimal} objects, the lower of the return value and
* 340 is used.
* @see #setMinimumFractionDigits
*/
@@ -3775,7 +3765,7 @@
* {@link DecimalFormatSymbols#getCurrency DecimalFormatSymbols.getCurrency}
* on this number format's symbols.
*
- * @return the currency used by this decimal format, or <code>null</code>
+ * @return the currency used by this decimal format, or {@code null}
* @since 1.4
*/
@Override
@@ -3792,7 +3782,7 @@
* on this number format's symbols.
*
* @param currency the new currency to be used by this decimal format
- * @exception NullPointerException if <code>currency</code> is null
+ * @exception NullPointerException if {@code currency} is null
* @since 1.4
*/
@Override
@@ -3809,7 +3799,7 @@
/**
* Gets the {@link java.math.RoundingMode} used in this DecimalFormat.
*
- * @return The <code>RoundingMode</code> used for this DecimalFormat.
+ * @return The {@code RoundingMode} used for this DecimalFormat.
* @see #setRoundingMode(RoundingMode)
* @since 1.6
*/
@@ -3821,9 +3811,9 @@
/**
* Sets the {@link java.math.RoundingMode} used in this DecimalFormat.
*
- * @param roundingMode The <code>RoundingMode</code> to be used
+ * @param roundingMode The {@code RoundingMode} to be used
* @see #getRoundingMode()
- * @exception NullPointerException if <code>roundingMode</code> is null.
+ * @exception NullPointerException if {@code roundingMode} is null.
* @since 1.6
*/
@Override
@@ -3845,38 +3835,38 @@
* <li>
* Verify that the superclass's digit count fields correctly reflect
* the limits imposed on formatting numbers other than
- * <code>BigInteger</code> and <code>BigDecimal</code> objects. These
+ * {@code BigInteger} and {@code BigDecimal} objects. These
* limits are stored in the superclass for serialization compatibility
- * with older versions, while the limits for <code>BigInteger</code> and
- * <code>BigDecimal</code> objects are kept in this class.
+ * with older versions, while the limits for {@code BigInteger} and
+ * {@code BigDecimal} objects are kept in this class.
* If, in the superclass, the minimum or maximum integer digit count is
- * larger than <code>DOUBLE_INTEGER_DIGITS</code> or if the minimum or
+ * larger than {@code DOUBLE_INTEGER_DIGITS} or if the minimum or
* maximum fraction digit count is larger than
- * <code>DOUBLE_FRACTION_DIGITS</code>, then the stream data is invalid
- * and this method throws an <code>InvalidObjectException</code>.
+ * {@code DOUBLE_FRACTION_DIGITS}, then the stream data is invalid
+ * and this method throws an {@code InvalidObjectException}.
* <li>
- * If <code>serialVersionOnStream</code> is less than 4, initialize
- * <code>roundingMode</code> to {@link java.math.RoundingMode#HALF_EVEN
+ * If {@code serialVersionOnStream} is less than 4, initialize
+ * {@code roundingMode} to {@link java.math.RoundingMode#HALF_EVEN
* RoundingMode.HALF_EVEN}. This field is new with version 4.
* <li>
- * If <code>serialVersionOnStream</code> is less than 3, then call
+ * If {@code serialVersionOnStream} is less than 3, then call
* the setters for the minimum and maximum integer and fraction digits with
* the values of the corresponding superclass getters to initialize the
* fields in this class. The fields in this class are new with version 3.
* <li>
- * If <code>serialVersionOnStream</code> is less than 1, indicating that
+ * If {@code serialVersionOnStream} is less than 1, indicating that
* the stream was written by JDK 1.1, initialize
- * <code>useExponentialNotation</code>
+ * {@code useExponentialNotation}
* to false, since it was not present in JDK 1.1.
* <li>
- * Set <code>serialVersionOnStream</code> to the maximum allowed value so
+ * Set {@code serialVersionOnStream} to the maximum allowed value so
* that default serialization will work properly if this object is streamed
* out again.
* </ol>
*
* <p>Stream versions older than 2 will not have the affix pattern variables
- * <code>posPrefixPattern</code> etc. As a result, they will be initialized
- * to <code>null</code>, which means the affix strings will be taken as
+ * {@code posPrefixPattern} etc. As a result, they will be initialized
+ * to {@code null}, which means the affix strings will be taken as
* literal values. This is exactly what we want, since that corresponds to
* the pre-version-2 behavior.
*/
@@ -3960,14 +3950,14 @@
/**
* The prefix pattern for non-negative numbers. This variable corresponds
- * to <code>positivePrefix</code>.
+ * to {@code positivePrefix}.
*
- * <p>This pattern is expanded by the method <code>expandAffix()</code> to
- * <code>positivePrefix</code> to update the latter to reflect changes in
- * <code>symbols</code>. If this variable is <code>null</code> then
- * <code>positivePrefix</code> is taken as a literal value that does not
- * change when <code>symbols</code> changes. This variable is always
- * <code>null</code> for <code>DecimalFormat</code> objects older than
+ * <p>This pattern is expanded by the method {@code expandAffix()} to
+ * {@code positivePrefix} to update the latter to reflect changes in
+ * {@code symbols}. If this variable is {@code null} then
+ * {@code positivePrefix} is taken as a literal value that does not
+ * change when {@code symbols} changes. This variable is always
+ * {@code null} for {@code DecimalFormat} objects older than
* stream version 2 restored from stream.
*
* @serial
@@ -3977,8 +3967,8 @@
/**
* The suffix pattern for non-negative numbers. This variable corresponds
- * to <code>positiveSuffix</code>. This variable is analogous to
- * <code>posPrefixPattern</code>; see that variable for further
+ * to {@code positiveSuffix}. This variable is analogous to
+ * {@code posPrefixPattern}; see that variable for further
* documentation.
*
* @serial
@@ -3988,8 +3978,8 @@
/**
* The prefix pattern for negative numbers. This variable corresponds
- * to <code>negativePrefix</code>. This variable is analogous to
- * <code>posPrefixPattern</code>; see that variable for further
+ * to {@code negativePrefix}. This variable is analogous to
+ * {@code posPrefixPattern}; see that variable for further
* documentation.
*
* @serial
@@ -3999,8 +3989,8 @@
/**
* The suffix pattern for negative numbers. This variable corresponds
- * to <code>negativeSuffix</code>. This variable is analogous to
- * <code>posPrefixPattern</code>; see that variable for further
+ * to {@code negativeSuffix}. This variable is analogous to
+ * {@code posPrefixPattern}; see that variable for further
* documentation.
*
* @serial
@@ -4019,7 +4009,7 @@
/**
* The number of digits between grouping separators in the integer
* portion of a number. Must be greater than 0 if
- * <code>NumberFormat.groupingUsed</code> is true.
+ * {@code NumberFormat.groupingUsed} is true.
*
* @serial
* @see #getGroupingSize
@@ -4053,7 +4043,7 @@
private transient boolean isCurrencyFormat = false;
/**
- * The <code>DecimalFormatSymbols</code> object used by this format.
+ * The {@code DecimalFormatSymbols} object used by this format.
* It contains the symbols used to format numbers, e.g. the grouping separator,
* decimal separator, and so on.
*
@@ -4074,28 +4064,28 @@
/**
* FieldPositions describing the positive prefix String. This is
- * lazily created. Use <code>getPositivePrefixFieldPositions</code>
+ * lazily created. Use {@code getPositivePrefixFieldPositions}
* when needed.
*/
private transient FieldPosition[] positivePrefixFieldPositions;
/**
* FieldPositions describing the positive suffix String. This is
- * lazily created. Use <code>getPositiveSuffixFieldPositions</code>
+ * lazily created. Use {@code getPositiveSuffixFieldPositions}
* when needed.
*/
private transient FieldPosition[] positiveSuffixFieldPositions;
/**
* FieldPositions describing the negative prefix String. This is
- * lazily created. Use <code>getNegativePrefixFieldPositions</code>
+ * lazily created. Use {@code getNegativePrefixFieldPositions}
* when needed.
*/
private transient FieldPosition[] negativePrefixFieldPositions;
/**
* FieldPositions describing the negative suffix String. This is
- * lazily created. Use <code>getNegativeSuffixFieldPositions</code>
+ * lazily created. Use {@code getNegativeSuffixFieldPositions}
* when needed.
*/
private transient FieldPosition[] negativeSuffixFieldPositions;
@@ -4103,7 +4093,7 @@
/**
* The minimum number of digits used to display the exponent when a number is
* formatted in exponential notation. This field is ignored if
- * <code>useExponentialNotation</code> is not true.
+ * {@code useExponentialNotation} is not true.
*
* @serial
* @since 1.2
@@ -4112,9 +4102,9 @@
/**
* The maximum number of digits allowed in the integer portion of a
- * <code>BigInteger</code> or <code>BigDecimal</code> number.
- * <code>maximumIntegerDigits</code> must be greater than or equal to
- * <code>minimumIntegerDigits</code>.
+ * {@code BigInteger} or {@code BigDecimal} number.
+ * {@code maximumIntegerDigits} must be greater than or equal to
+ * {@code minimumIntegerDigits}.
*
* @serial
* @see #getMaximumIntegerDigits
@@ -4124,9 +4114,9 @@
/**
* The minimum number of digits allowed in the integer portion of a
- * <code>BigInteger</code> or <code>BigDecimal</code> number.
- * <code>minimumIntegerDigits</code> must be less than or equal to
- * <code>maximumIntegerDigits</code>.
+ * {@code BigInteger} or {@code BigDecimal} number.
+ * {@code minimumIntegerDigits} must be less than or equal to
+ * {@code maximumIntegerDigits}.
*
* @serial
* @see #getMinimumIntegerDigits
@@ -4136,9 +4126,9 @@
/**
* The maximum number of digits allowed in the fractional portion of a
- * <code>BigInteger</code> or <code>BigDecimal</code> number.
- * <code>maximumFractionDigits</code> must be greater than or equal to
- * <code>minimumFractionDigits</code>.
+ * {@code BigInteger} or {@code BigDecimal} number.
+ * {@code maximumFractionDigits} must be greater than or equal to
+ * {@code minimumFractionDigits}.
*
* @serial
* @see #getMaximumFractionDigits
@@ -4148,9 +4138,9 @@
/**
* The minimum number of digits allowed in the fractional portion of a
- * <code>BigInteger</code> or <code>BigDecimal</code> number.
- * <code>minimumFractionDigits</code> must be less than or equal to
- * <code>maximumFractionDigits</code>.
+ * {@code BigInteger} or {@code BigDecimal} number.
+ * {@code minimumFractionDigits} must be less than or equal to
+ * {@code maximumFractionDigits}.
*
* @serial
* @see #getMinimumFractionDigits
@@ -4247,19 +4237,19 @@
* <ul>
* <li><b>0</b> (default): versions before the Java 2 platform v1.2
* <li><b>1</b>: version for 1.2, which includes the two new fields
- * <code>useExponentialNotation</code> and
- * <code>minExponentDigits</code>.
+ * {@code useExponentialNotation} and
+ * {@code minExponentDigits}.
* <li><b>2</b>: version for 1.3 and later, which adds four new fields:
- * <code>posPrefixPattern</code>, <code>posSuffixPattern</code>,
- * <code>negPrefixPattern</code>, and <code>negSuffixPattern</code>.
+ * {@code posPrefixPattern}, {@code posSuffixPattern},
+ * {@code negPrefixPattern}, and {@code negSuffixPattern}.
* <li><b>3</b>: version for 1.5 and later, which adds five new fields:
- * <code>maximumIntegerDigits</code>,
- * <code>minimumIntegerDigits</code>,
- * <code>maximumFractionDigits</code>,
- * <code>minimumFractionDigits</code>, and
- * <code>parseBigDecimal</code>.
+ * {@code maximumIntegerDigits},
+ * {@code minimumIntegerDigits},
+ * {@code maximumFractionDigits},
+ * {@code minimumFractionDigits}, and
+ * {@code parseBigDecimal}.
* <li><b>4</b>: version for 1.6 and later, which adds one new field:
- * <code>roundingMode</code>.
+ * {@code roundingMode}.
* </ul>
* @since 1.2
* @serial
--- a/src/java.base/share/classes/java/text/DecimalFormatSymbols.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/text/DecimalFormatSymbols.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,12 +38,14 @@
package java.text;
+import java.io.InvalidObjectException;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.text.spi.DecimalFormatSymbolsProvider;
import java.util.Currency;
import java.util.Locale;
+import java.util.Objects;
import sun.util.locale.provider.CalendarDataUtility;
import sun.util.locale.provider.LocaleProviderAdapter;
import sun.util.locale.provider.LocaleServiceProviderPool;
@@ -51,11 +53,11 @@
/**
* This class represents the set of symbols (such as the decimal separator,
- * the grouping separator, and so on) needed by <code>DecimalFormat</code>
- * to format numbers. <code>DecimalFormat</code> creates for itself an instance of
- * <code>DecimalFormatSymbols</code> from its locale data. If you need to change any
- * of these symbols, you can get the <code>DecimalFormatSymbols</code> object from
- * your <code>DecimalFormat</code> and modify it.
+ * the grouping separator, and so on) needed by {@code DecimalFormat}
+ * to format numbers. {@code DecimalFormat} creates for itself an instance of
+ * {@code DecimalFormatSymbols} from its locale data. If you need to change any
+ * of these symbols, you can get the {@code DecimalFormatSymbols} object from
+ * your {@code DecimalFormat} and modify it.
*
* <p>If the locale contains "rg" (region override)
* <a href="../util/Locale.html#def_locale_extension">Unicode extension</a>,
@@ -107,7 +109,7 @@
* instead of the Latin numbering system.
*
* @param locale the desired locale
- * @exception NullPointerException if <code>locale</code> is null
+ * @exception NullPointerException if {@code locale} is null
*/
public DecimalFormatSymbols( Locale locale ) {
initialize( locale );
@@ -115,16 +117,16 @@
/**
* Returns an array of all locales for which the
- * <code>getInstance</code> methods of this class can return
+ * {@code getInstance} methods of this class can return
* localized instances.
* The returned array represents the union of locales supported by the Java
* runtime and by installed
* {@link java.text.spi.DecimalFormatSymbolsProvider DecimalFormatSymbolsProvider}
- * implementations. It must contain at least a <code>Locale</code>
+ * implementations. It must contain at least a {@code Locale}
* instance equal to {@link java.util.Locale#US Locale.US}.
*
* @return an array of locales for which localized
- * <code>DecimalFormatSymbols</code> instances are available.
+ * {@code DecimalFormatSymbols} instances are available.
* @since 1.6
*/
public static Locale[] getAvailableLocales() {
@@ -134,8 +136,8 @@
}
/**
- * Gets the <code>DecimalFormatSymbols</code> instance for the default
- * locale. This method provides access to <code>DecimalFormatSymbols</code>
+ * Gets the {@code DecimalFormatSymbols} instance for the default
+ * locale. This method provides access to {@code DecimalFormatSymbols}
* instances for locales supported by the Java runtime itself as well
* as for those supported by installed
* {@link java.text.spi.DecimalFormatSymbolsProvider
@@ -145,7 +147,7 @@
* getInstance(Locale.getDefault(Locale.Category.FORMAT))}.
* @see java.util.Locale#getDefault(java.util.Locale.Category)
* @see java.util.Locale.Category#FORMAT
- * @return a <code>DecimalFormatSymbols</code> instance.
+ * @return a {@code DecimalFormatSymbols} instance.
* @since 1.6
*/
public static final DecimalFormatSymbols getInstance() {
@@ -153,8 +155,8 @@
}
/**
- * Gets the <code>DecimalFormatSymbols</code> instance for the specified
- * locale. This method provides access to <code>DecimalFormatSymbols</code>
+ * Gets the {@code DecimalFormatSymbols} instance for the specified
+ * locale. This method provides access to {@code DecimalFormatSymbols}
* instances for locales supported by the Java runtime itself as well
* as for those supported by installed
* {@link java.text.spi.DecimalFormatSymbolsProvider
@@ -169,8 +171,8 @@
* instead of the Latin numbering system.
*
* @param locale the desired locale.
- * @return a <code>DecimalFormatSymbols</code> instance.
- * @exception NullPointerException if <code>locale</code> is null
+ * @return a {@code DecimalFormatSymbols} instance.
+ * @exception NullPointerException if {@code locale} is null
* @since 1.6
*/
public static final DecimalFormatSymbols getInstance(Locale locale) {
@@ -255,6 +257,41 @@
*/
public void setPerMill(char perMill) {
this.perMill = perMill;
+ this.perMillText = Character.toString(perMill);
+ }
+
+ /**
+ * Gets the string used for per mille sign. Different for Arabic, etc.
+ *
+ * @return the string used for per mille sign
+ * @since 13
+ */
+ String getPerMillText() {
+ return perMillText;
+ }
+
+ /**
+ * Sets the string used for per mille sign. Different for Arabic, etc.
+ *
+ * Setting the {@code perMillText} affects the return value of
+ * {@link #getPerMill()}, in which the first non-format character of
+ * {@code perMillText} is returned.
+ *
+ * @param perMillText the string used for per mille sign
+ * @throws NullPointerException if {@code perMillText} is null
+ * @throws IllegalArgumentException if {@code perMillText} is an empty string
+ * @see #getPerMill()
+ * @see #getPerMillText()
+ * @since 13
+ */
+ void setPerMillText(String perMillText) {
+ Objects.requireNonNull(perMillText);
+ if (perMillText.isEmpty()) {
+ throw new IllegalArgumentException("Empty argument string");
+ }
+
+ this.perMillText = perMillText;
+ this.perMill = findNonFormatChar(perMillText, '\u2030');
}
/**
@@ -273,6 +310,41 @@
*/
public void setPercent(char percent) {
this.percent = percent;
+ this.percentText = Character.toString(percent);
+ }
+
+ /**
+ * Gets the string used for percent sign. Different for Arabic, etc.
+ *
+ * @return the string used for percent sign
+ * @since 13
+ */
+ String getPercentText() {
+ return percentText;
+ }
+
+ /**
+ * Sets the string used for percent sign. Different for Arabic, etc.
+ *
+ * Setting the {@code percentText} affects the return value of
+ * {@link #getPercent()}, in which the first non-format character of
+ * {@code percentText} is returned.
+ *
+ * @param percentText the string used for percent sign
+ * @throws NullPointerException if {@code percentText} is null
+ * @throws IllegalArgumentException if {@code percentText} is an empty string
+ * @see #getPercent()
+ * @see #getPercentText()
+ * @since 13
+ */
+ void setPercentText(String percentText) {
+ Objects.requireNonNull(percentText);
+ if (percentText.isEmpty()) {
+ throw new IllegalArgumentException("Empty argument string");
+ }
+
+ this.percentText = percentText;
+ this.percent = findNonFormatChar(percentText, '%');
}
/**
@@ -373,6 +445,46 @@
*/
public void setMinusSign(char minusSign) {
this.minusSign = minusSign;
+ this.minusSignText = Character.toString(minusSign);
+ }
+
+ /**
+ * Gets the string used to represent minus sign. If no explicit
+ * negative format is specified, one is formed by prefixing
+ * minusSignText to the positive format.
+ *
+ * @return the string representing minus sign
+ * @since 13
+ */
+ String getMinusSignText() {
+ return minusSignText;
+ }
+
+ /**
+ * Sets the string used to represent minus sign. If no explicit
+ * negative format is specified, one is formed by prefixing
+ * minusSignText to the positive format.
+ *
+ * Setting the {@code minusSignText} affects the return value of
+ * {@link #getMinusSign()}, in which the first non-format character of
+ * {@code minusSignText} is returned.
+ *
+ * @param minusSignText the character representing minus sign
+ * @throws NullPointerException if {@code minusSignText} is null
+ * @throws IllegalArgumentException if {@code minusSignText} is an
+ * empty string
+ * @see #getMinusSign()
+ * @see #getMinusSignText()
+ * @since 13
+ */
+ void setMinusSignText(String minusSignText) {
+ Objects.requireNonNull(minusSignText);
+ if (minusSignText.isEmpty()) {
+ throw new IllegalArgumentException("Empty argument string");
+ }
+
+ this.minusSignText = minusSignText;
+ this.minusSign = findNonFormatChar(minusSignText, '-');
}
/**
@@ -464,7 +576,7 @@
* symbol attribute to the currency's ISO 4217 currency code.
*
* @param currency the new currency to be used
- * @exception NullPointerException if <code>currency</code> is null
+ * @exception NullPointerException if {@code currency} is null
* @since 1.4
* @see #setCurrencySymbol
* @see #setInternationalCurrencySymbol
@@ -540,7 +652,7 @@
* Examples: "x10^" for 1.23x10^4, "E" for 1.23E4.
*
* @param exp the exponent separator string
- * @exception NullPointerException if <code>exp</code> is null
+ * @exception NullPointerException if {@code exp} is null
* @see #getExponentSeparator()
* @since 1.6
*/
@@ -583,9 +695,12 @@
groupingSeparator == other.groupingSeparator &&
decimalSeparator == other.decimalSeparator &&
percent == other.percent &&
+ percentText.equals(other.percentText) &&
perMill == other.perMill &&
+ perMillText.equals(other.perMillText) &&
digit == other.digit &&
minusSign == other.minusSign &&
+ minusSignText.equals(other.minusSignText) &&
patternSeparator == other.patternSeparator &&
infinity.equals(other.infinity) &&
NaN.equals(other.NaN) &&
@@ -631,13 +746,16 @@
decimalSeparator = numberElements[0].charAt(0);
groupingSeparator = numberElements[1].charAt(0);
patternSeparator = numberElements[2].charAt(0);
- percent = numberElements[3].charAt(0);
+ percentText = numberElements[3];
+ percent = findNonFormatChar(percentText, '%');
zeroDigit = numberElements[4].charAt(0); //different for Arabic,etc.
digit = numberElements[5].charAt(0);
- minusSign = numberElements[6].charAt(0);
+ minusSignText = numberElements[6];
+ minusSign = findNonFormatChar(minusSignText, '-');
exponential = numberElements[7].charAt(0);
exponentialSeparator = numberElements[7]; //string representation new since 1.6
- perMill = numberElements[8].charAt(0);
+ perMillText = numberElements[8];
+ perMill = findNonFormatChar(perMillText, '\u2030');
infinity = numberElements[9];
NaN = numberElements[10];
@@ -652,6 +770,16 @@
}
/**
+ * Obtains non-format single character from String
+ */
+ private char findNonFormatChar(String src, char defChar) {
+ return (char)src.chars()
+ .filter(c -> Character.getType(c) != Character.FORMAT)
+ .findFirst()
+ .orElse(defChar);
+ }
+
+ /**
* Lazy initialization for currency related fields
*/
private void initializeCurrency(Locale locale) {
@@ -704,18 +832,24 @@
/**
* Reads the default serializable fields, provides default values for objects
* in older serial versions, and initializes non-serializable fields.
- * If <code>serialVersionOnStream</code>
- * is less than 1, initializes <code>monetarySeparator</code> to be
- * the same as <code>decimalSeparator</code> and <code>exponential</code>
+ * If {@code serialVersionOnStream}
+ * is less than 1, initializes {@code monetarySeparator} to be
+ * the same as {@code decimalSeparator} and {@code exponential}
* to be 'E'.
- * If <code>serialVersionOnStream</code> is less than 2,
- * initializes <code>locale</code>to the root locale, and initializes
- * If <code>serialVersionOnStream</code> is less than 3, it initializes
- * <code>exponentialSeparator</code> using <code>exponential</code>.
- * Sets <code>serialVersionOnStream</code> back to the maximum allowed value so that
+ * If {@code serialVersionOnStream} is less than 2,
+ * initializes {@code locale}to the root locale, and initializes
+ * If {@code serialVersionOnStream} is less than 3, it initializes
+ * {@code exponentialSeparator} using {@code exponential}.
+ * If {@code serialVersionOnStream} is less than 4, it initializes
+ * {@code perMillText}, {@code percentText}, and
+ * {@code minusSignText} using {@code perMill}, {@code percent}, and
+ * {@code minusSign} respectively.
+ * Sets {@code serialVersionOnStream} back to the maximum allowed value so that
* default serialization will work properly if this object is streamed out again.
* Initializes the currency from the intlCurrencySymbol field.
*
+ * @throws InvalidObjectException if {@code char} and {@code String}
+ * representations of either percent, per mille, and/or minus sign disagree.
* @since 1.1.6
*/
private void readObject(ObjectInputStream stream)
@@ -735,6 +869,23 @@
// didn't have exponentialSeparator. Create one using exponential
exponentialSeparator = Character.toString(exponential);
}
+ if (serialVersionOnStream < 4) {
+ // didn't have perMillText, percentText, and minusSignText.
+ // Create one using corresponding char variations.
+ perMillText = Character.toString(perMill);
+ percentText = Character.toString(percent);
+ minusSignText = Character.toString(minusSign);
+ } else {
+ // Check whether char and text fields agree
+ if (findNonFormatChar(perMillText, '\uFFFF') != perMill ||
+ findNonFormatChar(percentText, '\uFFFF') != percent ||
+ findNonFormatChar(minusSignText, '\uFFFF') != minusSign) {
+ throw new InvalidObjectException(
+ "'char' and 'String' representations of either percent, " +
+ "per mille, and/or minus sign disagree.");
+ }
+ }
+
serialVersionOnStream = currentSerialVersion;
if (intlCurrencySymbol != null) {
@@ -862,8 +1013,8 @@
* The string used to separate the mantissa from the exponent.
* Examples: "x10^" for 1.23x10^4, "E" for 1.23E4.
* <p>
- * If both <code>exponential</code> and <code>exponentialSeparator</code>
- * exist, this <code>exponentialSeparator</code> has the precedence.
+ * If both {@code exponential} and {@code exponentialSeparator}
+ * exist, this {@code exponentialSeparator} has the precedence.
*
* @serial
* @since 1.6
@@ -878,6 +1029,39 @@
*/
private Locale locale;
+ /**
+ * String representation of per mille sign, which may include
+ * formatting characters, such as BiDi control characters.
+ * The first non-format character of this string is the same as
+ * {@code perMill}.
+ *
+ * @serial
+ * @since 13
+ */
+ private String perMillText;
+
+ /**
+ * String representation of percent sign, which may include
+ * formatting characters, such as BiDi control characters.
+ * The first non-format character of this string is the same as
+ * {@code percent}.
+ *
+ * @serial
+ * @since 13
+ */
+ private String percentText;
+
+ /**
+ * String representation of minus sign, which may include
+ * formatting characters, such as BiDi control characters.
+ * The first non-format character of this string is the same as
+ * {@code minusSign}.
+ *
+ * @serial
+ * @since 13
+ */
+ private String minusSignText;
+
// currency; only the ISO code is serialized.
private transient Currency currency;
private transient volatile boolean currencyInitialized;
@@ -891,23 +1075,28 @@
// monetarySeparator and exponential.
// - 2 for version from J2SE 1.4, which includes locale field.
// - 3 for version from J2SE 1.6, which includes exponentialSeparator field.
- private static final int currentSerialVersion = 3;
+ // - 4 for version from Java SE 13, which includes perMillText, percentText,
+ // and minusSignText field.
+ private static final int currentSerialVersion = 4;
/**
- * Describes the version of <code>DecimalFormatSymbols</code> present on the stream.
+ * Describes the version of {@code DecimalFormatSymbols} present on the stream.
* Possible values are:
* <ul>
* <li><b>0</b> (or uninitialized): versions prior to JDK 1.1.6.
*
* <li><b>1</b>: Versions written by JDK 1.1.6 or later, which include
- * two new fields: <code>monetarySeparator</code> and <code>exponential</code>.
+ * two new fields: {@code monetarySeparator} and {@code exponential}.
* <li><b>2</b>: Versions written by J2SE 1.4 or later, which include a
- * new <code>locale</code> field.
+ * new {@code locale} field.
* <li><b>3</b>: Versions written by J2SE 1.6 or later, which include a
- * new <code>exponentialSeparator</code> field.
+ * new {@code exponentialSeparator} field.
+ * <li><b>4</b>: Versions written by Java SE 13 or later, which include
+ * new {@code perMillText}, {@code percentText}, and
+ * {@code minusSignText} field.
* </ul>
- * When streaming out a <code>DecimalFormatSymbols</code>, the most recent format
- * (corresponding to the highest allowable <code>serialVersionOnStream</code>)
+ * When streaming out a {@code DecimalFormatSymbols}, the most recent format
+ * (corresponding to the highest allowable {@code serialVersionOnStream})
* is always written.
*
* @serial
--- a/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -363,9 +363,8 @@
/**
* Returns the calendar system era object from the given numeric value.
*
- * See the description of each Era for the numeric values of:
- * {@link JapaneseEra#HEISEI}, {@link JapaneseEra#SHOWA},{@link JapaneseEra#TAISHO},
- * {@link JapaneseEra#MEIJI}), only Meiji and later eras are supported.
+ * The numeric values supported by this method are the same as the
+ * numeric values supported by {@link JapaneseEra#of(int)}.
*
* @param eraValue the era value
* @return the Japanese {@code Era} for the given numeric era value
--- a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java Tue Apr 02 10:57:57 2019 +0530
@@ -151,14 +151,15 @@
*/
public static final JapaneseEra HEISEI = new JapaneseEra(2, LocalDate.of(1989, 1, 8));
/**
- * The singleton instance for the 'NewEra' era (2019-05-01 - current)
- * which has the value 3.
+ * The singleton instance for the 'Reiwa' era (2019-05-01 - )
+ * which has the value 3. The end date of this era is not specified, unless
+ * the Japanese Government defines it.
*/
- private static final JapaneseEra NEWERA = new JapaneseEra(3, LocalDate.of(2019, 5, 1));
+ public static final JapaneseEra REIWA = new JapaneseEra(3, LocalDate.of(2019, 5, 1));
// The number of predefined JapaneseEra constants.
// There may be a supplemental era defined by the property.
- private static final int N_ERA_CONSTANTS = NEWERA.getValue() + ERA_OFFSET;
+ private static final int N_ERA_CONSTANTS = REIWA.getValue() + ERA_OFFSET;
/**
* Serialization version.
@@ -176,7 +177,7 @@
KNOWN_ERAS[1] = TAISHO;
KNOWN_ERAS[2] = SHOWA;
KNOWN_ERAS[3] = HEISEI;
- KNOWN_ERAS[4] = NEWERA;
+ KNOWN_ERAS[4] = REIWA;
for (int i = N_ERA_CONSTANTS; i < ERA_CONFIG.length; i++) {
CalendarDate date = ERA_CONFIG[i].getSinceDate();
LocalDate isoDate = LocalDate.of(date.getYear(), date.getMonth(), date.getDayOfMonth());
--- a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java Tue Apr 02 10:57:57 2019 +0530
@@ -50,7 +50,7 @@
* 2 Taisho 1912-07-30T00:00:00 local time
* 3 Showa 1926-12-25T00:00:00 local time
* 4 Heisei 1989-01-08T00:00:00 local time
- * 5 NewEra 2019-05-01T00:00:00 local time
+ * 5 Reiwa 2019-05-01T00:00:00 local time
* ------------------------------------------------------
* }</pre>
*
@@ -129,9 +129,9 @@
public static final int HEISEI = 4;
/**
- * The ERA constant designating the NewEra era.
+ * The ERA constant designating the Reiwa era.
*/
- private static final int NEWERA = 5;
+ private static final int REIWA = 5;
private static final int EPOCH_OFFSET = 719163; // Fixed date of January 1, 1970 (Gregorian)
@@ -1761,12 +1761,12 @@
}
} else if (transitionYear) {
if (jdate.getYear() == 1) {
- // As of NewEra (since Meiji) there's no case
+ // As of Reiwa (since Meiji) there's no case
// that there are multiple transitions in a
// year. Historically there was such
// case. There might be such case again in the
// future.
- if (era > NEWERA) {
+ if (era > REIWA) {
CalendarDate pd = eras[era - 1].getSinceDate();
if (normalizedYear == pd.getYear()) {
d.setMonth(pd.getMonth()).setDayOfMonth(pd.getDayOfMonth());
--- a/src/java.base/share/classes/java/util/jar/Attributes.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/util/jar/Attributes.java Tue Apr 02 10:57:57 2019 +0530
@@ -34,6 +34,8 @@
import java.util.Objects;
import java.util.Set;
+import jdk.internal.misc.VM;
+import jdk.internal.vm.annotation.Stable;
import sun.util.logging.PlatformLogger;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -454,7 +456,7 @@
/**
* Avoid allocation for common Names
*/
- private static final Map<String, Name> KNOWN_NAMES;
+ private static @Stable Map<String, Name> KNOWN_NAMES;
static final Name of(String name) {
Name n = KNOWN_NAMES.get(name);
@@ -541,7 +543,7 @@
* @see <a href="{@docRoot}/../specs/jar/jar.html#jar-manifest">
* Manifest and Signature Specification</a>
*/
- public static final Name MANIFEST_VERSION = new Name("Manifest-Version");
+ public static final Name MANIFEST_VERSION;
/**
* {@code Name} object for {@code Signature-Version}
@@ -549,13 +551,13 @@
* @see <a href="{@docRoot}/../specs/jar/jar.html#jar-manifest">
* Manifest and Signature Specification</a>
*/
- public static final Name SIGNATURE_VERSION = new Name("Signature-Version");
+ public static final Name SIGNATURE_VERSION;
/**
* {@code Name} object for {@code Content-Type}
* manifest attribute.
*/
- public static final Name CONTENT_TYPE = new Name("Content-Type");
+ public static final Name CONTENT_TYPE;
/**
* {@code Name} object for {@code Class-Path}
@@ -563,7 +565,7 @@
* @see <a href="{@docRoot}/../specs/jar/jar.html#class-path-attribute">
* JAR file specification</a>
*/
- public static final Name CLASS_PATH = new Name("Class-Path");
+ public static final Name CLASS_PATH;
/**
* {@code Name} object for {@code Main-Class} manifest
@@ -572,7 +574,7 @@
* with the {@code -jar} command-line option of the
* {@code java} application launcher.
*/
- public static final Name MAIN_CLASS = new Name("Main-Class");
+ public static final Name MAIN_CLASS;
/**
* {@code Name} object for {@code Sealed} manifest attribute
@@ -580,19 +582,19 @@
* @see <a href="{@docRoot}/../specs/jar/jar.html#package-sealing">
* Package Sealing</a>
*/
- public static final Name SEALED = new Name("Sealed");
+ public static final Name SEALED;
/**
* {@code Name} object for {@code Extension-List} manifest attribute
* used for the extension mechanism that is no longer supported.
*/
- public static final Name EXTENSION_LIST = new Name("Extension-List");
+ public static final Name EXTENSION_LIST;
/**
* {@code Name} object for {@code Extension-Name} manifest attribute.
* used for the extension mechanism that is no longer supported.
*/
- public static final Name EXTENSION_NAME = new Name("Extension-Name");
+ public static final Name EXTENSION_NAME;
/**
* {@code Name} object for {@code Extension-Installation} manifest attribute.
@@ -600,25 +602,25 @@
* @deprecated Extension mechanism is no longer supported.
*/
@Deprecated
- public static final Name EXTENSION_INSTALLATION = new Name("Extension-Installation");
+ public static final Name EXTENSION_INSTALLATION;
/**
* {@code Name} object for {@code Implementation-Title}
* manifest attribute used for package versioning.
*/
- public static final Name IMPLEMENTATION_TITLE = new Name("Implementation-Title");
+ public static final Name IMPLEMENTATION_TITLE;
/**
* {@code Name} object for {@code Implementation-Version}
* manifest attribute used for package versioning.
*/
- public static final Name IMPLEMENTATION_VERSION = new Name("Implementation-Version");
+ public static final Name IMPLEMENTATION_VERSION;
/**
* {@code Name} object for {@code Implementation-Vendor}
* manifest attribute used for package versioning.
*/
- public static final Name IMPLEMENTATION_VENDOR = new Name("Implementation-Vendor");
+ public static final Name IMPLEMENTATION_VENDOR;
/**
* {@code Name} object for {@code Implementation-Vendor-Id}
@@ -627,7 +629,7 @@
* @deprecated Extension mechanism is no longer supported.
*/
@Deprecated
- public static final Name IMPLEMENTATION_VENDOR_ID = new Name("Implementation-Vendor-Id");
+ public static final Name IMPLEMENTATION_VENDOR_ID;
/**
* {@code Name} object for {@code Implementation-URL}
@@ -636,25 +638,25 @@
* @deprecated Extension mechanism is no longer supported.
*/
@Deprecated
- public static final Name IMPLEMENTATION_URL = new Name("Implementation-URL");
+ public static final Name IMPLEMENTATION_URL;
/**
* {@code Name} object for {@code Specification-Title}
* manifest attribute used for package versioning.
*/
- public static final Name SPECIFICATION_TITLE = new Name("Specification-Title");
+ public static final Name SPECIFICATION_TITLE;
/**
* {@code Name} object for {@code Specification-Version}
* manifest attribute used for package versioning.
*/
- public static final Name SPECIFICATION_VERSION = new Name("Specification-Version");
+ public static final Name SPECIFICATION_VERSION;
/**
* {@code Name} object for {@code Specification-Vendor}
* manifest attribute used for package versioning.
*/
- public static final Name SPECIFICATION_VENDOR = new Name("Specification-Vendor");
+ public static final Name SPECIFICATION_VENDOR;
/**
* {@code Name} object for {@code Multi-Release}
@@ -662,56 +664,94 @@
*
* @since 9
*/
- public static final Name MULTI_RELEASE = new Name("Multi-Release");
+ public static final Name MULTI_RELEASE;
private static void addName(Map<String, Name> names, Name name) {
names.put(name.name, name);
}
static {
- var names = new HashMap<String, Name>(64);
- addName(names, MANIFEST_VERSION);
- addName(names, SIGNATURE_VERSION);
- addName(names, CONTENT_TYPE);
- addName(names, CLASS_PATH);
- addName(names, MAIN_CLASS);
- addName(names, SEALED);
- addName(names, EXTENSION_LIST);
- addName(names, EXTENSION_NAME);
- addName(names, IMPLEMENTATION_TITLE);
- addName(names, IMPLEMENTATION_VERSION);
- addName(names, IMPLEMENTATION_VENDOR);
- addName(names, SPECIFICATION_TITLE);
- addName(names, SPECIFICATION_VERSION);
- addName(names, SPECIFICATION_VENDOR);
- addName(names, MULTI_RELEASE);
+
+ VM.initializeFromArchive(Attributes.Name.class);
+
+ if (KNOWN_NAMES == null) {
+ MANIFEST_VERSION = new Name("Manifest-Version");
+ SIGNATURE_VERSION = new Name("Signature-Version");
+ CONTENT_TYPE = new Name("Content-Type");
+ CLASS_PATH = new Name("Class-Path");
+ MAIN_CLASS = new Name("Main-Class");
+ SEALED = new Name("Sealed");
+ EXTENSION_LIST = new Name("Extension-List");
+ EXTENSION_NAME = new Name("Extension-Name");
+ EXTENSION_INSTALLATION = new Name("Extension-Installation");
+ IMPLEMENTATION_TITLE = new Name("Implementation-Title");
+ IMPLEMENTATION_VERSION = new Name("Implementation-Version");
+ IMPLEMENTATION_VENDOR = new Name("Implementation-Vendor");
+ IMPLEMENTATION_VENDOR_ID = new Name("Implementation-Vendor-Id");
+ IMPLEMENTATION_URL = new Name("Implementation-URL");
+ SPECIFICATION_TITLE = new Name("Specification-Title");
+ SPECIFICATION_VERSION = new Name("Specification-Version");
+ SPECIFICATION_VENDOR = new Name("Specification-Vendor");
+ MULTI_RELEASE = new Name("Multi-Release");
- // Common attributes used in MANIFEST.MF et.al; adding these has a
- // small footprint cost, but is likely to be quickly paid for by
- // reducing allocation when reading and parsing typical manifests
- addName(names, new Name("Add-Exports"));
- addName(names, new Name("Add-Opens"));
- addName(names, new Name("Ant-Version"));
- addName(names, new Name("Archiver-Version"));
- addName(names, new Name("Build-Jdk"));
- addName(names, new Name("Built-By"));
- addName(names, new Name("Bnd-LastModified"));
- addName(names, new Name("Bundle-Description"));
- addName(names, new Name("Bundle-DocURL"));
- addName(names, new Name("Bundle-License"));
- addName(names, new Name("Bundle-ManifestVersion"));
- addName(names, new Name("Bundle-Name"));
- addName(names, new Name("Bundle-Vendor"));
- addName(names, new Name("Bundle-Version"));
- addName(names, new Name("Bundle-SymbolicName"));
- addName(names, new Name("Created-By"));
- addName(names, new Name("Export-Package"));
- addName(names, new Name("Import-Package"));
- addName(names, new Name("Name"));
- addName(names, new Name("SHA1-Digest"));
- addName(names, new Name("X-Compile-Source-JDK"));
- addName(names, new Name("X-Compile-Target-JDK"));
- KNOWN_NAMES = names;
+ var names = new HashMap<String, Name>(64);
+ addName(names, MANIFEST_VERSION);
+ addName(names, SIGNATURE_VERSION);
+ addName(names, CONTENT_TYPE);
+ addName(names, CLASS_PATH);
+ addName(names, MAIN_CLASS);
+ addName(names, SEALED);
+ addName(names, EXTENSION_LIST);
+ addName(names, EXTENSION_NAME);
+ addName(names, EXTENSION_INSTALLATION);
+ addName(names, IMPLEMENTATION_TITLE);
+ addName(names, IMPLEMENTATION_VERSION);
+ addName(names, IMPLEMENTATION_VENDOR);
+ addName(names, IMPLEMENTATION_VENDOR_ID);
+ addName(names, IMPLEMENTATION_URL);
+ addName(names, SPECIFICATION_TITLE);
+ addName(names, SPECIFICATION_VERSION);
+ addName(names, SPECIFICATION_VENDOR);
+ addName(names, MULTI_RELEASE);
+
+ // Common attributes used in MANIFEST.MF et.al; adding these has a
+ // small footprint cost, but is likely to be quickly paid for by
+ // reducing allocation when reading and parsing typical manifests
+
+ // JDK internal attributes
+ addName(names, new Name("Add-Exports"));
+ addName(names, new Name("Add-Opens"));
+ // LauncherHelper attributes
+ addName(names, new Name("Launcher-Agent-Class"));
+ addName(names, new Name("JavaFX-Application-Class"));
+ // jarsigner attributes
+ addName(names, new Name("Name"));
+ addName(names, new Name("Created-By"));
+ addName(names, new Name("SHA1-Digest"));
+ addName(names, new Name("SHA-256-Digest"));
+ KNOWN_NAMES = Map.copyOf(names);
+ } else {
+ // Even if KNOWN_NAMES was read from archive, we still need
+ // to initialize the public constants
+ MANIFEST_VERSION = KNOWN_NAMES.get("Manifest-Version");
+ SIGNATURE_VERSION = KNOWN_NAMES.get("Signature-Version");
+ CONTENT_TYPE = KNOWN_NAMES.get("Content-Type");
+ CLASS_PATH = KNOWN_NAMES.get("Class-Path");
+ MAIN_CLASS = KNOWN_NAMES.get("Main-Class");
+ SEALED = KNOWN_NAMES.get("Sealed");
+ EXTENSION_LIST = KNOWN_NAMES.get("Extension-List");
+ EXTENSION_NAME = KNOWN_NAMES.get("Extension-Name");
+ EXTENSION_INSTALLATION = KNOWN_NAMES.get("Extension-Installation");
+ IMPLEMENTATION_TITLE = KNOWN_NAMES.get("Implementation-Title");
+ IMPLEMENTATION_VERSION = KNOWN_NAMES.get("Implementation-Version");
+ IMPLEMENTATION_VENDOR = KNOWN_NAMES.get("Implementation-Vendor");
+ IMPLEMENTATION_VENDOR_ID = KNOWN_NAMES.get("Implementation-Vendor-Id");
+ IMPLEMENTATION_URL = KNOWN_NAMES.get("Implementation-URL");
+ SPECIFICATION_TITLE = KNOWN_NAMES.get("Specification-Title");
+ SPECIFICATION_VERSION = KNOWN_NAMES.get("Specification-Version");
+ SPECIFICATION_VENDOR = KNOWN_NAMES.get("Specification-Vendor");
+ MULTI_RELEASE = KNOWN_NAMES.get("Multi-Release");
+ }
}
}
}
--- a/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -114,8 +114,8 @@
* <td>B.E. (Buddhist Era)</td>
* </tr>
* <tr>
- * <th scope="row" rowspan="6" style="font-weight:normal; text-align:left; vertical-align:top">{@code "japanese"}</th>
- * <th scope="row" rowspan="5" style="font-weight:normal; text-align:left; vertical-align:top">{@link Calendar#ERA}</th>
+ * <th scope="row" rowspan="7" style="font-weight:normal; text-align:left; vertical-align:top">{@code "japanese"}</th>
+ * <th scope="row" rowspan="6" style="font-weight:normal; text-align:left; vertical-align:top">{@link Calendar#ERA}</th>
* <th scope="row" style="font-weight:normal">0</th>
* <td>Seireki (Before Meiji)</td>
* </tr>
@@ -133,7 +133,11 @@
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal">4</th>
- * <td >Heisei</td>
+ * <td>Heisei</td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="font-weight:normal">5</th>
+ * <td>Reiwa</td>
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal; text-align:left; vertical-align:top">{@link Calendar#YEAR}</th>
--- a/src/java.base/share/classes/javax/net/ssl/SSLContextSpi.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/javax/net/ssl/SSLContextSpi.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -194,10 +194,9 @@
*/
protected SSLParameters engineGetSupportedSSLParameters() {
SSLSocket socket = getDefaultSocket();
- SSLParameters params = new SSLParameters();
+ SSLParameters params = socket.getSSLParameters();
params.setCipherSuites(socket.getSupportedCipherSuites());
params.setProtocols(socket.getSupportedProtocols());
return params;
}
-
}
--- a/src/java.base/share/classes/sun/nio/ch/IOStatus.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/nio/ch/IOStatus.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -81,4 +81,12 @@
return ((n > EOF) || (n < UNSUPPORTED_CASE));
}
+ /**
+ * Returns true if the error code is UNAVAILABLE or INTERRUPTED, the
+ * error codes to indicate that an I/O operation can be retried.
+ */
+ static boolean okayToRetry(long n) {
+ return (n == IOStatus.UNAVAILABLE) || (n == IOStatus.INTERRUPTED);
+ }
+
}
--- a/src/java.base/share/classes/sun/nio/ch/Net.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/nio/ch/Net.java Tue Apr 02 10:57:57 2019 +0530
@@ -310,6 +310,12 @@
static final ExtendedSocketOptions extendedOptions =
ExtendedSocketOptions.getInstance();
+ static void setSocketOption(FileDescriptor fd, SocketOption<?> name, Object value)
+ throws IOException
+ {
+ setSocketOption(fd, Net.UNSPEC, name, value);
+ }
+
static void setSocketOption(FileDescriptor fd, ProtocolFamily family,
SocketOption<?> name, Object value)
throws IOException
@@ -372,8 +378,13 @@
setIntOption0(fd, mayNeedConversion, key.level(), key.name(), arg, isIPv6);
}
- static Object getSocketOption(FileDescriptor fd, ProtocolFamily family,
- SocketOption<?> name)
+ static Object getSocketOption(FileDescriptor fd, SocketOption<?> name)
+ throws IOException
+ {
+ return getSocketOption(fd, Net.UNSPEC, name);
+ }
+
+ static Object getSocketOption(FileDescriptor fd, ProtocolFamily family, SocketOption<?> name)
throws IOException
{
Class<?> type = name.type();
@@ -426,8 +437,7 @@
return socket(UNSPEC, stream);
}
- static FileDescriptor socket(ProtocolFamily family, boolean stream)
- throws IOException {
+ static FileDescriptor socket(ProtocolFamily family, boolean stream) throws IOException {
boolean preferIPv6 = isIPv6Available() &&
(family != StandardProtocolFamily.INET);
return IOUtil.newFD(socket0(preferIPv6, stream, false, fastLoopback));
@@ -525,21 +535,44 @@
int level, int opt, int arg, boolean isIPv6)
throws IOException;
+ /**
+ * Polls a file descriptor for events.
+ * @param timeout the timeout to wait; 0 to not wait, -1 to wait indefinitely
+ * @return the polled events or 0 if no events are polled
+ */
static native int poll(FileDescriptor fd, int events, long timeout)
throws IOException;
/**
+ * Performs a non-blocking poll of a file descriptor.
+ * @return the polled events or 0 if no events are polled
+ */
+ static int pollNow(FileDescriptor fd, int events) throws IOException {
+ return poll(fd, events, 0);
+ }
+
+ /**
* Polls a connecting socket to test if the connection has been established.
*
* @apiNote This method is public to allow it be used by code in jdk.sctp.
*
* @param timeout the timeout to wait; 0 to not wait, -1 to wait indefinitely
- * @return 1 if connected, 0 if not connected, or IOS_INTERRUPTED
+ * @return true if connected
*/
- public static native int pollConnect(FileDescriptor fd, long timeout)
+ public static native boolean pollConnect(FileDescriptor fd, long timeout)
throws IOException;
/**
+ * Performs a non-blocking poll of a connecting socket to test if the
+ * connection has been established.
+ *
+ * @return true if connected
+ */
+ static boolean pollConnectNow(FileDescriptor fd) throws IOException {
+ return pollConnect(fd, 0);
+ }
+
+ /**
* Return the number of bytes in the socket input buffer.
*/
static native int available(FileDescriptor fd) throws IOException;
--- a/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -216,6 +216,11 @@
}
}
}
+
+ @Override
+ public int available() throws IOException {
+ return sc.available();
+ }
}
private InputStream socketInputStream = null;
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -32,6 +32,7 @@
import java.net.ProtocolFamily;
import java.net.Socket;
import java.net.SocketAddress;
+import java.net.SocketException;
import java.net.SocketOption;
import java.net.StandardProtocolFamily;
import java.net.StandardSocketOptions;
@@ -52,6 +53,7 @@
import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;
+import sun.net.ConnectionResetException;
import sun.net.NetHooks;
import sun.net.ext.ExtendedSocketOptions;
import sun.net.util.SocketExceptions;
@@ -85,6 +87,9 @@
private volatile boolean isInputClosed;
private volatile boolean isOutputClosed;
+ // Connection reset protected by readLock
+ private boolean connectionReset;
+
// -- The following fields are protected by stateLock
// set true when exclusive binding is on and SO_REUSEADDR is emulated
@@ -230,7 +235,7 @@
}
// no options that require special handling
- Net.setSocketOption(fd, Net.UNSPEC, name, value);
+ Net.setSocketOption(fd, name, value);
return this;
}
}
@@ -260,7 +265,7 @@
}
// no options that require special handling
- return (T) Net.getSocketOption(fd, Net.UNSPEC, name);
+ return (T) Net.getSocketOption(fd, name);
}
}
@@ -334,6 +339,10 @@
}
}
+ private void throwConnectionReset() throws SocketException {
+ throw new SocketException("Connection reset");
+ }
+
@Override
public int read(ByteBuffer buf) throws IOException {
Objects.requireNonNull(buf);
@@ -345,6 +354,10 @@
try {
beginRead(blocking);
+ // check if connection has been reset
+ if (connectionReset)
+ throwConnectionReset();
+
// check if input is shutdown
if (isInputClosed)
return IOStatus.EOF;
@@ -356,6 +369,9 @@
} else {
n = IOUtil.read(fd, buf, -1, nd);
}
+ } catch (ConnectionResetException e) {
+ connectionReset = true;
+ throwConnectionReset();
} finally {
endRead(blocking, n > 0);
if (n <= 0 && isInputClosed)
@@ -380,6 +396,10 @@
try {
beginRead(blocking);
+ // check if connection has been reset
+ if (connectionReset)
+ throwConnectionReset();
+
// check if input is shutdown
if (isInputClosed)
return IOStatus.EOF;
@@ -391,6 +411,9 @@
} else {
n = IOUtil.read(fd, dsts, offset, length, nd);
}
+ } catch (ConnectionResetException e) {
+ connectionReset = true;
+ throwConnectionReset();
} finally {
endRead(blocking, n > 0);
if (n <= 0 && isInputClosed)
@@ -769,15 +792,13 @@
boolean connected = false;
try {
beginFinishConnect(blocking);
- int n = 0;
if (blocking) {
do {
- n = Net.pollConnect(fd, -1);
- } while ((n == 0 || n == IOStatus.INTERRUPTED) && isOpen());
+ connected = Net.pollConnect(fd, -1);
+ } while (!connected && isOpen());
} else {
- n = Net.pollConnect(fd, 0);
+ connected = Net.pollConnect(fd, 0);
}
- connected = (n > 0);
} finally {
endFinishConnect(blocking, connected);
}
@@ -1007,6 +1028,20 @@
}
/**
+ * Return the number of bytes in the socket input buffer.
+ */
+ int available() throws IOException {
+ synchronized (stateLock) {
+ ensureOpenAndConnected();
+ if (isInputClosed) {
+ return 0;
+ } else {
+ return Net.available(fd);
+ }
+ }
+ }
+
+ /**
* Translates native poll revent ops into a ready operation ops
*/
public boolean translateReadyOps(int ops, int initialOps, SelectionKeyImpl ski) {
--- a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
import java.security.SecureRandom;
import java.text.MessageFormat;
import java.util.Locale;
-import java.util.Optional;
import javax.crypto.SecretKey;
import javax.net.ssl.SSLHandshakeException;
import sun.security.ssl.PskKeyExchangeModesExtension.PskKeyExchangeModesSpec;
@@ -224,9 +223,9 @@
SessionId newId = new SessionId(true,
shc.sslContext.getSecureRandom());
- Optional<SecretKey> resumptionMasterSecret =
+ SecretKey resumptionMasterSecret =
shc.handshakeSession.getResumptionMasterSecret();
- if (!resumptionMasterSecret.isPresent()) {
+ if (resumptionMasterSecret == null) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
SSLLogger.fine(
"Session has no resumption secret. No ticket sent.");
@@ -239,7 +238,7 @@
byte[] nonceArr = nonce.toByteArray();
SecretKey psk = derivePreSharedKey(
shc.negotiatedCipherSuite.hashAlg,
- resumptionMasterSecret.get(), nonceArr);
+ resumptionMasterSecret, nonceArr);
int sessionTimeoutSeconds = sessionCache.getSessionTimeout();
if (sessionTimeoutSeconds > MAX_TICKET_LIFETIME) {
@@ -354,9 +353,9 @@
SSLSessionImpl sessionToSave = hc.conContext.conSession;
- Optional<SecretKey> resumptionMasterSecret =
+ SecretKey resumptionMasterSecret =
sessionToSave.getResumptionMasterSecret();
- if (!resumptionMasterSecret.isPresent()) {
+ if (resumptionMasterSecret == null) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
SSLLogger.fine(
"Session has no resumption master secret. Ignoring ticket.");
@@ -366,7 +365,7 @@
// derive the PSK
SecretKey psk = derivePreSharedKey(
- sessionToSave.getSuite().hashAlg, resumptionMasterSecret.get(),
+ sessionToSave.getSuite().hashAlg, resumptionMasterSecret,
nstm.ticketNonce);
// create and cache the new session
--- a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java Tue Apr 02 10:57:57 2019 +0530
@@ -33,7 +33,6 @@
import java.util.Locale;
import java.util.Arrays;
import java.util.Objects;
-import java.util.Optional;
import java.util.Collection;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
@@ -402,7 +401,7 @@
private static boolean canRejoin(ClientHelloMessage clientHello,
ServerHandshakeContext shc, SSLSessionImpl s) {
- boolean result = s.isRejoinable() && s.getPreSharedKey().isPresent();
+ boolean result = s.isRejoinable() && (s.getPreSharedKey() != null);
// Check protocol version
if (result && s.getProtocolVersion() != shc.negotiatedProtocol) {
@@ -530,12 +529,11 @@
private static void checkBinder(ServerHandshakeContext shc,
SSLSessionImpl session,
HandshakeHash pskBinderHash, byte[] binder) throws IOException {
- Optional<SecretKey> pskOpt = session.getPreSharedKey();
- if (!pskOpt.isPresent()) {
+ SecretKey psk = session.getPreSharedKey();
+ if (psk == null) {
throw shc.conContext.fatal(Alert.INTERNAL_ERROR,
"Session has no PSK");
}
- SecretKey psk = pskOpt.get();
SecretKey binderKey = deriveBinderKey(shc, psk, session);
byte[] computedBinder =
@@ -647,27 +645,28 @@
}
// The session must have a pre-shared key
- Optional<SecretKey> pskOpt = chc.resumingSession.getPreSharedKey();
- if (!pskOpt.isPresent()) {
+ SecretKey psk = chc.resumingSession.getPreSharedKey();
+ if (psk == null) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
SSLLogger.fine("Existing session has no PSK.");
}
return null;
}
- SecretKey psk = pskOpt.get();
+
// The PSK ID can only be used in one connections, but this method
// may be called twice in a connection if the server sends HRR.
// ID is saved in the context so it can be used in the second call.
- Optional<byte[]> pskIdOpt = Optional.ofNullable(chc.pskIdentity)
- .or(chc.resumingSession::consumePskIdentity);
- if (!pskIdOpt.isPresent()) {
+ if (chc.pskIdentity == null) {
+ chc.pskIdentity = chc.resumingSession.consumePskIdentity();
+ }
+
+ if (chc.pskIdentity == null) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
SSLLogger.fine(
"PSK has no identity, or identity was already used");
}
return null;
}
- chc.pskIdentity = pskIdOpt.get();
//The session cannot be used again. Remove it from the cache.
SSLSessionContextImpl sessionCache = (SSLSessionContextImpl)
--- a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java Tue Apr 02 10:57:57 2019 +0530
@@ -126,7 +126,7 @@
this.identificationProtocol = null;
this.serverNames = Collections.<SNIServerName>emptyList();
this.sniMatchers = Collections.<SNIMatcher>emptyList();
- this.preferLocalCipherSuites = false;
+ this.preferLocalCipherSuites = true;
this.applicationProtocols = new String[0];
this.enableRetransmissions = sslContext.isDTLS();
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -36,7 +36,6 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import javax.crypto.SecretKey;
@@ -286,18 +285,20 @@
return masterSecret;
}
- Optional<SecretKey> getResumptionMasterSecret() {
- return Optional.ofNullable(resumptionMasterSecret);
+ SecretKey getResumptionMasterSecret() {
+ return resumptionMasterSecret;
}
- synchronized Optional<SecretKey> getPreSharedKey() {
- return Optional.ofNullable(preSharedKey);
+ synchronized SecretKey getPreSharedKey() {
+ return preSharedKey;
}
- synchronized Optional<SecretKey> consumePreSharedKey() {
- Optional<SecretKey> result = Optional.ofNullable(preSharedKey);
- preSharedKey = null;
- return result;
+ synchronized SecretKey consumePreSharedKey() {
+ try {
+ return preSharedKey;
+ } finally {
+ preSharedKey = null;
+ }
}
int getTicketAgeAdd() {
@@ -312,10 +313,12 @@
* be used once. This method will return the identity and then clear it
* so it cannot be used again.
*/
- synchronized Optional<byte[]> consumePskIdentity() {
- Optional<byte[]> result = Optional.ofNullable(pskIdentity);
- pskIdentity = null;
- return result;
+ synchronized byte[] consumePskIdentity() {
+ try {
+ return pskIdentity;
+ } finally {
+ pskIdentity = null;
+ }
}
void setPeerCertificates(X509Certificate[] peer) {
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Optional;
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.net.ssl.SSLException;
@@ -544,7 +543,7 @@
shc.negotiatedProtocol, shc.negotiatedCipherSuite);
setUpPskKD(shc,
- shc.resumingSession.consumePreSharedKey().get());
+ shc.resumingSession.consumePreSharedKey());
// The session can't be resumed again---remove it from cache
SSLSessionContextImpl sessionCache = (SSLSessionContextImpl)
@@ -1223,16 +1222,16 @@
chc.sslConfig.maximumPacketSize);
} else {
// The PSK is consumed to allow it to be deleted
- Optional<SecretKey> psk =
+ SecretKey psk =
chc.resumingSession.consumePreSharedKey();
- if(!psk.isPresent()) {
+ if(psk == null) {
throw chc.conContext.fatal(Alert.INTERNAL_ERROR,
"No PSK available. Unable to resume.");
}
chc.handshakeSession = chc.resumingSession;
- setUpPskKD(chc, psk.get());
+ setUpPskKD(chc, psk);
}
//
--- a/src/java.base/share/classes/sun/security/ssl/SunJSSE.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/ssl/SunJSSE.java Tue Apr 02 10:57:57 2019 +0530
@@ -27,18 +27,12 @@
import java.security.*;
import java.util.*;
-import sun.security.rsa.SunRsaSignEntries;
import static sun.security.util.SecurityConstants.PROVIDER_VER;
import static sun.security.provider.SunEntries.createAliases;
/**
* The JSSE provider.
*
- * The RSA implementation has been removed from JSSE, but we still need to
- * register the same algorithms for compatibility. We just point to the RSA
- * implementation in the SunRsaSign provider. This works because all classes
- * are in the bootclasspath and therefore loaded by the same classloader.
- *
* SunJSSE now supports an experimental FIPS compliant mode when used with an
* appropriate FIPS certified crypto provider. In FIPS mode, we:
* . allow only TLS 1.0 or later
@@ -84,12 +78,6 @@
}
private void doRegister() {
- Iterator<Provider.Service> rsaIter =
- new SunRsaSignEntries(this).iterator();
- while (rsaIter.hasNext()) {
- putService(rsaIter.next());
- }
-
ps("Signature", "MD5andSHA1withRSA",
"sun.security.ssl.RSASignature", null, null);
--- a/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java Tue Apr 02 10:57:57 2019 +0530
@@ -287,8 +287,11 @@
// Add all mandatory attributes
info.set(X509CertInfo.VERSION,
new CertificateVersion(CertificateVersion.V3));
- info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(
- new java.util.Random().nextInt() & 0x7fffffff));
+ if (prng == null) {
+ prng = new SecureRandom();
+ }
+ info.set(X509CertInfo.SERIAL_NUMBER,
+ CertificateSerialNumber.newRandom64bit(prng));
AlgorithmId algID = AlgorithmId.getWithParameterSpec(sigAlg, params);
info.set(X509CertInfo.ALGORITHM_ID,
new CertificateAlgorithmId(algID));
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java Tue Apr 02 10:57:57 2019 +0530
@@ -37,6 +37,7 @@
import java.security.Key;
import java.security.PublicKey;
import java.security.PrivateKey;
+import java.security.SecureRandom;
import java.security.Signature;
import java.security.Timestamp;
import java.security.UnrecoverableEntryException;
@@ -1436,8 +1437,8 @@
.getDefaultAlgorithmParameterSpec(sigAlgName, privateKey);
AlgorithmId algID = AlgorithmId.getWithParameterSpec(sigAlgName, params);
info.set(X509CertInfo.VALIDITY, interval);
- info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(
- new java.util.Random().nextInt() & 0x7fffffff));
+ info.set(X509CertInfo.SERIAL_NUMBER,
+ CertificateSerialNumber.newRandom64bit(new SecureRandom()));
info.set(X509CertInfo.VERSION,
new CertificateVersion(CertificateVersion.V3));
info.set(X509CertInfo.ALGORITHM_ID,
@@ -2947,8 +2948,8 @@
certInfo.set(X509CertInfo.VALIDITY, interval);
// Make new serial number
- certInfo.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(
- new java.util.Random().nextInt() & 0x7fffffff));
+ certInfo.set(X509CertInfo.SERIAL_NUMBER,
+ CertificateSerialNumber.newRandom64bit(new SecureRandom()));
// Set owner and issuer fields
X500Name owner;
--- a/src/java.base/share/classes/sun/security/util/DerIndefLenConverter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/util/DerIndefLenConverter.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,9 @@
package sun.security.util;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
/**
* A package private utility class to convert indefinite length DER
@@ -143,6 +145,10 @@
/**
* Parse the length and if it is an indefinite length then add
* the current position to the <code>ndefsList</code> vector.
+ *
+ * @return the length of definite length data next, or -1 if there is
+ * not enough bytes to determine it
+ * @throws IOException if invalid data is read
*/
private int parseLength() throws IOException {
int curLen = 0;
@@ -160,7 +166,7 @@
throw new IOException("Too much data");
}
if ((dataSize - dataPos) < (lenByte + 1)) {
- throw new IOException("Too little data");
+ return -1;
}
for (int i = 0; i < lenByte; i++) {
curLen = (curLen << 8) + (data[dataPos++] & 0xff);
@@ -314,10 +320,10 @@
* @param indefData the byte array holding the indefinite
* length encoding.
* @return the byte array containing the definite length
- * DER encoding.
+ * DER encoding, or null if there is not enough data.
* @exception IOException on parsing or re-writing errors.
*/
- byte[] convert(byte[] indefData) throws IOException {
+ byte[] convertBytes(byte[] indefData) throws IOException {
data = indefData;
dataPos=0; index=0;
dataSize = data.length;
@@ -328,6 +334,9 @@
while (dataPos < dataSize) {
parseTag();
len = parseLength();
+ if (len < 0) {
+ return null;
+ }
parseValue(len);
if (unresolved == 0) {
unused = dataSize - dataPos;
@@ -337,7 +346,7 @@
}
if (unresolved != 0) {
- throw new IOException("not all indef len BER resolved");
+ return null;
}
newData = new byte[dataSize + numOfTotalLenBytes + unused];
@@ -354,4 +363,48 @@
return newData;
}
+
+ /**
+ * Read the input stream into a DER byte array. If an indef len BER is
+ * not resolved this method will try to read more data until EOF is reached.
+ * This may block.
+ *
+ * @param in the input stream with tag and lenByte already read
+ * @param lenByte the length of the length field to remember
+ * @param tag the tag to remember
+ * @return a DER byte array
+ * @throws IOException if not all indef len BER
+ * can be resolved or another I/O error happens
+ */
+ public static byte[] convertStream(InputStream in, byte lenByte, byte tag)
+ throws IOException {
+ int offset = 2; // for tag and length bytes
+ int readLen = in.available();
+ byte[] indefData = new byte[readLen + offset];
+ indefData[0] = tag;
+ indefData[1] = lenByte;
+ while (true) {
+ int bytesRead = in.readNBytes(indefData, offset, readLen);
+ if (bytesRead != readLen) {
+ readLen = bytesRead;
+ indefData = Arrays.copyOf(indefData, offset + bytesRead);
+ }
+ DerIndefLenConverter derIn = new DerIndefLenConverter();
+ byte[] result = derIn.convertBytes(indefData);
+ if (result == null) {
+ int next = in.read(); // This could block, but we need more
+ if (next == -1) {
+ throw new IOException("not all indef len BER resolved");
+ }
+ int more = in.available();
+ // expand array to include next and more
+ indefData = Arrays.copyOf(indefData, offset + readLen + 1 + more);
+ indefData[offset + readLen] = (byte)next;
+ offset = offset + readLen + 1;
+ readLen = more;
+ } else {
+ return result;
+ }
+ }
+ }
}
--- a/src/java.base/share/classes/sun/security/util/DerInputStream.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/util/DerInputStream.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,9 @@
import java.io.InputStream;
import java.io.IOException;
-import java.io.EOFException;
import java.util.Date;
import java.util.Vector;
import java.math.BigInteger;
-import java.io.DataInputStream;
/**
* A DER input stream, used for parsing ASN.1 DER-encoded data such as
@@ -130,7 +128,12 @@
System.arraycopy(data, offset, inData, 0, len);
DerIndefLenConverter derIn = new DerIndefLenConverter();
- buffer = new DerInputBuffer(derIn.convert(inData), allowBER);
+ byte[] result = derIn.convertBytes(inData);
+ if (result == null) {
+ throw new IOException("not all indef len BER resolved");
+ } else {
+ buffer = new DerInputBuffer(result, allowBER);
+ }
}
} else {
buffer = new DerInputBuffer(data, offset, len, allowBER);
@@ -389,16 +392,9 @@
if (len == -1) {
// indefinite length encoding found
- int readLen = buffer.available();
- int offset = 2; // for tag and length bytes
- byte[] indefData = new byte[readLen + offset];
- indefData[0] = tag;
- indefData[1] = lenByte;
- DataInputStream dis = new DataInputStream(buffer);
- dis.readFully(indefData, offset, readLen);
- dis.close();
- DerIndefLenConverter derIn = new DerIndefLenConverter();
- buffer = new DerInputBuffer(derIn.convert(indefData), buffer.allowBER);
+ buffer = new DerInputBuffer(
+ DerIndefLenConverter.convertStream(buffer, lenByte, tag),
+ buffer.allowBER);
if (tag != buffer.read())
throw new IOException("Indefinite length encoding" +
--- a/src/java.base/share/classes/sun/security/util/DerValue.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/util/DerValue.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -257,16 +257,9 @@
length = DerInputStream.getLength(lenByte, in);
if (length == -1) { // indefinite length encoding found
DerInputBuffer inbuf = in.dup();
- int readLen = inbuf.available();
- int offset = 2; // for tag and length bytes
- byte[] indefData = new byte[readLen + offset];
- indefData[0] = tag;
- indefData[1] = lenByte;
- DataInputStream dis = new DataInputStream(inbuf);
- dis.readFully(indefData, offset, readLen);
- dis.close();
- DerIndefLenConverter derIn = new DerIndefLenConverter();
- inbuf = new DerInputBuffer(derIn.convert(indefData), in.allowBER);
+ inbuf = new DerInputBuffer(
+ DerIndefLenConverter.convertStream(inbuf, lenByte, tag),
+ in.allowBER);
if (tag != inbuf.read())
throw new IOException
("Indefinite length encoding not supported");
@@ -277,7 +270,7 @@
// indefinite form is encoded by sending a length field with a
// length of 0. - i.e. [1000|0000].
// the object is ended by sending two zero bytes.
- in.skip(length + offset);
+ in.skip(length + 2);
} else {
buffer = in.dup();
@@ -389,16 +382,8 @@
byte lenByte = (byte)in.read();
length = DerInputStream.getLength(lenByte, in);
if (length == -1) { // indefinite length encoding found
- int readLen = in.available();
- int offset = 2; // for tag and length bytes
- byte[] indefData = new byte[readLen + offset];
- indefData[0] = tag;
- indefData[1] = lenByte;
- DataInputStream dis = new DataInputStream(in);
- dis.readFully(indefData, offset, readLen);
- dis.close();
- DerIndefLenConverter derIn = new DerIndefLenConverter();
- in = new ByteArrayInputStream(derIn.convert(indefData));
+ in = new ByteArrayInputStream(
+ DerIndefLenConverter.convertStream(in, lenByte, tag));
if (tag != in.read())
throw new IOException
("Indefinite length encoding not supported");
--- a/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/security/x509/CertificateSerialNumber.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
import java.io.OutputStream;
import java.math.BigInteger;
import java.util.Enumeration;
+import java.util.Random;
import sun.security.util.*;
@@ -179,4 +180,16 @@
public String getName() {
return (NAME);
}
+
+ /**
+ * Generates a new random serial number.
+ */
+ public static CertificateSerialNumber newRandom64bit(Random rand) {
+ while (true) {
+ BigInteger b = new BigInteger(64, rand);
+ if (b.signum() != 0) {
+ return new CertificateSerialNumber(b);
+ }
+ }
+ }
}
--- a/src/java.base/share/classes/sun/text/resources/FormatData.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/text/resources/FormatData.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -106,7 +106,7 @@
"T",
"S",
"H",
- "N", // NewEra
+ "R",
};
// Japanese imperial calendar era strings
@@ -116,7 +116,7 @@
"Taisho",
"Showa",
"Heisei",
- "NewEra", // NewEra
+ "Reiwa",
};
return new Object[][] {
--- a/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -159,7 +159,7 @@
"Taisho",
"Showa",
"Heisei",
- "NewEra", // New Era
+ "Reiwa",
};
final String[] sharedShortEras = {
--- a/src/java.base/share/classes/sun/util/calendar/Era.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/util/calendar/Era.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
* Taisho 1912-07-30T00:00:00 local time
* Showa 1926-12-25T00:00:00 local time
* Heisei 1989-01-08T00:00:00 local time
- * NewEra 2019-05-01T00:00:00 local time
+ * Reiwa 2019-05-01T00:00:00 local time
* -----------------------------------------------------------------------
* }</pre>
*
--- a/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/util/calendar/LocalGregorianCalendar.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
new Era("Taisho", "T", -1812153600000L, true),
new Era("Showa", "S", -1357603200000L, true),
new Era("Heisei", "H", 600220800000L, true),
- new Era("NewEra", "N", 1556668800000L, true),
+ new Era("Reiwa", "R", 1556668800000L, true),
};
private static boolean isValidEra(Era newEra, Era[] eras) {
--- a/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -84,10 +84,10 @@
Era[] jeras = CalendarSystem.forName("japanese").getEras();
if (value <= jeras.length) {
// Localized era name could not be retrieved from this provider.
- // This can occur either for NewEra or SupEra.
+ // This can occur either for Reiwa or SupEra.
//
// If it's CLDR provider, try COMPAT first, which is guaranteed to have
- // the name for NewEra.
+ // the name for Reiwa.
if (type == LocaleProviderAdapter.Type.CLDR) {
lr = LocaleProviderAdapter.forJRE().getLocaleResources(locale);
key = getResourceKeyFor(LocaleProviderAdapter.Type.JRE,
--- a/src/java.base/share/legal/public_suffix.md Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/share/legal/public_suffix.md Tue Apr 02 10:57:57 2019 +0530
@@ -11,7 +11,7 @@
The Source Code of this file is available under the
Mozilla Public License, v. 2.0 and is located at
-https://raw.githubusercontent.com/publicsuffix/list/2225db8d9f4a2a27ec697c883360632fa0c16261/public_suffix_list.dat.
+https://raw.githubusercontent.com/publicsuffix/list/ce0d1a5fba657e55adea3abde4b7f1e50636ff10/public_suffix_list.dat.
If a copy of the MPL was not distributed with this file, you can obtain one
at https://mozilla.org/MPL/2.0/.
--- a/src/java.base/unix/classes/java/io/UnixFileSystem.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/unix/classes/java/io/UnixFileSystem.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,10 +51,12 @@
/* -- Normalization and construction -- */
+ @Override
public char getSeparator() {
return slash;
}
+ @Override
public char getPathSeparator() {
return colon;
}
@@ -84,6 +86,7 @@
/* Check that the given pathname is normal. If not, invoke the real
normalizer on the part of the pathname that requires normalization.
This way we iterate through the whole pathname string only once. */
+ @Override
public String normalize(String pathname) {
int n = pathname.length();
char prevChar = 0;
@@ -97,11 +100,13 @@
return pathname;
}
+ @Override
public int prefixLength(String pathname) {
if (pathname.isEmpty()) return 0;
return (pathname.charAt(0) == '/') ? 1 : 0;
}
+ @Override
public String resolve(String parent, String child) {
if (child.isEmpty()) return parent;
if (child.charAt(0) == '/') {
@@ -112,10 +117,12 @@
return parent + '/' + child;
}
+ @Override
public String getDefaultParent() {
return "/";
}
+ @Override
public String fromURIPath(String path) {
String p = path;
if (p.endsWith("/") && (p.length() > 1)) {
@@ -128,10 +135,12 @@
/* -- Path operations -- */
+ @Override
public boolean isAbsolute(File f) {
return (f.getPrefixLength() != 0);
}
+ @Override
public String resolve(File f) {
if (isAbsolute(f)) return f.getPath();
SecurityManager sm = System.getSecurityManager();
@@ -153,6 +162,7 @@
// canonicalization algorithm
private final ExpiringCache javaHomePrefixCache;
+ @Override
public String canonicalize(String path) throws IOException {
if (!useCanonCaches) {
return canonicalize0(path);
@@ -246,6 +256,7 @@
public native int getBooleanAttributes0(File f);
+ @Override
public int getBooleanAttributes(File f) {
int rv = getBooleanAttributes0(f);
String name = f.getName();
@@ -253,15 +264,25 @@
return rv | (hidden ? BA_HIDDEN : 0);
}
+ @Override
public native boolean checkAccess(File f, int access);
+
+ @Override
public native long getLastModifiedTime(File f);
+
+ @Override
public native long getLength(File f);
+
+ @Override
public native boolean setPermission(File f, int access, boolean enable, boolean owneronly);
/* -- File operations -- */
+ @Override
public native boolean createFileExclusively(String path)
throws IOException;
+
+ @Override
public boolean delete(File f) {
// Keep canonicalization caches in sync after file deletion
// and renaming operations. Could be more clever than this
@@ -277,8 +298,14 @@
return delete0(f);
}
private native boolean delete0(File f);
+
+ @Override
public native String[] list(File f);
+
+ @Override
public native boolean createDirectory(File f);
+
+ @Override
public boolean rename(File f1, File f2) {
// Keep canonicalization caches in sync after file deletion
// and renaming operations. Could be more clever than this
@@ -294,12 +321,16 @@
return rename0(f1, f2);
}
private native boolean rename0(File f1, File f2);
+
+ @Override
public native boolean setLastModifiedTime(File f, long time);
+
+ @Override
public native boolean setReadOnly(File f);
-
/* -- Filesystem interface -- */
+ @Override
public File[] listRoots() {
try {
SecurityManager security = System.getSecurityManager();
@@ -313,12 +344,15 @@
}
/* -- Disk usage -- */
+
+ @Override
public native long getSpace(File f, int t);
/* -- Basic infrastructure -- */
private native long getNameMax0(String path);
+ @Override
public int getNameMax(String path) {
long nameMax = getNameMax0(path);
if (nameMax > Integer.MAX_VALUE) {
@@ -327,10 +361,12 @@
return (int)nameMax;
}
+ @Override
public int compare(File f1, File f2) {
return f1.getPath().compareTo(f2.getPath());
}
+ @Override
public int hashCode(File f) {
return f.getPath().hashCode() ^ 1234321;
}
@@ -341,5 +377,4 @@
static {
initIDs();
}
-
}
--- a/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,13 +34,28 @@
*/
class SocketDispatcher extends NativeDispatcher {
+ SocketDispatcher() { }
+ /**
+ * Reads up to len bytes from a socket with special handling for "connection
+ * reset".
+ *
+ * @throws sun.net.ConnectionResetException if connection reset is detected
+ * @throws IOException if another I/O error occurs
+ */
int read(FileDescriptor fd, long address, int len) throws IOException {
- return FileDispatcherImpl.read0(fd, address, len);
+ return read0(fd, address, len);
}
+ /**
+ * Scattering read from a socket into len buffers with special handling for
+ * "connection reset".
+ *
+ * @throws sun.net.ConnectionResetException if connection reset is detected
+ * @throws IOException if another I/O error occurs
+ */
long readv(FileDescriptor fd, long address, int len) throws IOException {
- return FileDispatcherImpl.readv0(fd, address, len);
+ return readv0(fd, address, len);
}
int write(FileDescriptor fd, long address, int len) throws IOException {
@@ -58,4 +73,16 @@
void preClose(FileDescriptor fd) throws IOException {
FileDispatcherImpl.preClose0(fd);
}
+
+ // -- Native methods --
+
+ private static native int read0(FileDescriptor fd, long address, int len)
+ throws IOException;
+
+ private static native long readv0(FileDescriptor fd, long address, int len)
+ throws IOException;
+
+ static {
+ IOUtil.load();
+ }
}
--- a/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@
import java.util.concurrent.*;
import java.io.IOException;
import java.io.FileDescriptor;
+
+import sun.net.ConnectionResetException;
import sun.net.NetHooks;
import sun.net.util.SocketExceptions;
import sun.security.action.GetPropertyAction;
@@ -415,6 +417,8 @@
enableReading();
if (x instanceof ClosedChannelException)
x = new AsynchronousCloseException();
+ if (x instanceof ConnectionResetException)
+ x = new IOException(x.getMessage());
exc = x;
} finally {
// restart poll in case of concurrent write
@@ -546,6 +550,8 @@
} catch (Throwable x) {
if (x instanceof ClosedChannelException)
x = new AsynchronousCloseException();
+ if (x instanceof ConnectionResetException)
+ x = new IOException(x.getMessage());
exc = x;
} finally {
if (!pending)
--- a/src/java.base/unix/native/libjava/UnixFileSystem_md.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/unix/native/libjava/UnixFileSystem_md.c Tue Apr 02 10:57:57 2019 +0530
@@ -284,10 +284,10 @@
fd = handleOpen(path, O_RDWR | O_CREAT | O_EXCL, 0666);
if (fd < 0) {
if (errno != EEXIST)
- JNU_ThrowIOExceptionWithLastError(env, path);
+ JNU_ThrowIOExceptionWithLastError(env, "Could not open file");
} else {
if (close(fd) == -1)
- JNU_ThrowIOExceptionWithLastError(env, path);
+ JNU_ThrowIOExceptionWithLastError(env, "Could not close file");
rv = JNI_TRUE;
}
}
--- a/src/java.base/unix/native/libnio/ch/Net.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/unix/native/libnio/ch/Net.c Tue Apr 02 10:57:57 2019 +0530
@@ -804,7 +804,7 @@
}
}
-JNIEXPORT jint JNICALL
+JNIEXPORT jboolean JNICALL
Java_sun_nio_ch_Net_pollConnect(JNIEnv *env, jobject this, jobject fdo, jlong timeout)
{
jint fd = fdval(env, fdo);
@@ -828,23 +828,22 @@
errno = 0;
result = getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &n);
if (result < 0) {
- return handleSocketError(env, errno);
+ handleSocketError(env, errno);
+ return JNI_FALSE;
} else if (error) {
- return handleSocketError(env, error);
+ handleSocketError(env, error);
+ return JNI_FALSE;
} else if ((poller.revents & POLLHUP) != 0) {
- return handleSocketError(env, ENOTCONN);
+ handleSocketError(env, ENOTCONN);
+ return JNI_FALSE;
}
// connected
- return 1;
- } else if (result == 0) {
- return 0;
+ return JNI_TRUE;
+ } else if (result == 0 || errno == EINTR) {
+ return JNI_FALSE;
} else {
- if (errno == EINTR) {
- return IOS_INTERRUPTED;
- } else {
- JNU_ThrowIOExceptionWithLastError(env, "poll failed");
- return IOS_THROWN;
- }
+ JNU_ThrowIOExceptionWithLastError(env, "poll failed");
+ return JNI_FALSE;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/unix/native/libnio/ch/SocketDispatcher.c Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ #include <sys/types.h>
+ #include <sys/uio.h>
+ #include <unistd.h>
+
+ #include "jni.h"
+ #include "jni_util.h"
+ #include "jlong.h"
+ #include "nio.h"
+ #include "nio_util.h"
+ #include "sun_nio_ch_SocketDispatcher.h"
+
+ JNIEXPORT jint JNICALL
+ Java_sun_nio_ch_SocketDispatcher_read0(JNIEnv *env, jclass clazz,
+ jobject fdo, jlong address, jint len)
+ {
+ jint fd = fdval(env, fdo);
+ void *buf = (void *)jlong_to_ptr(address);
+ jint n = read(fd, buf, len);
+ if ((n == -1) && (errno == ECONNRESET || errno == EPIPE)) {
+ JNU_ThrowByName(env, "sun/net/ConnectionResetException", "Connection reset");
+ return IOS_THROWN;
+ } else {
+ return convertReturnVal(env, n, JNI_TRUE);
+ }
+ }
+
+ JNIEXPORT jlong JNICALL
+ Java_sun_nio_ch_SocketDispatcher_readv0(JNIEnv *env, jclass clazz,
+ jobject fdo, jlong address, jint len)
+ {
+ jint fd = fdval(env, fdo);
+ struct iovec *iov = (struct iovec *)jlong_to_ptr(address);
+ jlong n = readv(fd, iov, len);
+ if ((n == -1) && (errno == ECONNRESET || errno == EPIPE)) {
+ JNU_ThrowByName(env, "sun/net/ConnectionResetException", "Connection reset");
+ return IOS_THROWN;
+ } else {
+ return convertLongReturnVal(env, n, JNI_TRUE);
+ }
+ }
--- a/src/java.base/windows/classes/java/io/WinNTFileSystem.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/windows/classes/java/io/WinNTFileSystem.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -328,7 +328,6 @@
return up + slashify(path.substring(2));
char drive = path.charAt(0);
String dir = getDriveDirectory(drive);
- String np;
if (dir != null) {
/* When resolving a directory-relative path that refers to a
drive other than the current drive, insist that the caller
@@ -641,6 +640,7 @@
// expects the path to be null or a root component ending in a backslash
private native int getNameMax0(String path);
+ @Override
public int getNameMax(String path) {
String s = null;
if (path != null) {
--- a/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,16 @@
package sun.nio.ch;
-import java.io.*;
+import java.io.FileDescriptor;
+import java.io.IOException;
/**
* Allows different platforms to call different native methods
* for read and write operations.
*/
-class SocketDispatcher extends NativeDispatcher
-{
-
- static {
- IOUtil.load();
- }
+class SocketDispatcher extends NativeDispatcher {
+ SocketDispatcher() { }
int read(FileDescriptor fd, long address, int len) throws IOException {
return read0(fd, address, len);
@@ -63,7 +60,8 @@
close0(fd);
}
- //-- Native methods
+ // -- Native methods --
+
static native int read0(FileDescriptor fd, long address, int len)
throws IOException;
@@ -79,4 +77,8 @@
static native void preClose0(FileDescriptor fd) throws IOException;
static native void close0(FileDescriptor fd) throws IOException;
+
+ static {
+ IOUtil.load();
+ }
}
--- a/src/java.base/windows/native/libnet/NetworkInterface_winXP.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/windows/native/libnet/NetworkInterface_winXP.c Tue Apr 02 10:57:57 2019 +0530
@@ -41,7 +41,7 @@
#ifdef _WIN64
printf ("nif:0x%I64x name:%s\n", (UINT_PTR)nif, nif->name);
#else
- printf ("nif:0x%x name:%s\n", nif, nif->name);
+ printf ("nif:0x%x name:%s\n", (UINT_PTR)nif, nif->name);
#endif
if (nif->dNameIsUnicode) {
printf ("dName:%S index:%d ", (unsigned short *)nif->displayName,
--- a/src/java.base/windows/native/libnio/ch/FileChannelImpl.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/windows/native/libnio/ch/FileChannelImpl.c Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.base/windows/native/libnio/ch/Net.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/windows/native/libnio/ch/Net.c Tue Apr 02 10:57:57 2019 +0530
@@ -660,7 +660,7 @@
return rv;
}
-JNIEXPORT jint JNICALL
+JNIEXPORT jboolean JNICALL
Java_sun_nio_ch_Net_pollConnect(JNIEnv* env, jclass this, jobject fdo, jlong timeout)
{
int optError = 0;
@@ -684,13 +684,13 @@
if (result == SOCKET_ERROR) {
handleSocketError(env, WSAGetLastError());
- return IOS_THROWN;
+ return JNI_FALSE;
} else if (result == 0) {
- return 0;
+ return JNI_FALSE;
} else {
// connection established if writable and no error to check
if (FD_ISSET(fd, &wr) && !FD_ISSET(fd, &ex)) {
- return 1;
+ return JNI_TRUE;
}
result = getsockopt((SOCKET)fd,
SOL_SOCKET,
@@ -699,17 +699,13 @@
&n);
if (result == SOCKET_ERROR) {
int lastError = WSAGetLastError();
- if (lastError == WSAEINPROGRESS) {
- return IOS_UNAVAILABLE;
+ if (lastError != WSAEINPROGRESS) {
+ NET_ThrowNew(env, lastError, "getsockopt");
}
- NET_ThrowNew(env, lastError, "getsockopt");
- return IOS_THROWN;
+ } else if (optError != NO_ERROR) {
+ handleSocketError(env, optError);
}
- if (optError != NO_ERROR) {
- handleSocketError(env, optError);
- return IOS_THROWN;
- }
- return 0;
+ return JNI_FALSE;
}
}
--- a/src/java.base/windows/native/libnio/ch/SocketDispatcher.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/windows/native/libnio/ch/SocketDispatcher.c Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,11 @@
if (theErr == WSAEWOULDBLOCK) {
return IOS_UNAVAILABLE;
}
- JNU_ThrowIOExceptionWithLastError(env, "Read failed");
+ if (theErr == WSAECONNRESET) {
+ JNU_ThrowByName(env, "sun/net/ConnectionResetException", "Connection reset");
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "Read failed");
+ }
return IOS_THROWN;
}
@@ -128,7 +132,11 @@
if (theErr == WSAEWOULDBLOCK) {
return IOS_UNAVAILABLE;
}
- JNU_ThrowIOExceptionWithLastError(env, "Vector read failed");
+ if (theErr == WSAECONNRESET) {
+ JNU_ThrowByName(env, "sun/net/ConnectionResetException", "Connection reset");
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "Vector read failed");
+ }
return IOS_THROWN;
}
@@ -174,7 +182,11 @@
if (theErr == WSAEWOULDBLOCK) {
return IOS_UNAVAILABLE;
}
- JNU_ThrowIOExceptionWithLastError(env, "Write failed");
+ if (theErr == WSAECONNRESET) {
+ JNU_ThrowIOException(env, "Connection reset by peer");
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "Write failed");
+ }
return IOS_THROWN;
}
}
@@ -256,7 +268,11 @@
if (theErr == WSAEWOULDBLOCK) {
return IOS_UNAVAILABLE;
}
- JNU_ThrowIOExceptionWithLastError(env, "Vector write failed");
+ if (theErr == WSAECONNRESET) {
+ JNU_ThrowIOException(env, "Connection reset by peer");
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "Vector write failed");
+ }
return IOS_THROWN;
}
--- a/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1063,8 +1063,14 @@
LPCWSTR link = jlong_to_ptr(linkAddress);
LPCWSTR target = jlong_to_ptr(targetAddress);
- /* On Windows 64-bit this appears to succeed even when there is insufficient privileges */
- if (CreateSymbolicLinkW(link, target, (DWORD)flags) == 0)
+ // Allow creation of symbolic links when the process is not elevated.
+ // Developer Mode must be enabled for this option to function, otherwise
+ // it will be ignored.
+ DWORD dwFlags = (DWORD)flags | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
+
+ // On Windows 64-bit this appears to succeed even when there are
+ // insufficient privileges
+ if (CreateSymbolicLinkW(link, target, dwFlags) == 0)
throwWindowsException(env, GetLastError());
}
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@
* 9: modules, small cleanups to 1.7 and 1.8 changes
* 10: local-variable type inference (var)
* 11: local-variable syntax for lambda parameters
- * 12: TBD
+ * 12: no changes (switch expressions in preview)
* 13: TBD
*/
@@ -208,38 +208,40 @@
private static final SourceVersion latestSupported = getLatestSupported();
+ /*
+ * The integer version to enum constant mapping implemented by
+ * this method assumes the JEP 322: "Time-Based Release
+ * Versioning" scheme is in effect. This scheme began in JDK
+ * 10. If the JDK versioning scheme is revised, this method may
+ * need to be updated accordingly.
+ */
private static SourceVersion getLatestSupported() {
- try {
- String specVersion = System.getProperty("java.specification.version");
-
- switch (specVersion) {
- case "13":
- return RELEASE_13;
- case "12":
- return RELEASE_12;
- case "11":
- return RELEASE_11;
- case "10":
- return RELEASE_10;
- case "9":
- return RELEASE_9;
- case "1.8":
- return RELEASE_8;
- case "1.7":
- return RELEASE_7;
- case "1.6":
- return RELEASE_6;
- }
- } catch (SecurityException se) {}
-
- return RELEASE_5;
+ int intVersion = Runtime.version().feature();
+ return (intVersion >= 11) ?
+ valueOf("RELEASE_" + Math.min(13, intVersion)):
+ RELEASE_10;
}
/**
* Returns the latest source version fully supported by the
- * current execution environment. {@code RELEASE_5} or later must
+ * current execution environment. {@code RELEASE_9} or later must
* be returned.
*
+ * @apiNote This method is included alongside {@link latest} to
+ * allow identification of situations where the language model API
+ * is running on a platform version different than the latest
+ * version modeled by the API. One way that sort of situation can
+ * occur is if an IDE or similar tool is using the API to model
+ * source version <i>N</i> while running on platform version
+ * (<i>N</i> - 1). Running in this configuration is
+ * supported by the API. Running an API on platform versions
+ * earlier than (<i>N</i> - 1) or later than <i>N</i>
+ * may or may not work as an implementation detail. If an
+ * annotation processor was generating code to run under the
+ * current execution environment, the processor should only use
+ * platform features up to the {@code latestSupported} release,
+ * which may be earlier than the {@code latest} release.
+ *
* @return the latest source version that is fully supported
*/
public static SourceVersion latestSupported() {
--- a/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java Tue Apr 02 10:57:57 2019 +0530
@@ -28,9 +28,11 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
/**
* File manager based on {@linkplain File java.io.File} and {@linkplain Path java.nio.file.Path}.
@@ -199,11 +201,40 @@
* a directory or if this file manager does not support any of the
* given paths.
*
- * @since 9
+ * @since 13
*/
default Iterable<? extends JavaFileObject> getJavaFileObjectsFromPaths(
+ Collection<? extends Path> paths) {
+ return getJavaFileObjectsFromFiles(asFiles(paths));
+ }
+
+ /**
+ * Returns file objects representing the given paths.
+ *
+ * @implSpec
+ * The default implementation converts each path to a file and calls
+ * {@link #getJavaFileObjectsFromFiles getJavaObjectsFromFiles}.
+ * IllegalArgumentException will be thrown if any of the paths
+ * cannot be converted to a file.
+ *
+ * @param paths a list of paths
+ * @return a list of file objects
+ * @throws IllegalArgumentException if the list of paths includes
+ * a directory or if this file manager does not support any of the
+ * given paths.
+ *
+ * @since 9
+ * @deprecated use {@link #getJavaFileObjectsFromPaths(Collection)} instead,
+ * to prevent the possibility of accidentally calling the method with a
+ * single {@code Path} as such an argument. Although {@code Path} implements
+ * {@code Iterable<Path>}, it would almost never be correct to pass a single
+ * {@code Path} and have it be treated as an {@code Iterable} of its
+ * components.
+ */
+ @Deprecated(since = "13")
+ default Iterable<? extends JavaFileObject> getJavaFileObjectsFromPaths(
Iterable<? extends Path> paths) {
- return getJavaFileObjectsFromFiles(asFiles(paths));
+ return getJavaFileObjectsFromPaths(asCollection(paths));
}
/**
@@ -484,4 +515,13 @@
}
};
}
+
+ private static <T> Collection<T> asCollection(Iterable<T> iterable) {
+ if (iterable instanceof Collection) {
+ return (Collection<T>) iterable;
+ }
+ List<T> result = new ArrayList<>();
+ for (T item : iterable) result.add(item);
+ return result;
+ }
}
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c Tue Apr 02 10:57:57 2019 +0530
@@ -117,7 +117,11 @@
*/
#define MAXFRAMEBUFFERS 16
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__solaris__)
+typedef Status XineramaGetInfoFunc(Display* display, int screen_number,
+ XRectangle* framebuffer_rects, unsigned char* framebuffer_hints,
+ int* num_framebuffers);
+#else /* Linux, Mac, AIX */
typedef struct {
int screen_number;
short x_org;
@@ -127,11 +131,6 @@
} XineramaScreenInfo;
typedef XineramaScreenInfo* XineramaQueryScreensFunc(Display*, int*);
-
-#else /* SOLARIS */
-typedef Status XineramaGetInfoFunc(Display* display, int screen_number,
- XRectangle* framebuffer_rects, unsigned char* framebuffer_hints,
- int* num_framebuffers);
#endif
Bool usingXinerama = False;
@@ -413,6 +412,7 @@
if (XQueryExtension(awt_display, "RENDER",
&major_opcode, &first_event, &first_error))
{
+ DTRACE_PRINTLN("RENDER extension available");
xrenderLibHandle = dlopen("libXrender.so.1", RTLD_LAZY | RTLD_GLOBAL);
#ifdef MACOSX
@@ -426,18 +426,30 @@
RTLD_LAZY | RTLD_GLOBAL);
}
-#ifndef __linux__ /* SOLARIS */
+#if defined(__solaris__)
if (xrenderLibHandle == NULL) {
xrenderLibHandle = dlopen("/usr/lib/libXrender.so.1",
RTLD_LAZY | RTLD_GLOBAL);
}
+#elif defined(_AIX)
+ if (xrenderLibHandle == NULL) {
+ xrenderLibHandle = dlopen("libXrender.a(libXrender.so.0)",
+ RTLD_MEMBER | RTLD_LAZY | RTLD_GLOBAL);
+ }
#endif
-
if (xrenderLibHandle != NULL) {
+ DTRACE_PRINTLN("Loaded libXrender");
xrenderFindVisualFormat =
(XRenderFindVisualFormatFunc*)dlsym(xrenderLibHandle,
"XRenderFindVisualFormat");
+ if (xrenderFindVisualFormat == NULL) {
+ DTRACE_PRINTLN1("Can't find 'XRenderFindVisualFormat' in libXrender (%s)", dlerror());
+ }
+ } else {
+ DTRACE_PRINTLN1("Can't load libXrender (%s)", dlerror());
}
+ } else {
+ DTRACE_PRINTLN("RENDER extension NOT available");
}
for (i = 0; i < nTrue; i++) {
@@ -453,18 +465,23 @@
graphicsConfigs [ind]->awt_depth = pVITrue [i].depth;
memcpy (&graphicsConfigs [ind]->awt_visInfo, &pVITrue [i],
sizeof (XVisualInfo));
- if (xrenderFindVisualFormat != NULL) {
+ if (xrenderFindVisualFormat != NULL) {
XRenderPictFormat *format = xrenderFindVisualFormat (awt_display,
- pVITrue [i].visual);
+ pVITrue [i].visual);
if (format &&
format->type == PictTypeDirect &&
format->direct.alphaMask)
{
+ DTRACE_PRINTLN1("GraphicsConfig[%d] supports Translucency", ind);
graphicsConfigs [ind]->isTranslucencySupported = 1;
memcpy(&graphicsConfigs [ind]->renderPictFormat, format,
sizeof(*format));
+ } else {
+ DTRACE_PRINTLN1(format ?
+ "GraphicsConfig[%d] has no Translucency support" :
+ "Error calling 'XRenderFindVisualFormat'", ind);
}
- }
+ }
}
if (xrenderLibHandle != NULL) {
@@ -570,7 +587,7 @@
}
#ifndef HEADLESS
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__linux__) || defined(MACOSX) || defined(_AIX)
static void xinerama_init_linux()
{
void* libHandle = NULL;
@@ -583,14 +600,18 @@
libHandle = dlopen(VERSIONED_JNI_LIB_NAME("Xinerama", "1"),
RTLD_LAZY | RTLD_GLOBAL);
if (libHandle == NULL) {
+#if defined(_AIX)
+ libHandle = dlopen("libXext.a(shr_64.o)", RTLD_MEMBER | RTLD_LAZY | RTLD_GLOBAL);
+#else
libHandle = dlopen(JNI_LIB_NAME("Xinerama"), RTLD_LAZY | RTLD_GLOBAL);
+#endif
}
if (libHandle != NULL) {
XineramaQueryScreens = (XineramaQueryScreensFunc*)
dlsym(libHandle, XineramaQueryScreensName);
if (XineramaQueryScreens != NULL) {
- DTRACE_PRINTLN("calling XineramaQueryScreens func on Linux");
+ DTRACE_PRINTLN("calling XineramaQueryScreens func");
xinInfo = (*XineramaQueryScreens)(awt_display, &locNumScr);
if (xinInfo != NULL && locNumScr > XScreenCount(awt_display)) {
int32_t idx;
@@ -610,7 +631,10 @@
fbrects[idx].y = xinInfo[idx].y_org;
}
} else {
- DTRACE_PRINTLN("calling XineramaQueryScreens didn't work");
+ DTRACE_PRINTLN((xinInfo == NULL) ?
+ "calling XineramaQueryScreens didn't work" :
+ "XineramaQueryScreens <= XScreenCount"
+ );
}
} else {
DTRACE_PRINTLN("couldn't load XineramaQueryScreens symbol");
@@ -620,8 +644,7 @@
DTRACE_PRINTLN1("\ncouldn't open shared library: %s\n", dlerror());
}
}
-#endif
-#if !defined(__linux__) && !defined(MACOSX) /* Solaris */
+#elif defined(__solaris__)
static void xinerama_init_solaris()
{
void* libHandle = NULL;
@@ -677,11 +700,11 @@
}
DTRACE_PRINTLN("Xinerama extension is available");
-#if defined(__linux__) || defined(MACOSX)
+#if defined(__solaris__)
+ xinerama_init_solaris();
+#else /* Linux, Mac, AIX */
xinerama_init_linux();
-#else /* Solaris */
- xinerama_init_solaris();
-#endif /* __linux__ || MACOSX */
+#endif
}
#endif /* HEADLESS */
--- a/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.instrument/windows/native/libinstrument/FileSystemSupport_md.c Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java Tue Apr 02 10:57:57 2019 +0530
@@ -317,14 +317,13 @@
void closeOrReturnToCache(HttpHeaders hdrs) {
if (hdrs == null) {
// the connection was closed by server, eof
+ Log.logTrace("Cannot return connection to pool: closing {0}", this);
close();
return;
}
- if (!isOpen()) {
- return;
- }
HttpClientImpl client = client();
if (client == null) {
+ Log.logTrace("Client released: closing {0}", this);
close();
return;
}
@@ -333,10 +332,12 @@
.map((s) -> !s.equalsIgnoreCase("close"))
.orElse(true);
- if (keepAlive) {
+ if (keepAlive && isOpen()) {
Log.logTrace("Returning connection to the pool: {0}", this);
pool.returnToPool(this);
} else {
+ Log.logTrace("Closing connection (keepAlive={0}, isOpen={1}): {2}",
+ keepAlive, isOpen(), this);
close();
}
}
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java Tue Apr 02 10:57:57 2019 +0530
@@ -31,7 +31,7 @@
* This engine does not conform to the POSIX regular expression.
*
* <hr width="50%">
- * <h3>How to use</h3>
+ * <h2>How to use</h2>
*
* <dl>
* <dt>A. Standard way
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java Tue Apr 02 10:57:57 2019 +0530
@@ -164,7 +164,7 @@
* set the property {@code javax.xml.catalog.defer} to false to allow the entire
* catalog to be pre-loaded.
*
- * <h3>Scope and Order</h3>
+ * <h2>Scope and Order</h2>
* Features and properties can be set through the catalog file, the Catalog API,
* system properties, and {@code jaxp.properties}, with a preference in the same order.
* <p>
@@ -202,7 +202,7 @@
.build();
* }</pre>
*
- * <h3>JAXP XML Processor Support</h3>
+ * <h2>JAXP XML Processor Support</h2>
* The Catalog Features are supported throughout the JAXP processors, including
* SAX and DOM ({@link javax.xml.parsers}), and StAX parsers ({@link javax.xml.stream}),
* Schema Validation ({@link javax.xml.validation}), and XML Transformation
@@ -246,7 +246,7 @@
* The Catalog support is available for any process in the JAXP library that
* supports a resolver. The following table lists all such processes.
*
- * <h3><a id="ProcessesWithCatalogSupport">Processes with Catalog Support</a></h3>
+ * <h2><a id="ProcessesWithCatalogSupport">Processes with Catalog Support</a></h2>
*
* <table class="striped">
* <caption>Processes with Catalog Support</caption>
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java Tue Apr 02 10:57:57 2019 +0530
@@ -54,7 +54,7 @@
* no further attempt will be made. Only if there is no match in the current
* catalog, will alternate catalogs including delegate and next catalogs be considered.
*
- * <h3>Search Order</h3>
+ * <h2>Search Order</h2>
* The resolver will first search the system-type of entries with the specified
* {@code systemId}. The system entries include {@code system},
* {@code rewriteSystem} and {@code systemSuffix} entries.
@@ -75,7 +75,7 @@
* with the specified {@code systemId} or {@code href}. The {@code uri} entries
* include {@code uri}, {@code rewriteURI}, and {@code uriSuffix} entries.
*
- * <h3>Error Handling</h3>
+ * <h2>Error Handling</h2>
* The interfaces that the CatalogResolver extend specified checked exceptions, including:
* <ul>
* <li>
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java Tue Apr 02 10:57:57 2019 +0530
@@ -183,7 +183,7 @@
* it can use the factory to configure and obtain datatype instances.
*
*
- * <h2>Tip for Trouble-shooting</h2>
+ * <h4>Tip for Trouble-shooting</h4>
* <p>Setting the {@code jaxp.debug} system property will cause
* this method to print a lot of debug messages
* to {@code System.err} about what it is doing and where it is looking at.
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java Tue Apr 02 10:57:57 2019 +0530
@@ -118,7 +118,7 @@
* configure and obtain parser instances.
*
*
- * <h2>Tip for Trouble-shooting</h2>
+ * <h4>Tip for Trouble-shooting</h4>
* <p>
* Setting the {@code jaxp.debug} system property will cause
* this method to print a lot of debug messages
@@ -154,7 +154,7 @@
* it can use the factory to configure and obtain parser instances.
*
*
- * <h2>Tip for Trouble-shooting</h2>
+ * <h4>Tip for Trouble-shooting</h4>
* <p>Setting the {@code jaxp.debug} system property will cause
* this method to print a lot of debug messages
* to {@code System.err} about what it is doing and where it is looking at.
@@ -549,7 +549,7 @@
* exception when the {@link #newDocumentBuilder()} is invoked.
*
*
- * <h3>Note for implementors</h3>
+ * <h4>Note for implementors</h4>
*
* <p>
* A parser must be able to work with any {@link Schema}
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java Tue Apr 02 10:57:57 2019 +0530
@@ -123,7 +123,7 @@
*
*
*
- * <h2>Tip for Trouble-shooting</h2>
+ * <h4>Tip for Trouble-shooting</h4>
* <p>
* Setting the {@code jaxp.debug} system property will cause
* this method to print a lot of debug messages
@@ -161,7 +161,7 @@
* it can use the factory to configure and obtain parser instances.
*
*
- * <h2>Tip for Trouble-shooting</h2>
+ * <h4>Tip for Trouble-shooting</h4>
* <p>Setting the {@code jaxp.debug} system property will cause
* this method to print a lot of debug messages
* to {@code System.err} about what it is doing and where it is looking at.
@@ -389,7 +389,7 @@
* Such configuration will cause a {@link SAXException}
* exception when those properties are set on a {@link SAXParser}.
*
- * <h3>Note for implementors</h3>
+ * <h4>Note for implementors</h4>
* <p>
* A parser must be able to work with any {@link Schema}
* implementation. However, parsers and schemas are allowed
--- a/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java Tue Apr 02 10:57:57 2019 +0530
@@ -140,7 +140,7 @@
* {@code TransformerFactory} it can use the factory to configure
* and obtain transformer instances.
*
- * <h2>Tip for Trouble-shooting</h2>
+ * <h4>Tip for Trouble-shooting</h4>
* <p>Setting the {@code jaxp.debug} system property will cause
* this method to print a lot of debug messages
* to {@code System.err} about what it is doing and where it is looking at.
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java Tue Apr 02 10:57:57 2019 +0530
@@ -206,7 +206,7 @@
*
* <p>If everything fails, {@link IllegalArgumentException} will be thrown.
*
- * <p><strong>Tip for Trouble-shooting:</strong>
+ * <h4>Tip for Trouble-shooting:</h4>
* <p>See {@link java.util.Properties#load(java.io.InputStream)} for
* exactly how a property file is parsed. In particular, colons ':'
* need to be escaped in a property file, so make sure schema language
@@ -259,7 +259,7 @@
* It gives more control to the application as it can specify which provider
* should be loaded.
*
- * <h2>Tip for Trouble-shooting</h2>
+ * <h4>Tip for Trouble-shooting</h4>
* <p>Setting the {@code jaxp.debug} system property will cause
* this method to print a lot of debug messages
* to {@code System.err} about what it is doing and where it is looking at.
@@ -717,7 +717,7 @@
* to abort the further processing by throwing it. If an error handler is not set,
* the callee will throw the first error it finds in the sources.
*
- * <h2>W3C XML Schema 1.0</h2>
+ * <h4>W3C XML Schema 1.0</h4>
* <p>
* The resulting schema contains components from the specified sources.
* The same result would be achieved if all these sources were
@@ -737,7 +737,7 @@
* specified in the section 5.1 of the XML Schema spec, then
* the error must be reported to the {@link ErrorHandler}.
*
- * <h2>RELAX NG</h2>
+ * <h4>RELAX NG</h4>
*
* <p>For RELAX NG, this method must throw {@link UnsupportedOperationException}
* if {@code schemas.length!=1}.
@@ -797,7 +797,7 @@
* make sure that features, such as secure processing, are explicitly
* set in both places.
*
- * <h2>W3C XML Schema 1.0</h2>
+ * <h4>W3C XML Schema 1.0</h4>
* <p>
* For XML Schema, this method creates a {@link Schema} object that
* performs validation by using location hints specified in documents.
@@ -815,7 +815,7 @@
* vulnerability to denial-of-service attacks.
*
*
- * <h2>RELAX NG</h2>
+ * <h4>RELAX NG</h4>
* <p>
* RELAX NG does not support this operation.
*
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java Tue Apr 02 10:57:57 2019 +0530
@@ -239,7 +239,7 @@
* should be loaded.</p>
*
*
- * <h2>Tip for Trouble-shooting</h2>
+ * <h4>Tip for Trouble-shooting</h4>
* <p>Setting the <code>jaxp.debug</code> system property will cause
* this method to print a lot of debug messages
* to <code>System.err</code> about what it is doing and where it is looking at.</p>
--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataPatchProcessor.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/DataPatchProcessor.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@
import jdk.vm.ci.hotspot.HotSpotObjectConstant;
import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
import jdk.vm.ci.hotspot.HotSpotSentinelConstant;
+import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.VMConstant;
final class DataPatchProcessor {
@@ -95,21 +96,24 @@
gotName = "got." + targetSymbol;
binaryContainer.addCountersSymbol(targetSymbol);
}
- } else if (constant instanceof HotSpotObjectConstant) {
- HotSpotObjectConstant oopConstant = (HotSpotObjectConstant) constant;
- if (oopConstant instanceof HotSpotConstantPoolObject) {
- HotSpotConstantPoolObject cpo = (HotSpotConstantPoolObject) oopConstant;
+ } else if (constant instanceof JavaConstant) {
+ JavaConstant jConstant = (JavaConstant) constant;
+ if (jConstant instanceof HotSpotConstantPoolObject) {
+ HotSpotConstantPoolObject cpo = (HotSpotConstantPoolObject) jConstant;
// Even if two locations use the same object, resolve separately
- targetSymbol = "ldc." + cpo.getCpType().getName() + cpo.getCpi();
- } else {
+ targetSymbol = "ldc." + cpo.toValueString();
+ Integer offset = binaryContainer.addOopSymbol(targetSymbol);
+ gotName = "got.ldc." + offset;
+ } else if (jConstant instanceof HotSpotObjectConstant) {
+ HotSpotObjectConstant oopConstant = (HotSpotObjectConstant) jConstant;
// String constant.
targetSymbol = "ldc." + oopConstant.toValueString();
+ Integer offset = binaryContainer.addOopSymbol(targetSymbol);
+ gotName = "got.ldc." + offset;
+ } else if (jConstant instanceof HotSpotSentinelConstant) {
+ targetSymbol = "state.M" + methodInfo.getCodeId();
+ gotName = "got." + targetSymbol;
}
- Integer offset = binaryContainer.addOopSymbol(targetSymbol);
- gotName = "got.ldc." + offset;
- } else if (constant instanceof HotSpotSentinelConstant) {
- targetSymbol = "state.M" + methodInfo.getCodeId();
- gotName = "got." + targetSymbol;
}
assert gotName != null : "Unknown constant type: " + constant;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java Tue Apr 02 10:57:57 2019 +0530
@@ -437,6 +437,18 @@
}
@Override @DefinedBy(Api.COMPILER)
+ public Iterable<? extends JavaFileObject> getJavaFileObjectsFromPaths(Collection<? extends Path> paths) {
+ try {
+ return ((StandardJavaFileManager)clientJavaFileManager).getJavaFileObjectsFromPaths(paths);
+ } catch (ClientCodeException e) {
+ throw e;
+ } catch (RuntimeException | Error e) {
+ throw new ClientCodeException(e);
+ }
+ }
+
+ @Deprecated(since = "13")
+ @Override @DefinedBy(Api.COMPILER)
public Iterable<? extends JavaFileObject> getJavaFileObjectsFromPaths(Iterable<? extends Path> paths) {
try {
return ((StandardJavaFileManager)clientJavaFileManager).getJavaFileObjectsFromPaths(paths);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java Tue Apr 02 10:57:57 2019 +0530
@@ -33,6 +33,7 @@
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.function.Supplier;
import javax.lang.model.SourceVersion;
import javax.tools.JavaFileManager;
@@ -222,7 +223,7 @@
jrtIndex = useCtProps && JRTIndex.isAvailable() ? JRTIndex.getSharedInstance() : null;
profile = Profile.instance(context);
- cachedCompletionFailure = new CompletionFailure(null, (JCDiagnostic) null, dcfh);
+ cachedCompletionFailure = new CompletionFailure(null, () -> null, dcfh);
cachedCompletionFailure.setStackTrace(new StackTraceElement[0]);
}
@@ -298,9 +299,12 @@
try {
fillIn(p);
} catch (IOException ex) {
- JCDiagnostic msg =
- diagFactory.fragment(Fragments.ExceptionMessage(ex.getLocalizedMessage()));
- throw new CompletionFailure(sym, msg, dcfh).initCause(ex);
+ throw new CompletionFailure(
+ sym,
+ () -> diagFactory.fragment(
+ Fragments.ExceptionMessage(ex.getLocalizedMessage())),
+ dcfh)
+ .initCause(ex);
}
}
if (!reader.filling)
@@ -337,9 +341,8 @@
*/
void fillIn(ClassSymbol c) {
if (completionFailureName == c.fullname) {
- JCDiagnostic msg =
- diagFactory.fragment(Fragments.UserSelectedCompletionFailure);
- throw new CompletionFailure(c, msg, dcfh);
+ throw new CompletionFailure(
+ c, () -> diagFactory.fragment(Fragments.UserSelectedCompletionFailure), dcfh);
}
currentOwner = c;
JavaFileObject classfile = c.classfile;
@@ -390,16 +393,15 @@
}
// where
private CompletionFailure classFileNotFound(ClassSymbol c) {
- JCDiagnostic diag =
- diagFactory.fragment(Fragments.ClassFileNotFound(c.flatname));
- return newCompletionFailure(c, diag);
+ return newCompletionFailure(
+ c, () -> diagFactory.fragment(Fragments.ClassFileNotFound(c.flatname)));
}
/** Static factory for CompletionFailure objects.
* In practice, only one can be used at a time, so we share one
* to reduce the expense of allocating new exception objects.
*/
private CompletionFailure newCompletionFailure(TypeSymbol c,
- JCDiagnostic diag) {
+ Supplier<JCDiagnostic> diag) {
if (!cacheCompletionFailure) {
// log.warning("proc.messager",
// Log.getLocalizedString("class.file.not.found", c.flatname));
@@ -408,7 +410,7 @@
} else {
CompletionFailure result = cachedCompletionFailure;
result.sym = c;
- result.diag = diag;
+ result.resetDiagnostic(diag);
return result;
}
}
@@ -782,7 +784,7 @@
public BadClassFile(TypeSymbol sym, JavaFileObject file, JCDiagnostic diag,
JCDiagnostic.Factory diagFactory, DeferredCompletionFailureHandler dcfh) {
- super(sym, createBadClassFileDiagnostic(file, diag, diagFactory), dcfh);
+ super(sym, () -> createBadClassFileDiagnostic(file, diag, diagFactory), dcfh);
}
// where
private static JCDiagnostic createBadClassFileDiagnostic(
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java Tue Apr 02 10:57:57 2019 +0530
@@ -32,6 +32,7 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
+import java.util.function.Supplier;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@@ -2131,26 +2132,31 @@
/** A diagnostic object describing the failure
*/
- public JCDiagnostic diag;
+ private JCDiagnostic diag;
- public CompletionFailure(Symbol sym, JCDiagnostic diag, DeferredCompletionFailureHandler dcfh) {
+ private Supplier<JCDiagnostic> diagSupplier;
+
+ public CompletionFailure(Symbol sym, Supplier<JCDiagnostic> diagSupplier, DeferredCompletionFailureHandler dcfh) {
this.dcfh = dcfh;
this.sym = sym;
- this.diag = diag;
+ this.diagSupplier = diagSupplier;
// this.printStackTrace();//DEBUG
}
public JCDiagnostic getDiagnostic() {
+ if (diag == null && diagSupplier != null) {
+ diag = diagSupplier.get();
+ }
return diag;
}
@Override
public String getMessage() {
- return diag.getMessage(null);
+ return getDiagnostic().getMessage(null);
}
public JCDiagnostic getDetailValue() {
- return diag;
+ return getDiagnostic();
}
@Override
@@ -2159,6 +2165,11 @@
return this;
}
+ public void resetDiagnostic(Supplier<JCDiagnostic> diagSupplier) {
+ this.diagSupplier = diagSupplier;
+ this.diag = null;
+ }
+
}
/**
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java Tue Apr 02 10:57:57 2019 +0530
@@ -2226,7 +2226,11 @@
// Warn about fall-through if lint switch fallthrough enabled.
}
if (!hasDefault) {
- inits.andSet(initsSwitch);
+ if (tree.hasTag(SWITCH_EXPRESSION)) {
+ markDead();
+ } else {
+ inits.andSet(initsSwitch);
+ }
}
resolveBreaks(tree, prevPendingExits);
nextadr = nextadrPrev;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/CacheFSInfo.java Tue Apr 02 10:57:57 2019 +0530
@@ -26,9 +26,11 @@
package com.sun.tools.javac.file;
import java.io.IOException;
+import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
import java.util.List;
-import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import com.sun.tools.javac.util.Context;
@@ -44,6 +46,12 @@
*/
public class CacheFSInfo extends FSInfo {
+ protected final ConcurrentHashMap<Path, Path> canonicalPathCache = new ConcurrentHashMap<>();
+ protected final ConcurrentHashMap<Path, Optional<BasicFileAttributes>> attributeCache =
+ new ConcurrentHashMap<>();
+ protected final ConcurrentHashMap<Path, List<Path>> jarClassPathCache =
+ new ConcurrentHashMap<>();
+
/**
* Register a Context.Factory to create a CacheFSInfo.
*/
@@ -56,68 +64,53 @@
}
public void clearCache() {
- cache.clear();
+ canonicalPathCache.clear();
+ attributeCache.clear();
+ jarClassPathCache.clear();
}
@Override
public Path getCanonicalFile(Path file) {
- Entry e = getEntry(file);
- return e.canonicalFile;
+ return canonicalPathCache.computeIfAbsent(file, super::getCanonicalFile);
}
@Override
public boolean exists(Path file) {
- Entry e = getEntry(file);
- return e.exists;
+ return getAttributes(file).isPresent();
}
@Override
public boolean isDirectory(Path file) {
- Entry e = getEntry(file);
- return e.isDirectory;
+ return getAttributes(file).map(BasicFileAttributes::isDirectory).orElse(false);
}
@Override
public boolean isFile(Path file) {
- Entry e = getEntry(file);
- return e.isFile;
+ return getAttributes(file).map(BasicFileAttributes::isRegularFile).orElse(false);
}
@Override
public List<Path> getJarClassPath(Path file) throws IOException {
- // don't bother to lock the cache, because it is thread-safe, and
- // because the worst that can happen would be to create two identical
- // jar class paths together and have one overwrite the other.
- Entry e = getEntry(file);
- if (e.jarClassPath == null)
- e.jarClassPath = super.getJarClassPath(file);
- return e.jarClassPath;
+ synchronized (jarClassPathCache) {
+ List<Path> jarClassPath = jarClassPathCache.get(file);
+ if (jarClassPath == null) {
+ jarClassPath = super.getJarClassPath(file);
+ jarClassPathCache.put(file, jarClassPath);
+ }
+ return jarClassPath;
+ }
}
- private Entry getEntry(Path file) {
- // don't bother to lock the cache, because it is thread-safe, and
- // because the worst that can happen would be to create two identical
- // entries together and have one overwrite the other.
- Entry e = cache.get(file);
- if (e == null) {
- e = new Entry();
- e.canonicalFile = super.getCanonicalFile(file);
- e.exists = super.exists(file);
- e.isDirectory = super.isDirectory(file);
- e.isFile = super.isFile(file);
- cache.put(file, e);
- }
- return e;
+ protected Optional<BasicFileAttributes> getAttributes(Path file) {
+ return attributeCache.computeIfAbsent(file, this::maybeReadAttributes);
}
- // could also be a Map<File,SoftReference<Entry>> ?
- private final Map<Path,Entry> cache = new ConcurrentHashMap<>();
-
- private static class Entry {
- Path canonicalFile;
- boolean exists;
- boolean isFile;
- boolean isDirectory;
- List<Path> jarClassPath;
+ protected Optional<BasicFileAttributes> maybeReadAttributes(Path file) {
+ try {
+ return Optional.of(Files.readAttributes(file, BasicFileAttributes.class));
+ } catch (IOException e) {
+ // Ignore; means file not found
+ return Optional.empty();
+ }
}
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java Tue Apr 02 10:57:57 2019 +0530
@@ -897,7 +897,7 @@
@Override @DefinedBy(Api.COMPILER)
public Iterable<? extends JavaFileObject> getJavaFileObjectsFromPaths(
- Iterable<? extends Path> paths)
+ Collection<? extends Path> paths)
{
ArrayList<PathFileObject> result;
if (paths instanceof Collection<?>)
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue Apr 02 10:57:57 2019 +0530
@@ -3079,7 +3079,7 @@
}
} catch (Exception e) {
throw new CompletionFailure(sym,
- ClassReader.this.diagFactory.fragment(Fragments.ExceptionMessage(e.getMessage())),
+ () -> ClassReader.this.diagFactory.fragment(Fragments.ExceptionMessage(e.getMessage())),
dcfh);
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/DelegatingJavaFileManager.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/DelegatingJavaFileManager.java Tue Apr 02 10:57:57 2019 +0530
@@ -206,6 +206,13 @@
@Override
public Iterable<? extends JavaFileObject> getJavaFileObjectsFromPaths
+ (Collection<? extends Path> paths) {
+ return baseSJFM.getJavaFileObjectsFromPaths(paths);
+ }
+
+ @Deprecated(since = "13")
+ @Override
+ public Iterable<? extends JavaFileObject> getJavaFileObjectsFromPaths
(Iterable<? extends Path> paths) {
return baseSJFM.getJavaFileObjectsFromPaths(paths);
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java Tue Apr 02 10:57:57 2019 +0530
@@ -805,9 +805,8 @@
*/
public void readSourceFile(JCCompilationUnit tree, ClassSymbol c) throws CompletionFailure {
if (completionFailureName == c.fullname) {
- JCDiagnostic msg =
- diagFactory.fragment(Fragments.UserSelectedCompletionFailure);
- throw new CompletionFailure(c, msg, dcfh);
+ throw new CompletionFailure(
+ c, () -> diagFactory.fragment(Fragments.UserSelectedCompletionFailure), dcfh);
}
JavaFileObject filename = c.classfile;
JavaFileObject prev = log.useSource(filename);
@@ -835,7 +834,7 @@
// have enough modules available to access java.lang, and
// so risk getting FatalError("no.java.lang") from MemberEnter.
if (!modules.enter(List.of(tree), c)) {
- throw new CompletionFailure(c, diags.fragment(Fragments.CantResolveModules), dcfh);
+ throw new CompletionFailure(c, () -> diags.fragment(Fragments.CantResolveModules), dcfh);
}
enter.complete(List.of(tree), c);
@@ -990,6 +989,8 @@
if (!log.hasDiagnosticListener()) {
printCount("error", errorCount());
printCount("warn", warningCount());
+ printSuppressedCount(errorCount(), log.nsuppressederrors, "count.error.recompile");
+ printSuppressedCount(warningCount(), log.nsuppressedwarns, "count.warn.recompile");
}
if (!taskListener.isEmpty()) {
taskListener.finished(new TaskEvent(TaskEvent.Kind.COMPILATION));
@@ -1845,6 +1846,15 @@
}
}
+ private void printSuppressedCount(int shown, int suppressed, String diagKey) {
+ if (suppressed > 0) {
+ int total = shown + suppressed;
+ log.printLines(WriterKind.ERROR, diagKey,
+ String.valueOf(shown), String.valueOf(total));
+ log.flush(Log.WriterKind.ERROR);
+ }
+ }
+
private static long now() {
return System.currentTimeMillis();
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Apr 02 10:57:57 2019 +0530
@@ -1636,6 +1636,14 @@
compiler.misc.count.error.plural=\
{0} errors
+# 0: number, 1: number
+compiler.misc.count.error.recompile=\
+ only showing the first {0} errors, of {1} total; use -Xmaxerrs if you would like to see more
+
+# 0: number, 1: number
+compiler.misc.count.warn.recompile=\
+ only showing the first {0} warnings, of {1} total; use -Xmaxwarns if you would like to see more
+
# 0: number
compiler.misc.count.warn=\
{0} warning
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java Tue Apr 02 10:57:57 2019 +0530
@@ -419,6 +419,14 @@
*/
public int nwarnings = 0;
+ /** The number of errors encountered after MaxErrors was reached.
+ */
+ public int nsuppressederrors = 0;
+
+ /** The number of warnings encountered after MaxWarnings was reached.
+ */
+ public int nsuppressedwarns = 0;
+
/** A set of all errors generated so far. This is used to avoid printing an
* error message more than once. For each error, a pair consisting of the
* source file name and source code position of the error is added to the set.
@@ -708,16 +716,21 @@
if (nwarnings < MaxWarnings) {
writeDiagnostic(diagnostic);
nwarnings++;
+ } else {
+ nsuppressedwarns++;
}
}
break;
case ERROR:
- if (nerrors < MaxErrors &&
- (diagnostic.isFlagSet(DiagnosticFlag.API) ||
- shouldReport(diagnostic))) {
- writeDiagnostic(diagnostic);
- nerrors++;
+ if (diagnostic.isFlagSet(DiagnosticFlag.API) ||
+ shouldReport(diagnostic)) {
+ if (nerrors < MaxErrors) {
+ writeDiagnostic(diagnostic);
+ nerrors++;
+ } else {
+ nsuppressederrors++;
+ }
}
break;
}
@@ -844,6 +857,8 @@
printRawDiag(errWriter, "error: ", pos, msg);
prompt();
nerrors++;
+ } else {
+ nsuppressederrors++;
}
errWriter.flush();
}
@@ -852,8 +867,12 @@
*/
public void rawWarning(int pos, String msg) {
PrintWriter warnWriter = writers.get(WriterKind.ERROR);
- if (nwarnings < MaxWarnings && emitWarnings) {
- printRawDiag(warnWriter, "warning: ", pos, msg);
+ if (emitWarnings) {
+ if (nwarnings < MaxWarnings) {
+ printRawDiag(warnWriter, "warning: ", pos, msg);
+ } else {
+ nsuppressedwarns++;
+ }
}
prompt();
nwarnings++;
--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -502,7 +502,7 @@
else
{
if ((dwKeySpec & CERT_NCRYPT_KEY_SPEC) == CERT_NCRYPT_KEY_SPEC) {
- PP("CNG %I64d", hCryptProv);
+ PP("CNG %I64d", (__int64)hCryptProv);
} else {
// Private key is available
BOOL bGetUserKey = ::CryptGetUserKey(hCryptProv, dwKeySpec, &hUserKey); //deprecated
@@ -517,7 +517,7 @@
// Set cipher mode to ECB
DWORD dwCipherMode = CRYPT_MODE_ECB;
::CryptSetKeyParam(hUserKey, KP_MODE, (BYTE*)&dwCipherMode, NULL); //deprecated
- PP("CAPI %I64d %I64d", hCryptProv, hUserKey);
+ PP("CAPI %I64d %I64d", (__int64)hCryptProv, (__int64)hUserKey);
}
// If the private key is present in smart card, we may not be able to
// determine the key length by using the private key handle. However,
@@ -863,8 +863,8 @@
SS_CHECK(::NCryptTranslateHandle(
NULL,
&hk,
- hCryptProv,
- hCryptKey,
+ (HCRYPTPROV)hCryptProv,
+ (HCRYPTKEY)hCryptKey,
NULL,
0));
}
@@ -1087,8 +1087,8 @@
SS_CHECK(::NCryptTranslateHandle(
NULL,
&hk,
- hCryptProv,
- hCryptKey,
+ (HCRYPTPROV)hCryptProv,
+ (HCRYPTKEY)hCryptKey,
NULL,
0));
}
@@ -1920,7 +1920,7 @@
// Determine the size of the blob
if (hCryptKey == 0) {
SS_CHECK(::NCryptExportKey(
- hCryptProv, NULL, BCRYPT_ECCPUBLIC_BLOB,
+ (NCRYPT_KEY_HANDLE)hCryptProv, NULL, BCRYPT_ECCPUBLIC_BLOB,
NULL, NULL, 0, &dwBlobLen, NCRYPT_SILENT_FLAG));
} else {
if (! ::CryptExportKey((HCRYPTKEY) hCryptKey, 0, PUBLICKEYBLOB, 0, NULL, //deprecated
@@ -1939,7 +1939,7 @@
// Generate key blob
if (hCryptKey == 0) {
SS_CHECK(::NCryptExportKey(
- hCryptProv, NULL, BCRYPT_ECCPUBLIC_BLOB,
+ (NCRYPT_KEY_HANDLE)hCryptProv, NULL, BCRYPT_ECCPUBLIC_BLOB,
NULL, pbKeyBlob, dwBlobLen, &dwBlobLen, NCRYPT_SILENT_FLAG));
} else {
if (! ::CryptExportKey((HCRYPTKEY) hCryptKey, 0, PUBLICKEYBLOB, 0, //deprecated
--- a/src/jdk.internal.vm.ci/share/classes/module-info.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.ci/share/classes/module-info.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,7 +24,9 @@
*/
module jdk.internal.vm.ci {
- exports jdk.vm.ci.services to jdk.internal.vm.compiler;
+ exports jdk.vm.ci.services to
+ jdk.internal.vm.compiler,
+ jdk.internal.vm.compiler.management;
exports jdk.vm.ci.runtime to
jdk.internal.vm.compiler,
jdk.internal.vm.compiler.management;
--- a/src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalRuntimeMBean.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalRuntimeMBean.java Tue Apr 02 10:57:57 2019 +0530
@@ -52,6 +52,8 @@
import org.graalvm.compiler.options.OptionsParser;
import org.graalvm.compiler.serviceprovider.GraalServices;
+import jdk.vm.ci.services.Services;
+
/**
* MBean used to access properties and operations of a {@link HotSpotGraalRuntime} instance.
*/
@@ -84,7 +86,7 @@
private static boolean initDebug() {
try {
- return Boolean.getBoolean(HotSpotGraalRuntimeMBean.class.getSimpleName() + ".debug");
+ return Boolean.parseBoolean(Services.getSavedProperties().get(HotSpotGraalRuntimeMBean.class.getSimpleName() + ".debug"));
} catch (SecurityException e) {
// Swallow the exception
return false;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java Tue Apr 02 10:57:57 2019 +0530
@@ -40,6 +40,7 @@
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.BR;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.BRK;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CAS;
+import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CCMP;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CLREX;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CLS;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CLZ;
@@ -86,6 +87,7 @@
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVK;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVN;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVZ;
+import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MRS;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MSUB;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ORN;
import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ORR;
@@ -436,6 +438,7 @@
private static final int FpImmOffset = 13;
private static final int FpCmpOp = 0x1E202000;
+ private static final int FpCmpeOp = 0x1E202010;
private static final int PcRelImmHiOffset = 5;
private static final int PcRelImmLoOffset = 29;
@@ -532,6 +535,8 @@
SUB(0x40000000),
SUBS(SUB.encoding | AddSubSetFlag),
+ CCMP(0x7A400000),
+
NOT(0x00200000),
AND(0x00000000),
BIC(AND.encoding | NOT.encoding),
@@ -618,6 +623,9 @@
HINT(0xD503201F),
DMB(0x000000A0),
+ MRS(0xD5300000),
+ MSR(0xD5100000),
+
BLR_NATIVE(0xc0000000);
public final int encoding;
@@ -628,6 +636,29 @@
}
+ public enum SystemRegister {
+ FPCR(0b11, 0b011, 0b0100, 0b0100, 0b000),
+ FPSR(0b11, 0b011, 0b0100, 0b0100, 0b001);
+
+ SystemRegister(int op0, int op1, int crn, int crm, int op2) {
+ this.op0 = op0;
+ this.op1 = op1;
+ this.crn = crn;
+ this.crm = crm;
+ this.op2 = op2;
+ }
+
+ public int encoding() {
+ return op0 << 19 | op1 << 16 | crn << 12 | crm << 8 | op2 << 5;
+ }
+
+ private final int op0;
+ private final int op1;
+ private final int crn;
+ private final int crm;
+ private final int op2;
+ }
+
public enum ShiftType {
LSL(0),
LSR(1),
@@ -971,8 +1002,10 @@
int imm = (imm28 & NumUtil.getNbitNumberInt(28)) >> 2;
int instrEncoding = instr.encoding | UnconditionalBranchImmOp;
if (pos == -1) {
+ annotatePatchingImmediate(position(), instr, 26, 0, 2);
emitInt(instrEncoding | imm);
} else {
+ annotatePatchingImmediate(pos, instr, 26, 0, 2);
emitInt(instrEncoding | imm, pos);
}
}
@@ -1011,6 +1044,7 @@
assert !reg.equals(zr);
assert !reg.equals(sp);
emitInt(instr.encoding | UnconditionalBranchRegOp | rs1(reg));
+
}
/* Load-Store Single Register (5.3.1) */
@@ -1161,9 +1195,11 @@
int memop = instr.encoding | transferSizeEncoding | is32Bit | isFloat | rt(reg);
switch (address.getAddressingMode()) {
case IMMEDIATE_SCALED:
+ annotatePatchingImmediate(position(), instr, 12, LoadStoreScaledImmOffset, log2TransferSize);
emitInt(memop | LoadStoreScaledOp | address.getImmediate() << LoadStoreScaledImmOffset | rs1(address.getBase()));
break;
case IMMEDIATE_UNSCALED:
+ annotatePatchingImmediate(position(), instr, 9, LoadStoreUnscaledImmOffset, 0);
emitInt(memop | LoadStoreUnscaledOp | address.getImmediate() << LoadStoreUnscaledImmOffset | rs1(address.getBase()));
break;
case BASE_REGISTER_ONLY:
@@ -1178,12 +1214,15 @@
case PC_LITERAL:
assert log2TransferSize >= 2 : "PC literal loads only works for load/stores of 32-bit and larger";
transferSizeEncoding = (log2TransferSize - 2) << LoadStoreTransferSizeOffset;
+ annotatePatchingImmediate(position(), instr, 21, LoadLiteralImmeOffset, 2);
emitInt(transferSizeEncoding | isFloat | LoadLiteralOp | rd(reg) | address.getImmediate() << LoadLiteralImmeOffset);
break;
case IMMEDIATE_POST_INDEXED:
+ annotatePatchingImmediate(position(), instr, 9, LoadStoreIndexedImmOffset, 0);
emitInt(memop | LoadStorePostIndexedOp | rs1(address.getBase()) | address.getImmediate() << LoadStoreIndexedImmOffset);
break;
case IMMEDIATE_PRE_INDEXED:
+ annotatePatchingImmediate(position(), instr, 9, LoadStoreIndexedImmOffset, 0);
emitInt(memop | LoadStorePreIndexedOp | rs1(address.getBase()) | address.getImmediate() << LoadStoreIndexedImmOffset);
break;
default:
@@ -1529,6 +1568,10 @@
emitInt(type.encoding | instr.encoding | AddSubImmOp | encodeAimm(aimm) | rd(dst) | rs1(src));
}
+ public void ccmp(int size, Register x, Register y, int aimm, ConditionFlag condition) {
+ emitInt(generalFromSize(size).encoding | CCMP.encoding | rs1(x) | rs2(y) | encodeAimm(aimm) | condition.encoding << ConditionalConditionOffset);
+ }
+
/**
* Encodes arithmetic immediate.
*
@@ -2414,7 +2457,8 @@
return false;
}
// bits[62] and bits[61] are opposites.
- return ((bits ^ (bits << 1)) & (1L << 62)) != 0;
+ boolean result = ((bits ^ (bits << 1)) & (1L << 62)) != 0;
+ return result;
}
private static int getFloatImmediate(float imm) {
@@ -2694,6 +2738,20 @@
}
/**
+ * Signalling compares src1 to src2.
+ *
+ * @param size register size.
+ * @param src1 floating point register. May not be null.
+ * @param src2 floating point register. May not be null.
+ */
+ public void fcmpe(int size, Register src1, Register src2) {
+ assert src1.getRegisterCategory().equals(SIMD);
+ assert src2.getRegisterCategory().equals(SIMD);
+ InstructionType type = floatFromSize(size);
+ emitInt(type.encoding | FCMP.encoding | FpCmpeOp | rs1(src1) | rs2(src2));
+ }
+
+ /**
* Conditional compare. NZCV = fcmp(src1, src2) if condition else uimm4.
*
* @param size register size.
@@ -2722,6 +2780,18 @@
emitInt(type.encoding | FCMPZERO.encoding | FpCmpOp | rs1(src));
}
+ /**
+ * Signalling compare register to 0.0 .
+ *
+ * @param size register size.
+ * @param src floating point register. May not be null.
+ */
+ public void fcmpeZero(int size, Register src) {
+ assert src.getRegisterCategory().equals(SIMD);
+ InstructionType type = floatFromSize(size);
+ emitInt(type.encoding | FCMPZERO.encoding | FpCmpeOp | rs1(src));
+ }
+
/* Floating-point Conditional Select (5.7.11) */
/**
@@ -2833,4 +2903,58 @@
emitInt(DMB.encoding | BarrierOp | barrierKind.encoding << BarrierKindOffset);
}
+ public void mrs(Register dst, SystemRegister systemRegister) {
+ emitInt(MRS.encoding | systemRegister.encoding() | rt(dst));
+ }
+
+ public void msr(SystemRegister systemRegister, Register src) {
+ emitInt(MRS.encoding | systemRegister.encoding() | rt(src));
+ }
+
+ public void annotatePatchingImmediate(int pos, Instruction instruction, int operandSizeBits, int offsetBits, int shift) {
+ if (codePatchingAnnotationConsumer != null) {
+ codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(pos, instruction, operandSizeBits, offsetBits, shift));
+ }
+ }
+
+ void annotatePatchingImmediateNativeAddress(int pos, int operandSizeBits, int numInstrs) {
+ if (codePatchingAnnotationConsumer != null) {
+ codePatchingAnnotationConsumer.accept(new MovSequenceAnnotation(pos, operandSizeBits, numInstrs));
+ }
+ }
+
+ public static class OperandDataAnnotation extends CodeAnnotation {
+
+ /**
+ * The size of the operand, in bytes.
+ */
+ public final int operandSizeBits;
+ public final int offsetBits;
+ public final Instruction instruction;
+ public final int shift;
+
+ OperandDataAnnotation(int instructionPosition, Instruction instruction, int operandSizeBits, int offsetBits, int shift) {
+ super(instructionPosition);
+ this.operandSizeBits = operandSizeBits;
+ this.offsetBits = offsetBits;
+ this.shift = shift;
+ this.instruction = instruction;
+ }
+ }
+
+ public static class MovSequenceAnnotation extends CodeAnnotation {
+
+ /**
+ * The size of the operand, in bytes.
+ */
+ public final int operandSizeBits;
+ public final int numInstrs;
+
+ MovSequenceAnnotation(int instructionPosition, int operandSizeBits, int numInstrs) {
+ super(instructionPosition);
+ this.operandSizeBits = operandSizeBits;
+ this.numInstrs = numInstrs;
+ }
+ }
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java Tue Apr 02 10:57:57 2019 +0530
@@ -266,7 +266,8 @@
* @return AArch64Address pointing to memory at {@code base + displacement}.
*/
public AArch64Address makeAddress(Register base, long displacement, int transferSize) {
- return makeAddress(base, displacement, zr, /* signExtend */false, transferSize, zr, /* allowOverwrite */false);
+ return makeAddress(base, displacement, zr, /* signExtend */false, //
+ transferSize, zr, /* allowOverwrite */false);
}
/**
@@ -365,7 +366,19 @@
* @param imm immediate loaded into register.
*/
public void mov(Register dst, long imm) {
+ mov(dst, imm, false);
+ }
+
+ /**
+ * Loads immediate into register.
+ *
+ * @param dst general purpose register. May not be null, zero-register or stackpointer.
+ * @param imm immediate loaded into register.
+ * @param annotateImm Flag to signal of the immediate value should be annotated.
+ */
+ public void mov(Register dst, long imm, boolean annotateImm) {
assert dst.getRegisterCategory().equals(CPU);
+ int pos = position();
if (imm == 0L) {
movx(dst, zr);
} else if (LogicalImmediateTable.isRepresentable(true, imm) != LogicalImmediateTable.Representable.NO) {
@@ -379,6 +392,9 @@
sxt(64, 32, dst, dst);
} else {
mov64(dst, imm);
+ if (annotateImm) {
+ annotatePatchingImmediateNativeAddress(pos, 64, 4);
+ }
}
}
@@ -403,9 +419,25 @@
* @param imm
*/
public void movNativeAddress(Register dst, long imm) {
+ movNativeAddress(dst, imm, false);
+ }
+
+ /**
+ * Generates a 48-bit immediate move code sequence. The immediate may later be updated by
+ * HotSpot.
+ *
+ * In AArch64 mode the virtual address space is 48-bits in size, so we only need three
+ * instructions to create a patchable instruction sequence that can reach anywhere.
+ *
+ * @param dst general purpose register. May not be null, stackpointer or zero-register.
+ * @param imm The immediate address
+ * @param annotateImm Flag to signal of the immediate value should be annotated.
+ */
+ public void movNativeAddress(Register dst, long imm, boolean annotateImm) {
assert (imm & 0xFFFF_0000_0000_0000L) == 0;
// We have to move all non zero parts of the immediate in 16-bit chunks
boolean firstMove = true;
+ int pos = position();
for (int offset = 0; offset < 48; offset += 16) {
int chunk = (int) (imm >> offset) & NumUtil.getNbitNumberInt(16);
if (firstMove) {
@@ -415,6 +447,9 @@
movk(64, dst, chunk, offset);
}
}
+ if (annotateImm) {
+ annotatePatchingImmediateNativeAddress(pos, 48, 3);
+ }
assert !firstMove;
}
@@ -1597,7 +1632,7 @@
}
public void pause() {
- throw GraalError.unimplemented();
+ super.hint(SystemHint.YIELD);
}
/**
@@ -1721,7 +1756,8 @@
*/
@Override
public AArch64Address makeAddress(Register base, int displacement) {
- return makeAddress(base, displacement, zr, /* signExtend */false, /* transferSize */0, zr, /* allowOverwrite */false);
+ return makeAddress(base, displacement, zr, /* signExtend */false, /* transferSize */0, //
+ zr, /* allowOverwrite */false);
}
@Override
@@ -1730,7 +1766,9 @@
}
public void addressOf(Register dst) {
- // This will be fixed up later.
+ if (codePatchingAnnotationConsumer != null) {
+ codePatchingAnnotationConsumer.accept(new AdrpAddMacroInstruction(position()));
+ }
super.adrp(dst);
super.add(64, dst, dst, 0);
}
@@ -1744,4 +1782,51 @@
public void lea(Register d, AArch64Address a) {
a.lea(this, d);
}
+
+ public interface MacroInstruction {
+ void patch(int codePos, int relative, byte[] code);
+ }
+
+ /**
+ * Emits elf patchable adrp add sequence.
+ */
+ public void adrAddRel(int srcSize, Register result, AArch64Address a) {
+ if (codePatchingAnnotationConsumer != null) {
+ codePatchingAnnotationConsumer.accept(new ADRADDPRELMacroInstruction(position()));
+ }
+ super.adrp(a.getBase());
+ this.ldr(srcSize, result, a);
+ }
+
+ public static class ADRADDPRELMacroInstruction extends CodeAnnotation implements MacroInstruction {
+ public ADRADDPRELMacroInstruction(int position) {
+ super(position);
+ }
+
+ @Override
+ public String toString() {
+ return "ADR_PREL_PG";
+ }
+
+ @Override
+ public void patch(int codePos, int relative, byte[] code) {
+ throw GraalError.unimplemented();
+ }
+ }
+
+ public static class AdrpAddMacroInstruction extends CodeAnnotation implements MacroInstruction {
+ public AdrpAddMacroInstruction(int position) {
+ super(position);
+ }
+
+ @Override
+ public String toString() {
+ return "ADRP_ADD";
+ }
+
+ @Override
+ public void patch(int codePos, int relative, byte[] code) {
+ throw GraalError.unimplemented();
+ }
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Assembler.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/Assembler.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -123,7 +123,7 @@
return codeBuffer.getInt(pos);
}
- private static final String NEWLINE = System.getProperty("line.separator");
+ private static final String NEWLINE = System.lineSeparator();
/**
* Some GPU architectures have a text based encoding.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java Tue Apr 02 10:57:57 2019 +0530
@@ -62,11 +62,26 @@
public class AArch64ArithmeticLIRGenerator extends ArithmeticLIRGenerator implements AArch64ArithmeticLIRGeneratorTool {
+ public AArch64ArithmeticLIRGenerator(AllocatableValue nullRegisterValue) {
+ this.nullRegisterValue = nullRegisterValue;
+ }
+
+ private final AllocatableValue nullRegisterValue;
+
@Override
public AArch64LIRGenerator getLIRGen() {
return (AArch64LIRGenerator) super.getLIRGen();
}
+ public boolean mustReplaceNullWithNullRegister(JavaConstant nullConstant) {
+ /* Uncompressed null pointers only */
+ return nullRegisterValue != null && JavaConstant.NULL_POINTER.equals(nullConstant);
+ }
+
+ public AllocatableValue getNullRegisterValue() {
+ return nullRegisterValue;
+ }
+
@Override
protected boolean isNumericInteger(PlatformKind kind) {
return ((AArch64Kind) kind).isInteger();
@@ -485,11 +500,6 @@
}
@Override
- public void emitCompareOp(AArch64Kind cmpKind, Variable left, Value right) {
- throw GraalError.unimplemented();
- }
-
- @Override
public Value emitRound(Value value, RoundingMode mode) {
AArch64ArithmeticOp op;
switch (mode) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java Tue Apr 02 10:57:57 2019 +0530
@@ -164,7 +164,7 @@
public Variable emitValueCompareAndSwap(LIRKind accessKind, Value address, Value expectedValue, Value newValue) {
Variable result = newVariable(newValue.getValueKind());
Variable scratch = newVariable(LIRKind.value(AArch64Kind.WORD));
- append(new CompareAndSwapOp(result, loadNonCompareConst(expectedValue), loadReg(newValue), asAllocatable(address), scratch));
+ append(new CompareAndSwapOp(result, loadReg(expectedValue), loadReg(newValue), asAllocatable(address), scratch));
return result;
}
@@ -238,8 +238,13 @@
* null.
*/
@Override
- public Variable emitConditionalMove(PlatformKind cmpKind, Value left, Value right, Condition cond, boolean unorderedIsTrue, Value trueValue, Value falseValue) {
- boolean mirrored = emitCompare(cmpKind, left, right, cond, unorderedIsTrue);
+ public Variable emitConditionalMove(PlatformKind cmpKind, Value left, final Value right, Condition cond, boolean unorderedIsTrue, Value trueValue, Value falseValue) {
+ AArch64ArithmeticLIRGenerator arithLir = ((AArch64ArithmeticLIRGenerator) arithmeticLIRGen);
+ Value actualRight = right;
+ if (isJavaConstant(actualRight) && arithLir.mustReplaceNullWithNullRegister((asJavaConstant(actualRight)))) {
+ actualRight = arithLir.getNullRegisterValue();
+ }
+ boolean mirrored = emitCompare(cmpKind, left, actualRight, cond, unorderedIsTrue);
Condition finalCondition = mirrored ? cond.mirror() : cond;
boolean finalUnorderedIsTrue = mirrored ? !unorderedIsTrue : unorderedIsTrue;
ConditionFlag cmpCondition = toConditionFlag(((AArch64Kind) cmpKind).isInteger(), finalCondition, finalUnorderedIsTrue);
@@ -256,30 +261,38 @@
}
@Override
- public void emitCompareBranch(PlatformKind cmpKind, Value left, Value right, Condition cond, boolean unorderedIsTrue, LabelRef trueDestination, LabelRef falseDestination,
+ public void emitCompareBranch(PlatformKind cmpKind, Value left, final Value right, Condition cond, boolean unorderedIsTrue, LabelRef trueDestination, LabelRef falseDestination,
double trueDestinationProbability) {
+ Value actualRight = right;
if (cond == Condition.EQ) {
// emit cbz instruction for IsNullNode.
assert !LIRValueUtil.isNullConstant(left) : "emitNullCheckBranch()'s null input should be in right.";
- if (LIRValueUtil.isNullConstant(right)) {
- append(new CompareBranchZeroOp(asAllocatable(left), trueDestination, falseDestination, trueDestinationProbability));
- return;
+ AArch64ArithmeticLIRGenerator arithLir = ((AArch64ArithmeticLIRGenerator) arithmeticLIRGen);
+ if (LIRValueUtil.isNullConstant(actualRight)) {
+ JavaConstant rightConstant = asJavaConstant(actualRight);
+ if (arithLir.mustReplaceNullWithNullRegister(rightConstant)) {
+ actualRight = arithLir.getNullRegisterValue();
+ } else {
+ append(new CompareBranchZeroOp(asAllocatable(left), trueDestination, falseDestination,
+ trueDestinationProbability));
+ return;
+ }
}
// emit cbz instruction for IntegerEquals when any of the inputs is zero.
AArch64Kind kind = (AArch64Kind) cmpKind;
if (kind.isInteger()) {
if (isIntConstant(left, 0)) {
- append(new CompareBranchZeroOp(asAllocatable(right), trueDestination, falseDestination, trueDestinationProbability));
+ append(new CompareBranchZeroOp(asAllocatable(actualRight), trueDestination, falseDestination, trueDestinationProbability));
return;
- } else if (isIntConstant(right, 0)) {
+ } else if (isIntConstant(actualRight, 0)) {
append(new CompareBranchZeroOp(asAllocatable(left), trueDestination, falseDestination, trueDestinationProbability));
return;
}
}
}
- boolean mirrored = emitCompare(cmpKind, left, right, cond, unorderedIsTrue);
+ boolean mirrored = emitCompare(cmpKind, left, actualRight, cond, unorderedIsTrue);
Condition finalCondition = mirrored ? cond.mirror() : cond;
boolean finalUnorderedIsTrue = mirrored ? !unorderedIsTrue : unorderedIsTrue;
ConditionFlag cmpCondition = toConditionFlag(((AArch64Kind) cmpKind).isInteger(), finalCondition, finalUnorderedIsTrue);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/AMD64MatchRuleTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/AMD64MatchRuleTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -26,14 +26,19 @@
import static org.junit.Assume.assumeTrue;
+import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
import org.graalvm.compiler.core.test.MatchRuleTest;
import org.graalvm.compiler.lir.LIR;
import org.graalvm.compiler.lir.LIRInstruction;
+import org.graalvm.compiler.lir.amd64.AMD64Binary;
import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer.MemoryConstOp;
+import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer.ConstOp;
+import org.graalvm.compiler.lir.amd64.AMD64Unary;
import org.junit.Before;
import org.junit.Test;
import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.amd64.AMD64Kind;
public class AMD64MatchRuleTest extends MatchRuleTest {
@Before
@@ -77,4 +82,182 @@
this.x = x;
}
}
+
+ static volatile short shortValue;
+
+ public static long testVolatileExtensionSnippet() {
+ return shortValue;
+ }
+
+ @Test
+ public void testVolatileExtension() {
+ compile(getResolvedJavaMethod("testVolatileExtensionSnippet"), null);
+ LIR lir = getLIR();
+ boolean found = false;
+ for (LIRInstruction ins : lir.getLIRforBlock(lir.codeEmittingOrder()[0])) {
+ if (ins instanceof AMD64Unary.MemoryOp) {
+ ins.visitEachOutput((value, mode, flags) -> assertTrue(value.getPlatformKind().toString(), value.getPlatformKind().equals(AMD64Kind.QWORD)));
+ assertFalse("MemoryOp expected only once in first block", found);
+ found = true;
+ }
+ }
+ assertTrue("sign extending load must be in the LIR", found);
+ }
+
+ static int intValue;
+ static volatile int volatileIntValue;
+
+ /**
+ * Can't match test and load of input because of volatile store in between.
+ */
+ public static short testLoadTestNoMatchSnippet() {
+ int v = intValue;
+ volatileIntValue = 42;
+ if (v == 42) {
+ return shortValue;
+ }
+ return 0;
+ }
+
+ @Test
+ public void testLoadTestNoMatch() {
+ compile(getResolvedJavaMethod("testLoadTestNoMatchSnippet"), null);
+ LIR lir = getLIR();
+ boolean found = false;
+ for (LIRInstruction ins : lir.getLIRforBlock(lir.codeEmittingOrder()[0])) {
+ if (ins instanceof ConstOp && ((ConstOp) ins).getOpcode().toString().equals("CMP")) {
+ assertFalse("CMP expected only once in first block", found);
+ found = true;
+ }
+ }
+ assertTrue("CMP must be in the LIR", found);
+ }
+
+ /**
+ * Should match as an add with a memory operand.
+ */
+ public static int testAddLoadSnippet() {
+ int v1 = volatileIntValue;
+ int v2 = intValue;
+ return v2 + (2 * v1);
+ }
+
+ @Test
+ public void testAddLoad() {
+ compile(getResolvedJavaMethod("testAddLoadSnippet"), null);
+ LIR lir = getLIR();
+ boolean found = false;
+ for (LIRInstruction ins : lir.getLIRforBlock(lir.codeEmittingOrder()[0])) {
+ if (ins instanceof AMD64Binary.MemoryTwoOp && ((AMD64Binary.MemoryTwoOp) ins).getOpcode().toString().equals("ADD")) {
+ assertFalse("MemoryTwoOp expected only once in first block", found);
+ found = true;
+ }
+ }
+ assertTrue("ADD with memory argument must be in the LIR", found);
+ }
+
+ /**
+ * Can't match as an add with a memory operand because the other add input is too late.
+ */
+ public static int testAddLoadNoMatchSnippet() {
+ int v1 = volatileIntValue;
+ int v2 = intValue;
+ return v1 + (2 * v2);
+ }
+
+ @Test
+ public void testAddLoadNoMatch() {
+ compile(getResolvedJavaMethod("testAddLoadNoMatchSnippet"), null);
+ LIR lir = getLIR();
+ boolean found = false;
+ for (LIRInstruction ins : lir.getLIRforBlock(lir.codeEmittingOrder()[0])) {
+ if (ins instanceof AMD64Binary.CommutativeTwoOp && ((AMD64Binary.CommutativeTwoOp) ins).getOpcode().toString().equals("ADD")) {
+ assertFalse("CommutativeTwoOp expected only once in first block", found);
+ found = true;
+ }
+ }
+ assertTrue("ADD with memory argument must not be in the LIR", found);
+ }
+
+ /**
+ * sign extension and load are in different blocks but can still be matched as a single
+ * instruction.
+ */
+ public static long testVolatileExtensionDifferentBlocksSnippet(boolean flag) {
+ short v = shortValue;
+ if (flag) {
+ return v;
+ }
+ return 0;
+ }
+
+ @Test
+ public void testVolatileExtensionDifferentBlocks() {
+ compile(getResolvedJavaMethod("testVolatileExtensionDifferentBlocksSnippet"), null);
+ LIR lir = getLIR();
+ boolean found = false;
+ for (LIRInstruction ins : lir.getLIRforBlock(lir.codeEmittingOrder()[0])) {
+ if (ins instanceof AMD64Unary.MemoryOp) {
+ ins.visitEachOutput((value, mode, flags) -> assertTrue(value.getPlatformKind().toString(), value.getPlatformKind().equals(AMD64Kind.QWORD)));
+ assertFalse("MemoryOp expected only once in first block", found);
+ found = true;
+ }
+ }
+ assertTrue("sign extending load must be in the LIR", found);
+ }
+
+ /**
+ * Add and load are not in the same block and one input is too late: can't match.
+ */
+ public static int testAddLoadDifferentBlocksNoMatchSnippet(boolean flag) {
+ int v1 = volatileIntValue;
+ if (flag) {
+ int v2 = intValue;
+ return v1 + (2 * v2);
+ }
+ return 0;
+ }
+
+ @Test
+ public void testAddLoadDifferentBlocksNoMatch() {
+ compile(getResolvedJavaMethod("testAddLoadDifferentBlocksNoMatchSnippet"), null);
+ LIR lir = getLIR();
+ boolean found = false;
+ for (AbstractBlockBase<?> b : lir.codeEmittingOrder()) {
+ for (LIRInstruction ins : lir.getLIRforBlock(b)) {
+ if (ins instanceof AMD64Binary.CommutativeTwoOp && ((AMD64Binary.CommutativeTwoOp) ins).getOpcode().toString().equals("ADD")) {
+ assertFalse("CommutativeTwoOp expected only once in first block", found);
+ found = true;
+ }
+ }
+ }
+ assertTrue("ADD with memory argument must not be in the LIR", found);
+ }
+
+ /**
+ * Add and load are in different blocks but can still match.
+ */
+ public static int testAddLoadDifferentBlocksSnippet(boolean flag) {
+ int v2 = intValue;
+ int v1 = volatileIntValue;
+ if (flag) {
+ return v1 + v2;
+ }
+ return 0;
+ }
+
+ @Test
+ public void testAddLoadDifferentBlocks() {
+ compile(getResolvedJavaMethod("testAddLoadDifferentBlocksSnippet"), null);
+ LIR lir = getLIR();
+ boolean found = false;
+ for (LIRInstruction ins : lir.getLIRforBlock(lir.codeEmittingOrder()[0])) {
+ if (ins instanceof AMD64Binary.MemoryTwoOp && ((AMD64Binary.MemoryTwoOp) ins).getOpcode().toString().equals("ADD")) {
+ assertFalse("MemoryTwoOp expected only once in first block", found);
+ found = true;
+ }
+ }
+ assertTrue("ADD with memory argument must be in the LIR", found);
+ }
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java Tue Apr 02 10:57:57 2019 +0530
@@ -689,10 +689,9 @@
getLIRGen().append(new AMD64Unary.MOp(op.m1Op, size, result, input));
} else {
/*
- * c is implicitly masked to 5 or 6 bits by the CPU, so casting it to (int) is
- * always correct, even without the NumUtil.is32bit() test.
+ * c needs to be masked here, because shifts with immediate expect a byte.
*/
- getLIRGen().append(new AMD64Binary.ConstOp(op.miOp, size, result, input, (int) c.asLong()));
+ getLIRGen().append(new AMD64Binary.ConstOp(op.miOp, size, result, input, (byte) c.asLong()));
}
} else {
getLIRGen().emitMove(RCX_I, b);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/Fields.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/Fields.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,7 +24,7 @@
package org.graalvm.compiler.core.common;
-import static org.graalvm.compiler.core.common.UnsafeAccess.UNSAFE;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
import java.util.ArrayList;
import java.util.Collections;
@@ -38,6 +38,8 @@
*/
public class Fields {
+ private static final Unsafe UNSAFE = getUnsafe();
+
/**
* Offsets used with {@link Unsafe} to access the fields.
*/
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldsScanner.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldsScanner.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,7 +24,7 @@
package org.graalvm.compiler.core.common;
-import static org.graalvm.compiler.core.common.UnsafeAccess.UNSAFE;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -50,6 +50,8 @@
*/
public static class DefaultCalcOffset implements CalcOffset {
+ private static final Unsafe UNSAFE = getUnsafe();
+
@Override
public long getOffset(Field field) {
return UNSAFE.objectFieldOffset(field);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -278,4 +278,8 @@
@Option(help = "Enable inlining decision tracing in stubs and snippets.", type = OptionType.Debug)
public static final OptionKey<Boolean> TraceInliningForStubsAndSnippets = new OptionKey<>(false);
+
+ @Option(help = "Use Graal-generated stubs for complicated LIR operations instead of embedding all the emitted code.")
+ public static final OptionKey<Boolean> UseGraalStubs = new OptionKey<>(true);
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/UnsafeAccess.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.core.common;
-
-import java.lang.reflect.Field;
-
-import sun.misc.Unsafe;
-
-/**
- * Package private access to the {@link Unsafe} capability.
- */
-class UnsafeAccess {
-
- static final Unsafe UNSAFE = initUnsafe();
-
- private static Unsafe initUnsafe() {
- try {
- // Fast path when we are trusted.
- return Unsafe.getUnsafe();
- } catch (SecurityException se) {
- // Slow path when we are not trusted.
- try {
- Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
- theUnsafe.setAccessible(true);
- return (Unsafe) theUnsafe.get(Unsafe.class);
- } catch (Exception e) {
- throw new RuntimeException("exception while trying to get Unsafe", e);
- }
- }
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeAccess.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.core.common.util;
-
-import java.lang.reflect.Field;
-
-import sun.misc.Unsafe;
-
-/**
- * Package private access to the {@link Unsafe} capability.
- */
-class UnsafeAccess {
-
- static final Unsafe UNSAFE = initUnsafe();
-
- private static Unsafe initUnsafe() {
- try {
- // Fast path when we are trusted.
- return Unsafe.getUnsafe();
- } catch (SecurityException se) {
- // Slow path when we are not trusted.
- try {
- Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
- theUnsafe.setAccessible(true);
- return (Unsafe) theUnsafe.get(Unsafe.class);
- } catch (Exception e) {
- throw new RuntimeException("exception while trying to get Unsafe", e);
- }
- }
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,7 +24,8 @@
package org.graalvm.compiler.core.common.util;
-import static org.graalvm.compiler.core.common.util.UnsafeAccess.UNSAFE;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
+
import sun.misc.Unsafe;
/**
@@ -41,6 +42,8 @@
*/
public abstract class UnsafeArrayTypeReader implements TypeReader {
+ private static final Unsafe UNSAFE = getUnsafe();
+
public static int getS1(byte[] data, long byteIndex) {
return UNSAFE.getByte(data, readOffset(data, byteIndex, Byte.BYTES));
}
@@ -142,6 +145,8 @@
}
final class UnalignedUnsafeArrayTypeReader extends UnsafeArrayTypeReader {
+ private static final Unsafe UNSAFE = getUnsafe();
+
protected static int getS2(byte[] data, long byteIndex) {
return UNSAFE.getShort(data, readOffset(data, byteIndex, Short.BYTES));
}
@@ -181,6 +186,8 @@
}
class AlignedUnsafeArrayTypeReader extends UnsafeArrayTypeReader {
+ private static final Unsafe UNSAFE = getUnsafe();
+
protected static int getS2(byte[] data, long byteIndex) {
long offset = readOffset(data, byteIndex, Short.BYTES);
return ((UNSAFE.getByte(data, offset + 0) & 0xFF) << 0) | //
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -30,6 +30,8 @@
import static org.graalvm.compiler.core.common.util.TypeConversion.asU1;
import static org.graalvm.compiler.core.common.util.TypeConversion.asU2;
import static org.graalvm.compiler.core.common.util.TypeConversion.asU4;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
+
import sun.misc.Unsafe;
/**
@@ -44,6 +46,7 @@
*/
public abstract class UnsafeArrayTypeWriter implements TypeWriter {
+ private static final Unsafe UNSAFE = getUnsafe();
private static final int MIN_CHUNK_LENGTH = 200;
private static final int MAX_CHUNK_LENGTH = 16000;
@@ -96,13 +99,13 @@
@Override
public final void putS1(long value) {
long offset = writeOffset(Byte.BYTES);
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset, asS1(value));
+ UNSAFE.putByte(writeChunk.data, offset, asS1(value));
}
@Override
public final void putU1(long value) {
long offset = writeOffset(Byte.BYTES);
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset, asU1(value));
+ UNSAFE.putByte(writeChunk.data, offset, asU1(value));
}
@Override
@@ -134,52 +137,56 @@
}
final class UnalignedUnsafeArrayTypeWriter extends UnsafeArrayTypeWriter {
+ private static final Unsafe UNSAFE = getUnsafe();
+
@Override
public void putS2(long value) {
long offset = writeOffset(Short.BYTES);
- UnsafeAccess.UNSAFE.putShort(writeChunk.data, offset, asS2(value));
+ UNSAFE.putShort(writeChunk.data, offset, asS2(value));
}
@Override
public void putS4(long value) {
long offset = writeOffset(Integer.BYTES);
- UnsafeAccess.UNSAFE.putInt(writeChunk.data, offset, asS4(value));
+ UNSAFE.putInt(writeChunk.data, offset, asS4(value));
}
@Override
public void putS8(long value) {
long offset = writeOffset(Long.BYTES);
- UnsafeAccess.UNSAFE.putLong(writeChunk.data, offset, value);
+ UNSAFE.putLong(writeChunk.data, offset, value);
}
}
final class AlignedUnsafeArrayTypeWriter extends UnsafeArrayTypeWriter {
+ private static final Unsafe UNSAFE = getUnsafe();
+
@Override
public void putS2(long value) {
long offset = writeOffset(Short.BYTES);
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 0, (byte) (value >> 0));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 1, (byte) (value >> 8));
+ UNSAFE.putByte(writeChunk.data, offset + 0, (byte) (value >> 0));
+ UNSAFE.putByte(writeChunk.data, offset + 1, (byte) (value >> 8));
}
@Override
public void putS4(long value) {
long offset = writeOffset(Integer.BYTES);
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 0, (byte) (value >> 0));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 1, (byte) (value >> 8));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 2, (byte) (value >> 16));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 3, (byte) (value >> 24));
+ UNSAFE.putByte(writeChunk.data, offset + 0, (byte) (value >> 0));
+ UNSAFE.putByte(writeChunk.data, offset + 1, (byte) (value >> 8));
+ UNSAFE.putByte(writeChunk.data, offset + 2, (byte) (value >> 16));
+ UNSAFE.putByte(writeChunk.data, offset + 3, (byte) (value >> 24));
}
@Override
public void putS8(long value) {
long offset = writeOffset(Long.BYTES);
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 0, (byte) (value >> 0));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 1, (byte) (value >> 8));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 2, (byte) (value >> 16));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 3, (byte) (value >> 24));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 4, (byte) (value >> 32));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 5, (byte) (value >> 40));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 6, (byte) (value >> 48));
- UnsafeAccess.UNSAFE.putByte(writeChunk.data, offset + 7, (byte) (value >> 56));
+ UNSAFE.putByte(writeChunk.data, offset + 0, (byte) (value >> 0));
+ UNSAFE.putByte(writeChunk.data, offset + 1, (byte) (value >> 8));
+ UNSAFE.putByte(writeChunk.data, offset + 2, (byte) (value >> 16));
+ UNSAFE.putByte(writeChunk.data, offset + 3, (byte) (value >> 24));
+ UNSAFE.putByte(writeChunk.data, offset + 4, (byte) (value >> 32));
+ UNSAFE.putByte(writeChunk.data, offset + 5, (byte) (value >> 40));
+ UNSAFE.putByte(writeChunk.data, offset + 6, (byte) (value >> 48));
+ UNSAFE.putByte(writeChunk.data, offset + 7, (byte) (value >> 56));
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java Tue Apr 02 10:57:57 2019 +0530
@@ -348,9 +348,15 @@
*/
final boolean shareable;
+ /**
+ * Can this node be subsumed into a match even if there are side effecting nodes between
+ * this node and the match.
+ */
+ final boolean ignoresSideEffects;
+
final Set<Element> originatingElements = new HashSet<>();
- TypeDescriptor(TypeMirror mirror, String shortName, String nodeClass, String nodePackage, List<String> inputs, boolean commutative, boolean shareable) {
+ TypeDescriptor(TypeMirror mirror, String shortName, String nodeClass, String nodePackage, List<String> inputs, boolean commutative, boolean shareable, boolean ignoresSideEffects) {
this.mirror = mirror;
this.shortName = shortName;
this.nodeClass = nodeClass;
@@ -358,6 +364,7 @@
this.inputs = inputs;
this.commutative = commutative;
this.shareable = shareable;
+ this.ignoresSideEffects = ignoresSideEffects;
assert !commutative || inputs.size() == 2;
}
}
@@ -369,8 +376,9 @@
private TypeDescriptor valueType;
- private void declareType(TypeMirror mirror, String shortName, String nodeClass, String nodePackage, List<String> inputs, boolean commutative, boolean shareable, Element element) {
- TypeDescriptor descriptor = new TypeDescriptor(mirror, shortName, nodeClass, nodePackage, inputs, commutative, shareable);
+ private void declareType(TypeMirror mirror, String shortName, String nodeClass, String nodePackage, List<String> inputs, boolean commutative, boolean shareable, boolean ignoresSideEffects,
+ Element element) {
+ TypeDescriptor descriptor = new TypeDescriptor(mirror, shortName, nodeClass, nodePackage, inputs, commutative, shareable, ignoresSideEffects);
descriptor.originatingElements.add(element);
knownTypes.put(shortName, descriptor);
}
@@ -453,7 +461,7 @@
private String formatPrefix() {
if (nodeType == valueType) {
- return String.format("new MatchPattern(%s, false", name != null ? ("\"" + name + "\"") : "null");
+ return String.format("new MatchPattern(%s, false, false", name != null ? ("\"" + name + "\"") : "null");
} else {
return String.format("new MatchPattern(%s.class, %s", nodeType.nodeClass, name != null ? ("\"" + name + "\"") : "null");
}
@@ -462,13 +470,13 @@
private String formatSuffix() {
if (nodeType != null) {
if (inputs.length != nodeType.inputs.size()) {
- return ", true)";
+ return ", true, " + nodeType.ignoresSideEffects + ")";
} else {
if (nodeType.inputs.size() > 0) {
- return ", " + nodeType.nodeClass + "_positions, " + !nodeType.shareable + ")";
+ return ", " + nodeType.nodeClass + "_positions, " + !nodeType.shareable + ", " + nodeType.ignoresSideEffects + ")";
}
if (nodeType.shareable) {
- return ", false)";
+ return ", false, " + nodeType.ignoresSideEffects + ")";
}
}
}
@@ -721,7 +729,7 @@
// Define a TypeDescriptor for the generic node but don't enter it into the nodeTypes
// table since it shouldn't be mentioned in match rules.
TypeMirror valueTypeMirror = getTypeElement(VALUE_NODE_CLASS_NAME).asType();
- valueType = new TypeDescriptor(valueTypeMirror, "Value", "ValueNode", "org.graalvm.compiler.nodes", Collections.emptyList(), false, false);
+ valueType = new TypeDescriptor(valueTypeMirror, "Value", "ValueNode", "org.graalvm.compiler.nodes", Collections.emptyList(), false, false, false);
Map<TypeElement, MatchRuleDescriptor> map = new HashMap<>();
@@ -831,7 +839,8 @@
boolean commutative = getAnnotationValue(matchable, "commutative", Boolean.class);
boolean shareable = getAnnotationValue(matchable, "shareable", Boolean.class);
- declareType(nodeClassMirror, shortName, nodeClass, nodePackage, inputs, commutative, shareable, element);
+ boolean ignoresSideEffects = getAnnotationValue(matchable, "ignoresSideEffects", Boolean.class);
+ declareType(nodeClassMirror, shortName, nodeClass, nodePackage, inputs, commutative, shareable, ignoresSideEffects, element);
}
private void processMatchRules(Map<TypeElement, MatchRuleDescriptor> map, Element element, List<AnnotationMirror> matchRules) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
@@ -266,9 +267,11 @@
verifiers.add(new VerifyVirtualizableUsage());
verifiers.add(new VerifyUpdateUsages());
verifiers.add(new VerifyBailoutUsage());
+ verifiers.add(new VerifySystemPropertyUsage());
verifiers.add(new VerifyInstanceOfUsage());
verifiers.add(new VerifyGraphAddUsage());
verifiers.add(new VerifyGetOptionsUsage());
+ verifiers.add(new VerifyUnsafeAccess());
VerifyFoldableMethods foldableMethodsVerifier = new VerifyFoldableMethods();
if (tool.shouldVerifyFoldableMethods()) {
@@ -301,21 +304,29 @@
String className = c.getName();
executor.execute(() -> {
try {
- checkClass(c, metaAccess);
+ checkClass(c, metaAccess, verifiers);
} catch (Throwable e) {
errors.add(String.format("Error while checking %s:%n%s", className, printStackTraceToString(e)));
}
});
- for (Method m : c.getDeclaredMethods()) {
- if (Modifier.isNative(m.getModifiers()) || Modifier.isAbstract(m.getModifiers())) {
+ ResolvedJavaType type = metaAccess.lookupJavaType(c);
+ List<ResolvedJavaMethod> methods = new ArrayList<>();
+ methods.addAll(Arrays.asList(type.getDeclaredMethods()));
+ methods.addAll(Arrays.asList(type.getDeclaredConstructors()));
+ ResolvedJavaMethod clinit = type.getClassInitializer();
+ if (clinit != null) {
+ methods.add(clinit);
+ }
+
+ for (ResolvedJavaMethod method : methods) {
+ if (Modifier.isNative(method.getModifiers()) || Modifier.isAbstract(method.getModifiers())) {
// ignore
} else {
- String methodName = className + "." + m.getName();
+ String methodName = className + "." + method.getName();
if (matches(filters, methodName)) {
executor.execute(() -> {
try (DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER)) {
- ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m);
boolean isSubstitution = method.getAnnotation(Snippet.class) != null || method.getAnnotation(MethodSubstitution.class) != null;
StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).setIsSubstitution(isSubstitution).build();
try (DebugCloseable s = debug.disableIntercept(); DebugContext.Scope ds = debug.scope("CheckingGraph", graph, method)) {
@@ -400,14 +411,18 @@
/**
* @param metaAccess
+ * @param verifiers
*/
- private static void checkClass(Class<?> c, MetaAccessProvider metaAccess) {
+ private static void checkClass(Class<?> c, MetaAccessProvider metaAccess, List<VerifyPhase<PhaseContext>> verifiers) {
if (Node.class.isAssignableFrom(c)) {
if (c.getAnnotation(NodeInfo.class) == null) {
throw new AssertionError(String.format("Node subclass %s requires %s annotation", c.getName(), NodeClass.class.getSimpleName()));
}
VerifyNodeCosts.verifyNodeClass(c);
}
+ for (VerifyPhase<PhaseContext> verifier : verifiers) {
+ verifier.verifyClass(c, metaAccess);
+ }
}
private static void checkMethod(ResolvedJavaMethod method) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -77,8 +77,7 @@
StructuredGraph graph = new StructuredGraph.Builder(options, getDebugContext(options, null, javaMethod), allowAssumptions).method(javaMethod).build();
GraphBuilderConfiguration conf = GraphBuilderConfiguration.getSnippetDefault(getDefaultGraphBuilderPlugins());
- new GraphBuilderPhase.Instance(getMetaAccess(), getProviders().getStampProvider(), getProviders().getConstantReflection(), getProviders().getConstantFieldProvider(), conf,
- OptimisticOptimizations.ALL, null).apply(graph);
+ new GraphBuilderPhase.Instance(getProviders(), conf, OptimisticOptimizations.ALL, null).apply(graph);
HighTierContext context = new HighTierContext(getProviders(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL);
createInliningPhase().apply(graph, context);
new CanonicalizerPhase().apply(graph, context);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NewInstanceTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NewInstanceTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -76,8 +76,7 @@
StructuredGraph graph = new StructuredGraph.Builder(options, getDebugContext(options, null, javaMethod), AllowAssumptions.YES).method(javaMethod).build();
GraphBuilderConfiguration conf = GraphBuilderConfiguration.getSnippetDefault(getDefaultGraphBuilderPlugins()).withUnresolvedIsError(false);
- new GraphBuilderPhase.Instance(getMetaAccess(), getProviders().getStampProvider(), getProviders().getConstantReflection(), getProviders().getConstantFieldProvider(), conf,
- OptimisticOptimizations.ALL, null).apply(graph);
+ new GraphBuilderPhase.Instance(getProviders(), conf, OptimisticOptimizations.ALL, null).apply(graph);
return graph;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.core.test;
+
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import org.junit.Test;
+
+// Regression test for JDK-8220643 (GR-14583)
+public class SwitchTest extends GraalCompilerTest {
+ public static boolean test1(int arg) {
+ switch (arg) {
+ case -2139290527:
+ case -1466249004:
+ case -1063407861:
+ case 125135499:
+ case 425995464:
+ case 786490581:
+ case 1180611932:
+ case 1790655921:
+ case 1970660086:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ @Test
+ public void run1() throws Throwable {
+ ResolvedJavaMethod method = getResolvedJavaMethod("test1");
+ Result compiled = executeActual(method, null, -2139290527);
+ assertEquals(new Result(true, null), compiled);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -94,7 +94,7 @@
GraphBuilderConfiguration graphBuilderConfig = GraphBuilderConfiguration.getDefault(plugins).withEagerResolving(true).withUnresolvedIsError(true);
OptimisticOptimizations optimisticOpts = OptimisticOptimizations.NONE;
- GraphBuilderPhase.Instance graphBuilder = new GraphBuilderPhase.Instance(getMetaAccess(), getProviders().getStampProvider(), null, null, graphBuilderConfig, optimisticOpts, null);
+ GraphBuilderPhase.Instance graphBuilder = new GraphBuilderPhase.Instance(getProviders(), graphBuilderConfig, optimisticOpts, null);
graphBuilder.apply(graph);
} catch (BailoutException e) {
if (e.getMessage().contains("unbalanced monitors")) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsage.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsage.java Tue Apr 02 10:57:57 2019 +0530
@@ -73,7 +73,7 @@
}
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
final ResolvedJavaType bailoutType = context.getMetaAccess().lookupJavaType(BailoutException.class);
ResolvedJavaMethod caller = graph.method();
String holderQualified = caller.format("%H");
@@ -92,7 +92,6 @@
}
}
}
- return true;
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyCallerSensitiveMethods.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyCallerSensitiveMethods.java Tue Apr 02 10:57:57 2019 +0530
@@ -67,7 +67,7 @@
}
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
Invoke invoke = callsReflectionGetCallerClass(graph, context);
Annotation annotation = graph.method().getAnnotation(callerSensitiveClass);
if (invoke != null) {
@@ -79,7 +79,6 @@
} else if (annotation != null) {
throw new VerificationError(String.format("%s: method annotated with @CallerSensitive does not call Reflection.getCallerClass()", graph.method().format("%H.%n(%p)")));
}
- return true;
}
private Invoke callsReflectionGetCallerClass(StructuredGraph graph, PhaseContext context) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java Tue Apr 02 10:57:57 2019 +0530
@@ -78,7 +78,7 @@
MetaAccessProvider metaAccess;
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
metaAccess = context.getMetaAccess();
ResolvedJavaType debugType = metaAccess.lookupJavaType(DebugContext.class);
ResolvedJavaType nodeType = metaAccess.lookupJavaType(Node.class);
@@ -108,7 +108,6 @@
}
}
}
- return true;
}
private void verifyParameters(MethodCallTargetNode callTarget, StructuredGraph callerGraph, NodeInputList<? extends ValueNode> args, ResolvedJavaType stringType, int startArgIdx) {
@@ -167,6 +166,7 @@
"org.graalvm.compiler.phases.BasePhase.dumpAfter",
"org.graalvm.compiler.replacements.ReplacementsImpl$GraphMaker.makeGraph",
"org.graalvm.compiler.replacements.SnippetTemplate.instantiate",
+ "org.graalvm.compiler.replacements.SnippetTemplate.<init>",
"org.graalvm.compiler.hotspot.SymbolicSnippetEncoder.verifySnippetEncodeDecode"));
private void verifyParameters(StructuredGraph callerGraph, MethodCallTargetNode debugCallTarget, List<? extends ValueNode> args, ResolvedJavaType stringType, int startArgIdx,
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyFoldableMethods.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyFoldableMethods.java Tue Apr 02 10:57:57 2019 +0530
@@ -52,7 +52,7 @@
ResolvedJavaType generatedInvocationPluginType;
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
ResolvedJavaMethod method = graph.method();
if (method.getAnnotation(Fold.class) != null) {
foldables.putIfAbsent(method, false);
@@ -69,7 +69,6 @@
}
}
}
- return true;
}
public void finish() {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyGetOptionsUsage.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyGetOptionsUsage.java Tue Apr 02 10:57:57 2019 +0530
@@ -36,6 +36,7 @@
import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaMethod.Parameter;
import jdk.vm.ci.meta.ResolvedJavaType;
/**
@@ -55,15 +56,19 @@
}
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
MetaAccessProvider metaAccess = context.getMetaAccess();
ResolvedJavaType canonicalizerToolClass = metaAccess.lookupJavaType(CanonicalizerTool.class);
boolean hasTool = false;
+ ResolvedJavaMethod method = graph.method();
try {
- for (ResolvedJavaMethod.Parameter parameter : graph.method().getParameters()) {
- if (parameter.getType().getName().equals(canonicalizerToolClass.getName())) {
- hasTool = true;
- break;
+ Parameter[] parameters = method.getParameters();
+ if (parameters != null) {
+ for (ResolvedJavaMethod.Parameter parameter : parameters) {
+ if (parameter.getType().getName().equals(canonicalizerToolClass.getName())) {
+ hasTool = true;
+ break;
+ }
}
}
} catch (MalformedParametersException e) {
@@ -76,13 +81,11 @@
if (callee.equals(getOptionsMethod)) {
if (hasTool) {
throw new VerificationError("Must use CanonicalizerTool.getOptions() instead of Node.getOptions() in method '%s' of class '%s'.",
- graph.method().getName(), graph.method().getDeclaringClass().getName());
+ method.getName(), method.getDeclaringClass().getName());
}
}
}
}
-
- return true;
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyGraphAddUsage.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyGraphAddUsage.java Tue Apr 02 10:57:57 2019 +0530
@@ -66,7 +66,7 @@
}
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
boolean allowed = false;
for (Class<?> cls : ALLOWED_CLASSES) {
ResolvedJavaType declaringClass = graph.method().getDeclaringClass();
@@ -85,8 +85,6 @@
}
}
}
-
- return true;
}
private void checkNonFactory(StructuredGraph graph, EconomicSet<Node> seen, PhaseContext context, ValueNode node) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyInstanceOfUsage.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyInstanceOfUsage.java Tue Apr 02 10:57:57 2019 +0530
@@ -53,7 +53,7 @@
}
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
final ResolvedJavaType[] bailoutType = new ResolvedJavaType[FORBIDDEN_INSTANCE_OF_CHECKS.length];
for (int i = 0; i < FORBIDDEN_INSTANCE_OF_CHECKS.length; i++) {
bailoutType[i] = context.getMetaAccess().lookupJavaType(FORBIDDEN_INSTANCE_OF_CHECKS[i]);
@@ -77,7 +77,6 @@
}
}
}
- return true;
}
private static boolean isTrustedInterface(ResolvedJavaType declaringClass, MetaAccessProvider metaAccess) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifySystemPropertyUsage.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.core.test;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+import org.graalvm.compiler.phases.VerifyPhase;
+import org.graalvm.compiler.phases.tiers.PhaseContext;
+
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.services.Services;
+
+/**
+ * Checks against calls to {@link System#getProperty(String)},
+ * {@link System#getProperty(String, String)} and {@link System#getProperties()}. System properties
+ * can be modified by application code so {@link Services#getSavedProperties()} should be used
+ * instead.
+ */
+public class VerifySystemPropertyUsage extends VerifyPhase<PhaseContext> {
+
+ static final Class<?>[] BOXES = {Integer.class, Long.class, Boolean.class, Float.class, Double.class};
+ static final int JVMCI_VERSION_MAJOR;
+ static final int JVMCI_VERSION_MINOR;
+ static {
+ int major = -1;
+ int minor = -1;
+ String vmVersion = System.getProperty("java.vm.version");
+ if (System.getProperty("java.specification.version").compareTo("1.9") < 0) {
+ Pattern re = Pattern.compile(".*-jvmci-(\\d+)\\.(\\d+).*");
+ Matcher matcher = re.matcher(vmVersion);
+ if (matcher.matches()) {
+ major = Integer.parseInt(matcher.group(1));
+ minor = Integer.parseInt(matcher.group(2));
+ }
+ }
+ JVMCI_VERSION_MAJOR = major;
+ JVMCI_VERSION_MINOR = minor;
+ }
+
+ @Override
+ protected void verify(StructuredGraph graph, PhaseContext context) {
+ MetaAccessProvider metaAccess = context.getMetaAccess();
+ final ResolvedJavaType systemType = metaAccess.lookupJavaType(System.class);
+ final ResolvedJavaType[] boxTypes = new ResolvedJavaType[BOXES.length];
+ for (int i = 0; i < boxTypes.length; i++) {
+ boxTypes[i] = metaAccess.lookupJavaType(BOXES[i]);
+ }
+
+ ResolvedJavaMethod caller = graph.method();
+ String holderQualified = caller.format("%H");
+ String holderUnqualified = caller.format("%h");
+ String packageName = holderQualified.equals(holderUnqualified) ? "" : holderQualified.substring(0, holderQualified.length() - holderUnqualified.length() - 1);
+ if (packageName.startsWith("jdk.vm.ci")) {
+ if (JVMCI_VERSION_MAJOR >= 0 && JVMCI_VERSION_MINOR > 56) {
+ // This JVMCI version should not use non-saved system properties
+ } else {
+ // This JVMCI version still has some calls that need to be removed
+ return;
+ }
+ } else if (holderQualified.equals("org.graalvm.compiler.hotspot.JVMCIVersionCheck") && caller.getName().equals("main")) {
+ // The main method in JVMCIVersionCheck is only called from the shell
+ return;
+ } else if (packageName.startsWith("com.oracle.truffle") || packageName.startsWith("org.graalvm.polyglot")) {
+ // Truffle and Polyglot do not depend on JVMCI so cannot use
+ // Services.getSavedProperties()
+ return;
+ } else if (packageName.startsWith("com.oracle.svm")) {
+ // SVM must read system properties in:
+ // * its JDK substitutions to mimic required JDK semantics
+ // * native-image for config info
+ return;
+ }
+ for (MethodCallTargetNode t : graph.getNodes(MethodCallTargetNode.TYPE)) {
+ ResolvedJavaMethod callee = t.targetMethod();
+ if (callee.getDeclaringClass().equals(systemType)) {
+ if (callee.getName().equals("getProperty") || callee.getName().equals("getProperties")) {
+ throw new VerificationError("Call to %s at callsite %s is prohibited. Call Services.getSavedProperties().get(String) instead.",
+ callee.format("%H.%n(%p)"),
+ caller.format("%H.%n(%p)"));
+ }
+ } else {
+ for (int i = 0; i < boxTypes.length; i++) {
+ ResolvedJavaType boxType = boxTypes[i];
+ if (callee.getDeclaringClass().equals(boxType)) {
+ String simpleName = boxType.toJavaName(false);
+ if (callee.getName().equals("get" + simpleName)) {
+ throw new VerificationError("Call to %s at callsite %s is prohibited. Call %s.parse%s(Services.getSavedProperties().get(String)) instead.",
+ callee.format("%H.%n(%p)"),
+ caller.format("%H.%n(%p)"),
+ simpleName, simpleName);
+ }
+ }
+ }
+ }
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUnsafeAccess.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.core.test;
+
+import static java.lang.reflect.Modifier.isProtected;
+import static java.lang.reflect.Modifier.isPublic;
+
+import java.lang.reflect.Field;
+
+import org.graalvm.compiler.core.common.type.TypeReference;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.java.InstanceOfNode;
+import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+import org.graalvm.compiler.phases.VerifyPhase;
+import org.graalvm.compiler.phases.tiers.PhaseContext;
+import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
+
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import sun.misc.Unsafe;
+
+/**
+ * Checks that the {@link Unsafe} singleton instance is only accessed via well known classes such as
+ * {@link GraalUnsafeAccess}.
+ */
+public class VerifyUnsafeAccess extends VerifyPhase<PhaseContext> {
+
+ @Override
+ protected void verify(StructuredGraph graph, PhaseContext context) {
+ MetaAccessProvider metaAccess = context.getMetaAccess();
+ final ResolvedJavaType unsafeType = metaAccess.lookupJavaType(Unsafe.class);
+
+ ResolvedJavaMethod caller = graph.method();
+ String holderQualified = caller.format("%H");
+ String holderUnqualified = caller.format("%h");
+ String packageName = holderQualified.equals(holderUnqualified) ? "" : holderQualified.substring(0, holderQualified.length() - holderUnqualified.length() - 1);
+ if ((holderQualified.equals(GraalUnsafeAccess.class.getName()) ||
+ holderQualified.equals("jdk.vm.ci.hotspot.UnsafeAccess")) &&
+ caller.getName().equals("initUnsafe")) {
+ // This is the blessed way access Unsafe in Graal and JVMCI
+ return;
+ } else if (packageName.startsWith("com.oracle.truffle") || packageName.startsWith("org.graalvm.compiler.truffle.runtime")) {
+ // Truffle and GraalTruffleRuntime do not depend on Graal and so cannot use
+ // GraalUnsafeAccess
+ return;
+ }
+
+ if (caller.getSignature().getReturnType(caller.getDeclaringClass()).equals(unsafeType)) {
+ if (caller.isPublic()) {
+ if (holderQualified.equals(GraalUnsafeAccess.class.getName()) && caller.getName().equals("getUnsafe")) {
+ // pass
+ } else {
+ throw new VerificationError("Cannot leak Unsafe from public method %s",
+ caller.format("%H.%n(%p)"));
+ }
+ }
+ }
+
+ for (InstanceOfNode node : graph.getNodes().filter(InstanceOfNode.class)) {
+ TypeReference typeRef = node.type();
+ if (typeRef != null) {
+ if (unsafeType.isAssignableFrom(typeRef.getType())) {
+ throw new VerificationError("Cast to %s in %s is prohibited as it implies accessing Unsafe.theUnsafe via reflection. Use %s.getUnsafe() instead.",
+ unsafeType.toJavaName(),
+ caller.format("%H.%n(%p)"),
+ GraalUnsafeAccess.class.getName());
+
+ }
+ }
+ }
+ for (MethodCallTargetNode t : graph.getNodes(MethodCallTargetNode.TYPE)) {
+ ResolvedJavaMethod callee = t.targetMethod();
+ if (callee.getDeclaringClass().equals(unsafeType)) {
+ if (callee.getName().equals("getUnsafe")) {
+ throw new VerificationError("Call to %s at callsite %s is prohibited. Use %s.getUnsafe() instead.",
+ callee.format("%H.%n(%p)"),
+ caller.format("%H.%n(%p)"),
+ GraalUnsafeAccess.class.getName());
+ }
+ }
+ }
+ }
+
+ @Override
+ public void verifyClass(Class<?> c, MetaAccessProvider metaAccess) {
+ for (Field field : c.getDeclaredFields()) {
+ int modifiers = field.getModifiers();
+ if (field.getType() == Unsafe.class && (isPublic(modifiers) || isProtected(modifiers))) {
+ throw new VerificationError("Field of type %s must be private or package-private: %s", Unsafe.class.getName(), field);
+ }
+ }
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java Tue Apr 02 10:57:57 2019 +0530
@@ -56,9 +56,9 @@
}
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
if (graph.method().isConstructor()) {
- return true;
+ return;
}
/*
* There are only two acceptable patterns for methods which update Node inputs, either a
@@ -78,35 +78,51 @@
} else if (storeField2 == null) {
storeField2 = store;
} else {
- return false;
+ throw new VerificationError("More than 2 stores to %s or %s fields found in %s",
+ Input.class.getSimpleName(),
+ OptionalInput.class.getSimpleName(),
+ graph.method().format("%H.%n(%p)"));
}
}
}
if (storeField1 == null) {
- return true;
+ return;
}
if (storeField2 == null) {
- // Single input field update so just check for updateUsages or updateUsagesInterface
- // call
- ResolvedJavaType node = context.getMetaAccess().lookupJavaType(Node.class);
+ // Single input field update so just check for updateUsages
+ // or updateUsagesInterface call
+ ResolvedJavaType nodeType = context.getMetaAccess().lookupJavaType(Node.class);
for (MethodCallTargetNode call : graph.getNodes().filter(MethodCallTargetNode.class)) {
ResolvedJavaMethod callee = call.targetMethod();
- if (callee.getDeclaringClass().equals(node) && (callee.getName().equals("updateUsages") || callee.getName().equals("updateUsagesInterface"))) {
- return true;
+ if (callee.getDeclaringClass().equals(nodeType) && (callee.getName().equals("updateUsages") || callee.getName().equals("updateUsagesInterface"))) {
+ return;
}
}
+ throw new VerificationError("%s updates field '%s' without calling %s.updateUsages() or %s.updateUsagesInterface()",
+ graph.method().format("%H.%n(%p)"),
+ storeField1.field().getName(),
+ Node.class.getName(),
+ Node.class.getName());
} else {
if (storeField1.value() instanceof LoadFieldNode && storeField2.value() instanceof LoadFieldNode) {
LoadFieldNode load1 = (LoadFieldNode) storeField1.value();
LoadFieldNode load2 = (LoadFieldNode) storeField2.value();
// Check for swapping values within the same object
- if (load1.object() == storeField1.object() && load2.object() == storeField2.object() && storeField1.object() == storeField2.object() &&
- load1.field().equals(storeField2.field()) && load2.field().equals(storeField1.field())) {
- return true;
+ if (load1.object() == storeField1.object() &&
+ load2.object() == storeField2.object() &&
+ storeField1.object() == storeField2.object() &&
+ load1.field().equals(storeField2.field()) &&
+ load2.field().equals(storeField1.field())) {
+ return;
}
}
+ throw new VerificationError("%s performs non-swap update to fields '%s' and '%s' without calling %s.updateUsages() or %s.updateUsagesInterface()",
+ graph.method().format("%H.%n(%p)"),
+ storeField1.field().getName(),
+ storeField2.field().getName(),
+ Node.class.getName(),
+ Node.class.getName());
}
- return false;
}
boolean isNodeInput(ResolvedJavaField field, ResolvedJavaType declaringClass, ResolvedJavaType nodeInputList) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUsageWithEquals.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUsageWithEquals.java Tue Apr 02 10:57:57 2019 +0530
@@ -143,7 +143,7 @@
}
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
for (ObjectEqualsNode cn : graph.getNodes().filter(ObjectEqualsNode.class)) {
// bail out if we compare an object of type klass with == or != (except null checks)
ResolvedJavaMethod method = graph.method();
@@ -156,6 +156,5 @@
" must use .equals() for object equality, not '==' or '!='");
}
}
- return true;
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableUsage.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableUsage.java Tue Apr 02 10:57:57 2019 +0530
@@ -53,7 +53,7 @@
}
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
final ResolvedJavaType graphType = context.getMetaAccess().lookupJavaType(Graph.class);
final ResolvedJavaType virtualizableType = context.getMetaAccess().lookupJavaType(Virtualizable.class);
final ResolvedJavaType constantNodeType = context.getMetaAccess().lookupJavaType(ConstantNode.class);
@@ -70,7 +70,6 @@
}
}
}
- return true;
}
private static void verifyVirtualizableEffectArguments(ResolvedJavaType constantNodeType, ResolvedJavaMethod caller, ResolvedJavaMethod callee, int bciCaller,
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java Tue Apr 02 10:57:57 2019 +0530
@@ -152,13 +152,17 @@
Assert.assertEquals(expectedConstantResult, returnNode.result().asConstant());
}
}
- int newInstanceCount = graph.getNodes().filter(isA(NewInstanceNode.class).or(NewArrayNode.class).or(AllocatedObjectNode.class)).count();
+ int newInstanceCount = getAllocationCount();
Assert.assertEquals("Expected allocation count does not match", expectedAllocationCount, newInstanceCount);
if (expectedAllocationCount == 0) {
Assert.assertTrue("Unexpected CommitAllocationNode", graph.getNodes().filter(CommitAllocationNode.class).isEmpty());
}
}
+ protected int getAllocationCount() {
+ return graph.getNodes().filter(isA(NewInstanceNode.class).or(NewArrayNode.class).or(AllocatedObjectNode.class)).count();
+ }
+
@SuppressWarnings("try")
protected void prepareGraph(String snippet, boolean iterativeEscapeAnalysis) {
ResolvedJavaMethod method = getResolvedJavaMethod(snippet);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java Tue Apr 02 10:57:57 2019 +0530
@@ -34,8 +34,8 @@
import java.util.Map;
import java.util.Set;
+import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeMap;
@@ -58,7 +58,7 @@
import org.graalvm.compiler.nodes.java.NewArrayNode;
import org.graalvm.compiler.nodes.java.NewInstanceNode;
import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.spi.StampProvider;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
import org.graalvm.compiler.nodes.util.GraphUtil;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.OptimisticOptimizations;
@@ -66,7 +66,6 @@
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
@@ -89,18 +88,21 @@
* {@link MethodState#formalReturn return value}.
*/
public class StaticAnalysis {
- /** Access to type, method, and fields using the Graal API. */
- private final MetaAccessProvider metaAccess;
- /** Access to platform dependent stamps. */
- private final StampProvider stampProvider;
- /** The results of the static analysis. */
+ /**
+ * Access to various builtin providers.
+ */
+ private final CoreProviders providers;
+ /**
+ * The results of the static analysis.
+ */
private final Results results;
- /** Worklist for fixpoint iteration. */
+ /**
+ * Worklist for fixpoint iteration.
+ */
private final Deque<WorklistEntry> worklist;
- public StaticAnalysis(MetaAccessProvider metaAccess, StampProvider stampProvider) {
- this.metaAccess = metaAccess;
- this.stampProvider = stampProvider;
+ public StaticAnalysis(CoreProviders providers) {
+ this.providers = providers;
this.results = new Results();
this.worklist = new ArrayDeque<>();
}
@@ -273,7 +275,7 @@
*/
OptimisticOptimizations optimisticOpts = OptimisticOptimizations.NONE;
- GraphBuilderPhase.Instance graphBuilder = new GraphBuilderPhase.Instance(metaAccess, stampProvider, null, null, graphBuilderConfig, optimisticOpts, null);
+ GraphBuilderPhase.Instance graphBuilder = new GraphBuilderPhase.Instance(providers, graphBuilderConfig, optimisticOpts, null);
graphBuilder.apply(graph);
} catch (Throwable ex) {
debug.handle(ex);
@@ -304,7 +306,9 @@
uses = new HashSet<>();
}
- /** Returns the types of this element. */
+ /**
+ * Returns the types of this element.
+ */
public Set<ResolvedJavaType> getTypes() {
return types;
}
@@ -349,7 +353,7 @@
* Adding a new callee means linking the type flow of the actual parameters with the formal
* parameters of the callee, and linking the return value of the callee with the return value
* state of the invocation.
- *
+ * <p>
* Statically bindable methods calls ({@link InvokeKind#Static static} and
* {@link InvokeKind#Special special} calls) have only one callee, but use the same code for
* simplicity.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java Tue Apr 02 10:57:57 2019 +0530
@@ -29,21 +29,18 @@
import java.util.Arrays;
import java.util.Collection;
-import jdk.vm.ci.meta.MetaAccessProvider;
-import jdk.vm.ci.meta.ResolvedJavaField;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-import org.junit.Assert;
-import org.junit.Test;
-
import org.graalvm.compiler.api.test.Graal;
import org.graalvm.compiler.core.target.Backend;
import org.graalvm.compiler.core.test.tutorial.StaticAnalysis.MethodState;
import org.graalvm.compiler.core.test.tutorial.StaticAnalysis.TypeFlow;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.phases.util.Providers;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
import org.graalvm.compiler.runtime.RuntimeProvider;
+import org.junit.Assert;
+import org.junit.Test;
+
+import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
public class StaticAnalysisTests {
@@ -68,14 +65,11 @@
Object f;
}
- private final MetaAccessProvider metaAccess;
- private final StampProvider stampProvider;
+ private final CoreProviders providers;
public StaticAnalysisTests() {
Backend backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend();
- Providers providers = backend.getProviders();
- this.metaAccess = providers.getMetaAccess();
- this.stampProvider = providers.getStampProvider();
+ providers = backend.getProviders();
}
static void test01Entry() {
@@ -85,7 +79,7 @@
@Test
public void test01() {
- StaticAnalysis sa = new StaticAnalysis(metaAccess, stampProvider);
+ StaticAnalysis sa = new StaticAnalysis(providers);
sa.addMethod(findMethod(StaticAnalysisTests.class, "test01Entry"));
sa.finish();
@@ -106,7 +100,7 @@
@Test
public void test02() {
- StaticAnalysis sa = new StaticAnalysis(metaAccess, stampProvider);
+ StaticAnalysis sa = new StaticAnalysis(providers);
sa.addMethod(findMethod(StaticAnalysisTests.class, "test02Entry"));
sa.finish();
@@ -134,7 +128,7 @@
@Test
public void test03() {
- StaticAnalysis sa = new StaticAnalysis(metaAccess, stampProvider);
+ StaticAnalysis sa = new StaticAnalysis(providers);
sa.addMethod(findMethod(StaticAnalysisTests.class, "test03Entry"));
sa.finish();
@@ -165,7 +159,7 @@
@Test
public void test04() {
- StaticAnalysis sa = new StaticAnalysis(metaAccess, stampProvider);
+ StaticAnalysis sa = new StaticAnalysis(providers);
sa.addMethod(findMethod(StaticAnalysisTests.class, "test04Entry"));
sa.finish();
@@ -192,7 +186,7 @@
}
private ResolvedJavaType t(Class<?> clazz) {
- return metaAccess.lookupJavaType(clazz);
+ return providers.getMetaAccess().lookupJavaType(clazz);
}
private ResolvedJavaMethod findMethod(Class<?> declaringClass, String name) {
@@ -204,7 +198,7 @@
}
}
assert reflectionMethod != null : "No method with name " + name + " in class " + declaringClass.getName();
- return metaAccess.lookupJavaMethod(reflectionMethod);
+ return providers.getMetaAccess().lookupJavaMethod(reflectionMethod);
}
private ResolvedJavaField findField(Class<?> declaringClass, String name) {
@@ -214,6 +208,6 @@
} catch (NoSuchFieldException | SecurityException ex) {
throw new AssertionError(ex);
}
- return metaAccess.lookupJavaField(reflectionField);
+ return providers.getMetaAccess().lookupJavaField(reflectionField);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/LIRGenerationPhase.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/LIRGenerationPhase.java Tue Apr 02 10:57:57 2019 +0530
@@ -67,7 +67,11 @@
NodeLIRBuilderTool nodeLirBuilder = context.nodeLirBuilder;
StructuredGraph graph = context.graph;
ScheduleResult schedule = context.schedule;
- for (AbstractBlockBase<?> b : lirGenRes.getLIR().getControlFlowGraph().getBlocks()) {
+ AbstractBlockBase<?>[] blocks = lirGenRes.getLIR().getControlFlowGraph().getBlocks();
+ for (AbstractBlockBase<?> b : blocks) {
+ matchBlock(nodeLirBuilder, (Block) b, graph, schedule);
+ }
+ for (AbstractBlockBase<?> b : blocks) {
emitBlock(nodeLirBuilder, lirGenRes, (Block) b, graph, schedule.getBlockToNodesMap());
}
context.lirGen.beforeRegisterAllocation();
@@ -84,6 +88,10 @@
instructionCounter.add(debug, lir.getLIRforBlock(b).size());
}
+ private static void matchBlock(NodeLIRBuilderTool nodeLirGen, Block b, StructuredGraph graph, ScheduleResult schedule) {
+ nodeLirGen.matchBlock(b, graph, schedule);
+ }
+
private static boolean verifyPredecessors(LIRGenerationResult lirGenRes, Block block) {
for (Block pred : block.getPredecessors()) {
if (!block.isLoopHeader() || !pred.isLoopEnd()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java Tue Apr 02 10:57:57 2019 +0530
@@ -48,6 +48,7 @@
import org.graalvm.compiler.core.match.MatchPattern;
import org.graalvm.compiler.core.match.MatchRuleRegistry;
import org.graalvm.compiler.core.match.MatchStatement;
+import org.graalvm.compiler.debug.DebugCloseable;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.debug.TTY;
@@ -255,7 +256,7 @@
// get ValueKind for input
final LIRKind valueKind;
- if (value != null) {
+ if (value != null && !(value instanceof ComplexMatchValue)) {
valueKind = value.getValueKind(LIRKind.class);
} else {
assert isPhiInputFromBackedge(phi, i) : String.format("Input %s to phi node %s is not yet available although it is not coming from a loop back edge", node, phi);
@@ -358,10 +359,6 @@
List<Node> nodes = blockMap.get(block);
- // Allow NodeLIRBuilder subclass to specialize code generation of any interesting groups
- // of instructions
- matchComplexExpressions(nodes);
-
boolean trace = traceLIRGeneratorLevel >= 3;
for (int i = 0; i < nodes.size(); i++) {
Node node = nodes.get(i);
@@ -419,11 +416,23 @@
}
}
+ @Override
@SuppressWarnings("try")
- protected void matchComplexExpressions(List<Node> nodes) {
+ public void matchBlock(Block block, StructuredGraph graph, StructuredGraph.ScheduleResult schedule) {
+ try (DebugCloseable matchScope = gen.getMatchScope(block)) {
+ // Allow NodeLIRBuilder subclass to specialize code generation of any interesting groups
+ // of instructions
+ matchComplexExpressions(block, schedule);
+ }
+ }
+
+ @SuppressWarnings("try")
+ protected void matchComplexExpressions(Block block, StructuredGraph.ScheduleResult schedule) {
+
if (matchRules != null) {
DebugContext debug = gen.getResult().getLIR().getDebug();
try (DebugContext.Scope s = debug.scope("MatchComplexExpressions")) {
+ List<Node> nodes = schedule.getBlockToNodesMap().get(block);
if (LogVerbose.getValue(nodeOperands.graph().getOptions())) {
int i = 0;
for (Node node : nodes) {
@@ -441,7 +450,7 @@
List<MatchStatement> statements = matchRules.get(node.getClass());
if (statements != null) {
for (MatchStatement statement : statements) {
- if (statement.generate(this, index, node, nodes)) {
+ if (statement.generate(this, index, node, block, schedule)) {
// Found a match so skip to the next
break;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java Tue Apr 02 10:57:57 2019 +0530
@@ -67,38 +67,38 @@
import jdk.vm.ci.meta.Value;
-@MatchableNode(nodeClass = ConstantNode.class, shareable = true)
-@MatchableNode(nodeClass = FloatConvertNode.class, inputs = {"value"})
+@MatchableNode(nodeClass = ConstantNode.class, shareable = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = FloatConvertNode.class, inputs = {"value"}, ignoresSideEffects = true)
@MatchableNode(nodeClass = FloatingReadNode.class, inputs = {"address"})
@MatchableNode(nodeClass = IfNode.class, inputs = {"condition"})
-@MatchableNode(nodeClass = SubNode.class, inputs = {"x", "y"})
-@MatchableNode(nodeClass = LeftShiftNode.class, inputs = {"x", "y"})
-@MatchableNode(nodeClass = NarrowNode.class, inputs = {"value"})
+@MatchableNode(nodeClass = SubNode.class, inputs = {"x", "y"}, ignoresSideEffects = true)
+@MatchableNode(nodeClass = LeftShiftNode.class, inputs = {"x", "y"}, ignoresSideEffects = true)
+@MatchableNode(nodeClass = NarrowNode.class, inputs = {"value"}, ignoresSideEffects = true)
@MatchableNode(nodeClass = ReadNode.class, inputs = {"address"})
-@MatchableNode(nodeClass = ReinterpretNode.class, inputs = {"value"})
-@MatchableNode(nodeClass = SignExtendNode.class, inputs = {"value"})
-@MatchableNode(nodeClass = UnsignedRightShiftNode.class, inputs = {"x", "y"})
+@MatchableNode(nodeClass = ReinterpretNode.class, inputs = {"value"}, ignoresSideEffects = true)
+@MatchableNode(nodeClass = SignExtendNode.class, inputs = {"value"}, ignoresSideEffects = true)
+@MatchableNode(nodeClass = UnsignedRightShiftNode.class, inputs = {"x", "y"}, ignoresSideEffects = true)
@MatchableNode(nodeClass = WriteNode.class, inputs = {"address", "value"})
-@MatchableNode(nodeClass = ZeroExtendNode.class, inputs = {"value"})
-@MatchableNode(nodeClass = AndNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = NegateNode.class, inputs = {"value"})
-@MatchableNode(nodeClass = NotNode.class, inputs = {"value"})
-@MatchableNode(nodeClass = FloatEqualsNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = FloatLessThanNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = PointerEqualsNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = AddNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = IntegerBelowNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = IntegerEqualsNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = IntegerLessThanNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = MulNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = IntegerTestNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = ObjectEqualsNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = OrNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = XorNode.class, inputs = {"x", "y"}, commutative = true)
-@MatchableNode(nodeClass = PiNode.class, inputs = {"object"})
+@MatchableNode(nodeClass = ZeroExtendNode.class, inputs = {"value"}, ignoresSideEffects = true)
+@MatchableNode(nodeClass = AndNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = NegateNode.class, inputs = {"value"}, ignoresSideEffects = true)
+@MatchableNode(nodeClass = NotNode.class, inputs = {"value"}, ignoresSideEffects = true)
+@MatchableNode(nodeClass = FloatEqualsNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = FloatLessThanNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = PointerEqualsNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = AddNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = IntegerBelowNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = IntegerEqualsNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = IntegerLessThanNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = MulNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = IntegerTestNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = ObjectEqualsNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = OrNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = XorNode.class, inputs = {"x", "y"}, commutative = true, ignoresSideEffects = true)
+@MatchableNode(nodeClass = PiNode.class, inputs = {"object"}, ignoresSideEffects = true)
@MatchableNode(nodeClass = LogicCompareAndSwapNode.class, inputs = {"address", "expectedValue", "newValue"})
@MatchableNode(nodeClass = ValueCompareAndSwapNode.class, inputs = {"address", "expectedValue", "newValue"})
-@MatchableNode(nodeClass = RightShiftNode.class, inputs = {"x", "y"})
+@MatchableNode(nodeClass = RightShiftNode.class, inputs = {"x", "y"}, ignoresSideEffects = true)
public abstract class NodeMatchRules {
NodeLIRBuilder lirBuilder;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchContext.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchContext.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,40 +24,120 @@
package org.graalvm.compiler.core.match;
+import static org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph.dominates;
+import static org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph.strictlyDominates;
import static org.graalvm.compiler.debug.DebugOptions.LogVerbose;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import jdk.internal.vm.compiler.collections.EconomicMap;
import jdk.internal.vm.compiler.collections.Equivalence;
+import org.graalvm.compiler.core.common.cfg.BlockMap;
import org.graalvm.compiler.core.gen.NodeLIRBuilder;
import org.graalvm.compiler.core.match.MatchPattern.Result;
+import org.graalvm.compiler.debug.CounterKey;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeMap;
+import org.graalvm.compiler.nodes.PhiNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.calc.FloatingNode;
+import org.graalvm.compiler.nodes.cfg.Block;
import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
/**
* Container for state captured during a match.
*/
public class MatchContext {
+ private static final CounterKey MatchContextSuccessDifferentBlocks = DebugContext.counter("MatchContextSuccessDifferentBlocks");
private final Node root;
- private final List<Node> nodes;
-
private final MatchStatement rule;
+ private final StructuredGraph.ScheduleResult schedule;
private EconomicMap<String, NamedNode> namedNodes;
- private ArrayList<Node> consumed;
+ /**
+ * A node consumed by a match. Keeps track of whether side effects can be ignored.
+ */
+ static final class ConsumedNode {
+ final Node node;
+ final boolean ignoresSideEffects;
+
+ ConsumedNode(Node node, boolean ignoresSideEffects) {
+ this.node = node;
+ this.ignoresSideEffects = ignoresSideEffects;
+ }
+ }
+
+ /**
+ * The collection of nodes consumed by this match.
+ */
+ static final class ConsumedNodes implements Iterable<ConsumedNode> {
+ private ArrayList<ConsumedNode> nodes;
+
+ ConsumedNodes() {
+ this.nodes = null;
+ }
+
+ public void add(Node node, boolean ignoresSideEffects) {
+ if (nodes == null) {
+ nodes = new ArrayList<>(2);
+ }
+ nodes.add(new ConsumedNode(node, ignoresSideEffects));
+ }
- private int startIndex;
+ public boolean contains(Node node) {
+ for (ConsumedNode c : nodes) {
+ if (c.node == node) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public ConsumedNode find(Node node) {
+ for (ConsumedNode c : nodes) {
+ if (c.node == node) {
+ return c;
+ }
+ }
+ return null;
+ }
- private int endIndex;
+ @Override
+ public String toString() {
+ Node[] arr = new Node[nodes.size()];
+ int i = 0;
+ for (ConsumedNode c : nodes) {
+ arr[i++] = c.node;
+ }
+ return Arrays.toString(arr);
+ }
+
+ @Override
+ public Iterator<ConsumedNode> iterator() {
+ return nodes.iterator();
+ }
+ }
+
+ private ConsumedNodes consumed = new ConsumedNodes();
+
+ private Block rootBlock;
+ private int rootIndex;
+
+ /**
+ * Block and index in the block at which the match should be emitted. Differs from
+ * rootBlock/rootIndex for (ZeroExtend Read=access) for instance: match should be emitted where
+ * the Read is.
+ */
+ private int emitIndex;
+ private Block emitBlock;
private final NodeLIRBuilder builder;
@@ -71,14 +151,15 @@
}
}
- public MatchContext(NodeLIRBuilder builder, MatchStatement rule, int index, Node node, List<Node> nodes) {
+ public MatchContext(NodeLIRBuilder builder, MatchStatement rule, int index, Node node, Block rootBlock, StructuredGraph.ScheduleResult schedule) {
this.builder = builder;
this.rule = rule;
this.root = node;
- this.nodes = nodes;
- assert index == nodes.indexOf(node);
+ assert index == schedule.getBlockToNodesMap().get(rootBlock).indexOf(node);
+ this.schedule = schedule;
// The root should be the last index since all the inputs must be scheduled before it.
- startIndex = endIndex = index;
+ this.rootBlock = rootBlock;
+ rootIndex = index;
}
public Node getRoot() {
@@ -103,28 +184,177 @@
}
public Result validate() {
- // Ensure that there's no unsafe work in between these operations.
- for (int i = startIndex; i <= endIndex; i++) {
+ Result result = findEarlyPosition();
+ if (result != Result.OK) {
+ return result;
+ }
+ findLatePosition();
+ assert emitIndex == rootIndex || consumed.find(root).ignoresSideEffects;
+ return verifyInputs();
+ }
+
+ private Result findEarlyPosition() {
+ int startIndexSideEffect = -1;
+ int endIndexSideEffect = -1;
+ final NodeMap<Block> nodeToBlockMap = schedule.getNodeToBlockMap();
+ final BlockMap<List<Node>> blockToNodesMap = schedule.getBlockToNodesMap();
+
+ // Nodes affected by side effects must be in the same block
+ for (ConsumedNode cn : consumed) {
+ if (!cn.ignoresSideEffects) {
+ Block b = nodeToBlockMap.get(cn.node);
+ if (emitBlock == null) {
+ emitBlock = b;
+ startIndexSideEffect = endIndexSideEffect = blockToNodesMap.get(b).indexOf(cn.node);
+ } else if (emitBlock == b) {
+ int index = blockToNodesMap.get(b).indexOf(cn.node);
+ startIndexSideEffect = Math.min(startIndexSideEffect, index);
+ endIndexSideEffect = Math.max(endIndexSideEffect, index);
+ } else {
+ logFailedMatch("nodes affected by side effects in different blocks %s", cn.node);
+ return Result.notInBlock(cn.node, rule.getPattern());
+ }
+ }
+ }
+ if (emitBlock != null) {
+ // There must be no side effects between nodes that are affected by side effects
+ assert startIndexSideEffect != -1 && endIndexSideEffect != -1;
+ final List<Node> nodes = blockToNodesMap.get(emitBlock);
+ for (int i = startIndexSideEffect; i <= endIndexSideEffect; i++) {
+ Node node = nodes.get(i);
+ if (!sideEffectFree(node) && !consumed.contains(node)) {
+ logFailedMatch("unexpected side effect %s", node);
+ return Result.notSafe(node, rule.getPattern());
+ }
+ }
+ // early position is at the node affected by side effects the closest to the root
+ emitIndex = endIndexSideEffect;
+ } else {
+ // Nodes not affected by side effect: early position is at the root
+ emitBlock = nodeToBlockMap.get(root);
+ emitIndex = rootIndex;
+ }
+ return Result.OK;
+ }
+
+ private static boolean sideEffectFree(Node node) {
+ // The order of evaluation of these nodes controlled by data dependence so they
+ // don't interfere with this match.
+ return node instanceof VirtualObjectNode || node instanceof FloatingNode;
+ }
+
+ private void findLatePosition() {
+ // If emit position is at a node affected by side effects that's followed by side effect
+ // free nodes, the node can be emitted later. This helps when the match has inputs that are
+ // late in the block.
+ int index = rootIndex;
+ if (emitBlock != rootBlock) {
+ index = schedule.getBlockToNodesMap().get(emitBlock).size() - 1;
+ }
+ final List<Node> emitBlockNodes = schedule.getBlockToNodesMap().get(emitBlock);
+ for (int i = emitIndex + 1; i <= index; i++) {
+ Node node = emitBlockNodes.get(i);
+ ConsumedNode cn = consumed.find(node);
+ if (cn == null) {
+ if (!sideEffectFree(node)) {
+ return;
+ }
+ } else {
+ assert cn.ignoresSideEffects;
+ emitIndex = i;
+ }
+ }
+ }
+
+ private Result verifyInputs() {
+ DebugContext debug = root.getDebug();
+ if (emitBlock != rootBlock) {
+ assert consumed.find(root).ignoresSideEffects;
+ Result result = verifyInputsDifferentBlock(root);
+ if (result == Result.OK) {
+ MatchContextSuccessDifferentBlocks.increment(debug);
+ }
+ return result;
+ }
+ // We are going to emit the match at emitIndex. We need to make sure nodes of the match
+ // between emitIndex and rootIndex don't have inputs after position emitIndex that would
+ // make emitIndex an illegal position.
+ final List<Node> nodes = schedule.getBlockToNodesMap().get(rootBlock);
+ for (int i = emitIndex + 1; i <= rootIndex; i++) {
Node node = nodes.get(i);
- if (node instanceof VirtualObjectNode || node instanceof FloatingNode) {
- // The order of evaluation of these nodes controlled by data dependence so they
- // don't interfere with this match.
- continue;
- } else if ((consumed == null || !consumed.contains(node)) && node != root) {
- if (LogVerbose.getValue(root.getOptions())) {
- DebugContext debug = root.getDebug();
- debug.log("unexpected node %s", node);
- for (int j = startIndex; j <= endIndex; j++) {
- Node theNode = nodes.get(j);
- debug.log("%s(%s) %1s", (consumed != null && consumed.contains(theNode) || theNode == root) ? "*" : " ", theNode.getUsageCount(), theNode);
+ ConsumedNode cn = consumed.find(node);
+ if (cn != null) {
+ assert cn.ignoresSideEffects;
+ for (Node in : node.inputs()) {
+ if (!consumed.contains(in)) {
+ for (int j = emitIndex + 1; j < i; j++) {
+ if (nodes.get(j) == in) {
+ logFailedMatch("Earliest position in block is too late %s", in);
+ assert consumed.find(root).ignoresSideEffects;
+ assert verifyInputsDifferentBlock(root) != Result.OK;
+ return Result.tooLate(node, rule.getPattern());
+ }
+ }
}
}
- return Result.notSafe(node, rule.getPattern());
+ }
+ }
+ assert verifyInputsDifferentBlock(root) == Result.OK;
+ return Result.OK;
+ }
+
+ private Result verifyInputsDifferentBlock(Node node) {
+ // Is there an input that's not part of the match that's after the emit position?
+ for (Node in : node.inputs()) {
+ if (in instanceof PhiNode) {
+ Block b = schedule.getNodeToBlockMap().get(((PhiNode) in).merge());
+ if (dominates(b, emitBlock)) {
+ continue;
+ }
+ } else {
+ Block b = schedule.getNodeToBlockMap().get(in);
+ if (strictlyDominates(b, emitBlock) || (b == emitBlock && schedule.getBlockToNodesMap().get(emitBlock).indexOf(in) <= emitIndex)) {
+ continue;
+ }
+ }
+ ConsumedNode cn = consumed.find(in);
+ if (cn == null) {
+ logFailedMatch("Earliest position in block is too late %s", in);
+ return Result.tooLate(node, rule.getPattern());
+ }
+ assert cn.ignoresSideEffects;
+ Result res = verifyInputsDifferentBlock(in);
+ if (res != Result.OK) {
+ return res;
}
}
return Result.OK;
}
+ private void logFailedMatch(String s, Node node) {
+ if (LogVerbose.getValue(root.getOptions())) {
+ DebugContext debug = root.getDebug();
+ debug.log(s, node);
+ int startIndex = emitIndex;
+ if (emitBlock != rootBlock) {
+ int endIndex = schedule.getBlockToNodesMap().get(emitBlock).size() - 1;
+ final List<Node> emitBlockNodes = schedule.getBlockToNodesMap().get(emitBlock);
+ debug.log("%s:", emitBlock);
+ for (int j = startIndex; j <= endIndex; j++) {
+ Node theNode = emitBlockNodes.get(j);
+ debug.log("%s(%s) %1s", consumed.contains(theNode) ? "*" : " ", theNode.getUsageCount(), theNode);
+ }
+ startIndex = 0;
+ }
+ debug.log("%s:", rootBlock);
+ final List<Node> nodes = schedule.getBlockToNodesMap().get(rootBlock);
+ for (int j = startIndex; j <= rootIndex; j++) {
+ Node theNode = nodes.get(j);
+ debug.log("%s(%s) %1s", consumed.contains(theNode) ? "*" : " ", theNode.getUsageCount(), theNode);
+ }
+ }
+ }
+
/**
* Mark the interior nodes with INTERIOR_MATCH and set the Value of the root to be the result.
* During final LIR generation it will be evaluated to produce the actual LIR value.
@@ -133,20 +363,28 @@
*/
public void setResult(ComplexMatchResult result) {
ComplexMatchValue value = new ComplexMatchValue(result);
+ Node emitNode = schedule.getBlockToNodesMap().get(emitBlock).get(emitIndex);
DebugContext debug = root.getDebug();
if (debug.isLogEnabled()) {
- debug.log("matched %s %s", rule.getName(), rule.getPattern());
+ debug.log("matched %s %s%s", rule.getName(), rule.getPattern(), emitIndex != rootIndex ? " skipping side effects" : "");
debug.log("with nodes %s", rule.formatMatch(root));
}
- if (consumed != null) {
- for (Node node : consumed) {
- // All the interior nodes should be skipped during the normal doRoot calls in
- // NodeLIRBuilder so mark them as interior matches. The root of the match will get a
- // closure which will be evaluated to produce the final LIR.
- builder.setMatchResult(node, ComplexMatchValue.INTERIOR_MATCH);
+ for (ConsumedNode cn : consumed) {
+ if (cn.node == root || cn.node == emitNode) {
+ continue;
}
+ // All the interior nodes should be skipped during the normal doRoot calls in
+ // NodeLIRBuilder so mark them as interior matches. The root of the match will get a
+ // closure which will be evaluated to produce the final LIR.
+ builder.setMatchResult(cn.node, ComplexMatchValue.INTERIOR_MATCH);
}
- builder.setMatchResult(root, value);
+ builder.setMatchResult(emitNode, value);
+ if (root != emitNode) {
+ // Match is not emitted at the position of root in the block but the uses of root needs
+ // the result of the match so add a ComplexMatchValue that will simply return the result
+ // of the actual match above.
+ builder.setMatchResult(root, new ComplexMatchValue(gen -> gen.operand(emitNode)));
+ }
}
/**
@@ -154,24 +392,18 @@
*
* @return Result.OK if the node can be safely consumed.
*/
- public Result consume(Node node) {
+ public Result consume(Node node, boolean ignoresSideEffects, boolean atRoot) {
+ if (atRoot) {
+ consumed.add(node, ignoresSideEffects);
+ return Result.OK;
+ }
assert MatchPattern.isSingleValueUser(node) : "should have already been checked";
- // Check NOT_IN_BLOCK first since that usually implies ALREADY_USED
- int index = nodes.indexOf(node);
- if (index == -1) {
- return Result.notInBlock(node, rule.getPattern());
- }
-
if (builder.hasOperand(node)) {
return Result.alreadyUsed(node, rule.getPattern());
}
- startIndex = Math.min(startIndex, index);
- if (consumed == null) {
- consumed = new ArrayList<>(2);
- }
- consumed.add(node);
+ consumed.add(node, ignoresSideEffects);
return Result.OK;
}
@@ -194,6 +426,6 @@
@Override
public String toString() {
- return String.format("%s %s (%d, %d) consumed %s", rule, root, startIndex, endIndex, consumed != null ? Arrays.toString(consumed.toArray()) : "");
+ return String.format("%s %s (%s/%d, %s/%d) consumed %s", rule, root, rootBlock, rootIndex, emitBlock, emitIndex, consumed);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchPattern.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchPattern.java Tue Apr 02 10:57:57 2019 +0530
@@ -30,6 +30,7 @@
import org.graalvm.compiler.graph.Position;
import org.graalvm.compiler.nodeinfo.InputType;
import org.graalvm.compiler.nodeinfo.Verbosity;
+import org.graalvm.compiler.nodes.calc.FloatingNode;
/**
* A simple recursive pattern matcher for a DAG of nodes.
@@ -45,6 +46,7 @@
NOT_IN_BLOCK,
NOT_SAFE,
ALREADY_USED,
+ TOO_LATE,
}
/**
@@ -70,6 +72,7 @@
private static final CounterKey MatchResult_NOT_IN_BLOCK = DebugContext.counter("MatchResult_NOT_IN_BLOCK");
private static final CounterKey MatchResult_NOT_SAFE = DebugContext.counter("MatchResult_NOT_SAFE");
private static final CounterKey MatchResult_ALREADY_USED = DebugContext.counter("MatchResult_ALREADY_USED");
+ private static final CounterKey MatchResult_TOO_LATE = DebugContext.counter("MatchResult_TOO_LATE");
static final Result OK = new Result(MatchResultCode.OK, null, null);
private static final Result CACHED_WRONG_CLASS = new Result(MatchResultCode.WRONG_CLASS, null, null);
@@ -78,6 +81,7 @@
private static final Result CACHED_NOT_IN_BLOCK = new Result(MatchResultCode.NOT_IN_BLOCK, null, null);
private static final Result CACHED_NOT_SAFE = new Result(MatchResultCode.NOT_SAFE, null, null);
private static final Result CACHED_ALREADY_USED = new Result(MatchResultCode.ALREADY_USED, null, null);
+ private static final Result CACHED_TOO_LATE = new Result(MatchResultCode.TOO_LATE, null, null);
static Result wrongClass(Node node, MatchPattern matcher) {
MatchResult_WRONG_CLASS.increment(node.getDebug());
@@ -109,6 +113,11 @@
return node.getDebug().isLogEnabled() ? new Result(MatchResultCode.ALREADY_USED, node, matcher) : CACHED_ALREADY_USED;
}
+ static Result tooLate(Node node, MatchPattern matcher) {
+ MatchResult_TOO_LATE.increment(node.getDebug());
+ return node.getDebug().isLogEnabled() ? new Result(MatchResultCode.TOO_LATE, node, matcher) : CACHED_TOO_LATE;
+ }
+
@Override
public String toString() {
if (code == MatchResultCode.OK) {
@@ -149,39 +158,49 @@
*/
private final boolean singleUser;
+ /**
+ * Can this node be subsumed into a match even if there are side effecting nodes between this
+ * node and the match.
+ */
+ private final boolean ignoresSideEffects;
+
private static final MatchPattern[] EMPTY_PATTERNS = new MatchPattern[0];
- public MatchPattern(String name, boolean singleUser) {
- this(null, name, singleUser);
+ public MatchPattern(String name, boolean singleUser, boolean ignoresSideEffects) {
+ this(null, name, singleUser, ignoresSideEffects);
}
- public MatchPattern(Class<? extends Node> nodeClass, String name, boolean singleUser) {
+ public MatchPattern(Class<? extends Node> nodeClass, String name, boolean singleUser, boolean ignoresSideEffects) {
this.nodeClass = nodeClass;
this.name = name;
this.singleUser = singleUser;
+ this.ignoresSideEffects = ignoresSideEffects;
this.patterns = EMPTY_PATTERNS;
this.inputs = null;
+ assert !ignoresSideEffects || FloatingNode.class.isAssignableFrom(nodeClass);
}
- private MatchPattern(Class<? extends Node> nodeClass, String name, boolean singleUser, MatchPattern[] patterns, Position[] inputs) {
+ private MatchPattern(Class<? extends Node> nodeClass, String name, boolean singleUser, boolean ignoresSideEffects, MatchPattern[] patterns, Position[] inputs) {
assert inputs == null || inputs.length == patterns.length;
this.nodeClass = nodeClass;
this.name = name;
this.singleUser = singleUser;
+ this.ignoresSideEffects = ignoresSideEffects;
this.patterns = patterns;
this.inputs = inputs;
+ assert !ignoresSideEffects || FloatingNode.class.isAssignableFrom(nodeClass);
}
- public MatchPattern(Class<? extends Node> nodeClass, String name, MatchPattern first, Position[] inputs, boolean singleUser) {
- this(nodeClass, name, singleUser, new MatchPattern[]{first}, inputs);
+ public MatchPattern(Class<? extends Node> nodeClass, String name, MatchPattern first, Position[] inputs, boolean singleUser, boolean ignoresSideEffects) {
+ this(nodeClass, name, singleUser, ignoresSideEffects, new MatchPattern[]{first}, inputs);
}
- public MatchPattern(Class<? extends Node> nodeClass, String name, MatchPattern first, MatchPattern second, Position[] inputs, boolean singleUser) {
- this(nodeClass, name, singleUser, new MatchPattern[]{first, second}, inputs);
+ public MatchPattern(Class<? extends Node> nodeClass, String name, MatchPattern first, MatchPattern second, Position[] inputs, boolean singleUser, boolean ignoresSideEffects) {
+ this(nodeClass, name, singleUser, ignoresSideEffects, new MatchPattern[]{first, second}, inputs);
}
- public MatchPattern(Class<? extends Node> nodeClass, String name, MatchPattern first, MatchPattern second, MatchPattern third, Position[] inputs, boolean singleUser) {
- this(nodeClass, name, singleUser, new MatchPattern[]{first, second, third}, inputs);
+ public MatchPattern(Class<? extends Node> nodeClass, String name, MatchPattern first, MatchPattern second, MatchPattern third, Position[] inputs, boolean singleUser, boolean ignoresSideEffects) {
+ this(nodeClass, name, singleUser, ignoresSideEffects, new MatchPattern[]{first, second, third}, inputs);
}
Class<? extends Node> nodeClass() {
@@ -215,8 +234,8 @@
if (result != Result.OK) {
return result;
}
- if (singleUser && !atRoot) {
- result = context.consume(node);
+ if (singleUser) {
+ result = context.consume(node, ignoresSideEffects, atRoot);
if (result != Result.OK) {
return result;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatement.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchStatement.java Tue Apr 02 10:57:57 2019 +0530
@@ -26,8 +26,6 @@
import static org.graalvm.compiler.debug.DebugOptions.LogVerbose;
-import java.util.List;
-
import org.graalvm.compiler.core.gen.NodeLIRBuilder;
import org.graalvm.compiler.core.match.MatchPattern.MatchResultCode;
import org.graalvm.compiler.core.match.MatchPattern.Result;
@@ -38,6 +36,8 @@
import org.graalvm.compiler.nodeinfo.Verbosity;
import jdk.vm.ci.meta.Value;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.cfg.Block;
/**
* A named {@link MatchPattern} along with a {@link MatchGenerator} that can be evaluated to replace
@@ -80,20 +80,21 @@
*
* @param builder the current builder instance.
* @param node the node to be matched
- * @param nodes the nodes in the current block
+ * @param block the current block
+ * @param schedule the schedule that's being used
* @return true if the statement matched something and set a {@link ComplexMatchResult} to be
* evaluated by the NodeLIRBuilder.
*/
- public boolean generate(NodeLIRBuilder builder, int index, Node node, List<Node> nodes) {
+ public boolean generate(NodeLIRBuilder builder, int index, Node node, Block block, StructuredGraph.ScheduleResult schedule) {
DebugContext debug = node.getDebug();
- assert index == nodes.indexOf(node);
+ assert index == schedule.getBlockToNodesMap().get(block).indexOf(node);
// Check that the basic shape matches
Result result = pattern.matchShape(node, this);
if (result != Result.OK) {
return false;
}
// Now ensure that the other safety constraints are matched.
- MatchContext context = new MatchContext(builder, this, index, node, nodes);
+ MatchContext context = new MatchContext(builder, this, index, node, block, schedule);
result = pattern.matchUsage(node, context);
if (result == Result.OK) {
// Invoke the generator method and set the result if it's non null.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchableNode.java Tue Apr 02 10:57:57 2019 +0530
@@ -64,4 +64,6 @@
* Can a node with multiple uses be safely matched by a rule.
*/
boolean shareable() default false;
+
+ boolean ignoresSideEffects() default false;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java Tue Apr 02 10:57:57 2019 +0530
@@ -239,15 +239,9 @@
this.unscopedTimers = parseUnscopedMetricSpec(Timers.getValue(options), "".equals(timeValue), true);
this.unscopedMemUseTrackers = parseUnscopedMetricSpec(MemUseTrackers.getValue(options), "".equals(trackMemUseValue), true);
- if (unscopedTimers != null || timeValue != null) {
- if (!GraalServices.isCurrentThreadCpuTimeSupported()) {
- throw new IllegalArgumentException("Time and Timers options require VM support for querying CPU time");
- }
- }
-
if (unscopedMemUseTrackers != null || trackMemUseValue != null) {
if (!GraalServices.isThreadAllocatedMemorySupported()) {
- throw new IllegalArgumentException("MemUseTrackers and TrackMemUse options require VM support for querying thread allocated memory");
+ TTY.println("WARNING: Missing VM support for MemUseTrackers and TrackMemUse options so all reported memory usage will be 0");
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/LogStream.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/LogStream.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@
/**
* The system dependent line separator.
*/
- public static final String LINE_SEPARATOR = System.getProperty("line.separator");
+ public static final String LINE_SEPARATOR = System.lineSeparator();
/**
* Creates a new log stream.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKey.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MemUseTrackerKey.java Tue Apr 02 10:57:57 2019 +0530
@@ -56,6 +56,6 @@
MemUseTrackerKey doc(String string);
static long getCurrentThreadAllocatedBytes() {
- return GraalServices.getCurrentThreadAllocatedBytes();
+ return GraalServices.isThreadAllocatedMemorySupported() ? GraalServices.getCurrentThreadAllocatedBytes() : 0;
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Versions.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Versions.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,11 +32,13 @@
import java.util.HashMap;
import java.util.Map;
+import jdk.vm.ci.services.Services;
+
/** Avoid using directly. Only public for the needs of unit testing. */
public final class Versions {
static final Versions VERSIONS;
static {
- String home = System.getProperty("java.home");
+ String home = Services.getSavedProperties().get("java.home");
VERSIONS = new Versions(home == null ? null : new File(home).toPath());
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java Tue Apr 02 10:57:57 2019 +0530
@@ -26,7 +26,6 @@
import static org.graalvm.compiler.graph.Graph.isModificationCountsEnabled;
import static org.graalvm.compiler.graph.Node.NOT_ITERABLE;
-import static org.graalvm.compiler.graph.UnsafeAccess.UNSAFE;
import java.util.ArrayList;
import java.util.Iterator;
@@ -34,6 +33,9 @@
import org.graalvm.compiler.core.common.Fields;
import org.graalvm.compiler.core.common.FieldsScanner;
import org.graalvm.compiler.graph.NodeClass.EdgeInfo;
+import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
+
+import sun.misc.Unsafe;
/**
* Describes {@link Node} fields representing the set of inputs for the node or the set of the
@@ -41,6 +43,8 @@
*/
public abstract class Edges extends Fields {
+ private static final Unsafe UNSAFE = GraalUnsafeAccess.getUnsafe();
+
/**
* Constants denoting whether a set of edges are inputs or successors.
*/
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java Tue Apr 02 10:57:57 2019 +0530
@@ -27,7 +27,7 @@
import static org.graalvm.compiler.graph.Edges.Type.Inputs;
import static org.graalvm.compiler.graph.Edges.Type.Successors;
import static org.graalvm.compiler.graph.Graph.isModificationCountsEnabled;
-import static org.graalvm.compiler.graph.UnsafeAccess.UNSAFE;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
@@ -61,6 +61,7 @@
import org.graalvm.compiler.nodeinfo.Verbosity;
import org.graalvm.compiler.options.OptionValues;
+import jdk.vm.ci.services.Services;
import sun.misc.Unsafe;
/**
@@ -86,9 +87,11 @@
@NodeInfo
public abstract class Node implements Cloneable, Formattable, NodeInterface {
+ private static final Unsafe UNSAFE = getUnsafe();
+
public static final NodeClass<?> TYPE = null;
- public static final boolean TRACK_CREATION_POSITION = Boolean.getBoolean("debug.graal.TrackNodeCreationPosition");
+ public static final boolean TRACK_CREATION_POSITION = Boolean.parseBoolean(Services.getSavedProperties().get("debug.graal.TrackNodeCreationPosition"));
static final int DELETED_ID_START = -1000000000;
static final int INITIAL_ID = -1;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,11 +24,13 @@
package org.graalvm.compiler.graph;
+import static org.graalvm.compiler.core.common.Fields.translateInto;
import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
+import static org.graalvm.compiler.graph.Edges.translateInto;
import static org.graalvm.compiler.graph.Graph.isModificationCountsEnabled;
import static org.graalvm.compiler.graph.InputEdges.translateInto;
import static org.graalvm.compiler.graph.Node.WithAllEdges;
-import static org.graalvm.compiler.graph.UnsafeAccess.UNSAFE;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
@@ -69,6 +71,8 @@
import org.graalvm.compiler.nodeinfo.NodeSize;
import org.graalvm.compiler.nodeinfo.Verbosity;
+import sun.misc.Unsafe;
+
/**
* Metadata for every {@link Node} type. The metadata includes:
* <ul>
@@ -79,6 +83,7 @@
*/
public final class NodeClass<T> extends FieldIntrospection<T> {
+ private static final Unsafe UNSAFE = getUnsafe();
// Timers for creation of a NodeClass instance
private static final TimerKey Init_FieldScanning = DebugContext.timer("NodeClass.Init.FieldScanning");
private static final TimerKey Init_FieldScanningInner = DebugContext.timer("NodeClass.Init.FieldScanning.Inner");
@@ -128,7 +133,7 @@
public static <T> NodeClass<T> get(Class<T> clazz) {
int numTries = 0;
while (true) {
- boolean shouldBeInitializedBefore = UnsafeAccess.UNSAFE.shouldBeInitialized(clazz);
+ boolean shouldBeInitializedBefore = UNSAFE.shouldBeInitialized(clazz);
NodeClass<T> result = getUnchecked(clazz);
if (result != null || clazz == NODE_CLASS) {
@@ -141,13 +146,13 @@
* information without failing gates.
*/
numTries++;
- boolean shouldBeInitializedAfter = UnsafeAccess.UNSAFE.shouldBeInitialized(clazz);
+ boolean shouldBeInitializedAfter = UNSAFE.shouldBeInitialized(clazz);
String msg = "GR-9537 Reflective field access of TYPE field returned null. This is probably a bug in HotSpot class initialization. " +
" clazz: " + clazz.getTypeName() + ", numTries: " + numTries +
", shouldBeInitializedBefore: " + shouldBeInitializedBefore + ", shouldBeInitializedAfter: " + shouldBeInitializedAfter;
if (numTries <= 100) {
TTY.println(msg);
- UnsafeAccess.UNSAFE.ensureClassInitialized(clazz);
+ UNSAFE.ensureClassInitialized(clazz);
} else {
throw GraalError.shouldNotReachHere(msg);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSourcePosition.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeSourcePosition.java Tue Apr 02 10:57:57 2019 +0530
@@ -40,11 +40,12 @@
import jdk.vm.ci.meta.JavaMethod;
import jdk.vm.ci.meta.MetaUtil;
import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.services.Services;
public class NodeSourcePosition extends BytecodePosition implements Iterable<NodeSourcePosition> {
- private static final boolean STRICT_SOURCE_POSITION = Boolean.getBoolean("debug.graal.SourcePositionStrictChecks");
- private static final boolean SOURCE_POSITION_BYTECODES = Boolean.getBoolean("debug.graal.SourcePositionDisassemble");
+ private static final boolean STRICT_SOURCE_POSITION = Boolean.parseBoolean(Services.getSavedProperties().get("debug.graal.SourcePositionStrictChecks"));
+ private static final boolean SOURCE_POSITION_BYTECODES = Boolean.parseBoolean(Services.getSavedProperties().get("debug.graal.SourcePositionDisassemble"));
private final int hashCode;
private final Marker marker;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/UnsafeAccess.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.graph;
-
-import java.lang.reflect.Field;
-
-import sun.misc.Unsafe;
-
-/**
- * Package private access to the {@link Unsafe} capability.
- */
-class UnsafeAccess {
-
- static final Unsafe UNSAFE = initUnsafe();
-
- private static Unsafe initUnsafe() {
- try {
- // Fast path when we are trusted.
- return Unsafe.getUnsafe();
- } catch (SecurityException se) {
- // Slow path when we are not trusted.
- try {
- Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
- theUnsafe.setAccessible(true);
- return (Unsafe) theUnsafe.get(Unsafe.class);
- } catch (Exception e) {
- throw new RuntimeException("exception while trying to get Unsafe", e);
- }
- }
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java Tue Apr 02 10:57:57 2019 +0530
@@ -166,7 +166,8 @@
HotSpotHostForeignCallsProvider foreignCalls, HotSpotMetaAccessProvider metaAccess, HotSpotSnippetReflectionProvider snippetReflection,
HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes) {
Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, replacements);
- AArch64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), false);
+ AArch64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), false, //
+ /* registerMathPlugins */true);
return plugins;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java Tue Apr 02 10:57:57 2019 +0530
@@ -113,7 +113,7 @@
private HotSpotDebugInfoBuilder debugInfoBuilder;
protected AArch64HotSpotLIRGenerator(HotSpotProviders providers, GraalHotSpotVMConfig config, LIRGenerationResult lirGenRes) {
- this(new AArch64LIRKindTool(), new AArch64ArithmeticLIRGenerator(), new AArch64HotSpotMoveFactory(), providers, config, lirGenRes);
+ this(new AArch64LIRKindTool(), new AArch64ArithmeticLIRGenerator(null), new AArch64HotSpotMoveFactory(), providers, config, lirGenRes);
}
protected AArch64HotSpotLIRGenerator(LIRKindTool lirKindTool, AArch64ArithmeticLIRGenerator arithmeticLIRGen, MoveFactory moveFactory, HotSpotProviders providers, GraalHotSpotVMConfig config,
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java Tue Apr 02 10:57:57 2019 +0530
@@ -73,7 +73,9 @@
crb.recordMark(config.MARKID_INLINE_INVOKE);
Register callReg = asRegister(targetAddress);
assert !callReg.equals(METHOD);
+ int pcOffset = masm.position();
AArch64Call.indirectCall(crb, masm, callReg, callTarget, state);
+ crb.recordInlineInvokeCallOp(pcOffset, getPosition());
}
@Override
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayCompareToStub.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.hotspot.amd64;
+
+import org.graalvm.compiler.api.replacements.Snippet;
+import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
+import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
+import org.graalvm.compiler.hotspot.stubs.SnippetStub;
+import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
+import jdk.internal.vm.compiler.word.Pointer;
+
+import jdk.vm.ci.meta.JavaKind;
+
+public final class AMD64ArrayCompareToStub extends SnippetStub {
+
+ public static final ForeignCallDescriptor STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY = new ForeignCallDescriptor(
+ "byteArrayCompareToByteArray", int.class, Pointer.class, Pointer.class, int.class, int.class);
+ public static final ForeignCallDescriptor STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY = new ForeignCallDescriptor(
+ "byteArrayCompareToCharArray", int.class, Pointer.class, Pointer.class, int.class, int.class);
+ public static final ForeignCallDescriptor STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY = new ForeignCallDescriptor(
+ "charArrayCompareToByteArray", int.class, Pointer.class, Pointer.class, int.class, int.class);
+ public static final ForeignCallDescriptor STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY = new ForeignCallDescriptor(
+ "charArrayCompareToCharArray", int.class, Pointer.class, Pointer.class, int.class, int.class);
+
+ public AMD64ArrayCompareToStub(ForeignCallDescriptor foreignCallDescriptor, OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
+ super(foreignCallDescriptor.getName(), options, providers, linkage);
+ }
+
+ @Snippet
+ private static int byteArrayCompareToByteArray(Pointer array1, Pointer array2, int length1, int length2) {
+ return ArrayCompareToNode.compareTo(array1, array2, length1, length2, JavaKind.Byte, JavaKind.Byte);
+ }
+
+ @Snippet
+ private static int byteArrayCompareToCharArray(Pointer array1, Pointer array2, int length1, int length2) {
+ return ArrayCompareToNode.compareTo(array1, array2, length1, length2, JavaKind.Byte, JavaKind.Char);
+ }
+
+ @Snippet
+ private static int charArrayCompareToByteArray(Pointer array1, Pointer array2, int length1, int length2) {
+ return ArrayCompareToNode.compareTo(array1, array2, length1, length2, JavaKind.Char, JavaKind.Byte);
+ }
+
+ @Snippet
+ private static int charArrayCompareToCharArray(Pointer array1, Pointer array2, int length1, int length2) {
+ return ArrayCompareToNode.compareTo(array1, array2, length1, length2, JavaKind.Char, JavaKind.Char);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayEqualsStub.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64ArrayEqualsStub.java Tue Apr 02 10:57:57 2019 +0530
@@ -31,6 +31,7 @@
import org.graalvm.compiler.hotspot.stubs.SnippetStub;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode;
+import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
import jdk.internal.vm.compiler.word.Pointer;
import jdk.vm.ci.meta.JavaKind;
@@ -54,6 +55,13 @@
public static final ForeignCallDescriptor STUB_DOUBLE_ARRAY_EQUALS = new ForeignCallDescriptor(
"doubleArraysEquals", boolean.class, Pointer.class, Pointer.class, int.class);
+ public static final ForeignCallDescriptor STUB_BYTE_ARRAY_EQUALS_DIRECT = new ForeignCallDescriptor(
+ "byteArraysEqualsDirect", boolean.class, Pointer.class, Pointer.class, int.class);
+ public static final ForeignCallDescriptor STUB_CHAR_ARRAY_EQUALS_DIRECT = new ForeignCallDescriptor(
+ "charArraysEqualsDirect", boolean.class, Pointer.class, Pointer.class, int.class);
+ public static final ForeignCallDescriptor STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY = new ForeignCallDescriptor(
+ "charArrayEqualsByteArray", boolean.class, Pointer.class, Pointer.class, int.class);
+
public AMD64ArrayEqualsStub(ForeignCallDescriptor foreignCallDescriptor, OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
super(foreignCallDescriptor.getName(), options, providers, linkage);
}
@@ -97,4 +105,19 @@
private static boolean doubleArraysEquals(Pointer array1, Pointer array2, int length) {
return ArrayEqualsNode.equals(array1, array2, length, JavaKind.Double);
}
+
+ @Snippet
+ private static boolean byteArraysEqualsDirect(Pointer array1, Pointer array2, int length) {
+ return ArrayRegionEqualsNode.regionEquals(array1, array2, length, JavaKind.Byte, JavaKind.Byte);
+ }
+
+ @Snippet
+ private static boolean charArraysEqualsDirect(Pointer array1, Pointer array2, int length) {
+ return ArrayRegionEqualsNode.regionEquals(array1, array2, length, JavaKind.Char, JavaKind.Char);
+ }
+
+ @Snippet
+ private static boolean charArrayEqualsByteArray(Pointer array1, Pointer array2, int length) {
+ return ArrayRegionEqualsNode.regionEquals(array1, array2, length, JavaKind.Char, JavaKind.Byte);
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Tue Apr 02 10:57:57 2019 +0530
@@ -137,6 +137,22 @@
registerStubCall(AMD64ArrayEqualsStub.STUB_FLOAT_ARRAY_EQUALS, LEAF, REEXECUTABLE, NO_LOCATIONS)));
link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_DOUBLE_ARRAY_EQUALS, options, providers,
registerStubCall(AMD64ArrayEqualsStub.STUB_DOUBLE_ARRAY_EQUALS, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS_DIRECT, options, providers,
+ registerStubCall(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS_DIRECT, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_DIRECT, options, providers,
+ registerStubCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_DIRECT, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64ArrayEqualsStub(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY, options, providers,
+ registerStubCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+
+ link(new AMD64ArrayCompareToStub(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY, options, providers,
+ registerStubCall(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64ArrayCompareToStub(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY, options, providers,
+ registerStubCall(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64ArrayCompareToStub(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY, options, providers,
+ registerStubCall(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64ArrayCompareToStub(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY, options, providers,
+ registerStubCall(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+
super.initialize(providers, options);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java Tue Apr 02 10:57:57 2019 +0530
@@ -676,32 +676,4 @@
protected StrategySwitchOp createStrategySwitchOp(SwitchStrategy strategy, LabelRef[] keyTargets, LabelRef defaultTarget, Variable key, AllocatableValue temp) {
return new AMD64HotSpotStrategySwitchOp(strategy, keyTargets, defaultTarget, key, temp);
}
-
- @Override
- public ForeignCallLinkage lookupArrayEqualsStub(JavaKind kind, int constantLength) {
- if (constantLength >= 0 && constantLength * kind.getByteCount() < 2 * getMaxVectorSize()) {
- // Yield constant-length arrays comparison assembly
- return null;
- }
- switch (kind) {
- case Boolean:
- return getForeignCalls().lookupForeignCall(AMD64ArrayEqualsStub.STUB_BOOLEAN_ARRAY_EQUALS);
- case Byte:
- return getForeignCalls().lookupForeignCall(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS);
- case Char:
- return getForeignCalls().lookupForeignCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS);
- case Short:
- return getForeignCalls().lookupForeignCall(AMD64ArrayEqualsStub.STUB_SHORT_ARRAY_EQUALS);
- case Int:
- return getForeignCalls().lookupForeignCall(AMD64ArrayEqualsStub.STUB_INT_ARRAY_EQUALS);
- case Long:
- return getForeignCalls().lookupForeignCall(AMD64ArrayEqualsStub.STUB_LONG_ARRAY_EQUALS);
- case Float:
- return getForeignCalls().lookupForeignCall(AMD64ArrayEqualsStub.STUB_FLOAT_ARRAY_EQUALS);
- case Double:
- return getForeignCalls().lookupForeignCall(AMD64ArrayEqualsStub.STUB_DOUBLE_ARRAY_EQUALS);
- default:
- return null;
- }
- }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,11 @@
import static jdk.vm.ci.code.ValueUtil.isStackSlot;
import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER;
+import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.core.amd64.AMD64NodeLIRBuilder;
import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules;
import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
import org.graalvm.compiler.core.gen.DebugInfoBuilder;
import org.graalvm.compiler.hotspot.HotSpotDebugInfoBuilder;
@@ -54,6 +56,8 @@
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.spi.NodeValueMap;
+import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
+import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode;
import jdk.vm.ci.amd64.AMD64;
import jdk.vm.ci.amd64.AMD64Kind;
@@ -66,8 +70,11 @@
import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
import jdk.vm.ci.meta.AllocatableValue;
+import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.JavaType;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.Value;
+import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
/**
* LIR generator specialized for AMD64 HotSpot.
@@ -196,4 +203,98 @@
Value[] parameters = visitInvokeArguments(gen.getRegisterConfig().getCallingConvention(HotSpotCallingConventionType.JavaCall, null, sig, gen), node.arguments());
append(new AMD64BreakpointOp(parameters));
}
+
+ private ForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) {
+ return getGen().getForeignCalls().lookupForeignCall(descriptor);
+ }
+
+ @Override
+ public ForeignCallLinkage lookupGraalStub(ValueNode valueNode) {
+ ResolvedJavaMethod method = valueNode.graph().method();
+ if (method == null || method.getAnnotation(Snippet.class) != null) {
+ // Emit assembly for snippet stubs
+ return null;
+ }
+
+ if (valueNode instanceof ArrayEqualsNode) {
+ ArrayEqualsNode arrayEqualsNode = (ArrayEqualsNode) valueNode;
+ JavaKind kind = arrayEqualsNode.getKind();
+ ValueNode length = arrayEqualsNode.getLength();
+
+ if (length.isConstant()) {
+ int constantLength = length.asJavaConstant().asInt();
+ if (constantLength >= 0 && constantLength * kind.getByteCount() < 2 * getGen().getMaxVectorSize()) {
+ // Yield constant-length arrays comparison assembly
+ return null;
+ }
+ }
+
+ switch (kind) {
+ case Boolean:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_BOOLEAN_ARRAY_EQUALS);
+ case Byte:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS);
+ case Char:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS);
+ case Short:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_SHORT_ARRAY_EQUALS);
+ case Int:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_INT_ARRAY_EQUALS);
+ case Long:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_LONG_ARRAY_EQUALS);
+ case Float:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_FLOAT_ARRAY_EQUALS);
+ case Double:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_DOUBLE_ARRAY_EQUALS);
+ default:
+ return null;
+ }
+ } else if (valueNode instanceof ArrayCompareToNode) {
+ ArrayCompareToNode arrayCompareToNode = (ArrayCompareToNode) valueNode;
+ JavaKind kind1 = arrayCompareToNode.getKind1();
+ JavaKind kind2 = arrayCompareToNode.getKind2();
+
+ if (kind1 == JavaKind.Byte) {
+ if (kind2 == JavaKind.Byte) {
+ return lookupForeignCall(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_BYTE_ARRAY);
+ } else if (kind2 == JavaKind.Char) {
+ return lookupForeignCall(AMD64ArrayCompareToStub.STUB_BYTE_ARRAY_COMPARE_TO_CHAR_ARRAY);
+ }
+ } else if (kind1 == JavaKind.Char) {
+ if (kind2 == JavaKind.Byte) {
+ return lookupForeignCall(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_BYTE_ARRAY);
+ } else if (kind2 == JavaKind.Char) {
+ return lookupForeignCall(AMD64ArrayCompareToStub.STUB_CHAR_ARRAY_COMPARE_TO_CHAR_ARRAY);
+ }
+ }
+ } else if (valueNode instanceof ArrayRegionEqualsNode) {
+ ArrayRegionEqualsNode arrayRegionEqualsNode = (ArrayRegionEqualsNode) valueNode;
+ JavaKind kind1 = arrayRegionEqualsNode.getKind1();
+ JavaKind kind2 = arrayRegionEqualsNode.getKind2();
+ ValueNode length = arrayRegionEqualsNode.getLength();
+
+ if (length.isConstant()) {
+ int constantLength = length.asJavaConstant().asInt();
+ if (constantLength >= 0 && constantLength * (Math.max(kind1.getByteCount(), kind2.getByteCount())) < 2 * getGen().getMaxVectorSize()) {
+ // Yield constant-length arrays comparison assembly
+ return null;
+ }
+ }
+
+ if (kind1 == kind2) {
+ switch (kind1) {
+ case Byte:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_BYTE_ARRAY_EQUALS_DIRECT);
+ case Char:
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_DIRECT);
+ default:
+ return null;
+ }
+ } else if (kind1 == JavaKind.Char && kind2 == JavaKind.Byte) {
+ return lookupForeignCall(AMD64ArrayEqualsStub.STUB_CHAR_ARRAY_EQUALS_BYTE_ARRAY);
+ }
+ }
+
+ return null;
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/NodeCostDumpUtil.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.hotspot.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
+
+import org.graalvm.compiler.debug.CSVUtil;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.memory.MemoryCheckpoint;
+import org.graalvm.compiler.nodes.spi.Virtualizable;
+
+public class NodeCostDumpUtil {
+
+ private static final String prefix1 = "com.oracle.";
+ private static final String prefix2 = "org.graalvm.";
+ private static final String FMT = CSVUtil.buildFormatString("%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s");
+
+ private static String getArgumentRegex(String arg) {
+ if (arg.length() == 0) {
+ return null;
+ }
+ try {
+ Pattern.compile(arg);
+ return arg;
+ } catch (PatternSyntaxException e) {
+ // silently ignore
+ System.err.println("Invalid regex given, defaulting to \".*\" regex..");
+ return null;
+ }
+ }
+
+ public static void main(String[] args) {
+ if (args.length != 1) {
+ System.err.println("NodeCostDumpUtil expects exactly one argument, the node name regex to match against.");
+ System.exit(-1);
+ }
+ final String pattern = getArgumentRegex(args[0]);
+ String version = System.getProperty("java.specification.version");
+ if (version.compareTo("1.9") >= 0) {
+ System.err.printf("NodeCostDumpUtil does not support JDK versions greater than 1.8, current version is %s.\n", version);
+ System.exit(-1);
+ }
+ String[] jvmciCP = System.getProperty("jvmci.class.path.append").split(File.pathSeparator);
+ String[] primarySuiteCP = System.getProperty("primary.suite.cp").split(File.pathSeparator);
+ ClassLoader applicationClassLoader = Thread.currentThread().getContextClassLoader();
+ HashSet<Class<?>> classes = new HashSet<>();
+ try {
+ Set<String> uniquePaths = new HashSet<>(Arrays.asList(primarySuiteCP));
+ uniquePaths.addAll(Arrays.asList(jvmciCP));
+ for (String path : uniquePaths) {
+ if (new File(path).exists()) {
+ if (path.endsWith(".jar")) {
+ try (FileSystem jarFileSystem = FileSystems.newFileSystem(URI.create("jar:file:" + path), Collections.emptyMap())) {
+ initAllClasses(jarFileSystem.getPath("/"), applicationClassLoader, classes);
+ }
+ } else {
+ initAllClasses(FileSystems.getDefault().getPath(path), applicationClassLoader, classes);
+ }
+ }
+ }
+ } catch (IOException ex) {
+ GraalError.shouldNotReachHere();
+ }
+ System.err.printf("Loaded %d classes...\n", classes.size());
+ List<Class<?>> nodeClasses = new ArrayList<>();
+ for (Class<?> loaded : classes) {
+ if (Node.class.isAssignableFrom(loaded) && !loaded.isArray()) {
+ nodeClasses.add(loaded);
+ }
+ }
+ System.err.printf("Loaded %s node classes...\n", nodeClasses.size());
+ List<NodeClass<?>> nc = new ArrayList<>();
+ for (Class<?> c : nodeClasses) {
+ try {
+ nc.add(NodeClass.get(c));
+ } catch (Throwable t) {
+ // Silently ignore problems here
+ }
+ }
+ System.err.printf("Read TYPE field from %s node classes...\n", nc.size());
+ nc = nc.stream().filter(x -> x != null).collect(Collectors.toList());
+ nc.sort((x, y) -> {
+ String a = x.getJavaClass().getName();
+ String b = y.getJavaClass().getName();
+ return a.compareTo(b);
+ });
+ CSVUtil.Escape.println(System.out, FMT, "NodeName", "Size", "Overrides Size Method", "Cycles", "Overrides Cycles Method", "Canonicalizable", "MemoryCheckPoint", "Virtualizable");
+ for (NodeClass<?> nodeclass : nc) {
+ String packageStrippedName = null;
+ try {
+ packageStrippedName = nodeclass.getJavaClass().getCanonicalName().replace(prefix1, "").replace(prefix2, "");
+ } catch (Throwable t) {
+ // do nothing
+ continue;
+ }
+ if (pattern != null && !packageStrippedName.matches(pattern)) {
+ continue;
+ }
+ boolean overridesSizeMethod = false;
+ boolean overridesCyclesMethod = false;
+ Class<?> c = nodeclass.getJavaClass();
+ try {
+ c.getDeclaredMethod("estimatedNodeSize");
+ overridesSizeMethod = true;
+ } catch (Throwable t) {
+ // do nothing
+ }
+ try {
+ c.getDeclaredMethod("estimatedNodeCycles");
+ overridesCyclesMethod = true;
+ } catch (Throwable t) {
+ // do nothing
+ }
+ CSVUtil.Escape.println(System.out, FMT, packageStrippedName, nodeclass.size(), overridesSizeMethod, nodeclass.cycles(), overridesCyclesMethod, canonicalizable(c), memoryCheckPoint(c),
+ virtualizable(c));
+ }
+ }
+
+ private static boolean canonicalizable(Class<?> c) {
+ return Canonicalizable.class.isAssignableFrom(c);
+ }
+
+ private static boolean virtualizable(Class<?> c) {
+ return Virtualizable.class.isAssignableFrom(c);
+ }
+
+ private static boolean memoryCheckPoint(Class<?> c) {
+ return MemoryCheckpoint.class.isAssignableFrom(c);
+ }
+
+ private static void initAllClasses(final Path root, ClassLoader classLoader, HashSet<Class<?>> classes) {
+ try {
+ Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+ String className = root.relativize(file).toString();
+ ClassLoader c = classLoader;
+ if (className.endsWith(".class")) {
+ String prefix = prefixed(className);
+ if (prefix != null) {
+ String stripped = stripClassName(className);
+ c = new URLClassLoader(new URL[]{new File(constructURLPart(stripped, className, prefix)).toURI().toURL()}, classLoader);
+ className = constructClazzPart(stripped, prefix);
+ } else {
+ String clazzPart = className.replace('/', '.');
+ className = clazzPart.substring(0, clazzPart.length() - ".class".length());
+ }
+ try {
+ Class<?> systemClass = Class.forName(className, false, c);
+ if (systemClass.getEnclosingClass() != null) {
+ try {
+ classes.add(systemClass.getEnclosingClass());
+ } catch (Throwable t) {
+ // do nothing
+ }
+ }
+ classes.add(systemClass);
+ } catch (Throwable ignored) {
+ }
+ }
+ return FileVisitResult.CONTINUE;
+ }
+ });
+ } catch (IOException ex) {
+ GraalError.shouldNotReachHere();
+ }
+ }
+
+ private static String prefixed(String className) {
+ if (className.contains(prefix1) && className.indexOf(prefix1) > 0) {
+ return prefix1;
+ } else if (className.contains(prefix2) && className.indexOf(prefix2) > 0) {
+ return prefix2;
+ }
+ return null;
+ }
+
+ private static String stripClassName(String className) {
+ return className.replace('/', '.');
+ }
+
+ private static String constructClazzPart(String stripped, String prefix) {
+ String clazzPart = stripped.substring(stripped.lastIndexOf(prefix), stripped.length());
+ return clazzPart.substring(0, clazzPart.length() - ".class".length());
+ }
+
+ private static String constructURLPart(String stripped, String className, String prefix) {
+ return className.substring(0, stripped.lastIndexOf(prefix));
+ }
+
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/StringInternConstantTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.hotspot.test;
+
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.FixedNode;
+import org.graalvm.compiler.nodes.ReturnNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.junit.Test;
+
+import jdk.vm.ci.hotspot.HotSpotObjectConstant;
+import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import org.junit.Assert;
+
+/**
+ * Tests constant folding of {@link String#intern()}.
+ */
+public class StringInternConstantTest extends GraalCompilerTest {
+
+ private static final String A_CONSTANT_STRING = "a constant string";
+
+ @Test
+ public void test1() {
+ ResolvedJavaMethod method = getResolvedJavaMethod("constantIntern");
+ StructuredGraph graph = parseForCompile(method);
+
+ FixedNode firstFixed = graph.start().next();
+ Assert.assertThat(firstFixed, instanceOf(ReturnNode.class));
+
+ ReturnNode ret = (ReturnNode) firstFixed;
+ if (ret.result() instanceof ConstantNode) {
+ String expected = A_CONSTANT_STRING.intern();
+ Constant constant = ((ConstantNode) ret.result()).getValue();
+ if (constant instanceof HotSpotObjectConstant) {
+ String returnedString = ((HotSpotObjectConstant) constant).asObject(String.class);
+ Assert.assertSame("result", expected, returnedString);
+ } else {
+ Assert.fail("expected HotSpotObjectConstant, got: " + constant.getClass());
+ }
+ } else {
+ Assert.fail("result not constant: " + ret.result());
+ }
+ }
+
+ public static String constantIntern() {
+ return A_CONSTANT_STRING.intern();
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java Tue Apr 02 10:57:57 2019 +0530
@@ -39,6 +39,7 @@
import org.graalvm.compiler.options.OptionValues;
import jdk.vm.ci.code.CompilationRequest;
+import jdk.vm.ci.services.Services;
/**
* A watch dog that monitors the duration and compilation rate during a
@@ -108,7 +109,7 @@
/**
* Set to true to debug the watch dog.
*/
- private static final boolean DEBUG = Boolean.getBoolean("debug.graal.BootstrapWatchDog");
+ private static final boolean DEBUG = Boolean.parseBoolean(Services.getSavedProperties().get("debug.graal.BootstrapWatchDog"));
/**
* Seconds to delay before starting to measure the compilation rate.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationStatistics.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationStatistics.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
import jdk.vm.ci.hotspot.HotSpotInstalledCode;
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
+import jdk.vm.ci.services.Services;
@SuppressWarnings("unused")
public final class CompilationStatistics {
@@ -189,7 +190,7 @@
timeLeft = RESOLUTION;
}
}
- String timelineName = System.getProperty("stats.timeline.name");
+ String timelineName = Services.getSavedProperties().get("stats.timeline.name");
if (timelineName != null && !timelineName.isEmpty()) {
out.printf("%s%c", CSVUtil.Escape.escape(timelineName), CSVUtil.SEPARATOR);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java Tue Apr 02 10:57:57 2019 +0530
@@ -57,7 +57,6 @@
import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
import jdk.vm.ci.hotspot.HotSpotCompilationRequestResult;
import jdk.vm.ci.hotspot.HotSpotInstalledCode;
-import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory;
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
import jdk.vm.ci.hotspot.HotSpotNmethod;
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
@@ -93,6 +92,7 @@
private final boolean installAsDefault;
private final boolean useProfilingInfo;
+ private final boolean shouldRetainLocalVariables;
private final OptionValues options;
final class HotSpotCompilationWrapper extends CompilationWrapper<HotSpotCompilationRequestResult> {
@@ -187,7 +187,7 @@
try (DebugContext.Scope s = debug.scope("Compiling", new DebugDumpScope(getIdString(), true))) {
// Begin the compilation event.
compilationEvent.begin();
- result = compiler.compile(method, entryBCI, useProfilingInfo, compilationId, options, debug);
+ result = compiler.compile(method, entryBCI, useProfilingInfo, shouldRetainLocalVariables, compilationId, options, debug);
} catch (Throwable e) {
throw debug.handle(e);
} finally {
@@ -213,10 +213,16 @@
public CompilationTask(HotSpotJVMCIRuntime jvmciRuntime, HotSpotGraalCompiler compiler, HotSpotCompilationRequest request, boolean useProfilingInfo, boolean installAsDefault,
OptionValues options) {
+ this(jvmciRuntime, compiler, request, useProfilingInfo, false, installAsDefault, options);
+ }
+
+ public CompilationTask(HotSpotJVMCIRuntime jvmciRuntime, HotSpotGraalCompiler compiler, HotSpotCompilationRequest request, boolean useProfilingInfo, boolean shouldRetainLocalVariables,
+ boolean installAsDefault, OptionValues options) {
this.jvmciRuntime = jvmciRuntime;
this.compiler = compiler;
this.compilationId = new HotSpotCompilationIdentifier(request);
this.useProfilingInfo = useProfilingInfo;
+ this.shouldRetainLocalVariables = shouldRetainLocalVariables;
this.installAsDefault = installAsDefault;
/*
@@ -321,15 +327,14 @@
// Log a compilation event.
EventProvider.CompilationEvent compilationEvent = eventProvider.newCompilationEvent();
- if (installAsDefault) {
+ if (installAsDefault || isOSR) {
// If there is already compiled code for this method on our level we simply return.
// JVMCI compiles are always at the highest compile level, even in non-tiered mode so we
// only need to check for that value.
if (method.hasCodeAtLevel(entryBCI, config.compilationLevelFullOptimization)) {
return HotSpotCompilationRequestResult.failure("Already compiled", false);
}
- if (HotSpotGraalCompilerFactory.checkGraalCompileOnlyFilter(method.getDeclaringClass().toJavaName(), method.getName(), method.getSignature().toString(),
- HotSpotJVMCICompilerFactory.CompilationLevel.FullOptimization) != HotSpotJVMCICompilerFactory.CompilationLevel.FullOptimization) {
+ if (HotSpotGraalCompilerFactory.shouldExclude(method)) {
return HotSpotCompilationRequestResult.failure("GraalCompileOnly excluded", false);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationWatchDog.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationWatchDog.java Tue Apr 02 10:57:57 2019 +0530
@@ -35,6 +35,7 @@
import org.graalvm.compiler.options.OptionValues;
import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.services.Services;
/**
* A watch dog for reporting long running compilations. This is designed to be an always on
@@ -166,7 +167,7 @@
/**
* Set to true to debug the watch dog.
*/
- private static final boolean DEBUG = Boolean.getBoolean("debug.graal.CompilationWatchDog");
+ private static final boolean DEBUG = Boolean.parseBoolean(Services.getSavedProperties().get("debug.graal.CompilationWatchDog"));
private void trace(String format, Object... args) {
if (DEBUG) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java Tue Apr 02 10:57:57 2019 +0530
@@ -316,14 +316,16 @@
public final int jvmAccWrittenFlags = getConstant("JVM_ACC_WRITTEN_FLAGS", Integer.class);
public final int jvmAccSynthetic = getConstant("JVM_ACC_SYNTHETIC", Integer.class);
- public final int jvmciCompileStateCanPostOnExceptionsOffset = getJvmciCompileStateCanPostOnExceptionsOffset();
+ public final int jvmciCompileStateCanPostOnExceptionsOffset = getJvmciJvmtiCapabilityOffset("_jvmti_can_post_on_exceptions");
+ public final int jvmciCompileStateCanPopFrameOffset = getJvmciJvmtiCapabilityOffset("_jvmti_can_pop_frame");
+ public final int jvmciCompileStateCanAccessLocalVariablesOffset = getJvmciJvmtiCapabilityOffset("_jvmti_can_access_local_variables");
// Integer.MIN_VALUE if not available
- private int getJvmciCompileStateCanPostOnExceptionsOffset() {
- int offset = getFieldOffset("JVMCICompileState::_jvmti_can_post_on_exceptions", Integer.class, "jbyte", Integer.MIN_VALUE);
+ private int getJvmciJvmtiCapabilityOffset(String name) {
+ int offset = getFieldOffset("JVMCICompileState::" + name, Integer.class, "jbyte", Integer.MIN_VALUE);
if (offset == Integer.MIN_VALUE) {
// JDK 12
- offset = getFieldOffset("JVMCIEnv::_jvmti_can_post_on_exceptions", Integer.class, "jbyte", Integer.MIN_VALUE);
+ offset = getFieldOffset("JVMCIEnv::" + name, Integer.class, "jbyte", Integer.MIN_VALUE);
}
return offset;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigBase.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigBase.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,10 @@
import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.services.Services;
/**
- * This is a source with different versions for various JDKs.
+ * Base class of class hierarchy for accessing HotSpot VM configuration.
*/
public abstract class GraalHotSpotVMConfigBase extends HotSpotVMConfigAccess {
@@ -62,6 +63,18 @@
return true;
}
+ private static String getProperty(String name, String def) {
+ String value = Services.getSavedProperties().get(name);
+ if (value == null) {
+ return def;
+ }
+ return value;
+ }
+
+ private static String getProperty(String name) {
+ return getProperty(name, null);
+ }
+
/**
* Contains values that are different between JDK versions.
*/
@@ -78,14 +91,14 @@
public final String osName = getHostOSName();
public final String osArch = getHostArchitectureName();
- public final boolean windowsOs = System.getProperty("os.name", "").startsWith("Windows");
- public final boolean linuxOs = System.getProperty("os.name", "").startsWith("Linux");
+ public final boolean windowsOs = getProperty("os.name", "").startsWith("Windows");
+ public final boolean linuxOs = getProperty("os.name", "").startsWith("Linux");
/**
* Gets the host operating system name.
*/
private static String getHostOSName() {
- String osName = System.getProperty("os.name");
+ String osName = getProperty("os.name");
switch (osName) {
case "Linux":
osName = "linux";
@@ -108,7 +121,7 @@
}
private static String getHostArchitectureName() {
- String arch = System.getProperty("os.arch");
+ String arch = getProperty("os.arch");
switch (arch) {
case "x86_64":
arch = "amd64";
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java Tue Apr 02 10:57:57 2019 +0530
@@ -25,6 +25,7 @@
package org.graalvm.compiler.hotspot;
import static org.graalvm.compiler.core.common.GraalOptions.OptAssumptions;
+import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
@@ -71,9 +72,11 @@
import jdk.vm.ci.meta.SpeculationLog;
import jdk.vm.ci.meta.TriState;
import jdk.vm.ci.runtime.JVMCICompiler;
+import sun.misc.Unsafe;
public class HotSpotGraalCompiler implements GraalJVMCICompiler {
+ private static final Unsafe UNSAFE = GraalUnsafeAccess.getUnsafe();
private final HotSpotJVMCIRuntime jvmciRuntime;
private final HotSpotGraalRuntimeProvider graalRuntime;
private final CompilationCounters compilationCounters;
@@ -131,7 +134,7 @@
if (compilationCounters != null) {
compilationCounters.countCompilation(method);
}
- CompilationTask task = new CompilationTask(jvmciRuntime, this, hsRequest, true, installAsDefault, options);
+ CompilationTask task = new CompilationTask(jvmciRuntime, this, hsRequest, true, shouldRetainLocalVariables(hsRequest.getJvmciEnv()), installAsDefault, options);
CompilationRequestResult r = null;
try (DebugContext debug = graalRuntime.openDebugContext(options, task.getCompilationIdentifier(), method, getDebugHandlersFactories(), DebugContext.DEFAULT_LOG_STREAM);
Activation a = debug.activate()) {
@@ -142,6 +145,24 @@
}
}
+ private boolean shouldRetainLocalVariables(long envAddress) {
+ GraalHotSpotVMConfig config = graalRuntime.getVMConfig();
+ if (envAddress == 0) {
+ return false;
+ }
+ if (config.jvmciCompileStateCanPopFrameOffset != Integer.MIN_VALUE) {
+ if ((UNSAFE.getByte(envAddress + config.jvmciCompileStateCanPopFrameOffset) & 0xFF) != 0) {
+ return true;
+ }
+ }
+ if (config.jvmciCompileStateCanAccessLocalVariablesOffset != Integer.MIN_VALUE) {
+ if ((UNSAFE.getByte(envAddress + config.jvmciCompileStateCanAccessLocalVariablesOffset) & 0xFF) != 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public StructuredGraph createGraph(ResolvedJavaMethod method, int entryBCI, boolean useProfilingInfo, CompilationIdentifier compilationId, OptionValues options, DebugContext debug) {
HotSpotBackend backend = graalRuntime.getHostBackend();
HotSpotProviders providers = backend.getProviders();
@@ -161,6 +182,11 @@
public CompilationResult compileHelper(CompilationResultBuilderFactory crbf, CompilationResult result, StructuredGraph graph, ResolvedJavaMethod method, int entryBCI, boolean useProfilingInfo,
OptionValues options) {
+ return compileHelper(crbf, result, graph, method, entryBCI, useProfilingInfo, false, options);
+ }
+
+ public CompilationResult compileHelper(CompilationResultBuilderFactory crbf, CompilationResult result, StructuredGraph graph, ResolvedJavaMethod method, int entryBCI, boolean useProfilingInfo,
+ boolean shouldRetainLocalVariables, OptionValues options) {
HotSpotBackend backend = graalRuntime.getHostBackend();
HotSpotProviders providers = backend.getProviders();
@@ -181,7 +207,7 @@
result.setEntryBCI(entryBCI);
boolean shouldDebugNonSafepoints = providers.getCodeCache().shouldDebugNonSafepoints();
- PhaseSuite<HighTierContext> graphBuilderSuite = configGraphBuilderSuite(providers.getSuites().getDefaultGraphBuilderSuite(), shouldDebugNonSafepoints, isOSR);
+ PhaseSuite<HighTierContext> graphBuilderSuite = configGraphBuilderSuite(providers.getSuites().getDefaultGraphBuilderSuite(), shouldDebugNonSafepoints, shouldRetainLocalVariables, isOSR);
GraalCompiler.compileGraph(graph, method, providers, backend, graphBuilderSuite, optimisticOpts, profilingInfo, suites, lirSuites, result, crbf, true);
if (!isOSR && useProfilingInfo) {
@@ -193,9 +219,14 @@
}
public CompilationResult compile(ResolvedJavaMethod method, int entryBCI, boolean useProfilingInfo, CompilationIdentifier compilationId, OptionValues options, DebugContext debug) {
+ return compile(method, entryBCI, useProfilingInfo, false, compilationId, options, debug);
+ }
+
+ public CompilationResult compile(ResolvedJavaMethod method, int entryBCI, boolean useProfilingInfo, boolean shouldRetainLocalVariables, CompilationIdentifier compilationId, OptionValues options,
+ DebugContext debug) {
StructuredGraph graph = createGraph(method, entryBCI, useProfilingInfo, compilationId, options, debug);
CompilationResult result = new CompilationResult(compilationId);
- return compileHelper(CompilationResultBuilderFactory.Default, result, graph, method, entryBCI, useProfilingInfo, options);
+ return compileHelper(CompilationResultBuilderFactory.Default, result, graph, method, entryBCI, useProfilingInfo, shouldRetainLocalVariables, options);
}
protected OptimisticOptimizations getOptimisticOpts(ProfilingInfo profilingInfo, OptionValues options) {
@@ -217,27 +248,26 @@
* @param suite the graph builder suite
* @param shouldDebugNonSafepoints specifies if extra debug info should be generated (default is
* false)
+ * @param shouldRetainLocalVariables specifies if local variables should be retained for
+ * debugging purposes (default is false)
* @param isOSR specifies if extra OSR-specific post-processing is required (default is false)
* @return a new suite derived from {@code suite} if any of the GBS parameters did not have a
* default value otherwise {@code suite}
*/
- protected PhaseSuite<HighTierContext> configGraphBuilderSuite(PhaseSuite<HighTierContext> suite, boolean shouldDebugNonSafepoints, boolean isOSR) {
- if (shouldDebugNonSafepoints || isOSR) {
+ protected PhaseSuite<HighTierContext> configGraphBuilderSuite(PhaseSuite<HighTierContext> suite, boolean shouldDebugNonSafepoints, boolean shouldRetainLocalVariables, boolean isOSR) {
+ if (shouldDebugNonSafepoints || shouldRetainLocalVariables || isOSR) {
PhaseSuite<HighTierContext> newGbs = suite.copy();
-
+ GraphBuilderPhase graphBuilderPhase = (GraphBuilderPhase) newGbs.findPhase(GraphBuilderPhase.class).previous();
+ GraphBuilderConfiguration graphBuilderConfig = graphBuilderPhase.getGraphBuilderConfig();
if (shouldDebugNonSafepoints) {
- GraphBuilderPhase graphBuilderPhase = (GraphBuilderPhase) newGbs.findPhase(GraphBuilderPhase.class).previous();
- GraphBuilderConfiguration graphBuilderConfig = graphBuilderPhase.getGraphBuilderConfig();
graphBuilderConfig = graphBuilderConfig.withNodeSourcePosition(true);
- GraphBuilderPhase newGraphBuilderPhase = new GraphBuilderPhase(graphBuilderConfig);
- newGbs.findPhase(GraphBuilderPhase.class).set(newGraphBuilderPhase);
}
+ if (shouldRetainLocalVariables) {
+ graphBuilderConfig = graphBuilderConfig.withRetainLocalVariables(true);
+ }
+ GraphBuilderPhase newGraphBuilderPhase = new GraphBuilderPhase(graphBuilderConfig);
+ newGbs.findPhase(GraphBuilderPhase.class).set(newGraphBuilderPhase);
if (isOSR) {
- // We must not clear non liveness for OSR compilations.
- GraphBuilderPhase graphBuilderPhase = (GraphBuilderPhase) newGbs.findPhase(GraphBuilderPhase.class).previous();
- GraphBuilderConfiguration graphBuilderConfig = graphBuilderPhase.getGraphBuilderConfig();
- GraphBuilderPhase newGraphBuilderPhase = new GraphBuilderPhase(graphBuilderConfig);
- newGbs.findPhase(GraphBuilderPhase.class).set(newGraphBuilderPhase);
newGbs.appendPhase(new OnStackReplacementPhase());
}
return newGbs;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
package org.graalvm.compiler.hotspot;
import static jdk.vm.ci.common.InitTimer.timer;
+import static jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory.CompilationLevelAdjustment.None;
import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX;
import java.io.PrintStream;
@@ -42,8 +44,10 @@
import jdk.vm.ci.common.InitTimer;
import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory;
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
-import jdk.vm.ci.hotspot.HotSpotSignature;
+import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
+import jdk.vm.ci.meta.Signature;
import jdk.vm.ci.runtime.JVMCIRuntime;
+import jdk.vm.ci.services.Services;
public final class HotSpotGraalCompilerFactory extends HotSpotJVMCICompilerFactory {
@@ -70,7 +74,7 @@
@Override
public void onSelection() {
- JVMCIVersionCheck.check(false);
+ JVMCIVersionCheck.check(Services.getSavedProperties(), false);
assert options == null : "cannot select " + getClass() + " service more than once";
options = HotSpotGraalOptionValues.defaultOptions();
initializeGraalCompilePolicyFields(options);
@@ -79,8 +83,10 @@
* Exercise this code path early to encourage loading now. This doesn't solve problem of
* deadlock during class loading but seems to eliminate it in practice.
*/
- adjustCompilationLevelInternal(Object.class, "hashCode", "()I", CompilationLevel.FullOptimization);
- adjustCompilationLevelInternal(Object.class, "hashCode", "()I", CompilationLevel.Simple);
+ if (isGraalPredicate != null && isGraalPredicate.getCompilationLevelAdjustment() != None) {
+ adjustCompilationLevelInternal(Object.class, CompilationLevel.FullOptimization);
+ adjustCompilationLevelInternal(Object.class, CompilationLevel.Simple);
+ }
if (IS_BUILDING_NATIVE_IMAGE) {
// Triggers initialization of all option descriptors
Options.CompileGraalWithC1Only.getName();
@@ -88,7 +94,7 @@
}
private static void initializeGraalCompilePolicyFields(OptionValues options) {
- compileGraalWithC1Only = Options.CompileGraalWithC1Only.getValue(options);
+ compileGraalWithC1Only = Options.CompileGraalWithC1Only.getValue(options) && !IS_IN_NATIVE_IMAGE;
String optionValue = Options.GraalCompileOnly.getValue(options);
if (optionValue != null) {
MethodFilter[] filter = MethodFilter.parse(optionValue);
@@ -123,7 +129,7 @@
public HotSpotGraalCompiler createCompiler(JVMCIRuntime runtime) {
CompilerConfigurationFactory factory = CompilerConfigurationFactory.selectFactory(null, options);
if (isGraalPredicate != null) {
- isGraalPredicate.onCompilerConfigurationFactorySelection(factory);
+ isGraalPredicate.onCompilerConfigurationFactorySelection((HotSpotJVMCIRuntime) runtime, factory);
}
HotSpotGraalCompiler compiler = createCompiler("VM", runtime, options, factory);
// Only the HotSpotGraalRuntime associated with the compiler created via
@@ -154,27 +160,13 @@
@Override
public CompilationLevelAdjustment getCompilationLevelAdjustment() {
- if (graalCompileOnlyFilter != null) {
- return CompilationLevelAdjustment.ByFullSignature;
- }
- if (compileGraalWithC1Only) {
- // We only decide using the class declaring the method
- // so no need to have the method name and signature
- // symbols converted to a String.
- return CompilationLevelAdjustment.ByHolder;
- }
- return CompilationLevelAdjustment.None;
+ return isGraalPredicate != null ? isGraalPredicate.getCompilationLevelAdjustment() : None;
}
@Override
public CompilationLevel adjustCompilationLevel(Object declaringClassObject, String name, String signature, boolean isOsr, CompilationLevel level) {
- if (declaringClassObject instanceof String) {
- // This must be SVM mode in which case only GraalCompileC1Only matters since Graal and
- // JVMCI are already compiled.
- return checkGraalCompileOnlyFilter((String) declaringClassObject, name, signature, level);
- }
Class<?> declaringClass = (Class<?>) declaringClassObject;
- return adjustCompilationLevelInternal(declaringClass, name, signature, level);
+ return adjustCompilationLevelInternal(declaringClass, level);
}
static {
@@ -184,32 +176,28 @@
assert HotSpotGraalCompilerFactory.class.getName().equals("org.graalvm.compiler.hotspot.HotSpotGraalCompilerFactory");
}
- private CompilationLevel adjustCompilationLevelInternal(Class<?> declaringClass, String name, String signature, CompilationLevel level) {
- if (compileGraalWithC1Only) {
- if (level.ordinal() > CompilationLevel.Simple.ordinal()) {
- if (isGraalPredicate.apply(declaringClass)) {
- return CompilationLevel.Simple;
- }
- }
- }
- return checkGraalCompileOnlyFilter(declaringClass.getName(), name, signature, level);
- }
-
- public static CompilationLevel checkGraalCompileOnlyFilter(String declaringClassName, String name, String signature, CompilationLevel level) {
- if (graalCompileOnlyFilter != null) {
- if (level == CompilationLevel.FullOptimization) {
- HotSpotSignature sig = null;
- for (MethodFilter filter : graalCompileOnlyFilter) {
- if (filter.hasSignature() && sig == null) {
- sig = new HotSpotSignature(HotSpotJVMCIRuntime.runtime(), signature);
- }
- if (filter.matches(declaringClassName, name, sig)) {
- return level;
- }
- }
+ private CompilationLevel adjustCompilationLevelInternal(Class<?> declaringClass, CompilationLevel level) {
+ assert isGraalPredicate != null;
+ if (level.ordinal() > CompilationLevel.Simple.ordinal()) {
+ if (isGraalPredicate.apply(declaringClass)) {
return CompilationLevel.Simple;
}
}
return level;
}
+
+ static boolean shouldExclude(HotSpotResolvedJavaMethod method) {
+ if (graalCompileOnlyFilter != null) {
+ String javaClassName = method.getDeclaringClass().toJavaName();
+ String name = method.getName();
+ Signature signature = method.getSignature();
+ for (MethodFilter filter : graalCompileOnlyFilter) {
+ if (filter.matches(javaClassName, name, signature)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ return false;
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java Tue Apr 02 10:57:57 2019 +0530
@@ -87,6 +87,7 @@
import jdk.vm.ci.meta.ResolvedJavaType;
import jdk.vm.ci.runtime.JVMCI;
import jdk.vm.ci.runtime.JVMCIBackend;
+import jdk.vm.ci.services.Services;
//JaCoCo Exclude
@@ -95,7 +96,7 @@
*/
public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider {
- private static final boolean IS_AOT = Boolean.getBoolean("com.oracle.graalvm.isaot");
+ private static final boolean IS_AOT = Boolean.parseBoolean(Services.getSavedProperties().get("com.oracle.graalvm.isaot"));
private static boolean checkArrayIndexScaleInvariants(MetaAccessProvider metaAccess) {
assert metaAccess.getArrayIndexScale(JavaKind.Byte) == 1;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@
import org.graalvm.compiler.serviceprovider.ServiceProvider;
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+import jdk.vm.ci.services.Services;
@ServiceProvider(TTYStreamProvider.class)
public class HotSpotTTYStreamProvider implements TTYStreamProvider {
@@ -151,7 +152,7 @@
if (inputArguments != null) {
ps.println("VM Arguments: " + String.join(" ", inputArguments));
}
- String cmd = System.getProperty("sun.java.command");
+ String cmd = Services.getSavedProperties().get("sun.java.command");
if (cmd != null) {
ps.println("sun.java.command=" + cmd);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/IsGraalPredicate.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/IsGraalPredicate.java Tue Apr 02 10:57:57 2019 +0530
@@ -25,12 +25,13 @@
package org.graalvm.compiler.hotspot;
import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory;
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
/**
* Determines if a given class is a JVMCI or Graal class for the purpose of
* {@link HotSpotGraalCompilerFactory.Options#CompileGraalWithC1Only}.
*/
-public class IsGraalPredicate {
+class IsGraalPredicate extends IsGraalPredicateBase {
/**
* Module containing {@link HotSpotJVMCICompilerFactory}.
*/
@@ -47,15 +48,17 @@
*/
private Module compilerConfigurationModule;
- public IsGraalPredicate() {
+ IsGraalPredicate() {
jvmciModule = HotSpotJVMCICompilerFactory.class.getModule();
graalModule = HotSpotGraalCompilerFactory.class.getModule();
}
- void onCompilerConfigurationFactorySelection(CompilerConfigurationFactory factory) {
+ @Override
+ void onCompilerConfigurationFactorySelection(HotSpotJVMCIRuntime runtime, CompilerConfigurationFactory factory) {
compilerConfigurationModule = factory.getClass().getModule();
}
+ @Override
boolean apply(Class<?> declaringClass) {
Module module = declaringClass.getModule();
return jvmciModule == module || graalModule == module || compilerConfigurationModule == module;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/IsGraalPredicateBase.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.hotspot;
+
+import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory;
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+
+/**
+ * Determines if a given class is a JVMCI or Graal class for the purpose of
+ * {@link HotSpotGraalCompilerFactory.Options#CompileGraalWithC1Only}.
+ */
+abstract class IsGraalPredicateBase {
+
+ @SuppressWarnings("unused")
+ void onCompilerConfigurationFactorySelection(HotSpotJVMCIRuntime runtime, CompilerConfigurationFactory factory) {
+ }
+
+ abstract boolean apply(Class<?> declaringClass);
+
+ HotSpotJVMCICompilerFactory.CompilationLevelAdjustment getCompilationLevelAdjustment() {
+ return HotSpotJVMCICompilerFactory.CompilationLevelAdjustment.ByHolder;
+ }
+}
+
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
package org.graalvm.compiler.hotspot;
import java.util.Formatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
/**
* Mechanism for checking that the current Java runtime environment supports the minimum JVMCI API
@@ -38,20 +41,22 @@
*/
class JVMCIVersionCheck {
- // 0.55 introduces new HotSpotSpeculationLog API
+ // 0.57 introduces HotSpotJVMCIRuntime.excludeFromJVMCICompilation
private static final int JVMCI8_MIN_MAJOR_VERSION = 0;
- private static final int JVMCI8_MIN_MINOR_VERSION = 55;
+ private static final int JVMCI8_MIN_MINOR_VERSION = 57;
- private static void failVersionCheck(boolean exit, String reason, Object... args) {
+ private static void failVersionCheck(Map<String, String> props, boolean exit, String reason, Object... args) {
Formatter errorMessage = new Formatter().format(reason, args);
- String javaHome = System.getProperty("java.home");
- String vmName = System.getProperty("java.vm.name");
+ String javaHome = props.get("java.home");
+ String vmName = props.get("java.vm.name");
errorMessage.format("Set the JVMCI_VERSION_CHECK environment variable to \"ignore\" to suppress ");
errorMessage.format("this error or to \"warn\" to emit a warning and continue execution.%n");
errorMessage.format("Currently used Java home directory is %s.%n", javaHome);
errorMessage.format("Currently used VM configuration is: %s%n", vmName);
- if (System.getProperty("java.specification.version").compareTo("1.9") < 0) {
- errorMessage.format("Download the latest JVMCI JDK 8 from http://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html");
+ if (props.get("java.specification.version").compareTo("1.9") < 0) {
+ errorMessage.format("Download the latest JVMCI JDK 8 from " +
+ "http://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html or " +
+ "https://github.com/graalvm/openjdk8-jvmci-builder/releases");
} else {
errorMessage.format("Download JDK 11 or later.");
}
@@ -68,10 +73,10 @@
}
}
- static void check(boolean exitOnFailure) {
+ static void check(Map<String, String> props, boolean exitOnFailure) {
// Don't use regular expressions to minimize Graal startup time
- String javaSpecVersion = System.getProperty("java.specification.version");
- String vmVersion = System.getProperty("java.vm.version");
+ String javaSpecVersion = props.get("java.specification.version");
+ String vmVersion = props.get("java.vm.version");
if (javaSpecVersion.compareTo("1.9") < 0) {
int start = vmVersion.indexOf("-jvmci-");
if (start >= 0) {
@@ -82,7 +87,7 @@
try {
major = Integer.parseInt(vmVersion.substring(start, end));
} catch (NumberFormatException e) {
- failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
+ failVersionCheck(props, exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
"Cannot read JVMCI major version from java.vm.version property: %s.%n", vmVersion);
return;
}
@@ -95,22 +100,22 @@
try {
minor = Integer.parseInt(vmVersion.substring(start, end));
} catch (NumberFormatException e) {
- failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
+ failVersionCheck(props, exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
"Cannot read JVMCI minor version from java.vm.version property: %s.%n", vmVersion);
return;
}
if (major >= JVMCI8_MIN_MAJOR_VERSION && minor >= JVMCI8_MIN_MINOR_VERSION) {
return;
}
- failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal: %d.%d < %d.%d.%n",
+ failVersionCheck(props, exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal: %d.%d < %d.%d.%n",
major, minor, JVMCI8_MIN_MAJOR_VERSION, JVMCI8_MIN_MINOR_VERSION);
return;
}
}
- failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
+ failVersionCheck(props, exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal.%n" +
"Cannot read JVMCI version from java.vm.version property: %s.%n", vmVersion);
} else if (javaSpecVersion.compareTo("11") < 0) {
- failVersionCheck(exitOnFailure, "Graal is not compatible with the JVMCI API in JDK 9 and 10.%n");
+ failVersionCheck(props, exitOnFailure, "Graal is not compatible with the JVMCI API in JDK 9 and 10.%n");
} else {
if (vmVersion.contains("SNAPSHOT")) {
return;
@@ -124,11 +129,11 @@
try {
int build = Integer.parseInt(buildString);
if (build < 20) {
- failVersionCheck(exitOnFailure, "Graal requires build 20 or later of JDK 11 early access binary, got build %d.%n", build);
+ failVersionCheck(props, exitOnFailure, "Graal requires build 20 or later of JDK 11 early access binary, got build %d.%n", build);
return;
}
} catch (NumberFormatException e) {
- failVersionCheck(exitOnFailure, "Could not parse the JDK 11 early access build number from java.vm.version property: %s.%n", vmVersion);
+ failVersionCheck(props, exitOnFailure, "Could not parse the JDK 11 early access build number from java.vm.version property: %s.%n", vmVersion);
return;
}
} else {
@@ -141,6 +146,11 @@
* Command line interface for performing the check.
*/
public static void main(String[] args) {
- check(true);
+ Properties sprops = System.getProperties();
+ Map<String, String> props = new HashMap<>(sprops.size());
+ for (String name : sprops.stringPropertyNames()) {
+ props.put(name, sprops.getProperty(name));
+ }
+ check(props, true);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/NodeCostDumpUtil.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.hotspot;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-import java.util.stream.Collectors;
-
-import org.graalvm.compiler.debug.CSVUtil;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.memory.MemoryCheckpoint;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-
-public class NodeCostDumpUtil {
-
- private static final String prefix1 = "com.oracle.";
- private static final String prefix2 = "org.graalvm.";
- private static final String FMT = CSVUtil.buildFormatString("%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s");
-
- private static String getArgumentRegex(String arg) {
- if (arg.length() == 0) {
- return null;
- }
- try {
- Pattern.compile(arg);
- return arg;
- } catch (PatternSyntaxException e) {
- // silently ignore
- System.err.println("Invalid regex given, defaulting to \".*\" regex..");
- return null;
- }
- }
-
- public static void main(String[] args) {
- if (args.length != 1) {
- System.err.println("NodeCostDumpUtil expects exactly one argument, the node name regex to match against.");
- System.exit(-1);
- }
- final String pattern = getArgumentRegex(args[0]);
- String version = System.getProperty("java.specification.version");
- if (version.compareTo("1.9") >= 0) {
- System.err.printf("NodeCostDumpUtil does not support JDK versions greater than 1.8, current version is %s.\n", version);
- System.exit(-1);
- }
- String[] jvmciCP = System.getProperty("jvmci.class.path.append").split(File.pathSeparator);
- String[] primarySuiteCP = System.getProperty("primary.suite.cp").split(File.pathSeparator);
- ClassLoader applicationClassLoader = Thread.currentThread().getContextClassLoader();
- HashSet<Class<?>> classes = new HashSet<>();
- try {
- Set<String> uniquePaths = new HashSet<>(Arrays.asList(primarySuiteCP));
- uniquePaths.addAll(Arrays.asList(jvmciCP));
- for (String path : uniquePaths) {
- if (new File(path).exists()) {
- if (path.endsWith(".jar")) {
- try (FileSystem jarFileSystem = FileSystems.newFileSystem(URI.create("jar:file:" + path), Collections.emptyMap())) {
- initAllClasses(jarFileSystem.getPath("/"), applicationClassLoader, classes);
- }
- } else {
- initAllClasses(FileSystems.getDefault().getPath(path), applicationClassLoader, classes);
- }
- }
- }
- } catch (IOException ex) {
- GraalError.shouldNotReachHere();
- }
- System.err.printf("Loaded %d classes...\n", classes.size());
- List<Class<?>> nodeClasses = new ArrayList<>();
- for (Class<?> loaded : classes) {
- if (Node.class.isAssignableFrom(loaded) && !loaded.isArray()) {
- nodeClasses.add(loaded);
- }
- }
- System.err.printf("Loaded %s node classes...\n", nodeClasses.size());
- List<NodeClass<?>> nc = new ArrayList<>();
- for (Class<?> c : nodeClasses) {
- try {
- nc.add(NodeClass.get(c));
- } catch (Throwable t) {
- // Silently ignore problems here
- }
- }
- System.err.printf("Read TYPE field from %s node classes...\n", nc.size());
- nc = nc.stream().filter(x -> x != null).collect(Collectors.toList());
- nc.sort((x, y) -> {
- String a = x.getJavaClass().getName();
- String b = y.getJavaClass().getName();
- return a.compareTo(b);
- });
- CSVUtil.Escape.println(System.out, FMT, "NodeName", "Size", "Overrides Size Method", "Cycles", "Overrides Cycles Method", "Canonicalizable", "MemoryCheckPoint", "Virtualizable");
- for (NodeClass<?> nodeclass : nc) {
- String packageStrippedName = null;
- try {
- packageStrippedName = nodeclass.getJavaClass().getCanonicalName().replace(prefix1, "").replace(prefix2, "");
- } catch (Throwable t) {
- // do nothing
- continue;
- }
- if (pattern != null && !packageStrippedName.matches(pattern)) {
- continue;
- }
- boolean overridesSizeMethod = false;
- boolean overridesCyclesMethod = false;
- Class<?> c = nodeclass.getJavaClass();
- try {
- c.getDeclaredMethod("estimatedNodeSize");
- overridesSizeMethod = true;
- } catch (Throwable t) {
- // do nothing
- }
- try {
- c.getDeclaredMethod("estimatedNodeCycles");
- overridesCyclesMethod = true;
- } catch (Throwable t) {
- // do nothing
- }
- CSVUtil.Escape.println(System.out, FMT, packageStrippedName, nodeclass.size(), overridesSizeMethod, nodeclass.cycles(), overridesCyclesMethod, canonicalizable(c), memoryCheckPoint(c),
- virtualizable(c));
- }
- }
-
- private static boolean canonicalizable(Class<?> c) {
- return Canonicalizable.class.isAssignableFrom(c);
- }
-
- private static boolean virtualizable(Class<?> c) {
- return Virtualizable.class.isAssignableFrom(c);
- }
-
- private static boolean memoryCheckPoint(Class<?> c) {
- return MemoryCheckpoint.class.isAssignableFrom(c);
- }
-
- private static void initAllClasses(final Path root, ClassLoader classLoader, HashSet<Class<?>> classes) {
- try {
- Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
- @Override
- public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
- String className = root.relativize(file).toString();
- ClassLoader c = classLoader;
- if (className.endsWith(".class")) {
- String prefix = prefixed(className);
- if (prefix != null) {
- String stripped = stripClassName(className);
- c = new URLClassLoader(new URL[]{new File(constructURLPart(stripped, className, prefix)).toURI().toURL()}, classLoader);
- className = constructClazzPart(stripped, prefix);
- } else {
- String clazzPart = className.replace('/', '.');
- className = clazzPart.substring(0, clazzPart.length() - ".class".length());
- }
- try {
- Class<?> systemClass = Class.forName(className, false, c);
- if (systemClass.getEnclosingClass() != null) {
- try {
- classes.add(systemClass.getEnclosingClass());
- } catch (Throwable t) {
- // do nothing
- }
- }
- classes.add(systemClass);
- } catch (Throwable ignored) {
- }
- }
- return FileVisitResult.CONTINUE;
- }
- });
- } catch (IOException ex) {
- GraalError.shouldNotReachHere();
- }
- }
-
- private static String prefixed(String className) {
- if (className.contains(prefix1) && className.indexOf(prefix1) > 0) {
- return prefix1;
- } else if (className.contains(prefix2) && className.indexOf(prefix2) > 0) {
- return prefix2;
- }
- return null;
- }
-
- private static String stripClassName(String className) {
- return className.replace('/', '.');
- }
-
- private static String constructClazzPart(String stripped, String prefix) {
- String clazzPart = stripped.substring(stripped.lastIndexOf(prefix), stripped.length());
- return clazzPart.substring(0, clazzPart.length() - ".class".length());
- }
-
- private static String constructURLPart(String stripped, String className, String prefix) {
- return className.substring(0, stripped.lastIndexOf(prefix));
- }
-
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java Tue Apr 02 10:57:57 2019 +0530
@@ -48,7 +48,6 @@
import org.graalvm.compiler.api.runtime.GraalJVMCICompiler;
import org.graalvm.compiler.api.runtime.GraalRuntime;
import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.type.StampPair;
@@ -88,7 +87,6 @@
import org.graalvm.compiler.nodes.java.AccessFieldNode;
import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
import org.graalvm.compiler.nodes.spi.DelegatingReplacements;
-import org.graalvm.compiler.nodes.spi.StampProvider;
import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.OptimisticOptimizations;
@@ -112,7 +110,6 @@
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.JavaType;
import jdk.vm.ci.meta.MemoryAccessProvider;
-import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.MethodHandleAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -311,10 +308,7 @@
PEGraphDecoder graphDecoder = new PEGraphDecoder(
providers.getCodeCache().getTarget().arch,
result,
- providers.getMetaAccess(),
- providers.getConstantReflection(),
- providers.getConstantFieldProvider(),
- providers.getStampProvider(),
+ providers,
null, // loopExplosionPlugin
replacements.getGraphBuilderPlugins().getInvocationPlugins(),
new InlineInvokePlugin[0],
@@ -407,10 +401,7 @@
PEGraphDecoder graphDecoder = new PEGraphDecoder(
architecture,
result,
- providers.getMetaAccess(),
- providers.getConstantReflection(),
- providers.getConstantFieldProvider(),
- providers.getStampProvider(),
+ providers,
null,
replacements.getGraphBuilderPlugins().getInvocationPlugins(),
new InlineInvokePlugin[0],
@@ -993,17 +984,15 @@
}
@Override
- protected GraphBuilderPhase.Instance createGraphBuilder(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection,
- ConstantFieldProvider constantFieldProvider, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
- return new HotSpotSnippetGraphBuilderPhase(metaAccess, stampProvider, constantReflection, constantFieldProvider, graphBuilderConfig, optimisticOpts,
- initialIntrinsicContext);
+ protected GraphBuilderPhase.Instance createGraphBuilder(Providers providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts,
+ IntrinsicContext initialIntrinsicContext) {
+ return new HotSpotSnippetGraphBuilderPhase(providers, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
}
}
static class HotSpotSnippetGraphBuilderPhase extends GraphBuilderPhase.Instance {
- HotSpotSnippetGraphBuilderPhase(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
- GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
- super(metaAccess, stampProvider, constantReflection, constantFieldProvider, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
+ HotSpotSnippetGraphBuilderPhase(Providers theProviders, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
+ super(theProviders, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java Tue Apr 02 10:57:57 2019 +0530
@@ -416,7 +416,9 @@
if (waitingForEnd) {
waitingForEnd = false;
running = false;
- BenchmarkCounters.dump(options, getPrintStream(options), (System.nanoTime() - startTime) / 1000000000d, jvmciRuntime.collectCounters(), 100);
+ try (PrintStreamScope scope = getPrintStream(options)) {
+ BenchmarkCounters.dump(options, scope.out, (System.nanoTime() - startTime) / 1000000000d, jvmciRuntime.collectCounters(), 100);
+ }
}
break;
}
@@ -445,18 +447,19 @@
if (Options.TimedDynamicCounters.getValue(options) > 0) {
Thread thread = new Thread() {
long lastTime = System.nanoTime();
- PrintStream out = getPrintStream(options);
@Override
public void run() {
- while (true) {
- try {
- Thread.sleep(Options.TimedDynamicCounters.getValue(options));
- } catch (InterruptedException e) {
+ try (PrintStreamScope scope = getPrintStream(options)) {
+ while (true) {
+ try {
+ Thread.sleep(Options.TimedDynamicCounters.getValue(options));
+ } catch (InterruptedException e) {
+ }
+ long time = System.nanoTime();
+ dump(options, scope.out, (time - lastTime) / 1000000000d, jvmciRuntime.collectCounters(), 10);
+ lastTime = time;
}
- long time = System.nanoTime();
- dump(options, out, (time - lastTime) / 1000000000d, jvmciRuntime.collectCounters(), 10);
- lastTime = time;
}
}
};
@@ -472,22 +475,39 @@
public static void shutdown(HotSpotJVMCIRuntime jvmciRuntime, OptionValues options, long compilerStartTime) {
if (Options.GenericDynamicCounters.getValue(options)) {
- dump(options, getPrintStream(options), (System.nanoTime() - compilerStartTime) / 1000000000d, jvmciRuntime.collectCounters(), 100);
+ try (PrintStreamScope scope = getPrintStream(options)) {
+ dump(options, scope.out, (System.nanoTime() - compilerStartTime) / 1000000000d, jvmciRuntime.collectCounters(), 100);
+ }
}
}
- private static PrintStream getPrintStream(OptionValues options) {
- if (Options.BenchmarkCountersFile.getValue(options) != null) {
- try {
+ static class PrintStreamScope implements AutoCloseable {
+ final PrintStream out;
- File file = new File(Options.BenchmarkCountersFile.getValue(options));
- TTY.println("Writing benchmark counters to '%s'", file.getAbsolutePath());
- return new PrintStream(file);
- } catch (IOException e) {
- TTY.out().println(e.getMessage());
- TTY.out().println("Fallback to default");
+ PrintStreamScope(OptionValues options) {
+ PrintStream ps = TTY.out;
+ if (Options.BenchmarkCountersFile.getValue(options) != null) {
+ try {
+ File file = new File(Options.BenchmarkCountersFile.getValue(options));
+ TTY.println("Writing benchmark counters to '%s'", file.getAbsolutePath());
+ ps = new PrintStream(file);
+ } catch (IOException e) {
+ TTY.out().println(e.getMessage());
+ TTY.out().println("Fallback to default");
+ }
+ }
+ this.out = ps;
+ }
+
+ @Override
+ public void close() {
+ if (out != TTY.out) {
+ this.out.close();
}
}
- return TTY.out;
+ }
+
+ private static PrintStreamScope getPrintStream(OptionValues options) {
+ return new PrintStreamScope(options);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java Tue Apr 02 10:57:57 2019 +0530
@@ -28,8 +28,6 @@
import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter;
import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-import java.lang.reflect.Field;
-
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.core.common.type.StampPair;
@@ -56,6 +54,7 @@
import org.graalvm.compiler.nodes.memory.address.AddressNode;
import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
import org.graalvm.compiler.nodes.util.ConstantFoldUtil;
+import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
import org.graalvm.compiler.word.Word;
import org.graalvm.compiler.word.WordOperationPlugin;
import jdk.internal.vm.compiler.word.LocationIdentity;
@@ -83,6 +82,7 @@
* </ul>
*/
public final class HotSpotNodePlugin implements NodePlugin, TypePlugin {
+ private static final Unsafe UNSAFE = GraalUnsafeAccess.getUnsafe();
protected final WordOperationPlugin wordOperationPlugin;
private final GraalHotSpotVMConfig config;
private final HotSpotWordTypes wordTypes;
@@ -243,21 +243,5 @@
}
private static final LocationIdentity JAVA_THREAD_SHOULD_POST_ON_EXCEPTIONS_FLAG_LOCATION = NamedLocationIdentity.mutable("JavaThread::_should_post_on_exceptions_flag");
- static final Unsafe UNSAFE = initUnsafe();
+}
- static Unsafe initUnsafe() {
- try {
- // Fast path when we are trusted.
- return Unsafe.getUnsafe();
- } catch (SecurityException se) {
- // Slow path when we are not trusted.
- try {
- Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
- theUnsafe.setAccessible(true);
- return (Unsafe) theUnsafe.get(Unsafe.class);
- } catch (Exception e) {
- throw new RuntimeException("exception while trying to get Unsafe", e);
- }
- }
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotObjdumpDisassemblerProvider.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.hotspot.meta;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.graalvm.compiler.code.CompilationResult;
+import org.graalvm.compiler.code.CompilationResult.CodeAnnotation;
+import org.graalvm.compiler.code.DisassemblerProvider;
+import org.graalvm.compiler.serviceprovider.ServiceProvider;
+
+import jdk.vm.ci.code.CodeCacheProvider;
+import jdk.vm.ci.code.CodeUtil;
+import jdk.vm.ci.code.CodeUtil.DefaultRefMapFormatter;
+import jdk.vm.ci.code.CodeUtil.RefMapFormatter;
+import jdk.vm.ci.code.InstalledCode;
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterConfig;
+import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.code.site.Call;
+import jdk.vm.ci.code.site.DataPatch;
+import jdk.vm.ci.code.site.Infopoint;
+import jdk.vm.ci.code.site.Mark;
+import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
+import jdk.vm.ci.services.Services;
+
+/**
+ * This disassembles the code immediatly with objdump.
+ */
+@ServiceProvider(DisassemblerProvider.class)
+public class HotSpotObjdumpDisassemblerProvider extends HotSpotDisassemblerProvider {
+
+ /**
+ * Uses objdump to disassemble the compiled code.
+ */
+ @Override
+ public String disassembleCompiledCode(CodeCacheProvider codeCache, CompilationResult compResult) {
+ File tmp = null;
+ try {
+ tmp = File.createTempFile("compiledBinary", ".bin");
+ try (FileOutputStream fos = new FileOutputStream(tmp)) {
+ fos.write(compResult.getTargetCode());
+ }
+ String[] cmdline;
+ String arch = Services.getSavedProperties().get("os.arch");
+ if (arch.equals("amd64")) {
+ cmdline = new String[]{"objdump", "-D", "-b", "binary", "-M", "x86-64", "-m", "i386", tmp.getAbsolutePath()};
+ } else if (arch.equals("aarch64")) {
+ cmdline = new String[]{"objdump", "-D", "-b", "binary", "-m", "aarch64", tmp.getAbsolutePath()};
+ } else {
+ return null;
+ }
+
+ Pattern p = Pattern.compile(" *(([0-9a-fA-F]+):\t.*)");
+
+ TargetDescription target = codeCache.getTarget();
+ RegisterConfig regConfig = codeCache.getRegisterConfig();
+ Register fp = regConfig.getFrameRegister();
+ RefMapFormatter slotFormatter = new DefaultRefMapFormatter(target.wordSize, fp, 0);
+
+ Map<Integer, String> annotations = new HashMap<>();
+ for (DataPatch site : compResult.getDataPatches()) {
+ putAnnotation(annotations, site.pcOffset, "{" + site.reference.toString() + "}");
+ }
+ for (Mark mark : compResult.getMarks()) {
+ putAnnotation(annotations, mark.pcOffset, codeCache.getMarkName(mark));
+ }
+ for (CodeAnnotation a : compResult.getCodeAnnotations()) {
+ putAnnotation(annotations, a.position, a.toString());
+ }
+ for (Infopoint infopoint : compResult.getInfopoints()) {
+ if (infopoint instanceof Call) {
+ Call call = (Call) infopoint;
+ if (call.debugInfo != null) {
+ putAnnotation(annotations, call.pcOffset + call.size, CodeUtil.append(new StringBuilder(100), call.debugInfo, slotFormatter).toString());
+ }
+ putAnnotation(annotations, call.pcOffset, "{" + codeCache.getTargetName(call) + "}");
+ } else {
+ if (infopoint.debugInfo != null) {
+ putAnnotation(annotations, infopoint.pcOffset, CodeUtil.append(new StringBuilder(100), infopoint.debugInfo, slotFormatter).toString());
+ }
+ putAnnotation(annotations, infopoint.pcOffset, "{infopoint: " + infopoint.reason + "}");
+ }
+ }
+
+ Process proc = Runtime.getRuntime().exec(cmdline);
+ InputStream is = proc.getInputStream();
+
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr);
+ String line;
+
+ StringBuilder sb = new StringBuilder();
+ while ((line = br.readLine()) != null) {
+ Matcher m = p.matcher(line);
+ if (m.find()) {
+ int address = Integer.parseInt(m.group(2), 16);
+ String annotation = annotations.get(address);
+ if (annotation != null) {
+ annotation = annotation.replace("\n", "\n; ");
+ sb.append("; ").append(annotation).append('\n');
+ }
+ line = m.replaceAll("0x$1");
+ }
+ sb.append(line).append("\n");
+ }
+ BufferedReader ebr = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
+ while ((line = ebr.readLine()) != null) {
+ System.err.println(line);
+ }
+ ebr.close();
+ return sb.toString();
+ } catch (IOException e) {
+ if (tmp != null) {
+ tmp.delete();
+ }
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ private static void putAnnotation(Map<Integer, String> annotations, int idx, String txt) {
+ String newAnnoation = annotations.getOrDefault(idx, "") + "\n" + txt;
+ annotations.put(idx, newAnnoation);
+ }
+
+ @Override
+ public String disassembleInstalledCode(CodeCacheProvider codeCache, CompilationResult compResult, InstalledCode code) {
+ return ((HotSpotCodeCacheProvider) codeCache).disassemble(code);
+ }
+
+ @Override
+ public String getName() {
+ return "hsdis-objdump";
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java Tue Apr 02 10:57:57 2019 +0530
@@ -142,8 +142,7 @@
StructuredGraph targetGraph = new StructuredGraph.Builder(graph.getOptions(), graph.getDebug(), AllowAssumptions.YES).method(graph.method()).trackNodeSourcePosition(
graph.trackNodeSourcePosition()).build();
- SimplifyingGraphDecoder graphDecoder = new SimplifyingGraphDecoder(runtime.getTarget().arch, targetGraph, context.getMetaAccess(), context.getConstantReflection(),
- context.getConstantFieldProvider(), context.getStampProvider(), !ImmutableCode.getValue(graph.getOptions()));
+ SimplifyingGraphDecoder graphDecoder = new SimplifyingGraphDecoder(runtime.getTarget().arch, targetGraph, context, !ImmutableCode.getValue(graph.getOptions()));
graphDecoder.decode(encodedGraph);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java Tue Apr 02 10:57:57 2019 +0530
@@ -44,17 +44,21 @@
public class AheadOfTimeVerificationPhase extends VerifyPhase<PhaseContext> {
@Override
- protected boolean verify(StructuredGraph graph, PhaseContext context) {
+ protected void verify(StructuredGraph graph, PhaseContext context) {
for (ConstantNode node : getConstantNodes(graph)) {
if (isIllegalObjectConstant(node)) {
throw new VerificationError("illegal object constant: " + node);
}
}
- return true;
}
public static boolean isIllegalObjectConstant(ConstantNode node) {
- return isObject(node) && !isNullReference(node) && !isInternedString(node) && !isDirectMethodHandle(node) && !isBoundMethodHandle(node);
+ return isObject(node) &&
+ !isNullReference(node) &&
+ !isInternedString(node) &&
+ !isDirectMethodHandle(node) &&
+ !isBoundMethodHandle(node) &&
+ !isVarHandle(node);
}
private static boolean isObject(ConstantNode node) {
@@ -79,6 +83,14 @@
return StampTool.typeOrNull(node).getName().startsWith("Ljava/lang/invoke/BoundMethodHandle");
}
+ private static boolean isVarHandle(ConstantNode node) {
+ if (!isObject(node)) {
+ return false;
+ }
+ String name = StampTool.typeOrNull(node).getName();
+ return name.equals("Ljava/lang/invoke/VarHandle$AccessDescriptor;");
+ }
+
private static boolean isInternedString(ConstantNode node) {
if (!isObject(node)) {
return false;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java Tue Apr 02 10:57:57 2019 +0530
@@ -420,6 +420,8 @@
import org.graalvm.compiler.nodes.java.RegisterFinalizerNode;
import org.graalvm.compiler.nodes.java.StoreFieldNode;
import org.graalvm.compiler.nodes.java.StoreIndexedNode;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
+import org.graalvm.compiler.nodes.spi.Replacements;
import org.graalvm.compiler.nodes.spi.StampProvider;
import org.graalvm.compiler.nodes.type.StampTool;
import org.graalvm.compiler.nodes.util.GraphUtil;
@@ -714,10 +716,7 @@
this.debug = graph.getDebug();
this.graphBuilderConfig = graphBuilderInstance.graphBuilderConfig;
this.optimisticOpts = graphBuilderInstance.optimisticOpts;
- this.metaAccess = graphBuilderInstance.metaAccess;
- this.stampProvider = graphBuilderInstance.stampProvider;
- this.constantReflection = graphBuilderInstance.constantReflection;
- this.constantFieldProvider = graphBuilderInstance.constantFieldProvider;
+ this.providers = graphBuilderInstance.providers;
this.stream = new BytecodeStream(code.getCode());
this.profilingInfo = graph.useProfilingInfo() ? code.getProfilingInfo() : null;
this.constantPool = code.getConstantPool();
@@ -778,7 +777,7 @@
@SuppressWarnings("try")
protected void buildRootMethod() {
- FrameStateBuilder startFrameState = new FrameStateBuilder(this, code, graph);
+ FrameStateBuilder startFrameState = new FrameStateBuilder(this, code, graph, graphBuilderConfig.retainLocalVariables());
startFrameState.initializeForMethodStart(graph.getAssumptions(), graphBuilderConfig.eagerResolving() || intrinsicContext != null, graphBuilderConfig.getPlugins());
try (IntrinsicScope s = intrinsicContext != null ? new IntrinsicScope(this) : null) {
@@ -1121,7 +1120,7 @@
AbstractBeginNode dispatchBegin;
if (exceptionObject == null) {
- ExceptionObjectNode newExceptionObject = graph.add(new ExceptionObjectNode(metaAccess));
+ ExceptionObjectNode newExceptionObject = graph.add(new ExceptionObjectNode(getMetaAccess()));
dispatchBegin = newExceptionObject;
dispatchState.push(JavaKind.Object, dispatchBegin);
dispatchState.setRethrowException(true);
@@ -1166,7 +1165,7 @@
}
protected ValueNode genLoadIndexed(ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind kind) {
- return LoadIndexedNode.create(graph.getAssumptions(), array, index, boundsCheck, kind, metaAccess, constantReflection);
+ return LoadIndexedNode.create(graph.getAssumptions(), array, index, boundsCheck, kind, getMetaAccess(), getConstantReflection());
}
protected void genStoreIndexed(ValueNode array, ValueNode index, GuardingNode boundsCheck, GuardingNode storeCheck, JavaKind kind, ValueNode value) {
@@ -1242,7 +1241,7 @@
}
protected ValueNode genNormalizeCompare(ValueNode x, ValueNode y, boolean isUnorderedLess) {
- return NormalizeCompareNode.create(x, y, isUnorderedLess, JavaKind.Int, constantReflection);
+ return NormalizeCompareNode.create(x, y, isUnorderedLess, JavaKind.Int, getConstantReflection());
}
protected ValueNode genFloatConvert(FloatConvert op, ValueNode input) {
@@ -1273,15 +1272,15 @@
}
protected LogicNode genObjectEquals(ValueNode x, ValueNode y) {
- return ObjectEqualsNode.create(constantReflection, metaAccess, options, x, y, NodeView.DEFAULT);
+ return ObjectEqualsNode.create(getConstantReflection(), getMetaAccess(), options, x, y, NodeView.DEFAULT);
}
protected LogicNode genIntegerEquals(ValueNode x, ValueNode y) {
- return IntegerEqualsNode.create(constantReflection, metaAccess, options, null, x, y, NodeView.DEFAULT);
+ return IntegerEqualsNode.create(getConstantReflection(), getMetaAccess(), options, null, x, y, NodeView.DEFAULT);
}
protected LogicNode genIntegerLessThan(ValueNode x, ValueNode y) {
- return IntegerLessThanNode.create(constantReflection, metaAccess, options, null, x, y, NodeView.DEFAULT);
+ return IntegerLessThanNode.create(getConstantReflection(), getMetaAccess(), options, null, x, y, NodeView.DEFAULT);
}
protected ValueNode genUnique(ValueNode x) {
@@ -1372,7 +1371,7 @@
return null;
}
ValueNode length = append(genArrayLength(receiver));
- LogicNode condition = genUnique(IntegerBelowNode.create(constantReflection, metaAccess, options, null, index, length, NodeView.DEFAULT));
+ LogicNode condition = genUnique(IntegerBelowNode.create(getConstantReflection(), getMetaAccess(), options, null, index, length, NodeView.DEFAULT));
return emitBytecodeExceptionCheck(condition, true, BytecodeExceptionKind.OUT_OF_BOUNDS, index, length);
}
@@ -1380,8 +1379,8 @@
if (elementKind != JavaKind.Object || StampTool.isPointerAlwaysNull(value) || !needsExplicitStoreCheckException(array, value)) {
return null;
}
- ValueNode arrayClass = genUnique(LoadHubNode.create(array, stampProvider, metaAccess, constantReflection));
- ValueNode componentHub = append(LoadArrayComponentHubNode.create(arrayClass, stampProvider, metaAccess, constantReflection));
+ ValueNode arrayClass = genUnique(LoadHubNode.create(array, getStampProvider(), getMetaAccess(), getConstantReflection()));
+ ValueNode componentHub = append(LoadArrayComponentHubNode.create(arrayClass, getStampProvider(), getMetaAccess(), getConstantReflection()));
LogicNode condition = genUnique(InstanceOfDynamicNode.create(graph.getAssumptions(), getConstantReflection(), componentHub, value, true));
return emitBytecodeExceptionCheck(condition, true, BytecodeExceptionKind.ARRAY_STORE, value);
}
@@ -1391,7 +1390,7 @@
return null;
}
ConstantNode zero = ConstantNode.defaultForKind(y.getStackKind(), graph);
- LogicNode condition = genUnique(IntegerEqualsNode.create(constantReflection, metaAccess, options, null, y, zero, NodeView.DEFAULT));
+ LogicNode condition = genUnique(IntegerEqualsNode.create(getConstantReflection(), getMetaAccess(), options, null, y, zero, NodeView.DEFAULT));
return emitBytecodeExceptionCheck(condition, false, BytecodeExceptionKind.DIVISION_BY_ZERO);
}
@@ -1400,7 +1399,7 @@
return null;
}
- BytecodeExceptionNode exception = graph.add(new BytecodeExceptionNode(metaAccess, exceptionKind, arguments));
+ BytecodeExceptionNode exception = graph.add(new BytecodeExceptionNode(getMetaAccess(), exceptionKind, arguments));
AbstractBeginNode passingSuccessor = graph.add(new BeginNode());
FixedNode trueSuccessor = passingOnTrue ? passingSuccessor : exception;
@@ -1416,7 +1415,7 @@
}
protected ValueNode genArrayLength(ValueNode x) {
- return ArrayLengthNode.create(x, constantReflection);
+ return ArrayLengthNode.create(x, getConstantReflection());
}
protected void genStoreField(ValueNode receiver, ResolvedJavaField field, ValueNode value) {
@@ -1567,7 +1566,7 @@
FrameState stateBefore = createCurrentFrameState();
appendixNode = invokeDynamicPlugin.genAppendixNode(this, cpi, opcode, appendix, stateBefore);
} else {
- appendixNode = ConstantNode.forConstant(appendix, metaAccess, graph);
+ appendixNode = ConstantNode.forConstant(appendix, getMetaAccess(), graph);
}
frameState.push(JavaKind.Object, appendixNode);
@@ -1629,10 +1628,7 @@
protected final ProfilingInfo profilingInfo;
protected final OptimisticOptimizations optimisticOpts;
protected final ConstantPool constantPool;
- protected final MetaAccessProvider metaAccess;
- private final ConstantReflectionProvider constantReflection;
- private final ConstantFieldProvider constantFieldProvider;
- private final StampProvider stampProvider;
+ protected final CoreProviders providers;
protected final IntrinsicContext intrinsicContext;
@Override
@@ -1954,7 +1950,7 @@
}
String error(String format, Object... a) {
- return String.format(format, a) + String.format("%n\tplugin at %s", plugin.getApplySourceLocation(metaAccess));
+ return String.format(format, a) + String.format("%n\tplugin at %s", plugin.getApplySourceLocation(getMetaAccess()));
}
boolean check(boolean pluginResult) {
@@ -2039,11 +2035,12 @@
Mark mark = graph.getMark();
FixedWithNextNode currentLastInstr = lastInstr;
ValueNode nonNullReceiver = pluginReceiver.get();
- Stamp methodStamp = stampProvider.createMethodStamp();
- LoadHubNode hub = graph.unique(new LoadHubNode(stampProvider, nonNullReceiver));
+ Stamp methodStamp = getStampProvider().createMethodStamp();
+ LoadHubNode hub = graph.unique(new LoadHubNode(getStampProvider(), nonNullReceiver));
LoadMethodNode actual = append(new LoadMethodNode(methodStamp, targetMethod, receiverType, method.getDeclaringClass(), hub));
ConstantNode expected = graph.unique(ConstantNode.forConstant(methodStamp, targetMethod.getEncoding(), getMetaAccess()));
- LogicNode compare = graph.addOrUniqueWithInputs(CompareNode.createCompareNode(constantReflection, metaAccess, options, null, CanonicalCondition.EQ, actual, expected, NodeView.DEFAULT));
+ LogicNode compare = graph.addOrUniqueWithInputs(
+ CompareNode.createCompareNode(getConstantReflection(), getMetaAccess(), options, null, CanonicalCondition.EQ, actual, expected, NodeView.DEFAULT));
JavaTypeProfile profile = null;
if (profilingInfo != null && this.optimisticOpts.useTypeCheckHints(getOptions())) {
@@ -2321,7 +2318,7 @@
}
return false;
}
- if (canInlinePartialIntrinsicExit() && InlinePartialIntrinsicExitDuringParsing.getValue(options) && !IS_BUILDING_NATIVE_IMAGE) {
+ if (canInlinePartialIntrinsicExit()) {
// Otherwise inline the original method. Any frame state created
// during the inlining will exclude frame(s) in the
// intrinsic method (see FrameStateBuilder.create(int bci)).
@@ -2384,7 +2381,7 @@
* intrinsic) can be inlined.
*/
protected boolean canInlinePartialIntrinsicExit() {
- return true;
+ return InlinePartialIntrinsicExitDuringParsing.getValue(options) && !IS_BUILDING_NATIVE_IMAGE && method.getAnnotation(Snippet.class) == null;
}
private void printInlining(ResolvedJavaMethod targetMethod, ResolvedJavaMethod inlinedMethod, boolean success, String msg) {
@@ -2446,7 +2443,7 @@
try (IntrinsicScope s = calleeIntrinsicContext != null && !parsingIntrinsic() ? new IntrinsicScope(this, targetMethod.getSignature().toParameterKinds(!targetMethod.isStatic()), args) : null) {
BytecodeParser parser = graphBuilderInstance.createBytecodeParser(graph, this, targetMethod, INVOCATION_ENTRY_BCI, calleeIntrinsicContext);
- FrameStateBuilder startFrameState = new FrameStateBuilder(parser, parser.code, graph);
+ FrameStateBuilder startFrameState = new FrameStateBuilder(parser, parser.code, graph, graphBuilderConfig.retainLocalVariables());
if (!targetMethod.isStatic()) {
args[0] = nullCheckedValue(args[0]);
}
@@ -2679,7 +2676,7 @@
JsrScope scope = currentBlock.getJsrScope();
int retAddress = scope.nextReturnAddress();
ConstantNode returnBciNode = getJsrConstant(retAddress);
- LogicNode guard = IntegerEqualsNode.create(constantReflection, metaAccess, options, null, local, returnBciNode, NodeView.DEFAULT);
+ LogicNode guard = IntegerEqualsNode.create(getConstantReflection(), getMetaAccess(), options, null, local, returnBciNode, NodeView.DEFAULT);
guard = graph.addOrUniqueWithInputs(guard);
append(new FixedGuardNode(guard, JavaSubroutineMismatch, InvalidateReprofile));
if (!successor.getJsrScope().equals(scope.pop())) {
@@ -2731,7 +2728,7 @@
protected ConstantNode appendConstant(JavaConstant constant) {
assert constant != null;
- return ConstantNode.forConstant(constant, metaAccess, graph);
+ return ConstantNode.forConstant(constant, getMetaAccess(), graph);
}
@Override
@@ -3602,12 +3599,17 @@
@Override
public StampProvider getStampProvider() {
- return stampProvider;
+ return providers.getStampProvider();
}
@Override
public MetaAccessProvider getMetaAccess() {
- return metaAccess;
+ return providers.getMetaAccess();
+ }
+
+ @Override
+ public Replacements getReplacements() {
+ return providers.getReplacements();
}
@Override
@@ -3623,12 +3625,12 @@
@Override
public ConstantReflectionProvider getConstantReflection() {
- return constantReflection;
+ return providers.getConstantReflection();
}
@Override
public ConstantFieldProvider getConstantFieldProvider() {
- return constantFieldProvider;
+ return providers.getConstantFieldProvider();
}
/**
@@ -3753,7 +3755,7 @@
private JavaKind refineComponentType(ValueNode array, JavaKind kind) {
if (kind == JavaKind.Byte) {
- JavaType type = array.stamp(NodeView.DEFAULT).javaType(metaAccess);
+ JavaType type = array.stamp(NodeView.DEFAULT).javaType(getMetaAccess());
if (type.isArray()) {
JavaType componentType = type.getComponentType();
if (componentType != null) {
@@ -4308,7 +4310,7 @@
}
private void genNewPrimitiveArray(int typeCode) {
- ResolvedJavaType elementType = metaAccess.lookupJavaType(arrayTypeCodeToClass(typeCode));
+ ResolvedJavaType elementType = getMetaAccess().lookupJavaType(arrayTypeCodeToClass(typeCode));
ValueNode length = frameState.pop(JavaKind.Int);
for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
@@ -4492,7 +4494,7 @@
@Override
public AbstractBeginNode genExplicitExceptionEdge(BytecodeExceptionKind exceptionKind) {
- BytecodeExceptionNode exceptionNode = graph.add(new BytecodeExceptionNode(metaAccess, exceptionKind));
+ BytecodeExceptionNode exceptionNode = graph.add(new BytecodeExceptionNode(getMetaAccess(), exceptionKind));
exceptionNode.setStateAfter(createFrameState(bci(), exceptionNode));
AbstractBeginNode exceptionDispatch = handleException(exceptionNode, bci(), false);
exceptionNode.setNext(exceptionDispatch);
@@ -5113,3 +5115,4 @@
return n == 0 ? "" : format("%" + n + "s", "");
}
}
+
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java Tue Apr 02 10:57:57 2019 +0530
@@ -118,17 +118,18 @@
* @param graph the target graph of Graal nodes created by the builder
*/
public FrameStateBuilder(GraphBuilderTool tool, ResolvedJavaMethod method, StructuredGraph graph) {
- this(tool, new ResolvedJavaMethodBytecode(method), graph);
+ this(tool, new ResolvedJavaMethodBytecode(method), graph, false);
}
/**
* Creates a new frame state builder for the given code attribute, method and the given target
- * graph.
+ * graph. Additionally specifies if nonLiveLocals should be retained.
*
* @param code the bytecode in which the frame exists
* @param graph the target graph of Graal nodes created by the builder
+ * @param shouldRetainLocalVariables specifies if nonLiveLocals should be retained in state.
*/
- public FrameStateBuilder(GraphBuilderTool tool, Bytecode code, StructuredGraph graph) {
+ public FrameStateBuilder(GraphBuilderTool tool, Bytecode code, StructuredGraph graph, boolean shouldRetainLocalVariables) {
this.tool = tool;
if (tool instanceof BytecodeParser) {
this.parser = (BytecodeParser) tool;
@@ -144,7 +145,7 @@
this.monitorIds = EMPTY_MONITOR_ARRAY;
this.graph = graph;
- this.clearNonLiveLocals = GraalOptions.OptClearNonLiveLocals.getValue(graph.getOptions());
+ this.clearNonLiveLocals = GraalOptions.OptClearNonLiveLocals.getValue(graph.getOptions()) && !shouldRetainLocalVariables;
this.canVerifyKind = true;
}
@@ -630,12 +631,12 @@
public void clearNonLiveLocals(BciBlock block, LocalLiveness liveness, boolean liveIn) {
/*
- * (lstadler) if somebody is tempted to remove/disable this clearing code: it's possible to
- * remove it for normal compilations, but not for OSR compilations - otherwise dead object
- * slots at the OSR entry aren't cleared. it is also not enough to rely on PiNodes with
- * Kind.Illegal, because the conflicting branch might not have been parsed.
+ * Non-live local clearing is mandatory for the entry block of an OSR compilation so that
+ * dead object slots at the OSR entry are cleared. It's not sufficient to rely on PiNodes
+ * with Kind.Illegal, because the conflicting branch might not have been parsed.
*/
- if (!clearNonLiveLocals) {
+ boolean isOSREntryBlock = graph.isOSR() && getMethod().equals(graph.method()) && graph.getEntryBCI() == block.startBci;
+ if (!clearNonLiveLocals && !isOSREntryBlock) {
return;
}
if (liveIn) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/GraphBuilderPhase.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/GraphBuilderPhase.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,17 +24,14 @@
package org.graalvm.compiler.java;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.spi.StampProvider;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
import org.graalvm.compiler.phases.BasePhase;
import org.graalvm.compiler.phases.OptimisticOptimizations;
import org.graalvm.compiler.phases.tiers.HighTierContext;
-import jdk.vm.ci.meta.ConstantReflectionProvider;
-import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaMethod;
/**
@@ -55,8 +52,7 @@
@Override
protected void run(StructuredGraph graph, HighTierContext context) {
- new Instance(context.getMetaAccess(), context.getStampProvider(), context.getConstantReflection(), context.getConstantFieldProvider(), graphBuilderConfig, context.getOptimisticOptimizations(),
- null).run(graph);
+ new Instance(context, graphBuilderConfig, context.getOptimisticOptimizations(), null).run(graph);
}
public GraphBuilderConfiguration getGraphBuilderConfig() {
@@ -66,22 +62,15 @@
// Fully qualified name is a workaround for JDK-8056066
public static class Instance extends org.graalvm.compiler.phases.Phase {
- protected final MetaAccessProvider metaAccess;
- protected final StampProvider stampProvider;
- protected final ConstantReflectionProvider constantReflection;
- protected final ConstantFieldProvider constantFieldProvider;
+ protected final CoreProviders providers;
protected final GraphBuilderConfiguration graphBuilderConfig;
protected final OptimisticOptimizations optimisticOpts;
private final IntrinsicContext initialIntrinsicContext;
- public Instance(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
- GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
+ public Instance(CoreProviders providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
this.graphBuilderConfig = graphBuilderConfig;
this.optimisticOpts = optimisticOpts;
- this.metaAccess = metaAccess;
- this.stampProvider = stampProvider;
- this.constantReflection = constantReflection;
- this.constantFieldProvider = constantFieldProvider;
+ this.providers = providers;
this.initialIntrinsicContext = initialIntrinsicContext;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticLIRGeneratorTool.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,10 +24,8 @@
package org.graalvm.compiler.lir.aarch64;
-import org.graalvm.compiler.lir.Variable;
import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.vm.ci.aarch64.AArch64Kind;
import jdk.vm.ci.meta.Value;
/**
@@ -53,6 +51,4 @@
}
Value emitRound(Value value, RoundingMode mode);
-
- void emitCompareOp(AArch64Kind cmpKind, Variable left, Value right);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java Tue Apr 02 10:57:57 2019 +0530
@@ -215,7 +215,7 @@
* Offset might not fit into a 28-bit immediate, generate an indirect call with a
* 64-bit immediate address which is fixed up by HotSpot.
*/
- masm.movNativeAddress(scratch, 0L);
+ masm.movNativeAddress(scratch, 0L, true);
masm.blr(scratch);
}
} else {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,22 +24,21 @@
package org.graalvm.compiler.lir.aarch64;
+import static jdk.vm.ci.code.ValueUtil.asRegister;
+import static jdk.vm.ci.code.ValueUtil.isRegister;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
-import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.vm.ci.code.ValueUtil.isRegister;
-import org.graalvm.compiler.core.common.NumUtil;
import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+import org.graalvm.compiler.core.common.NumUtil;
import org.graalvm.compiler.core.common.calc.Condition;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.lir.LIRInstructionClass;
import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import jdk.vm.ci.aarch64.AArch64Kind;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.Value;
@@ -53,8 +52,7 @@
public CompareOp(Value x, Value y) {
super(TYPE);
- assert ((AArch64Kind) x.getPlatformKind()).isInteger() && ((AArch64Kind) y.getPlatformKind()).isInteger();
- assert x.getPlatformKind() == y.getPlatformKind();
+ assert x.getPlatformKind() == y.getPlatformKind() : x.getPlatformKind() + " " + y.getPlatformKind();
this.x = x;
this.y = y;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,22 +24,24 @@
package org.graalvm.compiler.lir.aarch64;
+import static jdk.vm.ci.aarch64.AArch64.lr;
import static jdk.vm.ci.code.ValueUtil.asAllocatableValue;
import static jdk.vm.ci.code.ValueUtil.asRegister;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
+import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
import java.util.function.Function;
import jdk.vm.ci.meta.AllocatableValue;
import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.core.common.NumUtil;
import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag;
import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ExtendType;
import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
import org.graalvm.compiler.code.CompilationResult.JumpTable;
import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.core.common.NumUtil;
import org.graalvm.compiler.core.common.calc.Condition;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.lir.ConstantValue;
@@ -47,6 +49,7 @@
import org.graalvm.compiler.lir.LabelRef;
import org.graalvm.compiler.lir.Opcode;
import org.graalvm.compiler.lir.StandardOp;
+import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
import org.graalvm.compiler.lir.SwitchStrategy;
import org.graalvm.compiler.lir.SwitchStrategy.BaseSwitchClosure;
import org.graalvm.compiler.lir.Variable;
@@ -59,6 +62,21 @@
import jdk.vm.ci.meta.Value;
public class AArch64ControlFlow {
+ public static final class ReturnOp extends AArch64BlockEndOp implements BlockEndOp {
+ public static final LIRInstructionClass<ReturnOp> TYPE = LIRInstructionClass.create(ReturnOp.class);
+ @Use({REG, ILLEGAL}) protected Value x;
+
+ public ReturnOp(Value x) {
+ super(TYPE);
+ this.x = x;
+ }
+
+ @Override
+ protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+ crb.frameContext.leave(crb);
+ masm.ret(lr);
+ }
+ }
public abstract static class AbstractBranchOp extends AArch64BlockEndOp implements StandardOp.BranchOp {
private final LabelRef trueDestination;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64MathIntrinsicBinaryOp.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.lir.aarch64;
+
+import static jdk.vm.ci.aarch64.AArch64.v0;
+import static jdk.vm.ci.aarch64.AArch64.v1;
+
+import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.Variable;
+import org.graalvm.compiler.lir.gen.LIRGenerator;
+
+import jdk.vm.ci.aarch64.AArch64;
+import jdk.vm.ci.aarch64.AArch64Kind;
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterValue;
+import jdk.vm.ci.meta.Value;
+
+public abstract class AArch64MathIntrinsicBinaryOp extends AArch64LIRInstruction {
+
+ @Def protected Value output;
+ @Use protected Value input0;
+ @Use protected Value input1;
+ @Temp protected Value[] temps;
+
+ public AArch64MathIntrinsicBinaryOp(LIRInstructionClass<? extends AArch64LIRInstruction> type, Register... registers) {
+ super(type);
+ input0 = v0.asValue(LIRKind.value(AArch64Kind.V64_WORD));
+ input1 = v0.asValue(LIRKind.value(AArch64Kind.V64_WORD));
+ output = v0.asValue(LIRKind.value(AArch64Kind.V64_WORD));
+
+ temps = registersToValues(registers);
+ }
+
+ protected static Value[] registersToValues(Register[] registers) {
+ Value[] temps = new Value[registers.length];
+ for (int i = 0; i < registers.length; i++) {
+ Register register = registers[i];
+ if (AArch64.CPU.equals(register.getRegisterCategory())) {
+ temps[i] = register.asValue(LIRKind.value(AArch64Kind.V64_WORD));
+ } else if (AArch64.SIMD.equals(register.getRegisterCategory())) {
+ temps[i] = register.asValue(LIRKind.value(AArch64Kind.V64_WORD));
+ } else {
+ throw GraalError.shouldNotReachHere("Unsupported register type in math stubs.");
+ }
+ }
+ return temps;
+ }
+
+ public final Variable emitLIRWrapper(LIRGenerator gen, Value x, Value y) {
+ LIRKind kind = LIRKind.combine(x, y);
+ RegisterValue v0value = v0.asValue(kind);
+ gen.emitMove(v0value, x);
+ RegisterValue v1value = v1.asValue(kind);
+ gen.emitMove(v1value, y);
+ gen.append(this);
+ Variable result = gen.newVariable(kind);
+ gen.emitMove(result, v0value);
+ return result;
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java Tue Apr 02 10:57:57 2019 +0530
@@ -31,18 +31,25 @@
import static jdk.vm.ci.code.ValueUtil.asStackSlot;
import static jdk.vm.ci.code.ValueUtil.isRegister;
import static jdk.vm.ci.code.ValueUtil.isStackSlot;
+import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
+import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
+import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED;
import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
+import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.asm.aarch64.AArch64Address;
+import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
+import org.graalvm.compiler.core.common.CompressEncoding;
import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.core.common.spi.LIRKindTool;
import org.graalvm.compiler.core.common.type.DataPointerConstant;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.lir.LIRFrameState;
@@ -54,6 +61,7 @@
import org.graalvm.compiler.lir.StandardOp.ValueMoveOp;
import org.graalvm.compiler.lir.VirtualStackSlot;
import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import org.graalvm.compiler.options.OptionValues;
import jdk.vm.ci.aarch64.AArch64Kind;
import jdk.vm.ci.code.MemoryBarriers;
@@ -507,10 +515,14 @@
break;
case Object:
if (input.isNull()) {
- masm.mov(dst, 0);
+ if (crb.mustReplaceWithNullRegister(input)) {
+ masm.mov(64, dst, crb.nullRegister);
+ } else {
+ masm.mov(dst, 0);
+ }
} else if (crb.target.inlineObjects) {
crb.recordInlineDataInCode(input);
- masm.movNativeAddress(dst, 0xDEADDEADDEADDEADL);
+ masm.mov(dst, 0xDEADDEADDEADDEADL, true);
} else {
masm.ldr(64, dst, (AArch64Address) crb.recordDataReferenceInCode(input, 8));
}
@@ -561,4 +573,131 @@
return masm.makeAddress(sp, displacement, scratchReg, transferSize, /* allowOverwrite */false);
}
+ public abstract static class PointerCompressionOp extends AArch64LIRInstruction {
+
+ @Def({REG, HINT}) private AllocatableValue result;
+ @Use({REG, CONST}) private Value input;
+ @Alive({REG, ILLEGAL, UNINITIALIZED}) private AllocatableValue baseRegister;
+
+ protected final CompressEncoding encoding;
+ protected final boolean nonNull;
+ protected final LIRKindTool lirKindTool;
+
+ protected PointerCompressionOp(LIRInstructionClass<? extends PointerCompressionOp> type, AllocatableValue result, Value input,
+ AllocatableValue baseRegister, CompressEncoding encoding, boolean nonNull, LIRKindTool lirKindTool) {
+
+ super(type);
+ this.result = result;
+ this.input = input;
+ this.baseRegister = baseRegister;
+ this.encoding = encoding;
+ this.nonNull = nonNull;
+ this.lirKindTool = lirKindTool;
+ }
+
+ public static boolean hasBase(OptionValues options, CompressEncoding encoding) {
+ return GeneratePIC.getValue(options) || encoding.hasBase();
+ }
+
+ public final Value getInput() {
+ return input;
+ }
+
+ public final AllocatableValue getResult() {
+ return result;
+ }
+
+ protected final Register getResultRegister() {
+ return asRegister(result);
+ }
+
+ protected final Register getBaseRegister(CompilationResultBuilder crb) {
+ return hasBase(crb.getOptions(), encoding) ? asRegister(baseRegister) : Register.None;
+ }
+
+ protected final int getShift() {
+ return encoding.getShift();
+ }
+
+ protected final void move(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+ AArch64Move.move(crb, masm, result, input);
+ }
+ }
+
+ public static class CompressPointerOp extends PointerCompressionOp {
+ public static final LIRInstructionClass<CompressPointerOp> TYPE = LIRInstructionClass.create(CompressPointerOp.class);
+
+ public CompressPointerOp(AllocatableValue result, Value input, AllocatableValue baseRegister, CompressEncoding encoding, boolean nonNull, LIRKindTool lirKindTool) {
+ this(TYPE, result, input, baseRegister, encoding, nonNull, lirKindTool);
+ }
+
+ private CompressPointerOp(LIRInstructionClass<? extends PointerCompressionOp> type, AllocatableValue result, Value input,
+ AllocatableValue baseRegister, CompressEncoding encoding, boolean nonNull, LIRKindTool lirKindTool) {
+
+ super(type, result, input, baseRegister, encoding, nonNull, lirKindTool);
+ }
+
+ @Override
+ protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+ Register resultRegister = getResultRegister();
+ Register ptr = asRegister(getInput());
+ Register base = getBaseRegister(crb);
+ // result = (ptr - base) >> shift
+ if (!encoding.hasBase()) {
+ if (encoding.hasShift()) {
+ masm.lshr(64, resultRegister, ptr, encoding.getShift());
+ } else {
+ masm.movx(resultRegister, ptr);
+ }
+ } else if (nonNull) {
+ masm.sub(64, resultRegister, ptr, base);
+ if (encoding.hasShift()) {
+ masm.lshr(64, resultRegister, resultRegister, encoding.getShift());
+ }
+ } else {
+ // if ptr is null it still has to be null after compression
+ masm.cmp(64, ptr, 0);
+ masm.cmov(64, resultRegister, ptr, base, AArch64Assembler.ConditionFlag.NE);
+ masm.sub(64, resultRegister, resultRegister, base);
+ if (encoding.hasShift()) {
+ masm.lshr(64, resultRegister, resultRegister, encoding.getShift());
+ }
+ }
+ }
+ }
+
+ public static class UncompressPointerOp extends PointerCompressionOp {
+ public static final LIRInstructionClass<UncompressPointerOp> TYPE = LIRInstructionClass.create(UncompressPointerOp.class);
+
+ public UncompressPointerOp(AllocatableValue result, Value input, AllocatableValue baseRegister, CompressEncoding encoding, boolean nonNull, LIRKindTool lirKindTool) {
+ this(TYPE, result, input, baseRegister, encoding, nonNull, lirKindTool);
+ }
+
+ private UncompressPointerOp(LIRInstructionClass<? extends PointerCompressionOp> type, AllocatableValue result, Value input,
+ AllocatableValue baseRegister, CompressEncoding encoding, boolean nonNull, LIRKindTool lirKindTool) {
+ super(type, result, input, baseRegister, encoding, nonNull, lirKindTool);
+ }
+
+ @Override
+ protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+ Register inputRegister = asRegister(getInput());
+ Register resultRegister = getResultRegister();
+ Register base = encoding.hasBase() ? getBaseRegister(crb) : null;
+
+ // result = base + (ptr << shift)
+ if (nonNull || base == null) {
+ masm.add(64, resultRegister, base == null ? zr : base, inputRegister, AArch64Assembler.ShiftType.LSL, encoding.getShift());
+ } else {
+ // if ptr is null it has to be null after decompression
+ Label done = new Label();
+ if (!resultRegister.equals(inputRegister)) {
+ masm.mov(32, resultRegister, inputRegister);
+ }
+ masm.cbz(32, resultRegister, done);
+ masm.add(64, resultRegister, base, resultRegister, AArch64Assembler.ShiftType.LSL, encoding.getShift());
+ masm.bind(done);
+ }
+ }
+ }
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArrayIndexOfOp.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArrayIndexOfOp.java Tue Apr 02 10:57:57 2019 +0530
@@ -655,3 +655,4 @@
return ((AMD64) tool.target().arch).getFeatures().contains(cpuFeature);
}
}
+
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java Tue Apr 02 10:57:57 2019 +0530
@@ -137,6 +137,11 @@
opcode.emit(masm, size, asRegister(result), (AMD64Address) crb.asAddress(input));
}
}
+
+ public AMD64RMOp getOpcode() {
+ return opcode;
+ }
+
}
/**
@@ -263,6 +268,11 @@
}
return false;
}
+
+ public AMD64RMOp getOpcode() {
+ return opcode;
+ }
+
}
/**
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java Tue Apr 02 10:57:57 2019 +0530
@@ -131,6 +131,10 @@
protected boolean shouldAnnotate() {
return false;
}
+
+ public AMD64MIOp getOpcode() {
+ return opcode;
+ }
}
/**
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java Tue Apr 02 10:57:57 2019 +0530
@@ -46,6 +46,7 @@
import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
import org.graalvm.compiler.core.common.spi.LIRKindTool;
import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.debug.DebugCloseable;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.debug.TTY;
import org.graalvm.compiler.graph.NodeSourcePosition;
@@ -386,6 +387,24 @@
return blockScope;
}
+ private final class MatchScope implements DebugCloseable {
+
+ private MatchScope(AbstractBlockBase<?> block) {
+ currentBlock = block;
+ }
+
+ @Override
+ public void close() {
+ currentBlock = null;
+ }
+
+ }
+
+ public final DebugCloseable getMatchScope(AbstractBlockBase<?> block) {
+ MatchScope matchScope = new MatchScope(block);
+ return matchScope;
+ }
+
@Override
public void emitIncomingValues(Value[] params) {
((LabelOp) res.getLIR().getLIRforBlock(getCurrentBlock()).get(0)).setIncomingValues(params);
@@ -457,7 +476,8 @@
double minDensity = 1 / Math.sqrt(strategy.getAverageEffort());
Optional<Hasher> hasher = hasherFor(keyConstants, minDensity);
double hashTableSwitchDensity = hasher.map(h -> keyCount / (double) h.cardinality()).orElse(0d);
- long valueRange = keyConstants[keyCount - 1].asLong() - keyConstants[0].asLong() + 1;
+ // The value range computation below may overflow, so compute it as a long.
+ long valueRange = (long) keyConstants[keyCount - 1].asInt() - (long) keyConstants[0].asInt() + 1;
double tableSwitchDensity = keyCount / (double) valueRange;
/*
@@ -479,7 +499,7 @@
targets[i] = defaultTarget;
}
for (int i = 0; i < keyCount; i++) {
- int idx = h.hash(keyConstants[i].asLong());
+ int idx = h.hash(keyConstants[i].asInt());
keys[idx] = keyConstants[i];
targets[idx] = keyTargets[i];
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java Tue Apr 02 10:57:57 2019 +0530
@@ -269,11 +269,6 @@
Variable emitArrayEquals(JavaKind kind, Value array1, Value array2, Value length, int constantLength, boolean directPointers);
@SuppressWarnings("unused")
- default ForeignCallLinkage lookupArrayEqualsStub(JavaKind kind, int constantLength) {
- return null;
- }
-
- @SuppressWarnings("unused")
default Variable emitArrayEquals(JavaKind kind1, JavaKind kind2, Value array1, Value array2, Value length, int constantLength, boolean directPointers) {
throw GraalError.unimplemented("Array.equals with different types substitution is not implemented on this architecture");
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/HashFunction.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/HashFunction.java Tue Apr 02 10:57:57 2019 +0530
@@ -49,7 +49,7 @@
* @param min {@code value} is guaranteed to be greater or equal to this minimum
* @return the hash value within int range
*/
- public abstract int apply(long value, long min);
+ public abstract int apply(int value, int min);
/**
* Generates LIR that implements the hash function in terms of value and min.
@@ -109,25 +109,25 @@
(gen, prime) -> (val, min) -> gen.emitShr(gen.emitMul(val, prime, false), min));
addWithPrimes("rotateRight(val, prime)", 3,
- prime -> (val, min) -> Long.rotateRight(val, prime),
+ prime -> (val, min) -> Integer.rotateRight(val, prime),
(gen, prime) -> (val, min) -> gen.emitRor(val, prime));
addWithPrimes("rotateRight(val, prime) + val", 4,
- prime -> (val, min) -> Long.rotateRight(val, prime) + val,
+ prime -> (val, min) -> Integer.rotateRight(val, prime) + val,
(gen, prime) -> (val, min) -> gen.emitAdd(gen.emitRor(val, prime), val, false));
addWithPrimes("rotateRight(val, prime) ^ val", 4,
- prime -> (val, min) -> Long.rotateRight(val, prime) ^ val,
+ prime -> (val, min) -> Integer.rotateRight(val, prime) ^ val,
(gen, prime) -> (val, min) -> gen.emitXor(gen.emitRor(val, prime), val));
//@formatter:on
}
- private static void add(String toString, int effort, BiFunction<Long, Long, Long> f, Function<ArithmeticLIRGenerator, BiFunction<Value, Value, Value>> gen) {
+ private static void add(String toString, int effort, BiFunction<Integer, Integer, Integer> f, Function<ArithmeticLIRGenerator, BiFunction<Value, Value, Value>> gen) {
instances.add(new HashFunction() {
@Override
- public int apply(long value, long min) {
- return f.apply(value, min).intValue();
+ public int apply(int value, int min) {
+ return f.apply(value, min);
}
@Override
@@ -147,7 +147,7 @@
});
}
- private static void addWithPrimes(String toString, int effort, Function<Integer, BiFunction<Long, Long, Long>> f,
+ private static void addWithPrimes(String toString, int effort, Function<Integer, BiFunction<Integer, Integer, Integer>> f,
BiFunction<ArithmeticLIRGenerator, Value, BiFunction<Value, Value, Value>> gen) {
for (int p : mersennePrimes) {
add(toString, effort, f.apply(p), g -> gen.apply(g, g.getLIRGen().emitJavaConstant(JavaConstant.forInt(p))));
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/Hasher.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/Hasher.java Tue Apr 02 10:57:57 2019 +0530
@@ -30,6 +30,7 @@
import java.util.Set;
import java.util.TreeSet;
+import jdk.vm.ci.meta.JavaKind;
import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator;
import jdk.vm.ci.meta.JavaConstant;
@@ -51,11 +52,12 @@
* @return an optional hasher
*/
public static Optional<Hasher> forKeys(JavaConstant[] keys, double minDensity) {
+ assert checkKeyKind(keys);
if (keys.length <= 2) {
return Optional.empty();
} else {
int maxCardinality = (int) Math.round(keys.length / minDensity);
- assertSorted(keys);
+ assert checkIfSorted(keys);
TreeSet<Hasher> candidates = new TreeSet<>(new Comparator<Hasher>() {
@Override
public int compare(Hasher o1, Hasher o2) {
@@ -67,7 +69,7 @@
}
}
});
- long min = keys[0].asLong();
+ int min = keys[0].asInt();
for (HashFunction f : HashFunction.instances()) {
for (int cardinality = keys.length; cardinality < maxCardinality; cardinality++) {
if (isValid(keys, min, f, cardinality)) {
@@ -84,16 +86,28 @@
}
}
- private static void assertSorted(JavaConstant[] keys) {
- for (int i = 1; i < keys.length; i++) {
- assert keys[i - 1].asLong() < keys[i].asLong();
+ private static boolean checkKeyKind(JavaConstant[] keys) {
+ for (int i = 0; i < keys.length; i++) {
+ if (keys[i].getJavaKind() != JavaKind.Int) {
+ throw new AssertionError(String.format("Key at index %d is not an int: %s", i, keys[i]));
+ }
}
+ return true;
}
- private static boolean isValid(JavaConstant[] keys, long min, HashFunction function, int cardinality) {
+ private static boolean checkIfSorted(JavaConstant[] keys) {
+ for (int i = 1; i < keys.length; i++) {
+ if (keys[i - 1].asInt() >= keys[i].asInt()) {
+ throw new AssertionError("Keys array is not sorted");
+ }
+ }
+ return true;
+ }
+
+ private static boolean isValid(JavaConstant[] keys, int min, HashFunction function, int cardinality) {
Set<Integer> seen = new HashSet<>(keys.length);
for (JavaConstant key : keys) {
- int hash = function.apply(key.asLong(), min) & (cardinality - 1);
+ int hash = function.apply(key.asInt(), min) & (cardinality - 1);
if (!seen.add(hash)) {
return false;
}
@@ -103,9 +117,9 @@
private final HashFunction function;
private final int cardinality;
- private final long min;
+ private final int min;
- private Hasher(HashFunction function, int cardinality, long min) {
+ private Hasher(HashFunction function, int cardinality, int min) {
this.function = function;
this.cardinality = cardinality;
this.min = min;
@@ -117,7 +131,7 @@
* @param value the value to be hashed
* @return the hash value
*/
- public int hash(long value) {
+ public int hash(int value) {
return function.apply(value, min) & (cardinality - 1);
}
@@ -129,7 +143,7 @@
* @return the hashed lir value
*/
public Value hash(Value value, ArithmeticLIRGenerator gen) {
- Value h = function.gen(value, gen.getLIRGen().emitJavaConstant(JavaConstant.forLong(min)), gen);
+ Value h = function.gen(value, gen.getLIRGen().emitJavaConstant(JavaConstant.forInt(min)), gen);
return gen.emitAnd(h, gen.getLIRGen().emitJavaConstant(JavaConstant.forInt(cardinality - 1)));
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java Tue Apr 02 10:57:57 2019 +0530
@@ -44,7 +44,7 @@
import org.graalvm.compiler.nodes.java.ArrayLengthNode;
import org.graalvm.compiler.nodes.java.LoadFieldNode;
import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.spi.StampProvider;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
import org.graalvm.compiler.nodes.util.GraphUtil;
import org.graalvm.compiler.options.OptionValues;
@@ -61,10 +61,7 @@
*/
public class SimplifyingGraphDecoder extends GraphDecoder {
- protected final MetaAccessProvider metaAccess;
- protected final ConstantReflectionProvider constantReflection;
- protected final ConstantFieldProvider constantFieldProvider;
- protected final StampProvider stampProvider;
+ protected final CoreProviders providers;
protected final boolean canonicalizeReads;
protected final CanonicalizerTool canonicalizerTool;
@@ -85,17 +82,17 @@
@Override
public MetaAccessProvider getMetaAccess() {
- return metaAccess;
+ return providers.getMetaAccess();
}
@Override
public ConstantReflectionProvider getConstantReflection() {
- return constantReflection;
+ return providers.getConstantReflection();
}
@Override
public ConstantFieldProvider getConstantFieldProvider() {
- return constantFieldProvider;
+ return providers.getConstantFieldProvider();
}
@Override
@@ -135,14 +132,9 @@
}
}
- public SimplifyingGraphDecoder(Architecture architecture, StructuredGraph graph, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection,
- ConstantFieldProvider constantFieldProvider, StampProvider stampProvider,
- boolean canonicalizeReads) {
+ public SimplifyingGraphDecoder(Architecture architecture, StructuredGraph graph, CoreProviders providers, boolean canonicalizeReads) {
super(architecture, graph);
- this.metaAccess = metaAccess;
- this.constantReflection = constantReflection;
- this.constantFieldProvider = constantFieldProvider;
- this.stampProvider = stampProvider;
+ this.providers = providers;
this.canonicalizeReads = canonicalizeReads;
this.canonicalizerTool = new PECanonicalizerTool(graph.getAssumptions(), graph.getOptions());
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,8 @@
package org.graalvm.compiler.nodes.extended;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.graph.NodeClass;
import org.graalvm.compiler.nodeinfo.NodeInfo;
import org.graalvm.compiler.nodes.StateSplit;
@@ -72,4 +74,9 @@
public boolean isCompressible() {
return compressible;
}
+
+ @Override
+ public Stamp getAccessStamp() {
+ return StampFactory.forKind(writeKind);
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java Tue Apr 02 10:57:57 2019 +0530
@@ -201,6 +201,7 @@
private final List<ResolvedJavaType> skippedExceptionTypes;
private final boolean insertFullInfopoints;
private final boolean trackNodeSourcePosition;
+ private final boolean retainLocalVariables;
private final Plugins plugins;
public enum BytecodeExceptionMode {
@@ -229,6 +230,7 @@
boolean omitAssertions,
boolean insertFullInfopoints,
boolean trackNodeSourcePosition,
+ boolean retainLocalVariables,
List<ResolvedJavaType> skippedExceptionTypes,
Plugins plugins) {
this.eagerResolving = eagerResolving;
@@ -237,6 +239,7 @@
this.omitAssertions = omitAssertions;
this.insertFullInfopoints = insertFullInfopoints;
this.trackNodeSourcePosition = trackNodeSourcePosition;
+ this.retainLocalVariables = retainLocalVariables;
this.skippedExceptionTypes = skippedExceptionTypes;
this.plugins = plugins;
}
@@ -255,6 +258,7 @@
omitAssertions,
insertFullInfopoints,
trackNodeSourcePosition,
+ retainLocalVariables,
skippedExceptionTypes,
newPlugins);
return result;
@@ -274,6 +278,7 @@
omitAssertions,
insertFullInfopoints,
trackNodeSourcePosition,
+ retainLocalVariables,
skippedExceptionTypes,
plugins);
}
@@ -286,6 +291,7 @@
omitAssertions,
insertFullInfopoints,
trackNodeSourcePosition,
+ retainLocalVariables,
skippedExceptionTypes,
plugins);
}
@@ -298,6 +304,7 @@
omitAssertions,
insertFullInfopoints,
trackNodeSourcePosition,
+ retainLocalVariables,
Collections.unmodifiableList(Arrays.asList(newSkippedExceptionTypes)),
plugins);
}
@@ -309,6 +316,7 @@
omitAssertions,
insertFullInfopoints,
trackNodeSourcePosition,
+ retainLocalVariables,
skippedExceptionTypes,
plugins);
}
@@ -321,6 +329,7 @@
newOmitAssertions,
insertFullInfopoints,
trackNodeSourcePosition,
+ retainLocalVariables,
skippedExceptionTypes,
plugins);
}
@@ -333,6 +342,7 @@
omitAssertions,
newInsertFullInfopoints,
trackNodeSourcePosition,
+ retainLocalVariables,
skippedExceptionTypes,
plugins);
}
@@ -345,6 +355,20 @@
omitAssertions,
insertFullInfopoints,
newTrackNodeSourcePosition,
+ retainLocalVariables,
+ skippedExceptionTypes,
+ plugins);
+ }
+
+ public GraphBuilderConfiguration withRetainLocalVariables(boolean newRetainLocalVariables) {
+ return new GraphBuilderConfiguration(
+ eagerResolving,
+ unresolvedIsError,
+ bytecodeExceptionMode,
+ omitAssertions,
+ insertFullInfopoints,
+ trackNodeSourcePosition,
+ newRetainLocalVariables,
skippedExceptionTypes,
plugins);
}
@@ -369,6 +393,10 @@
return trackNodeSourcePosition;
}
+ public boolean retainLocalVariables() {
+ return retainLocalVariables;
+ }
+
public boolean insertFullInfopoints() {
return insertFullInfopoints;
}
@@ -381,6 +409,7 @@
/* omitAssertions: */ false,
/* insertFullInfopoints: */ false,
/* trackNodeSourcePosition: */ false,
+ /* retainLocalVariables */ false,
Collections.emptyList(),
plugins);
}
@@ -393,6 +422,7 @@
/* omitAssertions: */ false,
/* insertFullInfopoints: */ false,
/* trackNodeSourcePosition: */ false,
+ /* retainLocalVariables */ false,
Collections.emptyList(),
plugins);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java Tue Apr 02 10:57:57 2019 +0530
@@ -28,6 +28,7 @@
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.Replacements;
import org.graalvm.compiler.nodes.spi.StampProvider;
import org.graalvm.compiler.options.OptionValues;
@@ -52,6 +53,8 @@
MetaAccessProvider getMetaAccess();
+ Replacements getReplacements();
+
default Assumptions getAssumptions() {
return getGraph().getAssumptions();
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java Tue Apr 02 10:57:57 2019 +0530
@@ -243,3 +243,4 @@
return false;
}
}
+
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java Tue Apr 02 10:57:57 2019 +0530
@@ -27,6 +27,7 @@
import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeClass;
@@ -90,4 +91,6 @@
updateUsages(lastLocationAccess, newLla);
lastLocationAccess = newLla;
}
+
+ public abstract Stamp getAccessStamp();
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProviders.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.nodes.spi;
+
+import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
+
+import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.MetaAccessProvider;
+
+public interface CoreProviders {
+
+ MetaAccessProvider getMetaAccess();
+
+ ConstantReflectionProvider getConstantReflection();
+
+ ConstantFieldProvider getConstantFieldProvider();
+
+ LoweringProvider getLowerer();
+
+ Replacements getReplacements();
+
+ StampProvider getStampProvider();
+
+ ForeignCallsProvider getForeignCalls();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/CoreProvidersImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.nodes.spi;
+
+import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
+
+import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.MetaAccessProvider;
+
+public class CoreProvidersImpl implements CoreProviders {
+ protected final MetaAccessProvider metaAccess;
+ protected final ConstantReflectionProvider constantReflection;
+ protected final ConstantFieldProvider constantFieldProvider;
+ protected final LoweringProvider lowerer;
+ protected final Replacements replacements;
+ protected final StampProvider stampProvider;
+ protected final ForeignCallsProvider foreignCalls;
+
+ protected CoreProvidersImpl(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, LoweringProvider lowerer,
+ Replacements replacements, StampProvider stampProvider, ForeignCallsProvider foreignCalls) {
+ this.metaAccess = metaAccess;
+ this.constantReflection = constantReflection;
+ this.constantFieldProvider = constantFieldProvider;
+ this.lowerer = lowerer;
+ this.replacements = replacements;
+ this.stampProvider = stampProvider;
+ this.foreignCalls = foreignCalls;
+ }
+
+ @Override
+ public MetaAccessProvider getMetaAccess() {
+ return metaAccess;
+ }
+
+ @Override
+ public ConstantReflectionProvider getConstantReflection() {
+ return constantReflection;
+ }
+
+ @Override
+ public ConstantFieldProvider getConstantFieldProvider() {
+ return constantFieldProvider;
+ }
+
+ @Override
+ public LoweringProvider getLowerer() {
+ return lowerer;
+ }
+
+ @Override
+ public Replacements getReplacements() {
+ return replacements;
+ }
+
+ @Override
+ public StampProvider getStampProvider() {
+ return stampProvider;
+ }
+
+ @Override
+ public ForeignCallsProvider getForeignCalls() {
+ return foreignCalls;
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringTool.java Tue Apr 02 10:57:57 2019 +0530
@@ -40,6 +40,8 @@
public interface LoweringTool {
+ CoreProviders getProviders();
+
MetaAccessProvider getMetaAccess();
LoweringProvider getLowerer();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
import java.util.List;
import org.graalvm.compiler.core.common.cfg.BlockMap;
+import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeSourcePosition;
@@ -96,4 +97,11 @@
}
void emitReadExceptionObject(ValueNode node);
+
+ @SuppressWarnings("unused")
+ default ForeignCallLinkage lookupGraalStub(ValueNode valueNode) {
+ return null;
+ }
+
+ void matchBlock(Block b, StructuredGraph graph, StructuredGraph.ScheduleResult blockMap);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,8 @@
import jdk.internal.vm.compiler.collections.EconomicMap;
import jdk.internal.vm.compiler.collections.MapCursor;
+import jdk.vm.ci.services.Services;
+
/**
* This class contains methods for parsing Graal options and matching them against a set of
* {@link OptionDescriptors}. The {@link OptionDescriptors} are loaded via a {@link ServiceLoader}.
@@ -51,7 +53,7 @@
if (IS_IN_NATIVE_IMAGE || cachedOptionDescriptors != null) {
return cachedOptionDescriptors;
}
- boolean java8OrEarlier = System.getProperty("java.specification.version").compareTo("1.9") < 0;
+ boolean java8OrEarlier = Services.getSavedProperties().get("java.specification.version").compareTo("1.9") < 0;
ClassLoader loader;
if (java8OrEarlier) {
// On JDK 8, Graal and its extensions are loaded by same class loader.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java Tue Apr 02 10:57:57 2019 +0530
@@ -38,6 +38,7 @@
import java.util.List;
import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.debug.DebugCloseable;
import org.graalvm.compiler.debug.GraalError;
@@ -68,6 +69,7 @@
import org.graalvm.compiler.nodes.extended.GuardedNode;
import org.graalvm.compiler.nodes.extended.GuardingNode;
import org.graalvm.compiler.nodes.memory.MemoryCheckpoint;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
import org.graalvm.compiler.nodes.spi.Lowerable;
import org.graalvm.compiler.nodes.spi.LoweringProvider;
import org.graalvm.compiler.nodes.spi.LoweringTool;
@@ -144,6 +146,11 @@
}
@Override
+ public CoreProviders getProviders() {
+ return context;
+ }
+
+ @Override
public ConstantReflectionProvider getConstantReflection() {
return context.getConstantReflection();
}
@@ -168,6 +175,10 @@
return context.getReplacements();
}
+ public ForeignCallsProvider getForeignCalls() {
+ return context.getForeignCalls();
+ }
+
@Override
public AnchoringNode getCurrentGuardAnchor() {
return guardAnchor;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,6 +69,8 @@
import org.graalvm.compiler.phases.Phase;
import org.graalvm.compiler.phases.schedule.SchedulePhase;
+import jdk.vm.ci.services.Services;
+
/**
* This phase add counters for the dynamically executed number of nodes. Incrementing the counter
* for each node would be too costly, so this phase takes the compromise that it trusts split
@@ -87,9 +89,17 @@
private static final String GROUP_NAME_WITHOUT = "~profiled weight (invoke-free sections)";
private static final String GROUP_NAME_INVOKES = "~profiled invokes";
- private static final boolean WITH_SECTION_HEADER = Boolean.parseBoolean(System.getProperty("ProfileCompiledMethodsPhase.WITH_SECTION_HEADER", "false"));
- private static final boolean WITH_INVOKE_FREE_SECTIONS = Boolean.parseBoolean(System.getProperty("ProfileCompiledMethodsPhase.WITH_FREE_SECTIONS", "false"));
- private static final boolean WITH_INVOKES = Boolean.parseBoolean(System.getProperty("ProfileCompiledMethodsPhase.WITH_INVOKES", "true"));
+ private static String getProperty(String name, String def) {
+ String value = Services.getSavedProperties().get(name);
+ if (value == null) {
+ return def;
+ }
+ return value;
+ }
+
+ private static final boolean WITH_SECTION_HEADER = Boolean.parseBoolean(getProperty("ProfileCompiledMethodsPhase.WITH_SECTION_HEADER", "false"));
+ private static final boolean WITH_INVOKE_FREE_SECTIONS = Boolean.parseBoolean(getProperty("ProfileCompiledMethodsPhase.WITH_FREE_SECTIONS", "false"));
+ private static final boolean WITH_INVOKES = Boolean.parseBoolean(getProperty("ProfileCompiledMethodsPhase.WITH_INVOKES", "true"));
@Override
protected void run(StructuredGraph graph) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java Tue Apr 02 10:57:57 2019 +0530
@@ -154,6 +154,8 @@
return "it is marked non-inlinable";
} else if (countRecursiveInlining(method) > MaximumRecursiveInlining.getValue(options)) {
return "it exceeds the maximum recursive inlining depth";
+ } else if (!method.hasBytecodes()) {
+ return "it has no bytecodes to inline";
} else {
if (new OptimisticOptimizations(rootGraph.getProfilingInfo(method), options).lessOptimisticThan(context.getOptimisticOptimizations())) {
return "the callee uses less optimistic optimizations than caller";
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/VerifyPhase.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/VerifyPhase.java Tue Apr 02 10:57:57 2019 +0530
@@ -26,11 +26,12 @@
import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
/***
- * This phase serves as a verification, in order to check the graph for certain properties. The
- * {@link #verify(StructuredGraph, Object)} method will be used as an assertion, and implements the
- * actual check. Instead of returning false, it is also valid to throw an {@link VerificationError}
- * in the implemented {@link #verify(StructuredGraph, Object)} method.
+ * Verifies a {@linkplain #verify graph} or {@linkplain #verifyClass class} against one or more
+ * invariants.
*/
public abstract class VerifyPhase<C> extends BasePhase<C> {
@@ -55,13 +56,23 @@
@Override
protected final void run(StructuredGraph graph, C context) {
- assert verify(graph, context);
+ verify(graph, context);
}
/**
- * Performs the actual verification.
+ * Checks {@code graph} against some invariants.
*
* @throws VerificationError if the verification fails
*/
- protected abstract boolean verify(StructuredGraph graph, C context);
+ protected abstract void verify(StructuredGraph graph, C context);
+
+ /**
+ * Checks {@code clazz} against some invariants.
+ *
+ * @param clazz the class to verify
+ * @param metaAccess an object to get a {@link ResolvedJavaType} for {@code clazz}
+ * @throws VerificationError if the class violates some invariant
+ */
+ public void verifyClass(Class<?> clazz, MetaAccessProvider metaAccess) {
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/PhaseContext.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/tiers/PhaseContext.java Tue Apr 02 10:57:57 2019 +0530
@@ -25,66 +25,55 @@
package org.graalvm.compiler.phases.tiers;
import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
import org.graalvm.compiler.nodes.spi.LoweringProvider;
import org.graalvm.compiler.nodes.spi.Replacements;
import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.phases.util.Providers;
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.MetaAccessProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-public class PhaseContext {
+public class PhaseContext implements CoreProviders {
- private final MetaAccessProvider metaAccess;
- private final ConstantReflectionProvider constantReflection;
- private final ConstantFieldProvider constantFieldProvider;
- private final LoweringProvider lowerer;
- private final Replacements replacements;
- private final StampProvider stampProvider;
- private final ForeignCallsProvider foreignCalls;
+ private final CoreProviders providers;
- public PhaseContext(MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider, LoweringProvider lowerer, Replacements replacements,
- StampProvider stampProvider, ForeignCallsProvider foreignCalls) {
- this.metaAccess = metaAccess;
- this.constantReflection = constantReflection;
- this.constantFieldProvider = constantFieldProvider;
- this.lowerer = lowerer;
- this.replacements = replacements;
- this.stampProvider = stampProvider;
- this.foreignCalls = foreignCalls;
+ public PhaseContext(CoreProviders providers) {
+ this.providers = providers;
}
- public PhaseContext(Providers providers) {
- this(providers.getMetaAccess(), providers.getConstantReflection(), providers.getConstantFieldProvider(), providers.getLowerer(), providers.getReplacements(), providers.getStampProvider(),
- providers.getForeignCalls());
+ @Override
+ public MetaAccessProvider getMetaAccess() {
+ return providers.getMetaAccess();
+ }
+
+ @Override
+ public ConstantReflectionProvider getConstantReflection() {
+ return providers.getConstantReflection();
}
- public MetaAccessProvider getMetaAccess() {
- return metaAccess;
+ @Override
+ public ConstantFieldProvider getConstantFieldProvider() {
+ return providers.getConstantFieldProvider();
}
- public ConstantReflectionProvider getConstantReflection() {
- return constantReflection;
- }
-
- public ConstantFieldProvider getConstantFieldProvider() {
- return constantFieldProvider;
+ @Override
+ public LoweringProvider getLowerer() {
+ return providers.getLowerer();
}
- public LoweringProvider getLowerer() {
- return lowerer;
- }
-
+ @Override
public Replacements getReplacements() {
- return replacements;
+ return providers.getReplacements();
}
+ @Override
public StampProvider getStampProvider() {
- return stampProvider;
+ return providers.getStampProvider();
}
+ @Override
public ForeignCallsProvider getForeignCalls() {
- return foreignCalls;
+ return providers.getForeignCalls();
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/Providers.java Tue Apr 02 10:57:57 2019 +0530
@@ -27,6 +27,7 @@
import org.graalvm.compiler.core.common.spi.CodeGenProviders;
import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
+import org.graalvm.compiler.nodes.spi.CoreProvidersImpl;
import org.graalvm.compiler.nodes.spi.LoweringProvider;
import org.graalvm.compiler.nodes.spi.Replacements;
import org.graalvm.compiler.nodes.spi.StampProvider;
@@ -39,27 +40,14 @@
/**
* A set of providers, some of which may not be present (i.e., null).
*/
-public class Providers implements CodeGenProviders {
+public class Providers extends CoreProvidersImpl implements CodeGenProviders {
- private final MetaAccessProvider metaAccess;
private final CodeCacheProvider codeCache;
- private final LoweringProvider lowerer;
- private final ConstantReflectionProvider constantReflection;
- private final ConstantFieldProvider constantFieldProvider;
- private final ForeignCallsProvider foreignCalls;
- private final Replacements replacements;
- private final StampProvider stampProvider;
public Providers(MetaAccessProvider metaAccess, CodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
ForeignCallsProvider foreignCalls, LoweringProvider lowerer, Replacements replacements, StampProvider stampProvider) {
- this.metaAccess = metaAccess;
+ super(metaAccess, constantReflection, constantFieldProvider, lowerer, replacements, stampProvider, foreignCalls);
this.codeCache = codeCache;
- this.constantReflection = constantReflection;
- this.constantFieldProvider = constantFieldProvider;
- this.foreignCalls = foreignCalls;
- this.lowerer = lowerer;
- this.replacements = replacements;
- this.stampProvider = stampProvider;
}
public Providers(Providers copyFrom) {
@@ -73,41 +61,10 @@
}
@Override
- public MetaAccessProvider getMetaAccess() {
- return metaAccess;
- }
-
- @Override
public CodeCacheProvider getCodeCache() {
return codeCache;
}
- @Override
- public ForeignCallsProvider getForeignCalls() {
- return foreignCalls;
- }
-
- public LoweringProvider getLowerer() {
- return lowerer;
- }
-
- @Override
- public ConstantReflectionProvider getConstantReflection() {
- return constantReflection;
- }
-
- public ConstantFieldProvider getConstantFieldProvider() {
- return constantFieldProvider;
- }
-
- public Replacements getReplacements() {
- return replacements;
- }
-
- public StampProvider getStampProvider() {
- return stampProvider;
- }
-
public Providers copyWith(MetaAccessProvider substitution) {
assert this.getClass() == Providers.class : "must override";
return new Providers(substitution, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, stampProvider);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java Tue Apr 02 10:57:57 2019 +0530
@@ -64,6 +64,7 @@
import jdk.vm.ci.code.InstalledCode;
import jdk.vm.ci.meta.JavaMethod;
import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.services.Services;
/**
* Observes compilation events and uses {@link CFGPrinter} to produce a control flow graph for the
@@ -256,11 +257,19 @@
static {
DisassemblerProvider selected = null;
+ String arch = Services.getSavedProperties().get("os.arch");
for (DisassemblerProvider d : GraalServices.load(DisassemblerProvider.class)) {
String name = d.getName().toLowerCase();
- if (name.contains("hcf") || name.contains("hexcodefile")) {
- selected = d;
- break;
+ if (arch.equals("aarch64")) {
+ if (name.contains("hsdis-objdump")) {
+ selected = d;
+ break;
+ }
+ } else {
+ if (name.contains("hcf") || name.contains("hexcodefile")) {
+ selected = d;
+ break;
+ }
}
}
if (selected == null) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@
import jdk.vm.ci.meta.JavaMethod;
import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.services.Services;
//JaCoCo Exclude
@@ -86,7 +87,7 @@
this.printerSupplier = printerSupplier;
/* Add the JVM and Java arguments to the graph properties to help identify it. */
this.jvmArguments = jvmArguments();
- this.sunJavaCommand = System.getProperty("sun.java.command");
+ this.sunJavaCommand = Services.getSavedProperties().get("sun.java.command");
}
private static String jvmArguments() {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java Tue Apr 02 10:57:57 2019 +0530
@@ -59,14 +59,16 @@
public class AArch64GraphBuilderPlugins {
- public static void register(Plugins plugins, BytecodeProvider bytecodeProvider, boolean explicitUnsafeNullChecks) {
+ public static void register(Plugins plugins, BytecodeProvider bytecodeProvider, boolean explicitUnsafeNullChecks, boolean registerMathPlugins) {
InvocationPlugins invocationPlugins = plugins.getInvocationPlugins();
invocationPlugins.defer(new Runnable() {
@Override
public void run() {
registerIntegerLongPlugins(invocationPlugins, AArch64IntegerSubstitutions.class, JavaKind.Int, bytecodeProvider);
registerIntegerLongPlugins(invocationPlugins, AArch64LongSubstitutions.class, JavaKind.Long, bytecodeProvider);
- registerMathPlugins(invocationPlugins);
+ if (registerMathPlugins) {
+ registerMathPlugins(invocationPlugins);
+ }
registerStringLatin1Plugins(invocationPlugins, bytecodeProvider);
registerStringUTF16Plugins(invocationPlugins, bytecodeProvider);
registerUnsafePlugins(invocationPlugins, bytecodeProvider);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java Tue Apr 02 10:57:57 2019 +0530
@@ -31,6 +31,7 @@
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.graph.SourceLanguagePositionProvider;
import org.graalvm.compiler.java.GraphBuilderPhase;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.nodes.EncodedGraph;
import org.graalvm.compiler.nodes.GraphEncoder;
import org.graalvm.compiler.nodes.StructuredGraph;
@@ -44,7 +45,6 @@
import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
import org.graalvm.compiler.phases.OptimisticOptimizations;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.tiers.PhaseContext;
import org.graalvm.compiler.phases.util.Providers;
@@ -67,7 +67,7 @@
AllowAssumptions allowAssumptions, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins,
ParameterPlugin parameterPlugin,
NodePlugin[] nodePlugins, ResolvedJavaMethod callInlinedMethod, SourceLanguagePositionProvider sourceLanguagePositionProvider) {
- super(architecture, graph, providers.getMetaAccess(), providers.getConstantReflection(), providers.getConstantFieldProvider(), providers.getStampProvider(), loopExplosionPlugin,
+ super(architecture, graph, providers, loopExplosionPlugin,
invocationPlugins, inlineInvokePlugins, parameterPlugin, nodePlugins, callInlinedMethod, sourceLanguagePositionProvider);
this.providers = providers;
@@ -78,8 +78,7 @@
}
protected GraphBuilderPhase.Instance createGraphBuilderPhaseInstance(IntrinsicContext initialIntrinsicContext) {
- return new GraphBuilderPhase.Instance(providers.getMetaAccess(), providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), graphBuilderConfig,
- optimisticOpts, initialIntrinsicContext);
+ return new GraphBuilderPhase.Instance(providers, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
}
@SuppressWarnings("try")
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ConstantStringIndexOfSnippets.java Tue Apr 02 10:57:57 2019 +0530
@@ -25,6 +25,7 @@
package org.graalvm.compiler.replacements;
import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
import org.graalvm.compiler.api.replacements.Fold;
import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
@@ -44,8 +45,11 @@
import jdk.vm.ci.code.TargetDescription;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.MetaAccessProvider;
+import sun.misc.Unsafe;
public class ConstantStringIndexOfSnippets implements Snippets {
+ private static final Unsafe UNSAFE = getUnsafe();
+
public static class Templates extends AbstractTemplates {
private final SnippetInfo indexOfConstant = snippet(ConstantStringIndexOfSnippets.class, "indexOfConstant");
@@ -157,10 +161,10 @@
return 0;
}
long base = metaAccess.getArrayBaseOffset(JavaKind.Byte);
- char lastChar = UnsafeAccess.UNSAFE.getChar(target, base + (c - 1) * 2);
+ char lastChar = UNSAFE.getChar(target, base + (c - 1) * 2);
int md2 = c;
for (int i = 0; i < c - 1; i++) {
- char currChar = UnsafeAccess.UNSAFE.getChar(target, base + i * 2);
+ char currChar = UNSAFE.getChar(target, base + i * 2);
if (currChar == lastChar) {
md2 = (c - 1) - i;
}
@@ -174,7 +178,7 @@
int i;
long base = metaAccess.getArrayBaseOffset(JavaKind.Byte);
for (i = 0; i < c - 1; i++) {
- char currChar = UnsafeAccess.UNSAFE.getChar(s, base + i * 2);
+ char currChar = UNSAFE.getChar(s, base + i * 2);
cache |= (1 << (currChar & 63));
}
return cache;
@@ -212,10 +216,10 @@
int sourceEnd = sourceCount - targetCountLess1;
long base = charArrayBaseOffset(INJECTED);
- int lastChar = UnsafeAccess.UNSAFE.getChar(target, base + targetCountLess1 * 2);
+ int lastChar = UNSAFE.getChar(target, base + targetCountLess1 * 2);
outer_loop: for (long i = sourceOffset + fromIndex; i < sourceEnd;) {
- int src = UnsafeAccess.UNSAFE.getChar(source, base + (i + targetCountLess1) * 2);
+ int src = UNSAFE.getChar(source, base + (i + targetCountLess1) * 2);
if (src == lastChar) {
// With random strings and a 4-character alphabet,
// reverse matching at this point sets up 0.8% fewer
@@ -229,8 +233,8 @@
ExplodeLoopNode.explodeLoop();
}
for (long j = 0; j < targetCountLess1; j++) {
- char sourceChar = UnsafeAccess.UNSAFE.getChar(source, base + (i + j) * 2);
- if (UnsafeAccess.UNSAFE.getChar(target, base + (targetOffset + j) * 2) != sourceChar) {
+ char sourceChar = UNSAFE.getChar(source, base + (i + j) * 2);
+ if (UNSAFE.getChar(target, base + (targetOffset + j) * 2) != sourceChar) {
if ((cache & (1 << sourceChar)) == 0) {
if (md2 < j + 1) {
i += j + 1;
@@ -270,10 +274,10 @@
int sourceEnd = sourceCount - targetCountLess1;
long base = byteArrayBaseOffset(INJECTED);
- int lastChar = UnsafeAccess.UNSAFE.getChar(target, base + targetCountLess1 * 2);
+ int lastChar = UNSAFE.getChar(target, base + targetCountLess1 * 2);
outer_loop: for (long i = fromIndex; i < sourceEnd;) {
- int src = UnsafeAccess.UNSAFE.getChar(source, base + (i + targetCountLess1) * 2);
+ int src = UNSAFE.getChar(source, base + (i + targetCountLess1) * 2);
if (src == lastChar) {
// With random strings and a 4-character alphabet,
// reverse matching at this point sets up 0.8% fewer
@@ -287,8 +291,8 @@
ExplodeLoopNode.explodeLoop();
}
for (long j = 0; j < targetCountLess1; j++) {
- char sourceChar = UnsafeAccess.UNSAFE.getChar(source, base + (i + j) * 2);
- if (UnsafeAccess.UNSAFE.getChar(target, base + j * 2) != sourceChar) {
+ char sourceChar = UNSAFE.getChar(source, base + (i + j) * 2);
+ if (UNSAFE.getChar(target, base + j * 2) != sourceChar) {
if ((cache & (1 << sourceChar)) == 0) {
if (md2 < j + 1) {
i += j + 1;
@@ -328,10 +332,10 @@
int sourceEnd = sourceCount - targetCountLess1;
long base = byteArrayBaseOffset(INJECTED);
- int lastByte = UnsafeAccess.UNSAFE.getByte(target, base + targetCountLess1);
+ int lastByte = UNSAFE.getByte(target, base + targetCountLess1);
outer_loop: for (long i = fromIndex; i < sourceEnd;) {
- int src = UnsafeAccess.UNSAFE.getByte(source, base + i + targetCountLess1);
+ int src = UNSAFE.getByte(source, base + i + targetCountLess1);
if (src == lastByte) {
// With random strings and a 4-character alphabet,
// reverse matching at this point sets up 0.8% fewer
@@ -345,8 +349,8 @@
ExplodeLoopNode.explodeLoop();
}
for (long j = 0; j < targetCountLess1; j++) {
- byte sourceByte = UnsafeAccess.UNSAFE.getByte(source, base + i + j);
- if (UnsafeAccess.UNSAFE.getByte(target, base + j) != sourceByte) {
+ byte sourceByte = UNSAFE.getByte(source, base + i + j);
+ if (UNSAFE.getByte(target, base + j) != sourceByte) {
if ((cache & (1 << sourceByte)) == 0) {
if (md2 < j + 1) {
i += j + 1;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java Tue Apr 02 10:57:57 2019 +0530
@@ -68,6 +68,7 @@
import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+import org.graalvm.compiler.nodes.spi.Replacements;
import org.graalvm.compiler.nodes.spi.StampProvider;
import org.graalvm.compiler.nodes.type.StampTool;
import org.graalvm.compiler.phases.OptimisticOptimizations;
@@ -152,6 +153,11 @@
}
@Override
+ public Replacements getReplacements() {
+ return providers.getReplacements();
+ }
+
+ @Override
public StampProvider getStampProvider() {
return providers.getStampProvider();
}
@@ -355,7 +361,6 @@
public void inline(InvokeNode invoke, String reason, String phase) {
ResolvedJavaMethod method = ((MethodCallTargetNode) invoke.callTarget()).targetMethod();
- MetaAccessProvider metaAccess = providers.getMetaAccess();
Plugins plugins = new Plugins(graphBuilderPlugins);
GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
@@ -366,9 +371,7 @@
calleeGraph = new StructuredGraph.Builder(invoke.getOptions(), invoke.getDebug()).method(method).trackNodeSourcePosition(invoke.graph().trackNodeSourcePosition()).setIsSubstitution(
true).build();
IntrinsicContext initialReplacementContext = new IntrinsicContext(method, method, providers.getReplacements().getDefaultReplacementBytecodeProvider(), INLINE_AFTER_PARSING);
- GraphBuilderPhase.Instance instance = createGraphBuilderInstance(metaAccess, providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
- OptimisticOptimizations.NONE,
- initialReplacementContext);
+ GraphBuilderPhase.Instance instance = createGraphBuilderInstance(providers, config, OptimisticOptimizations.NONE, initialReplacementContext);
instance.apply(calleeGraph);
}
@@ -379,9 +382,9 @@
InliningUtil.inline(invoke, calleeGraph, false, method, reason, phase);
}
- protected GraphBuilderPhase.Instance createGraphBuilderInstance(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection,
- ConstantFieldProvider constantFieldProvider, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
- return new GraphBuilderPhase.Instance(metaAccess, stampProvider, constantReflection, constantFieldProvider, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
+ protected GraphBuilderPhase.Instance createGraphBuilderInstance(Providers theProviders, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts,
+ IntrinsicContext initialIntrinsicContext) {
+ return new GraphBuilderPhase.Instance(theProviders, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
}
protected void pushStructure(Structure structure) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java Tue Apr 02 10:57:57 2019 +0530
@@ -35,17 +35,26 @@
import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.services.Services;
public final class InlineDuringParsingPlugin implements InlineInvokePlugin {
+ private static int getInteger(String name, int def) {
+ String value = Services.getSavedProperties().get(name);
+ if (value != null) {
+ return Integer.parseInt(value);
+ }
+ return def;
+ }
+
/**
* Budget which when exceeded reduces the effective value of
* {@link BytecodeParserOptions#InlineDuringParsingMaxDepth} to
* {@link #MaxDepthAfterBudgetExceeded}.
*/
- private static final int NodeBudget = Integer.getInteger("InlineDuringParsingPlugin.NodeBudget", 2000);
+ private static final int NodeBudget = getInteger("InlineDuringParsingPlugin.NodeBudget", 2000);
- private static final int MaxDepthAfterBudgetExceeded = Integer.getInteger("InlineDuringParsingPlugin.MaxDepthAfterBudgetExceeded", 3);
+ private static final int MaxDepthAfterBudgetExceeded = getInteger("InlineDuringParsingPlugin.MaxDepthAfterBudgetExceeded", 3);
@Override
public InlineInfo shouldInlineInvoke(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java Tue Apr 02 10:57:57 2019 +0530
@@ -51,6 +51,8 @@
import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
+import org.graalvm.compiler.nodes.spi.Replacements;
import org.graalvm.compiler.nodes.spi.StampProvider;
import org.graalvm.compiler.options.OptionValues;
@@ -70,10 +72,7 @@
*/
public class IntrinsicGraphBuilder implements GraphBuilderContext, Receiver {
- protected final MetaAccessProvider metaAccess;
- protected final ConstantReflectionProvider constantReflection;
- protected final ConstantFieldProvider constantFieldProvider;
- protected final StampProvider stampProvider;
+ protected final CoreProviders providers;
protected final StructuredGraph graph;
protected final Bytecode code;
protected final ResolvedJavaMethod method;
@@ -82,17 +81,12 @@
protected ValueNode[] arguments;
protected ValueNode returnValue;
- public IntrinsicGraphBuilder(OptionValues options, DebugContext debug, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
- StampProvider stampProvider, Bytecode code, int invokeBci) {
- this(options, debug, metaAccess, constantReflection, constantFieldProvider, stampProvider, code, invokeBci, AllowAssumptions.YES);
+ public IntrinsicGraphBuilder(OptionValues options, DebugContext debug, CoreProviders providers, Bytecode code, int invokeBci) {
+ this(options, debug, providers, code, invokeBci, AllowAssumptions.YES);
}
- protected IntrinsicGraphBuilder(OptionValues options, DebugContext debug, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
- StampProvider stampProvider, Bytecode code, int invokeBci, AllowAssumptions allowAssumptions) {
- this.metaAccess = metaAccess;
- this.constantReflection = constantReflection;
- this.constantFieldProvider = constantFieldProvider;
- this.stampProvider = stampProvider;
+ protected IntrinsicGraphBuilder(OptionValues options, DebugContext debug, CoreProviders providers, Bytecode code, int invokeBci, AllowAssumptions allowAssumptions) {
+ this.providers = providers;
this.code = code;
this.method = code.getMethod();
this.graph = new StructuredGraph.Builder(options, debug, allowAssumptions).method(method).setIsSubstitution(true).trackNodeSourcePosition(true).build();
@@ -133,7 +127,9 @@
private <T extends ValueNode> void updateLastInstruction(T v) {
if (v instanceof FixedNode) {
FixedNode fixedNode = (FixedNode) v;
- lastInstr.setNext(fixedNode);
+ if (lastInstr != null) {
+ lastInstr.setNext(fixedNode);
+ }
if (fixedNode instanceof FixedWithNextNode) {
FixedWithNextNode fixedWithNextNode = (FixedWithNextNode) fixedNode;
assert fixedWithNextNode.next() == null : "cannot append instruction to instruction which isn't end";
@@ -175,22 +171,27 @@
@Override
public StampProvider getStampProvider() {
- return stampProvider;
+ return providers.getStampProvider();
}
@Override
public MetaAccessProvider getMetaAccess() {
- return metaAccess;
+ return providers.getMetaAccess();
}
@Override
public ConstantReflectionProvider getConstantReflection() {
- return constantReflection;
+ return providers.getConstantReflection();
}
@Override
public ConstantFieldProvider getConstantFieldProvider() {
- return constantFieldProvider;
+ return providers.getConstantFieldProvider();
+ }
+
+ @Override
+ public Replacements getReplacements() {
+ return providers.getReplacements();
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java Tue Apr 02 10:57:57 2019 +0530
@@ -106,6 +106,8 @@
import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
import org.graalvm.compiler.nodes.java.StoreFieldNode;
import org.graalvm.compiler.nodes.java.StoreIndexedNode;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
+import org.graalvm.compiler.nodes.spi.Replacements;
import org.graalvm.compiler.nodes.spi.StampProvider;
import org.graalvm.compiler.nodes.type.StampTool;
import org.graalvm.compiler.nodes.util.GraphUtil;
@@ -309,22 +311,27 @@
@Override
public StampProvider getStampProvider() {
- return stampProvider;
+ return providers.getStampProvider();
}
@Override
public MetaAccessProvider getMetaAccess() {
- return metaAccess;
+ return providers.getMetaAccess();
}
@Override
public ConstantReflectionProvider getConstantReflection() {
- return constantReflection;
+ return providers.getConstantReflection();
}
@Override
public ConstantFieldProvider getConstantFieldProvider() {
- return constantFieldProvider;
+ return providers.getConstantFieldProvider();
+ }
+
+ @Override
+ public Replacements getReplacements() {
+ return providers.getReplacements();
}
@Override
@@ -565,11 +572,11 @@
private final ResolvedJavaMethod callInlinedMethod;
protected final SourceLanguagePositionProvider sourceLanguagePositionProvider;
- public PEGraphDecoder(Architecture architecture, StructuredGraph graph, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
- StampProvider stampProvider, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins,
+ public PEGraphDecoder(Architecture architecture, StructuredGraph graph, CoreProviders providers, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins,
+ InlineInvokePlugin[] inlineInvokePlugins,
ParameterPlugin parameterPlugin,
NodePlugin[] nodePlugins, ResolvedJavaMethod callInlinedMethod, SourceLanguagePositionProvider sourceLanguagePositionProvider) {
- super(architecture, graph, metaAccess, constantReflection, constantFieldProvider, stampProvider, true);
+ super(architecture, graph, providers, true);
this.loopExplosionPlugin = loopExplosionPlugin;
this.invocationPlugins = invocationPlugins;
this.inlineInvokePlugins = inlineInvokePlugins;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -52,7 +52,6 @@
import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode;
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
import org.graalvm.compiler.debug.DebugCloseable;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.DebugContext.Description;
@@ -64,6 +63,7 @@
import org.graalvm.compiler.graph.NodeSourcePosition;
import org.graalvm.compiler.java.GraphBuilderPhase;
import org.graalvm.compiler.java.GraphBuilderPhase.Instance;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.nodes.CallTargetNode;
import org.graalvm.compiler.nodes.Invoke;
import org.graalvm.compiler.nodes.StateSplit;
@@ -80,14 +80,12 @@
import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.spi.StampProvider;
import org.graalvm.compiler.options.Option;
import org.graalvm.compiler.options.OptionKey;
import org.graalvm.compiler.options.OptionType;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.OptimisticOptimizations;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
import org.graalvm.compiler.phases.tiers.PhaseContext;
import org.graalvm.compiler.phases.util.Providers;
@@ -95,7 +93,6 @@
import org.graalvm.compiler.word.WordOperationPlugin;
import jdk.vm.ci.code.TargetDescription;
-import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
@@ -322,11 +319,8 @@
result = graph;
} else {
Bytecode code = new ResolvedJavaMethodBytecode(method);
- ConstantReflectionProvider constantReflection = providers.getConstantReflection();
- ConstantFieldProvider constantFieldProvider = providers.getConstantFieldProvider();
- StampProvider stampProvider = providers.getStampProvider();
try (DebugContext debug = openDebugContext("Substitution_", method)) {
- result = new IntrinsicGraphBuilder(options, debug, metaAccess, constantReflection, constantFieldProvider, stampProvider, code, invokeBci).buildGraph(plugin);
+ result = new IntrinsicGraphBuilder(options, debug, providers, code, invokeBci).buildGraph(plugin);
}
}
} else {
@@ -355,8 +349,7 @@
Plugins plugins = new Plugins(getGraphBuilderPlugins());
GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
IntrinsicContext initialReplacementContext = new IntrinsicContext(method, substMethod, bytecodeProvider, ROOT_COMPILATION);
- new GraphBuilderPhase.Instance(providers.getMetaAccess(), providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
- OptimisticOptimizations.NONE, initialReplacementContext).apply(graph);
+ new GraphBuilderPhase.Instance(providers, config, OptimisticOptimizations.NONE, initialReplacementContext).apply(graph);
assert !graph.isFrozen();
return graph;
} catch (Throwable e) {
@@ -521,8 +514,7 @@
snippetAnnotation != null ? snippetAnnotation.allowPartialIntrinsicArgumentMismatch() : true);
}
- createGraphBuilder(metaAccess, replacements.providers.getStampProvider(), replacements.providers.getConstantReflection(), replacements.providers.getConstantFieldProvider(), config,
- OptimisticOptimizations.NONE, initialIntrinsicContext).apply(graph);
+ createGraphBuilder(replacements.providers, config, OptimisticOptimizations.NONE, initialIntrinsicContext).apply(graph);
new CanonicalizerPhase().apply(graph, new PhaseContext(replacements.providers));
} catch (Throwable e) {
@@ -531,10 +523,8 @@
return graph;
}
- protected Instance createGraphBuilder(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
- GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
- return new GraphBuilderPhase.Instance(metaAccess, stampProvider, constantReflection, constantFieldProvider, graphBuilderConfig, optimisticOpts,
- initialIntrinsicContext);
+ protected Instance createGraphBuilder(Providers providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
+ return new GraphBuilderPhase.Instance(providers, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounterNode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounterNode.java Tue Apr 02 10:57:57 2019 +0530
@@ -28,7 +28,6 @@
import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
-import java.lang.reflect.Field;
import java.util.Arrays;
import org.graalvm.compiler.api.replacements.Fold;
@@ -51,6 +50,7 @@
import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
+import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
import org.graalvm.compiler.word.ObjectAccess;
import jdk.internal.vm.compiler.word.LocationIdentity;
@@ -129,6 +129,8 @@
static class SnippetCounterSnippets implements Snippets {
+ private static final Unsafe UNSAFE = GraalUnsafeAccess.getUnsafe();
+
@Fold
static int countOffset() {
try {
@@ -162,20 +164,4 @@
}
}
}
-
- private static final Unsafe UNSAFE = initUnsafe();
-
- private static Unsafe initUnsafe() {
- try {
- return Unsafe.getUnsafe();
- } catch (SecurityException se) {
- try {
- Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
- theUnsafe.setAccessible(true);
- return (Unsafe) theUnsafe.get(Unsafe.class);
- } catch (Exception e) {
- throw new RuntimeException("exception while trying to get Unsafe", e);
- }
- }
- }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java Tue Apr 02 10:57:57 2019 +0530
@@ -212,6 +212,20 @@
return false;
}
});
+ r.register1("intern", Receiver.class, new InvocationPlugin() {
+ @Override
+ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+ if (receiver.isConstant()) {
+ String s = snippetReflection.asObject(String.class, (JavaConstant) receiver.get().asConstant());
+ if (s != null) {
+ JavaConstant interned = snippetReflection.forObject(s.intern());
+ b.addPush(JavaKind.Object, b.add(ConstantNode.forConstant(interned, b.getMetaAccess(), b.getGraph())));
+ return true;
+ }
+ }
+ return false;
+ }
+ });
if (Java8OrEarlier) {
r.registerMethodSubstitution(StringSubstitutions.class, "equals", Receiver.class, Object.class);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/UnsafeAccess.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.replacements;
-
-import java.lang.reflect.Field;
-
-import sun.misc.Unsafe;
-
-/**
- * Package private access to the {@link Unsafe} capability.
- */
-class UnsafeAccess {
-
- private static final Unsafe THE_UNSAFE = initUnsafe();
-
- static final UnsafeAccess UNSAFE = new UnsafeAccess();
-
- private static Unsafe initUnsafe() {
- try {
- // Fast path when we are trusted.
- return Unsafe.getUnsafe();
- } catch (SecurityException se) {
- // Slow path when we are not trusted.
- try {
- Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
- theUnsafe.setAccessible(true);
- return (Unsafe) theUnsafe.get(Unsafe.class);
- } catch (Exception e) {
- throw new RuntimeException("exception while trying to get Unsafe", e);
- }
- }
- }
-
- public char getChar(Object target, long l) {
- return THE_UNSAFE.getChar(target, l);
- }
-
- public byte getByte(Object target, long l) {
- return THE_UNSAFE.getByte(target, l);
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java Tue Apr 02 10:57:57 2019 +0530
@@ -108,12 +108,13 @@
if (classfile == null) {
try {
ResolvedJavaType type = metaAccess.lookupJavaType(c);
- InputStream in = GraalServices.getClassfileAsStream(c);
- if (in != null) {
- DataInputStream stream = new DataInputStream(in);
- classfile = new Classfile(type, stream, this);
- classfiles.put(c, classfile);
- return classfile;
+ try (InputStream in = GraalServices.getClassfileAsStream(c)) {
+ if (in != null) {
+ DataInputStream stream = new DataInputStream(in);
+ classfile = new Classfile(type, stream, this);
+ classfiles.put(c, classfile);
+ return classfile;
+ }
}
throw new NoClassDefFoundError(c.getName());
} catch (IOException e) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToNode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToNode.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,12 @@
package org.graalvm.compiler.replacements.nodes;
+import static org.graalvm.compiler.core.common.GraalOptions.UseGraalStubs;
import static org.graalvm.compiler.nodeinfo.InputType.Memory;
import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1024;
import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1024;
+import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeClass;
@@ -117,8 +119,25 @@
@NodeIntrinsic
public static native int compareTo(Object array1, Object array2, int length1, int length2, @ConstantNodeParameter JavaKind kind1, @ConstantNodeParameter JavaKind kind2);
+ public JavaKind getKind1() {
+ return kind1;
+ }
+
+ public JavaKind getKind2() {
+ return kind2;
+ }
+
@Override
public void generate(NodeLIRBuilderTool gen) {
+ if (UseGraalStubs.getValue(graph().getOptions())) {
+ ForeignCallLinkage linkage = gen.lookupGraalStub(this);
+ if (linkage != null) {
+ Value result = gen.getLIRGeneratorTool().emitForeignCall(linkage, null, gen.operand(array1), gen.operand(array2), gen.operand(length1), gen.operand(length2));
+ gen.setResult(this, result);
+ return;
+ }
+ }
+
Value result = gen.getLIRGeneratorTool().emitArrayCompareTo(kind1, kind2, gen.operand(array1), gen.operand(array2), gen.operand(length1), gen.operand(length2));
gen.setResult(this, result);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,16 +24,15 @@
package org.graalvm.compiler.replacements.nodes;
+import static org.graalvm.compiler.core.common.GraalOptions.UseGraalStubs;
import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeClass;
import org.graalvm.compiler.graph.spi.Canonicalizable;
import org.graalvm.compiler.graph.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
import org.graalvm.compiler.nodeinfo.NodeCycles;
import org.graalvm.compiler.nodeinfo.NodeInfo;
import org.graalvm.compiler.nodeinfo.NodeSize;
@@ -51,14 +50,11 @@
import org.graalvm.compiler.nodes.spi.VirtualizerTool;
import org.graalvm.compiler.nodes.util.GraphUtil;
import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
import jdk.internal.vm.compiler.word.LocationIdentity;
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.Value;
// JaCoCo Exclude
@@ -69,13 +65,6 @@
@NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = NodeSize.SIZE_128)
public final class ArrayEqualsNode extends FixedWithNextNode implements LIRLowerable, Canonicalizable, Virtualizable, MemoryAccess {
- public static class Options {
- // @formatter:off
- @Option(help = "Use Array equals stubs instead of embedding all the emitted code.")
- public static final OptionKey<Boolean> ArrayEqualsStubs = new OptionKey<>(true);
- // @formatter:on
- }
-
public static final NodeClass<ArrayEqualsNode> TYPE = NodeClass.create(ArrayEqualsNode.class);
/** {@link JavaKind} of the arrays to compare. */
protected final JavaKind kind;
@@ -225,27 +214,30 @@
return equals(array1, array2, length, JavaKind.Double);
}
+ public ValueNode getLength() {
+ return length;
+ }
+
+ public JavaKind getKind() {
+ return kind;
+ }
+
@Override
public void generate(NodeLIRBuilderTool gen) {
- LIRGeneratorTool tool = gen.getLIRGeneratorTool();
+ if (UseGraalStubs.getValue(graph().getOptions())) {
+ ForeignCallLinkage linkage = gen.lookupGraalStub(this);
+ if (linkage != null) {
+ Value result = gen.getLIRGeneratorTool().emitForeignCall(linkage, null, gen.operand(array1), gen.operand(array2), gen.operand(length));
+ gen.setResult(this, result);
+ return;
+ }
+ }
+
int constantLength = -1;
if (length.isConstant()) {
constantLength = length.asJavaConstant().asInt();
}
-
- if (Options.ArrayEqualsStubs.getValue(graph().getOptions())) {
- ResolvedJavaMethod method = graph().method();
- if (method != null && method.getAnnotation(Snippet.class) == null) {
- ForeignCallLinkage linkage = tool.lookupArrayEqualsStub(kind, constantLength);
- if (linkage != null) {
- Value result = tool.emitForeignCall(linkage, null, gen.operand(array1), gen.operand(array2), gen.operand(length));
- gen.setResult(this, result);
- return;
- }
- }
- }
-
- Value result = tool.emitArrayEquals(kind, gen.operand(array1), gen.operand(array2), gen.operand(length), constantLength, false);
+ Value result = gen.getLIRGeneratorTool().emitArrayEquals(kind, gen.operand(array1), gen.operand(array2), gen.operand(length), constantLength, false);
gen.setResult(this, result);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsNode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsNode.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,10 @@
package org.graalvm.compiler.replacements.nodes;
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.Value;
+import static org.graalvm.compiler.core.common.GraalOptions.UseGraalStubs;
+import static org.graalvm.compiler.nodeinfo.InputType.Memory;
+
+import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.graph.NodeClass;
import org.graalvm.compiler.nodeinfo.NodeCycles;
@@ -42,7 +44,8 @@
import jdk.internal.vm.compiler.word.LocationIdentity;
import jdk.internal.vm.compiler.word.Pointer;
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.Value;
// JaCoCo Exclude
@@ -85,8 +88,29 @@
@NodeIntrinsic
public static native boolean regionEquals(Pointer array1, Pointer array2, int length, @ConstantNodeParameter JavaKind kind1, @ConstantNodeParameter JavaKind kind2);
+ public JavaKind getKind1() {
+ return kind1;
+ }
+
+ public JavaKind getKind2() {
+ return kind2;
+ }
+
+ public ValueNode getLength() {
+ return length;
+ }
+
@Override
public void generate(NodeLIRBuilderTool gen) {
+ if (UseGraalStubs.getValue(graph().getOptions())) {
+ ForeignCallLinkage linkage = gen.lookupGraalStub(this);
+ if (linkage != null) {
+ Value result = gen.getLIRGeneratorTool().emitForeignCall(linkage, null, gen.operand(array1), gen.operand(array2), gen.operand(length));
+ gen.setResult(this, result);
+ return;
+ }
+ }
+
int constantLength = -1;
if (length.isConstant()) {
constantLength = length.asJavaConstant().asInt();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java Tue Apr 02 10:57:57 2019 +0530
@@ -41,9 +41,9 @@
import org.graalvm.compiler.nodeinfo.NodeInfo;
import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.Invokable;
import org.graalvm.compiler.nodes.FixedWithNextNode;
import org.graalvm.compiler.nodes.FrameState;
+import org.graalvm.compiler.nodes.Invokable;
import org.graalvm.compiler.nodes.InvokeNode;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
@@ -58,10 +58,10 @@
import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
import org.graalvm.compiler.phases.common.inlining.InliningUtil;
import org.graalvm.compiler.phases.tiers.PhaseContext;
+import jdk.internal.vm.compiler.word.LocationIdentity;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.internal.vm.compiler.word.LocationIdentity;
/**
* Macro nodes can be used to temporarily replace an invoke. They can, for example, be used to
@@ -160,8 +160,7 @@
*/
@SuppressWarnings("try")
protected StructuredGraph lowerReplacement(final StructuredGraph replacementGraph, LoweringTool tool) {
- final PhaseContext c = new PhaseContext(tool.getMetaAccess(), tool.getConstantReflection(), tool.getConstantFieldProvider(), tool.getLowerer(), tool.getReplacements(),
- tool.getStampProvider(), null);
+ final PhaseContext c = new PhaseContext(tool.getProviders());
if (!graph().hasValueProxies()) {
new RemoveValueProxyPhase().apply(replacementGraph);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalUnsafeAccess.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.serviceprovider;
+
+import java.lang.reflect.Field;
+
+import sun.misc.Unsafe;
+
+/**
+ * Access to the {@link Unsafe} capability. Care must be taken not to leak the {@link #UNSAFE} value
+ * of out code loaded by the JVMCI class loader or encapsulated in the JVMCI or Graal modules into
+ * other code (e.g. via the Polyglot API).
+ */
+public class GraalUnsafeAccess {
+
+ private static final Unsafe UNSAFE = initUnsafe();
+
+ private static Unsafe initUnsafe() {
+ try {
+ // Fast path when we are trusted.
+ return Unsafe.getUnsafe();
+ } catch (SecurityException se) {
+ // Slow path when we are not trusted.
+ try {
+ Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
+ theUnsafe.setAccessible(true);
+ return (Unsafe) theUnsafe.get(Unsafe.class);
+ } catch (Exception e) {
+ throw new RuntimeException("exception while trying to get Unsafe", e);
+ }
+ }
+ }
+
+ /**
+ * Gets the {@link Unsafe} singleton.
+ *
+ * @throws SecurityException if a security manager is present and it denies
+ * {@link RuntimePermission}("accessUnsafe")
+ */
+ public static Unsafe getUnsafe() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new RuntimePermission("accessUnsafe"));
+ }
+ return UNSAFE;
+ }
+}
+
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JavaVersionUtil.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JavaVersionUtil.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,13 +24,15 @@
package org.graalvm.compiler.serviceprovider;
+import jdk.vm.ci.services.Services;
+
/**
* Interface to query which JDK version Graal is running on.
*/
public final class JavaVersionUtil {
private static int getJavaSpecificationVersion() {
- String value = System.getProperty("java.specification.version");
+ String value = Services.getSavedProperties().get("java.specification.version");
if (value.startsWith("1.")) {
value = value.substring(2);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java Tue Apr 02 10:57:57 2019 +0530
@@ -428,7 +428,7 @@
protected abstract class MergeProcessor {
private final Block mergeBlock;
- private final AbstractMergeNode merge;
+ protected final AbstractMergeNode merge;
protected final GraphEffectList mergeEffects;
protected final GraphEffectList afterMergeEffects;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java Tue Apr 02 10:57:57 2019 +0530
@@ -59,6 +59,7 @@
import org.graalvm.compiler.nodes.ProxyNode;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
+import org.graalvm.compiler.nodes.UnwindNode;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.ValuePhiNode;
import org.graalvm.compiler.nodes.ValueProxyNode;
@@ -105,7 +106,6 @@
* The indexes into this array correspond to {@link VirtualObjectNode#getObjectId()}.
*/
public final ArrayList<VirtualObjectNode> virtualObjects = new ArrayList<>();
- public final DebugContext debug;
@Override
public boolean needsApplyEffects() {
@@ -189,7 +189,6 @@
super(schedule, schedule.getCFG());
StructuredGraph graph = schedule.getCFG().graph;
this.hasVirtualInputs = graph.createNodeBitMap();
- this.debug = graph.getDebug();
this.tool = new VirtualizerToolImpl(metaAccess, constantReflection, constantFieldProvider, this, graph.getAssumptions(), graph.getOptions(), debug, loweringProvider);
}
@@ -687,16 +686,44 @@
// calculate the set of virtual objects that exist in all predecessors
int[] virtualObjTemp = intersectVirtualObjects(states);
+ boolean forceMaterialization = false;
+ ValueNode forcedMaterializationValue = null;
+ FrameState frameState = merge.stateAfter();
+ if (frameState != null && frameState.isExceptionHandlingBCI()) {
+ // We can not go below merges with an exception handling bci
+ // it could create allocations whose slow-path has an invalid framestate
+ forceMaterialization = true;
+ // check if we can reduce the scope of forced materialization to one phi node
+ if (frameState.stackSize() == 1 && merge.next() instanceof UnwindNode) {
+ assert frameState.outerFrameState() == null;
+ UnwindNode unwind = (UnwindNode) merge.next();
+ if (unwind.exception() == frameState.stackAt(0)) {
+ boolean nullLocals = true;
+ for (int i = 0; i < frameState.localsSize(); i++) {
+ if (frameState.localAt(i) != null) {
+ nullLocals = false;
+ break;
+ }
+ }
+ if (nullLocals) {
+ // We found that the merge is directly followed by an unwind
+ // the Framestate only has the thrown value on the stack and no locals
+ forcedMaterializationValue = unwind.exception();
+ }
+ }
+ }
+ }
+
boolean materialized;
do {
materialized = false;
- if (PartialEscapeBlockState.identicalObjectStates(states)) {
+ if (!forceMaterialization && PartialEscapeBlockState.identicalObjectStates(states)) {
newState.adoptAddObjectStates(states[0]);
} else {
for (int object : virtualObjTemp) {
- if (PartialEscapeBlockState.identicalObjectStates(states, object)) {
+ if (!forceMaterialization && PartialEscapeBlockState.identicalObjectStates(states, object)) {
newState.addObject(object, states[0].getObjectState(object).share());
continue;
}
@@ -710,6 +737,22 @@
for (int i = 0; i < states.length; i++) {
ObjectState obj = states[i].getObjectState(object);
ensureVirtual &= obj.getEnsureVirtualized();
+ if (forceMaterialization) {
+ if (forcedMaterializationValue == null) {
+ uniqueMaterializedValue = null;
+ continue;
+ } else {
+ ValueNode value = forcedMaterializationValue;
+ if (merge.isPhiAtMerge(value)) {
+ value = ((ValuePhiNode) value).valueAt(i);
+ }
+ ValueNode alias = getAlias(value);
+ if (alias instanceof VirtualObjectNode && ((VirtualObjectNode) alias).getObjectId() == object) {
+ uniqueMaterializedValue = null;
+ continue;
+ }
+ }
+ }
if (obj.isVirtual()) {
virtualCount++;
uniqueMaterializedValue = null;
@@ -1029,6 +1072,7 @@
*/
if (virtual.hasIdentity() && !isSingleUsageAllocation(getPhiValueAt(phi, i), virtualObjs, states[i])) {
compatible = false;
+ break;
}
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/UnsafeAccess.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.word;
-
-import java.lang.reflect.Field;
-
-import sun.misc.Unsafe;
-
-/**
- * Package private access to the {@link Unsafe} capability.
- */
-class UnsafeAccess {
-
- static final Unsafe UNSAFE = initUnsafe();
-
- private static Unsafe initUnsafe() {
- try {
- // Fast path when we are trusted.
- return Unsafe.getUnsafe();
- } catch (SecurityException se) {
- // Slow path when we are not trusted.
- try {
- Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
- theUnsafe.setAccessible(true);
- return (Unsafe) theUnsafe.get(Unsafe.class);
- } catch (Exception e) {
- throw new RuntimeException("exception while trying to get Unsafe", e);
- }
- }
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/Word.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,7 +24,7 @@
package org.graalvm.compiler.word;
-import static org.graalvm.compiler.word.UnsafeAccess.UNSAFE;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -59,8 +59,12 @@
import jdk.internal.vm.compiler.word.WordFactory;
import jdk.internal.vm.compiler.word.impl.WordBoxFactory;
+import sun.misc.Unsafe;
+
public abstract class Word implements SignedWord, UnsignedWord, Pointer {
+ private static final Unsafe UNSAFE = getUnsafe();
+
static {
BoxFactoryImpl.initialize();
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -44,9 +44,7 @@
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
/**
- * Abstract class to generate the module overview files in
- * Frame and Non-Frame format. This will be sub-classed to
- * generate module-overview-frame.html as well as module-overview-summary.html.
+ * Abstract class to generate the module overview files.
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
@@ -118,19 +116,16 @@
String tableSummary, Content main, ModuleElement mdle);
/**
- * Generate and prints the contents in the module index file. Call appropriate
- * methods from the sub-class in order to generate Frame or Non
- * Frame format.
+ * Generate and prints the contents in the module index file.
*
* @param title the title of the window
* @param description the content for the description META tag
- * @param includeScript boolean set true if windowtitle script is to be included
* @throws DocFileIOException if there is a problem building the module index file
*/
- protected void buildModuleIndexFile(String title, String description, boolean includeScript)
+ protected void buildModuleIndexFile(String title, String description)
throws DocFileIOException {
String windowOverview = resources.getText(title);
- Content body = getBody(includeScript, getWindowTitle(windowOverview));
+ Content body = getBody(getWindowTitle(windowOverview));
Content header = HtmlTree.HEADER();
addNavigationBarHeader(header);
Content main = HtmlTree.MAIN();
@@ -149,20 +144,17 @@
}
/**
- * Generate and prints the contents in the module packages index file. Call appropriate
- * methods from the sub-class in order to generate Frame or Non
- * Frame format.
+ * Generate and prints the contents in the module packages index file.
*
* @param title the title of the window.
* @param description the content for the description META tag
- * @param includeScript boolean set true if windowtitle script is to be included
* @param mdle the name of the module being documented
* @throws DocFileIOException if there is an exception building the module packages index file
*/
protected void buildModulePackagesIndexFile(String title, String description,
- boolean includeScript, ModuleElement mdle) throws DocFileIOException {
+ ModuleElement mdle) throws DocFileIOException {
String windowOverview = resources.getText(title);
- Content body = getBody(includeScript, getWindowTitle(windowOverview));
+ Content body = getBody(getWindowTitle(windowOverview));
Content header = HtmlTree.HEADER();
addNavigationBarHeader(header);
Content main = HtmlTree.MAIN();
@@ -188,7 +180,7 @@
protected void addOverview(Content main) { }
/**
- * Adds the frame or non-frame module index to the documentation tree.
+ * Adds the module index to the documentation tree.
*
* @param header the document tree to which the navigational links will be added
* @param main the document tree to which the modules list will be added
@@ -201,7 +193,7 @@
}
/**
- * Adds the frame or non-frame module packages index to the documentation tree.
+ * Adds the module packages index to the documentation tree.
*
* @param header the document tree to which the navigational links will be added
* @param main the document tree to which the module packages list will be added
@@ -226,13 +218,6 @@
*/
protected void addIndexContents(Collection<ModuleElement> modules, String text,
String tableSummary, Content header, Content main) {
- HtmlTree htmlTree = HtmlTree.NAV();
- htmlTree.setStyle(HtmlStyle.indexNav);
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- addAllClassesLink(ul);
- addAllPackagesLink(ul);
- htmlTree.add(ul);
- header.add(htmlTree);
addModulesList(main);
}
@@ -248,14 +233,6 @@
*/
protected void addModulePackagesIndexContents(String text,
String tableSummary, Content header, Content main, ModuleElement mdle) {
- HtmlTree htmlTree = HtmlTree.NAV();
- htmlTree.setStyle(HtmlStyle.indexNav);
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- addAllClassesLink(ul);
- addAllPackagesLink(ul);
- addAllModulesLink(ul);
- htmlTree.add(ul);
- header.add(htmlTree);
addModulePackagesList(modules, text, tableSummary, main, mdle);
}
@@ -273,25 +250,4 @@
body.add(div);
}
}
-
- /**
- * Do nothing. This will be overridden in ModuleIndexFrameWriter.
- *
- * @param div the document tree to which the all classes link will be added
- */
- protected void addAllClassesLink(Content div) { }
-
- /**
- * Do nothing. This will be overridden in ModuleIndexFrameWriter.
- *
- * @param div the document tree to which the all packages link will be added
- */
- protected void addAllPackagesLink(Content div) { }
-
- /**
- * Do nothing. This will be overridden in ModulePackageIndexFrameWriter.
- *
- * @param div the document tree to which the all modules link will be added
- */
- protected void addAllModulesLink(Content div) { }
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -40,9 +40,8 @@
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
/**
- * Abstract class to generate the overview files in
- * Frame and Non-Frame format. This will be sub-classed by to
- * generate overview-frame.html as well as overview-summary.html.
+ * Abstract class to generate the overview files. This will be sub-classed to
+ * generate overview-summary.html.
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
@@ -103,19 +102,16 @@
protected abstract void addPackagesList(Content main);
/**
- * Generate and prints the contents in the package index file. Call appropriate
- * methods from the sub-class in order to generate Frame or Non
- * Frame format.
+ * Generate and prints the contents in the package index file.
*
* @param title the title of the window
* @param description the content for the description META tag
- * @param includeScript boolean set true if windowtitle script is to be included
* @throws DocFileIOException if there is a problem building the package index file
*/
- protected void buildPackageIndexFile(String title, String description, boolean includeScript)
+ protected void buildPackageIndexFile(String title, String description)
throws DocFileIOException {
String windowOverview = resources.getText(title);
- Content body = getBody(includeScript, getWindowTitle(windowOverview));
+ Content body = getBody(getWindowTitle(windowOverview));
Content header = HtmlTree.HEADER();
addNavigationBarHeader(header);
Content main = HtmlTree.MAIN();
@@ -140,7 +136,7 @@
protected void addOverview(Content main) { }
/**
- * Adds the frame or non-frame package index to the documentation tree.
+ * Adds the package index to the documentation tree.
*
* @param header the document tree to which the navigation links will be added
* @param main the document tree to which the packages list will be added
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.formats.html;
-
-
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
-
-
-/**
- * Generate the file with list of all the classes in this run. This page will be
- * used in the left-hand bottom frame, when "All Classes" link is clicked in
- * the left-hand top frame. The name of the generated file is
- * "allclasses-frame.html".
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- * @author Atul M Dambalkar
- * @author Doug Kramer
- * @author Bhavesh Patel (Modified)
- */
-public class AllClassesFrameWriter extends HtmlDocletWriter {
-
- /**
- * Index of all the classes.
- */
- protected IndexBuilder indexbuilder;
-
- /**
- * BR tag to be used within a document tree.
- */
- final HtmlTree BR = new HtmlTree(HtmlTag.BR);
-
- /**
- * Construct AllClassesFrameWriter object. Also initializes the indexbuilder
- * variable in this class.
- * @param configuration The current configuration
- * @param filename Path to the file which is getting generated.
- * @param indexbuilder Unicode based Index from {@link IndexBuilder}
- */
- public AllClassesFrameWriter(HtmlConfiguration configuration,
- DocPath filename, IndexBuilder indexbuilder) {
- super(configuration, filename);
- this.indexbuilder = indexbuilder;
- }
-
- /**
- * Create AllClassesFrameWriter object. Then use it to generate the
- * "allclasses-frame.html" file. Generate the file in the current or the
- * destination directory.
- *
- * @param configuration the configuration for this javadoc run
- * @throws DocFileIOException
- */
- public static void generate(HtmlConfiguration configuration,
- IndexBuilder indexBuilder) throws DocFileIOException {
- if (configuration.frames) {
- generate(configuration, indexBuilder, DocPaths.ALLCLASSES_FRAME, true);
- }
- }
-
- private static void generate(HtmlConfiguration configuration, IndexBuilder indexBuilder,
- DocPath fileName, boolean wantFrames) throws DocFileIOException {
- AllClassesFrameWriter allclassgen = new AllClassesFrameWriter(configuration,
- fileName, indexBuilder);
- allclassgen.buildAllClassesFile(wantFrames);
- allclassgen = new AllClassesFrameWriter(configuration,
- fileName, indexBuilder);
- }
-
- /**
- * Print all the classes in the file.
- * @param wantFrames True if we want frames.
- */
- protected void buildAllClassesFile(boolean wantFrames) throws DocFileIOException {
- String label = resources.getText("doclet.All_Classes");
- Content body = getBody(false, getWindowTitle(label));
- Content htmlTree = HtmlTree.MAIN();
- Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
- HtmlStyle.bar, contents.allClassesLabel);
- htmlTree.add(heading);
- Content ul = new HtmlTree(HtmlTag.UL);
- // Generate the class links and add it to the tdFont tree.
- addAllClasses(ul, wantFrames);
- HtmlTree div = HtmlTree.DIV(HtmlStyle.indexContainer, ul);
- htmlTree.add(div);
- body.add(htmlTree);
- printHtmlDocument(null, "all classes (frame)", body);
- }
-
- /**
- * Use the sorted index of all the classes and add all the classes to the
- * content list.
- *
- * @param content HtmlTree content to which all classes information will be added
- * @param wantFrames True if we want frames.
- */
- protected void addAllClasses(Content content, boolean wantFrames) {
- for (Character unicode : indexbuilder.index()) {
- addContents(indexbuilder.getMemberList(unicode), wantFrames, content);
- }
- }
-
- /**
- * Given a list of classes, generate links for each class or interface.
- * If the class kind is interface, print it in the italics font. Also all
- * links should target the right-hand frame. If clicked on any class name
- * in this page, appropriate class page should get opened in the right-hand
- * frame.
- *
- * @param classlist Sorted list of classes.
- * @param wantFrames True if we want frames.
- * @param content HtmlTree content to which the links will be added
- */
- protected void addContents(Iterable<? extends Element> classlist, boolean wantFrames,
- Content content) {
- for (Element element : classlist) {
- TypeElement typeElement = (TypeElement)element;
- if (!utils.isCoreClass(typeElement)) {
- continue;
- }
- Content label = interfaceName(typeElement, false);
- Content linkContent;
- if (wantFrames) {
- linkContent = getLink(new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.ALL_CLASSES_FRAME, typeElement).label(label).target("classFrame"));
- } else {
- linkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, typeElement).label(label));
- }
- Content li = HtmlTree.LI(linkContent);
- content.add(li);
- }
- }
-}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -63,7 +63,7 @@
private final Navigation navBar;
/**
- * Construct AllClassesFrameWriter object. Also initializes the indexbuilder variable in this
+ * Construct AllClassesIndexWriter object. Also initializes the indexbuilder variable in this
* class.
*
* @param configuration The current configuration
@@ -101,7 +101,7 @@
*/
protected void buildAllClassesFile() throws DocFileIOException {
String label = resources.getText("doclet.All_Classes");
- HtmlTree bodyTree = getBody(true, getWindowTitle(label));
+ HtmlTree bodyTree = getBody(getWindowTitle(label));
HtmlTree header = HtmlTree.HEADER();
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -83,7 +83,7 @@
*/
protected void buildAllPackagesFile() throws DocFileIOException {
String label = resources.getText("doclet.All_Packages");
- HtmlTree bodyTree = getBody(true, getWindowTitle(label));
+ HtmlTree bodyTree = getBody(getWindowTitle(label));
HtmlTree header = HtmlTree.HEADER();
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -84,7 +84,7 @@
*/
@Override
public Content getHeader(String header) {
- HtmlTree bodyTree = getBody(true, getWindowTitle(utils.getSimpleName(annotationType)));
+ HtmlTree bodyTree = getBody(getWindowTitle(utils.getSimpleName(annotationType)));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(annotationType),
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -434,7 +434,7 @@
String clname = utils.getFullyQualifiedName(typeElement);
String title = resources.getText("doclet.Window_ClassUse_Header",
cltype, clname);
- HtmlTree bodyTree = getBody(true, getWindowTitle(title));
+ HtmlTree bodyTree = getBody(getWindowTitle(title));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
Content mdleLinkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -105,7 +105,7 @@
*/
@Override
public Content getHeader(String header) {
- HtmlTree bodyTree = getBody(true, getWindowTitle(utils.getSimpleName(typeElement)));
+ HtmlTree bodyTree = getBody(getWindowTitle(utils.getSimpleName(typeElement)));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -105,7 +105,7 @@
@Override
public Content getHeader() {
String label = resources.getText("doclet.Constants_Summary");
- HtmlTree bodyTree = getBody(true, getWindowTitle(label));
+ HtmlTree bodyTree = getBody(getWindowTitle(label));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -369,7 +369,7 @@
*/
public HtmlTree getHeader() {
String title = resources.getText("doclet.Window_Deprecated_List");
- HtmlTree bodyTree = getBody(true, getWindowTitle(title));
+ HtmlTree bodyTree = getBody(getWindowTitle(title));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -179,7 +179,7 @@
Content localTagsContent = docletWriter.commentTagsToContent(null, dfElement, localTags, false);
String title = getWindowTitle(docletWriter, dfElement).trim();
- HtmlTree htmlContent = docletWriter.getBody(true, title);
+ HtmlTree htmlContent = docletWriter.getBody(title);
docletWriter.addTop(htmlContent);
PackageElement pkg = (PackageElement) element;
this.navBar = new Navigation(pkg, configuration, docletWriter.fixedNavDiv,
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +0,0 @@
-/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.formats.html;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.Head;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Script;
-import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-
-
-/**
- * Generate the documentation in the Html "frame" format in the browser. The
- * generated documentation will have two or three frames depending upon the
- * number of packages on the command line. In general there will be three frames
- * in the output, a left-hand top frame will have a list of all packages with
- * links to target left-hand bottom frame. The left-hand bottom frame will have
- * the particular package contents or the all-classes list, where as the single
- * right-hand frame will have overview or package summary or class file. Also
- * take care of browsers which do not support Html frames.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- * @author Atul M Dambalkar
- */
-public class FrameOutputWriter extends HtmlDocletWriter {
-
- /**
- * Number of packages specified on the command line.
- */
- int noOfPackages;
-
- /**
- * Constructor to construct FrameOutputWriter object.
- *
- * @param configuration for this run
- * @param filename File to be generated.
- */
- public FrameOutputWriter(HtmlConfiguration configuration, DocPath filename) {
- super(configuration, filename);
- noOfPackages = configuration.packages.size();
- }
-
- /**
- * Construct FrameOutputWriter object and then use it to generate the Html
- * file which will have the description of all the frames in the
- * documentation. The name of the generated file is "index.html" which is
- * the default first file for Html documents.
- * @param configuration the configuration for this doclet
- * @throws DocFileIOException if there is a problem generating the frame file
- */
- public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
- FrameOutputWriter framegen = new FrameOutputWriter(configuration, DocPaths.INDEX);
- framegen.generateFrameFile();
- }
-
- /**
- * Generate the constants in the "index.html" file. Print the frame details
- * as well as warning if browser is not supporting the Html frames.
- * @throws DocFileIOException if there is a problem generating the frame file
- */
- protected void generateFrameFile() throws DocFileIOException {
- Content frame = getFrameDetails();
- HtmlTree body = new HtmlTree(HtmlTag.BODY);
- body.put(HtmlAttr.CLASS, "frames");
- body.put(HtmlAttr.ONLOAD, "loadFrames()");
- String topFilePath = configuration.topFile.getPath();
- Script script = new Script(
- "\nif (targetPage == \"\" || targetPage == \"undefined\")\n" +
- " window.location.replace(")
- .appendStringLiteral(topFilePath, '\'')
- .append(");\n");
- body.add(script.asContent());
- Content noScript = HtmlTree.NOSCRIPT(contents.noScriptMessage);
- body.add(noScript);
- HtmlTree main = HtmlTree.MAIN(frame);
- body.add(main);
- if (configuration.windowtitle.length() > 0) {
- printFramesDocument(configuration.windowtitle, body);
- } else {
- printFramesDocument(resources.getText("doclet.Generated_Docs_Untitled"), body);
- }
- }
-
- /**
- * Print the frames version of the Html file header.
- * Called only when generating an HTML frames file.
- *
- * @param title Title of this HTML document
- * @param body the body content tree to be added to the HTML document
- * @throws DocFileIOException if there is an error writing the frames document
- */
- private void printFramesDocument(String title, HtmlTree body) throws DocFileIOException {
- Content htmlComment = contents.newPage;
- Head head = new Head(path, configuration.docletVersion)
- .setTimestamp(!configuration.notimestamp)
- .setTitle(title)
- .setDescription("frames")
- .setGenerator(getGenerator(getClass()))
- .setCharset(configuration.charset)
- .setStylesheets(configuration.getMainStylesheet(), configuration.getAdditionalStylesheets())
- .addDefaultScript(false)
- .addScript(getFramesScript());
-
- Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(), head.toContent(), body);
- HtmlDocument htmlDocument = new HtmlDocument(htmlComment, htmlTree);
- htmlDocument.write(DocFile.createFileForOutput(configuration, path));
- }
-
- /**
- * Get the frame sizes and their contents.
- *
- * @return a content tree for the frame details
- */
- protected Content getFrameDetails() {
- HtmlTree leftContainerDiv = new HtmlTree(HtmlTag.DIV);
- HtmlTree rightContainerDiv = new HtmlTree(HtmlTag.DIV);
- leftContainerDiv.setStyle(HtmlStyle.leftContainer);
- rightContainerDiv.setStyle(HtmlStyle.rightContainer);
- if (configuration.showModules && configuration.modules.size() > 1) {
- addAllModulesFrameTag(leftContainerDiv);
- } else if (noOfPackages > 1) {
- addAllPackagesFrameTag(leftContainerDiv);
- }
- addAllClassesFrameTag(leftContainerDiv);
- addClassFrameTag(rightContainerDiv);
- HtmlTree mainContainer = HtmlTree.DIV(HtmlStyle.mainContainer, leftContainerDiv);
- mainContainer.add(rightContainerDiv);
- return mainContainer;
- }
-
- /**
- * Add the IFRAME tag for the frame that lists all modules.
- *
- * @param contentTree to which the information will be added
- */
- private void addAllModulesFrameTag(Content contentTree) {
- HtmlTree frame = HtmlTree.IFRAME(DocPaths.MODULE_OVERVIEW_FRAME.getPath(),
- "packageListFrame", resources.getText("doclet.All_Modules"));
- HtmlTree leftTop = HtmlTree.DIV(HtmlStyle.leftTop, frame);
- contentTree.add(leftTop);
- }
-
- /**
- * Add the IFRAME tag for the frame that lists all packages.
- *
- * @param contentTree the content tree to which the information will be added
- */
- private void addAllPackagesFrameTag(Content contentTree) {
- HtmlTree frame = HtmlTree.IFRAME(DocPaths.OVERVIEW_FRAME.getPath(),
- "packageListFrame", resources.getText("doclet.All_Packages"));
- HtmlTree leftTop = HtmlTree.DIV(HtmlStyle.leftTop, frame);
- contentTree.add(leftTop);
- }
-
- /**
- * Add the IFRAME tag for the frame that lists all classes.
- *
- * @param contentTree the content tree to which the information will be added
- */
- private void addAllClassesFrameTag(Content contentTree) {
- HtmlTree frame = HtmlTree.IFRAME(DocPaths.ALLCLASSES_FRAME.getPath(),
- "packageFrame", resources.getText("doclet.All_classes_and_interfaces"));
- HtmlTree leftBottom = HtmlTree.DIV(HtmlStyle.leftBottom, frame);
- contentTree.add(leftBottom);
- }
-
- /**
- * Add the IFRAME tag for the frame that describes the class in detail.
- *
- * @param contentTree the content tree to which the information will be added
- */
- private void addClassFrameTag(Content contentTree) {
- HtmlTree frame = HtmlTree.IFRAME(configuration.topFile.getPath(), "classFrame",
- resources.getText("doclet.Package_class_and_interface_descriptions"));
- frame.setStyle(HtmlStyle.rightIframe);
- contentTree.add(frame);
- }
-
- /**
- * Returns a content tree for the SCRIPT tag for the main page(index.html).
- *
- * @return a content for the SCRIPT tag
- */
- protected Script getFramesScript() {
- return new Script("\n" +
- " tmpTargetPage = \"\" + window.location.search;\n" +
- " if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")\n" +
- " tmpTargetPage = tmpTargetPage.substring(1);\n" +
- " if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))\n" +
- " tmpTargetPage = \"undefined\";\n" +
- " targetPage = tmpTargetPage;\n" +
- " function validURL(url) {\n" +
- " try {\n" +
- " url = decodeURIComponent(url);\n" +
- " }\n" +
- " catch (error) {\n" +
- " return false;\n" +
- " }\n" +
- " var pos = url.indexOf(\".html\");\n" +
- " if (pos == -1 || pos != url.length - 5)\n" +
- " return false;\n" +
- " var allowNumber = false;\n" +
- " var allowSep = false;\n" +
- " var seenDot = false;\n" +
- " for (var i = 0; i < url.length - 5; i++) {\n" +
- " var ch = url.charAt(i);\n" +
- " if ('a' <= ch && ch <= 'z' ||\n" +
- " 'A' <= ch && ch <= 'Z' ||\n" +
- " ch == '$' ||\n" +
- " ch == '_' ||\n" +
- " ch.charCodeAt(0) > 127) {\n" +
- " allowNumber = true;\n" +
- " allowSep = true;\n" +
- " } else if ('0' <= ch && ch <= '9'\n" +
- " || ch == '-') {\n" +
- " if (!allowNumber)\n" +
- " return false;\n" +
- " } else if (ch == '/' || ch == '.') {\n" +
- " if (!allowSep)\n" +
- " return false;\n" +
- " allowNumber = false;\n" +
- " allowSep = false;\n" +
- " if (ch == '.')\n" +
- " seenDot = true;\n" +
- " if (ch == '/' && seenDot)\n" +
- " return false;\n" +
- " } else {\n" +
- " return false;\n" +
- " }\n" +
- " }\n" +
- " return true;\n" +
- " }\n" +
- " function loadFrames() {\n" +
- " if (targetPage != \"\" && targetPage != \"undefined\")\n" +
- " top.classFrame.location = top.targetPage;\n" +
- " }\n");
- }
-}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -87,7 +87,7 @@
*/
protected void generateHelpFile() throws DocFileIOException {
String title = resources.getText("doclet.Window_Help_title");
- HtmlTree body = getBody(true, getWindowTitle(title));
+ HtmlTree body = getBody(getWindowTitle(title));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
@@ -132,8 +132,7 @@
? "doclet.help.overview.modules.body"
: "doclet.help.overview.packages.body";
Content overviewLink = links.createLink(
- DocPaths.overviewSummary(configuration.frames),
- resources.getText("doclet.Overview"));
+ DocPaths.INDEX, resources.getText("doclet.Overview"));
Content overviewBody = contents.getContent(overviewKey, overviewLink);
Content overviewPara = HtmlTree.P(overviewBody);
htmlTree.add(overviewPara);
@@ -299,18 +298,6 @@
ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
- // Frames
- if (configuration.frames) {
- Content frameHead = HtmlTree.HEADING(Headings.CONTENT_HEADING,
- contents.getContent("doclet.help.frames.head"));
- htmlTree = HtmlTree.SECTION(frameHead);
- Content framesBody = contents.getContent("doclet.help.frames.body");
- Content framePara = HtmlTree.P(framesBody);
- htmlTree.add(framePara);
-
- ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
- }
-
// Serialized Form
Content sHead = HtmlTree.HEADING(Headings.CONTENT_HEADING,
contents.serializedForm);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java Tue Apr 02 10:57:57 2019 +0530
@@ -197,12 +197,6 @@
public boolean createoverview = false;
/**
- * Specifies whether or not frames should be generated.
- * Defaults to false; can be set to true by --frames; can be set to false by --no-frames; last one wins.
- */
- public boolean frames = false;
-
- /**
* Collected set of doclint options
*/
public Map<Doclet.Option, String> doclintOpts = new LinkedHashMap<>();
@@ -375,7 +369,7 @@
return;
}
if (createoverview) {
- topFile = DocPaths.overviewSummary(frames);
+ topFile = DocPaths.INDEX;
} else {
if (showModules) {
topFile = DocPath.empty.resolve(docPaths.moduleSummary(modules.first()));
@@ -640,21 +634,6 @@
return true;
}
},
- new Option(resources, "--frames") {
- @Override
- public boolean process(String opt, List<String> args) {
- reporter.print(WARNING, resources.getText("doclet.Frames_specified", helpfile));
- frames = true;
- return true;
- }
- },
- new Option(resources, "--no-frames") {
- @Override
- public boolean process(String opt, List<String> args) {
- frames = false;
- return true;
- }
- },
new Hidden(resources, "-packagesheader", 1) {
@Override
public boolean process(String opt, List<String> args) {
@@ -749,6 +728,13 @@
}
return true;
}
+ },
+ new XOption(resources, "--no-frames") {
+ @Override
+ public boolean process(String opt, List<String> args) {
+ reporter.print(WARNING, resources.getText("doclet.NoFrames_specified"));
+ return true;
+ }
}
};
Set<Doclet.Option> oset = new TreeSet<>();
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java Tue Apr 02 10:57:57 2019 +0530
@@ -144,13 +144,6 @@
DeprecatedListWriter.generate(configuration);
}
- AllClassesFrameWriter.generate(configuration,
- new IndexBuilder(configuration, nodeprecated, true));
-
- if (configuration.frames) {
- FrameOutputWriter.generate(configuration);
- }
-
if (configuration.createoverview) {
if (configuration.showModules) {
ModuleIndexWriter.generate(configuration);
@@ -173,12 +166,10 @@
}
}
- if (!configuration.frames) {
- if (configuration.createoverview) {
- IndexRedirectWriter.generate(configuration, DocPaths.OVERVIEW_SUMMARY, DocPaths.INDEX);
- } else {
- IndexRedirectWriter.generate(configuration);
- }
+ if (configuration.createoverview) {
+ IndexRedirectWriter.generate(configuration, DocPaths.OVERVIEW_SUMMARY, DocPaths.INDEX);
+ } else {
+ IndexRedirectWriter.generate(configuration);
}
if (configuration.helpfile.isEmpty() && !configuration.nohelp) {
@@ -273,15 +264,8 @@
@Override // defined by AbstractDoclet
protected void generateModuleFiles() throws DocletException {
if (configuration.showModules) {
- if (configuration.frames && configuration.modules.size() > 1) {
- ModuleIndexFrameWriter.generate(configuration);
- }
List<ModuleElement> mdles = new ArrayList<>(configuration.modulePackages.keySet());
for (ModuleElement mdle : mdles) {
- if (configuration.frames && configuration.modules.size() > 1) {
- ModulePackageIndexFrameWriter.generate(configuration, mdle);
- ModuleFrameWriter.generate(configuration, mdle);
- }
AbstractBuilder moduleSummaryBuilder =
configuration.getBuilderFactory().getModuleSummaryBuilder(mdle);
moduleSummaryBuilder.build();
@@ -295,18 +279,12 @@
@Override // defined by AbstractDoclet
protected void generatePackageFiles(ClassTree classtree) throws DocletException {
Set<PackageElement> packages = configuration.packages;
- if (packages.size() > 1 && configuration.frames) {
- PackageIndexFrameWriter.generate(configuration);
- }
List<PackageElement> pList = new ArrayList<>(packages);
for (PackageElement pkg : pList) {
// if -nodeprecated option is set and the package is marked as
// deprecated, do not generate the package-summary.html, package-frame.html
// and package-tree.html pages for that package.
if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) {
- if (configuration.frames) {
- PackageFrameWriter.generate(configuration, pkg);
- }
AbstractBuilder packageSummaryBuilder =
configuration.getBuilderFactory().getPackageSummaryBuilder(pkg);
packageSummaryBuilder.build();
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -202,6 +202,7 @@
this.pathToRoot = path.parent().invert();
this.filename = path.basename();
this.docPaths = configuration.docPaths;
+ this.mainBodyScript = new Script();
messages.notice("doclet.Generating_0",
DocFile.createFileForOutput(configuration, path).getPath());
@@ -375,47 +376,6 @@
}
/**
- * Get Package link, with target frame.
- *
- * @param pkg The link will be to the "package-summary.html" page for this package
- * @param target name of the target frame
- * @param label tag for the link
- * @return a content for the target package link
- */
- public Content getTargetPackageLink(PackageElement pkg, String target,
- Content label) {
- return links.createLink(pathString(pkg, DocPaths.PACKAGE_SUMMARY), label, "", target);
- }
-
- /**
- * Get Module Package link, with target frame.
- *
- * @param pkg the PackageElement
- * @param target name of the target frame
- * @param label tag for the link
- * @param mdle the module being documented
- * @return a content for the target module packages link
- */
- public Content getTargetModulePackageLink(PackageElement pkg, String target,
- Content label, ModuleElement mdle) {
- return links.createLink(pathString(pkg, DocPaths.PACKAGE_SUMMARY),
- label, "", target);
- }
-
- /**
- * Get Module link, with target frame.
- *
- * @param target name of the target frame
- * @param label tag for the link
- * @param mdle the module being documented
- * @return a content for the target module link
- */
- public Content getTargetModuleLink(String target, Content label, ModuleElement mdle) {
- return links.createLink(pathToRoot.resolve(
- docPaths.moduleSummary(mdle)), label, "", target);
- }
-
- /**
* Generates the HTML document tree and prints it out.
*
* @param metakeywords Array of String keywords for META tag. Each element
@@ -2190,24 +2150,19 @@
/**
* Returns an HtmlTree for the BODY tag.
*
- * @param includeScript set true if printing windowtitle script
* @param title title for the window
* @return an HtmlTree for the BODY tag
*/
- public HtmlTree getBody(boolean includeScript, String title) {
+ public HtmlTree getBody(String title) {
HtmlTree body = new HtmlTree(HtmlTag.BODY);
body.put(HtmlAttr.CLASS, getBodyClass());
- // Set window title string which is later printed
this.winTitle = title;
// Don't print windowtitle script for overview-frame, allclasses-frame
// and package-frame
- if (includeScript) {
- this.mainBodyScript = getWinTitleScript();
- body.add(mainBodyScript.asContent());
- Content noScript = HtmlTree.NOSCRIPT(HtmlTree.DIV(contents.noScriptMessage));
- body.add(noScript);
- }
+ body.add(mainBodyScript.asContent());
+ Content noScript = HtmlTree.NOSCRIPT(HtmlTree.DIV(contents.noScriptMessage));
+ body.add(noScript);
return body;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -75,7 +75,7 @@
private void generateIndexFile() throws DocFileIOException {
Content htmlComment = contents.newPage;
Head head = new Head(path, configuration.docletVersion)
- .setTimestamp(true)
+ .setTimestamp(!configuration.notimestamp)
.setDescription("index redirect")
.setGenerator(getGenerator(getClass()))
.setStylesheets(configuration.getMainStylesheet(), Collections.emptyList()) // avoid reference to default stylesheet
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.formats.html;
-
-import java.util.*;
-
-import javax.lang.model.element.ModuleElement;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.util.ElementFilter;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
-import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-
-/**
- * Class to generate file for each module contents in the left-hand bottom
- * frame. This will list all the Class Kinds in the module. A click on any
- * class-kind will update the right-hand frame with the clicked class-kind page.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- * @author Bhavesh Patel
- */
-public class ModuleFrameWriter extends HtmlDocletWriter {
-
- /**
- * The module being documented.
- */
- private final ModuleElement mdle;
-
- /**
- * The classes to be documented. Use this to filter out classes
- * that will not be documented.
- */
- private SortedSet<TypeElement> documentedClasses;
-
- /**
- * Constructor to construct ModuleFrameWriter object and to generate
- * "module_name-type-frame.html" file. For example for module "java.base" this will generate file
- * "java.base-type-frame.html" file.
- *
- * @param configuration the configuration of the doclet.
- * @param moduleElement moduleElement under consideration.
- */
- public ModuleFrameWriter(HtmlConfiguration configuration, ModuleElement moduleElement) {
- super(configuration, configuration.docPaths.moduleTypeFrame(moduleElement));
- this.mdle = moduleElement;
- if (configuration.getSpecifiedPackageElements().isEmpty()) {
- documentedClasses = new TreeSet<>(utils.makeGeneralPurposeComparator());
- documentedClasses.addAll(configuration.getIncludedTypeElements());
- }
- }
-
- /**
- * Generate a module type summary page for the left-hand bottom frame.
- *
- * @param configuration the current configuration of the doclet.
- * @param moduleElement The package for which "module_name-type-frame.html" is to be generated.
- * @throws DocFileIOException if there is a problem generating the module summary file
- */
- public static void generate(HtmlConfiguration configuration, ModuleElement moduleElement)
- throws DocFileIOException {
- ModuleFrameWriter mdlgen = new ModuleFrameWriter(configuration, moduleElement);
- String mdlName = moduleElement.getQualifiedName().toString();
- Content mdlLabel = new StringContent(mdlName);
- HtmlTree body = mdlgen.getBody(false, mdlgen.getWindowTitle(mdlName));
- HtmlTree htmlTree = HtmlTree.MAIN();
- DocPath moduleSummary = configuration.useModuleDirectories
- ? DocPaths.DOT_DOT.resolve(configuration.docPaths.moduleSummary(moduleElement))
- : configuration.docPaths.moduleSummary(moduleElement);
- Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.bar,
- mdlgen.links.createLink(moduleSummary, mdlLabel, "", "classFrame"));
- htmlTree.add(heading);
- HtmlTree div = new HtmlTree(HtmlTag.DIV);
- div.setStyle(HtmlStyle.indexContainer);
- mdlgen.addClassListing(div);
- htmlTree.add(div);
- body.add(htmlTree);
- mdlgen.printHtmlDocument(
- configuration.metakeywords.getMetaKeywordsForModule(moduleElement),
- "module summary (frame)",
- body);
- }
-
- /**
- * Add class listing for all the classes in this module. Divide class
- * listing as per the class kind and generate separate listing for
- * Classes, Interfaces, Exceptions and Errors.
- *
- * @param contentTree the content tree to which the listing will be added
- */
- protected void addClassListing(HtmlTree contentTree) {
- List<PackageElement> packagesIn = ElementFilter.packagesIn(mdle.getEnclosedElements());
- SortedSet<TypeElement> interfaces = new TreeSet<>(utils.makeGeneralPurposeComparator());
- SortedSet<TypeElement> classes = new TreeSet<>(utils.makeGeneralPurposeComparator());
- SortedSet<TypeElement> enums = new TreeSet<>(utils.makeGeneralPurposeComparator());
- SortedSet<TypeElement> exceptions = new TreeSet<>(utils.makeGeneralPurposeComparator());
- SortedSet<TypeElement> errors = new TreeSet<>(utils.makeGeneralPurposeComparator());
- SortedSet<TypeElement> annotationTypes = new TreeSet<>(utils.makeGeneralPurposeComparator());
- for (PackageElement pkg : packagesIn) {
- if (utils.isIncluded(pkg)) {
- interfaces.addAll(utils.getInterfaces(pkg));
- classes.addAll(utils.getOrdinaryClasses(pkg));
- enums.addAll(utils.getEnums(pkg));
- exceptions.addAll(utils.getExceptions(pkg));
- errors.addAll(utils.getErrors(pkg));
- annotationTypes.addAll(utils.getAnnotationTypes(pkg));
- }
- }
- addClassKindListing(interfaces, contents.interfaces, contentTree);
- addClassKindListing(classes, contents.classes, contentTree);
- addClassKindListing(enums, contents.enums, contentTree);
- addClassKindListing(exceptions, contents.exceptions, contentTree);
- addClassKindListing(errors, contents.errors, contentTree);
- addClassKindListing(annotationTypes, contents.annotationTypes, contentTree);
- }
-
- /**
- * Add specific class kind listing. Also add label to the listing.
- *
- * @param list Iterable list of TypeElements
- * @param labelContent content tree of the label to be added
- * @param contentTree the content tree to which the class kind listing will be added
- */
- protected void addClassKindListing(Iterable<TypeElement> list, Content labelContent,
- HtmlTree contentTree) {
- SortedSet<TypeElement> tset = utils.filterOutPrivateClasses(list, configuration.javafx);
- if (!tset.isEmpty()) {
- boolean printedHeader = false;
- HtmlTree htmlTree = HtmlTree.SECTION();
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(labelContent);
- for (TypeElement typeElement : tset) {
- if (documentedClasses != null && !documentedClasses.contains(typeElement)) {
- continue;
- }
- if (!utils.isCoreClass(typeElement) || !configuration.isGeneratedDoc(typeElement)) {
- continue;
- }
- if (!printedHeader) {
- Content heading = HtmlTree.HEADING(Headings.CONTENT_HEADING,
- true, labelContent);
- htmlTree.add(heading);
- printedHeader = true;
- }
- Content arr_i_name = new StringContent(utils.getSimpleName(typeElement));
- if (utils.isInterface(typeElement)) {
- arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, arr_i_name);
- }
- Content link = getLink(new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.ALL_CLASSES_FRAME, typeElement).label(arr_i_name).target("classFrame"));
- Content li = HtmlTree.LI(link);
- ul.add(li);
- }
- htmlTree.add(ul);
- contentTree.add(htmlTree);
- }
- }
-}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.formats.html;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.lang.model.element.ModuleElement;
-import javax.lang.model.element.PackageElement;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
-import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-
-/**
- * Generate the module index for the left-hand frame in the generated output.
- * A click on the module name in this frame will update the page in the top
- * left hand frame with the listing of packages of the clicked module.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- * @author Bhavesh Patel
- */
-public class ModuleIndexFrameWriter extends AbstractModuleIndexWriter {
- /**
- * The heading (h1 or h2) to use for the module list,
- * set by addNavigationBarHeader depending on whether or not there
- * is an additional initial heading.
- */
- private HtmlTag moduleListHeading;
-
- /**
- * Construct the ModuleIndexFrameWriter object.
- *
- * @param configuration the configuration object
- * @param filename Name of the module index file to be generated.
- */
- public ModuleIndexFrameWriter(HtmlConfiguration configuration,
- DocPath filename) {
- super(configuration, filename);
- }
-
- /**
- * Generate the module index file named "module-overview-frame.html".
- * @throws DocFileIOException
- * @param configuration the configuration object
- */
- public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
- DocPath filename = DocPaths.MODULE_OVERVIEW_FRAME;
- ModuleIndexFrameWriter modulegen = new ModuleIndexFrameWriter(configuration, filename);
- modulegen.buildModuleIndexFile("doclet.Window_Overview", "module overview (frame)", false);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void addModulesList(Content main) {
- Content heading = HtmlTree.HEADING(moduleListHeading, true,
- contents.modulesLabel);
- HtmlTree htmlTree = HtmlTree.DIV(HtmlStyle.indexContainer, heading);
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(contents.modulesLabel);
- for (ModuleElement mdle: configuration.modules) {
- ul.add(getModuleLink(mdle));
- }
- htmlTree.add(ul);
- main.add(htmlTree);
- }
-
- /**
- * Returns each module name as a separate link.
- *
- * @param mdle the module being documented
- * @return content for the module link
- */
- protected Content getModuleLink(ModuleElement mdle) {
- Content moduleLinkContent;
- Content mdlLabel = new StringContent(mdle.getQualifiedName());
- moduleLinkContent = getModuleFramesHyperLink(mdle, mdlLabel, "packageListFrame");
- Content li = HtmlTree.LI(moduleLinkContent);
- return li;
- }
-
- private Content getModuleFramesHyperLink(ModuleElement mdle, Content label, String target) {
- DocLink mdlLink = new DocLink(docPaths.moduleFrame(mdle));
- DocLink mtFrameLink = new DocLink(docPaths.moduleTypeFrame(mdle));
- DocLink cFrameLink = new DocLink(docPaths.moduleSummary(mdle));
- HtmlTree anchor = HtmlTree.A(mdlLink.toString(), label);
- String onclickStr = "updateModuleFrame('" + mtFrameLink + "','" + cFrameLink + "');";
- anchor.put(HtmlAttr.TARGET, target);
- anchor.put(HtmlAttr.ONCLICK, onclickStr);
- return anchor;
- }
-
- /**
- * {@inheritDoc}
- */
- protected void addNavigationBarHeader(Content header) {
- String headerContent = !configuration.packagesheader.isEmpty() ? configuration.packagesheader
- : configuration.header;
- if (!headerContent.isEmpty()) {
- Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
- HtmlStyle.bar, new RawHtml(replaceDocRootDir(headerContent)));
- header.add(heading);
- moduleListHeading = Headings.IndexFrames.MODULE_HEADING;
- } else {
- moduleListHeading = Headings.PAGE_TITLE_HEADING;
- }
- }
-
- /**
- * Do nothing as there is no overview information in this page.
- */
- protected void addOverviewHeader(Content body) {
- }
-
- /**
- * Adds "All Classes" link for the top of the left-hand frame page to the
- * documentation tree.
- *
- * @param ul the Content object to which the all classes link should be added
- */
- protected void addAllClassesLink(Content ul) {
- Content linkContent = links.createLink(DocPaths.ALLCLASSES_FRAME,
- contents.allClassesLabel, "", "packageFrame");
- Content li = HtmlTree.LI(linkContent);
- ul.add(li);
- }
-
- /**
- * Adds "All Packages" link for the top of the left-hand frame page to the
- * documentation tree.
- *
- * @param ul the Content object to which the all packages link should be added
- */
- protected void addAllPackagesLink(Content ul) {
- Content linkContent = links.createLink(DocPaths.OVERVIEW_FRAME,
- contents.allPackagesLabel, "", "packageListFrame");
- Content li = HtmlTree.LI(linkContent);
- ul.add(li);
- }
-
- /**
- * {@inheritDoc}
- */
- protected void addNavigationBarFooter(Content footer) {
- Content p = HtmlTree.P(Contents.SPACE);
- footer.add(p);
- }
-
- protected void addModulePackagesList(Map<ModuleElement, Set<PackageElement>> modules, String text,
- String tableSummary, Content main, ModuleElement mdle) {
- }
-}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -44,8 +44,7 @@
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
/**
- * Generate the module index page "overview-summary.html" for the right-hand
- * frame.
+ * Generate the module index page "index.html".
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
@@ -66,15 +65,15 @@
}
/**
- * Generate the module index page for the right-hand frame.
+ * Generate the module index page.
*
* @param configuration the current configuration of the doclet.
* @throws DocFileIOException if there is a problem generating the module index page
*/
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
- DocPath filename = DocPaths.overviewSummary(configuration.frames);
+ DocPath filename = DocPaths.INDEX;
ModuleIndexWriter mdlgen = new ModuleIndexWriter(configuration, filename);
- mdlgen.buildModuleIndexFile("doclet.Window_Overview_Summary", "module index", true);
+ mdlgen.buildModuleIndexFile("doclet.Window_Overview_Summary", "module index");
}
/**
@@ -95,15 +94,6 @@
* @param main the document tree to which the modules list will be added
*/
protected void addIndexContents(Content header, Content main) {
- HtmlTree htmltree = HtmlTree.NAV();
- htmltree.setStyle(HtmlStyle.indexNav);
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- addAllClassesLink(ul);
- if (configuration.showModules) {
- addAllModulesLink(ul);
- }
- htmltree.add(ul);
- header.add(htmltree);
addModulesList(main);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.formats.html;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.lang.model.element.ModuleElement;
-import javax.lang.model.element.PackageElement;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
-import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-
-/**
- * Generate the module package index for the left-hand frame in the generated output.
- * A click on the package name in this frame will update the page in the bottom
- * left hand frame with the listing of contents of the clicked module package.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- * @author Bhavesh Patel
- */
-public class ModulePackageIndexFrameWriter extends AbstractModuleIndexWriter {
- /**
- * The heading (h1 or h2) to use for the module packages list,
- * set by addNavigationBarHeader depending on whether or not there
- * is an additional initial heading.
- */
- private HtmlTag modulePackagesListHeading;
-
- /**
- * Construct the ModulePackageIndexFrameWriter object.
- *
- * @param configuration the configuration object
- * @param filename Name of the package index file to be generated.
- */
- public ModulePackageIndexFrameWriter(HtmlConfiguration configuration, DocPath filename) {
- super(configuration, filename);
- }
-
- /**
- * Generate the module package index file.
- * @throws DocFileIOException
- * @param configuration the configuration object
- * @param mdle the module being documented
- */
- public static void generate(HtmlConfiguration configuration, ModuleElement mdle) throws DocFileIOException {
- DocPath filename = configuration.docPaths.moduleFrame(mdle);
- ModulePackageIndexFrameWriter modpackgen = new ModulePackageIndexFrameWriter(configuration, filename);
- modpackgen.buildModulePackagesIndexFile("doclet.Window_Overview",
- getDescription("module package index", mdle) + " (frame)",
- false,
- mdle);
- }
-
- /**
- * {@inheritDoc}
- */
- protected void addModulePackagesList(Map<ModuleElement, Set<PackageElement>> modules, String text,
- String tableSummary, Content main, ModuleElement mdle) {
- Content profNameContent = new StringContent(mdle.getQualifiedName().toString());
- Content heading = HtmlTree.HEADING(modulePackagesListHeading, true,
- getTargetModuleLink("classFrame", profNameContent, mdle));
- heading.add(Contents.SPACE);
- heading.add(contents.packagesLabel);
- HtmlTree htmlTree = HtmlTree.DIV(HtmlStyle.indexContainer, heading);
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(contents.packagesLabel);
- List<PackageElement> packages = new ArrayList<>(modules.get(mdle));
- for (PackageElement pkg : packages) {
- if ((!(configuration.nodeprecated && utils.isDeprecated(pkg)))) {
- ul.add(getPackage(pkg, mdle));
- }
- }
- htmlTree.add(ul);
- main.add(htmlTree);
- }
-
- /**
- * {@inheritDoc}
- */
- protected void addModulePackagesList(Set<ModuleElement> modules, String text,
- String tableSummary, Content body, ModuleElement mdle) {
- Content moduleNameContent = new StringContent(mdle.getQualifiedName().toString());
- Content heading = HtmlTree.HEADING(modulePackagesListHeading, true,
- getTargetModuleLink("classFrame", moduleNameContent, mdle));
- heading.add(Contents.SPACE);
- heading.add(contents.packagesLabel);
- HtmlTree htmlTree = HtmlTree.MAIN(HtmlStyle.indexContainer, heading);
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(contents.packagesLabel);
- Set<PackageElement> modulePackages = configuration.modulePackages.get(mdle);
- for (PackageElement pkg: modulePackages) {
- if ((!(configuration.nodeprecated && utils.isDeprecated(pkg)))) {
- ul.add(getPackage(pkg, mdle));
- }
- }
- htmlTree.add(ul);
- body.add(htmlTree);
- }
-
- /**
- * Returns each package name as a separate link.
- *
- * @param pkg PackageElement
- * @param mdle the module being documented
- * @return content for the package link
- */
- protected Content getPackage(PackageElement pkg, ModuleElement mdle) {
- Content packageLinkContent;
- Content pkgLabel;
- if (!pkg.isUnnamed()) {
- pkgLabel = getPackageLabel(utils.getPackageName(pkg));
- packageLinkContent = links.createLink(pathString(pkg,
- DocPaths.PACKAGE_FRAME), pkgLabel, "",
- "packageFrame");
- } else {
- pkgLabel = new StringContent("<unnamed package>");
- packageLinkContent = links.createLink(DocPaths.PACKAGE_FRAME,
- pkgLabel, "", "packageFrame");
- }
- Content li = HtmlTree.LI(packageLinkContent);
- return li;
- }
-
- /**
- * {@inheritDoc}
- */
- protected void addNavigationBarHeader(Content header) {
- String headerContent = !configuration.packagesheader.isEmpty() ? configuration.packagesheader
- : configuration.header;
- if (!headerContent.isEmpty()) {
- Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
- HtmlStyle.bar, new RawHtml(replaceDocRootDir(headerContent)));
- header.add(heading);
- modulePackagesListHeading = Headings.IndexFrames.PACKAGE_HEADING;
- } else {
- modulePackagesListHeading = Headings.PAGE_TITLE_HEADING;
- }
- }
-
- /**
- * Do nothing as there is no overview information in this page.
- */
- protected void addOverviewHeader(Content body) {
- }
-
- /**
- * Do nothing as there is no modules list on this page.
- */
- @Override
- protected void addModulesList(Content body) {
- }
-
- /**
- * Adds "All Classes" link for the top of the left-hand frame page to the
- * documentation tree.
- *
- * @param ul the Content object to which the all classes link should be added
- */
- protected void addAllClassesLink(Content ul) {
- DocPath allClassesFrame = configuration.useModuleDirectories
- ? DocPaths.DOT_DOT.resolve(DocPaths.ALLCLASSES_FRAME)
- : DocPaths.ALLCLASSES_FRAME;
- Content linkContent = links.createLink(allClassesFrame,
- contents.allClassesLabel, "", "packageFrame");
- Content li = HtmlTree.LI(linkContent);
- ul.add(li);
- }
-
- /**
- * Adds "All Packages" link for the top of the left-hand frame page to the
- * documentation tree.
- *
- * @param ul the Content object to which the all packages link should be added
- */
- protected void addAllPackagesLink(Content ul) {
- DocPath overviewFrame = configuration.useModuleDirectories
- ? DocPaths.DOT_DOT.resolve(DocPaths.OVERVIEW_FRAME)
- : DocPaths.OVERVIEW_FRAME;
- Content linkContent = links.createLink(overviewFrame,
- contents.allPackagesLabel, "", "packageListFrame");
- Content li = HtmlTree.LI(linkContent);
- ul.add(li);
- }
-
- /**
- * Adds "All Modules" link for the top of the left-hand frame page to the
- * documentation tree.
- *
- * @param ul the Content object to which the all modules link should be added
- */
- protected void addAllModulesLink(Content ul) {
- DocPath moduleOverviewFrame = configuration.useModuleDirectories
- ? DocPaths.DOT_DOT.resolve(DocPaths.MODULE_OVERVIEW_FRAME)
- : DocPaths.MODULE_OVERVIEW_FRAME;
- Content linkContent = links.createLink(moduleOverviewFrame,
- contents.allModulesLabel, "", "packageListFrame");
- Content li = HtmlTree.LI(linkContent);
- ul.add(li);
- }
-
- /**
- * {@inheritDoc}
- */
- protected void addNavigationBarFooter(Content footer) {
- Content p = HtmlTree.P(Contents.SPACE);
- footer.add(p);
- }
-}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -194,7 +194,7 @@
*/
@Override
public Content getModuleHeader(String heading) {
- HtmlTree bodyTree = getBody(true, getWindowTitle(mdle.getQualifiedName().toString()));
+ HtmlTree bodyTree = getBody(getWindowTitle(mdle.getQualifiedName().toString()));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setDisplaySummaryModuleDescLink(!utils.getFullBody(mdle).isEmpty() && !configuration.nocomment);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.formats.html;
-
-import java.util.*;
-
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
-import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
-import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-
-/**
- * Class to generate file for each package contents in the left-hand bottom
- * frame. This will list all the Class Kinds in the package. A click on any
- * class-kind will update the right-hand frame with the clicked class-kind page.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-public class PackageFrameWriter extends HtmlDocletWriter {
-
- /**
- * The package being documented.
- */
- private final PackageElement packageElement;
-
- /**
- * The classes to be documented. Use this to filter out classes
- * that will not be documented.
- */
- private SortedSet<TypeElement> documentedClasses;
-
- /**
- * Constructor to construct PackageFrameWriter object and to generate
- * "package-frame.html" file in the respective package directory.
- * For example for package "java.lang" this will generate file
- * "package-frame.html" file in the "java/lang" directory. It will also
- * create "java/lang" directory in the current or the destination directory
- * if it doesn't exist.
- *
- * @param configuration the configuration of the doclet.
- * @param packageElement PackageElement under consideration.
- */
- public PackageFrameWriter(HtmlConfiguration configuration, PackageElement packageElement) {
- super(configuration,
- configuration.docPaths.forPackage(packageElement).resolve(DocPaths.PACKAGE_FRAME));
- this.packageElement = packageElement;
- if (configuration.getSpecifiedPackageElements().isEmpty()) {
- documentedClasses = new TreeSet<>(utils.makeGeneralPurposeComparator());
- documentedClasses.addAll(configuration.getIncludedTypeElements());
- }
- }
-
- /**
- * Generate a package summary page for the left-hand bottom frame. Construct
- * the PackageFrameWriter object and then use it generate the file.
- *
- * @param configuration the current configuration of the doclet.
- * @param packageElement The package for which "pacakge-frame.html" is to be generated.
- * @throws DocFileIOException if there is a problem generating the package summary page
- */
- public static void generate(HtmlConfiguration configuration, PackageElement packageElement)
- throws DocFileIOException {
- PackageFrameWriter packgen = new PackageFrameWriter(configuration, packageElement);
- String pkgName = configuration.utils.getPackageName(packageElement);
- HtmlTree body = packgen.getBody(false, packgen.getWindowTitle(pkgName));
- Content pkgNameContent = new StringContent(pkgName);
- HtmlTree htmlTree = HtmlTree.MAIN();
- Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.bar,
- packgen.getTargetPackageLink(packageElement, "classFrame", pkgNameContent));
- htmlTree.add(heading);
- HtmlTree div = new HtmlTree(HtmlTag.DIV);
- div.setStyle(HtmlStyle.indexContainer);
- packgen.addClassListing(div);
- htmlTree.add(div);
- body.add(htmlTree);
- packgen.printHtmlDocument(
- configuration.metakeywords.getMetaKeywords(packageElement),
- getDescription("package summary (frame)", packageElement),
- body);
- }
-
- /**
- * Add class listing for all the classes in this package. Divide class
- * listing as per the class kind and generate separate listing for
- * Classes, Interfaces, Exceptions and Errors.
- *
- * @param contentTree the content tree to which the listing will be added
- */
- protected void addClassListing(HtmlTree contentTree) {
- BaseConfiguration config = configuration;
- if (utils.isSpecified(packageElement)) {
- addClassKindListing(utils.getInterfaces(packageElement),
- contents.interfaces, contentTree);
- addClassKindListing(utils.getOrdinaryClasses(packageElement),
- contents.classes, contentTree);
- addClassKindListing(utils.getEnums(packageElement),
- contents.enums, contentTree);
- addClassKindListing(utils.getExceptions(packageElement),
- contents.exceptions, contentTree);
- addClassKindListing(utils.getErrors(packageElement),
- contents.errors, contentTree);
- addClassKindListing(utils.getAnnotationTypes(packageElement),
- contents.annotationTypes, contentTree);
- } else {
- addClassKindListing(config.typeElementCatalog.interfaces(packageElement),
- contents.interfaces, contentTree);
- addClassKindListing(config.typeElementCatalog.ordinaryClasses(packageElement),
- contents.classes, contentTree);
- addClassKindListing(config.typeElementCatalog.enums(packageElement),
- contents.enums, contentTree);
- addClassKindListing(config.typeElementCatalog.exceptions(packageElement),
- contents.exceptions, contentTree);
- addClassKindListing(config.typeElementCatalog.errors(packageElement),
- contents.errors, contentTree);
- addClassKindListing(config.typeElementCatalog.annotationTypes(packageElement),
- contents.annotationTypes, contentTree);
- }
- }
-
- /**
- * Add specific class kind listing. Also add label to the listing.
- *
- * @param list list of specific class kinds, namely Class or Interface or Exception or Error
- * @param labelContent content tree of the label to be added
- * @param contentTree the content tree to which the class kind listing will be added
- */
- protected void addClassKindListing(Iterable<TypeElement> list, Content labelContent,
- HtmlTree contentTree) {
- SortedSet<TypeElement> tset = utils.filterOutPrivateClasses(list, configuration.javafx);
- if(!tset.isEmpty()) {
- boolean printedHeader = false;
- HtmlTree htmlTree = HtmlTree.SECTION();
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(labelContent);
- for (TypeElement typeElement : tset) {
- if (documentedClasses != null && !documentedClasses.contains(typeElement)) {
- continue;
- }
- if (!utils.isCoreClass(typeElement) || !configuration.isGeneratedDoc(typeElement)) {
- continue;
- }
- if (!printedHeader) {
- Content heading = HtmlTree.HEADING(Headings.CONTENT_HEADING,
- true, labelContent);
- htmlTree.add(heading);
- printedHeader = true;
- }
- Content arr_i_name = new StringContent(utils.getSimpleName(typeElement));
- if (utils.isInterface(typeElement))
- arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, arr_i_name);
- Content link = getLink(new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.PACKAGE_FRAME, typeElement).label(arr_i_name).target("classFrame"));
- Content li = HtmlTree.LI(link);
- ul.add(li);
- }
- htmlTree.add(ul);
- contentTree.add(htmlTree);
- }
- }
-}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.formats.html;
-
-import javax.lang.model.element.PackageElement;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
-import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-
-
-/**
- * Generate the package index for the left-hand frame in the generated output.
- * A click on the package name in this frame will update the page in the bottom
- * left hand frame with the listing of contents of the clicked package.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- *
- * @author Atul M Dambalkar
- */
-public class PackageIndexFrameWriter extends AbstractPackageIndexWriter {
- /**
- * The heading (h1 or h2) to use for the module list,
- * set by addNavigationBarHeader depending on whether or not there
- * is an additional initial heading.
- */
- private HtmlTag packageListHeading;
-
- /**
- * Construct the PackageIndexFrameWriter object.
- *
- * @param filename Name of the package index file to be generated.
- */
- public PackageIndexFrameWriter(HtmlConfiguration configuration, DocPath filename) {
- super(configuration, filename);
- }
-
- /**
- * Generate the package index file named "overview-frame.html".
- * @throws DocFileIOException
- */
- public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
- DocPath filename = DocPaths.OVERVIEW_FRAME;
- PackageIndexFrameWriter packgen = new PackageIndexFrameWriter(configuration, filename);
- packgen.buildPackageIndexFile("doclet.Window_Overview",
- "package index (frame)",
- false);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void addPackagesList(Content main) {
- Content heading = HtmlTree.HEADING(packageListHeading, true,
- contents.packagesLabel);
- HtmlTree htmlTree = HtmlTree.DIV(HtmlStyle.indexContainer, heading);
- HtmlTree ul = new HtmlTree(HtmlTag.UL);
- ul.setTitle(contents.packagesLabel);
- for (PackageElement aPackage : packages) {
- // Do not list the package if -nodeprecated option is set and the
- // package is marked as deprecated.
- if (aPackage != null &&
- (!(configuration.nodeprecated && utils.isDeprecated(aPackage)))) {
- ul.add(getPackage(aPackage));
- }
- }
- htmlTree.add(ul);
- main.add(htmlTree);
- }
-
- /**
- * Returns each package name as a separate link.
- *
- * @param pe PackageElement
- * @return content for the package link
- */
- protected Content getPackage(PackageElement pe) {
- Content packageLinkContent;
- Content packageLabel;
- if (pe.isUnnamed()) {
- packageLabel = new StringContent("<unnamed package>");
- packageLinkContent = links.createLink(DocPaths.PACKAGE_FRAME,
- packageLabel, "", "packageFrame");
- } else {
- packageLabel = getPackageLabel(pe.getQualifiedName());
- packageLinkContent = links.createLink(pathString(pe,
- DocPaths.PACKAGE_FRAME), packageLabel, "",
- "packageFrame");
- }
- Content li = HtmlTree.LI(packageLinkContent);
- return li;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void addNavigationBarHeader(Content header) {
- Content headerContent;
- if (configuration.packagesheader.length() > 0) {
- headerContent = new RawHtml(replaceDocRootDir(configuration.packagesheader));
- } else {
- headerContent = new RawHtml(replaceDocRootDir(configuration.header));
- }
- if (!headerContent.isEmpty()) {
- Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
- HtmlStyle.bar, headerContent);
- header.add(heading);
- packageListHeading = Headings.IndexFrames.PACKAGE_HEADING;
- } else {
- packageListHeading = Headings.PAGE_TITLE_HEADING;
- }
- }
-
- /**
- * Do nothing as there is no overview information in this page.
- */
- @Override
- protected void addOverviewHeader(Content body) {
- }
-
- /**
- * Adds "All Classes" link for the top of the left-hand frame page to the
- * documentation tree.
- *
- * @param ul the Content object to which the "All Classes" link should be added
- */
- @Override
- protected void addAllClassesLink(Content ul) {
- Content linkContent = links.createLink(DocPaths.ALLCLASSES_FRAME,
- contents.allClassesLabel, "", "packageFrame");
- Content li = HtmlTree.LI(linkContent);
- ul.add(li);
- }
-
- /**
- * Adds "All Modules" link for the top of the left-hand frame page to the
- * documentation tree.
- *
- * @param ul the Content object to which the "All Modules" link should be added
- */
- @Override
- protected void addAllModulesLink(Content ul) {
- Content linkContent = links.createLink(DocPaths.MODULE_OVERVIEW_FRAME,
- contents.allModulesLabel, "", "packageListFrame");
- Content li = HtmlTree.LI(linkContent);
- ul.add(li);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void addNavigationBarFooter(Content footer) {
- Content p = HtmlTree.P(Contents.SPACE);
- footer.add(p);
- }
-}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -42,9 +42,7 @@
import jdk.javadoc.internal.doclets.toolkit.util.Group;
/**
- * Generate the package index page "overview-summary.html" for the right-hand
- * frame. A click on the package name on this page will update the same frame
- * with the "package-summary.html" file for the clicked package.
+ * Generate the package index page "index.html".
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
@@ -70,15 +68,15 @@
}
/**
- * Generate the package index page for the right-hand frame.
+ * Generate the package index page.
*
* @param configuration the current configuration of the doclet.
* @throws DocFileIOException if there is a problem generating the package index page
*/
public static void generate(HtmlConfiguration configuration) throws DocFileIOException {
- DocPath filename = DocPaths.overviewSummary(configuration.frames);
+ DocPath filename = DocPaths.INDEX;
PackageIndexWriter packgen = new PackageIndexWriter(configuration, filename);
- packgen.buildPackageIndexFile("doclet.Window_Overview_Summary", "package index", true);
+ packgen.buildPackageIndexFile("doclet.Window_Overview_Summary", "package index");
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -131,7 +131,7 @@
protected HtmlTree getPackageTreeHeader() {
String packageName = packageElement.isUnnamed() ? "" : utils.getPackageName(packageElement);
String title = packageName + " " + resources.getText("doclet.Window_Class_Hierarchy");
- HtmlTree bodyTree = getBody(true, getWindowTitle(title));
+ HtmlTree bodyTree = getBody(getWindowTitle(title));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -237,7 +237,7 @@
String packageText = resources.getText("doclet.Package");
String name = packageElement.isUnnamed() ? "" : utils.getPackageName(packageElement);
String title = resources.getText("doclet.Window_ClassUse_Header", packageText, name);
- HtmlTree bodyTree = getBody(true, getWindowTitle(title));
+ HtmlTree bodyTree = getBody(getWindowTitle(title));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -105,7 +105,7 @@
*/
@Override
public Content getPackageHeader(String heading) {
- HtmlTree bodyTree = getBody(true, getWindowTitle(utils.getPackageName(packageElement)));
+ HtmlTree bodyTree = getBody(getWindowTitle(utils.getPackageName(packageElement)));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -78,7 +78,7 @@
* @return the body content tree
*/
public Content getHeader(String header) {
- HtmlTree bodyTree = getBody(true, getWindowTitle(header));
+ HtmlTree bodyTree = getBody(getWindowTitle(header));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -92,7 +92,7 @@
*/
protected void generateIndexFile() throws DocFileIOException {
String title = resources.getText("doclet.Window_Single_Index");
- HtmlTree body = getBody(true, getWindowTitle(title));
+ HtmlTree body = getBody(getWindowTitle(title));
HtmlTree header = HtmlTree.HEADER();
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -120,7 +120,7 @@
protected void generateIndexFile(Character unicode) throws DocFileIOException {
String title = resources.getText("doclet.Window_Split_Index",
unicode.toString());
- HtmlTree body = getBody(true, getWindowTitle(title));
+ HtmlTree body = getBody(getWindowTitle(title));
HtmlTree header = HtmlTree.HEADER();
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java Tue Apr 02 10:57:57 2019 +0530
@@ -175,7 +175,7 @@
*/
protected HtmlTree getTreeHeader() {
String title = resources.getText("doclet.Window_Class_Hierarchy");
- HtmlTree bodyTree = getBody(true, getWindowTitle(title));
+ HtmlTree bodyTree = getBody(getWindowTitle(title));
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java Tue Apr 02 10:57:57 2019 +0530
@@ -824,7 +824,7 @@
private void addOverviewLink(Content tree) {
if (configuration.createoverview) {
- tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.overviewSummary(configuration.frames)),
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.INDEX),
contents.overviewLabel, "", "")));
}
}
@@ -930,27 +930,6 @@
}
}
- /**
- * Add "FRAMES" link, to switch to the frame version of the output.
- *
- * @param tree the content tree to which the link will be added
- */
- private void addNavShowLists(Content tree) {
- DocLink dl = new DocLink(pathToRoot.resolve(DocPaths.INDEX), path.getPath(), null);
- Content framesContent = links.createLink(dl, contents.framesLabel, "", "_top");
- tree.add(HtmlTree.LI(framesContent));
- }
-
- /**
- * Add "NO FRAMES" link, to switch to the non-frame version of the output.
- *
- * @param tree the content tree to which the link will be added
- */
- private void addNavHideLists(Content tree) {
- Content noFramesContent = links.createLink(path.basename(), contents.noFramesLabel, "", "_top");
- tree.add(HtmlTree.LI(noFramesContent));
- }
-
private void addSearch(Content tree) {
String searchValueId = "search";
String reset = "reset";
@@ -1018,15 +997,6 @@
ulNavDetail.setStyle(HtmlStyle.subNavList);
addDetailLinks(ulNavDetail);
div.add(ulNavDetail);
- HtmlTree ulFrames = new HtmlTree(HtmlTag.UL);
- ulFrames.setStyle(HtmlStyle.navList);
- if (!configuration.nonavbar) {
- if (configuration.frames) {
- addNavShowLists(ulFrames);
- addNavHideLists(ulFrames);
- }
- }
- div.add(ulFrames);
subDiv.add(div);
if (top && configuration.createindex) {
addSearch(subDiv);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js Tue Apr 02 10:57:57 2019 +0530
@@ -77,7 +77,7 @@
$(this).val(watermark).addClass('watermark');
}
});
- $("#search").on('click keydown', function() {
+ $("#search").on('click keydown paste', function() {
if ($(this).val() == watermark) {
$(this).val('').removeClass('watermark');
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties Tue Apr 02 10:57:57 2019 +0530
@@ -1,7 +1,6 @@
doclet.build_version=Standard Doclet version {0}
doclet.Contents=Contents
doclet.Overview=Overview
-doclet.Window_Overview=Overview List
doclet.Window_Overview_Summary=Overview
doclet.Element=Element
doclet.Package=Package
@@ -167,10 +166,6 @@
doclet.help.index.body=\
The {0} contains an alphabetic index of all classes, interfaces, constructors, methods, \
and fields, as well as lists of all packages and all classes.
-doclet.help.frames.head=\
- Frames/No Frames
-doclet.help.frames.body=\
- These links show and hide the HTML frames. All pages are available with or without frames.
doclet.help.serial_form.body=\
Each serializable or externalizable class has a description of its serialization fields and \
methods. This information is of interest to re-implementors, not to developers using the API. \
@@ -446,9 +441,7 @@
of the given package. Prefix the package specifier with - to\n\
disable checks for the specified packages.
-# L10N: do not localize the option names --frames
-doclet.Frames_specified=\
- You have specified to generate frames, by using the --frames option.\n\
- The default is currently to not generate frames and the support for \n\
- frames will be removed in a future release.\n\
- To suppress this warning, remove the --frames option and avoid the use of frames.
+# L10N: do not localize the option names --no-frames
+doclet.NoFrames_specified=\
+ The --no-frames option is no longer required and may be removed\n\
+ in a future release.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties Tue Apr 02 10:57:57 2019 +0530
@@ -124,8 +124,6 @@
doclet.All_Classes=All Classes
doclet.All_Superinterfaces=All Superinterfaces:
doclet.All_Implemented_Interfaces=All Implemented Interfaces:
-doclet.All_classes_and_interfaces=All classes and interfaces (except non-static nested types)
-doclet.Package_class_and_interface_descriptions=Package, class and interface descriptions
doclet.Interface=Interface
doclet.Class=Class
doclet.AnnotationType=Annotation Type
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js Tue Apr 02 10:57:57 2019 +0530
@@ -150,10 +150,6 @@
}
}
-function updateModuleFrame(pFrame, cFrame) {
- top.packageFrame.location = pFrame;
- top.classFrame.location = cFrame;
-}
function switchTab(e) {
if (e.keyCode == 37 || e.keyCode == 38) {
$("[aria-selected=true]").prev().click().focus();
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Tue Apr 02 10:57:57 2019 +0530
@@ -59,7 +59,6 @@
}
h3 {
font-size:16px;
- font-style:italic;
}
h4 {
font-size:13px;
@@ -296,32 +295,21 @@
/*
* Styles for headings.
*/
-div.details ul.blockList ul.blockList ul.blockList li.blockList h3,
-div.details ul.blockList ul.blockList ul.blockListLast li.blockList h3,
-div.serializedFormContainer ul.blockList ul.blockList ul.blockList li.blockList h4 {
+body.class-declaration .summary h2,
+body.class-declaration .details h2,
+body.class-use h2,
+body.module-declaration .blockList h2 {
+ font-style: italic;
+ padding:0;
+ margin:15px 0;
+}
+body.class-declaration .summary h3,
+body.class-declaration .details h3 {
background-color:#dee3e9;
border:1px solid #d0d9e0;
margin:0 0 6px -8px;
padding:7px 5px;
}
-div.details h2,
-div.summary h2 {
- font-style: italic;
-}
-div.details h3,
-div.summary h3 {
- font-style: normal;
-}
-ul.blockList ul.blockList ul.blockList li.blockList h2 {
- background-color:#dee3e9;
- border:1px solid #d0d9e0;
- margin:0 0 6px -8px;
- padding:7px 5px;
-}
-ul.blockList ul.blockList li.blockList h2 {
- padding:0;
- margin:15px 0;
-}
/*
* Styles for page layout containers.
*/
@@ -604,10 +592,6 @@
.docSummary {
padding:0;
}
-ul.blockList ul.blockList ul.blockList li.blockList h3,
-ul.blockList ul.blockList ul.blockListLast li.blockList h3 {
- font-style:normal;
-}
div.block {
font-size:14px;
font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
@@ -659,9 +643,6 @@
div.block div.block span.interfaceName {
font-style:normal;
}
-div.contentContainer ul.blockList li.blockList h2 {
- padding-bottom:0px;
-}
/*
* Styles for IFRAME.
*/
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java Tue Apr 02 10:57:57 2019 +0530
@@ -51,25 +51,12 @@
public static final DocPath DOT_DOT = DocPath.create("..");
- /** The name of the file for all classes, without using frames, when --no-frames is specified. */
- public static final DocPath ALLCLASSES = DocPath.create("allclasses.html");
-
- /** The name of the file for all classes, using frames. */
- public static final DocPath ALLCLASSES_FRAME = DocPath.create("allclasses-frame.html");
-
/** The name of the file for all classes index. */
public static final DocPath ALLCLASSES_INDEX = DocPath.create("allclasses-index.html");
/** The name of the file for all packages index. */
public static final DocPath ALLPACKAGES_INDEX = DocPath.create("allpackages-index.html");
- /** The name of the file for all classes, without using frames. */
- public static final DocPath ALLCLASSES_NOFRAME = DocPath.create("allclasses-noframe.html");
-
- public static DocPath AllClasses(boolean frames) {
- return frames ? ALLCLASSES_NOFRAME : ALLCLASSES;
- }
-
/** The name of the sub-directory for storing class usage info. */
public static final DocPath CLASS_USE = DocPath.create("class-use");
@@ -163,22 +150,12 @@
/** The name of the module search index js file. */
public static final DocPath MODULE_SEARCH_INDEX_JS = DocPath.create("module-search-index.js");
- /** The name of the file for the overview frame. */
- public static final DocPath OVERVIEW_FRAME = DocPath.create("overview-frame.html");
-
/** The name of the file for the overview summary. */
public static final DocPath OVERVIEW_SUMMARY = DocPath.create("overview-summary.html");
- public static DocPath overviewSummary(boolean frames) {
- return frames ? OVERVIEW_SUMMARY : INDEX;
- }
-
/** The name of the file for the overview tree. */
public static final DocPath OVERVIEW_TREE = DocPath.create("overview-tree.html");
- /** The name of the file for the package frame. */
- public static final DocPath PACKAGE_FRAME = DocPath.create("package-frame.html");
-
/** The name of the file for the package list. This is to support the legacy mode. */
public static final DocPath PACKAGE_LIST = DocPath.create("package-list");
@@ -306,15 +283,6 @@
}
/**
- * The path for the file for a module's frame page.
- * @param mdle the module
- * @return the path
- */
- public DocPath moduleFrame(ModuleElement mdle) {
- return createModulePath(mdle, "frame.html");
- }
-
- /**
* The path for the file for a module's summary page.
* @param mdle the module
* @return the path
@@ -332,15 +300,6 @@
return createModulePath(mdleName, "summary.html");
}
- /**
- * The path for the file for a module's type frame page.
- * @param mdle the module
- * @return the path
- */
- public DocPath moduleTypeFrame(ModuleElement mdle) {
- return createModulePath(mdle, "type-frame.html");
- }
-
private DocPath createModulePath(ModuleElement mdle, String path) {
return DocPath.create(mdle.getQualifiedName() + moduleSeparator + path);
}
@@ -349,9 +308,6 @@
return DocPath.create(moduleName + moduleSeparator + path);
}
- /** The name of the file for the module overview frame. */
- public static final DocPath MODULE_OVERVIEW_FRAME = DocPath.create("module-overview-frame.html");
-
/** The name of the sub-package from which resources are read. */
public static final DocPath RESOURCES = DocPath.create("resources");
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -33,10 +33,11 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.TreeSet;
+import java.util.Set;
import com.sun.jdi.BooleanType;
import com.sun.jdi.BooleanValue;
@@ -110,7 +111,7 @@
// tested unsynchronized (since once true, it stays true), but must
// be set synchronously
private Map<Long, ReferenceType> typesByID;
- private TreeSet<ReferenceType> typesBySignature;
+ private Set<ReferenceType> typesBySignature;
private boolean retrievedAllTypes = false;
private Map<Long, ModuleReference> modulesByID;
@@ -843,14 +844,9 @@
throw new InternalException("Invalid reference type tag");
}
- /*
- * If a signature was specified, make sure to set it ASAP, to
- * prevent any needless JDWP command to retrieve it. (for example,
- * typesBySignature.add needs the signature, to maintain proper
- * ordering.
- */
- if (signature != null) {
- type.setSignature(signature);
+ if (signature == null && retrievedAllTypes) {
+ // do not cache if signature is not provided
+ return type;
}
typesByID.put(id, type);
@@ -920,7 +916,7 @@
private void initReferenceTypes() {
typesByID = new HashMap<>(300);
- typesBySignature = new TreeSet<>();
+ typesBySignature = new HashSet<>();
}
ReferenceTypeImpl referenceType(long ref, byte tag) {
@@ -969,6 +965,9 @@
if (retType == null) {
retType = addReferenceType(id, tag, signature);
}
+ if (signature != null) {
+ retType.setSignature(signature);
+ }
}
return retType;
}
--- a/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,13 +45,14 @@
private static Registry registry;
private static int port = -1;
private static boolean startRegistry = true;
+ private static RemoteHost remoteHost;
private static void printUsage() {
System.err.println("usage: jstatd [-nr] [-p port] [-n rminame]\n" +
" jstatd -?|-h|--help");
}
- static void bind(String name, RemoteHostImpl remoteHost)
+ static void bind(String name, RemoteHost remoteHost)
throws RemoteException, MalformedURLException, Exception {
try {
@@ -138,10 +139,10 @@
try {
// use 1.5.0 dynamically generated subs.
System.setProperty("java.rmi.server.ignoreSubClasses", "true");
- RemoteHostImpl remoteHost = new RemoteHostImpl();
+ remoteHost = new RemoteHostImpl();
RemoteHost stub = (RemoteHost) UnicastRemoteObject.exportObject(
remoteHost, 0);
- bind(name.toString(), remoteHost);
+ bind(name.toString(), stub);
System.out.println("jstatd started (bound to " + name.toString() + ")");
System.out.flush();
} catch (MalformedURLException e) {
--- a/src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteHostImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.jstatd/share/classes/sun/tools/jstatd/RemoteHostImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,7 @@
private MonitoredHost monitoredHost;
private Set<Integer> activeVms;
+ private static RemoteVm rvm;
public RemoteHostImpl() throws MonitorException {
try {
@@ -76,7 +77,7 @@
try {
VmIdentifier vmid = new VmIdentifier(vmidStr);
MonitoredVm mvm = monitoredHost.getMonitoredVm(vmid);
- RemoteVmImpl rvm = new RemoteVmImpl((BufferedMonitoredVm)mvm);
+ rvm = new RemoteVmImpl((BufferedMonitoredVm)mvm);
stub = (RemoteVm) UnicastRemoteObject.exportObject(rvm, 0);
}
catch (URISyntaxException e) {
--- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@
"\u5927\u6b63", // Taisho
"\u662d\u548c", // Showa
"\u5e73\u6210", // Heisei
- "\u5143\u53f7", // NewEra
+ "\u4ee4\u548c", // Reiwa
};
final String[] rocEras = {
"\u6c11\u56fd\u524d",
--- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -154,7 +154,7 @@
"\u5927\u6b63",
"\u662d\u548c",
"\u5e73\u6210",
- "\u5143\u53f7", // NewEra
+ "\u4ee4\u548c",
};
final String[] sharedJavaTimeShortEras = {
--- a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java Tue Apr 02 10:55:20 2019 +0530
+++ b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -465,7 +465,7 @@
if (state != ChannelState.PENDING)
throw new NoConnectionPendingException();
}
- int n = 0;
+ boolean connected = false;
try {
try {
begin();
@@ -477,26 +477,11 @@
receiverThread = NativeThread.current();
}
if (!isBlocking()) {
- for (;;) {
- n = Net.pollConnect(fd, 0);
- if ( (n == IOStatus.INTERRUPTED)
- && isOpen())
- continue;
- break;
- }
+ connected = Net.pollConnect(fd, 0);
} else {
- for (;;) {
- n = Net.pollConnect(fd, -1);
- if (n == 0) {
- // Loop in case of
- // spurious notifications
- continue;
- }
- if ( (n == IOStatus.INTERRUPTED)
- && isOpen())
- continue;
- break;
- }
+ do {
+ connected = Net.pollConnect(fd, -1);
+ } while (!connected && isOpen());
}
}
} finally {
@@ -504,16 +489,10 @@
receiverThread = 0;
if (state == ChannelState.KILLPENDING) {
kill();
- /* poll()/getsockopt() does not report
- * error (throws exception, with n = 0)
- * on Linux platform after dup2 and
- * signal-wakeup. Force n to 0 so the
- * end() can throw appropriate exception */
- n = 0;
+ connected = false;
}
}
- end((n > 0) || (n == IOStatus.UNAVAILABLE));
- assert IOStatus.check(n);
+ end(connected);
}
} catch (IOException x) {
/* If an exception was thrown, close the channel after
@@ -523,7 +502,7 @@
throw x;
}
- if (n > 0) {
+ if (connected) {
synchronized (stateLock) {
state = ChannelState.CONNECTED;
if (!isBound()) {
--- a/test/hotspot/gtest/gc/z/test_zForwarding.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/gtest/gc/z/test_zForwarding.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -70,10 +70,8 @@
for (uint32_t i = 0; i < entries_to_check; i++) {
uintptr_t from_index = SequenceToFromIndex::one_to_one(i);
- EXPECT_TRUE(forwarding->find(from_index).is_empty()) << CAPTURE2(from_index, size);
+ EXPECT_FALSE(forwarding->find(from_index).populated()) << CAPTURE2(from_index, size);
}
-
- EXPECT_TRUE(forwarding->find(uintptr_t(-1)).is_empty()) << CAPTURE(size);
}
static void find_full(ZForwarding* forwarding) {
@@ -86,7 +84,7 @@
ZForwardingCursor cursor;
ZForwardingEntry entry = forwarding->find(from_index, &cursor);
- ASSERT_TRUE(entry.is_empty()) << CAPTURE2(from_index, size);
+ ASSERT_FALSE(entry.populated()) << CAPTURE2(from_index, size);
forwarding->insert(from_index, from_index, &cursor);
}
@@ -96,7 +94,7 @@
uintptr_t from_index = SequenceToFromIndex::one_to_one(i);
ZForwardingEntry entry = forwarding->find(from_index);
- ASSERT_FALSE(entry.is_empty()) << CAPTURE2(from_index, size);
+ ASSERT_TRUE(entry.populated()) << CAPTURE2(from_index, size);
ASSERT_EQ(entry.from_index(), from_index) << CAPTURE(size);
ASSERT_EQ(entry.to_offset(), from_index) << CAPTURE(size);
@@ -113,7 +111,7 @@
ZForwardingCursor cursor;
ZForwardingEntry entry = forwarding->find(from_index, &cursor);
- ASSERT_TRUE(entry.is_empty()) << CAPTURE2(from_index, size);
+ ASSERT_FALSE(entry.populated()) << CAPTURE2(from_index, size);
forwarding->insert(from_index, from_index, &cursor);
}
@@ -124,7 +122,7 @@
ZForwardingCursor cursor;
ZForwardingEntry entry = forwarding->find(from_index, &cursor);
- ASSERT_FALSE(entry.is_empty()) << CAPTURE2(from_index, size);
+ ASSERT_TRUE(entry.populated()) << CAPTURE2(from_index, size);
ASSERT_EQ(entry.from_index(), from_index) << CAPTURE(size);
ASSERT_EQ(entry.to_offset(), from_index) << CAPTURE(size);
@@ -139,7 +137,7 @@
ZForwardingEntry entry = forwarding->find(from_index);
- ASSERT_TRUE(entry.is_empty()) << CAPTURE2(from_index, size);
+ ASSERT_FALSE(entry.populated()) << CAPTURE2(from_index, size);
}
}
--- a/test/hotspot/jtreg/ProblemList-graal.txt Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/ProblemList-graal.txt Tue Apr 02 10:57:57 2019 +0530
@@ -206,8 +206,6 @@
serviceability/tmtools/jstat/GcCapacityTest.java 8196611 generic-all
serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorMultiArrayTest.java 8196611 generic-all
-runtime/RedefineObject/TestRedefineObject.java 8218399 generic-all
-
vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock02/TestDescription.java 8218700 generic-all
vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java 8218701 generic-all
--- a/test/hotspot/jtreg/ProblemList.txt Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/ProblemList.txt Tue Apr 02 10:57:57 2019 +0530
@@ -80,7 +80,6 @@
# :hotspot_runtime
-runtime/handshake/HandshakeWalkSuspendExitTest.java 8214174 generic-all
runtime/NMT/CheckForProperDetailStackTrace.java 8218458 generic-all
runtime/SharedArchiveFile/SASymbolTableTest.java 8193639 solaris-all
runtime/containers/docker/TestCPUSets.java 8220672 generic-all
@@ -140,6 +139,13 @@
#############################################################################
+# :hotspot_gc_shenandoah
+
+gc/shenandoah/TestStringDedup.java 8220671,8221102 generic-all
+gc/shenandoah/TestStringDedupStress.java 8220671,8221102 generic-all
+
+#############################################################################
+
# :hotspot_misc
#############################################################################
@@ -162,6 +168,8 @@
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all
+vmTestbase/nsk/jdb/eval/eval001/eval001.java 8221503 generic-all
+
vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java 8208250 generic-all
vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
--- a/test/hotspot/jtreg/TEST.groups Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/TEST.groups Tue Apr 02 10:57:57 2019 +0530
@@ -321,6 +321,21 @@
runtime/appcds/ \
-:tier1_runtime_appcds
+# This group should be executed with "jtreg -Dtest.cds.run.with.jfr=true ..."
+# to test interaction between AppCDS and JFR. It also has the side effect of
+# testing JVMTI ClassFileLoadHook.
+#
+# The excluded tests disallow the jdk.jfr module, which is required to
+# run with JFR.
+hotspot_appcds_with_jfr = \
+ runtime/appcds/ \
+ -runtime/appcds/cacheObject/ArchivedModuleCompareTest.java \
+ -runtime/appcds/jigsaw/classpathtests/BootAppendTests.java \
+ -runtime/appcds/jigsaw/classpathtests/ClassPathTests.java \
+ -runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java \
+ -runtime/appcds/jigsaw/JigsawOptionsCombo.java \
+ -runtime/appcds/jigsaw/modulepath/MainModuleOnly.java
+
tier1_serviceability = \
serviceability/dcmd/compiler \
-serviceability/dcmd/compiler/CompilerQueueTest.java \
--- a/test/hotspot/jtreg/compiler/codecache/stress/Helper.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/compiler/codecache/stress/Helper.java Tue Apr 02 10:57:57 2019 +0530
@@ -40,7 +40,7 @@
public static final Random RNG = Utils.getRandomInstance();
private static final long THRESHOLD = WHITE_BOX.getIntxVMFlag("CompileThreshold");
- private static final String TEST_CASE_IMPL_CLASS_NAME = "compiler.codecache.stress.Helper$TestCaseImpl";
+ private static final String TEST_CASE_IMPL_CLASS_NAME = "compiler.codecache.stress.TestCaseImpl";
private static byte[] CLASS_DATA;
static {
try {
@@ -109,34 +109,4 @@
int method();
int expectedValue();
}
-
- public static class TestCaseImpl implements TestCase {
- private static final int RETURN_VALUE = 42;
- private static final int RECURSION_DEPTH = 10;
- private volatile int i;
-
- @Override
- public Callable<Integer> getCallable() {
- return () -> {
- i = 0;
- return method();
- };
- }
-
- @Override
- public int method() {
- ++i;
- int result = RETURN_VALUE;
- if (i < RECURSION_DEPTH) {
- return result + method();
- }
- return result;
- }
-
- @Override
- public int expectedValue() {
- return RETURN_VALUE * RECURSION_DEPTH;
- }
- }
-
}
--- a/test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/compiler/codecache/stress/RandomAllocationTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -29,7 +29,7 @@
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build sun.hotspot.WhiteBox
+ * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -29,7 +29,7 @@
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build sun.hotspot.WhiteBox
+ * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/codecache/stress/TestCaseImpl.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.codecache.stress;
+
+import java.util.concurrent.Callable;
+
+public class TestCaseImpl implements Helper.TestCase {
+ private static final int RETURN_VALUE = 42;
+ private static final int RECURSION_DEPTH = 10;
+ private volatile int i;
+
+ @Override
+ public Callable<Integer> getCallable() {
+ return () -> {
+ i = 0;
+ return method();
+ };
+ }
+
+ @Override
+ public int method() {
+ ++i;
+ int result = RETURN_VALUE;
+ if (i < RECURSION_DEPTH) {
+ return result + method();
+ }
+ return result;
+ }
+
+ @Override
+ public int expectedValue() {
+ return RETURN_VALUE * RECURSION_DEPTH;
+ }
+}
--- a/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -29,7 +29,7 @@
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build sun.hotspot.WhiteBox
+ * @build sun.hotspot.WhiteBox compiler.codecache.stress.Helper compiler.codecache.stress.TestCaseImpl
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/codegen/TestOopCmp.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2019 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8221083
+ * @requires vm.gc.Serial
+ * @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
+ * @summary On ppc64, C1 erroneously emits a 32-bit compare instruction for oop compares.
+ * @modules java.base/jdk.internal.misc:+open
+ * @library /test/lib /
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbatch -XX:-UseTLAB -Xmx4m -XX:+UseSerialGC -XX:HeapBaseMinAddress=0x700000000
+ * -XX:CompileCommand=compileonly,compiler.codegen.TestOopCmp::nullTest
+ * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * compiler.codegen.TestOopCmp
+ * @author volker.simonis@gmail.com
+ */
+
+package compiler.codegen;
+
+import sun.hotspot.WhiteBox;
+
+public class TestOopCmp {
+
+ private static Object nullObj = null;
+
+ public static boolean nullTest(Object o) {
+ if (o == nullObj) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public static void main(String args[]) {
+
+ WhiteBox WB = WhiteBox.getWhiteBox();
+
+ // The test is started with -XX:HeapBaseMinAddress=0x700000000 and a
+ // small heap of only 4mb. This works pretty reliable and at least on
+ // Linux/Windows/Solaris we will get a heap starting at 0x700000000.
+ // The test also runs with -XX:+UseSerialGC which means that we'll get
+ // eden starting at 0x700000000.
+ // Calling 'System.gc()' will clean up all the objects from eden, so if
+ // eden starts at 0x700000000 the first allocation right after the
+ // system GC will be allcoated right at address 0x700000000.
+ System.gc();
+ String s = new String("I'm not null!!!");
+ if (WB.getObjectAddress(s) == 0x700000000L) {
+ System.out.println("Got object at address 0x700000000");
+ }
+
+ // We call 'nullTest()' with the newly allocated String object. If it was
+ // allocated at 0x700000000, its 32 least-significant bits will be 0 and a
+ // 32-bit comparison with 'nullObj' (which is 'null') will yield true and
+ // result in a test failure.
+ // If the code generated for 'nullTest()' correctly performs a 64-bit
+ // comparison or if we didn't manage to allcoate 's' at 0x700000000 the
+ // test will always succeed.
+ for (int i = 0; i < 30_000; i++) {
+ if (nullTest(s)) {
+ throw new RuntimeException("Comparing non-null object with null returned 'true'");
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package gc.g1;
+
+/*
+ * @test TestLargePageUseForHeap.java
+ * @summary Test that Java heap is allocated using large pages of the appropriate size if available.
+ * @bug 8221517
+ * @key gc
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @requires vm.gc.G1
+ * @requires os.family != "solaris"
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ -XX:+IgnoreUnrecognizedVMOptions -XX:+UseLargePages gc.g1.TestLargePageUseForHeap
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
+import sun.hotspot.WhiteBox;
+
+public class TestLargePageUseForHeap {
+ static long largePageSize;
+ static long smallPageSize;
+
+ static void checkSize(OutputAnalyzer output, long expectedSize, String pattern) {
+ String pageSizeStr = output.firstMatch(pattern, 1);
+
+ if (pageSizeStr == null) {
+ output.reportDiagnosticSummary();
+ throw new RuntimeException("Match from '" + pattern + "' got 'null' expected: " + expectedSize);
+ }
+
+ long size = parseMemoryString(pageSizeStr);
+ if (size != expectedSize) {
+ output.reportDiagnosticSummary();
+ throw new RuntimeException("Match from '" + pattern + "' got " + size + " expected: " + expectedSize);
+ }
+ }
+
+ static boolean checkLargePageEnabled(OutputAnalyzer output) {
+ // This message is printed when tried to reserve a memory with large page but it failed.
+ String errorStr = "Reserve regular memory without large pages";
+ String heapPattern = ".*Heap: ";
+ // If errorStr is printed just before heap page log, reservation for Java Heap is failed.
+ String result = output.firstMatch(errorStr + "\n" + heapPattern);
+ if (result != null) {
+ return false;
+ }
+ return true;
+ }
+
+ static void checkHeap(OutputAnalyzer output, long expectedPageSize) throws Exception {
+ checkSize(output, expectedPageSize, "Heap: .*page_size=([^ ]+)");
+ }
+
+ static void testVM(long regionSize) throws Exception {
+ ProcessBuilder pb;
+ // Test with large page enabled.
+ pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
+ "-XX:G1HeapRegionSize=" + regionSize,
+ "-Xmx128m",
+ "-Xlog:pagesize,gc+heap+coops=debug",
+ "-XX:+UseLargePages",
+ "-version");
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ boolean largePageEnabled = checkLargePageEnabled(output);
+ checkHeap(output, largePageEnabled ? largePageSize : smallPageSize);
+ output.shouldHaveExitValue(0);
+
+ // Test with large page disabled.
+ pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
+ "-XX:G1HeapRegionSize=" + regionSize,
+ "-Xmx128m",
+ "-Xlog:pagesize,gc+heap+coops=debug",
+ "-XX:-UseLargePages",
+ "-version");
+
+ output = new OutputAnalyzer(pb.start());
+ checkHeap(output, smallPageSize);
+ output.shouldHaveExitValue(0);
+ }
+
+ public static void main(String[] args) throws Exception {
+ WhiteBox wb = WhiteBox.getWhiteBox();
+ smallPageSize = wb.getVMPageSize();
+ largePageSize = wb.getVMLargePageSize();
+
+ if (largePageSize == 0) {
+ throw new SkippedException("Large page support does not seem to be available on this platform.");
+ }
+ if (largePageSize == smallPageSize) {
+ throw new SkippedException("Large page support does not seem to be available on this platform."
+ + "Small and large page size are the same.");
+ }
+
+ // G1HeapRegionSize=1MB
+ testVM(1 * 1024 * 1024);
+
+ // G1HeapRegionSize=2MB
+ testVM(2 * 1024 * 1024);
+
+ // G1HeapRegionSize=8MB
+ testVM(8 * 1024 * 1024);
+ }
+
+ public static long parseMemoryString(String value) {
+ long multiplier = 1;
+
+ if (value.endsWith("B")) {
+ multiplier = 1;
+ } else if (value.endsWith("K")) {
+ multiplier = 1024;
+ } else if (value.endsWith("M")) {
+ multiplier = 1024 * 1024;
+ } else if (value.endsWith("G")) {
+ multiplier = 1024 * 1024 * 1024;
+ } else {
+ throw new IllegalArgumentException("Expected memory string '" + value + "'to end with either of: B, K, M, G");
+ }
+
+ long longValue = Long.parseUnsignedLong(value.substring(0, value.length() - 1));
+
+ return longValue * multiplier;
+ }
+}
+
--- a/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java Tue Apr 02 10:57:57 2019 +0530
@@ -174,9 +174,9 @@
private static void verifyType(CollectionInfo ci, boolean shouldExist, String pattern) {
if (shouldExist) {
- Asserts.assertTrue(ci.containsVerification(pattern), "Missing expected verification for: " + ci.getName());
+ Asserts.assertTrue(ci.containsVerification(pattern), "Missing expected verification pattern " + pattern + " for: " + ci.getName());
} else {
- Asserts.assertFalse(ci.containsVerification(pattern), "Found unexpected verification for: " + ci.getName());
+ Asserts.assertFalse(ci.containsVerification(pattern), "Found unexpected verification pattern " + pattern + " for: " + ci.getName());
}
}
--- a/test/hotspot/jtreg/runtime/CreateMirror/ArraysNewInstanceBug.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/CreateMirror/ArraysNewInstanceBug.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
// This test crashes in compiled code with race, because the compiler generates code that assumes this ordering.
import java.lang.reflect.Array;
+import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
@@ -55,13 +56,13 @@
public static void main(String[] args) throws Throwable {
Class<?> c = ArraysNewInstanceBug.class;
- ClassLoader apploader = c.getClassLoader();
+ ClassLoader apploader = c.getClassLoader();
+ File testClasses = new File(System.getProperty("test.classes"));
for (int iter = 0; iter < 10 ; iter++) { // 10 is enough to get it to crash on my machine.
System.err.print('[');
classes = new Class<?>[1000];
- String urlpath = "file://" + System.getProperty("test.classes") + "/";
for (int i = 0; i < classes.length; i++) {
- ClassLoader loader = new URLClassLoader(new URL[] { new URL(urlpath) }, apploader.getParent());
+ ClassLoader loader = new URLClassLoader(new URL[] { testClasses.toURI().toURL() }, apploader.getParent());
classes[i] = loader.loadClass(c.getSimpleName());
}
System.err.print(']');
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileRedirectTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, SAP. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8220786
+ * @summary Test ErrorFileToStderr and ErrorFileToStdout
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @requires (vm.debug == true)
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class ErrorFileRedirectTest {
+
+ public static void do_test(boolean redirectStdout, boolean redirectStderr) throws Exception {
+
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx64M",
+ "-XX:-CreateCoredumpOnCrash",
+ "-XX:ErrorHandlerTest=14",
+ "-XX:" + (redirectStdout ? "+" : "-") + "ErrorFileToStdout",
+ "-XX:" + (redirectStderr ? "+" : "-") + "ErrorFileToStderr",
+ "-version");
+
+ OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
+
+ // we should have crashed with a SIGSEGV
+ output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
+ output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
+
+ // If no redirection happened, we should find a mention of the file in the output.
+ String hs_err_file = output_detail.firstMatch("# *(\\S*hs_err_pid\\d+\\.log)", 1);
+ if (redirectStdout == false && redirectStderr == false) {
+ if (hs_err_file == null) {
+ throw new RuntimeException("Expected hs-err file but none found.");
+ } else {
+ System.out.println("Found hs error file mentioned as expected: " + hs_err_file);
+ }
+ } else {
+ if (hs_err_file != null) {
+ throw new RuntimeException("Found unexpected mention of hs-err file (we did redirect the output so no file should have been written).");
+ } else {
+ System.out.println("No mention of an hs-err file - ok! ");
+ }
+ }
+
+ // Check the output. Note that since stderr was specified last it has preference if both are set.
+ if (redirectStdout == true && redirectStderr == false) {
+ output_detail.stdoutShouldContain("--------------- S U M M A R Y ------------");
+ output_detail.stderrShouldNotContain("--------------- S U M M A R Y ------------");
+ System.out.println("Found report on stderr - ok! ");
+ } else if (redirectStderr == true) {
+ output_detail.stderrShouldContain("--------------- S U M M A R Y ------------");
+ output_detail.stdoutShouldNotContain("--------------- S U M M A R Y ------------");
+ System.out.println("Found report on stdout - ok! ");
+ }
+
+ System.out.println("OK.");
+
+ }
+
+ public static void main(String[] args) throws Exception {
+ do_test(false, false);
+ do_test(false, true);
+ do_test(true, false);
+ do_test(true, true);
+ }
+
+}
+
+
--- a/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java Tue Apr 02 10:57:57 2019 +0530
@@ -67,7 +67,7 @@
}
output.shouldContain("Virtual space:");
output.shouldContain("Chunk freelists:");
-
+ output.shouldMatch("MaxMetaspaceSize:.*201.00.*MB");
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace"});
output = new OutputAnalyzer(pb.start());
--- a/test/hotspot/jtreg/runtime/Thread/SuspendAtExit.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/Thread/SuspendAtExit.java Tue Apr 02 10:57:57 2019 +0530
@@ -26,6 +26,7 @@
* @bug 8167108
* @summary Stress test java.lang.Thread.suspend() at thread exit.
* @run main/othervm -Xlog:thread+smr=debug SuspendAtExit
+ * @run main/othervm -Xlog:thread+smr=debug -XX:+UnlockDiagnosticVMOptions -XX:GuaranteedSafepointInterval=1 -XX:+HandshakeALot SuspendAtExit
*/
import java.util.concurrent.CountDownLatch;
--- a/test/hotspot/jtreg/runtime/appcds/TestCommon.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/TestCommon.java Tue Apr 02 10:57:57 2019 +0530
@@ -145,6 +145,15 @@
return executeAndLog(pb, "dump");
}
+ // This allows you to run the AppCDS tests with JFR enabled at runtime (though not at
+ // dump time, as that's uncommon for typical AppCDS users).
+ //
+ // To run in this special mode, add the following to your jtreg command-line
+ // -Dtest.cds.run.with.jfr=true
+ //
+ // Some AppCDS tests are not compatible with this mode. See the group
+ // hotspot_appcds_with_jfr in ../../TEST.ROOT for details.
+ private static final boolean RUN_WITH_JFR = Boolean.getBoolean("test.cds.run.with.jfr");
// Execute JVM using AppCDS archive with specified AppCDSOptions
public static OutputAnalyzer runWithArchive(AppCDSOptions opts)
@@ -166,6 +175,22 @@
for (String s : opts.suffix) cmd.add(s);
+ if (RUN_WITH_JFR) {
+ boolean usesJFR = false;
+ for (String s : cmd) {
+ if (s.startsWith("-XX:StartFlightRecording=") || s.startsWith("-XX:FlightRecorderOptions")) {
+ System.out.println("JFR option might have been specified. Don't interfere: " + s);
+ usesJFR = true;
+ break;
+ }
+ }
+ if (!usesJFR) {
+ System.out.println("JFR option not specified. Enabling JFR ...");
+ cmd.add(0, "-XX:StartFlightRecording=dumponexit=true");
+ System.out.println(cmd);
+ }
+ }
+
String[] cmdLine = cmd.toArray(new String[cmd.size()]);
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, cmdLine);
return executeAndLog(pb, "exec");
--- a/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
* @compile test-classes/Hello.java test-classes/CustomLoadee.java
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller -jar hello.jar Hello
@@ -43,6 +41,9 @@
public class HelloCustom {
public static void main(String[] args) throws Exception {
+ run();
+ }
+ public static void run(String... extra_runtime_args) throws Exception {
String wbJar = ClassFileInstaller.getJarPath("WhiteBox.jar");
String use_whitebox_jar = "-Xbootclasspath/a:" + wbJar;
@@ -62,11 +63,12 @@
use_whitebox_jar);
output = TestCommon.exec(appJar,
- // command-line arguments ...
- use_whitebox_jar,
- "-XX:+UnlockDiagnosticVMOptions",
- "-XX:+WhiteBoxAPI",
- "Hello", customJarPath);
+ TestCommon.concat(extra_runtime_args,
+ // command-line arguments ...
+ use_whitebox_jar,
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+WhiteBoxAPI",
+ "Hello", customJarPath));
TestCommon.checkExec(output);
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom_JFR.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @summary Same as HelloCustom, but add -XX:StartFlightRecording=dumponexit=true to the runtime
+ * options. This makes sure that the shared classes are compatible with both
+ * JFR and JVMTI ClassFileLoadHook.
+ * @requires vm.hasJFR
+ * @requires vm.cds
+ * @requires vm.cds.custom.loaders
+ * @library /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @compile test-classes/Hello.java test-classes/CustomLoadee.java
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller -jar hello.jar Hello
+ * @run driver ClassFileInstaller -jar hello_custom.jar CustomLoadee
+ * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
+ * @run driver HelloCustom_JFR
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import sun.hotspot.WhiteBox;
+
+public class HelloCustom_JFR {
+ public static void main(String[] args) throws Exception {
+ HelloCustom.run("-XX:StartFlightRecording=dumponexit=true", "-Xlog:cds+jvmti=debug");
+ }
+}
+
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java Tue Apr 02 10:57:57 2019 +0530
@@ -93,6 +93,10 @@
}
public static void main(String... args) throws Exception {
+ run();
+ }
+
+ public static void run(String... extra_runtime_args) throws Exception {
// compile the modules and create the modular jar files
buildTestModule();
String appClasses[] = {MAIN_CLASS, APP_CLASS};
@@ -104,6 +108,7 @@
"-m", MAIN_MODULE);
TestCommon.checkDump(output);
String prefix[] = {"-Djava.class.path=", "-Xlog:class+load=trace"};
+ prefix = TestCommon.concat(prefix, extra_runtime_args);
// run with the archive with the --module-path the same as the one during
// dump time. The classes should be loaded from the archive.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @requires vm.hasJFR & vm.cds
+ * @library /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules jdk.compiler
+ * jdk.jartool/sun.tools.jar
+ * jdk.jlink
+ * @run driver ModulePathAndCP_JFR
+ * @summary Same as ModulePathAndCP, but add -XX:StartFlightRecording=dumponexit=true to the runtime
+ * options. This makes sure that the shared classes are compatible with both
+ * JFR and JVMTI ClassFileLoadHook.
+ */
+
+public class ModulePathAndCP_JFR {
+ public static void main(String... args) throws Exception {
+ ModulePathAndCP.run("-XX:StartFlightRecording=dumponexit=true", "-Xlog:cds+jvmti=debug");
+ }
+}
+
--- a/test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHook.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHook.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,14 @@
SHARING_ON_CFLH_ON
}
- public static void main(String args[]) {
+ public static void main(String args[]) throws Exception {
TestCaseId testCase = TestCaseId.valueOf(args[0]);
+ test1(testCase);
+ test2(testCase);
+ }
+
+ // Test rewriting the classfile data using CFLH
+ static void test1(TestCaseId testCase) {
WhiteBox wb = WhiteBox.getWhiteBox();
System.out.println("====== ClassFileLoadHook.main():testCase = " + testCase);
@@ -81,6 +87,20 @@
}
}
+ // Test the loading of classfile data for non-boot shared classes from jrt:/xxx.
+ // See JDK-8221351.
+ static void test2(TestCaseId testCase) throws Exception {
+ WhiteBox wb = WhiteBox.getWhiteBox();
+ Class c = Class.forName("java.sql.SQLException"); // defined by platform class loader.
+
+ switch (testCase) {
+ case SHARING_ON_CFLH_OFF:
+ case SHARING_AUTO_CFLH_ON:
+ case SHARING_ON_CFLH_ON:
+ assertTrue(wb.isSharedClass(c), "must be shared");
+ }
+ }
+
private static void assertTrue(boolean expr, String msg) {
if (!expr)
throw new RuntimeException(msg);
--- a/test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHookTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jvmti/ClassFileLoadHookTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,6 @@
* @summary Test jvmti class file loader hook interaction with AppCDS
* @library /test/lib /test/hotspot/jtreg/runtime/appcds
* @requires vm.cds
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
* @build ClassFileLoadHook
* @run main/othervm/native ClassFileLoadHookTest
*/
@@ -46,7 +43,8 @@
"ClassFileLoadHook",
"ClassFileLoadHook$TestCaseId",
"ClassFileLoadHook$1",
- "LoadMe"
+ "LoadMe",
+ "java/sql/SQLException"
};
public static void main(String[] args) throws Exception {
--- a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationApp.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationApp.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.io.File;
+import java.io.FileWriter;
import java.security.CodeSigner;
import java.security.CodeSource;
import java.security.ProtectionDomain;
@@ -140,8 +141,22 @@
}
static void waitAttach(String flagFile) throws Throwable {
+ // See InstrumentationTest.java for the hand-shake protocol.
if (!flagFile.equals("noattach")) {
File f = new File(flagFile);
+ try (FileWriter fw = new FileWriter(f)) {
+ long pid = ProcessHandle.current().pid();
+ System.out.println("my pid = " + pid);
+ fw.write(Long.toString(pid));
+ fw.write("\n");
+ for (int i=0; i<10; i++) {
+ // Parent process waits until we have written more than 100 bytes, so it won't
+ // read a partial pid
+ fw.write("==========");
+ }
+ fw.close();
+ }
+
long start = System.currentTimeMillis();
while (f.exists()) {
long elapsed = System.currentTimeMillis() - start;
--- a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,6 @@
* @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes
* @requires vm.cds
* @requires vm.flavor != "minimal"
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
* @build sun.hotspot.WhiteBox
* InstrumentationApp
* InstrumentationClassFileTransformer
@@ -43,10 +40,9 @@
// Note: Util is from /test/hotspot/jtreg/runtime/appcds/test-classes/TestCommon.java
import com.sun.tools.attach.VirtualMachine;
-import com.sun.tools.attach.VirtualMachineDescriptor;
import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
+import java.io.FileInputStream;
+import java.util.Scanner;
import jdk.test.lib.Asserts;
import jdk.test.lib.cds.CDSOptions;
import jdk.test.lib.process.OutputAnalyzer;
@@ -179,24 +175,28 @@
return null;
}
- // We use the flagFile to prevent the child process to make progress, until we have
- // attached to it.
+ // Hand-shake protocol with the child process
+ // [1] Parent process (this process) launches child process (InstrumentationApp)
+ // and then waits until child process writes its pid into the flagFile.
+ // [2] Child process process starts up, writes its pid into the flagFile,
+ // and waits for the flagFile to be deleted.
+ // [3] When parent process gets the pid, it attaches to the child process
+ // (if we attempt to attach to a process too early, the SIGQUIT
+ // may cause the child to die) and deletes the flagFile.
+ // [4] Child process resumes execution.
+
File f = new File(flagFile);
- try (FileOutputStream o = new FileOutputStream(f)) {
- o.write(1);
- }
- if (!f.exists()) {
- throw new RuntimeException("Failed to create " + f);
+ f.delete();
+ if (f.exists()) {
+ throw new RuntimeException("Flag file should not exist: " + f);
}
// At this point, the child process is not yet launched. Note that
// TestCommon.exec() and OutputAnalyzer.OutputAnalyzer() both block
// until the child process has finished.
//
- // So, we will launch a AgentAttachThread which will poll the system
- // until the child process is launched, and then do the attachment.
- // The child process is uniquely identified by having flagFile in its
- // command-line -- see AgentAttachThread.getPid().
+ // So, we will launch a AgentAttachThread which will poll the flagFile
+ // until the child process is launched.
AgentAttachThread t = new AgentAttachThread(flagFile, agentJar);
t.start();
return t;
@@ -225,13 +225,17 @@
// reason the child process fails to launch, this test will be terminated
// by JTREG's time-out mechanism.
Thread.sleep(100);
- List<VirtualMachineDescriptor> vmds = VirtualMachine.list();
- for (VirtualMachineDescriptor vmd : vmds) {
- if (vmd.displayName().contains(flagFile) && vmd.displayName().contains("InstrumentationApp")) {
- // We use flagFile (which has the PID of this process) as a unique identifier
- // to ident the child process, which we want to attach to.
- System.out.println("Process found: " + vmd.id() + " " + vmd.displayName());
- return vmd.id();
+ File f = new File(flagFile);
+ if (f.exists() && f.length() > 100) {
+ try (FileInputStream in = new FileInputStream(f)) {
+ Scanner scanner = new Scanner(in);
+ return Long.toString(scanner.nextLong());
+ } catch (Throwable t) {
+ // This may happen on Windows if the child process has not
+ // fully closed the output stream to the flagFile
+ System.out.println("Ignored: " + t);
+ t.printStackTrace(System.out);
+ continue;
}
}
}
@@ -240,6 +244,7 @@
public void run() {
try {
String pid = getPid(flagFile);
+ System.out.println("child pid = " + pid);
VirtualMachine vm = VirtualMachine.attach(pid);
System.out.println(agentJar);
vm.loadAgent(agentJar);
--- a/test/hotspot/jtreg/runtime/containers/docker/DockerBasicTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/containers/docker/DockerBasicTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
* @build HelloDocker
* @run driver DockerBasicTest
*/
+import jdk.test.lib.containers.docker.Common;
import jdk.test.lib.containers.docker.DockerRunOptions;
import jdk.test.lib.containers.docker.DockerTestUtils;
import jdk.test.lib.Platform;
@@ -40,7 +41,7 @@
public class DockerBasicTest {
- private static final String imageNameAndTag = "jdk10-internal:test";
+ private static final String imageNameAndTag = Common.imageName("basic");
// Diganostics: set to false to examine image after the test
private static final boolean removeImageAfterTest = true;
--- a/test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-FROM oraclelinux:7.6
-MAINTAINER mikhailo.seledtsov@oracle.com
-
-COPY /jdk /jdk
-
-ENV JAVA_HOME=/jdk
-
-CMD ["/bin/bash"]
--- a/test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-aarch64 Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# Use generic ubuntu Linux on AArch64
-FROM aarch64/ubuntu
-
-COPY /jdk /jdk
-
-ENV JAVA_HOME=/jdk
-
-CMD ["/bin/bash"]
--- a/test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-ppc64le Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# test on x86_64 uses Oracle Linux but we do not have this for ppc64le
-# so use some other Linux where OpenJDK works
-# FROM oraclelinux:7.2
-FROM ppc64le/ubuntu
-
-COPY /jdk /jdk
-
-ENV JAVA_HOME=/jdk
-
-CMD ["/bin/bash"]
--- a/test/hotspot/jtreg/runtime/containers/docker/Dockerfile-BasicTest-s390x Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-FROM s390x/ubuntu
-
-COPY /jdk /jdk
-
-ENV JAVA_HOME=/jdk
-
-CMD ["/bin/bash"]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/NoClassDefFoundErrorTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8056900
+ * @summary Verifies message returned with NoClassDefFoundError exception.
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * java.compiler
+ * @run main/native NoClassDefFoundErrorTest
+ */
+
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+import jdk.internal.misc.Unsafe;
+
+public class NoClassDefFoundErrorTest {
+
+ static native void callDefineClass(String className);
+ static native void callFindClass(String className);
+ static {
+ System.loadLibrary("NoClassDefFoundErrorTest");
+ }
+
+
+ public static void main(String args[]) throws Exception {
+ Unsafe unsafe = Unsafe.getUnsafe();
+
+ byte klassbuf[] = InMemoryJavaCompiler.compile("TestClass", "class TestClass { }");
+
+ // Create a class name of length 65536.
+ StringBuilder tooBigClassName = new StringBuilder("z");
+ for (int x = 0; x < 16; x++) {
+ tooBigClassName = tooBigClassName.append(tooBigClassName);
+ }
+
+ // Test JVM_DefineClass() with long name.
+ try {
+ unsafe.defineClass(tooBigClassName.toString(), klassbuf, 4, klassbuf.length - 4, null, null);
+ throw new RuntimeException("defineClass did not throw expected NoClassDefFoundError");
+ } catch (NoClassDefFoundError e) {
+ if (!e.getMessage().contains("Class name exceeds maximum length of ")) {
+ throw new RuntimeException("Wrong NoClassDefFoundError: " + e.getMessage());
+ }
+ }
+
+ // Test JNI_DefineClass() with long name.
+ try {
+ callDefineClass(tooBigClassName.toString());
+ throw new RuntimeException("DefineClass did not throw expected NoClassDefFoundError");
+ } catch (NoClassDefFoundError e) {
+ if (!e.getMessage().contains("Class name exceeds maximum length of ")) {
+ throw new RuntimeException("Wrong NoClassDefFoundError: " + e.getMessage());
+ }
+ }
+
+ // Test JNI_FindClass() with long name.
+ try {
+ callFindClass(tooBigClassName.toString());
+ throw new RuntimeException("DefineClass did not throw expected NoClassDefFoundError");
+ } catch (NoClassDefFoundError e) {
+ if (!e.getMessage().contains("Class name exceeds maximum length of ")) {
+ throw new RuntimeException("Wrong NoClassDefFoundError: " + e.getMessage());
+ }
+ }
+
+ // Test JNI_FindClass() with null name.
+ try {
+ callFindClass(null);
+ throw new RuntimeException("FindClass did not throw expected NoClassDefFoundError");
+ } catch (NoClassDefFoundError e) {
+ if (!e.getMessage().contains("No class name given")) {
+ throw new RuntimeException("Wrong NoClassDefFoundError: " + e.getMessage());
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NoClassDefFoundError/libNoClassDefFoundErrorTest.c Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+
+JNIEXPORT void JNICALL
+Java_NoClassDefFoundErrorTest_callDefineClass(JNIEnv *env, jclass klass, jstring className) {
+ const char *c_name = (*env)->GetStringUTFChars(env, className, NULL);
+ (*env)->DefineClass(env, c_name, NULL, NULL, 0);
+}
+
+JNIEXPORT void JNICALL
+Java_NoClassDefFoundErrorTest_callFindClass(JNIEnv *env, jclass klass, jstring className) {
+ const char *c_name;
+ jclass cls;
+ if (className == NULL) {
+ c_name = NULL;
+ } else {
+ c_name = (*env)->GetStringUTFChars(env, className, NULL);
+ }
+ cls = (*env)->FindClass(env, c_name);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeSuspendExitTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test HandshakeSuspendExitTest
+ * @summary This test tries to stress the handshakes with new and exiting threads while suspending them.
+ * @library /testlibrary /test/lib
+ * @build HandshakeSuspendExitTest
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:GuaranteedSafepointInterval=1 -XX:+HandshakeALot HandshakeSuspendExitTest
+ */
+
+public class HandshakeSuspendExitTest implements Runnable {
+
+ static Thread[] _suspend_threads = new Thread[16];
+ static volatile boolean _exit_now = false;
+ static java.util.concurrent.Semaphore _sem = new java.util.concurrent.Semaphore(0);
+
+ @Override
+ public void run() {
+ _sem.release();
+ while (!_exit_now) {
+ // Leave last 2 threads running.
+ for (int i = 0; i < _suspend_threads.length - 2; i++) {
+ if (Thread.currentThread() != _suspend_threads[i]) {
+ _suspend_threads[i].suspend();
+ _suspend_threads[i].resume();
+ }
+ }
+ }
+ _sem.release();
+ }
+
+ public static void main(String... args) throws Exception {
+ HandshakeSuspendExitTest test = new HandshakeSuspendExitTest();
+ // Fire-up suspend threads.
+ for (int i = 0; i < _suspend_threads.length; i++) {
+ _suspend_threads[i] = new Thread(test);
+ }
+ for (int i = 0; i < _suspend_threads.length; i++) {
+ _suspend_threads[i].start();
+ }
+ // Wait for all suspend-threads to start looping.
+ for (Thread thr : _suspend_threads) {
+ _sem.acquire();
+ }
+
+ // Fire-up exiting threads.
+ Thread[] exit_threads = new Thread[128];
+ for (int i = 0; i < exit_threads.length; i++) {
+ exit_threads[i] = new Thread();
+ exit_threads[i].start();
+ }
+
+ // Try to suspend them.
+ for (Thread thr : exit_threads) {
+ thr.suspend();
+ }
+ for (Thread thr : exit_threads) {
+ thr.resume();
+ }
+
+ // Start exit and join.
+ _exit_now = true;
+ int waiting = _suspend_threads.length;
+ do {
+ // Resume any worker threads that might have suspended
+ // each other at exactly the same time so they can see
+ // _exit_now and check in via the semaphore.
+ for (Thread thr : _suspend_threads) {
+ thr.resume();
+ }
+ while (_sem.tryAcquire()) {
+ --waiting;
+ }
+ } while (waiting > 0);
+ for (Thread thr : _suspend_threads) {
+ thr.join();
+ }
+ for (Thread thr : exit_threads) {
+ thr.join();
+ }
+ }
+}
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -62,6 +62,7 @@
true,
"-Djava.library.path=" + lib,
"-XX:+SafepointALot",
+ "-XX:+HandshakeALot",
"-XX:GuaranteedSafepointInterval=20",
"-Xlog:ergo*",
"-XX:ParallelGCThreads=1",
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeWalkSuspendExitTest.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/*
- * @test HandshakeWalkSuspendExitTest
- * @summary This test tries to stress the handshakes with new and exiting threads while suspending them.
- * @library /testlibrary /test/lib
- * @build HandshakeWalkSuspendExitTest
- * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI HandshakeWalkSuspendExitTest
- */
-
-import jdk.test.lib.Asserts;
-import sun.hotspot.WhiteBox;
-
-public class HandshakeWalkSuspendExitTest implements Runnable {
-
- static final int _test_threads = 8;
- static final int _test_exit_threads = 128;
- static Thread[] _threads = new Thread[_test_threads];
- static volatile boolean exit_now = false;
- static java.util.concurrent.Semaphore _sem = new java.util.concurrent.Semaphore(0);
-
- @Override
- public void run() {
- WhiteBox wb = WhiteBox.getWhiteBox();
- while (!exit_now) {
- _sem.release();
- // We only suspend threads on even index and not ourself.
- // Otherwise we can accidentially suspend all threads.
- for (int i = 0; i < _threads.length; i += 2) {
- wb.handshakeWalkStack(null /* ignored */, true /* stackwalk all threads */);
- if (Thread.currentThread() != _threads[i]) {
- _threads[i].suspend();
- _threads[i].resume();
- }
- }
- for (int i = 0; i < _threads.length; i += 2) {
- wb.handshakeWalkStack(_threads[i] /* thread to stackwalk */, false /* stackwalk one thread */);
- if (Thread.currentThread() != _threads[i]) {
- _threads[i].suspend();
- _threads[i].resume();
- }
- }
- }
- }
-
- public static void main(String... args) throws Exception {
- HandshakeWalkSuspendExitTest test = new HandshakeWalkSuspendExitTest();
-
- for (int i = 0; i < _threads.length; i++) {
- _threads[i] = new Thread(test);
- _threads[i].start();
- }
- for (int i = 0; i < _test_threads; i++) {
- _sem.acquire();
- }
- Thread[] exit_threads = new Thread[_test_exit_threads];
- for (int i = 0; i < _test_exit_threads; i++) {
- exit_threads[i] = new Thread(new Runnable() { public void run() {} });
- exit_threads[i].start();
- }
- exit_now = true;
- for (int i = 0; i < _threads.length; i++) {
- _threads[i].join();
- }
- for (int i = 0; i < exit_threads.length; i++) {
- exit_threads[i].join();
- }
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2019, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test with symbolic linked lib/modules
+ * @bug 8220095
+ * @requires (os.family == "solaris" | os.family == "linux" | os.family == "mac")
+ * @library /test/lib
+ * @modules java.management
+ * jdk.jlink
+ * @run driver ModulesSymLink
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class ModulesSymLink {
+ static String java_home;
+ static String test_jdk;
+
+ public static void main(String[] args) throws Throwable {
+ java_home = System.getProperty("java.home");
+ test_jdk = System.getProperty("user.dir") + File.separator +
+ "modulessymlink_jdk" + Long.toString(System.currentTimeMillis());
+
+ constructTestJDK();
+
+ ProcessBuilder pb = new ProcessBuilder(
+ test_jdk + File.separator + "bin" + File.separator + "java",
+ "-version");
+ OutputAnalyzer out = new OutputAnalyzer(pb.start());
+ out.shouldHaveExitValue(0);
+ }
+
+ // 1) Create a test JDK binary (jlink is used to help simplify the process,
+ // alternatively a test JDK could be copied from JAVA_HOME.)
+ // 2) Rename the test JDK's lib/modules to lib/0.
+ // 3) Then create a link to lib/0 as lib/modules.
+ static void constructTestJDK() throws Throwable {
+ Path jlink = Paths.get(java_home, "bin", "jlink");
+ System.out.println("Jlink = " + jlink);
+ OutputAnalyzer out = ProcessTools.executeProcess(jlink.toString(),
+ "--output", test_jdk,
+ "--add-modules", "java.base");
+ out.shouldHaveExitValue(0);
+
+ Path modules = Paths.get(test_jdk, "lib", "modules");
+ Path renamed_modules = Paths.get(test_jdk, "lib", "0");
+ Files.move(modules, renamed_modules);
+ Files.createSymbolicLink(modules, renamed_modules);
+ }
+}
--- a/test/hotspot/jtreg/runtime/noClassDefFoundMsg/NoClassDefFoundMsg.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8056900
- * @summary Verifies message returned with NoClassDefFoundError exception.
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.compiler
- * @run main/native NoClassDefFoundMsg
- */
-
-import jdk.test.lib.compiler.InMemoryJavaCompiler;
-import jdk.internal.misc.Unsafe;
-
-public class NoClassDefFoundMsg {
-
- static native void callDefineClass(String className);
- static native void callFindClass(String className);
- static {
- System.loadLibrary("NoClassDefFoundMsg");
- }
-
-
- public static void main(String args[]) throws Exception {
- Unsafe unsafe = Unsafe.getUnsafe();
-
- byte klassbuf[] = InMemoryJavaCompiler.compile("TestClass", "class TestClass { }");
-
- // Create a class name of length 65536.
- StringBuilder tooBigClassName = new StringBuilder("z");
- for (int x = 0; x < 16; x++) {
- tooBigClassName = tooBigClassName.append(tooBigClassName);
- }
-
- // Test JVM_DefineClass() with long name.
- try {
- unsafe.defineClass(tooBigClassName.toString(), klassbuf, 4, klassbuf.length - 4, null, null);
- throw new RuntimeException("defineClass did not throw expected NoClassDefFoundError");
- } catch (NoClassDefFoundError e) {
- if (!e.getMessage().contains("Class name exceeds maximum length of ")) {
- throw new RuntimeException("Wrong NoClassDefFoundError: " + e.getMessage());
- }
- }
-
- // Test JNI_DefineClass() with long name.
- try {
- callDefineClass(tooBigClassName.toString());
- throw new RuntimeException("DefineClass did not throw expected NoClassDefFoundError");
- } catch (NoClassDefFoundError e) {
- if (!e.getMessage().contains("Class name exceeds maximum length of ")) {
- throw new RuntimeException("Wrong NoClassDefFoundError: " + e.getMessage());
- }
- }
-
- // Test JNI_FindClass() with long name.
- try {
- callFindClass(tooBigClassName.toString());
- throw new RuntimeException("DefineClass did not throw expected NoClassDefFoundError");
- } catch (NoClassDefFoundError e) {
- if (!e.getMessage().contains("Class name exceeds maximum length of ")) {
- throw new RuntimeException("Wrong NoClassDefFoundError: " + e.getMessage());
- }
- }
-
- // Test JNI_FindClass() with null name.
- try {
- callFindClass(null);
- throw new RuntimeException("FindClass did not throw expected NoClassDefFoundError");
- } catch (NoClassDefFoundError e) {
- if (!e.getMessage().contains("No class name given")) {
- throw new RuntimeException("Wrong NoClassDefFoundError: " + e.getMessage());
- }
- }
- }
-}
--- a/test/hotspot/jtreg/runtime/noClassDefFoundMsg/libNoClassDefFoundMsg.c Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <jni.h>
-
-JNIEXPORT void JNICALL
-Java_NoClassDefFoundMsg_callDefineClass(JNIEnv *env, jclass klass, jstring className) {
- const char *c_name = (*env)->GetStringUTFChars(env, className, NULL);
- (*env)->DefineClass(env, c_name, NULL, NULL, 0);
-}
-
-JNIEXPORT void JNICALL
-Java_NoClassDefFoundMsg_callFindClass(JNIEnv *env, jclass klass, jstring className) {
- const char *c_name;
- jclass cls;
- if (className == NULL) {
- c_name = NULL;
- } else {
- c_name = (*env)->GetStringUTFChars(env, className, NULL);
- }
- cls = (*env)->FindClass(env, c_name);
-}
-
-
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestRedefineObject.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestRedefineObject.java Tue Apr 02 10:57:57 2019 +0530
@@ -33,8 +33,8 @@
* sure cached versions used afterward are the current version.
*
* @test
- * @bug 8005056
- * @bug 8009728
+ * @bug 8005056 8009728 8218399
+ * @requires !vm.graal.enabled
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.instrument
--- a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForLargeArray.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForLargeArray.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -96,10 +96,13 @@
}
try {
+ // Need to add the default arguments first to have explicit
+ // -Xmx8g last, otherwise test will fail if default
+ // arguments contain a smaller -Xmx.
List<String> vmArgs = new ArrayList<String>();
+ vmArgs.addAll(Utils.getVmOptions());
vmArgs.add("-XX:+UsePerfData");
vmArgs.add("-Xmx8g");
- vmArgs.addAll(Utils.getVmOptions());
theApp = new LingeredAppWithLargeArray();
LingeredApp.startApp(vmArgs, theApp);
--- a/test/hotspot/jtreg/serviceability/sa/TestUniverse.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/serviceability/sa/TestUniverse.java Tue Apr 02 10:57:57 2019 +0530
@@ -29,99 +29,107 @@
import java.util.HashMap;
import jdk.test.lib.apps.LingeredApp;
import jtreg.SkippedException;
+import sun.hotspot.gc.GC;
/**
* @test
* @summary Test the 'universe' command of jhsdb clhsdb.
- * @requires vm.hasSAandCanAttach & vm.gc != "Z"
+ * @requires vm.hasSAandCanAttach
* @bug 8190307
* @library /test/lib
* @build jdk.test.lib.apps.*
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. TestUniverse withoutZ
- */
-
-/**
- * @test
- * @summary Test the 'universe' command of jhsdb clhsdb.
- * @requires vm.hasSAandCanAttach & vm.gc == "Z"
- * @bug 8190307
- * @library /test/lib
- * @build jdk.test.lib.apps.*
- * @build sun.hotspot.WhiteBox
- * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. TestUniverse withZ
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. TestUniverse
*/
public class TestUniverse {
- private static void testClhsdbForUniverse(long lingeredAppPid,
- String gc) throws Exception {
-
+ private static void testClhsdbForUniverse(long lingeredAppPid, GC gc) throws Exception {
ClhsdbLauncher launcher = new ClhsdbLauncher();
List<String> cmds = List.of("universe");
Map<String, List<String>> expStrMap = new HashMap<>();
List<String> expStrings = new ArrayList<String>();
expStrings.add("Heap Parameters");
- if (gc.contains("UseZGC")) {
- expStrings.add("ZHeap");
- }
- if (gc.contains("G1GC")) {
+ switch (gc) {
+ case Serial:
+ expStrings.add("Gen 1: old");
+ break;
+
+ case Parallel:
+ expStrings.add("ParallelScavengeHeap");
+ expStrings.add("PSYoungGen");
+ expStrings.add("eden");
+ break;
+
+ case ConcMarkSweep:
+ expStrings.add("Gen 1: concurrent mark-sweep generation");
+ break;
+
+ case G1:
expStrings.add("garbage-first heap");
expStrings.add("region size");
expStrings.add("G1 Young Generation:");
expStrings.add("regions =");
- }
- if (gc.contains("UseConcMarkSweepGC")) {
- expStrings.add("Gen 1: concurrent mark-sweep generation");
- }
- if (gc.contains("UseSerialGC")) {
- expStrings.add("Gen 1: old");
- }
- if (gc.contains("UseParallelGC")) {
- expStrings.add("ParallelScavengeHeap");
- expStrings.add("PSYoungGen");
- expStrings.add("eden");
- }
- if (gc.contains("UseEpsilonGC")) {
+ break;
+
+ case Epsilon:
expStrings.add("Epsilon heap");
expStrings.add("reserved");
expStrings.add("committed");
expStrings.add("used");
+ break;
+
+ case Z:
+ expStrings.add("ZHeap");
+ break;
+
+ case Shenandoah:
+ expStrings.add("Shenandoah Heap");
+ break;
}
+
expStrMap.put("universe", expStrings);
launcher.run(lingeredAppPid, cmds, expStrMap, null);
}
- public static void test(String gc) throws Exception {
+ private static void test(GC gc) throws Exception {
LingeredApp app = null;
try {
- List<String> vmArgs = new ArrayList<String>();
- vmArgs.add("-XX:+UnlockExperimentalVMOptions"); // unlock experimental GCs
- vmArgs.add(gc);
- app = LingeredApp.startApp(vmArgs);
- System.out.println ("Started LingeredApp with the GC option " + gc +
- " and pid " + app.getPid());
+ app = LingeredApp.startApp(List.of("-XX:+UnlockExperimentalVMOptions", "-XX:+Use" + gc + "GC"));
+ System.out.println ("Started LingeredApp with " + gc + "GC and pid " + app.getPid());
testClhsdbForUniverse(app.getPid(), gc);
} finally {
LingeredApp.stopApp(app);
}
}
+ private static boolean isSelectedAndSupported(GC gc) {
+ if (!gc.isSelected()) {
+ // Not selected
+ return false;
+ }
+
+ if (Compiler.isGraalEnabled()) {
+ if (gc == GC.ConcMarkSweep || gc == GC.Epsilon || gc == GC.Z || gc == GC.Shenandoah) {
+ // Not supported
+ System.out.println ("Skipped testing of " + gc + "GC, not supported by Graal");
+ return false;
+ }
+ }
+
+ // Selected and supported
+ return true;
+ }
+
public static void main (String... args) throws Exception {
- System.out.println("Starting TestUniverse test");
+ System.out.println("Starting TestUniverse");
try {
- test("-XX:+UseG1GC");
- test("-XX:+UseParallelGC");
- test("-XX:+UseSerialGC");
- if (!Compiler.isGraalEnabled()) { // Graal does not support all GCs
- test("-XX:+UseConcMarkSweepGC");
- if (args[0].equals("withZ")) {
- test("-XX:+UseZGC");
+ for (GC gc: GC.values()) {
+ if (isSelectedAndSupported(gc)) {
+ test(gc);
}
- test("-XX:+UseEpsilonGC");
}
} catch (SkippedException se) {
throw se;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted002/TestDescription.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted002/TestDescription.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
*
* @library /vmTestbase
* /test/lib
+ * @requires !vm.graal.enabled
* @run driver jdk.test.lib.FileInstaller . .
* @run main/othervm/native
* -agentlib:resexhausted=-waittime=5
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
import java.io.FileInputStream;
import java.io.PrintStream;
import java.security.ProtectionDomain;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
import nsk.share.Consts;
import nsk.share.test.Stresser;
@@ -77,12 +79,20 @@
public static int run(String args[], PrintStream out) {
- if ( args == null || args.length < 1 ) {
- System.err.println("TEST BUG: Classes directory should be the first argument. Check .cfg file.");
+ String testclasspath = System.getProperty("test.class.path");
+ String [] testpaths = testclasspath.split(System.getProperty("path.separator"));
+ String classesDir = "";
+
+ Pattern pattern = Pattern.compile("^(.*)classes(.*)vmTestbase(.*)$");
+ for (int i = 0 ; i < testpaths.length; i++) {
+ if (pattern.matcher(testpaths[i]).matches()) {
+ classesDir = testpaths[i];
+ }
+ }
+ if (classesDir.equals("")) {
+ System.err.println("TEST BUG: Classes directory not found in test,class.path.");
return Consts.TEST_FAILED;
}
-
- String classesDir = args[0];
Stresser stress = new Stresser(args);
String className = Helper.class.getName();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TEST.properties Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+exclusiveAccess.dirs=.
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TestDescription.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TestDescription.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,5 @@
* -XX:MaxMetaspaceSize=9m
* -XX:-UseGCOverheadLimit
* nsk.jvmti.ResourceExhausted.resexhausted003
- * ../../classes/0/vmTestbase
*/
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,14 +39,12 @@
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
- * @ignore 7013634 6606767
* @run main/othervm/native
* -agentlib:resexhausted=-waittime=5
* -Xms16m
* -Xmx16m
- * -XX:MaxMetaspaceSize=8m
+ * -XX:MaxMetaspaceSize=9m
* -XX:-UseGCOverheadLimit
* nsk.jvmti.ResourceExhausted.resexhausted004
- * ./bin/classes
*/
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
#include "jvmti_tools.h"
#include "JVMTITools.h"
#include "nsk_list.h"
-#include "nsk_mutex.h"
extern "C" {
@@ -49,8 +48,8 @@
int sign;
} nsk_jvmti_DCG_params;
-static MUTEX* mutex = NULL;
-
+static jrawMonitorID syncLock = NULL;
+static volatile int callbacksEnabled = NSK_TRUE;
/* ============================================================================= */
/* callbacks */
@@ -60,6 +59,12 @@
nsk_jvmti_DCG_params *rec;
int b;
+ jvmti->RawMonitorEnter(syncLock);
+ if (!callbacksEnabled) {
+ jvmti->RawMonitorExit(syncLock);
+ return;
+ }
+
rec = (nsk_jvmti_DCG_params *)malloc(sizeof(nsk_jvmti_DCG_params));
strncpy(rec->name, name, NAME_LENGTH);
rec->name[NAME_LENGTH - 1] = '\0';
@@ -69,16 +74,13 @@
NSK_DISPLAY3("received: 0x%p %7d %s\n", rec->address, rec->length, rec->name);
- MUTEX_acquire(mutex);
-
b = NSK_VERIFY(nsk_list_add(plist, rec));
- MUTEX_release(mutex);
-
if (!b) {
nsk_jvmti_setFailStatus();
free((void *)rec);
}
+ jvmti->RawMonitorExit(syncLock);
}
void JNICALL
@@ -87,6 +89,13 @@
int i;
nsk_jvmti_DCG_params *rec;
+
+ jvmti->RawMonitorEnter(syncLock);
+ if (!callbacksEnabled) {
+ jvmti->RawMonitorExit(syncLock);
+ return;
+ }
+
int count = nsk_list_getCount(plist);
int compLength = NAME_LENGTH - 1;
@@ -99,11 +108,13 @@
if (strncmp(rec->name, name, compLength) != 0) {
NSK_DISPLAY2("\t<%s> was renamed to <%s>\n", rec->name, name);
}
+ jvmti->RawMonitorExit(syncLock);
return;
}
}
NSK_DISPLAY3("NOT FOUND: 0x%p %7d %s\n", address, length, name);
+ jvmti->RawMonitorExit(syncLock);
}
@@ -151,6 +162,9 @@
if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_DYNAMIC_CODE_GENERATED)))
nsk_jvmti_setFailStatus();
+ jvmti->RawMonitorEnter(syncLock);
+ callbacksEnabled = NSK_FALSE;
+
{
int i;
const nsk_jvmti_DCG_params *rec;
@@ -168,6 +182,8 @@
}
+ jvmti->RawMonitorExit(syncLock);
+
NSK_DISPLAY0("Let debuggee to finish\n");
if (!nsk_jvmti_resumeSync())
return;
@@ -190,10 +206,6 @@
#endif
jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
- mutex = MUTEX_create();
- if (!mutex)
- return JNI_ERR;
-
if (!NSK_VERIFY(nsk_jvmti_parseOptions(options)))
return JNI_ERR;
@@ -203,6 +215,11 @@
if (!NSK_VERIFY(jvmti != NULL))
return JNI_ERR;
+ if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
+ nsk_jvmti_setFailStatus();
+ return JNI_ERR;
+ }
+
plist = (const void *)nsk_list_create();
if (!NSK_VERIFY(plist != NULL))
return JNI_ERR;
@@ -239,9 +256,8 @@
nsk_jvmti_setFailStatus();
}
- if (mutex) {
- MUTEX_destroy(mutex);
- mutex = NULL;
+ if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock))) {
+ nsk_jvmti_setFailStatus();
}
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp Tue Apr 02 10:55:20 2019 +0530
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@
#define NAME_LENGTH 50
const void *plist = NULL;
+static volatile int callbacksEnabled = NSK_TRUE;
typedef struct nsk_jvmti_CompiledMethodIDStruct {
jmethodID method;
@@ -63,8 +64,15 @@
char *sign;
char *genc;
+ jvmti->RawMonitorEnter(syncLock);
+ if (!callbacksEnabled) {
+ jvmti->RawMonitorExit(syncLock);
+ return;
+ }
+
if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sign, &genc))) {
nsk_jvmti_setFailStatus();
+ jvmti->RawMonitorExit(syncLock);
return;
}
@@ -105,6 +113,9 @@
if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)genc))) {
nsk_jvmti_setFailStatus();
}
+
+ jvmti->RawMonitorExit(syncLock);
+
}
void JNICALL
@@ -113,7 +124,13 @@
nsk_jvmti_CompiledMethod *rec;
+ jvmti->RawMonitorEnter(syncLock);
+ if (!callbacksEnabled) {
+ jvmti->RawMonitorExit(syncLock);
+ return;
+ }
int count = nsk_list_getCount(plist);
+
int i;
for (i = 0; i < count; i ++) {
@@ -122,21 +139,16 @@
NSK_DISPLAY0(">>>JVMTI_EVENT_COMPILED_METHOD_UNLOAD received for\n");
NSK_DISPLAY1("\t\tmethod: %s\n", rec->name);
- if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
- nsk_jvmti_setFailStatus();
-
methodUnloadCount++;
- if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
- nsk_jvmti_setFailStatus();
-
free(rec);
nsk_list_remove(plist, i);
+ jvmti->RawMonitorExit(syncLock);
return;
}
}
-
+ jvmti->RawMonitorExit(syncLock);
}
/* ============================================================================= */
@@ -210,6 +222,9 @@
return;
}
+ jvmti->RawMonitorEnter(syncLock);
+ callbacksEnabled = NSK_FALSE;
+
{
int count = nsk_list_getCount(plist);
@@ -221,6 +236,8 @@
}
+ jvmti->RawMonitorExit(syncLock);
+
if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
nsk_jvmti_setFailStatus();
--- a/test/jdk/TEST.ROOT Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/TEST.ROOT Tue Apr 02 10:57:57 2019 +0530
@@ -22,8 +22,11 @@
javax/management sun/awt sun/java2d javax/xml/jaxp/testng/validation java/lang/ProcessHandle
# Tests that cannot run concurrently
-exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd \
-sun/security/mscapi java/util/stream java/util/Arrays/largeMemory java/util/BitSet/stream javax/rmi
+exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote \
+sun/tools/jstatd sun/tools/jcmd sun/tools/jhsdb sun/tools/jhsdb/heapconfig \
+sun/tools/jinfo sun/tools/jmap sun/tools/jps sun/tools/jstack sun/tools/jstat \
+com/sun/tools/attach sun/security/mscapi java/util/stream java/util/Arrays/largeMemory \
+java/util/BitSet/stream javax/rmi
# Group definitions
groups=TEST.groups
--- a/test/jdk/com/sun/net/httpserver/TestLogging.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/com/sun/net/httpserver/TestLogging.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/**
* @test
* @bug 6422914
+ * @library /test/lib
* @summary change httpserver exception printouts
*/
@@ -37,6 +38,7 @@
import java.security.*;
import java.security.cert.*;
import javax.net.ssl.*;
+import jdk.test.lib.net.URIBuilder;
public class TestLogging extends Test {
@@ -63,13 +65,25 @@
int p1 = s1.getAddress().getPort();
- URL url = new URL ("http://127.0.0.1:"+p1+"/test1/smallfile.txt");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(p1)
+ .path("/test1/smallfile.txt")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
InputStream is = urlc.getInputStream();
while (is.read() != -1) ;
is.close();
- url = new URL ("http://127.0.0.1:"+p1+"/test1/doesntexist.txt");
+ url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(p1)
+ .path("/test1/doesntexist.txt")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
urlc = (HttpURLConnection)url.openConnection();
try {
is = urlc.getInputStream();
--- a/test/jdk/com/sun/net/httpserver/bugs/6725892/Test.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/com/sun/net/httpserver/bugs/6725892/Test.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/**
* @test
* @bug 6725892
+ * @library /test/lib
* @run main/othervm -Dsun.net.httpserver.maxReqTime=2 Test
* @summary
*/
@@ -36,6 +37,8 @@
import java.net.*;
import javax.net.ssl.*;
+import jdk.test.lib.net.URIBuilder;
+
public class Test {
static HttpServer s1;
@@ -76,7 +79,13 @@
port = s1.getAddress().getPort();
System.out.println ("Server on port " + port);
- url = new URL ("http://127.0.0.1:"+port+"/foo");
+ url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
test1();
test2();
test3();
--- a/test/jdk/com/sun/net/httpserver/bugs/B6373555.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6373555.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/**
* @test
* @bug 6373555
+ * @library /test/lib
* @summary HTTP Server failing to answer client requests
*/
@@ -32,6 +33,7 @@
import java.util.*;
import com.sun.net.httpserver.*;
import java.util.concurrent.*;
+import jdk.test.lib.net.URIBuilder;
public class B6373555 {
@@ -96,7 +98,13 @@
try {
Thread.sleep(10);
byte[] buf = getBuf();
- URL url = new URL("http://127.0.0.1:"+port+"/test");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/test")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
HttpURLConnection con = (HttpURLConnection)url.openConnection();
con.setDoOutput(true);
con.setDoInput(true);
--- a/test/jdk/com/sun/net/httpserver/bugs/B6401598.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6401598.java Tue Apr 02 10:57:57 2019 +0530
@@ -23,6 +23,7 @@
/**
* @test
+ * @library /test/lib
* @bug 6401598
* @summary new HttpServer cannot serve binary stream data
*/
@@ -31,9 +32,12 @@
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.concurrent.*;
+import jdk.test.lib.net.URIBuilder;
+
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
@@ -90,7 +94,14 @@
short counter;
for (counter = 0; counter < 1000; counter++) {
- HttpURLConnection connection = getHttpURLConnection(new URL("http://127.0.0.1:"+port+"/server/"), 10000);
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/server/")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
+ HttpURLConnection connection = getHttpURLConnection(url, 10000);
OutputStream os = connection.getOutputStream();
--- a/test/jdk/java/io/DataOutputStream/WriteUTF.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/io/DataOutputStream/WriteUTF.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,22 @@
*/
/* @test
- @bug 4260284
- @summary Test if DataOutputStream will overcount written field.
-*/
+ * @bug 4260284 8219196
+ * @summary Test if DataOutputStream will overcount written field.
+ * @requires (sun.arch.data.model == "64" & os.maxMemory >= 3g)
+ * @run testng/othervm -Xmx3g WriteUTF
+ */
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.UTFDataFormatException;
+
+import org.testng.annotations.Test;
public class WriteUTF {
- public static void main(String[] args) throws Exception {
+ @Test
+ public static void overcountWrittenField() throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(baos);
dos.writeUTF("Hello, World!"); // 15
@@ -37,4 +45,25 @@
if (baos.size() != dos.size())
throw new RuntimeException("Miscounted bytes in DataOutputStream.");
}
+
+ private static void writeUTF(int size) throws IOException {
+ // this character gives 3 bytes when encoded using UTF-8
+ String s = "\u0800".repeat(size);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ DataOutputStream dos = new DataOutputStream(bos);
+ dos.writeUTF(s);
+ }
+
+ @Test(expectedExceptions = UTFDataFormatException.class)
+ public void utfDataFormatException() throws IOException {
+ writeUTF(1 << 16);
+ }
+
+ // Without 8219196 fix, throws ArrayIndexOutOfBoundsException instead of
+ // expected UTFDataFormatException. Requires 3GB of heap (-Xmx3g) to run
+ // without throwing an OutOfMemoryError.
+ @Test(expectedExceptions = UTFDataFormatException.class)
+ public void arrayIndexOutOfBoundsException() throws IOException {
+ writeUTF(Integer.MAX_VALUE / 3 + 1);
+ }
}
--- a/test/jdk/java/lang/Character/UnicodeData.txt Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/lang/Character/UnicodeData.txt Tue Apr 02 10:57:57 2019 +0530
@@ -11836,7 +11836,7 @@
32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
-32FF;SQUARE ERA NAME NEWERA;So;0;L;<square> 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;;
+32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME REIWA;;;;
3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
--- a/test/jdk/java/lang/String/StringRepeat.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/lang/String/StringRepeat.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,7 +24,7 @@
/*
* @test
* @summary This exercises String#repeat patterns and limits.
- * @run main/othervm -Xmx4G StringRepeat
+ * @run main/othervm -Xmx2g StringRepeat
*/
import java.nio.CharBuffer;
--- a/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -22,6 +22,7 @@
*/
/* @test
+ * @bug 8216558
* @summary unit tests for java.lang.invoke.MethodHandles
* @library /test/lib /java/lang/invoke/common
* @compile MethodHandlesTest.java MethodHandlesGeneralTest.java remote/RemoteExample.java
@@ -664,6 +665,7 @@
boolean testNPE = ((testMode0 & TEST_NPE) != 0);
int testMode = testMode0 & ~(TEST_SETTER | TEST_BOUND | TEST_NPE);
boolean positive = positive0 && !testNPE;
+ boolean isFinal;
boolean isStatic;
Class<?> fclass;
String fname;
@@ -671,12 +673,14 @@
Field f = (fieldRef instanceof Field ? (Field)fieldRef : null);
if (f != null) {
isStatic = Modifier.isStatic(f.getModifiers());
+ isFinal = Modifier.isFinal(f.getModifiers());
fclass = f.getDeclaringClass();
fname = f.getName();
ftype = f.getType();
} else {
Object[] scnt = (Object[]) fieldRef;
isStatic = (Boolean) scnt[0];
+ isFinal = false;
fclass = (Class<?>) scnt[1];
fname = (String) scnt[2];
ftype = (Class<?>) scnt[3];
@@ -720,18 +724,21 @@
? NoSuchFieldException.class
: IllegalAccessException.class,
noAccess);
+ if (((testMode0 & TEST_SETTER) != 0) && (isFinal && isStatic)) return; // Final static field setter test failed as intended.
if (verbosity >= 5) ex.printStackTrace(System.out);
}
if (verbosity >= 3)
- System.out.println("find"+(isStatic?"Static":"")+(isGetter?"Getter":"Setter")+" "+fclass.getName()+"."+fname+"/"+ftype
- +" => "+mh
- +(noAccess == null ? "" : " !! "+noAccess));
+ System.out.println((((testMode0 & TEST_UNREFLECT) != 0)?"unreflect":"find")
+ +(((testMode0 & TEST_FIND_STATIC) != 0)?"Static":"")
+ +(isGetter?"Getter":"Setter")
+ +" "+fclass.getName()+"."+fname+"/"+ftype
+ +" => "+mh
+ +(noAccess == null ? "" : " !! "+noAccess));
if (positive && !testNPE && noAccess != null) throw new RuntimeException(noAccess);
assertEquals(positive0 ? "positive test" : "negative test erroneously passed", positive0, mh != null);
+ assertFalse("Setter methods should throw an exception if passed a final static field.", ((testMode0 & TEST_SETTER) != 0) && (isFinal && isStatic));
if (!positive && !testNPE) return; // negative access test failed as expected
assertEquals((isStatic ? 0 : 1)+(isGetter ? 0 : 1), mh.type().parameterCount());
-
-
assertSame(mh.type(), expType);
//assertNameStringContains(mh, fname); // This does not hold anymore with LFs
HasFields fields = new HasFields();
@@ -778,8 +785,7 @@
}
}
assertEquals(sawValue, expValue);
- if (f != null && f.getDeclaringClass() == HasFields.class
- && !Modifier.isFinal(f.getModifiers())) {
+ if (f != null && f.getDeclaringClass() == HasFields.class && !isFinal) {
Object random = randomArg(ftype);
f.set(fields, random);
expValue = random;
@@ -813,8 +819,8 @@
}
}
}
- if (f != null && f.getDeclaringClass() == HasFields.class) {
- f.set(fields, value); // put it back
+ if ((f != null) && (f.getDeclaringClass() == HasFields.class) && !isFinal) {
+ f.set(fields, value); // put it back if we changed it.
}
if (testNPE) {
if (caughtEx == null || !(caughtEx instanceof NullPointerException))
@@ -862,7 +868,6 @@
public void testSetter(int testMode) throws Throwable {
Lookup lookup = PRIVATE; // FIXME: test more lookups than this one
- startTest("unreflectSetter");
for (Object[] c : HasFields.CASES) {
boolean positive = (c[1] != Error.class);
testSetter(positive, lookup, c[0], c[1], testMode);
--- a/test/jdk/java/lang/invoke/MethodHandlesTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/lang/invoke/MethodHandlesTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -545,14 +545,14 @@
}
public static class HasFields {
- boolean fZ = false;
- byte fB = (byte)'B';
- short fS = (short)'S';
- char fC = 'C';
- int fI = 'I';
- long fJ = 'J';
- float fF = 'F';
- double fD = 'D';
+ boolean iZ = false;
+ byte iB = (byte)'B';
+ short iS = (short)'S';
+ char iC = 'C';
+ int iI = 'I';
+ long iJ = 'J';
+ float iF = 'F';
+ double iD = 'D';
static boolean sZ = true;
static byte sB = 1+(byte)'B';
static short sS = 1+(short)'S';
@@ -561,11 +561,21 @@
static long sJ = 1+'J';
static float sF = 1+'F';
static double sD = 1+'D';
+ final static boolean fsZ = false;
+ final static byte fsB = 2+(byte)'B';
+ final static short fsS = 2+(short)'S';
+ final static char fsC = 2+'C';
+ final static int fsI = 2+'I';
+ final static long fsJ = 2+'J';
+ final static float fsF = 2+'F';
+ final static double fsD = 2+'D';
- Object fL = 'L';
- String fR = "R";
+ Object iL = 'L';
+ String iR = "R";
static Object sL = 'M';
static String sR = "S";
+ final static Object fsL = 'N';
+ final static String fsR = "T";
static final Object[][] CASES;
static {
@@ -579,14 +589,16 @@
};
HasFields fields = new HasFields();
for (Object[] t : types) {
- for (int kind = 0; kind <= 1; kind++) {
+ for (int kind = 0; kind <= 2; kind++) {
boolean isStatic = (kind != 0);
+ boolean isFinal = (kind == 2);
char btc = (Character)t[0];
- String name = (isStatic ? "s" : "f") + btc;
+ String name = (isStatic ? "s" : "i") + btc;
+ if (isFinal) name = "f" + name;
Class<?> type = (Class<?>) t[1];
Object value;
Field field;
- try {
+ try {
field = HasFields.class.getDeclaredField(name);
} catch (NoSuchFieldException | SecurityException ex) {
throw new InternalError("no field HasFields."+name);
@@ -599,11 +611,14 @@
if (type == float.class) {
float v = 'F';
if (isStatic) v++;
+ if (isFinal) v++;
assertTrue(value.equals(v));
}
+ if (isFinal && isStatic) field.setAccessible(true);
assertTrue(name.equals(field.getName()));
assertTrue(type.equals(field.getType()));
assertTrue(isStatic == (Modifier.isStatic(field.getModifiers())));
+ assertTrue(isFinal == (Modifier.isFinal(field.getModifiers())));
cases.add(new Object[]{ field, value });
}
}
--- a/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java Tue Apr 02 10:57:57 2019 +0530
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 8152645
+ * @bug 8152645 8216558
* @summary test field lookup accessibility of MethodHandles and VarHandles
* @compile TestFieldLookupAccessibility.java
* pkg/A.java pkg/B_extends_A.java pkg/C.java
@@ -96,6 +96,12 @@
Object lookup(MethodHandles.Lookup l, Field f) throws Exception {
return l.unreflectGetter(cloneAndSetAccessible(f));
}
+
+ // Setting the accessibility bit of a Field grants access under
+ // all conditions for MethodHandle getters.
+ Set<String> inaccessibleFields(Set<String> inaccessibleFields) {
+ return new HashSet<>();
+ }
},
MH_UNREFLECT_SETTER() {
Object lookup(MethodHandles.Lookup l, Field f) throws Exception {
@@ -103,13 +109,27 @@
}
boolean isAccessible(Field f) {
- return f.isAccessible() || !Modifier.isFinal(f.getModifiers());
+ return f.isAccessible() && !Modifier.isStatic(f.getModifiers()) || !Modifier.isFinal(f.getModifiers());
}
},
MH_UNREFLECT_SETTER_ACCESSIBLE() {
Object lookup(MethodHandles.Lookup l, Field f) throws Exception {
return l.unreflectSetter(cloneAndSetAccessible(f));
}
+
+ boolean isAccessible(Field f) {
+ return !(Modifier.isStatic(f.getModifiers()) && Modifier.isFinal(f.getModifiers()));
+ }
+
+ // Setting the accessibility bit of a Field grants access to non-static
+ // final fields for MethodHandle setters.
+ Set<String> inaccessibleFields(Set<String>inaccessibleFields) {
+ Set<String> result = new HashSet<>();
+ inaccessibleFields.stream()
+ .filter(f -> (f.contains("static") && f.contains("final")))
+ .forEach(result::add);
+ return result;
+ }
},
VH() {
Object lookup(MethodHandles.Lookup l, Field f) throws Exception {
@@ -142,6 +162,10 @@
return true;
}
+ Set<String> inaccessibleFields(Set<String> inaccessibleFields) {
+ return new HashSet<>(inaccessibleFields);
+ }
+
static Field cloneAndSetAccessible(Field f) throws Exception {
// Clone to avoid mutating source field
f = f.getDeclaringClass().getDeclaredField(f.getName());
@@ -180,7 +204,7 @@
@Test(dataProvider = "lookupProvider")
public void test(FieldLookup fl, Class<?> src, MethodHandles.Lookup l, Set<String> inaccessibleFields) {
// Add to the expected failures all inaccessible fields due to accessibility modifiers
- Set<String> expected = new HashSet<>(inaccessibleFields);
+ Set<String> expected = fl.inaccessibleFields(inaccessibleFields);
Map<Field, Throwable> actual = new HashMap<>();
for (Field f : fields(src)) {
@@ -202,12 +226,7 @@
collect(Collectors.toSet());
if (!actualFieldNames.equals(expected)) {
if (actualFieldNames.isEmpty()) {
- // Setting the accessibility bit of a Field grants access under
- // all conditions for MethodHander getters and setters
- if (fl != FieldLookup.MH_UNREFLECT_GETTER_ACCESSIBLE &&
- fl != FieldLookup.MH_UNREFLECT_SETTER_ACCESSIBLE) {
- Assert.assertEquals(actualFieldNames, expected, "No accessibility failures:");
- }
+ Assert.assertEquals(actualFieldNames, expected, "No accessibility failures:");
}
else {
Assert.assertEquals(actualFieldNames, expected, "Accessibility failures differ:");
--- a/test/jdk/java/math/BigInteger/LargeValueExceptions.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/math/BigInteger/LargeValueExceptions.java Tue Apr 02 10:57:57 2019 +0530
@@ -25,7 +25,7 @@
* @test
* @bug 8200698
* @summary Tests that exceptions are thrown for ops which would overflow
- * @requires os.maxMemory >= 4g
+ * @requires (sun.arch.data.model == "64" & os.maxMemory >= 4g)
* @run testng/othervm -Xmx4g LargeValueExceptions
*/
import java.math.BigInteger;
--- a/test/jdk/java/net/HttpCookie/ExpiredCookieTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/HttpCookie/ExpiredCookieTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,12 +24,14 @@
/*
* @test
* @bug 8000525
+ * @library /test/lib
*/
import java.net.*;
import java.util.*;
import java.io.*;
import java.text.*;
+import jdk.test.lib.net.URIBuilder;
public class ExpiredCookieTest {
// lifted from HttpCookie.java
@@ -81,7 +83,13 @@
"TEST4=TEST4; Path=/; Expires=" + datestring.toString());
header.put("Set-Cookie", values);
- cm.put(new URI("http://127.0.0.1/"), header);
+ URI uri = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .path("/")
+ .buildUnchecked();
+ System.out.println("URI: " + uri);
+ cm.put(uri, header);
CookieStore cookieJar = cm.getCookieStore();
List <HttpCookie> cookies = cookieJar.getCookies();
--- a/test/jdk/java/net/HttpURLConnection/NoProxyTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/HttpURLConnection/NoProxyTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,11 +24,13 @@
/*
* @test
* @bug 8144008
+ * @library /test/lib
* @summary Setting NO_PROXY on HTTP URL connections does not stop proxying
* @run main/othervm NoProxyTest
*/
import java.io.IOException;
+import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.Proxy;
import java.net.ProxySelector;
@@ -37,6 +39,7 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.List;
+import jdk.test.lib.net.URIBuilder;
public class NoProxyTest {
@@ -52,7 +55,12 @@
public static void main(String args[]) throws MalformedURLException {
ProxySelector.setDefault(new NoProxyTestSelector());
- URL url = URI.create("http://127.0.0.1/").toURL();
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .path("/")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
URLConnection connection;
try {
connection = url.openConnection(Proxy.NO_PROXY);
--- a/test/jdk/java/net/ProxySelector/NullSelector.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/ProxySelector/NullSelector.java Tue Apr 02 10:57:57 2019 +0530
@@ -23,15 +23,22 @@
/* @test
* @bug 6215885
+ * @library /test/lib
* @summary URLConnection.openConnection NPE if ProxySelector.setDefault is set to null
*/
import java.net.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
public class NullSelector {
public static void main(String[] args) throws Exception {
- URL url = new URL("http://127.0.0.1/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .path("/")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
ProxySelector.setDefault(null);
URLConnection con = url.openConnection();
con.setConnectTimeout(500);
--- a/test/jdk/java/net/ResponseCache/Test2.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/ResponseCache/Test2.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8042622
+ * @library /test/lib
* @summary Check for CRL results in IllegalArgumentException "white space not allowed"
* @modules jdk.httpserver
* @run main/othervm Test2
@@ -38,6 +39,7 @@
import java.security.*;
import javax.security.auth.callback.*;
import javax.net.ssl.*;
+import jdk.test.lib.net.URIBuilder;
public class Test2 {
@@ -63,7 +65,7 @@
static int port;
- static String urlstring, redirstring;
+ static URL url, redir;
public static void main (String[] args) throws Exception {
Handler handler = new Handler();
@@ -78,10 +80,21 @@
server.setExecutor (executor);
server.start ();
- urlstring = "http://127.0.0.1:" + Integer.toString(port)+"/test/foo";
- redirstring = urlstring + "/redirect/bar";
+ url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/test/foo")
+ .toURLUnchecked();
+ System.out.println("URL: " + url);
+ redir = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/test/foo/redirect/bar")
+ .toURLUnchecked();
+ System.out.println("Redir URL: " + redir);
- URL url = new URL (urlstring);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
urlc.addRequestProperty("X-Foo", "bar");
urlc.setInstanceFollowRedirects(true);
@@ -114,7 +127,7 @@
Headers rmap = t.getResponseHeaders();
invocation ++;
if (invocation == 1) {
- rmap.add("Location", redirstring);
+ rmap.add("Location", redir.toString());
while (is.read () != -1) ;
is.close();
System.out.println ("sending response");
--- a/test/jdk/java/net/Socket/Timeouts.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/Socket/Timeouts.java Tue Apr 02 10:57:57 2019 +0530
@@ -85,8 +85,7 @@
}
/**
- * Test connect with a negative timeout. This case is not currently specified
- * but the long standing behavior is to throw IllegalArgumentException.
+ * Test connect with a negative timeout.
*/
public void testTimedConnect4() throws IOException {
try (ServerSocket ss = new ServerSocket(0)) {
@@ -393,8 +392,7 @@
}
/**
- * Test Socket setSoTimeout with a negative timeout. This case is not currently
- * specified but the long standing behavior is to throw IllegalArgumentException.
+ * Test Socket setSoTimeout with a negative timeout.
*/
@Test(expectedExceptions = { IllegalArgumentException.class })
public void testBadTimeout1() throws IOException {
@@ -404,9 +402,7 @@
}
/**
- * Test ServerSocket setSoTimeout with a negative timeout. This case is not
- * currently specified but the long standing behavior is to throw
- * IllegalArgumentException.
+ * Test ServerSocket setSoTimeout with a negative timeout.
*/
@Test(expectedExceptions = { IllegalArgumentException.class })
public void testBadTimeout2() throws IOException {
--- a/test/jdk/java/net/URLClassLoader/closetest/CloseTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/URLClassLoader/closetest/CloseTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -42,6 +42,7 @@
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URLClassLoader;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URL;
import java.nio.file.Files;
@@ -49,6 +50,7 @@
import java.nio.file.Paths;
import jdk.test.lib.compiler.CompilerUtils;
+import jdk.test.lib.net.URIBuilder;
import jdk.test.lib.util.JarUtils;
import com.sun.net.httpserver.HttpContext;
@@ -157,8 +159,12 @@
static URL getServerURL() throws Exception {
int port = httpServer.getAddress().getPort();
- String s = "http://127.0.0.1:" + port + "/";
- return new URL(s);
+ return URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/")
+ .toURL();
}
static void startHttpServer(String docroot) throws Exception {
--- a/test/jdk/java/net/URLConnection/TimeoutTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/URLConnection/TimeoutTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,12 +24,14 @@
/*
* @test
* @bug 4389976
+ * @library /test/lib
* @summary can't unblock read() of InputStream from URL connection
* @run main/timeout=40/othervm -Dsun.net.client.defaultReadTimeout=2000 TimeoutTest
*/
import java.io.*;
import java.net.*;
+import jdk.test.lib.net.URIBuilder;
public class TimeoutTest {
@@ -68,7 +70,12 @@
ServerSocket ss = new ServerSocket(0);
Server s = new Server (ss);
try{
- URL url = new URL ("http://127.0.0.1:"+ss.getLocalPort());
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(ss.getLocalPort())
+ .toURL();
+ System.out.println("URL: " + url);
URLConnection urlc = url.openConnection ();
InputStream is = urlc.getInputStream ();
throw new RuntimeException("Should have received timeout");
--- a/test/jdk/java/net/URLPermission/OpenURL.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/URLPermission/OpenURL.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,11 +24,13 @@
/*
* @test
* @bug 8029354
+ * @library /test/lib
* @run main/othervm OpenURL
*/
import java.net.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
public class OpenURL {
@@ -37,7 +39,13 @@
System.setSecurityManager(new SecurityManager());
try {
- URL url = new URL ("http://joe@127.0.0.1/a/b");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .userInfo("joe")
+ .loopback()
+ .path("/a/b")
+ .toURL();
+ System.out.println("URL: " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
InputStream is = urlc.getInputStream();
// error will throw exception other than SecurityException
--- a/test/jdk/java/net/httpclient/AuthSchemesTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/httpclient/AuthSchemesTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8217237
+ * @library /test/lib
* @modules java.net.http
* @run main/othervm AuthSchemesTest
* @summary HttpClient does not deal well with multi-valued WWW-Authenticate challenge headers
@@ -37,6 +38,7 @@
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
+import jdk.test.lib.net.URIBuilder;
public class AuthSchemesTest {
static class BasicServer extends Thread {
@@ -142,7 +144,13 @@
.authenticator(authenticator)
.build();
server.start();
- URI uri = URI.create("http://127.0.0.1:" + port + "/foo");
+ URI uri = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo")
+ .build();
+ System.out.println("URI: " + uri);
HttpRequest request = HttpRequest.newBuilder(uri)
.GET()
.build();
--- a/test/jdk/java/net/httpclient/LargeResponseContent.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/httpclient/LargeResponseContent.java Tue Apr 02 10:57:57 2019 +0530
@@ -39,10 +39,12 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Flow;
+import jdk.test.lib.net.URIBuilder;
/**
* @test
* @bug 8212926
+ * @library /test/lib
* @summary Basic tests for response timeouts
* @run main/othervm LargeResponseContent
*/
@@ -60,7 +62,13 @@
}
void runClient() throws IOException, InterruptedException {
- URI uri = URI.create("http://127.0.0.1:" + Integer.toString(port) + "/foo");
+ URI uri = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo")
+ .buildUnchecked();
+ System.out.println("URI: " + uri);
HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder(uri)
.GET()
--- a/test/jdk/java/net/httpclient/whitebox/ConnectionPoolTestDriver.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/httpclient/whitebox/ConnectionPoolTestDriver.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8187044 8187111
+ * @bug 8187044 8187111 8221395
* @summary Verifies that the ConnectionPool correctly handle
* connection deadlines and purges the right connections
* from the cache.
@@ -35,4 +35,8 @@
* @run main/othervm
* --add-reads java.net.http=java.management
* java.net.http/jdk.internal.net.http.ConnectionPoolTest testPoolSize
+ * @run main/othervm
+ * --add-reads java.net.http=java.management
+ * -Djdk.httpclient.HttpClient.log=errors,requests,headers,content,ssl,trace,channel
+ * java.net.http/jdk.internal.net.http.ConnectionPoolTest testCloseOrReturnToPool
*/
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,25 @@
import java.io.IOException;
import java.lang.management.ManagementFactory;
+import java.lang.ref.Reference;
import java.net.Authenticator;
import java.net.CookieHandler;
import java.net.InetSocketAddress;
import java.net.ProxySelector;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketOption;
+import java.net.http.HttpHeaders;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
+import java.nio.channels.spi.SelectorProvider;
import java.time.Duration;
-import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import java.util.Random;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.concurrent.Flow;
@@ -53,7 +61,7 @@
* @summary Verifies that the ConnectionPool correctly handle
* connection deadlines and purges the right connections
* from the cache.
- * @bug 8187044 8187111
+ * @bug 8187044 8187111 8221395
* @author danielfuchs
*/
public class ConnectionPoolTest {
@@ -78,7 +86,10 @@
} else if ("testPoolSize".equals(arg)) {
assert args.length == 1 : "testPoolSize should be run in its own VM";
testPoolSize();
- }
+ } else if ("testCloseOrReturnToPool".equals(arg)) {
+ assert args.length == 1 : "testCloseOrReturnToPool should be run in its own VM";
+ testCloseOrReturnToPool();
+ } else throw new RuntimeException("unknown test case: " + arg);
}
}
@@ -226,6 +237,113 @@
}
}
+ public static void testCloseOrReturnToPool() throws Exception {
+ HttpClientFacade facade = (HttpClientFacade)HttpClient.newHttpClient();
+ HttpClientImpl client = facade.impl;
+ ConnectionPool pool = client.connectionPool();
+ InetSocketAddress proxy = InetSocketAddress.createUnresolved("bar", 80);
+
+ InetSocketAddress addr = InetSocketAddress.createUnresolved("foo1", 80);
+ HttpConnectionStub conn1 = new HttpConnectionStub(facade, client, addr, proxy, true);
+ HttpHeaders hdrs = HttpHeaders.of(new HashMap<>(), (s1,s2) -> true);
+ HttpConnection conn;
+
+ conn1.reopen();
+ if (!conn1.isOpen()) {
+ throw new RuntimeException("conn1 finished");
+ }
+
+ conn1.closeOrReturnToCache(hdrs);
+
+ // Check we can find conn1 in the pool
+ if (conn1 != (conn = pool.getConnection(true, addr, proxy))) {
+ throw new RuntimeException("conn1 not returned, got: " + conn);
+ }
+ System.out.println("Found connection in the pool: " + conn );
+
+ // Try to return it with no headers: the connection should
+ // be closed and not returned to the pool (EOF).
+ conn.closeOrReturnToCache(null);
+ if ((conn = pool.getConnection(true, addr, proxy)) != null) {
+ throw new RuntimeException(conn + " found in the pool!");
+ }
+ if (!conn1.closed) {
+ throw new RuntimeException("conn1 not closed!");
+ }
+ System.out.println("EOF connection successfully closed when returned to pool");
+
+ // reopen the connection
+ conn1.reopen();
+ if (!conn1.isOpen()) {
+ throw new RuntimeException("conn1 finished");
+ }
+
+ // Try to return it with empty headers: the connection should
+ // be returned to the pool.
+ conn1.closeOrReturnToCache(hdrs);
+ if (conn1 != (conn = pool.getConnection(true, addr, proxy))) {
+ throw new RuntimeException("conn1 not returned to pool, got: " + conn);
+ }
+ if (conn1.closed) {
+ throw new RuntimeException("conn1 closed");
+ }
+ if (!conn1.isOpen()) {
+ throw new RuntimeException("conn1 finished");
+ }
+
+ System.out.println("Keep alive connection successfully returned to pool");
+
+ // Try to return it with connection: close headers: the connection should
+ // not be returned to the pool, and should be closed.
+ HttpHeaders hdrs2 = HttpHeaders.of(Map.of("connection", List.of("close")), (s1, s2) -> true);
+ conn1.closeOrReturnToCache(hdrs2);
+ if ((conn = pool.getConnection(true, addr, proxy)) != null) {
+ throw new RuntimeException(conn + " found in the pool!");
+ }
+ if (!conn1.closed) {
+ throw new RuntimeException("conn1 not closed!");
+ }
+ System.out.println("Close connection successfully closed when returned to pool");
+
+ // reopen and finish the connection.
+ conn1.reopen();
+ conn1.finish(true);
+ if (conn1.closed) {
+ throw new RuntimeException("conn1 closed");
+ }
+ if (conn1.isOpen()) {
+ throw new RuntimeException("conn1 is opened!");
+ }
+ conn1.closeOrReturnToCache(hdrs2);
+ if ((conn = pool.getConnection(true, addr, proxy)) != null) {
+ throw new RuntimeException(conn + " found in the pool!");
+ }
+ if (!conn1.closed) {
+ throw new RuntimeException("conn1 not closed!");
+ }
+ System.out.println("Finished 'close' connection successfully closed when returned to pool");
+
+ // reopen and finish the connection.
+ conn1.reopen();
+ conn1.finish(true);
+ if (conn1.closed) {
+ throw new RuntimeException("conn1 closed");
+ }
+ if (conn1.isOpen()) {
+ throw new RuntimeException("conn1 is opened!");
+ }
+ conn1.closeOrReturnToCache(hdrs);
+ if ((conn = pool.getConnection(true, addr, proxy)) != null) {
+ throw new RuntimeException(conn + " found in the pool!");
+ }
+ if (!conn1.closed) {
+ throw new RuntimeException("conn1 not closed!");
+ }
+ System.out.println("Finished keep-alive connection successfully closed when returned to pool");
+
+ Reference.reachabilityFence(facade);
+ }
+
static <T> T error() {
throw new InternalError("Should not reach here: wrong test assumptions!");
}
@@ -241,22 +359,108 @@
@Override
public void subscribe(Flow.Subscriber<? super List<ByteBuffer>> subscriber) {
}
- @Override public boolean isFinished() { return conn.closed; }
+ @Override public boolean isFinished() { return conn.finished; }
+ }
+
+ static class SocketChannelStub extends SocketChannel {
+
+ SocketChannelStub() { super(SelectorProvider.provider()); }
+
+ @Override
+ public SocketChannel bind(SocketAddress local) throws IOException {
+ return error();
+ }
+ @Override
+ public <T> SocketChannel setOption(SocketOption<T> name, T value) throws IOException {
+ return error();
+ }
+ @Override
+ public SocketChannel shutdownInput() throws IOException {
+ return error();
+ }
+ @Override
+ public SocketChannel shutdownOutput() throws IOException {
+ return error();
+ }
+ @Override
+ public Socket socket() { return error(); }
+ @Override
+ public boolean isConnected() { return true; }
+ @Override
+ public boolean isConnectionPending() { return false; }
+ @Override
+ public boolean connect(SocketAddress remote) throws IOException {
+ return error();
+ }
+ @Override
+ public boolean finishConnect() throws IOException {
+ return error();
+ }
+ @Override
+ public SocketAddress getRemoteAddress() throws IOException {
+ return error();
+ }
+ @Override
+ public int read(ByteBuffer dst) throws IOException {
+ return error();
+ }
+ @Override
+ public long read(ByteBuffer[] dsts, int offset, int length) throws IOException {
+ return error();
+ }
+ @Override
+ public int write(ByteBuffer src) throws IOException {
+ return error();
+ }
+ @Override
+ public long write(ByteBuffer[] srcs, int offset, int length) throws IOException {
+ return 0;
+ }
+ @Override
+ public SocketAddress getLocalAddress() throws IOException {
+ return error();
+ }
+ @Override
+ public <T> T getOption(SocketOption<T> name) throws IOException {
+ return error();
+ }
+ @Override
+ public Set<SocketOption<?>> supportedOptions() {
+ return error();
+ }
+ @Override
+ protected void implCloseSelectableChannel() throws IOException {
+ error();
+ }
+ @Override
+ protected void implConfigureBlocking(boolean block) throws IOException {
+ error();
+ }
}
// Emulates an HttpConnection that has a strong reference to its HttpClient.
static class HttpConnectionStub extends HttpConnection {
- public HttpConnectionStub(HttpClient client,
+ public HttpConnectionStub(
+ HttpClient client,
InetSocketAddress address,
InetSocketAddress proxy,
boolean secured) {
- super(address, null);
+ this(client, null, address, proxy, secured);
+ }
+ public HttpConnectionStub(
+ HttpClient client,
+ HttpClientImpl impl,
+ InetSocketAddress address,
+ InetSocketAddress proxy,
+ boolean secured) {
+ super(address, impl);
this.key = ConnectionPool.cacheKey(address, proxy);
this.address = address;
this.proxy = proxy;
this.secured = secured;
this.client = client;
+ this.channel = new SocketChannelStub();
this.flow = new FlowTubeStub(this);
}
@@ -266,16 +470,23 @@
final ConnectionPool.CacheKey key;
final HttpClient client;
final FlowTubeStub flow;
- volatile boolean closed;
+ final SocketChannel channel;
+ volatile boolean closed, finished;
+
+ // Used for testing closeOrReturnToPool.
+ void finish(boolean finished) { this.finished = finished; }
+ void reopen() { closed = finished = false;}
// All these return something
@Override boolean connected() {return !closed;}
@Override boolean isSecure() {return secured;}
@Override boolean isProxied() {return proxy!=null;}
@Override ConnectionPool.CacheKey cacheKey() {return key;}
+ @Override FlowTube getConnectionFlow() {return flow;}
+ @Override SocketChannel channel() {return channel;}
@Override
public void close() {
- closed=true;
+ closed=finished=true;
System.out.println("closed: " + this);
}
@Override
@@ -283,13 +494,11 @@
return "HttpConnectionStub: " + address + " proxy: " + proxy;
}
+
// All these throw errors
@Override public HttpPublisher publisher() {return error();}
@Override public CompletableFuture<Void> connectAsync(Exchange<?> e) {return error();}
@Override public CompletableFuture<Void> finishConnect() {return error();}
- @Override SocketChannel channel() {return error();}
- @Override
- FlowTube getConnectionFlow() {return flow;}
}
// Emulates an HttpClient that has a strong reference to its connection pool.
static class HttpClientStub extends HttpClient {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/nio/channels/SocketChannel/ConnectionReset.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @requires os.family != "solaris"
+ * @run testng ConnectionReset
+ * @summary Test behavior of SocketChannel.read and the Socket adaptor read
+ * and available methods when a connection is reset
+ */
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+import java.lang.reflect.Method;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+@Test
+public class ConnectionReset {
+
+ static final int REPEAT_COUNT = 5;
+
+ /**
+ * Tests SocketChannel.read when the connection is reset and there are no
+ * bytes to read.
+ */
+ public void testSocketChannelReadNoData() throws IOException {
+ System.out.println("testSocketChannelReadNoData");
+ withResetConnection(null, sc -> {
+ ByteBuffer bb = ByteBuffer.allocate(100);
+ for (int i=0; i<REPEAT_COUNT; i++) {
+ try {
+ sc.read(bb);
+ assertTrue(false);
+ } catch (IOException ioe) {
+ System.out.format("read => %s (expected)%n", ioe);
+ }
+ }
+ });
+ }
+
+ /**
+ * Tests SocketChannel.read when the connection is reset and there are bytes
+ * to read.
+ */
+ public void testSocketChannelReadData() throws IOException {
+ System.out.println("testSocketChannelReadData");
+ byte[] data = { 1, 2, 3 };
+ withResetConnection(data, sc -> {
+ int remaining = data.length;
+ ByteBuffer bb = ByteBuffer.allocate(remaining + 100);
+ for (int i=0; i<REPEAT_COUNT; i++) {
+ try {
+ int bytesRead = sc.read(bb);
+ if (bytesRead == -1) {
+ System.out.println("read => EOF");
+ } else {
+ System.out.println("read => " + bytesRead + " byte(s)");
+ }
+ assertTrue(bytesRead > 0);
+ remaining -= bytesRead;
+ assertTrue(remaining >= 0);
+ } catch (IOException ioe) {
+ System.out.format("read => %s%n", ioe);
+ remaining = 0;
+ }
+ }
+ });
+ }
+
+
+ /**
+ * Tests available before Socket read when the connection is reset and there
+ * are no bytes to read.
+ */
+ public void testAvailableBeforeSocketReadNoData() throws IOException {
+ System.out.println("testAvailableBeforeSocketReadNoData");
+ withResetConnection(null, sc -> {
+ Socket s = sc.socket();
+ InputStream in = s.getInputStream();
+ for (int i=0; i<REPEAT_COUNT; i++) {
+ int bytesAvailable = in.available();
+ System.out.format("available => %d%n", bytesAvailable);
+ assertTrue(bytesAvailable == 0);
+ try {
+ int bytesRead = in.read();
+ if (bytesRead == -1) {
+ System.out.println("read => EOF");
+ } else {
+ System.out.println("read => 1 byte");
+ }
+ assertTrue(false);
+ } catch (IOException ioe) {
+ System.out.format("read => %s (expected)%n", ioe);
+ }
+ }
+ });
+ }
+
+ /**
+ * Tests available before Socket read when the connection is reset and there
+ * are bytes to read.
+ */
+ public void testAvailableBeforeSocketReadData() throws IOException {
+ System.out.println("testAvailableBeforeSocketReadData");
+ byte[] data = { 1, 2, 3 };
+ withResetConnection(data, sc -> {
+ Socket s = sc.socket();
+ InputStream in = s.getInputStream();
+ int remaining = data.length;
+ for (int i=0; i<REPEAT_COUNT; i++) {
+ int bytesAvailable = in.available();
+ System.out.format("available => %d%n", bytesAvailable);
+ assertTrue(bytesAvailable <= remaining);
+ try {
+ int bytesRead = in.read();
+ if (bytesRead == -1) {
+ System.out.println("read => EOF");
+ assertTrue(false);
+ } else {
+ System.out.println("read => 1 byte");
+ assertTrue(remaining > 0);
+ remaining--;
+ }
+ } catch (IOException ioe) {
+ System.out.format("read => %s%n", ioe);
+ remaining = 0;
+ }
+ }
+ });
+ }
+
+ /**
+ * Tests Socket read before available when the connection is reset and there
+ * are no bytes to read.
+ */
+ public void testSocketReadNoDataBeforeAvailable() throws IOException {
+ System.out.println("testSocketReadNoDataBeforeAvailable");
+ withResetConnection(null, sc -> {
+ Socket s = sc.socket();
+ InputStream in = s.getInputStream();
+ for (int i=0; i<REPEAT_COUNT; i++) {
+ try {
+ int bytesRead = in.read();
+ if (bytesRead == -1) {
+ System.out.println("read => EOF");
+ } else {
+ System.out.println("read => 1 byte");
+ }
+ assertTrue(false);
+ } catch (IOException ioe) {
+ System.out.format("read => %s (expected)%n", ioe);
+ }
+ int bytesAvailable = in.available();
+ System.out.format("available => %d%n", bytesAvailable);
+ assertTrue(bytesAvailable == 0);
+ }
+ });
+ }
+
+ /**
+ * Tests Socket read before available when the connection is reset and there
+ * are bytes to read.
+ */
+ public void testSocketReadDataBeforeAvailable() throws IOException {
+ System.out.println("testSocketReadDataBeforeAvailable");
+ byte[] data = { 1, 2, 3 };
+ withResetConnection(data, sc -> {
+ Socket s = sc.socket();
+ InputStream in = s.getInputStream();
+ int remaining = data.length;
+ for (int i=0; i<REPEAT_COUNT; i++) {
+ try {
+ int bytesRead = in.read();
+ if (bytesRead == -1) {
+ System.out.println("read => EOF");
+ assertTrue(false);
+ } else {
+ System.out.println("read => 1 byte");
+ assertTrue(remaining > 0);
+ remaining--;
+ }
+ } catch (IOException ioe) {
+ System.out.format("read => %s%n", ioe);
+ remaining = 0;
+ }
+ int bytesAvailable = in.available();
+ System.out.format("available => %d%n", bytesAvailable);
+ assertTrue(bytesAvailable <= remaining);
+ }
+ });
+ }
+
+ interface ThrowingConsumer<T> {
+ void accept(T t) throws IOException;
+ }
+
+ /**
+ * Invokes a consumer with a SocketChannel connected to a peer that has closed
+ * the connection with a "connection reset". The peer sends the given data
+ * bytes before closing (when data is not null).
+ */
+ static void withResetConnection(byte[] data, ThrowingConsumer<SocketChannel> consumer)
+ throws IOException
+ {
+ var loopback = InetAddress.getLoopbackAddress();
+ try (var listener = new ServerSocket()) {
+ listener.bind(new InetSocketAddress(loopback, 0));
+ try (var sc = SocketChannel.open()) {
+ sc.connect(listener.getLocalSocketAddress());
+ try (Socket peer = listener.accept()) {
+ if (data != null) {
+ peer.getOutputStream().write(data);
+ }
+ peer.setSoLinger(true, 0);
+ }
+ consumer.accept(sc);
+ }
+ }
+ }
+}
--- a/test/jdk/java/security/Signature/Offsets.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/security/Signature/Offsets.java Tue Apr 02 10:57:57 2019 +0530
@@ -123,8 +123,13 @@
throw new RuntimeException("Test doesn't support this signature "
+ "algorithm: " + algorithm);
}
-
- KeyPairGenerator kpg = KeyPairGenerator.getInstance(keyAlgo, provider);
+ KeyPairGenerator kpg = null;
+ // first try matching provider, fallback to most preferred if none available
+ try {
+ kpg = KeyPairGenerator.getInstance(keyAlgo, provider);
+ } catch (NoSuchAlgorithmException nsae) {
+ kpg = KeyPairGenerator.getInstance(keyAlgo);
+ }
kpg.initialize(keySize);
KeyPair kp = kpg.generateKeyPair();
PublicKey pubkey = kp.getPublic();
--- a/test/jdk/java/security/SignedObject/Chain.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/security/SignedObject/Chain.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,13 +21,7 @@
* questions.
*/
-import java.security.Signature;
-import java.security.SignedObject;
-import java.security.KeyPairGenerator;
-import java.security.KeyPair;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
+import java.security.*;
import java.security.spec.*;
import java.util.*;
import jdk.test.lib.SigTestUtil;
@@ -197,8 +191,15 @@
if (test.provider != Provider.Default) {
signature = Signature.getInstance(test.sigAlg.name,
test.provider.name);
- kpg = KeyPairGenerator.getInstance(
- test.keyAlg.name, test.provider.name);
+ // try using the same provider first, if not, fallback
+ // to the first available impl
+ try {
+ kpg = KeyPairGenerator.getInstance(
+ test.keyAlg.name, test.provider.name);
+ } catch (NoSuchAlgorithmException nsae) {
+ kpg = KeyPairGenerator.getInstance(
+ test.keyAlg.name);
+ }
} else {
signature = Signature.getInstance(test.sigAlg.name);
kpg = KeyPairGenerator.getInstance(test.keyAlg.name);
--- a/test/jdk/java/text/Format/DateFormat/WeekDateTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/text/Format/DateFormat/WeekDateTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -137,9 +137,9 @@
Calendar jcal = Calendar.getInstance(TimeZone.getTimeZone("GMT"),
new Locale("ja", "JP", "JP"));
- String format = "2-W01-2"; // 2019-12-31 == N1-12-31
+ String format = "2-W01-2"; // 2019-12-31 == R1-12-31
int expectedYear = 2019;
- // Check the current era, Heisei or NewEra
+ // Check the current era, Heisei or Reiwa
if (System.currentTimeMillis() < 1556668800000L) {
format = "21-W01-3"; // 2008-12-31 == H20-12-31
expectedYear = 2008;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/text/Format/NumberFormat/DFSMinusPerCentMill.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8220309
+ * @library /java/text/testlib
+ * @summary Test String representation of MinusSign/Percent/PerMill symbols.
+ * This test assumes CLDR has numbering systems for "arab" and
+ * "arabext", and their minus/percent representations include
+ * BiDi formatting control characters.
+ * @run testng/othervm DFSMinusPerCentMill
+ */
+
+import java.io.*;
+import java.util.*;
+import java.text.*;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class DFSMinusPerCentMill {
+ private enum Type {
+ NUMBER, PERCENT, CURRENCY, INTEGER, COMPACT, PERMILL
+ }
+
+ private static final Locale US_ARAB = Locale.forLanguageTag("en-US-u-nu-arab");
+ private static final Locale US_ARABEXT = Locale.forLanguageTag("en-US-u-nu-arabext");
+ private static final double SRC_NUM = -1234.56;
+
+ @DataProvider
+ Object[][] formatData() {
+ return new Object[][] {
+ // Locale, FormatStyle, expected format, expected single char symbol
+ {US_ARAB, Type.NUMBER, "\u061c-\u0661\u066c\u0662\u0663\u0664\u066b\u0665\u0666"},
+ {US_ARAB, Type.PERCENT, "\u061c-\u0661\u0662\u0663\u066c\u0664\u0665\u0666\u066a\u061c"},
+ {US_ARAB, Type.CURRENCY, "\u061c-$\u0661\u066c\u0662\u0663\u0664\u066b\u0665\u0666"},
+ {US_ARAB, Type.INTEGER, "\u061c-\u0661\u066c\u0662\u0663\u0665"},
+ {US_ARAB, Type.COMPACT, "\u061c-\u0661K"},
+ {US_ARAB, Type.PERMILL, "\u061c-\u0661\u0662\u0663\u0664\u0665\u0666\u0660\u0609"},
+
+ {US_ARABEXT, Type.NUMBER, "\u200e-\u200e\u06f1\u066c\u06f2\u06f3\u06f4\u066b\u06f5\u06f6"},
+ {US_ARABEXT, Type.PERCENT, "\u200e-\u200e\u06f1\u06f2\u06f3\u066c\u06f4\u06f5\u06f6\u066a"},
+ {US_ARABEXT, Type.CURRENCY, "\u200e-\u200e$\u06f1\u066c\u06f2\u06f3\u06f4\u066b\u06f5\u06f6"},
+ {US_ARABEXT, Type.INTEGER, "\u200e-\u200e\u06f1\u066c\u06f2\u06f3\u06f5"},
+ {US_ARABEXT, Type.COMPACT, "\u200e-\u200e\u06f1K"},
+ {US_ARABEXT, Type.PERMILL, "\u200e-\u200e\u06f1\u06f2\u06f3\u06f4\u06f5\u06f6\u06f0\u0609"},
+ };
+ }
+
+ @DataProvider
+ Object[][] charSymbols() {
+ return new Object[][]{
+ // Locale, percent, per mille, minus sign
+ {US_ARAB, '\u066a', '\u0609', '-'},
+ {US_ARABEXT, '\u066a', '\u0609', '-'},
+ };
+ }
+
+ @Test(dataProvider="formatData")
+ public void testFormatData(Locale l, Type style, String expected) {
+ NumberFormat nf = null;
+ switch (style) {
+ case NUMBER:
+ nf = NumberFormat.getNumberInstance(l);
+ break;
+ case PERCENT:
+ nf = NumberFormat.getPercentInstance(l);
+ break;
+ case CURRENCY:
+ nf = NumberFormat.getCurrencyInstance(l);
+ break;
+ case INTEGER:
+ nf = NumberFormat.getIntegerInstance(l);
+ break;
+ case COMPACT:
+ nf = NumberFormat.getCompactNumberInstance(l, NumberFormat.Style.SHORT);
+ break;
+ case PERMILL:
+ nf = new DecimalFormat("#.#\u2030", DecimalFormatSymbols.getInstance(l));
+ break;
+ }
+
+ assertEquals(nf.format(SRC_NUM), expected);
+ }
+
+ @Test(dataProvider="charSymbols")
+ public void testCharSymbols(Locale l, char percent, char permill, char minus) {
+ DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(l);
+ assertEquals(dfs.getPercent(), percent);
+ assertEquals(dfs.getPerMill(), permill);
+ assertEquals(dfs.getMinusSign(), minus);
+ }
+
+ @Test
+ public void testSerialization() throws Exception {
+ DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance();
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ new ObjectOutputStream(bos).writeObject(dfs);
+ DecimalFormatSymbols dfsSerialized = (DecimalFormatSymbols)new ObjectInputStream(
+ new ByteArrayInputStream(bos.toByteArray())
+ ).readObject();
+
+ assertEquals(dfs, dfsSerialized);
+
+ // set minus/percent/permille
+ dfs.setMinusSign('a');
+ dfs.setPercent('b');
+ dfs.setPerMill('c');
+ bos = new ByteArrayOutputStream();
+ new ObjectOutputStream(bos).writeObject(dfs);
+ dfsSerialized = (DecimalFormatSymbols)new ObjectInputStream(
+ new ByteArrayInputStream(bos.toByteArray())
+ ).readObject();
+
+ assertEquals(dfs, dfsSerialized);
+ }
+}
--- a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- o Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ o Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,9 @@
*/
@Test
public class TCKJapaneseChronology {
- private static final int YDIFF_NEWERA = 2018;
+
+ // Year differences from Gregorian years.
+ private static final int YDIFF_REIWA = 2018;
private static final int YDIFF_HEISEI = 1988;
private static final int YDIFF_MEIJI = 1867;
private static final int YDIFF_SHOWA = 1925;
@@ -174,7 +176,7 @@
@DataProvider(name="createByEra")
Object[][] data_createByEra() {
return new Object[][] {
- {JapaneseEra.of(3), 2020 - YDIFF_NEWERA, 2, 29, 60, LocalDate.of(2020, 2, 29)}, // NEWERA
+ {JapaneseEra.REIWA, 2020 - YDIFF_REIWA, 2, 29, 60, LocalDate.of(2020, 2, 29)},
{JapaneseEra.HEISEI, 1996 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(1996, 2, 29)},
{JapaneseEra.HEISEI, 2000 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(2000, 2, 29)},
{JapaneseEra.MEIJI, 1874 - YDIFF_MEIJI, 2, 28, 59, LocalDate.of(1874, 2, 28)},
@@ -367,8 +369,8 @@
@DataProvider(name="prolepticYear")
Object[][] data_prolepticYear() {
return new Object[][] {
- {3, JapaneseEra.of(3), 1, 1 + YDIFF_NEWERA, false}, // NEWERA
- {3, JapaneseEra.of(3), 102, 102 + YDIFF_NEWERA, true}, // NEWERA
+ {3, JapaneseEra.REIWA, 1, 1 + YDIFF_REIWA, false},
+ {3, JapaneseEra.REIWA, 102, 102 + YDIFF_REIWA, true},
{2, JapaneseEra.HEISEI, 1, 1 + YDIFF_HEISEI, false},
{2, JapaneseEra.HEISEI, 4, 4 + YDIFF_HEISEI, true},
@@ -553,7 +555,7 @@
{ JapaneseEra.TAISHO, 0, "Taisho"},
{ JapaneseEra.SHOWA, 1, "Showa"},
{ JapaneseEra.HEISEI, 2, "Heisei"},
- { JapaneseEra.of(3), 3, "NewEra"}, // NEWERA
+ { JapaneseEra.REIWA, 3, "Reiwa"},
};
}
@@ -689,7 +691,7 @@
{JapaneseChronology.INSTANCE.date(1989, 1, 7), "Japanese Showa 64-01-07"},
{JapaneseChronology.INSTANCE.date(1989, 1, 8), "Japanese Heisei 1-01-08"},
{JapaneseChronology.INSTANCE.date(2012, 12, 6), "Japanese Heisei 24-12-06"},
- {JapaneseChronology.INSTANCE.date(2020, 1, 6), "Japanese NewEra 2-01-06"},
+ {JapaneseChronology.INSTANCE.date(2020, 1, 6), "Japanese Reiwa 2-01-06"},
};
}
--- a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@
@DataProvider(name = "JapaneseEras")
Object[][] data_of_eras() {
return new Object[][] {
- {JapaneseEra.of(3), "NewEra", 3}, // NEWERA
+ {JapaneseEra.REIWA, "Reiwa", 3},
{JapaneseEra.HEISEI, "Heisei", 2},
{JapaneseEra.SHOWA, "Showa", 1},
{JapaneseEra.TAISHO, "Taisho", 0},
--- a/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,26 +69,32 @@
{ JapaneseEra.TAISHO, TextStyle.FULL, Locale.US, "Taisho" },
{ JapaneseEra.SHOWA, TextStyle.FULL, Locale.US, "Showa" },
{ JapaneseEra.HEISEI, TextStyle.FULL, Locale.US, "Heisei" },
+ { JapaneseEra.REIWA, TextStyle.FULL, Locale.US, "Reiwa" },
{ JapaneseEra.MEIJI, TextStyle.FULL, Locale.JAPAN, "\u660e\u6cbb" },
{ JapaneseEra.TAISHO, TextStyle.FULL, Locale.JAPAN, "\u5927\u6b63" },
{ JapaneseEra.SHOWA, TextStyle.FULL, Locale.JAPAN, "\u662d\u548c" },
{ JapaneseEra.HEISEI, TextStyle.FULL, Locale.JAPAN, "\u5e73\u6210" },
+ { JapaneseEra.REIWA, TextStyle.FULL, Locale.JAPAN, "\u4ee4\u548c" },
{ JapaneseEra.MEIJI, TextStyle.SHORT, Locale.US, "Meiji" },
{ JapaneseEra.TAISHO, TextStyle.SHORT, Locale.US, "Taisho" },
{ JapaneseEra.SHOWA, TextStyle.SHORT, Locale.US, "Showa" },
{ JapaneseEra.HEISEI, TextStyle.SHORT, Locale.US, "Heisei" },
+ { JapaneseEra.REIWA, TextStyle.SHORT, Locale.US, "Reiwa" },
{ JapaneseEra.MEIJI, TextStyle.SHORT, Locale.JAPAN, "\u660e\u6cbb" },
{ JapaneseEra.TAISHO, TextStyle.SHORT, Locale.JAPAN, "\u5927\u6b63" },
{ JapaneseEra.SHOWA, TextStyle.SHORT, Locale.JAPAN, "\u662d\u548c" },
{ JapaneseEra.HEISEI, TextStyle.SHORT, Locale.JAPAN, "\u5e73\u6210" },
+ { JapaneseEra.REIWA, TextStyle.SHORT, Locale.JAPAN, "\u4ee4\u548c" },
{ JapaneseEra.MEIJI, TextStyle.NARROW, Locale.US, "M" },
{ JapaneseEra.TAISHO, TextStyle.NARROW, Locale.US, "T" },
{ JapaneseEra.SHOWA, TextStyle.NARROW, Locale.US, "S" },
{ JapaneseEra.HEISEI, TextStyle.NARROW, Locale.US, "H" },
+ { JapaneseEra.REIWA, TextStyle.NARROW, Locale.US, "R" },
{ JapaneseEra.MEIJI, TextStyle.NARROW, Locale.JAPAN, "M" },
{ JapaneseEra.TAISHO, TextStyle.NARROW, Locale.JAPAN, "T" },
{ JapaneseEra.SHOWA, TextStyle.NARROW, Locale.JAPAN, "S" },
{ JapaneseEra.HEISEI, TextStyle.NARROW, Locale.JAPAN, "H" },
+ { JapaneseEra.REIWA, TextStyle.NARROW, Locale.JAPAN, "R" },
// ThaiBuddhistEra
{ ThaiBuddhistEra.BEFORE_BE, TextStyle.FULL, Locale.US, "BC" },
--- a/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
/**
* Tests for the Japanese chronology
@@ -59,7 +60,7 @@
{ JapaneseEra.SHOWA, 64, 1, 7, 1989 },
{ JapaneseEra.HEISEI, 1, 1, 8, 1989 },
{ JapaneseEra.HEISEI, 31, 4, 30, 2019 },
- { JapaneseEra.of(3), 1, 5, 1, 2019 }, // NEWERA
+ { JapaneseEra.REIWA, 1, 5, 1, 2019 },
};
}
@@ -77,7 +78,7 @@
{ JapaneseEra.HEISEI, 1, 1, 1, 8 },
{ JapaneseEra.HEISEI, 2, 8, 1, 8 },
{ JapaneseEra.HEISEI, 31, 120, 4, 30 },
- { JapaneseEra.of(3), 1, 1, 5, 1 }, // NEWERA
+ { JapaneseEra.REIWA, 1, 1, 5, 1 },
};
}
@@ -110,8 +111,8 @@
{ JapaneseEra.HEISEI, 1, 1, 7 },
{ JapaneseEra.HEISEI, 1, 2, 29 },
{ JapaneseEra.HEISEI, 31, 5, 1 },
- { JapaneseEra.of(3), 1, 4, 30 }, // NEWERA
- { JapaneseEra.of(3), Year.MAX_VALUE, 12, 31 }, // NEWERA
+ { JapaneseEra.REIWA, 1, 4, 30 },
+ { JapaneseEra.REIWA, Year.MAX_VALUE, 12, 31 },
};
}
@@ -131,9 +132,9 @@
{ JapaneseEra.HEISEI, -1 },
{ JapaneseEra.HEISEI, 0 },
{ JapaneseEra.HEISEI, 32 },
- { JapaneseEra.of(3), -1 }, // NEWERA
- { JapaneseEra.of(3), 0 }, // NEWERA
- { JapaneseEra.of(3), Year.MAX_VALUE }, // NEWERA
+ { JapaneseEra.REIWA, -1 },
+ { JapaneseEra.REIWA, 0 },
+ { JapaneseEra.REIWA, Year.MAX_VALUE },
};
}
@@ -151,8 +152,21 @@
{ JapaneseEra.HEISEI, 1, 360 },
{ JapaneseEra.HEISEI, 2, 366 },
{ JapaneseEra.HEISEI, 31, 121 },
- { JapaneseEra.of(3), 1, 246 }, // NEWERA
- { JapaneseEra.of(3), 2, 367 }, // NEWERA
+ { JapaneseEra.REIWA, 1, 246 },
+ { JapaneseEra.REIWA, 2, 367 },
+ };
+ }
+
+ @DataProvider
+ Object[][] eraNameData() {
+ return new Object[][] {
+ // Japanese era, name, exception
+ { "Meiji", JapaneseEra.MEIJI, null },
+ { "Taisho", JapaneseEra.TAISHO, null },
+ { "Showa", JapaneseEra.SHOWA, null },
+ { "Heisei", JapaneseEra.HEISEI, null },
+ { "Reiwa", JapaneseEra.REIWA, null },
+ { "NewEra", null, IllegalArgumentException.class},
};
}
@@ -204,4 +218,13 @@
JapaneseDate date = JAPANESE.dateYearDay(era, yearOfEra, dayOfYear);
System.out.printf("No DateTimeException with era=%s, year=%d, dayOfYear=%d%n", era, yearOfEra, dayOfYear);
}
+
+ @Test(dataProvider="eraNameData")
+ public void test_eraName(String eraName, JapaneseEra era, Class expectedEx) {
+ try {
+ assertEquals(JapaneseEra.valueOf(eraName), era);
+ } catch (Exception ex) {
+ assertTrue(expectedEx.isInstance(ex));
+ }
+ }
}
--- a/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -776,9 +776,9 @@
{HijrahDate.of(1434,5,1), "Japanese Heisei 25-03-13"},
{HijrahDate.of(1436,1,1), "Japanese Heisei 26-10-25"},
{HijrahDate.of(1440,8,25), "Japanese Heisei 31-04-30"},
- {HijrahDate.of(1440,8,26), "Japanese NewEra 1-05-01"},
- {HijrahDate.of(1500,6,12), "Japanese NewEra 59-05-05"},
- {HijrahDate.of(1550,3,11), "Japanese NewEra 107-08-11"},
+ {HijrahDate.of(1440,8,26), "Japanese Reiwa 1-05-01"},
+ {HijrahDate.of(1500,6,12), "Japanese Reiwa 59-05-05"},
+ {HijrahDate.of(1550,3,11), "Japanese Reiwa 107-08-11"},
};
}
--- a/test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -143,7 +143,7 @@
// Chronology, lenient era/year, strict era/year
{ JAPANESE, "Meiji 123", "Heisei 2" },
{ JAPANESE, "Showa 65", "Heisei 2" },
- { JAPANESE, "Heisei 32", "NewEra 2" }, // NewEra
+ { JAPANESE, "Heisei 32", "Reiwa 2" },
};
}
--- a/test/jdk/java/util/Base64/TestEncodingDecodingLength.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Base64/TestEncodingDecodingLength.java Tue Apr 02 10:57:57 2019 +0530
@@ -30,7 +30,7 @@
* @bug 8210583 8217969 8218265
* @summary Tests Base64.Encoder.encode and Base64.Decoder.decode
* with the large size of input array/buffer
- * @requires os.maxMemory >= 10g
+ * @requires (sun.arch.data.model == "64" & os.maxMemory >= 10g)
* @run main/othervm -Xms6g -Xmx8g TestEncodingDecodingLength
*
*/
--- a/test/jdk/java/util/Calendar/CalendarTestScripts/CalendarAdapter.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/CalendarTestScripts/CalendarAdapter.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -364,7 +364,7 @@
"Taisho",
"Showa",
"Heisei",
- "NewEra"
+ "Reiwa"
};
break;
}
--- a/test/jdk/java/util/Calendar/CalendarTestScripts/Symbol.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/CalendarTestScripts/Symbol.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -322,7 +322,7 @@
put("taisho", new Symbol(Type.ERA, 2));
put("showa", new Symbol(Type.ERA, 3));
put("heisei", new Symbol(Type.ERA, 4));
- put("newera", new Symbol(Type.ERA, 5));
+ put("reiwa", new Symbol(Type.ERA, 5));
}
}
--- a/test/jdk/java/util/Calendar/CalendarTestScripts/japanese/japanese.cts Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/CalendarTestScripts/japanese/japanese.cts Tue Apr 02 10:57:57 2019 +0530
@@ -57,7 +57,7 @@
check millisecond 0
clear all
- set era NewEra
+ set era Reiwa
check era Heisei
check datetime 31 Jan 1 0 0 0
check millisecond 0
--- a/test/jdk/java/util/Calendar/CalendarTestScripts/japanese/japanese_add.cts Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/CalendarTestScripts/japanese/japanese_add.cts Tue Apr 02 10:57:57 2019 +0530
@@ -16,10 +16,10 @@
test add ERA
use jcal
clear all
- set date NewEra 17 Mar 8
+ set date Reiwa 17 Mar 8
add era 10
- # as of NewEra 17 March 8
- check era NewEra
+ # as of Reiwa 17 March 8
+ check era Reiwa
add era -100
check era BeforeMeiji
@@ -342,12 +342,12 @@
check date BeforeMeiji $minyear May 18
check timeofday 1 47 4 191
- set date NewEra 17 Jan 1
+ set date Reiwa 17 Jan 1
get max year
assign $result $max
- set date NewEra $max Jul 17
+ set date Reiwa $max Jul 17
add month 1
- check date NewEra $max Aug 17
+ check date Reiwa $max Aug 17
# set date Heisei $max Jul 28
# set timeofday 23 59 59 999
# add month 1
--- a/test/jdk/java/util/Calendar/CalendarTestScripts/japanese/japanese_minmax.cts Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/CalendarTestScripts/japanese/japanese_minmax.cts Tue Apr 02 10:57:57 2019 +0530
@@ -14,10 +14,10 @@
test Make sure that the maximum year value doesn't depent on era
use jcal
- # Note: the max year value is as of NewEra
+ # Note: the max year value is as of Reiwa
assign 292276976 $max
clear all
- set date NewEra 1 May 1
+ set date Reiwa 1 May 1
get millis
check max year $max
assign $max $maxyear
@@ -39,9 +39,9 @@
test Max of ERA
use jcal
- # Assumption: NewEra is the current era
- check maximum era NewEra
- check leastmax era NewEra
+ # Assumption: Reiwa is the current era
+ check maximum era Reiwa
+ check leastmax era Reiwa
test Actual max MONTH
use jcal
@@ -78,7 +78,7 @@
check actualmax month Apr
clear all
- set date NewEra 2 Jan 1
+ set date Reiwa 2 Jan 1
set year $maxyear
check actualmax month Aug
get millis
@@ -133,8 +133,8 @@
# time zone dependent
use tokyocal
clear all
- set date NewEra $maxyear Jan 1
- # the last date of NewEra is N292276976.08.17T16:12:55.807+0900
+ set date Reiwa $maxyear Jan 1
+ # the last date of Reiwa is R292276976.08.17T16:12:55.807+0900
check actualmax day_of_year 229 # 31+28+31+30+31+30+31+17
test Actual max WEEK_OF_YEAR
@@ -165,12 +165,12 @@
clear all
set date Heisei 31 Apr 28
check actualmax week_of_year 17
- set date NewEra 1 Aug 9
+ set date Reiwa 1 Aug 9
check actualmax week_of_year 35
use tokyocal
- set date NewEra $maxyear Jan 1
- # the last date of NewEra is N292276976.08.17T16:12:55.807+0900 (Sunday)
+ set date Reiwa $maxyear Jan 1
+ # the last date of Reiwa is R292276976.08.17T16:12:55.807+0900 (Sunday)
# The year is equivalent to 2003 (Gregorian).
check actualmax week_of_year 34
@@ -197,12 +197,12 @@
clear all
set date Heisei 31 Apr 30
check actualmax week_of_month 5
- set date NewEra 1 May 1
+ set date Reiwa 1 May 1
check actualmax week_of_month 5
use tokyocal
- set date NewEra $maxyear Jan 1
- # the last date of NewEra is N292276976.08.17T16:12:55.807+0900 (Sunday)
+ set date Reiwa $maxyear Jan 1
+ # the last date of Reiwa is R292276976.08.17T16:12:55.807+0900 (Sunday)
# The year is equivalent to 2003 (Gregorian).
check actualmax week_of_month 4
@@ -229,13 +229,13 @@
clear all
set date Heisei 31 Apr 30
check actualmax week_of_month 5
- set date NewEra 1 May 1
+ set date Reiwa 1 May 1
check actualmax week_of_month 5
use tokyocal
clear all
- set date NewEra $maxyear Jan 1
- # the last date of NewEra is N292276976.08.17T16:12:55.807+0900 (Sunday)
+ set date Reiwa $maxyear Jan 1
+ # the last date of Reiwa is R292276976.08.17T16:12:55.807+0900 (Sunday)
# The year is equivalent to 2003 (Gregorian).
check actualmax week_of_month 4
@@ -269,11 +269,11 @@
set date Heisei 1 Aug 18
check actualmax year 30
- set date NewEra 1 Apr 30
+ set date Reiwa 1 Apr 30
check actualmax year 31
# Date/time beyond the last date in the max year.
- set date NewEra 1 Aug 18
+ set date Reiwa 1 Aug 18
check actualmax year 292276975
test Least max YEAR
--- a/test/jdk/java/util/Calendar/CalendarTestScripts/japanese/japanese_roll.cts Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/CalendarTestScripts/japanese/japanese_roll.cts Tue Apr 02 10:57:57 2019 +0530
@@ -147,13 +147,13 @@
roll year -1
check date Heisei 31 Apr 30
- set date NewEra 2 Apr 30
+ set date Reiwa 2 Apr 30
get max year
assign $result $hmax
roll year -1
- check date NewEra $hmax Apr 30
+ check date Reiwa $hmax Apr 30
roll year 1
- check date NewEra 2 Apr 30
+ check date Reiwa 2 Apr 30
test roll MONTH
set date BeforeMeiji 1867 Dec 1
@@ -276,16 +276,16 @@
check date BeforeMeiji $minyear May 18
check timeofday 1 47 4 191
- set date NewEra 17 Jan 1
+ set date Reiwa 17 Jan 1
get max year
assign $result $max
- set date NewEra $max Jul 28
+ set date Reiwa $max Jul 28
roll month 1
- check date NewEra $max Aug 17
- set date NewEra $max Jul 28
+ check date Reiwa $max Aug 17
+ set date Reiwa $max Jul 28
set timeofday 23 59 59 999
roll month 1
- check date NewEra $max Aug 16
+ check date Reiwa $max Aug 16
check timeofday 23 59 59 999
test roll WEEK_OF_YEAR
--- a/test/jdk/java/util/Calendar/JapaneseEraNameTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/JapaneseEraNameTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -51,12 +51,12 @@
Object[][] names() {
return new Object[][] {
// type, locale, name
- { LONG, JAPAN, "\u5143\u53f7" }, // NewEra
- { LONG, US, "NewEra" },
- { LONG, CHINA, "NewEra" },
- { SHORT, JAPAN, "\u5143\u53f7" },
- { SHORT, US, "NewEra" },
- { SHORT, CHINA, "N" },
+ { LONG, JAPAN, "\u4ee4\u548c" },
+ { LONG, US, "Reiwa" },
+ { LONG, CHINA, "Reiwa" },
+ { SHORT, JAPAN, "\u4ee4\u548c" },
+ { SHORT, US, "Reiwa" },
+ { SHORT, CHINA, "R" },
};
}
--- a/test/jdk/java/util/Calendar/JapaneseLenientEraTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/JapaneseLenientEraTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
// lenient era/year, strict era/year
{ "Meiji 123", "Heisei 2" },
{ "Sh\u014dwa 65", "Heisei 2" },
- { "Heisei 32", "NewEra 2" }, // NewEra
+ { "Heisei 32", "Reiwa 2" },
};
}
--- a/test/jdk/java/util/Calendar/NarrowNamesTest.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/NarrowNamesTest.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@
HOUR_OF_DAY, 23);
test(JAJPJP, DAY_OF_WEEK,
LocalDateTime.now().isBefore(LocalDateTime.of(2019, 5, 1, 0, 0)) ?
- "\u65e5" : "\u706b", // "Sun" for HEISEI, "Tue" for NEWERA
+ "\u65e5" : "\u706b", // "Sun" for HEISEI, "Tue" for REIWA
YEAR, 24, MONTH, DECEMBER, DAY_OF_MONTH, 23);
test(THTH, MONTH, NARROW_STANDALONE, "\u0e18.\u0e04.",
YEAR, 2555, MONTH, DECEMBER, DAY_OF_MONTH, 5);
--- a/test/jdk/java/util/Calendar/ZoneOffsets.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/java/util/Calendar/ZoneOffsets.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -240,11 +240,11 @@
}
private static void adjustJapaneseEra(Calendar cal) {
- // In case of Japanese calendar, explicitly set the last era; NEWERA so that
+ // In case of Japanese calendar, explicitly set the last era; REIWA so that
// year 2005 won't throw exception
if (!cal.isLenient() &&
cal.getCalendarType().equals("japanese") &&
- System.currentTimeMillis() < 1556668800000L) { // Current time not in NEWERA
+ System.currentTimeMillis() < 1556668800000L) { // Current time not in REIWA
cal.set(Calendar.ERA, 5);
cal.add(Calendar.YEAR, -30); // -30: Subtract year-length of HEISEI era
}
--- a/test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-FROM oraclelinux:7.6
-MAINTAINER mikhailo.seledtsov@oracle.com
-
-COPY /jdk /jdk
-
-ENV JAVA_HOME=/jdk
-
-CMD ["/bin/bash"]
--- a/test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-aarch64 Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# Use generic ubuntu Linux on AArch64
-FROM aarch64/ubuntu
-
-COPY /jdk /jdk
-
-ENV JAVA_HOME=/jdk
-
-CMD ["/bin/bash"]
--- a/test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-ppc64le Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# test on x86_64 uses Oracle Linux but we do not have this for ppc64le
-# so use some other Linux where OpenJDK works
-# FROM oraclelinux:7.2
-FROM ppc64le/ubuntu
-
-COPY /jdk /jdk
-
-ENV JAVA_HOME=/jdk
-
-CMD ["/bin/bash"]
--- a/test/jdk/jdk/internal/platform/docker/Dockerfile-BasicTest-s390x Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-FROM s390x/ubuntu
-
-COPY /jdk /jdk
-
-ENV JAVA_HOME=/jdk
-
-CMD ["/bin/bash"]
--- a/test/jdk/jdk/jfr/jvm/TestDumpOnCrash.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/jdk/jfr/jvm/TestDumpOnCrash.java Tue Apr 02 10:57:57 2019 +0530
@@ -77,22 +77,25 @@
}
public static void main(String[] args) throws Exception {
- verify(runProcess(CrasherIllegalAccess.class.getName(), ""));
- verify(runProcess(CrasherHalt.class.getName(), ""));
+ verify(runProcess(CrasherIllegalAccess.class.getName(), "", true));
+ verify(runProcess(CrasherIllegalAccess.class.getName(), "", false));
+ verify(runProcess(CrasherHalt.class.getName(), "", true));
+ verify(runProcess(CrasherHalt.class.getName(), "", false));
// Verification is excluded for the test case below until 8219680 is fixed
- long pid = runProcess(CrasherSig.class.getName(), "FPE");
+ long pid = runProcess(CrasherSig.class.getName(), "FPE", true);
// @ignore 8219680
// verify(pid);
}
- private static long runProcess(String crasher, String signal) throws Exception {
+ private static long runProcess(String crasher, String signal, boolean disk) throws Exception {
System.out.println("Test case for crasher " + crasher);
+ final String flightRecordingOptions = "dumponexit=true,disk=" + Boolean.toString(disk);
Process p = ProcessTools.createJavaProcessBuilder(true,
"-Xmx64m",
"-XX:-CreateCoredumpOnCrash",
"--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED",
- "-XX:StartFlightRecording",
+ "-XX:StartFlightRecording=" + flightRecordingOptions,
crasher,
signal)
.start();
--- a/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java Tue Apr 02 10:57:57 2019 +0530
@@ -23,24 +23,26 @@
/*
* @test
+ * @library /test/lib
* @bug 4701299
* @summary Keep-Alive-Timer thread management in KeepAliveCache causes memory leak
*/
+
import java.net.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
public class KeepAliveTimerThread {
static class Fetcher implements Runnable {
- String url;
+ URL url;
- Fetcher(String url) {
+ Fetcher(URL url) {
this.url = url;
}
public void run() {
try {
- InputStream in =
- (new URL(url)).openConnection().getInputStream();
+ InputStream in = url.openConnection().getInputStream();
byte b[] = new byte[128];
int n;
do {
@@ -105,7 +107,12 @@
Server s = new Server (ss);
s.start();
- String url = "http://127.0.0.1:"+ss.getLocalPort();
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(ss.getLocalPort())
+ .toURL();
+ System.out.println("URL: " + url);
// start fetch in its own thread group
ThreadGroup grp = new ThreadGroup("MyGroup");
--- a/test/jdk/sun/net/www/protocol/http/6550798/test.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/6550798/test.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/**
* @test
* @bug 6550798
+ * @library /test/lib
* @summary Using InputStream.skip with ResponseCache will cause partial data to be cached
* @modules jdk.httpserver
* @run main/othervm test
@@ -33,6 +34,8 @@
import com.sun.net.httpserver.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
+
public class test {
final static int LEN = 16 * 1024;
@@ -58,7 +61,13 @@
s.start();
System.out.println("http request with cache hander");
- URL u = new URL("http://127.0.0.1:"+s.getAddress().getPort()+"/f");
+ URL u = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(s.getAddress().getPort())
+ .path("/f")
+ .toURL();
+ System.out.println("URL: " + u);
URLConnection conn = u.openConnection();
InputStream is = null;
--- a/test/jdk/sun/net/www/protocol/http/B6890349.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/B6890349.java Tue Apr 02 10:57:57 2019 +0530
@@ -39,7 +39,11 @@
System.out.println ("listening on " + port);
B6890349 t = new B6890349 (server);
t.start();
- URL u = new URL ("http://127.0.0.1:"+port+"/foo\nbar");
+ URL u = new URL("http",
+ InetAddress.getLoopbackAddress().getHostAddress(),
+ port,
+ "/foo\nbar");
+ System.out.println("URL: " + u);
HttpURLConnection urlc = (HttpURLConnection)u.openConnection ();
InputStream is = urlc.getInputStream();
throw new RuntimeException ("Test failed");
--- a/test/jdk/sun/net/www/protocol/http/B8012625.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/B8012625.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8012625
+ * @library /test/lib
* @modules jdk.httpserver
* @run main B8012625
*/
@@ -34,6 +35,9 @@
import java.net.*;
import java.io.*;
import java.util.concurrent.*;
+
+import jdk.test.lib.net.URIBuilder;
+
import com.sun.net.httpserver.*;
public class B8012625 implements HttpHandler {
@@ -44,8 +48,13 @@
}
public void run() throws Exception {
- String u = "http://127.0.0.1:" + port + "/foo";
- URL url = new URL(u);
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo")
+ .toURL();
+ System.out.println("URL: " + url);
HttpURLConnection uc = (HttpURLConnection)url.openConnection();
uc.setDoOutput(true);
uc.setRequestMethod("POST");
--- a/test/jdk/sun/net/www/protocol/http/NoNTLM.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/NoNTLM.java Tue Apr 02 10:57:57 2019 +0530
@@ -23,6 +23,7 @@
/* @test
* @bug 8004502
+ * @library /test/lib
* @summary Sanity check that NTLM will not be selected by the http protocol
* handler when running on a profile that does not support NTLM
* @modules java.base/sun.net.www
@@ -34,11 +35,13 @@
import java.lang.reflect.Field;
import java.net.Authenticator;
import java.net.HttpURLConnection;
+import java.net.InetAddress;
import java.net.PasswordAuthentication;
import java.net.Proxy;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URL;
+import jdk.test.lib.net.URIBuilder;
import sun.net.www.MessageHeader;
public class NoNTLM {
@@ -57,7 +60,13 @@
private volatile int respCode;
Client(int port) throws IOException {
- this.url = new URL("http://127.0.0.1:" + port + "/foo.html");
+ this.url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/foo.html")
+ .toURLUnchecked();
+ System.out.println("Client URL: " + this.url);
}
public void run() {
--- a/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java Tue Apr 02 10:57:57 2019 +0530
@@ -39,6 +39,7 @@
import java.util.concurrent.*;
import javax.net.ssl.*;
import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
public class RedirectOnPost {
@@ -55,8 +56,8 @@
int sslPort = httpsServer.getAddress().getPort();
httpServer.start();
httpsServer.start();
- runTest("http://127.0.0.1:"+port+"/test/", null);
- runTest("https://127.0.0.1:"+sslPort+"/test/", ctx);
+ runTest("http", port, null);
+ runTest("https", sslPort, ctx);
System.out.println("Main thread waiting");
} finally {
httpServer.stop(0);
@@ -65,10 +66,17 @@
}
}
- public static void runTest(String baseURL, SSLContext ctx) throws Exception
+ public static void runTest(String scheme, int port, SSLContext ctx) throws Exception
{
byte[] buf = "Hello world".getBytes();
- URL url = new URL(baseURL + "a");
+
+ URL url = URIBuilder.newBuilder()
+ .scheme(scheme)
+ .loopback()
+ .port(port)
+ .path("/test/a")
+ .toURL();
+ System.out.println("URL: " + url);
HttpURLConnection con = (HttpURLConnection)url.openConnection();
if (con instanceof HttpsURLConnection) {
HttpsURLConnection ssl = (HttpsURLConnection)con;
@@ -107,10 +115,12 @@
static class Handler implements HttpHandler {
- String baseURL;
+ String scheme;
+ int port;
- Handler(String baseURL) {
- this.baseURL = baseURL;
+ Handler(String scheme, int port) {
+ this.scheme = scheme;
+ this.port = port;
}
int calls = 0;
@@ -118,6 +128,12 @@
public void handle(HttpExchange msg) {
try {
String method = msg.getRequestMethod();
+ URL baseURL = URIBuilder.newBuilder()
+ .scheme(scheme)
+ .loopback()
+ .path("/test/b")
+ .port(port)
+ .toURLUnchecked();
System.out.println ("Server: " + baseURL);
if (calls++ == 0) {
System.out.println ("Server: redirecting");
@@ -125,7 +141,7 @@
byte[] buf = readFully(is);
is.close();
Headers h = msg.getResponseHeaders();
- h.add("Location", baseURL + "b");
+ h.add("Location", baseURL.toString());
msg.sendResponseHeaders(302, -1);
msg.close();
} else {
@@ -153,9 +169,9 @@
HttpServer testServer = HttpServer.create(inetAddress, 15);
int port = testServer.getAddress().getPort();
testServer.setExecutor(execs);
- String base = "http://127.0.0.1:"+port+"/test";
+
HttpContext context = testServer.createContext("/test");
- context.setHandler(new Handler(base));
+ context.setHandler(new Handler("http", port));
return testServer;
}
@@ -169,9 +185,9 @@
int port = testServer.getAddress().getPort();
testServer.setExecutor(execs);
testServer.setHttpsConfigurator(new HttpsConfigurator (ctx));
- String base = "https://127.0.0.1:"+port+"/test";
+
HttpContext context = testServer.createContext("/test");
- context.setHandler(new Handler(base));
+ context.setHandler(new Handler("https", port));
return testServer;
}
}
--- a/test/jdk/sun/net/www/protocol/http/ResponseCacheStream.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/ResponseCacheStream.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/*
* @test
* @bug 6262486
+ * @library /test/lib
* @modules java.base/sun.net.www
* @library ../../httptest/
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
@@ -34,6 +35,7 @@
import java.net.*;
import java.io.*;
import java.util.*;
+import jdk.test.lib.net.URIBuilder;
public class ResponseCacheStream implements HttpCallback {
@@ -100,7 +102,12 @@
ResponseCache.setDefault(cache);
server = new TestHttpServer (new ResponseCacheStream());
System.out.println ("Server: listening on port: " + server.getLocalPort());
- URL url = new URL ("http://127.0.0.1:"+server.getLocalPort()+"/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(server.getLocalPort())
+ .path("/")
+ .toURL();
System.out.println ("Client: connecting to " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
InputStream is = urlc.getInputStream();
--- a/test/jdk/sun/net/www/protocol/http/RetryUponTimeout.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/RetryUponTimeout.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,12 +24,14 @@
/**
* @test
* @bug 4772077
+ * @library /test/lib
* @summary using defaultReadTimeout appear to retry request upon timeout
* @modules java.base/sun.net.www
*/
import java.net.*;
import java.io.*;
+import jdk.test.lib.net.URIBuilder;
import sun.net.www.*;
public class RetryUponTimeout implements Runnable {
@@ -63,7 +65,12 @@
int port = server.getLocalPort ();
new Thread(new RetryUponTimeout()).start ();
- URL url = new URL("http://127.0.0.1:"+port);
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .toURL();
+ System.out.println("URL: " + url);
java.net.URLConnection uc = url.openConnection();
uc.setReadTimeout(1000);
uc.getInputStream();
--- a/test/jdk/sun/net/www/protocol/http/SetChunkedStreamingMode.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/SetChunkedStreamingMode.java Tue Apr 02 10:57:57 2019 +0530
@@ -26,6 +26,7 @@
* @bug 5049976
* @modules java.base/sun.net.www
* @library ../../httptest/
+ * @library /test/lib
* @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
* @run main SetChunkedStreamingMode
* @summary Unspecified NPE is thrown when streaming output mode is enabled
@@ -33,6 +34,7 @@
import java.io.*;
import java.net.*;
+import jdk.test.lib.net.URIBuilder;
public class SetChunkedStreamingMode implements HttpCallback {
@@ -67,7 +69,12 @@
try {
server = new TestHttpServer (new SetChunkedStreamingMode(), 1, 10, 0);
System.out.println ("Server: listening on port: " + server.getLocalPort());
- URL url = new URL ("http://127.0.0.1:"+server.getLocalPort()+"/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(server.getLocalPort())
+ .path("/")
+ .toURL();
System.out.println ("Client: connecting to " + url);
HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
urlc.setChunkedStreamingMode (0);
--- a/test/jdk/sun/net/www/protocol/http/UserAgent.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/http/UserAgent.java Tue Apr 02 10:57:57 2019 +0530
@@ -24,6 +24,7 @@
/**
* @test
* @bug 4512200
+ * @library /test/lib
* @modules java.base/sun.net.www
* @run main/othervm -Dhttp.agent=foo UserAgent
* @summary HTTP header "User-Agent" format incorrect
@@ -32,6 +33,7 @@
import java.io.*;
import java.util.*;
import java.net.*;
+import jdk.test.lib.net.URIBuilder;
import sun.net.www.MessageHeader;
class Server extends Thread {
@@ -89,7 +91,12 @@
Server s = new Server (server);
s.start ();
int port = server.getLocalPort ();
- URL url = new URL ("http://127.0.0.1:"+port);
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .toURL();
+ System.out.println("URL: " + url);
URLConnection urlc = url.openConnection ();
urlc.getInputStream ();
s.join ();
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java Tue Apr 02 10:57:57 2019 +0530
@@ -23,6 +23,7 @@
/* @test
* @bug 6766775
+ * @library /test/lib
* @summary X509 certificate hostname checking is broken in JDK1.6.0_10
* @run main/othervm IPAddressDNSIdentities
*
@@ -42,6 +43,7 @@
import java.security.spec.*;
import java.security.interfaces.*;
import java.math.BigInteger;
+import jdk.test.lib.net.URIBuilder;
/*
* Certificates and key used in the test.
@@ -710,7 +712,12 @@
HttpsURLConnection http = null;
/* establish http connection to server */
- URL url = new URL("https://127.0.0.1:" + serverPort+"/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("https")
+ .loopback()
+ .port(serverPort)
+ .path("/")
+ .toURL();
System.out.println("url is "+url.toString());
try {
--- a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java Tue Apr 02 10:57:57 2019 +0530
@@ -28,6 +28,7 @@
/* @test
* @summary X509 certificate hostname checking is broken in JDK1.6.0_10
+ * @library /test/lib
* @bug 6766775
* @run main/othervm IPAddressIPIdentities
* @author Xuelei Fan
@@ -45,6 +46,7 @@
import java.security.spec.*;
import java.security.interfaces.*;
import java.math.BigInteger;
+import jdk.test.lib.net.URIBuilder;
/*
* Certificates and key used in the test.
@@ -714,7 +716,12 @@
HttpsURLConnection http = null;
/* establish http connection to server */
- URL url = new URL("https://127.0.0.1:" + serverPort+"/");
+ URL url = URIBuilder.newBuilder()
+ .scheme("https")
+ .loopback()
+ .port(serverPort)
+ .path("/")
+ .toURL();
System.out.println("url is "+url.toString());
try {
--- a/test/jdk/sun/security/pkcs11/KeyStore/Basic.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/security/pkcs11/KeyStore/Basic.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,7 @@
this.provider = p;
// get private keys
- KeyFactory kf = KeyFactory.getInstance("RSA", "SunJSSE");
+ KeyFactory kf = KeyFactory.getInstance("RSA");
KeyFactory dsaKf = KeyFactory.getInstance("DSA", "SUN");
ObjectInputStream ois1 = new ObjectInputStream
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/rsa/BrokenRSAPrivateCrtKey.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4503229 8220016
+ * @summary default RSA KeyFactory can return broken RSAPrivateCrtKey objects
+ * This test was taken directly from the bug report, which
+ * was fixed in the crippled JSAFE provider, and needed
+ * to be brought forward into SunRsaSign (was JSSE).
+ * @author Brad Wetmore
+ */
+
+import java.security.*;
+import java.security.interfaces.*;
+import java.security.spec.*;
+import java.math.BigInteger;
+
+public class BrokenRSAPrivateCrtKey {
+ public static void main(String[] args) throws Exception {
+ KeyPairGenerator generator =
+ KeyPairGenerator.getInstance("RSA", "SunRsaSign");
+ generator.initialize(512);
+
+ KeyPair pair = generator.generateKeyPair();
+
+ RSAPrivateCrtKey privatekey = (RSAPrivateCrtKey) pair.getPrivate();
+
+ RSAPrivateCrtKeySpec spec =
+ new RSAPrivateCrtKeySpec(privatekey.getModulus(),
+ privatekey.getPublicExponent(),
+ privatekey.getPrivateExponent(),
+ privatekey.getPrimeP(), privatekey.getPrimeQ(),
+ privatekey.getPrimeExponentP(),
+ privatekey.getPrimeExponentQ(),
+ privatekey.getCrtCoefficient());
+
+ KeyFactory factory = KeyFactory.getInstance("RSA", "SunRsaSign");
+
+ PrivateKey privatekey2 = factory.generatePrivate(spec);
+
+ BigInteger pe =
+ ((RSAPrivateCrtKey) privatekey2).getPublicExponent();
+
+ System.out.println("public exponent: " + pe);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/ssl/SSLContextImpl/DefaultCipherSuitePreference.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
+/*
+ * @test
+ * @bug 8168261
+ * @summary Use server cipher suites preference by default
+ * @run main/othervm DefaultCipherSuitePreference
+ */
+
+import javax.net.SocketFactory;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.TrustManager;
+
+public class DefaultCipherSuitePreference {
+ private static final String[] contextAlgorithms = {
+ "Default", "SSL", "TLS", "SSLv3", "TLSv1",
+ "TLSv1.1", "TLSv1.2", "TLSv1.3"
+ };
+
+ public static void main(String[] args) throws Exception {
+ for (String algorithm : contextAlgorithms) {
+ System.out.println("Checking SSLContext of " + algorithm);
+ SSLContext sslContext = SSLContext.getInstance(algorithm);
+
+ // Default SSLContext is initialized automatically.
+ if (!algorithm.equals("Default")) {
+ // Use default TK, KM and random.
+ sslContext.init((KeyManager[])null, (TrustManager[])null, null);
+ }
+
+ //
+ // Check SSLContext
+ //
+ // Check default SSLParameters of SSLContext
+ checkDefaultCipherSuitePreference(
+ sslContext.getDefaultSSLParameters(),
+ "SSLContext.getDefaultSSLParameters()");
+
+ // Check supported SSLParameters of SSLContext
+ checkDefaultCipherSuitePreference(
+ sslContext.getSupportedSSLParameters(),
+ "SSLContext.getSupportedSSLParameters()");
+
+ //
+ // Check SSLEngine
+ //
+ // Check SSLParameters of SSLEngine
+ SSLEngine engine = sslContext.createSSLEngine();
+ engine.setUseClientMode(true);
+ checkDefaultCipherSuitePreference(
+ engine.getSSLParameters(),
+ "client mode SSLEngine.getSSLParameters()");
+
+ engine.setUseClientMode(false);
+ checkDefaultCipherSuitePreference(
+ engine.getSSLParameters(),
+ "server mode SSLEngine.getSSLParameters()");
+
+ //
+ // Check SSLSocket
+ //
+ // Check SSLParameters of SSLSocket
+ SocketFactory fac = sslContext.getSocketFactory();
+ SSLSocket socket = (SSLSocket)fac.createSocket();
+ checkDefaultCipherSuitePreference(
+ socket.getSSLParameters(),
+ "SSLSocket.getSSLParameters()");
+
+ //
+ // Check SSLServerSocket
+ //
+ // Check SSLParameters of SSLServerSocket
+ SSLServerSocketFactory sf = sslContext.getServerSocketFactory();
+ SSLServerSocket ssocket = (SSLServerSocket)sf.createServerSocket();
+ checkDefaultCipherSuitePreference(
+ ssocket.getSSLParameters(),
+ "SSLServerSocket.getSSLParameters()");
+ }
+ }
+
+ private static void checkDefaultCipherSuitePreference(
+ SSLParameters parameters, String context) throws Exception {
+ if (!parameters.getUseCipherSuitesOrder()) {
+ throw new Exception(
+ "The local cipher suite preference is not honored " +
+ "in the connection populated SSLParameters object (" +
+ context + ")");
+ }
+ }
+}
--- a/test/jdk/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4503229
- * @summary default RSA KeyFactory can return broken RSAPrivateCrtKey objects
- * This test was taken directly from the bug report, which
- * was fixed in the crippled JSAFE provider, and needed
- * to be brought forward into JSSE.
- * @author Brad Wetmore
- */
-
-import java.security.*;
-import java.security.interfaces.*;
-import java.security.spec.*;
-import java.math.BigInteger;
-
-public class BrokenRSAPrivateCrtKey {
- public static void main(String[] args) throws Exception {
- KeyPairGenerator generator =
- KeyPairGenerator.getInstance("RSA", "SunJSSE");
- generator.initialize(512);
-
- KeyPair pair = generator.generateKeyPair();
-
- RSAPrivateCrtKey privatekey = (RSAPrivateCrtKey) pair.getPrivate();
-
- RSAPrivateCrtKeySpec spec =
- new RSAPrivateCrtKeySpec(privatekey.getModulus(),
- privatekey.getPublicExponent(),
- privatekey.getPrivateExponent(),
- privatekey.getPrimeP(), privatekey.getPrimeQ(),
- privatekey.getPrimeExponentP(),
- privatekey.getPrimeExponentQ(),
- privatekey.getCrtCoefficient());
-
- KeyFactory factory = KeyFactory.getInstance("RSA", "SunJSSE");
-
- PrivateKey privatekey2 = factory.generatePrivate(spec);
-
- BigInteger pe =
- ((RSAPrivateCrtKey) privatekey2).getPublicExponent();
-
- System.out.println("public exponent: " + pe);
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/ssl/rsa/CheckProviderEntries.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.*;
+import java.util.Iterator;
+import java.security.Provider.Service;
+
+/*
+ * @test
+ * @bug 8220016
+ * @summary This test checks the RSA-related services in SunJSSE provider
+ */
+public class CheckProviderEntries {
+
+ private static boolean testResult = true;
+
+ private static void error(String msg) {
+ testResult = false;
+ System.out.println(msg);
+ }
+ public static void main(String[] args) throws NoSuchAlgorithmException,
+ InvalidKeyException, SignatureException {
+ Provider p = Security.getProvider("SunJSSE");
+ Iterator<Provider.Service> iter = p.getServices().iterator();
+ while (iter.hasNext()) {
+ Service s = iter.next();
+ String type = s.getType();
+ String algo = s.getAlgorithm();
+ System.out.println("Type: " + type + " " + algo);
+ try {
+ if (algo.indexOf("RSA") != -1) {
+ // only MD5andSHA1withRSA signature support
+ // error out on any other RSA support
+ if (type.equals("Signature") &&
+ algo.equals("MD5andSHA1withRSA")) {
+ s.newInstance(null);
+ continue;
+ }
+ error("Error: unexpected RSA services");
+ }
+ } catch (NoSuchAlgorithmException | InvalidParameterException e) {
+ error("Error: cannot create obj " + e);
+ }
+ }
+ if (testResult) {
+ System.out.println("Test Passed");
+ } else {
+ throw new RuntimeException("One or more tests failed");
+ }
+ }
+}
--- a/test/jdk/sun/security/ssl/rsa/SignatureOffsets.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/security/ssl/rsa/SignatureOffsets.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
/*
* @test
- * @bug 8050374
+ * @bug 8050374 8220016
* @key randomness
* @summary This test validates signature verification
* Signature.verify(byte[], int, int). The test uses RandomFactory to
@@ -37,10 +37,7 @@
* @library /test/lib
* @build jdk.test.lib.RandomFactory
* @compile ../../../../java/security/Signature/Offsets.java
- * @run main SignatureOffsets SunJSSE MD2withRSA
- * @run main SignatureOffsets SunJSSE MD5withRSA
- * @run main SignatureOffsets SunJSSE SHA1withRSA
- * @run main SignatureOffsets SunJSSE MD5andSHA1withRSA
+ * @run main SignatureOffsets SunJSSE MD5andSHA1withRSA
*/
public class SignatureOffsets {
--- a/test/jdk/sun/security/ssl/rsa/SignedObjectChain.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/security/ssl/rsa/SignedObjectChain.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
* @compile ../../../../java/security/SignedObject/Chain.java
* @run main SignedObjectChain
*/
+
public class SignedObjectChain {
private static class Test extends Chain.Test {
@@ -40,9 +41,6 @@
}
private static final Test[] tests = {
- new Test(Chain.SigAlg.MD2withRSA),
- new Test(Chain.SigAlg.MD5withRSA),
- new Test(Chain.SigAlg.SHA1withRSA),
new Test(Chain.SigAlg.MD5andSHA1withRSA),
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/tools/keytool/Serial64.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8221257
+ * @summary Improve serial number generation mechanism for keytool -gencert
+ * @library /test/lib
+ * @key randomness
+ */
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.SecurityTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.math.BigInteger;
+import java.security.KeyStore;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Serial64 {
+
+ static List<BigInteger> numbers = new ArrayList<>();
+
+ public static void main(String[] args) throws Exception {
+
+ // 10 Self-signed certs and issued certs
+ genkeypair("ca");
+ genkeypair("user");
+ for (int i = 0; i < 8; i++) {
+ gencert("ca", "user");
+ }
+
+ numbers.forEach(b -> System.out.println(b.toString(16)));
+
+ // Must be positive, therefore never zero.
+ Asserts.assertTrue(numbers.stream()
+ .allMatch(b -> b.signum() == 1));
+
+ // At least one should be 64 bit. There is a chance of
+ // 2^-10 this would fail.
+ Asserts.assertTrue(numbers.stream()
+ .anyMatch(b -> b.bitLength() == 64));
+ }
+
+ static OutputAnalyzer keytool(String s) throws Exception {
+ return SecurityTools.keytool(
+ "-storepass changeit -keypass changeit "
+ + "-keystore ks -keyalg rsa " + s);
+ }
+
+ static void genkeypair(String a) throws Exception {
+ keytool("-genkeypair -alias " + a + " -dname CN=" + a)
+ .shouldHaveExitValue(0);
+ numbers.add(((X509Certificate)KeyStore.getInstance(
+ new File("ks"), "changeit".toCharArray())
+ .getCertificate(a)).getSerialNumber());
+ }
+
+ static void gencert(String signer, String owner)
+ throws Exception {
+ keytool("-certreq -alias " + owner + " -file req")
+ .shouldHaveExitValue(0);
+ keytool("-gencert -alias " + signer + " -infile req -outfile cert")
+ .shouldHaveExitValue(0);
+ try (FileInputStream fis = new FileInputStream("cert")) {
+ numbers.add(((X509Certificate)CertificateFactory.getInstance("X.509")
+ .generateCertificate(fis)).getSerialNumber());
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/util/RegisteredDomain/Versions.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8221801
+ * @library /test/lib
+ * @summary Update src/java.base/share/legal/public_suffix.md
+ */
+
+import jdk.test.lib.Asserts;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Versions {
+
+ public static void main(String[] args) throws Exception {
+
+ Path root = Path.of(System.getProperty("test.root"));
+ Path jdk = Path.of(System.getProperty("test.jdk"));
+
+ Path version = root.resolve("../../make/data/publicsuffixlist/VERSION");
+ Path mdSrc = root.resolve("../../src/java.base/share/legal/public_suffix.md");
+ Path mdImage = jdk.resolve("legal/java.base/public_suffix.md");
+
+ // Files in src should either both exist or not
+ if (!Files.exists(version) && !Files.exists(mdSrc)) {
+ System.out.println("Source not available. Cannot proceed.");
+ return;
+ }
+
+ String s1 = findURL(version);
+ String s2 = findURL(mdSrc);
+
+ Asserts.assertEQ(s1, s2);
+
+ String s3 = findURL(mdImage);
+ Asserts.assertEQ(s2, s3);
+ }
+
+ static Pattern URL_PATTERN = Pattern.compile(
+ "(https://raw.githubusercontent.com.*?public_suffix_list.dat)");
+
+ static String findURL(Path p) throws IOException {
+ return Files.lines(p)
+ .map(Versions::matchURL)
+ .filter(Objects::nonNull)
+ .findFirst()
+ .orElseThrow();
+ }
+
+ static String matchURL(String input) {
+ Matcher m = URL_PATTERN.matcher(input);
+ return m.find() ? m.group(1) : null;
+ }
+}
--- a/test/jdk/sun/tools/jstat/lineCounts1.awk Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/tools/jstat/lineCounts1.awk Tue Apr 02 10:57:57 2019 +0530
@@ -18,7 +18,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}
--- a/test/jdk/sun/tools/jstat/lineCounts2.awk Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/tools/jstat/lineCounts2.awk Tue Apr 02 10:57:57 2019 +0530
@@ -14,7 +14,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}
--- a/test/jdk/sun/tools/jstat/lineCounts3.awk Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/tools/jstat/lineCounts3.awk Tue Apr 02 10:57:57 2019 +0530
@@ -23,7 +23,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
datalines++;
}
--- a/test/jdk/sun/tools/jstat/lineCounts4.awk Tue Apr 02 10:55:20 2019 +0530
+++ b/test/jdk/sun/tools/jstat/lineCounts4.awk Tue Apr 02 10:57:57 2019 +0530
@@ -26,7 +26,7 @@
headerlines++;
}
-/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+)|-[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
+/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*([0-9]+\.[0-9]+|-)[ ]*([0-9]+\.[0-9]+|-)[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
if (headerlines == 2) {
datalines2++;
}
--- a/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4636655 8196202
- * @summary Add title attribute to <FRAME> tags for accessibility
- * @author dkramer
- * @library ../../lib
- * @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @build javadoc.tester.*
- * @run main AccessFrameTitle
- */
-
-import javadoc.tester.JavadocTester;
-
-public class AccessFrameTitle extends JavadocTester {
-
- public static void main(String... args) throws Exception {
- AccessFrameTitle tester = new AccessFrameTitle();
- tester.runTests();
- }
-
- @Test
- public void test() {
- javadoc("-d", "out",
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- // Testing only for the presence of the title attributes.
- // To make this test more robust, only
- // the initial part of each title string is tested for,
- // in case the ending part of the string later changes
- checkOutput("index.html", true,
- "title=\"All classes and interfaces (except non-static nested types)\"",
- "title=\"All Packages\"",
- "title=\"Package, class and interface descriptions\"");
- }
-}
--- a/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p1/C1.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p1;
-
-public class C1 {
-}
--- a/test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p2/C2.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p2;
-
-public class C2 {
-}
--- a/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@
public void test() {
javadoc("-d", "out",
"-doctitle", "Document Title",
- "--frames",
"-sourcepath", testSrc,
"p1", "p2");
checkExit(Exit.OK);
@@ -58,7 +57,7 @@
+ "}");
// Test the doc title in the overview page
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<h1 class=\"title\">Document Title</h1>");
}
}
--- a/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java Tue Apr 02 10:57:57 2019 +0530
@@ -48,7 +48,6 @@
@Test
public void testAccessSummary() {
javadoc("-d", "out",
- "--frames",
"-sourcepath", testSrc,
"p1", "p2");
checkExit(Exit.OK);
@@ -56,7 +55,7 @@
}
void checkSummary(boolean found) {
- checkOutput("overview-summary.html", found,
+ checkOutput("index.html", found,
"summary=\"Package Summary table, listing packages, and an explanation\"");
// Test that the summary attribute appears or not
--- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,6 @@
javadoc("-d", "out",
"-Xdoclint:none",
"-overview", (srcdir + "/overview.html"),
- "--frames",
"-header", "<A HREF=\"{@docroot}/element-list\">{@docroot}</A> <A HREF=\"{@docRoot}/help-doc.html\">{@docRoot}</A>",
"-sourcepath", srcdir,
"p1", "p2");
@@ -65,13 +64,7 @@
checkFiles(
"p1/C1.html",
"p1/package-summary.html",
- "overview-summary.html");
-
- // Bug 4633447: Special test for overview-frame.html
- // Find two strings in file "overview-frame.html"
- checkOutput("overview-frame.html", true,
- "<A HREF=\"./element-list\">",
- "<A HREF=\"./help-doc.html\">");
+ "index.html");
}
void checkFiles(String... filenameArray) {
--- a/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/JavascriptWinTitle.java Tue Apr 02 10:57:57 2019 +0530
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4645058 4747738 4855054 8024756 8141492 8196202 8205593
+ * @bug 4645058 4747738 4855054 8024756 8141492 8196202 8205593 8215599
* @summary Javascript IE load error when linked by -linkoffline
* Window title shouldn't change when loading left frames (javascript)
* @author dkramer
@@ -46,7 +46,6 @@
public void test() {
javadoc("-d", "out",
"-source", "8",
- "--frames",
"-doctitle", "Document Title",
"-windowtitle", "Window Title",
"-overview", testSrc("overview.html"),
@@ -54,26 +53,13 @@
"-sourcepath", testSrc,
"p1", "p2");
checkExit(Exit.OK);
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<script type=\"text/javascript\">",
"<body class=\"package-index\">");
// Test that "onload" is not present in BODY tag:
checkOutput("p1/package-summary.html", true, "<body class=\"package-declaration\">");
- checkOutput("overview-frame.html", true, "<body class=\"package-index-frame\">");
- checkOutput("allclasses-frame.html", true, "<body class=\"all-classes-frame\">");
- checkOutput("p1/package-frame.html", true, "<body class=\"package-frame\">");
- // Test that win title javascript is followed by NOSCRIPT code.
- checkOutput("p1/C.html", true,
- "<script type=\"text/javascript\"><!--\n"
- + " try {\n"
- + " if (location.href.indexOf('is-external=true') == -1) {\n"
- + " parent.document.title=\"C (Window Title)\";\n"
- + " }\n"
- + " }\n"
- + " catch(err) {\n"
- + " }\n"
- + "//-->\n");
+ checkOutput("p1/C.html", true, "<title>C (Window Title)</title>");
}
}
--- a/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java Tue Apr 02 10:57:57 2019 +0530
@@ -55,7 +55,6 @@
javadoc("-d", "out-1",
"-sourcepath", testSrc,
"-keywords",
- "--frames",
"-doctitle", "Sample Packages",
"p1", "p2");
@@ -69,7 +68,6 @@
javadoc("-d", "out-2",
"-sourcepath", testSrc,
"-notimestamp",
- "--frames",
"-doctitle", "Sample Packages",
"p1", "p2");
checkExit(Exit.OK);
@@ -89,7 +87,7 @@
checkOutput("p1/package-summary.html", found,
"<meta name=\"keywords\" content=\"p1 package\">");
- checkOutput("overview-summary.html", found,
+ checkOutput("index.html", found,
"<meta name=\"keywords\" content=\"Overview, Sample Packages\">");
// NOTE: Hopefully, this regression test is not run at midnight. If the output
@@ -97,7 +95,7 @@
// so make sure the date has not changed since the test started
String date = date();
if (date.equals(startDate)) {
- checkOutput("overview-summary.html", found,
+ checkOutput("index.html", found,
"<meta name=\"" + metaNameDate + "\" content=\"" + date + "\">");
}
}
--- a/test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4766385 8196202
- * @summary Test that the header option for upper left frame
- * is present for three sets of options: (1) -header,
- * (2) -packagesheader, and (3) -header -packagesheader
- * @author dkramer
- * @library ../../lib
- * @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @build javadoc.tester.*
- * @run main PackagesHeader
- */
-
-import javadoc.tester.JavadocTester;
-
-public class PackagesHeader extends JavadocTester {
-
- public static void main(String... args) throws Exception {
- JavadocTester tester = new PackagesHeader();
- tester.runTests();
- }
-
- @Test
- public void testHeader() {
- // First test with -header only
- javadoc("-d", "out-header",
- "-header", "Main Frame Header",
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- // Test that the -header shows up in the packages frame
- checkOutput("overview-frame.html", true,
- "Main Frame Header");
- }
-
- @Test
- public void testPackagesHeader() {
- // Second test with -packagesheader only
- javadoc("-d", "out-packages-header",
- "-packagesheader", "Packages Frame Header",
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- // Test that the -packagesheader string shows
- // up in the packages frame
- checkOutput("overview-frame.html", true,
- "Packages Frame Header");
- }
-
- @Test
- public void testBothHeaders() {
- // Third test with both -packagesheader and -header
- javadoc("-d", "out-both",
- "-packagesheader", "Packages Frame Header",
- "-header", "Main Frame Header",
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- // Test that the both headers show up and are different
- checkOutput("overview-frame.html", true,
- "Packages Frame Header");
-
- checkOutput("overview-summary.html", true,
- "Main Frame Header");
- }
-}
--- a/test/langtools/jdk/javadoc/doclet/PackagesHeader/p1/C1.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p1;
-
-public class C1 {
-}
--- a/test/langtools/jdk/javadoc/doclet/PackagesHeader/p2/C2.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p2;
-
-public class C2 {
-}
--- a/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java Tue Apr 02 10:57:57 2019 +0530
@@ -51,14 +51,10 @@
"-doctitle", "Document Title",
"-windowtitle", "Window Title",
"-use",
- "--frames",
"-overview", testSrc("overview.html"),
"-sourcepath", testSrc,
"p1", "p2");
checkExit(Exit.OK);
- // Test for IFRAME element:
- checkOutput("index.html", true,
- "<iframe");
// Test the table elements are in the correct order:
checkOutput("p1/package-use.html", true,
"</td>\n"
@@ -73,8 +69,5 @@
checkOutput("overview-summary.html", true, doctype);
checkOutput("p1/package-summary.html", true, doctype);
checkOutput("p1/C.html", true, doctype);
- checkOutput("overview-frame.html", true, doctype);
- checkOutput("allclasses-frame.html", true, doctype);
- checkOutput("p1/package-frame.html", true, doctype);
}
}
--- a/test/langtools/jdk/javadoc/doclet/WindowTitles/WindowTitles.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/WindowTitles/WindowTitles.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,21 +49,17 @@
// Test for all cases except the split index page
javadoc("-d", "out-1",
"-use",
- "--frames",
"-sourcepath", testSrc,
"p1", "p2");
checkExit(Exit.OK);
checkFiles(false, "allclasses-noframe.html");
- checkTitle("overview-summary.html", "Overview");
+ checkTitle("index.html", "Overview");
checkTitle("overview-tree.html", "Class Hierarchy");
- checkTitle("overview-frame.html", "Overview List");
checkTitle("p1/package-summary.html", "p1");
- checkTitle("p1/package-frame.html", "p1");
checkTitle("p1/package-tree.html", "p1 Class Hierarchy");
checkTitle("p1/package-use.html", "Uses of Package p1");
checkTitle("p1/C1.html", "C1");
- checkTitle("allclasses-frame.html", "All Classes");
checkTitle("constant-values.html", "Constant Field Values");
checkTitle("deprecated-list.html", "Deprecated List");
checkTitle("serialized-form.html", "Serialized Form");
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8071982 8196202
- * @summary Test for package-frame.html.
- * @library ../../lib
- * @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @build javadoc.tester.*
- * @run main TestClassDocCatalog
- */
-
-import javadoc.tester.JavadocTester;
-
-public class TestClassDocCatalog extends JavadocTester {
-
- public static void main(String... args) throws Exception {
- TestClassDocCatalog tester = new TestClassDocCatalog();
- tester.runTests();
- }
-
- @Test
- public void test() {
- javadoc("-d", "out",
- "--frames",
- testSrc("pkg1/EmptyAnnotation.java"),
- testSrc("pkg1/EmptyClass.java"),
- testSrc("pkg1/EmptyEnum.java"),
- testSrc("pkg1/EmptyError.java"),
- testSrc("pkg1/EmptyException.java"),
- testSrc("pkg1/EmptyInterface.java"),
- testSrc("pkg2/EmptyAnnotation.java"),
- testSrc("pkg2/EmptyClass.java"),
- testSrc("pkg2/EmptyEnum.java"),
- testSrc("pkg2/EmptyError.java"),
- testSrc("pkg2/EmptyException.java"),
- testSrc("pkg2/EmptyInterface.java"));
- checkExit(Exit.OK);
-
- checkOutput("overview-frame.html", true,
- "<li><a href=\"pkg1/package-frame.html\" target=\"packageFrame\">pkg1</a>"
- + "</li>\n<li><a href=\"pkg2/package-frame.html\" target=\"packageFrame\">pkg2</a></li>");
-
- checkOutput("pkg1/package-frame.html", true,
- "<li><a href=\"EmptyInterface.html\" title=\"interface in pkg1\" "
- + "target=\"classFrame\"><span class=\"interfaceName\">EmptyInterface"
- + "</span></a></li>",
- "<li><a href=\"EmptyClass.html\" title=\"class in pkg1\" "
- + "target=\"classFrame\">EmptyClass</a></li>",
- "<li><a href=\"EmptyEnum.html\" title=\"enum in pkg1\" "
- + "target=\"classFrame\">EmptyEnum</a></li>",
- "<li><a href=\"EmptyError.html\" title=\"class in pkg1\" "
- + "target=\"classFrame\">EmptyError</a></li>",
- "<li><a href=\"EmptyAnnotation.html\" title=\"annotation in pkg1\""
- + " target=\"classFrame\">EmptyAnnotation</a></li>");
- }
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyAnnotation.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.lang.annotation.Documented;
-
-@Documented public @interface EmptyAnnotation {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyClass.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class EmptyClass {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyEnum.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public enum EmptyEnum {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyError.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class EmptyError extends Error {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyException.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class EmptyException extends Exception {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyInterface.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public interface EmptyInterface {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyAnnotation.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg2;
-
-import java.lang.annotation.Documented;
-
-@Documented public @interface EmptyAnnotation {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyClass.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg2;
-
-public class EmptyClass {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyEnum.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg2;
-
-public enum EmptyEnum {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyError.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg2;
-
-public class EmptyError extends Error {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyException.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg2;
-
-public class EmptyException extends Exception {
-}
--- a/test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyInterface.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg2;
-
-public interface EmptyInterface {
-}
--- a/test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,431 +0,0 @@
-/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8162353 8164747 8173707 8196202 8204303 8184205
- * @summary javadoc should provide a way to disable use of frames
- * @library /tools/lib ../../lib
- * @modules
- * jdk.compiler/com.sun.tools.javac.api
- * jdk.compiler/com.sun.tools.javac.main
- * jdk.javadoc/jdk.javadoc.internal.tool
- * @build toolbox.ModuleBuilder toolbox.ToolBox
- * @build javadoc.tester.*
- * @run main TestFramesNoFrames
- */
-
-import java.io.*;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.*;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import toolbox.ModuleBuilder;
-import toolbox.ToolBox;
-
-import javadoc.tester.JavadocTester;
-
-public class TestFramesNoFrames extends JavadocTester {
-
- public static void main(String... args) throws Exception {
- TestFramesNoFrames tester = new TestFramesNoFrames();
- tester.generateSource();
- tester.runTests();
- }
-
- ToolBox tb = new ToolBox();
- Path gensrcModules = Paths.get("gensrc/modules");
- Path gensrcPackages = Paths.get("gensrc/packages");
-
- void generateSource() throws IOException {
- String[] modules = { "", "m1", "m2", "m3" };
- String[] packages = { "p1", "p2", "p3" };
- String[] classes = { "C1", "C2", "C3" };
- for (String m: modules) {
- ModuleBuilder mb = m.equals("") ? null : new ModuleBuilder(tb, m);
- for (String p: packages) {
- Path pkgRoot;
- if (m.equals("")) {
- pkgRoot = gensrcPackages;
- } else {
- pkgRoot = gensrcModules.resolve(m);
- mb.exports(m + p);
- }
- for (String c: classes) {
- tb.writeJavaFiles(pkgRoot,
- "package " + (m + p) + ";\n"
- + "/** class " + (m + p + c).toUpperCase() + ". */\n"
- + "public class " + (m + p + c).toUpperCase() + " { }"
- );
- }
- }
- if (!m.equals("")) {
- mb.write(gensrcModules);
- }
- }
- tb.writeFile("overview.html",
- "<html><body>This is the overview file</body></html>");
- }
-
- enum FrameKind {
- DEFAULT(),
- FRAMES("--frames"),
- NO_FRAMES("--no-frames");
- FrameKind(String... opts) {
- this.opts = Arrays.asList(opts);
- }
- final List<String> opts;
- }
-
- enum OverviewKind {
- DEFAULT(),
- OVERVIEW("-overview", "overview.html"),
- NO_OVERVIEW("-nooverview");
- OverviewKind(String... opts) {
- this.opts = Arrays.asList(opts);
- }
- final List<String> opts;
- }
-
- enum HtmlKind {
- HTML5("-html5");
- HtmlKind(String... opts) {
- this.opts = Arrays.asList(opts);
- }
- final List<String> opts;
- }
-
- @Override
- public void runTests() throws Exception {
- for (Method m : getClass().getDeclaredMethods()) {
- Annotation a = m.getAnnotation(Test.class);
- if (a != null) {
- for (FrameKind fk : FrameKind.values()) {
- for (OverviewKind ok : OverviewKind.values()) {
- try {
- out.println("Running test " + m.getName() + " " + fk + " " + ok);
- Path base = Paths.get(m.getName() + "_" + fk + "_" + ok);
- Files.createDirectories(base);
- m.invoke(this, new Object[]{base, fk, ok});
- } catch (InvocationTargetException e) {
- Throwable cause = e.getCause();
- throw (cause instanceof Exception) ? ((Exception)cause) : e;
- }
- out.println();
- }
- }
- }
- }
- printSummary();
- }
-
- void javadoc(Path outDir, FrameKind fKind, OverviewKind oKind, String... rest) {
- List<String> args = new ArrayList<>();
- args.add("-d");
- args.add(outDir.toString());
- args.addAll(fKind.opts);
- args.addAll(oKind.opts);
- args.addAll(Arrays.asList(rest));
- javadoc(args.toArray(new String[0]));
- checkExit(Exit.OK);
- }
-
- @Test
- public void testClass(Path base, FrameKind fKind, OverviewKind oKind) throws Exception {
- javadoc(base, fKind, oKind, gensrcPackages.resolve("p1/P1C1.java").toString());
-
- new Checker(fKind, oKind)
- .classes("p1.P1C1")
- .check();
- }
-
- @Test
- public void testClasses(Path base, FrameKind fKind, OverviewKind oKind) throws IOException {
- javadoc(base, fKind, oKind,
- gensrcPackages.resolve("p1/P1C1.java").toString(),
- gensrcPackages.resolve("p1/P1C2.java").toString(),
- gensrcPackages.resolve("p1/P1C3.java").toString());
-
- new Checker(fKind, oKind)
- .classes("p1.P1C1", "p1.P1C2", "p1.P1C3")
- .check();
- }
-
- @Test
- public void testPackage(Path base, FrameKind fKind, OverviewKind oKind) throws IOException {
- javadoc(base, fKind, oKind,
- "-sourcepath", gensrcPackages.toString(),
- "p1");
-
- new Checker(fKind, oKind)
- .classes("p1.P1C1", "p1.P1C2", "p1.P1C3")
- .check();
- }
-
- @Test
- public void testPackages(Path base, FrameKind fKind, OverviewKind oKind) throws IOException {
- javadoc(base, fKind, oKind,
- "-sourcepath", gensrcPackages.toString(),
- "p1", "p2", "p3");
-
- new Checker(fKind, oKind)
- .classes("p1.P1C1", "p1.P1C2", "p1.P1C3",
- "p2.P2C1", "p2.P2C2", "p2.P2C3",
- "p3.P3C1", "p3.P3C2", "p3.P3C3")
- .check();
- }
-
- @Test
- public void testModules(Path base, FrameKind fKind, OverviewKind oKind) throws IOException {
- javadoc(base, fKind, oKind,
- "--module-source-path", gensrcModules.toString(),
- "--module", "m1,m2,m3");
-
- new Checker(fKind, oKind)
- .classes("m1/m1p1.M1P1C1", "m1/m1p1.M1P1C2", "m1/m1p1.M1P1C3",
- "m2/m2p1.M2P1C1", "m2/m2p1.M2P1C2", "m2/m2p1.M2P1C3",
- "m3/m3p1.M3P1C1", "m3/m3p1.M3P1C2", "m3/m3p1.M3P1C3")
- .check();
- }
-
- /**
- * Check the contents of the generated output, according to the
- * specified options.
- */
- class Checker {
- private final FrameKind fKind;
- private final OverviewKind oKind;
- List<String> classes;
-
- private boolean frames;
- private boolean overview;
- private static final String framesWarning
- = "javadoc: warning - You have specified to generate frames, by using the --frames option.\n"
- + "The default is currently to not generate frames and the support for \n"
- + "frames will be removed in a future release.\n"
- + "To suppress this warning, remove the --frames option and avoid the use of frames.";
-
- Checker(FrameKind fKind, OverviewKind oKind) {
- this.fKind = fKind;
- this.oKind = oKind;
- }
-
- Checker classes(String... classes) {
- this.classes = Arrays.asList(classes);
- return this;
- }
-
- void check() throws IOException {
- switch (fKind) {
- case FRAMES:
- frames = true;
- break;
-
- case DEFAULT:
- case NO_FRAMES:
- frames = false;
- break;
- }
-
- switch (oKind) {
- case DEFAULT:
- overview = (getPackageCount() > 1);
- break;
-
- case OVERVIEW:
- overview = true;
- break;
-
- case NO_OVERVIEW:
- overview = false;
- break;
- }
-
- out.println("Checker: " + fKind + " " + oKind
- + ": frames:" + frames + " overview:" + overview);
-
- checkAllClassesFiles();
- checkFrameFiles();
- checkOverviewSummary();
-
- checkIndex();
- checkNavBar();
- checkHelpDoc();
-
- checkWarning();
-
- }
-
- private void checkAllClassesFiles() {
- // these files are only generated in frames mode
- checkFiles(frames,
- "allclasses-frame.html");
-
- checkFiles(false,
- "allclasses.html");
-
- checkFiles(false,
- "allclasses-noframe.html");
-
- if (frames) {
- checkOutput("allclasses-frame.html", true,
- classes.stream()
- .map(c -> "title=\"class in " + packagePart(c) + "\" target=\"classFrame\">" + classPart(c) + "</a>")
- .toArray(String[]::new));
- }
- }
-
- private void checkFrameFiles() {
- // these files are all only generated in frames mode
-
- // <module>/module-frame.html and <module>/module-type-frame.html files
- checkFiles(frames, classes.stream()
- .filter(c -> isInModule(c))
- .map(c -> modulePart(c))
- .flatMap(m -> Arrays.asList(
- m + "/module-frame.html",
- m + "/module-type-frame.html").stream())
- .collect(Collectors.toSet()));
-
- // <package>/package-frame.html files
- checkFiles(frames, classes.stream()
- .map(c -> (isInModule(c) ? (modulePart(c) + "/") : "")
- + packagePart(c)
- + "/package-frame.html")
- .collect(Collectors.toSet()));
- }
-
- private void checkHelpDoc() {
- // the Help page only describes Frame/NoFrames in frames mode
- checkOutput("help-doc.html", frames,
- "<h2>Frames/No Frames</h2>");
- }
-
- private void checkIndex() {
- // the index.html page only contains frames and Javascript to default to no-frames view,
- // in frames mode
- checkOutput("index.html", frames,
- "<iframe ",
- "</iframe>",
- "<body class=\"frames\" onload=\"loadFrames()\">\n"
- + "<script type=\"text/javascript\">\n"
- + "if (targetPage == \"\" || targetPage == \"undefined\")");
-
- // the index.html contains the overview if one
- // has been given, and not in frames mode
- checkOutput("index.html", !frames && oKind == OverviewKind.OVERVIEW,
- "This is the overview file");
-
- // the index.html file contains a summary table
- // if an overview was generated and not in frames mode
- checkOutput("index.html", !frames && overview,
- "<div class=\"overviewSummary\">\n<table");
-
- // the index.html file contains a redirect if
- // no frames and no overview
- checkOutput("index.html", !frames && !overview,
- "<meta http-equiv=\"Refresh\" content=\"0;",
- "<script type=\"text/javascript\">window.location.replace(");
-
- if (!frames && !overview) {
- checkOutput("index.html", true,
- "<noscript>\n<meta http-equiv=\"Refresh\" content=\"0;");
- }
- }
-
- private void checkNavBar() {
- // the files containing a navigation bar should only
- // contain FRAMES/NO-FRAMES links in frames mode
- List<String> navbarFiles = new ArrayList<>();
- navbarFiles.addAll(classes.stream()
- .map(c -> (isInModule(c) ? (modulePart(c) + "/") : "")
- + toHtml(packageClassPart(c)))
- .collect(Collectors.toSet()));
- for (String f : navbarFiles) {
- checkOutput(f, frames,
- "target=\"_top\">Frames</a>",
- "target=\"_top\">No Frames</a>");
- }
- }
-
- private void checkOverviewSummary() {
- // To accommodate the historical behavior of generating
- // overview-summary.html in frames mode, the file
- // will still be generated in no-frames mode,
- // but will be a redirect to index.html
- checkFiles(overview,
- "overview-summary.html");
- if (overview) {
- checkOutput("overview-summary.html", !frames,
- "<link rel=\"canonical\" href=\"index.html\">",
- "<script type=\"text/javascript\">window.location.replace('index.html')</script>",
- "<meta http-equiv=\"Refresh\" content=\"0;index.html\">",
- "<p><a href=\"index.html\">index.html</a></p>");
- }
- }
-
- private void checkWarning() {
- checkOutput(Output.OUT, frames, framesWarning);
- }
-
- private long getPackageCount() {
- return this.classes.stream()
- .filter(name -> name.contains("."))
- .map(name -> name.substring(0, name.lastIndexOf(".")))
- .distinct()
- .count();
- }
-
- private String classPart(String className) {
- int lastDot = className.lastIndexOf(".");
- return className.substring(lastDot + 1);
- }
-
- private String packagePart(String className) {
- int slash = className.indexOf("/");
- int lastDot = className.lastIndexOf(".");
- return className.substring(slash + 1, lastDot);
- }
-
- private String packageClassPart(String className) {
- int slash = className.indexOf("/");
- return className.substring(slash + 1);
- }
-
- private boolean isInModule(String className) {
- return className.contains("/");
- }
-
- private String modulePart(String className) {
- int slash = className.indexOf("/");
- return className.substring(0, slash);
- }
-
- private String toHtml(String className) {
- return className.replace(".", "/") + ".html";
- }
- }
-}
--- a/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@
@Test
public void testTimestamp() {
javadoc("-d", "out-timestamp",
- "--frames",
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
@@ -56,7 +55,6 @@
public void testNoTimestamp() {
javadoc("-d", "out-notimestamp",
"-notimestamp",
- "--frames",
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
@@ -69,10 +67,8 @@
checkTimestamps(timestamp,
"pkg/MyClass.html",
"pkg/package-summary.html",
- "pkg/package-frame.html",
"pkg/package-tree.html",
"constant-values.html",
- "allclasses-frame.html",
"overview-tree.html",
"deprecated-list.html",
"serialized-form.html",
--- a/test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,13 +59,12 @@
"package p3; public class C3 { }");
javadoc("-d", base.resolve("out").toString(),
- "--frames",
"-sourcepath", src.toString(),
"-group", "abc < & > def", "p1",
"p1", "p2", "p3");
checkExit(Exit.OK);
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+ " onclick=\"show(1);\">abc < & > def</button>",
@@ -94,14 +93,13 @@
"package pc3; public class CC3 { }");
javadoc("-d", base.resolve("out").toString(),
- "--frames",
"--module-source-path", src.toString(),
"-group", "abc < & > def", "ma",
"--module", "ma,mb,mc");
checkExit(Exit.OK);
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\""
+ " onclick=\"show(2);\">Other Modules</button>",
--- a/test/langtools/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testGroupOption/TestGroupOption.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,6 @@
// Make sure that the headers of group that is defined using patterns are printed.
public void test2() {
javadoc("-d", "out-2",
- "--frames",
"-sourcepath", testSrc,
"-group", "Group pkg*", "pkg*",
"-group", "Group abc*", "abc*",
@@ -71,8 +70,8 @@
"pkg1", "pkg2", "pkg3", "abc1", "abc2", "abc3", "other", testSrc("InUnnamedPackage.java"));
checkExit(Exit.OK);
- checkOutput("overview-summary.html", true, "Group pkg*", "Group abc*", "Other Packages");
- checkOutput("overview-summary.html", false, "Empty group", "Group a*");
+ checkOutput("index.html", true, "Group pkg*", "Group abc*", "Other Packages");
+ checkOutput("index.html", false, "Empty group", "Group a*");
}
@Test
--- a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java Tue Apr 02 10:57:57 2019 +0530
@@ -47,7 +47,6 @@
javadoc("-d", "out",
"-sourcepath", testSrc,
"-use",
- "--frames",
"-header", "Test Files",
"pkg1", "pkg2");
checkExit(Exit.OK);
@@ -93,13 +92,8 @@
+ "pkg1.C1</a> extends java.lang.Object implements Serializable</h3>",
"<h4>Serialized Fields</h4>");
- // Overview Frame
- checkOutput("overview-frame.html", true,
- "<h1 title=\"Test Files\" class=\"bar\">Test Files</h1>",
- "<title>Overview List</title>");
-
// Overview Summary
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<title>Overview</title>");
}
}
--- a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java Tue Apr 02 10:57:57 2019 +0530
@@ -46,7 +46,6 @@
@Test
public void test1() {
javadoc("-d", "out1",
- "--frames",
"-sourcepath", testSrc,
"-package",
"pkg1");
@@ -91,8 +90,6 @@
"invisibleMethod",
"A.InvisibleInner");
- checkOutput("pkg1/package-frame.html", false, "A.InvisibleInner");
-
checkOutput("pkg1/package-summary.html", false, "A.InvisibleInner");
checkOutput("pkg1/package-tree.html", false, "A.InvisibleInner");
--- a/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java Tue Apr 02 10:57:57 2019 +0530
@@ -69,32 +69,12 @@
javadoc("-d", outDir.toString(),
"-doctitle", "Document Title",
"-header", "Test Header",
- "--frames",
"--module-source-path", srcDir.toString(),
"--module", "m1,m2");
checkExit(Exit.OK);
- checkOrder("module-overview-frame.html",
- "<header role=\"banner\">\n"
- + "<h1 title=\"Test Header\" class=\"bar\">Test Header</h1>\n"
- + "<nav role=\"navigation\" class=\"indexNav\">",
- "<main role=\"main\">\n"
- + "<div class=\"indexContainer\">\n"
- + "<h2 title=\"Modules\">Modules</h2>\n"
- + "<ul title=\"Modules\">",
- "<footer role=\"contentinfo\">");
-
- checkOrder("m1/module-frame.html",
- "<header role=\"banner\">\n"
- + "<h1 title=\"Test Header\" class=\"bar\">Test Header</h1>\n"
- + "<nav role=\"navigation\" class=\"indexNav\">",
- "<main role=\"main\">\n"
- + "<div class=\"indexContainer\">\n"
- + "<h2 title=\"m1\"><a href=\"module-summary.html\" target=\"classFrame\">m1</a> Packages</h2>",
- "<footer role=\"contentinfo\">");
-
- checkOrder("overview-summary.html",
+ checkOrder("index.html",
"<header role=\"banner\">\n"
+ "<nav role=\"navigation\">",
"<main role=\"main\">\n"
@@ -113,13 +93,12 @@
javadoc("-d", outDir.toString(),
"-doctitle", "Document Title",
"-header", "Test Header",
- "--frames",
"-sourcepath", srcDir.toString(),
"pkg1", "pkg2");
checkExit(Exit.OK);
- checkOrder("overview-summary.html",
+ checkOrder("index.html",
"<header role=\"banner\">\n"
+ "<nav role=\"navigation\">",
"<main role=\"main\">\n"
@@ -127,15 +106,6 @@
+ "<h1 class=\"title\">Document Title</h1>",
"<footer role=\"contentinfo\">\n" +
"<nav role=\"navigation\">");
-
- checkOrder("overview-frame.html",
- "<header role=\"banner\">\n"
- + "<h1 title=\"Test Header\" class=\"bar\">Test Header</h1>\n"
- + "<nav role=\"navigation\" class=\"indexNav\">",
- "<main role=\"main\">\n"
- + "<div class=\"indexContainer\">\n"
- + "<h2 title=\"Packages\">Packages</h2>",
- "<footer role=\"contentinfo\">");
}
@Test
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java Tue Apr 02 10:57:57 2019 +0530
@@ -46,7 +46,6 @@
javadoc("-d", "out",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg1", "pkg2");
checkExit(Exit.ERROR);
checkOutput(Output.OUT, true,
@@ -68,7 +67,7 @@
checkOutput("pkg1/class-use/TestTable.html", true,
"<div class=\"useSummary\">\n<table>");
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n<table>");
checkOutput("deprecated-list.html", true,
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java Tue Apr 02 10:57:57 2019 +0530
@@ -52,7 +52,6 @@
javadoc("-d", "out",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg1", "pkg2");
checkExit(Exit.OK);
@@ -129,7 +128,7 @@
"<div class=\"constantsSummary\">\n<table>");
// Overview Summary
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n<table>");
}
@@ -240,7 +239,7 @@
+ "constant fields, and values\">");
// Overview Summary
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">");
}
@@ -353,7 +352,7 @@
+ "C1</a></span><span class=\"tabEnd\"> </span></caption>");
// Overview Summary
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>");
}
@@ -469,7 +468,7 @@
+ "<th class=\"colLast\" scope=\"col\">Value</th>");
// Overview Summary
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<th class=\"colFirst\" scope=\"col\">"
+ "Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\""
--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java Tue Apr 02 10:57:57 2019 +0530
@@ -47,7 +47,6 @@
javadoc("-d", "out-1",
"-private",
"-linksource",
- "--frames",
"-sourcepath", testSrc,
"-use",
"pkg", "pkg1", "pkg2", "pkg3");
@@ -69,29 +68,8 @@
}
void html5Output() {
- // Test for overview-frame page
- checkOutput("overview-frame.html", true,
- "<!DOCTYPE HTML>",
- "<meta name=\"dc.created\"",
- "<nav role=\"navigation\" class=\"indexNav\">\n"
- + "<ul>\n"
- + "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All Classes</a></li>",
- "<main role=\"main\">\n"
- + "<div class=\"indexContainer\">\n"
- + "<h1 title=\"Packages\">Packages</h1>");
-
- // Test for allclasses-frame page
- checkOutput("allclasses-frame.html", true,
- "<!DOCTYPE HTML>",
- "<meta name=\"dc.created\"",
- "<main role=\"main\">\n"
- + "<h1 class=\"bar\">All Classes</h1>\n"
- + "<div class=\"indexContainer\">\n"
- + "<ul>\n"
- + "<li>");
-
// Test for overview-summary page
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<a id=\"navbar.top.firstrow\">\n"
@@ -108,25 +86,6 @@
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
- // Test for package-frame page
- checkOutput("pkg/package-frame.html", true,
- "<!DOCTYPE HTML>",
- "<meta name=\"dc.created\"",
- "<main role=\"main\">\n"
- + "<h1 class=\"bar\"><a href=\"package-summary.html\" target=\"classFrame\">pkg</a></h1>",
- "<section role=\"region\">\n"
- + "<h2 title=\"Interfaces\">Interfaces</h2>",
- "<section role=\"region\">\n"
- + "<h2 title=\"Classes\">Classes</h2>",
- "<section role=\"region\">\n"
- + "<h2 title=\"Enums\">Enums</h2>",
- "<section role=\"region\">\n"
- + "<h2 title=\"Exceptions\">Exceptions</h2>",
- "<section role=\"region\">\n"
- + "<h2 title=\"Errors\">Errors</h2>",
- "<section role=\"region\">\n"
- + "<h2 title=\"Annotation Types\">Annotation Types</h2>");
-
// Test for package-summary page
checkOutput("pkg/package-summary.html", true,
"<!DOCTYPE HTML>",
@@ -586,44 +545,9 @@
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
- // Test for main index page
- checkOutput("index.html", true,
- "<!DOCTYPE HTML>",
- "<link rel=\"stylesheet\" type=\"text/css\" href=\"stylesheet.css\" title=\"Style\">",
- "<body class=\"frames\" onload=\"loadFrames()\">\n"
- + "<script type=\"text/javascript\">\n"
- + "if (targetPage == \"\" || targetPage == \"undefined\")\n"
- + " window.location.replace('overview-summary.html');\n"
- + "</script>\n"
- + "<noscript>JavaScript is disabled on your browser.</noscript>\n"
- + "<main role=\"main\">\n"
- + "<div class=\"mainContainer\">\n"
- + "<div class=\"leftContainer\">\n"
- + "<div class=\"leftTop\">\n"
- + "<iframe src=\"overview-frame.html\" name=\"packageListFrame\" title=\"All Packages\"></iframe>\n"
- + "</div>");
}
void html5NegatedOutput() {
- // Negated test for overview-frame page
- checkOutput("overview-frame.html", false,
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
- "<meta name=\"date\"",
- "<div class=\"indexNav\">\n"
- + "<ul>\n"
- + "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All Classes</a></li>",
- "<main class=\"indexContainer\">\n"
- + "<h2 title=\"Packages\">Packages</h2>");
-
- // Negated test for allclasses-frame page
- checkOutput("allclasses-frame.html", false,
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
- "<meta name=\"date\"",
- "<main class=\"indexContainer\">\n"
- + "<ul>\n"
- + "<li>");
-
// Negated test for overview-summary page
checkOutput("overview-summary.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
@@ -637,13 +561,6 @@
+ "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->");
- // Negated test for package-frame page
- checkOutput("pkg/package-frame.html", false,
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
- "<meta name=\"date\"",
- "<body>\n"
- + "<h1 class=\"bar\"><a href=\"package-summary.html\" target=\"classFrame\">pkg</a></h1>");
-
// Negated test for package-summary page
checkOutput("pkg/package-summary.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
--- a/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,15 +46,10 @@
@Test
public void test() {
javadoc("-d", "out",
- "--frames",
"-sourcepath", testSrc,
"pkg", testSrc("NoPackage.java"));
checkExit(Exit.OK);
- checkOutput("index.html", true,
- "<iframe src=\"overview-summary.html\" name=\"classFrame\" title=\""
- + "Package, class and interface descriptions\" class=\"rightIframe\">");
-
//Test index-all.html
checkOutput("index-all.html", true,
"<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">C</span></a>"
--- a/test/langtools/jdk/javadoc/doclet/testIndexWithModules/TestIndexWithModules.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testIndexWithModules/TestIndexWithModules.java Tue Apr 02 10:57:57 2019 +0530
@@ -87,14 +87,13 @@
Path out = base.resolve("out");
javadoc("-d", out.toString(),
"--module-source-path", src.toString(),
- "--module", "m1,m3,m4",
- "--frames");
+ "--module", "m1,m3,m4");
checkExit(Exit.OK);
- checkOutput("index.html", true,
- "window.location.replace('overview-summary.html')");
- checkOrder("overview-summary.html",
+ checkOutput("overview-summary.html", true,
+ "window.location.replace('index.html')");
+ checkOrder("index.html",
"Modules",
"<a href=\"m1/module-summary.html\">m1</a>",
"<a href=\"m3/module-summary.html\">m3</a>",
--- a/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testJavascript/TestJavascript.java Tue Apr 02 10:57:57 2019 +0530
@@ -44,88 +44,20 @@
@Test
public void test() {
javadoc("-d", "out",
- "--frames",
"-sourcepath", testSrc,
"pkg", testSrc("TestJavascript.java"));
checkExit(Exit.OK);
checkOutput("pkg/C.html", true,
- "<a href=\"../index.html?pkg/C.html\" target=\"_top\">Frames</a>",
"<script type=\"text/javascript\"><!--\n"
+ "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
+ "//-->\n"
+ "</script>");
- checkOutput("TestJavascript.html", true,
- "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>");
-
checkOutput("index.html", true,
- "<script type=\"text/javascript\">\n"
- + " tmpTargetPage = \"\" + window.location.search;\n"
- + " if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")\n"
- + " tmpTargetPage = tmpTargetPage.substring(1);\n"
- + " if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))\n"
- + " tmpTargetPage = \"undefined\";\n"
- + " targetPage = tmpTargetPage;\n"
- + " function validURL(url) {\n"
- + " try {\n"
- + " url = decodeURIComponent(url);\n"
- + " }\n"
- + " catch (error) {\n"
- + " return false;\n"
- + " }\n"
- + " var pos = url.indexOf(\".html\");\n"
- + " if (pos == -1 || pos != url.length - 5)\n"
- + " return false;\n"
- + " var allowNumber = false;\n"
- + " var allowSep = false;\n"
- + " var seenDot = false;\n"
- + " for (var i = 0; i < url.length - 5; i++) {\n"
- + " var ch = url.charAt(i);\n"
- + " if ('a' <= ch && ch <= 'z' ||\n"
- + " 'A' <= ch && ch <= 'Z' ||\n"
- + " ch == '$' ||\n"
- + " ch == '_' ||\n"
- + " ch.charCodeAt(0) > 127) {\n"
- + " allowNumber = true;\n"
- + " allowSep = true;\n"
- + " } else if ('0' <= ch && ch <= '9'\n"
- + " || ch == '-') {\n"
- + " if (!allowNumber)\n"
- + " return false;\n"
- + " } else if (ch == '/' || ch == '.') {\n"
- + " if (!allowSep)\n"
- + " return false;\n"
- + " allowNumber = false;\n"
- + " allowSep = false;\n"
- + " if (ch == '.')\n"
- + " seenDot = true;\n"
- + " if (ch == '/' && seenDot)\n"
- + " return false;\n"
- + " } else {\n"
- + " return false;\n"
- + " }\n"
- + " }\n"
- + " return true;\n"
- + " }\n"
- + " function loadFrames() {\n"
- + " if (targetPage != \"\" && targetPage != \"undefined\")\n"
- + " top.classFrame.location = top.targetPage;\n"
- + " }\n"
- + "</script>");
-
- checkOutput("index.html", true,
- "<body class=\"frames\" onload=\"loadFrames()\"");
-
- //Make sure title javascript only runs if is-external is not true
- checkOutput("pkg/C.html", true,
- " try {\n"
- + " if (location.href.indexOf('is-external=true') == -1) {\n"
- + " parent.document.title=\"C\";\n"
- + " }\n"
- + " }\n"
- + " catch(err) {\n"
- + " }");
+ "<script type=\"text/javascript\"><!--\n"
+ + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
+ + "//-->\n");
checkOutput("script.js", true,
"$(window).resize(function() {\n"
--- a/test/langtools/jdk/javadoc/doclet/testMetadata/TestMetadata.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testMetadata/TestMetadata.java Tue Apr 02 10:57:57 2019 +0530
@@ -57,7 +57,6 @@
tester.runTests();
}
- enum Frames { NO_FRAMES, FRAMES };
enum Index { SINGLE, SPLIT };
enum Source { PACKAGES, MODULES };
@@ -68,16 +67,14 @@
public void runTests() throws Exception {
for (Source s : Source.values()) {
Path src = genSource(s);
- for (Frames f : Frames.values()) {
for (Index i : Index.values()) {
List<String> args = new ArrayList<>();
args.add("-d");
- args.add(String.format("out-%s-%s-%s", s, f, i));
+ args.add(String.format("out-%s-%s", s, i));
args.add("-use");
if (s != Source.MODULES) {
args.add("-linksource"); // broken, with modules: JDK-8219060
}
- args.add(f == Frames.NO_FRAMES ? "--no-frames" : "--frames");
if (i == Index.SPLIT) {
args.add("-splitIndex");
}
@@ -116,7 +113,6 @@
break;
}
}
- }
}
checking ("all generators");
@@ -143,7 +139,6 @@
final Pattern nl = Pattern.compile("[\\r\\n]+");
final Pattern bodyPattern = Pattern.compile("<body [^>]*class=\"([^\"]+)\"");
final Set<String> allBodyClasses = Set.of(
- "all-classes-frame",
"all-classes-index",
"all-packages-index",
"class-declaration",
@@ -151,18 +146,12 @@
"constants-summary",
"deprecated-list",
"doc-file",
- "frames",
"help",
"index-redirect",
"module-declaration",
- "module-frame",
"module-index",
- "module-index-frame",
- "module-package-index-frame",
"package-declaration",
- "package-frame",
"package-index",
- "package-index-frame",
"package-tree",
"package-use",
"serialized-form",
@@ -216,7 +205,6 @@
final Pattern contentPattern = Pattern.compile("content=\"([^\"]+)\">");
final Pattern generatorPattern = Pattern.compile("content=\"javadoc/([^\"]+)\">");
final Set<String> allGenerators = Set.of(
- "AllClassesFrameWriter",
"AllClassesIndexWriter",
"AllPackagesIndexWriter",
"AnnotationTypeWriterImpl",
@@ -225,16 +213,10 @@
"ConstantsSummaryWriterImpl",
"DeprecatedListWriter",
"DocFileWriter",
- "FrameOutputWriter",
"HelpWriter",
"IndexRedirectWriter",
- "ModuleFrameWriter",
- "ModuleIndexFrameWriter",
"ModuleIndexWriter",
- "ModulePackageIndexFrameWriter",
"ModuleWriterImpl",
- "PackageFrameWriter",
- "PackageIndexFrameWriter",
"PackageIndexWriter",
"PackageTreeWriter",
"PackageUseWriter",
@@ -323,16 +305,6 @@
}
switch (generator) {
- case "AllClassesFrameWriter":
- case "FrameOutputWriter":
- case "ModuleFrameWriter":
- case "ModuleIndexFrameWriter":
- case "ModulePackageIndexFrameWriter":
- case "PackageFrameWriter":
- case "PackageIndexFrameWriter":
- check(generator, content, content.contains("frame"));
- break;
-
case "AllClassesIndexWriter":
case "AllPackagesIndexWriter":
case "ModuleIndexWriter":
--- a/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -83,26 +83,17 @@
javadoc("-d", base.resolve("api").toString(),
"-quiet",
- "--frames",
"--module-source-path", src.toString(),
"--no-module-directories",
"--module", "ma,mb");
checkExit(Exit.OK);
checkFiles(true,
- "ma-frame.html",
"ma-summary.html",
"pa/package-summary.html");
checkFiles(false,
- "ma/module-frame.html",
"ma/module-summary.html",
"ma/pa/package-summary.html");
- checkOutput("ma-frame.html", true,
- "<ul>\n"
- + "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All Classes</a></li>\n"
- + "<li><a href=\"overview-frame.html\" target=\"packageListFrame\">All Packages</a></li>\n"
- + "<li><a href=\"module-overview-frame.html\" target=\"packageListFrame\">All Modules</a></li>\n"
- + "</ul>\n");
checkOutput("ma-summary.html", false,
"<ul class=\"navList\" id=\"allclasses_navbar_top\">\n"
+ "<li><a href=\"allclasses-noframe.html\">All Classes</a></li>\n"
@@ -127,25 +118,16 @@
javadoc("-d", base.resolve("api").toString(),
"-quiet",
- "--frames",
"--module-source-path", src.toString(),
"--module", "ma,mb");
checkExit(Exit.OK);
checkFiles(false,
- "ma-frame.html",
"ma-summary.html",
"pa/package-summary.html");
checkFiles(true,
- "ma/module-frame.html",
"ma/module-summary.html",
"ma/pa/package-summary.html");
- checkOutput("ma/module-frame.html", true,
- "<ul>\n"
- + "<li><a href=\"../allclasses-frame.html\" target=\"packageFrame\">All Classes</a></li>\n"
- + "<li><a href=\"../overview-frame.html\" target=\"packageListFrame\">All Packages</a></li>\n"
- + "<li><a href=\"../module-overview-frame.html\" target=\"packageListFrame\">All Modules</a></li>\n"
- + "</ul>\n");
checkOutput("ma/module-summary.html", false,
"<ul class=\"navList\" id=\"allclasses_navbar_top\">\n"
+ "<li><a href=\"../allclasses-noframe.html\">All Classes</a></li>\n"
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Tue Apr 02 10:57:57 2019 +0530
@@ -53,7 +53,6 @@
"-use",
"-Xdoclint:none",
"-overview", testSrc("overview.html"),
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleA,moduleB",
"testpkgmdlA", "testpkgmdlB");
@@ -62,11 +61,8 @@
checkHtml5NoDescription(false);
checkHtml5OverviewSummaryModules();
checkModuleLink();
- checkModuleClickThroughLinks();
- checkModuleClickThrough(true);
checkModuleFilesAndLinks(true);
checkModulesInSearch(true);
- checkOverviewFrame(true);
checkAllPkgsAllClasses(true);
}
@@ -79,7 +75,6 @@
"-nocomment",
"-use",
"-Xdoclint:none",
- "--frames",
"-overview", testSrc("overview.html"),
"--module-source-path", testSrc,
"--module", "moduleA,moduleB",
@@ -89,7 +84,6 @@
checkHtml5NoDescription(true);
checkModuleLink();
checkModuleFilesAndLinks(true);
- checkOverviewFrame(true);
}
/**
@@ -99,7 +93,6 @@
public void testHtml5UnnamedModule() {
javadoc("-d", "out-html5-nomodule",
"-use",
- "--frames",
"-overview", testSrc("overview.html"),
"-sourcepath", testSrc,
"testpkgnomodule", "testpkgnomodule1");
@@ -107,7 +100,6 @@
checkHtml5OverviewSummaryPackages();
checkModuleFilesAndLinks(false);
checkModulesInSearch(false);
- checkOverviewFrame(false);
}
/**
@@ -165,13 +157,11 @@
public void testModuleFilesAndLinks() {
javadoc("-d", "out-modulelinks",
"-Xdoclint:none",
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleA,moduleB",
"testpkgmdlA", "testpkgmdlB");
checkExit(Exit.OK);
checkModuleFilesAndLinks(true);
- checkOverviewFrame(true);
}
/**
@@ -215,7 +205,6 @@
"-author",
"-version",
"-Xdoclint:none",
- "--frames",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
"--module-source-path", testSrc,
@@ -225,8 +214,6 @@
checkModuleModeCommon();
checkModuleModeApi(true);
checkModuleModeAll(false);
- checkModuleFrameFiles(true);
- checkAllModulesLink(true);
}
/**
@@ -240,7 +227,6 @@
"-author",
"-version",
"-Xdoclint:none",
- "--frames",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
"--module-source-path", testSrc,
@@ -250,8 +236,6 @@
checkModuleModeCommon();
checkModuleModeApi(false);
checkModuleModeAll(true);
- checkModuleFrameFiles(true);
- checkAllModulesLink(true);
}
/**
@@ -289,12 +273,10 @@
@Test
public void testSingleModuleSinglePkg() {
javadoc("-d", "out-singlemod",
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleC",
"testpkgmdlC");
checkExit(Exit.OK);
- checkModuleFrameFiles(false);
}
/**
@@ -305,12 +287,10 @@
javadoc("-d", "out-singlemodmultiplepkg",
"--show-module-contents=all",
"-Xdoclint:none",
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleB",
"testpkg2mdlB", "testpkgmdlB");
checkExit(Exit.OK);
- checkAllModulesLink(false);
}
/**
@@ -321,7 +301,6 @@
javadoc("-d", "out-group",
"--show-module-contents=all",
"-Xdoclint:none",
- "--frames",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
"--module-source-path", testSrc,
@@ -345,7 +324,6 @@
javadoc("-d", "out-groupOrder",
"--show-module-contents=all",
"-Xdoclint:none",
- "--frames",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
"--module-source-path", testSrc,
@@ -368,7 +346,6 @@
javadoc("-d", "out-groupnomodule",
"-use",
"-Xdoclint:none",
- "--frames",
"-overview", testSrc("overview.html"),
"-sourcepath", testSrc,
"-group", "Package Group 0", "testpkgnomodule",
@@ -388,7 +365,6 @@
javadoc("-d", "out-groupPkgOrder",
"-use",
"-Xdoclint:none",
- "--frames",
"-overview", testSrc("overview.html"),
"-sourcepath", testSrc,
"-group", "Z Group", "testpkgnomodule",
@@ -406,7 +382,6 @@
javadoc("-d", "out-groupsinglemodule",
"-use",
"-Xdoclint:none",
- "--frames",
"--module-source-path", testSrc,
"-group", "Module Group B", "moduleB*",
"--module", "moduleB",
@@ -423,7 +398,6 @@
javadoc("-d", "out-modulename",
"-use",
"-Xdoclint:none",
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleB,test.moduleFullName",
"testpkg2mdlB", "testpkgmdlB", "testpkgmdlfullname");
@@ -464,7 +438,7 @@
+ "</a>\n"
+ "<div class=\"block\">This is a test description for the moduleB module. Search "
+ "word <a id=\"search_word\" class=\"searchTagResult\">search_word</a> with no description.</div>");
- checkOutput("overview-summary.html", found,
+ checkOutput("index.html", found,
"</script>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
@@ -473,7 +447,7 @@
+ "<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>");
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"</table>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
@@ -523,7 +497,7 @@
+ "</a>\n"
+ "<div class=\"block\">This is a test description for the moduleB module. Search "
+ "word <a id=\"search_word\" class=\"searchTagResult\">search_word</a> with no description.</div>");
- checkOutput("overview-summary.html", found,
+ checkOutput("index.html", found,
"</nav>\n"
+ "</header>\n"
+ "<main role=\"main\">\n"
@@ -533,7 +507,7 @@
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>");
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"</table>\n"
+ "</div>\n"
+ "</main>\n"
@@ -564,7 +538,7 @@
}
void checkModuleLink() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<li>Module</li>");
checkOutput("moduleA/module-summary.html", true,
"<li class=\"navBarCell1Rev\">Module</li>");
@@ -619,7 +593,7 @@
}
void checkOverviewSummaryModules() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -642,7 +616,7 @@
}
void checkOverviewSummaryPackages() {
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -661,7 +635,7 @@
+ "<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>");
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -682,7 +656,7 @@
}
void checkHtml5OverviewSummaryModules() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -705,7 +679,7 @@
}
void checkHtml5OverviewSummaryPackages() {
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -728,7 +702,7 @@
+ "<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>");
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ "<thead>\n"
@@ -861,27 +835,6 @@
+ "</a>");
}
- void checkModuleClickThroughLinks() {
- checkOutput("module-overview-frame.html", true,
- "<li><a href=\"moduleA/module-frame.html\" target=\"packageListFrame\" "
- + "onclick=\"updateModuleFrame('moduleA/module-type-frame.html','moduleA/module-summary.html');"
- + "\">moduleA</a></li>",
- "<li><a href=\"moduleB/module-frame.html\" target=\"packageListFrame\" "
- + "onclick=\"updateModuleFrame('moduleB/module-type-frame.html','moduleB/module-summary.html');"
- + "\">moduleB</a></li>");
- checkOutput("script.js", true,
- "function updateModuleFrame(pFrame, cFrame) {\n"
- + " top.packageFrame.location = pFrame;\n"
- + " top.classFrame.location = cFrame;\n"
- + "}");
- }
-
- void checkModuleClickThrough(boolean found) {
- checkFiles(found,
- "moduleA/module-type-frame.html",
- "moduleB/module-type-frame.html");
- }
-
void checkModuleFilesAndLinks(boolean found) {
checkFileAndOutput("moduleA/testpkgmdlA/package-summary.html", found,
"<li><a href=\"../module-summary.html\">Module</a></li>",
@@ -897,26 +850,7 @@
"<div class=\"subTitle\"><span class=\"packageLabelInType\">"
+ "Package</span> <a href=\"package-summary.html\">testpkgmdlB</a></div>");
checkFiles(found,
- "moduleA/module-frame.html",
- "moduleA/module-summary.html",
- "module-overview-frame.html");
- }
-
- void checkModuleFrameFiles(boolean found) {
- checkFiles(found,
- "moduleC/module-frame.html",
- "moduleC/module-type-frame.html",
- "module-overview-frame.html");
- checkFiles(true,
- "moduleC/module-summary.html",
- "allclasses-frame.html");
- checkFiles(false,
- "allclasses-noframe.html");
- }
-
- void checkAllModulesLink(boolean found) {
- checkOutput("overview-frame.html", found,
- "<li><a href=\"module-overview-frame.html\" target=\"packageListFrame\">All Modules</a></li>");
+ "moduleA/module-summary.html");
}
void checkModulesInSearch(boolean found) {
@@ -950,7 +884,7 @@
}
void checkModuleModeCommon() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<th class=\"colFirst\" scope=\"row\"><a href=\"moduleA/module-summary.html\">moduleA</a></th>\n"
+ "<td class=\"colLast\">\n"
+ "<div class=\"block\">This is a test description for the moduleA module with a Search "
@@ -1155,13 +1089,6 @@
"@AnnotationTypeUndocumented");
}
- void checkOverviewFrame(boolean found) {
- checkOutput("index.html", !found,
- "<iframe src=\"overview-frame.html\" name=\"packageListFrame\" title=\"All Packages\"></iframe>");
- checkOutput("index.html", found,
- "<iframe src=\"module-overview-frame.html\" name=\"packageListFrame\" title=\"All Modules\"></iframe>");
- }
-
void checkModuleSummaryNoExported(boolean found) {
checkOutput("moduleNoExport/module-summary.html", found,
"<!-- ============ PACKAGES SUMMARY =========== -->\n"
@@ -1172,7 +1099,7 @@
}
void checkGroupOption() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
@@ -1194,14 +1121,14 @@
+ "var rowColor = \"rowColor\";\n"
+ "var tableTab = \"tableTab\";\n"
+ "var activeTableTab = \"activeTableTab\";");
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>",
"Java SE Modules");
}
void checkGroupOptionOrdering() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>"
@@ -1217,7 +1144,7 @@
+ "Other Modules</button></div>",
"var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"B Group\"],2:[\"t2\",\"C Group\"],"
+ "4:[\"t4\",\"A Group\"],8:[\"t8\",\"Other Modules\"]};");
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>"
@@ -1235,7 +1162,7 @@
}
void checkUnnamedModuleGroupOption() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
@@ -1260,7 +1187,7 @@
}
void checkGroupOptionPackageOrdering() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Packages</button>"
@@ -1289,12 +1216,6 @@
+ "<dd>\n"
+ "<div class=\"block\">This is a test description for the test.moduleFullName.</div>\n"
+ "</dd>");
- checkOutput("module-overview-frame.html", found,
- "<h1 title=\"Modules\">Modules</h1>\n"
- + "<ul title=\"Modules\">\n"
- + "<li><a href=\"moduleB/module-frame.html\" target=\"packageListFrame\" onclick=\"updateModuleFrame('moduleB/module-type-frame.html','moduleB/module-summary.html');\">moduleB</a></li>\n"
- + "<li><a href=\"test.moduleFullName/module-frame.html\" target=\"packageListFrame\" onclick=\"updateModuleFrame('test.moduleFullName/module-type-frame.html','test.moduleFullName/module-summary.html');\">test.moduleFullName</a></li>\n"
- + "</ul>");
checkOutput("test.moduleFullName/module-summary.html", !found,
"<div class=\"header\">\n"
+ "<h1 title=\"Module\" class=\"title\">Module moduleFullName</h1>\n"
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestModuleNavigation.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -76,12 +76,11 @@
javadoc("-d", base.resolve("out").toString(), "-use",
"-quiet",
- "--frames",
"--module-source-path", src.toString(),
"--module", "m,m2");
checkExit(Exit.OK);
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"Prev",
"Next",
"All Classes",
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java Tue Apr 02 10:57:57 2019 +0530
@@ -57,7 +57,6 @@
public void test(Path ignore) {
javadoc("-d", "out",
"-overview", testSrc("overview.html"),
- "--frames",
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
@@ -65,15 +64,15 @@
checkOutput("pkg/A.html", true,
"<ul class=\"navList\" title=\"Navigation\">\n" +
- "<li><a href=\"../overview-summary.html\">Overview</a></li>");
+ "<li><a href=\"../index.html\">Overview</a></li>");
checkOutput("pkg/C.html", true,
"<ul class=\"navList\" title=\"Navigation\">\n" +
- "<li><a href=\"../overview-summary.html\">Overview</a></li>");
+ "<li><a href=\"../index.html\">Overview</a></li>");
checkOutput("pkg/E.html", true,
"<ul class=\"navList\" title=\"Navigation\">\n" +
- "<li><a href=\"../overview-summary.html\">Overview</a></li>");
+ "<li><a href=\"../index.html\">Overview</a></li>");
checkOutput("pkg/I.html", true,
// Test for 4664607
@@ -81,7 +80,7 @@
+ "<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<li><a href=\"../overview-summary.html\">Overview</a></li>");
+ "<li><a href=\"../index.html\">Overview</a></li>");
// Remaining tests check for additional padding to offset the fixed navigation bar.
checkOutput("pkg/A.html", true,
@@ -115,7 +114,6 @@
public void test1(Path ignore) {
javadoc("-d", "out-1",
"-html5",
- "--frames",
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
@@ -149,7 +147,6 @@
public void test2(Path ignore) {
javadoc("-d", "out-2",
"-nonavbar",
- "--frames",
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Apr 02 10:57:57 2019 +0530
@@ -49,7 +49,6 @@
javadoc("-Xdoclint:none",
"-d", "out",
"-use",
- "--frames",
"-sourcepath", testSrc,
"pkg", "pkg1", "pkg2");
checkExit(Exit.OK);
@@ -465,13 +464,6 @@
+ "method(Vector<Object>)</a></span>"
);
- // No type parameters in class frame.
- checkOutput("allclasses-frame.html", false,
- "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
- + "TypeParameters</a><<a href=\"../pkg/TypeParameters.html\" "
- + "title=\"type parameter in TypeParameters\">E</a>>"
- );
-
}
//=================================
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testNoFrames/TestNoFrames.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8215599
+ * @summary Remove support for javadoc "frames" mode
+ * @library ../../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build javadoc.tester.*
+ * @run main TestNoFrames
+ */
+
+import javadoc.tester.JavadocTester;
+
+public class TestNoFrames extends JavadocTester {
+
+ public static void main(String... args) throws Exception {
+ TestNoFrames tester = new TestNoFrames();
+ tester.runTests();
+ }
+
+ @Test
+ public void testFrames() {
+ javadoc("-d", "out-1",
+ "--frames",
+ "-sourcepath",testSrc,
+ testSrc("TestNoFrames.java"));
+ checkExit(Exit.ERROR);
+ }
+
+ @Test
+ public void testDefault() {
+ javadoc("-d", "out-2",
+ "--no-frames",
+ "-sourcepath",testSrc,
+ testSrc("TestNoFrames.java"));
+ checkExit(Exit.OK);
+
+ checkOutput(Output.OUT, true,
+ "javadoc: warning - The --no-frames option is no longer required and may be removed\n"
+ + "in a future release.");
+ }
+}
--- a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java Tue Apr 02 10:57:57 2019 +0530
@@ -121,10 +121,8 @@
javadoc("-d", "out-1",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg1");
checkExit(Exit.OK);
- checkFiles(false, "allclasses-noframe.html");
checkClassUseOrdering("pkg1/class-use/UsedClass.html");
@@ -174,20 +172,6 @@
checkOrder("pkg1/OverrideOrdering.html",
"<dd><code>iterator</code> in interface <code>java.util.Collection<",
"<dd><code>iterator</code> in interface <code>java.lang.Iterable<");
-
- checkOrder("allclasses-frame.html",
- "pkg1/A.html\" title=\"class in pkg1",
- "pkg1/A.C.html\" title=\"class in pkg1",
- "pkg1/B.html\" title=\"class in pkg1",
- "pkg1/B.A.html\" title=\"class in pkg1",
- "pkg1/C1.html\" title=\"class in pkg1",
- "pkg1/C2.html\" title=\"class in pkg1",
- "pkg1/C3.html\" title=\"class in pkg1",
- "pkg1/C4.html\" title=\"class in pkg1",
- "pkg1/ImplementsOrdering.html\" title=\"interface in pkg1",
- "pkg1/MethodOrder.html\" title=\"class in pkg1",
- "pkg1/OverrideOrdering.html\" title=\"class in pkg1",
- "pkg1/UsedClass.html\" title=\"class in pkg1");
}
void checkClassUseOrdering(String usePage) {
@@ -359,7 +343,6 @@
List<String> cmdArgs = new ArrayList();
cmdArgs.add("-d");
cmdArgs.add("out-2");
- cmdArgs.add("--frames");
cmdArgs.add("-sourcepath");
cmdArgs.add("src");
cmdArgs.add("-package");
@@ -419,25 +402,6 @@
"<a href=\"add3/add/Add.ADD.html\" title=\"enum in add3.add\">",
"<a href=\"add3/add/add/Add.ADD.html\" title=\"enum in add3.add.add\">",
"<a href=\"add3/add/add/add/Add.ADD.html\" title=\"enum in add3.add.add.add\">");
-
- checkOrder("overview-frame.html",
- "<a href=\"package-frame.html\" target=\"packageFrame\"><unnamed package></a>",
- "<a href=\"add0/package-frame.html\" target=\"packageFrame\">add0</a>",
- "<a href=\"add0/add/package-frame.html\" target=\"packageFrame\">add0.add</a>",
- "<a href=\"add0/add/add/package-frame.html\" target=\"packageFrame\">add0.add.add</a>",
- "<a href=\"add0/add/add/add/package-frame.html\" target=\"packageFrame\">add0.add.add.add</a>",
- "<a href=\"add1/package-frame.html\" target=\"packageFrame\">add1</a>",
- "<a href=\"add1/add/package-frame.html\" target=\"packageFrame\">add1.add</a>",
- "<a href=\"add1/add/add/package-frame.html\" target=\"packageFrame\">add1.add.add</a>",
- "<a href=\"add1/add/add/add/package-frame.html\" target=\"packageFrame\">add1.add.add.add</a>",
- "<a href=\"add2/package-frame.html\" target=\"packageFrame\">add2</a>",
- "<a href=\"add2/add/package-frame.html\" target=\"packageFrame\">add2.add</a>",
- "<a href=\"add2/add/add/package-frame.html\" target=\"packageFrame\">add2.add.add</a>",
- "<a href=\"add2/add/add/add/package-frame.html\" target=\"packageFrame\">add2.add.add.add</a>",
- "<a href=\"add3/package-frame.html\" target=\"packageFrame\">add3</a>",
- "<a href=\"add3/add/package-frame.html\" target=\"packageFrame\">add3.add</a>",
- "<a href=\"add3/add/add/package-frame.html\" target=\"packageFrame\">add3.add.add</a>",
- "<a href=\"add3/add/add/add/package-frame.html\" target=\"packageFrame\">add3.add.add.add</a></li>");
}
void emitFile(String pkgname, String clsname, ListOrder order) throws IOException {
--- a/test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testOverview/TestOverview.java Tue Apr 02 10:57:57 2019 +0530
@@ -47,7 +47,6 @@
"-doctitle", "Document Title",
"-windowtitle", "Window Title",
"-overview", testSrc("overview.html"),
- "--frames",
"-sourcepath", testSrc("src"),
"p1", "p2");
checkExit(Exit.OK);
@@ -60,7 +59,6 @@
"-doctitle", "Document Title",
"-windowtitle", "Window Title",
"-overview", testSrc("overview.html"),
- "--frames",
"-sourcepath", testSrc("msrc"),
"p1", "p2");
checkExit(Exit.OK);
@@ -68,7 +66,7 @@
}
void checkOverview() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<main role=\"main\">\n"
+ "<div class=\"header\">\n"
+ "<h1 class=\"title\">Document Title</h1>\n"
--- a/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java Tue Apr 02 10:57:57 2019 +0530
@@ -46,7 +46,6 @@
javadoc("-d", "out-default",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", testSrc("C2.java"), testSrc("FooDepr.java"));
checkExit(Exit.OK);
@@ -66,14 +65,11 @@
"-sourcepath", testSrc,
"-use",
"-nodeprecated",
- "--frames",
"pkg", "pkg1", testSrc("C2.java"), testSrc("FooDepr.java"));
checkExit(Exit.OK);
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"pkg1");
- checkOutput("allclasses-frame.html", false,
- "FooDepr");
checkOutput("class-use/C2.ModalExclusionType.html", true,
"<th class=\"colFirst\" scope=\"row\"><a href=\"#unnamed.package\"><Unnamed></a></th>");
--- a/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testRecurseSubPackages/TestRecurseSubPackages.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,19 +44,15 @@
@Test
public void test() {
javadoc("-d", "out",
- "--frames",
"-sourcepath", testSrc,
"-subpackages", "pkg1",
"-exclude", "pkg1.pkg2.packageToExclude");
checkExit(Exit.OK);
for (int i = 1; i <= 6; i++) {
- checkOutput("allclasses-frame.html", true,
+ checkOutput("allclasses-index.html", true,
"C" + i + ".html");
}
-
- checkOutput("allclasses-frame.html", false,
- "DummyClass.html");
}
}
--- a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java Tue Apr 02 10:57:57 2019 +0530
@@ -50,7 +50,6 @@
public void test() {
javadoc("-d", "out",
"-use",
- "--frames",
"-sourcepath", testSrc,
"pkg", "pkg2");
checkExit(Exit.ERROR);
@@ -98,7 +97,7 @@
" <a href=\"../../pkg/relative-multi-line-link.html\">relative-multi-line-link</a>.");
// PACKAGE OVERVIEW
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<a href=\"./pkg/relative-package-link.html\">relative package link</a>");
}
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java Tue Apr 02 10:57:57 2019 +0530
@@ -70,7 +70,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkInvalidUsageIndexTag();
@@ -97,7 +96,6 @@
"-Xdoclint:all",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.ERROR);
checkDocLintErrors();
@@ -124,7 +122,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(false);
@@ -150,7 +147,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(true);
@@ -177,7 +173,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(false);
@@ -201,7 +196,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(true);
@@ -226,7 +220,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
@@ -252,7 +245,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkInvalidUsageIndexTag();
@@ -280,7 +272,6 @@
"--disable-javafx-strict-checks",
"-package",
"-use",
- "--frames",
"pkgfx", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(true);
@@ -306,7 +297,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(true, false);
@@ -373,7 +363,7 @@
}
void checkSearchOutput(boolean expectedOutput) {
- checkSearchOutput("overview-summary.html", expectedOutput, true);
+ checkSearchOutput("index.html", expectedOutput, true);
}
void checkSearchIndex(boolean expectedOutput) {
@@ -390,7 +380,7 @@
}
void checkSearchOutput(boolean expectedOutput, boolean moduleDirectoriesVar) {
- checkSearchOutput("overview-summary.html", expectedOutput, moduleDirectoriesVar);
+ checkSearchOutput("index.html", expectedOutput, moduleDirectoriesVar);
}
void checkSearchOutput(String fileName, boolean expectedOutput, boolean moduleDirectoriesVar) {
@@ -635,7 +625,7 @@
"function concatResults(a1, a2) {",
"if (exactMatcher.test(item.l)) {\n"
+ " presult.push(item);",
- "$(\"#search\").on('click keydown', function() {\n"
+ "$(\"#search\").on('click keydown paste', function() {\n"
+ " if ($(this).val() == watermark) {\n"
+ " $(this).val('').removeClass('watermark');\n"
+ " }\n"
--- a/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java Tue Apr 02 10:57:57 2019 +0530
@@ -113,13 +113,12 @@
@Test
public void test3() {
javadoc("-d", "out3",
- "--frames",
"-sourcepath", testSrc,
"-overview", testSrc("p3/overview.html"),
"p3");
checkExit(Exit.OK);
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"block\">The first... line second from ...</div>");
}
}
--- a/test/langtools/jdk/javadoc/doclet/testTopOption/TestTopOption.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testTopOption/TestTopOption.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
"-use",
"-top", "TOP TEXT",
"-d", "out-1",
- "--frames",
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
@@ -59,7 +58,7 @@
"pkg/class-use/Cl.html",
"pkg/package-summary.html",
"pkg/package-use.html",
- "overview-summary.html",
+ "index.html",
"overview-tree.html",
"constant-values.html",
"help-doc.html");
@@ -71,7 +70,6 @@
"-use",
"-top", "\u0130{@docroot}TOP TEXT",
"-d", "out-2",
- "--frames",
"-sourcepath", testSrc,
"pkg");
checkExit(Exit.OK);
@@ -83,7 +81,7 @@
"pkg/class-use/Cl.html",
"pkg/package-summary.html",
"pkg/package-use.html",
- "overview-summary.html",
+ "index.html",
"overview-tree.html",
"constant-values.html",
"help-doc.html");
--- a/test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java Tue Apr 02 10:57:57 2019 +0530
@@ -47,7 +47,6 @@
javadoc("-d", "out-1",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg1", "pkg2");
checkExit(Exit.OK);
@@ -80,10 +79,6 @@
"Method in C8."
);
- checkOutput("pkg2/class-use/C3.html", true,
- "<a href=\"../../index.html?pkg2/class-use/C3.html\" target=\"_top\">"
- + "Frames</a></li>"
- );
checkOutput("pkg1/class-use/UsedClass.html", true,
"that return types with arguments of type"
);
--- a/test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8016675 8026736 8196202
- * @summary Test for window title.
- * @author Bhavesh Patel
- * @library ../../lib
- * @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @build javadoc.tester.*
- * @run main TestWindowTitle
- */
-import javadoc.tester.JavadocTester;
-
-public class TestWindowTitle extends JavadocTester {
-
- public static void main(String... args) throws Exception {
- TestWindowTitle tester = new TestWindowTitle();
- tester.runTests();
- tester.printSummary();
- }
-
- @Test
- public void testJavaScriptChars() {
- // Window title with JavaScript special characters.
- String title = "Testing \"Window 'Title'\" with a \\ backslash and a / "
- + "forward slash and a \u00e8 unicode char also a tab and also a "
- + "\t special character another \u0002 unicode)";
-
- javadoc("-d", "out-js-chars",
- "-windowtitle", title,
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- checkOutput("overview-summary.html", true,
- "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" "
- + "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char "
- + "also a tab and also a \\t special character another \\u0002 unicode))\";"
- );
-
- checkOutput("overview-summary.html", false,
- "parent.document.title=\"Overview (Testing \"Window \'Title\'\" "
- + "with a \\ backslash and a / forward slash and a \u00E8 unicode char "
- + "also a tab and also a \t special character another \u0002 unicode))\";"
- );
- }
-
- @Test
- public void testScriptTag() {
- // Window title with a script tag.
- String title = "Testing script tag in title </title><script>alert(\"Should not pop up\")</script>.";
-
- javadoc("-d", "out-script",
- "-windowtitle", title,
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- checkOutput("overview-summary.html", true,
- "parent.document.title=\"Overview (Testing script tag in title alert"
- + "(\\\"Should not pop up\\\").)\";"
- );
-
- checkOutput("p2/C2.html", true,
- "parent.document.title=\"C2 (Testing script tag in title alert"
- + "(\\\"Should not pop up\\\").)\";"
- );
-
- checkOutput("overview-summary.html", false,
- "parent.document.title=\"Overview (Testing script tag in title </title><script>"
- + "alert(\\\"Should not pop up\\\")</script>.)\";"
- );
-
- checkOutput("p2/C2.html", false,
- "parent.document.title=\"C2 (Testing script tag in title </title><script>"
- + "alert(\\\"Should not pop up\\\")</script>.)\";"
- );
- }
-
- @Test
- public void testHtmlTags() {
- // Window title with other HTML tags.
- String title = "Testing another <p>HTML</p> tag. Another <h1>tag</h1>. A "
- + "<span id=\"testTag\">tag with attributes</span>. <script and </p are not tags.";
-
- javadoc("-d", "out-html-tags",
- "-windowtitle", title,
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- checkOutput("overview-summary.html", true,
- "parent.document.title=\"Overview (Testing another HTML tag. Another tag. A "
- + "tag with attributes. <script and </p are not tags.)\";"
- );
-
- checkOutput("overview-summary.html", false,
- "parent.document.title=\"Overview (Testing another <p>HTML</p> tag. Another "
- + "<h1>tag</h1>. A <span id=\"testTag\">tag with attributes</span>. <script and "
- + "</p are not tags.)\";"
- );
- }
-
- @Test
- public void testHtmlEntities() {
- // Window title using entities.
- String title = "Testing entities <script>alert(\"Should not pop up\")</script>.";
-
- javadoc("-d", "out-html-entities",
- "-windowtitle", title,
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
-
- checkOutput("overview-summary.html", true,
- "parent.document.title=\"Overview (Testing entities <script>alert(\\\"Should "
- + "not pop up\\\")</script>.)\";"
- );
-
- checkOutput("overview-summary.html", false,
- "parent.document.title=\"Overview (Testing entities alert(\\\"Should not pop up\\\").)\";"
- );
- }
-
- @Test
- public void testEmptyTags() {
- // Window title with just empty HTML tags.
- String title = "</title><script></script>";
-
- javadoc("-d", "out-empty-tags",
- "-windowtitle", title,
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
-
- checkOutput("overview-summary.html", true,
- "parent.document.title=\"Overview\";"
- );
-
- checkOutput("overview-summary.html", false,
- "parent.document.title=\"Overview (</title><script></script>)\";"
- );
- }
-
- @Test
- public void testUnicode() {
- //Window title with unicode characters.
- String title = "Testing unicode \u003cscript\u003ealert(\"Should not pop up\")\u003c/script\u003e.";
-
- javadoc("-d", "out-unicode",
- "-windowtitle", title,
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- checkOutput("overview-summary.html", true,
- "parent.document.title=\"Overview (Testing unicode alert(\\\"Should "
- + "not pop up\\\").)\";"
- );
-
- checkOutput("overview-summary.html", false,
- "parent.document.title=\"Overview (Testing unicode <script>alert(\\\"Should not pop up\\\")"
- + "</script>.)\";"
- );
- }
-
- @Test
- public void testEmpty() {
- // An empty window title.
- String title = "";
- javadoc("-d", "out-empty",
- "-windowtitle", title,
- "--frames",
- "-sourcepath", testSrc, "p1", "p2");
- checkExit(Exit.OK);
-
- checkOutput("overview-summary.html", true,
- "parent.document.title=\"Overview\";"
- );
- }
-
- @Test
- public void testDocTitle() {
- // Window title with JavaScript special characters, specified with -doctitle
- String title = "Testing \"Window 'Title'\" with a \\ backslash and a / "
- + "forward slash and a \u00e8 unicode char also a tab and also a "
- + "\t special character another \u0002 unicode)";
-
- javadoc("-d", "out-doctitle",
- "-doctitle", title,
- "--frames",
- "-sourcepath", testSrc,
- "p1", "p2");
- checkExit(Exit.OK);
-
- checkOutput("overview-summary.html", false,
- "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" "
- + "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char "
- + "also a tab and also a \\t special character another \\u0002 unicode)\";"
- );
- }
-}
--- a/test/langtools/jdk/javadoc/doclet/testWindowTitle/p1/C1.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p1;
-
-public class C1 {
-}
--- a/test/langtools/jdk/javadoc/doclet/testWindowTitle/p2/C2.java Tue Apr 02 10:55:20 2019 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package p2;
-
-public class C2 {
-}
--- a/test/langtools/jdk/javadoc/tool/TestScriptInComment.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/jdk/javadoc/tool/TestScriptInComment.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -240,7 +240,6 @@
opts.add(srcDir.getPath());
opts.add("-d");
opts.add(outDir.getPath());
- opts.add("--frames");
if (option.text != null)
opts.add(option.text);
for (String opt: template.getOpts(srcDir)) {
--- a/test/langtools/tools/javac/api/file/SJFM_GetFileObjects.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/tools/javac/api/file/SJFM_GetFileObjects.java Tue Apr 02 10:57:57 2019 +0530
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8059977
+ * @bug 8059977 8220687
* @summary StandardJavaFileManager should support java.nio.file.Path.
* Test getFileObject methods.
* @modules java.compiler
@@ -117,6 +117,40 @@
//----------------------------------------------------------------------------------------------
+ @Test
+ void test_getJavaFileObjectsFromPaths_Iterable(StandardJavaFileManager fm) throws IOException {
+ test_getJavaFileObjectsFromPaths_Iterable(fm, getTestFilePaths());
+ test_getJavaFileObjectsFromPaths_Iterable(fm, getTestZipPaths());
+ }
+
+ /**
+ * Tests the {@code getJavaFileObjectsFromPaths(Iterable)} method for a specific file
+ * manager and a series of paths.
+ *
+ * Note: instances of MyStandardJavaFileManager only support
+ * encapsulating paths for files in the default file system.
+ *
+ * @param fm the file manager to be tested
+ * @param paths the paths to be tested
+ * @throws IOException
+ */
+ void test_getJavaFileObjectsFromPaths_Iterable(StandardJavaFileManager fm, List<Path> paths)
+ throws IOException {
+ boolean expectException = !isGetFileObjectsSupported(fm, paths);
+ try {
+ compile(fm.getJavaFileObjectsFromPaths((Iterable<Path>) paths));
+ if (expectException)
+ error("expected exception not thrown: " + IllegalArgumentException.class.getName());
+ } catch (RuntimeException e) {
+ if (expectException && e instanceof IllegalArgumentException)
+ return;
+ error("unexpected exception thrown: " + e);
+ }
+ }
+
+
+ //----------------------------------------------------------------------------------------------
+
/**
* Compiles a set of files.
*
--- a/test/langtools/tools/javac/defaultMethods/BadClassfile.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/tools/javac/defaultMethods/BadClassfile.java Tue Apr 02 10:57:57 2019 +0530
@@ -79,7 +79,7 @@
clazz.complete();
} catch (BadClassFile f) {
- JCDiagnostic embeddedDiag = (JCDiagnostic) f.diag.getArgs()[1];
+ JCDiagnostic embeddedDiag = (JCDiagnostic) f.getDiagnostic().getArgs()[1];
assertEquals(expected, embeddedDiag.getCode());
assertEquals(Integer.toString(Target.JDK1_7.majorVersion), embeddedDiag.getArgs()[0]);
assertEquals(Integer.toString(Target.JDK1_7.minorVersion), embeddedDiag.getArgs()[1]);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/CountErrorRecompile.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019, Google LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.cant.resolve.location
+// key: compiler.misc.count.error.recompile
+// key: compiler.err.error
+// key: compiler.misc.count.error
+// key: compiler.misc.kindname.class
+// key: compiler.misc.location
+// options: -Xmaxerrs 1
+// run: backdoor
+
+class CountErrorRecompile {
+
+ NoSuchSymbol1 f1;
+ NoSuchSymbol2 f2;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/CountWarnRecompile.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2019, Google LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.warn.raw.class.use
+// key: compiler.misc.count.warn
+// key: compiler.misc.kindname.interface
+// key: compiler.misc.where.description.typevar
+// key: compiler.misc.where.typevar
+// key: compiler.warn.lintOption
+// key: compiler.warn.warning
+// key: compiler.misc.count.warn.recompile
+// options: -Xlint:all -Xmaxwarns 1
+// run: backdoor
+
+import java.util.List;
+
+class CountWarnRecompile {
+
+ List x1;
+ List x2;
+}
--- a/test/langtools/tools/javac/switchexpr/DefiniteAssignment1.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/langtools/tools/javac/switchexpr/DefiniteAssignment1.java Tue Apr 02 10:57:57 2019 +0530
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 8214031
+ * @bug 8214031 8221413
* @summary Verify that definite assignment when true works (legal code)
* @compile --enable-preview --source ${jdk.version} DefiniteAssignment1.java
* @run main/othervm --enable-preview DefiniteAssignment1
@@ -395,6 +395,36 @@
throw new IllegalStateException("Unexpected result.");
}
}
+
+ { //JDK-8221413: definite assignment for implicit default in switch expressions
+ int x;
+ E e = E.A;
+
+ int v = (switch(e) {
+ case A -> x = 0;
+ case B -> x = 0;
+ case C -> x = 0;
+ });
+
+ if (x != 0 || v != 0) {
+ throw new IllegalStateException("Unexpected result.");
+ }
+ }
+
+ { //JDK-8221413: definite assignment for implicit default in switch expressions
+ int x;
+ E e = E.A;
+
+ boolean tA = (switch(e) {
+ case A -> { x = 1; break true; }
+ case B -> { x = 1; break true; }
+ case C -> { x = 1; break true; }
+ }) && x == 1; //x is definitelly assigned here
+
+ if (!tA) {
+ throw new IllegalStateException("Unexpected result.");
+ }
+ }
}
private int id(int v) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.all.out Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,5 @@
+MaxDiagsRecompile.java:28:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol1, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null)
+MaxDiagsRecompile.java:29:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol2, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null)
+MaxDiagsRecompile.java:30:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol3, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null)
+MaxDiagsRecompile.java:31:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol4, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null)
+4 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2019, Google LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * @test
+ * @summary suggest recompiling with -Xmaxerrs
+ * @compile/fail/ref=MaxDiagsRecompile.max1.out -XDrawDiagnostics -Xmaxerrs 1 MaxDiagsRecompile.java
+ * @compile/fail/ref=MaxDiagsRecompile.all.out -XDrawDiagnostics -Xmaxerrs 4 MaxDiagsRecompile.java
+ */
+public class MaxDiagsRecompile {
+
+ NoSuchSymbol1 f1;
+ NoSuchSymbol2 f2;
+ NoSuchSymbol3 f3;
+ NoSuchSymbol4 f4;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/warnings/MaxDiagsRecompile.max1.out Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,3 @@
+MaxDiagsRecompile.java:28:3: compiler.err.cant.resolve.location: kindname.class, NoSuchSymbol1, , , (compiler.misc.location: kindname.class, MaxDiagsRecompile, null)
+1 error
+only showing the first 1 errors, of 4 total; use -Xmaxerrs if you would like to see more
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.all.out Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,5 @@
+MaxWarnsRecompile.java:30:3: compiler.warn.raw.class.use: java.util.List, java.util.List<E>
+MaxWarnsRecompile.java:31:3: compiler.warn.raw.class.use: java.util.List, java.util.List<E>
+MaxWarnsRecompile.java:32:3: compiler.warn.raw.class.use: java.util.List, java.util.List<E>
+MaxWarnsRecompile.java:33:3: compiler.warn.raw.class.use: java.util.List, java.util.List<E>
+4 warnings
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019, Google LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+import java.util.List;
+
+/*
+ * @test
+ * @summary suggest recompiling with -Xmaxwarns
+ * @compile/ref=MaxWarnsRecompile.max1.out -XDrawDiagnostics -Xlint:all -Xmaxwarns 1 MaxWarnsRecompile.java
+ * @compile/ref=MaxWarnsRecompile.all.out -XDrawDiagnostics -Xlint:all -Xmaxwarns 4 MaxWarnsRecompile.java
+ */
+public class MaxWarnsRecompile {
+
+ List x1;
+ List x2;
+ List x3;
+ List x4;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/warnings/MaxWarnsRecompile.max1.out Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,3 @@
+MaxWarnsRecompile.java:30:3: compiler.warn.raw.class.use: java.util.List, java.util.List<E>
+1 warning
+only showing the first 1 warnings, of 4 total; use -Xmaxwarns if you would like to see more
--- a/test/lib/jdk/test/lib/containers/docker/Common.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/lib/jdk/test/lib/containers/docker/Common.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
import jdk.test.lib.containers.docker.DockerRunOptions;
import jdk.test.lib.containers.docker.DockerTestUtils;
import jdk.test.lib.Utils;
@@ -46,7 +47,7 @@
public static void prepareWhiteBox() throws Exception {
Files.copy(Paths.get(new File("whitebox.jar").getAbsolutePath()),
- Paths.get(Utils.TEST_CLASSES, "whitebox.jar"));
+ Paths.get(Utils.TEST_CLASSES, "whitebox.jar"), StandardCopyOption.REPLACE_EXISTING);
}
--- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java Tue Apr 02 10:55:20 2019 +0530
+++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java Tue Apr 02 10:57:57 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import jdk.test.lib.Platform;
import jdk.test.lib.Utils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
@@ -126,11 +125,6 @@
if (Files.exists(buildDir)) {
throw new RuntimeException("The docker build directory already exists: " + buildDir);
}
- // check for the existance of a platform specific docker file as well
- String platformSpecificDockerfile = dockerfile + "-" + Platform.getOsArch();
- if (Files.exists(Paths.get(Utils.TEST_SRC, platformSpecificDockerfile))) {
- dockerfile = platformSpecificDockerfile;
- }
Path jdkSrcDir = Paths.get(Utils.TEST_JDK);
Path jdkDstDir = buildDir.resolve("jdk");
@@ -158,8 +152,9 @@
public static void
buildDockerImage(String imageName, Path dockerfile, Path buildDir) throws Exception {
- // Copy docker file to the build dir
- Files.copy(dockerfile, buildDir.resolve("Dockerfile"));
+ generateDockerFile(buildDir.resolve("Dockerfile"),
+ DockerfileConfig.getBaseImageName(),
+ DockerfileConfig.getBaseImageVersion());
// Build the docker
execute("docker", "build", "--no-cache", "--tag", imageName, buildDir.toString())
@@ -250,6 +245,18 @@
}
+ private static void generateDockerFile(Path dockerfile, String baseImage,
+ String baseImageVersion) throws Exception {
+ String template =
+ "FROM %s:%s\n" +
+ "COPY /jdk /jdk\n" +
+ "ENV JAVA_HOME=/jdk\n" +
+ "CMD [\"/bin/bash\"]\n";
+ String dockerFileStr = String.format(template, baseImage, baseImageVersion);
+ Files.writeString(dockerfile, dockerFileStr);
+ }
+
+
private static class CopyFileVisitor extends SimpleFileVisitor<Path> {
private final Path src;
private final Path dst;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.test.lib.containers.docker;
+
+import jdk.test.lib.Platform;
+
+// Use the following properties to specify docker base image at test execution time:
+// Image name: jdk.test.docker.image.name
+// Image version: jdk.test.docker.image.version
+// Usage:
+// jtreg -Djdk.test.docker.image.name=<BASE_IMAGE_NAME> -Djdk.test.docker.image.version=<BASE_IMAGE_VERSION> test/hotspot/jtreg/runtime/containers/docker/
+// E.g.:
+// jtreg -Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest test/hotspot/jtreg/runtime/containers/docker/
+// Using make:
+// make test TEST="test/hotspot/jtreg/runtime/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
+// Note: base image version should not be an empty string. Use "latest" to get the latest version.
+
+public class DockerfileConfig {
+ static String getBaseImageName() {
+ String name = System.getProperty("jdk.test.docker.image.name");
+ if (name != null) {
+ System.out.println("DockerfileConfig: using custom image name: " + name);
+ return name;
+ }
+
+ switch (Platform.getOsArch()) {
+ case "aarch64":
+ return "aarch64/ubuntu";
+ case "ppc64le":
+ return "ppc64le/ubuntu";
+ case "s390x":
+ return "s390x/ubuntu";
+ default:
+ return "oraclelinux";
+ }
+ }
+
+ static String getBaseImageVersion() {
+ String version = System.getProperty("jdk.test.docker.image.version");
+ if (version != null) {
+ System.out.println("DockerfileConfig: using custom image version: " + version);
+ return version;
+ }
+
+ switch (Platform.getOsArch()) {
+ case "aarch64":
+ case "ppc64le":
+ case "s390x":
+ return "latest";
+ default:
+ return "7.6";
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/net/URIBuilder.java Tue Apr 02 10:57:57 2019 +0530
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Google and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.test.lib.net;
+
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+public class URIBuilder {
+
+ public static URIBuilder newBuilder() {
+ return new URIBuilder();
+ }
+
+ private String scheme;
+ private String userInfo;
+ private String host;
+ private int port;
+ private String path;
+ private String query;
+ private String fragment;
+
+ private URIBuilder() {}
+
+ public URIBuilder scheme(String scheme) {
+ this.scheme = scheme;
+ return this;
+ }
+
+ public URIBuilder userInfo(String userInfo) {
+ this.userInfo = userInfo;
+ return this;
+ }
+
+ public URIBuilder host(String host) {
+ this.host = host;
+ return this;
+ }
+
+ public URIBuilder loopback() {
+ return host(InetAddress.getLoopbackAddress().getHostAddress());
+ }
+
+ public URIBuilder port(int port) {
+ this.port = port;
+ return this;
+ }
+
+ public URIBuilder path(String path) {
+ this.path = path;
+ return this;
+ }
+
+ public URIBuilder query(String query) {
+ this.query = query;
+ return this;
+ }
+
+ public URIBuilder fragment(String fragment) {
+ this.fragment = fragment;
+ return this;
+ }
+
+ public URI build() throws URISyntaxException {
+ return new URI(scheme, userInfo, host, port, path, query, fragment);
+ }
+
+ public URI buildUnchecked() {
+ try {
+ return build();
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ public URL toURL() throws URISyntaxException, MalformedURLException {
+ return build().toURL();
+ }
+
+ public URL toURLUnchecked() {
+ try {
+ return toURL();
+ } catch (URISyntaxException | MalformedURLException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+}