# HG changeset patch # User herrick # Date 1571853677 14400 # Node ID 015949faea55f747bf971e22bda066202dbbd270 # Parent bc43733cd5cfe72d89ba2eb91c869dd4fdcfee57# Parent 1f7f707c1aa9fe2db1fd2748e1051ed703b1d211 Merge diff -r bc43733cd5cf -r 015949faea55 .hgtags --- a/.hgtags Wed Oct 23 13:53:41 2019 -0400 +++ b/.hgtags Wed Oct 23 14:01:17 2019 -0400 @@ -591,3 +591,4 @@ d29f0181ba424a95d881aba5eabf2e393abcc70f jdk-14+16 5c83830390baafb76a1fbe33443c57620bd45fb9 jdk-14+17 e84d8379815ba0d3e50fb096d28c25894cb50b8c jdk-14+18 +9b67dd88a9313e982ec5f710a7747161bc8f0c23 jdk-14+19 diff -r bc43733cd5cf -r 015949faea55 make/Bundles.gmk --- a/make/Bundles.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/Bundles.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -50,6 +50,7 @@ # files or directories may contain spaces. # BASE_DIRS : Base directories for the root dir in the bundle. # SUBDIR : Optional name of root dir in bundle. +# OUTPUTDIR : Optionally override output dir SetupBundleFile = $(NamedParamsMacroTemplate) define SetupBundleFileBody @@ -70,8 +71,11 @@ $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) - $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) + $$(call SetIfEmpty, $1_OUTPUTDIR, $$(BUNDLES_OUTPUTDIR)) + + $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) $$(call MakeTargetDir) + $$(call LogWarn, Creating $$($1_BUNDLE_NAME)) # If any of the files contain a space in the file name, FindFiles # will have replaced it with ?. Tar does not accept that so need to # switch it back. @@ -137,7 +141,7 @@ endif endif - $1 += $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME) + $1 += $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME) endef @@ -165,7 +169,7 @@ ################################################################################ -ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), ) +ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), ) SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map diff -r bc43733cd5cf -r 015949faea55 make/CompileInterimLangtools.gmk --- a/make/CompileInterimLangtools.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/CompileInterimLangtools.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -49,6 +49,13 @@ TARGETS += $(patsubst %, $(BUILDTOOLS_OUTPUTDIR)/gensrc/%/module-info.java, \ $(INTERIM_LANGTOOLS_MODULES)) +$(eval $(call SetupCopyFiles, COPY_PREVIEW_FEATURES, \ + FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/PreviewFeature.java, \ + DEST := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/, \ +)) + +TARGETS += $(COPY_PREVIEW_FEATURES) + ################################################################################ # Setup the rules to build interim langtools, which is compiled by the boot # javac and can be run on the boot jdk. This will be used to compile the rest of @@ -72,13 +79,15 @@ BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \ ADD_JAVAC_FLAGS := --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \ $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \ + --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \ + --add-exports java.base/jdk.internal=jdk.compiler.interim \ -Xlint:-module, \ )) $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \ $$(INTERIM_LANGTOOLS_BASE_MODULES), $$(call FindTransitiveDepsForModule, $1))) - $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) + $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) $(COPY_PREVIEW_FEATURES) TARGETS += $$(BUILD_$1.interim) endef diff -r bc43733cd5cf -r 015949faea55 make/Docs.gmk --- a/make/Docs.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/Docs.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -95,6 +95,7 @@ -tag see \ -taglet build.tools.taglet.ExtLink \ -taglet build.tools.taglet.Incubating \ + -taglet build.tools.taglet.Preview \ -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ $(CUSTOM_JAVADOC_TAGS) \ # @@ -191,26 +192,26 @@ ################################################################################ # Functions -# Helper function for creating a png file from a dot file generated by the +# Helper function for creating a svg file from a dot file generated by the # GenGraphs tool. # param 1: SetupJavadocGeneration namespace ($1) # param 2: module name # -define setup_gengraph_dot_to_png +define setup_gengraph_dot_to_svg $1_$2_DOT_SRC := $$($1_GENGRAPHS_DIR)/$2.dot - $1_$2_PNG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.png + $1_$2_SVG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.svg - # For each module needing a graph, create a png file from the dot file + # For each module needing a graph, create a svg file from the dot file # generated by the GenGraphs tool and store it in the target dir. - $$(eval $$(call SetupExecute, gengraphs_png_$1_$2, \ + $$(eval $$(call SetupExecute, gengraphs_svg_$1_$2, \ INFO := Running dot for module graphs for $2, \ DEPS := $$(gengraphs_$1_TARGET), \ - OUTPUT_FILE := $$($1_$2_PNG_TARGET), \ + OUTPUT_FILE := $$($1_$2_SVG_TARGET), \ SUPPORT_DIR := $$($1_GENGRAPHS_DIR), \ - COMMAND := $$(DOT) -Tpng -o $$($1_$2_PNG_TARGET) $$($1_$2_DOT_SRC), \ + COMMAND := $$(DOT) -Tsvg -o $$($1_$2_SVG_TARGET) $$($1_$2_DOT_SRC), \ )) - $1_MODULEGRAPH_TARGETS += $$($1_$2_PNG_TARGET) + $1_MODULEGRAPH_TARGETS += $$($1_$2_SVG_TARGET) endef # Helper function to create the overview.html file to use with the -overview @@ -281,7 +282,7 @@ ifeq ($$(ENABLE_FULL_DOCS), true) # Tell the ModuleGraph taglet to generate html links to soon-to-be-created - # png files with module graphs. + # svg files with module graphs. $1_JAVA_ARGS += -DenableModuleGraph=true endif @@ -361,8 +362,8 @@ $1_JAVADOC_TARGETS := $$(javadoc_$1_TARGET) ifeq ($$(ENABLE_FULL_DOCS), true) - # We have asked ModuleGraph to generate links to png files. Now we must - # produce the png files. + # We have asked ModuleGraph to generate links to svg files. Now we must + # produce the svg files. # Locate which modules has the @moduleGraph tag in their module-info.java $1_MODULES_NEEDING_GRAPH := $$(strip $$(foreach m, $$($1_ALL_MODULES), \ @@ -387,11 +388,11 @@ --dot-attributes $$(GENGRAPHS_PROPS), \ )) - # For each module needing a graph, create a png file from the dot file + # For each module needing a graph, create a svg file from the dot file # generated by the GenGraphs tool and store it in the target dir. # They will depend on gengraphs_$1_TARGET, and will be added to $1. $$(foreach m, $$($1_MODULES_NEEDING_GRAPH), \ - $$(eval $$(call setup_gengraph_dot_to_png,$1,$$m)) \ + $$(eval $$(call setup_gengraph_dot_to_svg,$1,$$m)) \ ) endif endef diff -r bc43733cd5cf -r 015949faea55 make/RunTests.gmk --- a/make/RunTests.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/RunTests.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -185,13 +185,13 @@ $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \ $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \ ) - $$(call ExecuteWithLog, $$@.check, \ + $$(call ExecuteWithLog, $$@.check, ( \ $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \ $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \ -XX:+PrintAOT -XX:+UseAOTStrictLoading \ -XX:AOTLibrary=$$@ -version \ > $$@.verify-aot \ - ) + )) $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB) @@ -593,7 +593,7 @@ $$(call LogWarn) $$(call LogWarn, Running test '$$($1_TEST)') $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) - $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \ + $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, ( \ $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \ -jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \ --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \ @@ -602,7 +602,7 @@ > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \ && $$(ECHO) $$$$? > $$($1_EXITCODE) \ || $$(ECHO) $$$$? > $$($1_EXITCODE) \ - ) + )) $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt @@ -705,7 +705,7 @@ $$(call LogWarn) $$(call LogWarn, Running test '$$($1_TEST)') $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) - $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, \ + $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, ( \ $$(FIXPATH) $$($1_MICRO_TEST_JDK)/bin/java $$($1_MICRO_JAVA_OPTIONS) \ -jar $$($1_MICRO_BENCHMARKS_JAR) \ $$($1_MICRO_ITER) $$($1_MICRO_FORK) $$($1_MICRO_TIME) \ @@ -715,7 +715,7 @@ > >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \ && $$(ECHO) $$$$? > $$($1_EXITCODE) \ || $$(ECHO) $$$$? > $$($1_EXITCODE) \ - ) + )) $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/micro.txt @@ -928,7 +928,7 @@ $$(call LogWarn) $$(call LogWarn, Running test '$$($1_TEST)') $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) - $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \ + $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \ $$(COV_ENVIRONMENT) \ $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \ -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \ @@ -943,7 +943,7 @@ $$($1_TEST_NAME) \ && $$(ECHO) $$$$? > $$($1_EXITCODE) \ || $$(ECHO) $$$$? > $$($1_EXITCODE) \ - ) + )) $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt @@ -1019,12 +1019,12 @@ $$(call LogWarn) $$(call LogWarn, Running test '$$($1_TEST)') $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) - $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, \ + $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, ( \ $$($1_TEST_COMMAND_LINE) \ > >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \ && $$(ECHO) $$$$? > $$($1_EXITCODE) \ || $$(ECHO) $$$$? > $$($1_EXITCODE) \ - ) + )) $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt diff -r bc43733cd5cf -r 015949faea55 make/autoconf/basics.m4 --- a/make/autoconf/basics.m4 Wed Oct 23 13:53:41 2019 -0400 +++ b/make/autoconf/basics.m4 Wed Oct 23 14:01:17 2019 -0400 @@ -489,31 +489,43 @@ # for unknown variables in the end. CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var" + tool_override=[$]$1 + AC_MSG_NOTICE([User supplied override $1="$tool_override"]) + # Check if we try to supply an empty value - if test "x[$]$1" = x; then - AC_MSG_NOTICE([Setting user supplied tool $1= (no value)]) + if test "x$tool_override" = x; then AC_MSG_CHECKING([for $1]) AC_MSG_RESULT([disabled]) else + # Split up override in command part and argument part + tool_and_args=($tool_override) + [ tool_command=${tool_and_args[0]} ] + [ unset 'tool_and_args[0]' ] + [ tool_args=${tool_and_args[@]} ] + # Check if the provided tool contains a complete path. - tool_specified="[$]$1" - tool_basename="${tool_specified##*/}" - if test "x$tool_basename" = "x$tool_specified"; then + tool_basename="${tool_command##*/}" + if test "x$tool_basename" = "x$tool_command"; then # A command without a complete path is provided, search $PATH. - AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename]) + AC_MSG_NOTICE([Will search for user supplied tool "$tool_basename"]) AC_PATH_PROG($1, $tool_basename) if test "x[$]$1" = x; then - AC_MSG_ERROR([User supplied tool $tool_basename could not be found]) + AC_MSG_ERROR([User supplied tool $1="$tool_basename" could not be found]) fi else # Otherwise we believe it is a complete path. Use it as it is. - AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified]) - AC_MSG_CHECKING([for $1]) - if test ! -x "$tool_specified"; then + AC_MSG_NOTICE([Will use user supplied tool "$tool_command"]) + AC_MSG_CHECKING([for $tool_command]) + if test ! -x "$tool_command"; then AC_MSG_RESULT([not found]) - AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable]) + AC_MSG_ERROR([User supplied tool $1="$tool_command" does not exist or is not executable]) fi - AC_MSG_RESULT([$tool_specified]) + $1="$tool_command" + AC_MSG_RESULT([found]) + fi + if test "x$tool_args" != x; then + # If we got arguments, re-append them to the command after the fixup. + $1="[$]$1 $tool_args" fi fi fi diff -r bc43733cd5cf -r 015949faea55 make/autoconf/flags-cflags.m4 --- a/make/autoconf/flags-cflags.m4 Wed Oct 23 13:53:41 2019 -0400 +++ b/make/autoconf/flags-cflags.m4 Wed Oct 23 14:01:17 2019 -0400 @@ -170,11 +170,11 @@ DISABLE_WARNING_PREFIX="-erroff=" CFLAGS_WARNINGS_ARE_ERRORS="-errwarn=%all" - WARNINGS_ENABLE_ALL_CFLAGS="-v" - WARNINGS_ENABLE_ALL_CXXFLAGS="+w" + WARNINGS_ENABLE_ALL_CFLAGS="-v -fd -xtransition" + WARNINGS_ENABLE_ALL_CXXFLAGS="+w +w2" - DISABLED_WARNINGS_C="" - DISABLED_WARNINGS_CXX="" + DISABLED_WARNINGS_C="E_OLD_STYLE_FUNC_DECL E_OLD_STYLE_FUNC_DEF E_SEMANTICS_OF_OP_CHG_IN_ANSI_C E_NO_REPLACEMENT_IN_STRING E_DECLARATION_IN_CODE" + DISABLED_WARNINGS_CXX="inllargeuse inllargeint notused wemptydecl notemsource" ;; gcc) diff -r bc43733cd5cf -r 015949faea55 make/autoconf/jdk-options.m4 --- a/make/autoconf/jdk-options.m4 Wed Oct 23 13:53:41 2019 -0400 +++ b/make/autoconf/jdk-options.m4 Wed Oct 23 14:01:17 2019 -0400 @@ -599,7 +599,14 @@ AC_MSG_RESULT([yes, forced]) ENABLE_GENERATE_CLASSLIST="true" if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then - AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS]) + if test "x$ENABLE_CDS" = "xfalse"; then + # In GenerateLinkOptData.gmk, DumpLoadedClassList is used to generate the + # classlist file. It never will work in this case since the VM will report + # an error for DumpLoadedClassList when CDS is disabled. + AC_MSG_ERROR([Generation of classlist is not possible with enable-cds=false]) + else + AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS]) + fi fi elif test "x$enable_generate_classlist" = "xno"; then AC_MSG_RESULT([no, forced]) diff -r bc43733cd5cf -r 015949faea55 make/common/MakeBase.gmk --- a/make/common/MakeBase.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/common/MakeBase.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -564,8 +564,8 @@ # Param 1 - The path to base the name of the log file / command line file on # Param 2 - The command to run ExecuteWithLog = \ - $(call LogCmdlines, Exececuting: [$(strip $2)]) \ - $(call MakeDir, $(dir $(strip $1))) \ + $(call LogCmdlines, Executing: [$(strip $2)]) \ + $(call MakeDir, $(dir $(strip $1)) $(MAKESUPPORT_OUTPUTDIR)/failure-logs) \ $(call WriteFile, $2, $(strip $1).cmdline) \ ( $(RM) $(strip $1).log && $(strip $2) > >($(TEE) -a $(strip $1).log) 2> >($(TEE) -a $(strip $1).log >&2) || \ ( exitcode=$(DOLLAR)? && \ diff -r bc43733cd5cf -r 015949faea55 make/common/TestFilesCompilation.gmk --- a/make/common/TestFilesCompilation.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/common/TestFilesCompilation.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -98,7 +98,7 @@ DISABLED_WARNINGS_gcc := format undef unused-function unused-value, \ DISABLED_WARNINGS_clang := undef format-nonliteral \ missing-field-initializers sometimes-uninitialized, \ - DISABLED_WARNINGS_CXX_solstudio := wvarhidenmem, \ + DISABLED_WARNINGS_CXX_solstudio := wvarhidenmem doubunder, \ LIBS := $$($1_LIBS_$$(name)), \ TOOLCHAIN := $(if $$(filter %.cpp, $$(file)), TOOLCHAIN_LINK_CXX, TOOLCHAIN_DEFAULT), \ OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)),$$($1_OPTIMIZATION_$$(name)),LOW), \ diff -r bc43733cd5cf -r 015949faea55 make/conf/jib-profiles.js --- a/make/conf/jib-profiles.js Wed Oct 23 13:53:41 2019 -0400 +++ b/make/conf/jib-profiles.js Wed Oct 23 14:01:17 2019 -0400 @@ -839,13 +839,17 @@ if (testedProfile == null) { testedProfile = input.build_os + "-" + input.build_cpu; } - var testedProfileJDK = testedProfile + ".jdk"; - var testedProfileTest = "" - if (testedProfile.endsWith("-jcov")) { - testedProfileTest = testedProfile.substring(0, testedProfile.length - "-jcov".length) + ".test"; + var testedProfileJdk = testedProfile + ".jdk"; + // Make it possible to use the test image from a different profile + var testImageProfile; + if (input.testImageProfile != null) { + testImageProfile = input.testImageProfile; + } else if (testedProfile.endsWith("-jcov")) { + testImageProfile = testedProfile.substring(0, testedProfile.length - "-jcov".length); } else { - testedProfileTest = testedProfile + ".test"; + testImageProfile = testedProfile; } + var testedProfileTest = testImageProfile + ".test" var testOnlyMake = [ "run-test-prebuilt", "LOG_CMDLINES=true", "JTREG_VERBOSE=fail,error,time" ]; if (testedProfile.endsWith("-gcov")) { testOnlyMake = concat(testOnlyMake, "GCOV_ENABLED=true") @@ -855,14 +859,14 @@ target_os: input.build_os, target_cpu: input.build_cpu, dependencies: [ - "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJDK, + "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJdk, testedProfileTest ], src: "src.conf", make_args: testOnlyMake, environment: { "BOOT_JDK": common.boot_jdk_home, - "JDK_IMAGE_DIR": input.get(testedProfileJDK, "home_path"), + "JDK_IMAGE_DIR": input.get(testedProfileJdk, "home_path"), "TEST_IMAGE_DIR": input.get(testedProfileTest, "home_path") }, labels: "test" @@ -871,10 +875,10 @@ // If actually running the run-test-prebuilt profile, verify that the input // variable is valid and if so, add the appropriate target_* values from - // the tested profile. + // the tested profile. Use testImageProfile value as backup. if (input.profile == "run-test-prebuilt") { - if (profiles[testedProfile] == null) { - error("testedProfile is not defined: " + testedProfile); + if (profiles[testedProfile] == null && profiles[testImageProfile] == null) { + error("testedProfile is not defined: " + testedProfile + " " + testImageProfile); } } if (profiles[testedProfile] != null) { @@ -882,6 +886,11 @@ = profiles[testedProfile]["target_os"]; testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"] = profiles[testedProfile]["target_cpu"]; + } else if (profiles[testImageProfile] != null) { + testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"] + = profiles[testImageProfile]["target_os"]; + testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"] + = profiles[testImageProfile]["target_cpu"]; } profiles = concatObjects(profiles, testOnlyProfilesPrebuilt); @@ -1346,3 +1355,8 @@ || (input.build_os == "linux" && java.lang.System.getProperty("os.version").contains("Microsoft"))); } + +var error = function (s) { + java.lang.System.err.println("[ERROR] " + s); + exit(1); +}; diff -r bc43733cd5cf -r 015949faea55 make/hotspot/gensrc/GensrcAdlc.gmk --- a/make/hotspot/gensrc/GensrcAdlc.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/hotspot/gensrc/GensrcAdlc.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -75,7 +75,6 @@ OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/adlc, \ DEBUG_SYMBOLS := false, \ DISABLED_WARNINGS_clang := tautological-compare, \ - DISABLED_WARNINGS_solstudio := notemsource, \ DEFINE_THIS_FILE := false, \ )) diff -r bc43733cd5cf -r 015949faea55 make/hotspot/lib/CompileJvm.gmk --- a/make/hotspot/lib/CompileJvm.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/hotspot/lib/CompileJvm.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -78,14 +78,14 @@ ################################################################################ # Disabled warnings -DISABLED_WARNINGS_gcc := extra parentheses comment unknown-pragmas address \ +DISABLED_WARNINGS_gcc := parentheses comment unknown-pragmas address \ delete-non-virtual-dtor char-subscripts array-bounds int-in-bool-context \ ignored-qualifiers missing-field-initializers implicit-fallthrough \ empty-body strict-overflow sequence-point maybe-uninitialized \ - misleading-indentation + misleading-indentation cast-function-type ifeq ($(call check-jvm-feature, zero), true) - DISABLED_WARNINGS_gcc += return-type switch + DISABLED_WARNINGS_gcc += return-type switch clobbered endif DISABLED_WARNINGS_clang := tautological-compare \ diff -r bc43733cd5cf -r 015949faea55 make/hotspot/symbols/symbols-unix --- a/make/hotspot/symbols/symbols-unix Wed Oct 23 13:53:41 2019 -0400 +++ b/make/hotspot/symbols/symbols-unix Wed Oct 23 14:01:17 2019 -0400 @@ -97,6 +97,7 @@ JVM_GetDeclaredClasses JVM_GetDeclaringClass JVM_GetEnclosingMethodInfo +JVM_GetExtendedNPEMessage JVM_GetFieldIxModifiers JVM_GetFieldTypeAnnotations JVM_GetInheritedAccessControlContext diff -r bc43733cd5cf -r 015949faea55 make/jdk/src/classes/build/tools/taglet/ModuleGraph.java --- a/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java Wed Oct 23 13:53:41 2019 -0400 +++ b/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java Wed Oct 23 14:01:17 2019 -0400 @@ -64,7 +64,7 @@ } String moduleName = ((ModuleElement) element).getQualifiedName().toString(); - String imageFile = "module-graph.png"; + String imageFile = "module-graph.svg"; int thumbnailHeight = -1; String hoverImage = ""; if (!moduleName.equals("java.base")) { diff -r bc43733cd5cf -r 015949faea55 make/jdk/src/classes/build/tools/taglet/Preview.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/jdk/src/classes/build/tools/taglet/Preview.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,79 @@ +/* + * 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. + */ + +package build.tools.taglet; + +import java.util.Arrays; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; +import java.util.function.Predicate; +import javax.lang.model.element.Element; +import com.sun.source.doctree.DocTree; +import com.sun.source.doctree.TextTree; +import com.sun.source.doctree.UnknownInlineTagTree; +import jdk.javadoc.doclet.Taglet; +import static jdk.javadoc.doclet.Taglet.Location.*; + +/** + * An block tag to insert a standard warning about a preview API. + */ +public class Preview implements Taglet { + + /** Returns the set of locations in which a taglet may be used. */ + @Override + public Set getAllowedLocations() { + return EnumSet.of(MODULE, PACKAGE, TYPE, CONSTRUCTOR, METHOD, FIELD); + } + + @Override + public boolean isInlineTag() { + return true; + } + + @Override + public String getName() { + return "preview"; + } + + @Override + public String toString(List tags, Element elem) { + UnknownInlineTagTree previewTag = (UnknownInlineTagTree) tags.get(0); + List previewContent = previewTag.getContent(); + String previewText = ((TextTree) previewContent.get(0)).getBody(); + String[] summaryAndDetails = previewText.split("\n\r?\n\r?"); + String summary = summaryAndDetails[0]; + String details = summaryAndDetails.length > 1 ? summaryAndDetails[1] : summaryAndDetails[0]; + StackTraceElement[] stackTrace = new Exception().getStackTrace(); + Predicate isSummary = + el -> el.getClassName().endsWith("HtmlDocletWriter") && + el.getMethodName().equals("addSummaryComment"); + if (Arrays.stream(stackTrace).anyMatch(isSummary)) { + return "
" + summary + "

"; + } + return "
" + details + "

"; + } +} + diff -r bc43733cd5cf -r 015949faea55 make/launcher/Launcher-jdk.pack.gmk --- a/make/launcher/Launcher-jdk.pack.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/launcher/Launcher-jdk.pack.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -87,6 +87,7 @@ CFLAGS_solaris := -KPIC, \ CFLAGS_macosx := -fPIC, \ DISABLED_WARNINGS_clang := format-nonliteral, \ + DISABLED_WARNINGS_solstudio := wunreachable, \ LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \ diff -r bc43733cd5cf -r 015949faea55 make/lib/Awt2dLibraries.gmk --- a/make/lib/Awt2dLibraries.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/lib/Awt2dLibraries.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -229,7 +229,6 @@ format-nonliteral parentheses unused-value unused-function, \ DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer \ sign-compare format-nonliteral, \ - DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ DISABLED_WARNINGS_microsoft := 4244 4267 4996, \ ASFLAGS := $(LIBAWT_ASFLAGS), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -339,8 +338,8 @@ implicit-fallthrough undef unused-function, \ DISABLED_WARNINGS_clang := parentheses format undef \ logical-op-parentheses format-nonliteral int-conversion, \ - DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \ - E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \ + DISABLED_WARNINGS_solstudio := E_ASSIGNMENT_TYPE_MISMATCH \ + E_NON_CONST_INIT, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -L$(INSTALL_LIBRARIES_HERE), \ @@ -620,7 +619,8 @@ E_ENUM_VAL_OVERFLOWS_INT_MAX, \ DISABLED_WARNINGS_CXX_solstudio := \ truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \ - hidevf w_novirtualdescr arrowrtn2 refmemnoconstr_aggr unknownpragma, \ + hidevf w_novirtualdescr arrowrtn2 refmemnoconstr_aggr unknownpragma \ + doubunder wunreachable, \ DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101 4068 4805 4138, \ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \ $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \ @@ -848,8 +848,7 @@ maybe-uninitialized shift-negative-value implicit-fallthrough \ unused-function, \ DISABLED_WARNINGS_clang := incompatible-pointer-types sign-compare, \ - DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \ - E_STATEMENT_NOT_REACHED, \ + DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ DISABLED_WARNINGS_microsoft := 4018 4244 4267, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff -r bc43733cd5cf -r 015949faea55 make/lib/CoreLibraries.gmk --- a/make/lib/CoreLibraries.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/lib/CoreLibraries.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -212,9 +212,6 @@ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ DISABLED_WARNINGS_gcc := unused-function, \ DISABLED_WARNINGS_clang := sometimes-uninitialized format-nonliteral, \ - DISABLED_WARNINGS_solstudio := \ - E_ASM_DISABLES_OPTIMIZATION \ - E_STATEMENT_NOT_REACHED, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS_unix := $(LIBZ_LIBS), \ diff -r bc43733cd5cf -r 015949faea55 make/lib/Lib-jdk.hotspot.agent.gmk --- a/make/lib/Lib-jdk.hotspot.agent.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/lib/Lib-jdk.hotspot.agent.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -61,7 +61,7 @@ DISABLED_WARNINGS_microsoft := 4267, \ DISABLED_WARNINGS_gcc := sign-compare pointer-arith, \ DISABLED_WARNINGS_clang := sign-compare pointer-arith format-nonliteral, \ - DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \ + DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma doubunder, \ CFLAGS := $(CFLAGS_JDKLIB) $(SA_CFLAGS), \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \ EXTRA_SRC := $(LIBSA_EXTRA_SRC), \ diff -r bc43733cd5cf -r 015949faea55 make/lib/Lib-jdk.pack.gmk --- a/make/lib/Lib-jdk.pack.gmk Wed Oct 23 13:53:41 2019 -0400 +++ b/make/lib/Lib-jdk.pack.gmk Wed Oct 23 14:01:17 2019 -0400 @@ -38,6 +38,7 @@ EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \ DISABLED_WARNINGS_gcc := implicit-fallthrough, \ DISABLED_WARNINGS_clang := format-nonliteral, \ + DISABLED_WARNINGS_solstudio := wunreachable, \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \ diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -58,7 +58,7 @@ Address gc_state(rthread, in_bytes(ShenandoahThreadLocalData::gc_state_offset())); __ ldrb(rscratch1, gc_state); if (dest_uninitialized) { - __ tbz(rscratch2, ShenandoahHeap::HAS_FORWARDED_BITPOS, done); + __ tbz(rscratch1, ShenandoahHeap::HAS_FORWARDED_BITPOS, done); } else { __ mov(rscratch2, ShenandoahHeap::HAS_FORWARDED | ShenandoahHeap::MARKING); __ tst(rscratch1, rscratch2); @@ -262,7 +262,7 @@ __ leave(); } -void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler* masm, Register dst, Register tmp) { +void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler* masm, Register dst, Address load_addr) { if (!ShenandoahLoadRefBarrier) { return; } @@ -272,6 +272,8 @@ Label is_null; Label done; + __ block_comment("load_reference_barrier_native { "); + __ cbz(dst, is_null); __ enter(); @@ -285,6 +287,7 @@ __ mov(rscratch2, dst); __ push_call_clobbered_registers(); __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native)); + __ lea(r1, load_addr); __ mov(r0, rscratch2); __ blr(lr); __ mov(rscratch2, r0); @@ -294,6 +297,7 @@ __ bind(done); __ leave(); __ bind(is_null); + __ block_comment("} load_reference_barrier_native"); } void ShenandoahBarrierSetAssembler::storeval_barrier(MacroAssembler* masm, Register dst, Register tmp) { @@ -327,20 +331,32 @@ bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0; bool on_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0; bool on_reference = on_weak || on_phantom; - bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0; + bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode(); + bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0 || is_traversal_mode; + + Register result_dst = dst; + + if (on_oop) { + // We want to preserve src + if (dst == src.base() || dst == src.index()) { + dst = rscratch1; + } + assert_different_registers(dst, src.base(), src.index()); + } BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread); if (on_oop) { - if (not_in_heap) { - if (ShenandoahHeap::heap()->is_traversal_mode()) { - load_reference_barrier(masm, dst, tmp1); - keep_alive = true; - } else { - load_reference_barrier_native(masm, dst, tmp1); - } - } else { - load_reference_barrier(masm, dst, tmp1); - } + if (not_in_heap && !is_traversal_mode) { + load_reference_barrier_native(masm, dst, src); + } else { + load_reference_barrier(masm, dst, tmp1); + } + + if (dst != result_dst) { + __ mov(result_dst, dst); + dst = result_dst; + } + if (ShenandoahKeepAliveBarrier && on_reference && keep_alive) { __ enter(); satb_write_barrier_pre(masm /* masm */, diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -58,7 +58,7 @@ void resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp = noreg); void load_reference_barrier(MacroAssembler* masm, Register dst, Register tmp); void load_reference_barrier_not_null(MacroAssembler* masm, Register dst, Register tmp); - void load_reference_barrier_native(MacroAssembler* masm, Register dst, Register tmp); + void load_reference_barrier_native(MacroAssembler* masm, Register dst, Address load_addr); address generate_shenandoah_lrb(StubCodeGenerator* cgen); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/ppc/assembler_ppc.hpp --- a/src/hotspot/cpu/ppc/assembler_ppc.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -444,6 +444,9 @@ FDIV_OPCODE = (63u << OPCODE_SHIFT | 18u << 1), FDIVS_OPCODE = (59u << OPCODE_SHIFT | 18u << 1), FMR_OPCODE = (63u << OPCODE_SHIFT | 72u << 1), + FRIN_OPCODE = (63u << OPCODE_SHIFT | 392u << 1), + FRIP_OPCODE = (63u << OPCODE_SHIFT | 456u << 1), + FRIM_OPCODE = (63u << OPCODE_SHIFT | 488u << 1), // These are special Power6 opcodes, reused for "lfdepx" and "stfdepx" // on Power7. Do not use. // MFFGPR_OPCODE = (31u << OPCODE_SHIFT | 607u << 1), @@ -545,6 +548,9 @@ XVMSUBADP_OPCODE=(60u << OPCODE_SHIFT | 113u << 3), XVNMSUBASP_OPCODE=(60u<< OPCODE_SHIFT | 209u << 3), XVNMSUBADP_OPCODE=(60u<< OPCODE_SHIFT | 241u << 3), + XVRDPI_OPCODE = (60u << OPCODE_SHIFT | 201u << 2), + XVRDPIM_OPCODE = (60u << OPCODE_SHIFT | 249u << 2), + XVRDPIP_OPCODE = (60u << OPCODE_SHIFT | 233u << 2), // Deliver A Random Number (introduced with POWER9) DARN_OPCODE = (31u << OPCODE_SHIFT | 755u << 1), @@ -1981,6 +1987,10 @@ inline void fmr( FloatRegister d, FloatRegister b); inline void fmr_( FloatRegister d, FloatRegister b); + inline void frin( FloatRegister d, FloatRegister b); + inline void frip( FloatRegister d, FloatRegister b); + inline void frim( FloatRegister d, FloatRegister b); + // inline void mffgpr( FloatRegister d, Register b); // inline void mftgpr( Register d, FloatRegister b); inline void cmpb( Register a, Register s, Register b); @@ -2241,6 +2251,9 @@ inline void xvmsubadp(VectorSRegister d, VectorSRegister a, VectorSRegister b); inline void xvnmsubasp(VectorSRegister d, VectorSRegister a, VectorSRegister b); inline void xvnmsubadp(VectorSRegister d, VectorSRegister a, VectorSRegister b); + inline void xvrdpi( VectorSRegister d, VectorSRegister b); + inline void xvrdpim( VectorSRegister d, VectorSRegister b); + inline void xvrdpip( VectorSRegister d, VectorSRegister b); // VSX Extended Mnemonics inline void xxspltd( VectorSRegister d, VectorSRegister a, int x); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/ppc/assembler_ppc.inline.hpp --- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -675,6 +675,10 @@ inline void Assembler::fmr( FloatRegister d, FloatRegister b) { emit_int32( FMR_OPCODE | frt(d) | frb(b) | rc(0)); } inline void Assembler::fmr_(FloatRegister d, FloatRegister b) { emit_int32( FMR_OPCODE | frt(d) | frb(b) | rc(1)); } +inline void Assembler::frin( FloatRegister d, FloatRegister b) { emit_int32( FRIN_OPCODE | frt(d) | frb(b) | rc(0)); } +inline void Assembler::frip( FloatRegister d, FloatRegister b) { emit_int32( FRIP_OPCODE | frt(d) | frb(b) | rc(0)); } +inline void Assembler::frim( FloatRegister d, FloatRegister b) { emit_int32( FRIM_OPCODE | frt(d) | frb(b) | rc(0)); } + // These are special Power6 opcodes, reused for "lfdepx" and "stfdepx" // on Power7. Do not use. //inline void Assembler::mffgpr( FloatRegister d, Register b) { emit_int32( MFFGPR_OPCODE | frt(d) | rb(b) | rc(0)); } @@ -796,6 +800,10 @@ inline void Assembler::xvmsubadp( VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMSUBADP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); } inline void Assembler::xvnmsubasp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVNMSUBASP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); } inline void Assembler::xvnmsubadp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVNMSUBADP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); } +inline void Assembler::xvrdpi( VectorSRegister d, VectorSRegister b) { emit_int32( XVRDPI_OPCODE | vsrt(d) | vsrb(b)); } +inline void Assembler::xvrdpim( VectorSRegister d, VectorSRegister b) { emit_int32( XVRDPIM_OPCODE | vsrt(d) | vsrb(b)); } +inline void Assembler::xvrdpip( VectorSRegister d, VectorSRegister b) { emit_int32( XVRDPIP_OPCODE | vsrt(d) | vsrb(b)); } + inline void Assembler::mtvrd( VectorRegister d, Register a) { emit_int32( MTVSRD_OPCODE | vsrt(d->to_vsr()) | ra(a)); } inline void Assembler::mfvrd( Register a, VectorRegister d) { emit_int32( MFVSRD_OPCODE | vsrt(d->to_vsr()) | ra(a)); } inline void Assembler::mtvrwz( VectorRegister d, Register a) { emit_int32( MTVSRWZ_OPCODE | vsrt(d->to_vsr()) | ra(a)); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/ppc/ppc.ad --- a/src/hotspot/cpu/ppc/ppc.ad Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/ppc/ppc.ad Wed Oct 23 14:01:17 2019 -0400 @@ -972,6 +972,8 @@ // To keep related declarations/definitions/uses close together, // we switch between source %{ }% and source_hpp %{ }% freely as needed. +#include "opto/convertnode.hpp" + // Returns true if Node n is followed by a MemBar node that // will do an acquire. If so, this node must not do the acquire // operation. @@ -2272,6 +2274,7 @@ case Op_AddVL: case Op_SubVL: case Op_MulVI: + case Op_RoundDoubleModeV: return SuperwordUseVSX; case Op_PopCountVI: return (SuperwordUseVSX && UsePopCountInstruction); @@ -14454,6 +14457,53 @@ ins_pipe(pipe_class_default); %} +// Round Instructions +instruct roundD_reg(regD dst, regD src, immI8 rmode) %{ + match(Set dst (RoundDoubleMode src rmode)); + format %{ "RoundDoubleMode $src,$rmode" %} + size(4); + ins_encode %{ + switch ($rmode$$constant) { + case RoundDoubleModeNode::rmode_rint: + __ frin($dst$$FloatRegister, $src$$FloatRegister); + break; + case RoundDoubleModeNode::rmode_floor: + __ frim($dst$$FloatRegister, $src$$FloatRegister); + break; + case RoundDoubleModeNode::rmode_ceil: + __ frip($dst$$FloatRegister, $src$$FloatRegister); + break; + default: + ShouldNotReachHere(); + } + %} + ins_pipe(pipe_class_default); +%} + +// Vector Round Instructions +instruct vround2D_reg(vecX dst, vecX src, immI8 rmode) %{ + match(Set dst (RoundDoubleModeV src rmode)); + predicate(n->as_Vector()->length() == 2); + format %{ "RoundDoubleModeV $src,$rmode" %} + size(4); + ins_encode %{ + switch ($rmode$$constant) { + case RoundDoubleModeNode::rmode_rint: + __ xvrdpi($dst$$VectorSRegister, $src$$VectorSRegister); + break; + case RoundDoubleModeNode::rmode_floor: + __ xvrdpim($dst$$VectorSRegister, $src$$VectorSRegister); + break; + case RoundDoubleModeNode::rmode_ceil: + __ xvrdpip($dst$$VectorSRegister, $src$$VectorSRegister); + break; + default: + ShouldNotReachHere(); + } + %} + ins_pipe(pipe_class_default); +%} + // Vector Negate Instructions instruct vneg4F_reg(vecX dst, vecX src) %{ diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp --- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -333,7 +333,7 @@ #endif } -void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler* masm, Register dst) { +void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler* masm, Register dst, Address src) { if (!ShenandoahLoadRefBarrier) { return; } @@ -341,6 +341,7 @@ Label done; Label not_null; Label slow_path; + __ block_comment("load_reference_barrier_native { "); // null check __ testptr(dst, dst); @@ -371,7 +372,7 @@ __ bind(slow_path); if (dst != rax) { - __ xchgptr(dst, rax); // Move obj into rax and save rax into obj. + __ push(rax); } __ push(rcx); __ push(rdx); @@ -388,8 +389,9 @@ __ push(r15); #endif - __ movptr(rdi, rax); - __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native), rdi); + assert_different_registers(dst, rsi); + __ lea(rsi, src); + __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native), dst, rsi); #ifdef _LP64 __ pop(r15); @@ -407,10 +409,12 @@ __ pop(rcx); if (dst != rax) { - __ xchgptr(rax, dst); // Swap back obj with rax. + __ movptr(dst, rax); + __ pop(rax); } __ bind(done); + __ block_comment("load_reference_barrier_native { "); } void ShenandoahBarrierSetAssembler::storeval_barrier(MacroAssembler* masm, Register dst, Register tmp) { @@ -474,14 +478,43 @@ bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode(); bool keep_alive = ((decorators & AS_NO_KEEPALIVE) == 0) || is_traversal_mode; + Register result_dst = dst; + bool use_tmp1_for_dst = false; + + if (on_oop) { + // We want to preserve src + if (dst == src.base() || dst == src.index()) { + // Use tmp1 for dst if possible, as it is not used in BarrierAssembler::load_at() + if (tmp1->is_valid() && tmp1 != src.base() && tmp1 != src.index()) { + dst = tmp1; + use_tmp1_for_dst = true; + } else { + dst = rdi; + __ push(dst); + } + } + assert_different_registers(dst, src.base(), src.index()); + } + BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread); + if (on_oop) { if (not_in_heap && !is_traversal_mode) { - load_reference_barrier_native(masm, dst); + load_reference_barrier_native(masm, dst, src); } else { load_reference_barrier(masm, dst); } + if (dst != result_dst) { + __ movptr(result_dst, dst); + + if (!use_tmp1_for_dst) { + __ pop(dst); + } + + dst = result_dst; + } + if (ShenandoahKeepAliveBarrier && on_reference && keep_alive) { const Register thread = NOT_LP64(tmp_thread) LP64_ONLY(r15_thread); assert_different_registers(dst, tmp1, tmp_thread); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp --- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -76,7 +76,7 @@ #endif void load_reference_barrier(MacroAssembler* masm, Register dst); - void load_reference_barrier_native(MacroAssembler* masm, Register dst); + void load_reference_barrier_native(MacroAssembler* masm, Register dst, Address src); void cmpxchg_oop(MacroAssembler* masm, Register res, Address addr, Register oldval, Register newval, diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/x86/macroAssembler_x86.cpp --- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -6352,7 +6352,7 @@ movptr(result, str1); if (UseAVX >= 2) { cmpl(cnt1, stride); - jcc(Assembler::less, SCAN_TO_CHAR_LOOP); + jcc(Assembler::less, SCAN_TO_CHAR); cmpl(cnt1, 2*stride); jcc(Assembler::less, SCAN_TO_8_CHAR_INIT); movdl(vec1, ch); @@ -6379,10 +6379,8 @@ } bind(SCAN_TO_8_CHAR); cmpl(cnt1, stride); - if (UseAVX >= 2) { - jcc(Assembler::less, SCAN_TO_CHAR); - } else { - jcc(Assembler::less, SCAN_TO_CHAR_LOOP); + jcc(Assembler::less, SCAN_TO_CHAR); + if (UseAVX < 2) { movdl(vec1, ch); pshuflw(vec1, vec1, 0x00); pshufd(vec1, vec1, 0); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/x86/macroAssembler_x86.hpp --- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -114,7 +114,8 @@ // short offset operators (jmp and jcc) char* disp = (char*) &branch[1]; int imm8 = target - (address) &disp[1]; - guarantee(this->is8bit(imm8), "Short forward jump exceeds 8-bit offset at %s:%d", file, line); + guarantee(this->is8bit(imm8), "Short forward jump exceeds 8-bit offset at %s:%d", + file == NULL ? "" : file, line); *disp = imm8; } else { int* disp = (int*) &branch[(op == 0x0F || op == 0xC7)? 2: 1]; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp --- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1304,6 +1304,97 @@ } } +// Registers need to be saved for runtime call +static Register caller_saved_registers[] = { + rcx, rdx, rsi, rdi +}; + +// Save caller saved registers except r1 and r2 +static void save_registers_except(MacroAssembler* masm, Register r1, Register r2) { + int reg_len = (int)(sizeof(caller_saved_registers) / sizeof(Register)); + for (int index = 0; index < reg_len; index ++) { + Register this_reg = caller_saved_registers[index]; + if (this_reg != r1 && this_reg != r2) { + __ push(this_reg); + } + } +} + +// Restore caller saved registers except r1 and r2 +static void restore_registers_except(MacroAssembler* masm, Register r1, Register r2) { + int reg_len = (int)(sizeof(caller_saved_registers) / sizeof(Register)); + for (int index = reg_len - 1; index >= 0; index --) { + Register this_reg = caller_saved_registers[index]; + if (this_reg != r1 && this_reg != r2) { + __ pop(this_reg); + } + } +} + +// Pin object, return pinned object or null in rax +static void gen_pin_object(MacroAssembler* masm, + Register thread, VMRegPair reg) { + __ block_comment("gen_pin_object {"); + + Label is_null; + Register tmp_reg = rax; + VMRegPair tmp(tmp_reg->as_VMReg()); + if (reg.first()->is_stack()) { + // Load the arg up from the stack + simple_move32(masm, reg, tmp); + reg = tmp; + } else { + __ movl(tmp_reg, reg.first()->as_Register()); + } + __ testptr(reg.first()->as_Register(), reg.first()->as_Register()); + __ jccb(Assembler::equal, is_null); + + // Save registers that may be used by runtime call + Register arg = reg.first()->is_Register() ? reg.first()->as_Register() : noreg; + save_registers_except(masm, arg, thread); + + __ call_VM_leaf( + CAST_FROM_FN_PTR(address, SharedRuntime::pin_object), + thread, reg.first()->as_Register()); + + // Restore saved registers + restore_registers_except(masm, arg, thread); + + __ bind(is_null); + __ block_comment("} gen_pin_object"); +} + +// Unpin object +static void gen_unpin_object(MacroAssembler* masm, + Register thread, VMRegPair reg) { + __ block_comment("gen_unpin_object {"); + Label is_null; + + // temp register + __ push(rax); + Register tmp_reg = rax; + VMRegPair tmp(tmp_reg->as_VMReg()); + + simple_move32(masm, reg, tmp); + + __ testptr(rax, rax); + __ jccb(Assembler::equal, is_null); + + // Save registers that may be used by runtime call + Register arg = reg.first()->is_Register() ? reg.first()->as_Register() : noreg; + save_registers_except(masm, arg, thread); + + __ call_VM_leaf( + CAST_FROM_FN_PTR(address, SharedRuntime::unpin_object), + thread, rax); + + // Restore saved registers + restore_registers_except(masm, arg, thread); + __ bind(is_null); + __ pop(rax); + __ block_comment("} gen_unpin_object"); +} + // Check GCLocker::needs_gc and enter the runtime if it's true. This // keeps a new JNI critical region from starting until a GC has been // forced. Save down any oops in registers and describe them in an @@ -1837,7 +1928,7 @@ __ get_thread(thread); - if (is_critical_native) { + if (is_critical_native && !Universe::heap()->supports_object_pinning()) { check_needs_gc_for_critical_native(masm, thread, stack_slots, total_c_args, total_in_args, oop_handle_offset, oop_maps, in_regs, in_sig_bt); } @@ -1875,6 +1966,11 @@ // OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/); + // Inbound arguments that need to be pinned for critical natives + GrowableArray pinned_args(total_in_args); + // Current stack slot for storing register based array argument + int pinned_slot = oop_handle_offset; + // Mark location of rbp, // map->set_callee_saved(VMRegImpl::stack2reg( stack_slots - 2), stack_slots * 2, 0, rbp->as_VMReg()); @@ -1886,7 +1982,28 @@ switch (in_sig_bt[i]) { case T_ARRAY: if (is_critical_native) { - unpack_array_argument(masm, in_regs[i], in_elem_bt[i], out_regs[c_arg + 1], out_regs[c_arg]); + VMRegPair in_arg = in_regs[i]; + if (Universe::heap()->supports_object_pinning()) { + // gen_pin_object handles save and restore + // of any clobbered registers + gen_pin_object(masm, thread, in_arg); + pinned_args.append(i); + + // rax has pinned array + VMRegPair result_reg(rax->as_VMReg()); + if (!in_arg.first()->is_stack()) { + assert(pinned_slot <= stack_slots, "overflow"); + simple_move32(masm, result_reg, VMRegImpl::stack2reg(pinned_slot)); + pinned_slot += VMRegImpl::slots_per_word; + } else { + // Write back pinned value, it will be used to unpin this argument + __ movptr(Address(rbp, reg2offset_in(in_arg.first())), result_reg.first()->as_Register()); + } + // We have the array in register, use it + in_arg = result_reg; + } + + unpack_array_argument(masm, in_arg, in_elem_bt[i], out_regs[c_arg + 1], out_regs[c_arg]); c_arg++; break; } @@ -2079,6 +2196,26 @@ default : ShouldNotReachHere(); } + // unpin pinned arguments + pinned_slot = oop_handle_offset; + if (pinned_args.length() > 0) { + // save return value that may be overwritten otherwise. + save_native_result(masm, ret_type, stack_slots); + for (int index = 0; index < pinned_args.length(); index ++) { + int i = pinned_args.at(index); + assert(pinned_slot <= stack_slots, "overflow"); + if (!in_regs[i].first()->is_stack()) { + int offset = pinned_slot * VMRegImpl::stack_slot_size; + __ movl(in_regs[i].first()->as_Register(), Address(rsp, offset)); + pinned_slot += VMRegImpl::slots_per_word; + } + // gen_pin_object handles save and restore + // of any other clobbered registers + gen_unpin_object(masm, thread, in_regs[i]); + } + restore_native_result(masm, ret_type, stack_slots); + } + // Switch thread to "native transition" state before reading the synchronization state. // This additional state is necessary because reading and testing the synchronization // state is not atomic w.r.t. GC, as this scenario demonstrates: diff -r bc43733cd5cf -r 015949faea55 src/hotspot/cpu/x86/x86.ad --- a/src/hotspot/cpu/x86/x86.ad Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/cpu/x86/x86.ad Wed Oct 23 14:01:17 2019 -0400 @@ -1280,7 +1280,7 @@ case Op_AbsVS: case Op_AbsVI: case Op_AddReductionVI: - if (UseSSE < 3) // requires at least SSE3 + if (UseSSE < 3 || !VM_Version::supports_ssse3()) // requires at least SSSE3 ret_value = false; break; case Op_MulReductionVI: diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/aix/os_aix.cpp --- a/src/hotspot/os/aix/os_aix.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/aix/os_aix.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1034,8 +1034,6 @@ } bool os::supports_vtime() { return true; } -bool os::enable_vtime() { return false; } -bool os::vtime_enabled() { return false; } double os::elapsedVTime() { struct rusage usage; @@ -3625,11 +3623,6 @@ return; } -bool os::distribute_processes(uint length, uint* distribution) { - // Not yet implemented. - return false; -} - bool os::bind_to_processor(uint processor_id) { // Not yet implemented. return false; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/aix/os_aix.hpp --- a/src/hotspot/os/aix/os_aix.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/aix/os_aix.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -44,7 +44,6 @@ static julong _physical_memory; static pthread_t _main_thread; - static Mutex* _createThread_lock; static int _page_size; // -1 = uninitialized, 0 = AIX, 1 = OS/400 (PASE) @@ -90,8 +89,6 @@ public: static void init_thread_fpu_state(); static pthread_t main_thread(void) { return _main_thread; } - static void set_createThread_lock(Mutex* lk) { _createThread_lock = lk; } - static Mutex* createThread_lock(void) { return _createThread_lock; } static void hotspot_sigmask(Thread* thread); // Given an address, returns the size of the page backing that address diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/aix/os_aix.inline.hpp --- a/src/hotspot/os/aix/os_aix.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/aix/os_aix.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -64,8 +64,6 @@ ::dlclose(lib); } -inline const int os::default_file_open_flags() { return 0;} - inline jlong os::lseek(int fd, jlong offset, int whence) { return (jlong) ::lseek64(fd, offset, whence); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/bsd/os_bsd.cpp --- a/src/hotspot/os/bsd/os_bsd.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/bsd/os_bsd.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -877,8 +877,6 @@ } bool os::supports_vtime() { return true; } -bool os::enable_vtime() { return false; } -bool os::vtime_enabled() { return false; } double os::elapsedVTime() { // better than nothing, but not much @@ -3282,11 +3280,6 @@ #endif } -bool os::distribute_processes(uint length, uint* distribution) { - // Not yet implemented. - return false; -} - bool os::bind_to_processor(uint processor_id) { // Not yet implemented. return false; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/bsd/os_bsd.inline.hpp --- a/src/hotspot/os/bsd/os_bsd.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/bsd/os_bsd.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -67,8 +67,6 @@ ::dlclose(lib); } -inline const int os::default_file_open_flags() { return 0;} - inline jlong os::lseek(int fd, jlong offset, int whence) { return (jlong) ::lseek(fd, offset, whence); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/linux/gc/z/zNUMA_linux.cpp --- a/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -22,7 +22,7 @@ */ #include "gc/z/zErrno.hpp" -#include "gc/z/zCPU.hpp" +#include "gc/z/zCPU.inline.hpp" #include "gc/z/zNUMA.hpp" #include "runtime/globals.hpp" #include "runtime/os.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/linux/osContainer_linux.cpp --- a/src/hotspot/os/linux/osContainer_linux.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/linux/osContainer_linux.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -131,14 +131,34 @@ * hierarchy. If set to true consider also memory.stat * file if everything else seems unlimited */ bool _uses_mem_hierarchy; + volatile jlong _memory_limit_in_bytes; + volatile jlong _next_check_counter; public: CgroupMemorySubsystem(char *root, char *mountpoint) : CgroupSubsystem::CgroupSubsystem(root, mountpoint) { _uses_mem_hierarchy = false; + _memory_limit_in_bytes = -1; + _next_check_counter = min_jlong; + } bool is_hierarchical() { return _uses_mem_hierarchy; } void set_hierarchical(bool value) { _uses_mem_hierarchy = value; } + + bool should_check_memory_limit() { + return os::elapsed_counter() > _next_check_counter; + } + jlong memory_limit_in_bytes() { return _memory_limit_in_bytes; } + void set_memory_limit_in_bytes(jlong value) { + _memory_limit_in_bytes = value; + // max memory limit is unlikely to change, but we want to remain + // responsive to configuration changes. A very short (20ms) grace time + // between re-read avoids excessive overhead during startup without + // significantly reducing the VMs ability to promptly react to reduced + // memory availability + _next_check_counter = os::elapsed_counter() + (NANOSECS_PER_SEC/50); + } + }; CgroupMemorySubsystem* memory = NULL; @@ -461,6 +481,16 @@ * OSCONTAINER_ERROR for not supported */ jlong OSContainer::memory_limit_in_bytes() { + if (!memory->should_check_memory_limit()) { + return memory->memory_limit_in_bytes(); + } + jlong memory_limit = read_memory_limit_in_bytes(); + // Update CgroupMemorySubsystem to avoid re-reading container settings too often + memory->set_memory_limit_in_bytes(memory_limit); + return memory_limit; +} + +jlong OSContainer::read_memory_limit_in_bytes() { GET_CONTAINER_INFO(julong, memory, "/memory.limit_in_bytes", "Memory Limit is: " JULONG_FORMAT, JULONG_FORMAT, memlimit); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/linux/osContainer_linux.hpp --- a/src/hotspot/os/linux/osContainer_linux.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/linux/osContainer_linux.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -36,6 +36,7 @@ private: static bool _is_initialized; static bool _is_containerized; + static jlong read_memory_limit_in_bytes(); public: static void init(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/linux/os_linux.cpp --- a/src/hotspot/os/linux/os_linux.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/linux/os_linux.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -148,11 +148,9 @@ int (*os::Linux::_pthread_getcpuclockid)(pthread_t, clockid_t *) = NULL; int (*os::Linux::_pthread_setname_np)(pthread_t, const char*) = NULL; -Mutex* os::Linux::_createThread_lock = NULL; pthread_t os::Linux::_main_thread; int os::Linux::_page_size = -1; bool os::Linux::_supports_fast_thread_cpu_time = false; -uint32_t os::Linux::_os_version = 0; const char * os::Linux::_glibc_version = NULL; const char * os::Linux::_libpthread_version = NULL; @@ -1364,8 +1362,6 @@ } bool os::supports_vtime() { return true; } -bool os::enable_vtime() { return false; } -bool os::vtime_enabled() { return false; } double os::elapsedVTime() { struct rusage usage; @@ -4823,48 +4819,6 @@ return (tp.tv_sec * NANOSECS_PER_SEC) + tp.tv_nsec; } -void os::Linux::initialize_os_info() { - assert(_os_version == 0, "OS info already initialized"); - - struct utsname _uname; - - uint32_t major; - uint32_t minor; - uint32_t fix; - - int rc; - - // Kernel version is unknown if - // verification below fails. - _os_version = 0x01000000; - - rc = uname(&_uname); - if (rc != -1) { - - rc = sscanf(_uname.release,"%d.%d.%d", &major, &minor, &fix); - if (rc == 3) { - - if (major < 256 && minor < 256 && fix < 256) { - // Kernel version format is as expected, - // set it overriding unknown state. - _os_version = (major << 16) | - (minor << 8 ) | - (fix << 0 ) ; - } - } - } -} - -uint32_t os::Linux::os_version() { - assert(_os_version != 0, "not initialized"); - return _os_version & 0x00FFFFFF; -} - -bool os::Linux::os_version_is_known() { - assert(_os_version != 0, "not initialized"); - return _os_version & 0x01000000 ? false : true; -} - ///// // glibc on Linux platform uses non-documented flag // to indicate, that some special sort of signal @@ -5084,8 +5038,6 @@ Linux::initialize_system_info(); - Linux::initialize_os_info(); - os::Linux::CPUPerfTicks pticks; bool res = os::Linux::get_tick_information(&pticks, -1); @@ -5262,9 +5214,6 @@ } } - // Initialize lock used to serialize thread creation (see os::create_thread) - Linux::set_createThread_lock(new Mutex(Mutex::leaf, "createThread_lock", false)); - // at-exit methods are called in the reverse order of their registration. // atexit functions are called on return from main or as a result of a // call to exit(3C). There can be only 32 of these functions registered @@ -5465,11 +5414,6 @@ } } -bool os::distribute_processes(uint length, uint* distribution) { - // Not yet implemented. - return false; -} - bool os::bind_to_processor(uint processor_id) { // Not yet implemented. return false; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/linux/os_linux.hpp --- a/src/hotspot/os/linux/os_linux.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/linux/os_linux.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -55,20 +55,10 @@ static GrowableArray* _cpu_to_node; static GrowableArray* _nindex_to_node; - // 0x00000000 = uninitialized, - // 0x01000000 = kernel version unknown, - // otherwise a 32-bit number: - // Ox00AABBCC - // AA, Major Version - // BB, Minor Version - // CC, Fix Version - static uint32_t _os_version; - protected: static julong _physical_memory; static pthread_t _main_thread; - static Mutex* _createThread_lock; static int _page_size; static julong available_memory(); @@ -136,8 +126,6 @@ // returns kernel thread id (similar to LWP id on Solaris), which can be // used to access /proc static pid_t gettid(); - static void set_createThread_lock(Mutex* lk) { _createThread_lock = lk; } - static Mutex* createThread_lock(void) { return _createThread_lock; } static void hotspot_sigmask(Thread* thread); static address initial_thread_stack_bottom(void) { return _initial_thread_stack_bottom; } @@ -196,7 +184,6 @@ // Stack overflow handling static bool manually_expand_stack(JavaThread * t, address addr); - static int max_register_window_saves_before_flushing(); // fast POSIX clocks support static void fast_thread_clock_init(void); @@ -211,10 +198,6 @@ static jlong fast_thread_cpu_time(clockid_t clockid); - static void initialize_os_info(); - static bool os_version_is_known(); - static uint32_t os_version(); - // Stack repair handling // none present diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/linux/os_linux.inline.hpp --- a/src/hotspot/os/linux/os_linux.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/linux/os_linux.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -59,8 +59,6 @@ ::dlclose(lib); } -inline const int os::default_file_open_flags() { return 0;} - inline jlong os::lseek(int fd, jlong offset, int whence) { return (jlong) ::lseek64(fd, offset, whence); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/posix/os_posix.cpp --- a/src/hotspot/os/posix/os_posix.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/posix/os_posix.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -167,11 +167,6 @@ return n; } -bool os::is_debugger_attached() { - // not implemented - return false; -} - void os::wait_for_keypress_at_exit(void) { // don't do anything on posix platforms return; @@ -690,6 +685,9 @@ #endif { SIGHUP, "SIGHUP" }, { SIGILL, "SIGILL" }, +#ifdef SIGINFO + { SIGINFO, "SIGINFO" }, +#endif { SIGINT, "SIGINT" }, #ifdef SIGIO { SIGIO, "SIGIO" }, diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/solaris/os_solaris.cpp --- a/src/hotspot/os/solaris/os_solaris.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/solaris/os_solaris.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -265,8 +265,6 @@ } } -static int _processors_online = 0; - jint os::Solaris::_os_thread_limit = 0; volatile jint os::Solaris::_os_thread_count = 0; @@ -291,7 +289,6 @@ void os::Solaris::initialize_system_info() { set_processor_count(sysconf(_SC_NPROCESSORS_CONF)); - _processors_online = sysconf(_SC_NPROCESSORS_ONLN); _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE); } @@ -320,7 +317,6 @@ // Query the number of cpus available to us. if (pset_info(pset, NULL, &pset_cpus, NULL) == 0) { assert(pset_cpus > 0 && pset_cpus <= online_cpus, "sanity check"); - _processors_online = pset_cpus; return pset_cpus; } } @@ -328,136 +324,6 @@ return online_cpus; } -static bool find_processors_in_pset(psetid_t pset, - processorid_t** id_array, - uint_t* id_length) { - bool result = false; - // Find the number of processors in the processor set. - if (pset_info(pset, NULL, id_length, NULL) == 0) { - // Make up an array to hold their ids. - *id_array = NEW_C_HEAP_ARRAY(processorid_t, *id_length, mtInternal); - // Fill in the array with their processor ids. - if (pset_info(pset, NULL, id_length, *id_array) == 0) { - result = true; - } - } - return result; -} - -// Callers of find_processors_online() must tolerate imprecise results -- -// the system configuration can change asynchronously because of DR -// or explicit psradm operations. -// -// We also need to take care that the loop (below) terminates as the -// number of processors online can change between the _SC_NPROCESSORS_ONLN -// request and the loop that builds the list of processor ids. Unfortunately -// there's no reliable way to determine the maximum valid processor id, -// so we use a manifest constant, MAX_PROCESSOR_ID, instead. See p_online -// man pages, which claim the processor id set is "sparse, but -// not too sparse". MAX_PROCESSOR_ID is used to ensure that we eventually -// exit the loop. -// -// In the future we'll be able to use sysconf(_SC_CPUID_MAX), but that's -// not available on S8.0. - -static bool find_processors_online(processorid_t** id_array, - uint* id_length) { - const processorid_t MAX_PROCESSOR_ID = 100000; - // Find the number of processors online. - *id_length = sysconf(_SC_NPROCESSORS_ONLN); - // Make up an array to hold their ids. - *id_array = NEW_C_HEAP_ARRAY(processorid_t, *id_length, mtInternal); - // Processors need not be numbered consecutively. - long found = 0; - processorid_t next = 0; - while (found < *id_length && next < MAX_PROCESSOR_ID) { - processor_info_t info; - if (processor_info(next, &info) == 0) { - // NB, PI_NOINTR processors are effectively online ... - if (info.pi_state == P_ONLINE || info.pi_state == P_NOINTR) { - (*id_array)[found] = next; - found += 1; - } - } - next += 1; - } - if (found < *id_length) { - // The loop above didn't identify the expected number of processors. - // We could always retry the operation, calling sysconf(_SC_NPROCESSORS_ONLN) - // and re-running the loop, above, but there's no guarantee of progress - // if the system configuration is in flux. Instead, we just return what - // we've got. Note that in the worst case find_processors_online() could - // return an empty set. (As a fall-back in the case of the empty set we - // could just return the ID of the current processor). - *id_length = found; - } - - return true; -} - -static bool assign_distribution(processorid_t* id_array, - uint id_length, - uint* distribution, - uint distribution_length) { - // We assume we can assign processorid_t's to uint's. - assert(sizeof(processorid_t) == sizeof(uint), - "can't convert processorid_t to uint"); - // Quick check to see if we won't succeed. - if (id_length < distribution_length) { - return false; - } - // Assign processor ids to the distribution. - // Try to shuffle processors to distribute work across boards, - // assuming 4 processors per board. - const uint processors_per_board = ProcessDistributionStride; - // Find the maximum processor id. - processorid_t max_id = 0; - for (uint m = 0; m < id_length; m += 1) { - max_id = MAX2(max_id, id_array[m]); - } - // The next id, to limit loops. - const processorid_t limit_id = max_id + 1; - // Make up markers for available processors. - bool* available_id = NEW_C_HEAP_ARRAY(bool, limit_id, mtInternal); - for (uint c = 0; c < limit_id; c += 1) { - available_id[c] = false; - } - for (uint a = 0; a < id_length; a += 1) { - available_id[id_array[a]] = true; - } - // Step by "boards", then by "slot", copying to "assigned". - // NEEDS_CLEANUP: The assignment of processors should be stateful, - // remembering which processors have been assigned by - // previous calls, etc., so as to distribute several - // independent calls of this method. What we'd like is - // It would be nice to have an API that let us ask - // how many processes are bound to a processor, - // but we don't have that, either. - // In the short term, "board" is static so that - // subsequent distributions don't all start at board 0. - static uint board = 0; - uint assigned = 0; - // Until we've found enough processors .... - while (assigned < distribution_length) { - // ... find the next available processor in the board. - for (uint slot = 0; slot < processors_per_board; slot += 1) { - uint try_id = board * processors_per_board + slot; - if ((try_id < limit_id) && (available_id[try_id] == true)) { - distribution[assigned] = try_id; - available_id[try_id] = false; - assigned += 1; - break; - } - } - board += 1; - if (board * processors_per_board + 0 >= limit_id) { - board = 0; - } - } - FREE_C_HEAP_ARRAY(bool, available_id); - return true; -} - void os::set_native_thread_name(const char *name) { if (Solaris::_pthread_setname_np != NULL) { // Only the first 31 bytes of 'name' are processed by pthread_setname_np @@ -470,31 +336,6 @@ } } -bool os::distribute_processes(uint length, uint* distribution) { - bool result = false; - // Find the processor id's of all the available CPUs. - processorid_t* id_array = NULL; - uint id_length = 0; - // There are some races between querying information and using it, - // since processor sets can change dynamically. - psetid_t pset = PS_NONE; - // Are we running in a processor set? - if ((pset_bind(PS_QUERY, P_PID, P_MYID, &pset) == 0) && pset != PS_NONE) { - result = find_processors_in_pset(pset, &id_array, &id_length); - } else { - result = find_processors_online(&id_array, &id_length); - } - if (result == true) { - if (id_length >= length) { - result = assign_distribution(id_array, id_length, distribution, length); - } else { - result = false; - } - } - FREE_C_HEAP_ARRAY(processorid_t, id_array); - return result; -} - bool os::bind_to_processor(uint processor_id) { // We assume that a processorid_t can be stored in a uint. assert(sizeof(uint) == sizeof(processorid_t), @@ -1237,8 +1078,6 @@ } bool os::supports_vtime() { return true; } -bool os::enable_vtime() { return false; } -bool os::vtime_enabled() { return false; } double os::elapsedVTime() { return (double)gethrvtime() / (double)hrtime_hz; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/solaris/os_solaris.hpp --- a/src/hotspot/os/solaris/os_solaris.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/solaris/os_solaris.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -271,10 +271,6 @@ static void correct_stack_boundaries_for_primordial_thread(Thread* thr); - // Stack overflow handling - - static int max_register_window_saves_before_flushing(); - // Stack repair handling // none present diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/solaris/os_solaris.inline.hpp --- a/src/hotspot/os/solaris/os_solaris.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/solaris/os_solaris.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -61,8 +61,6 @@ inline void os::dll_unload(void *lib) { ::dlclose(lib); } -inline const int os::default_file_open_flags() { return 0;} - ////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/windows/os_windows.cpp --- a/src/hotspot/os/windows/os_windows.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/windows/os_windows.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -826,11 +826,6 @@ } __except(EXCEPTION_EXECUTE_HANDLER) {} } -bool os::distribute_processes(uint length, uint* distribution) { - // Not yet implemented. - return false; -} - bool os::bind_to_processor(uint processor_id) { // Not yet implemented. return false; @@ -911,8 +906,6 @@ } bool os::supports_vtime() { return true; } -bool os::enable_vtime() { return false; } -bool os::vtime_enabled() { return false; } double os::elapsedVTime() { FILETIME created; @@ -3904,12 +3897,6 @@ _setmode(_fileno(stderr), _O_BINARY); } - -bool os::is_debugger_attached() { - return IsDebuggerPresent() ? true : false; -} - - void os::wait_for_keypress_at_exit(void) { if (PauseAtExit) { fprintf(stderr, "Press any key to continue...\n"); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os/windows/os_windows.inline.hpp --- a/src/hotspot/os/windows/os_windows.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os/windows/os_windows.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -30,8 +30,6 @@ inline const char* os::dll_file_extension() { return ".dll"; } -inline const int os::default_file_open_flags() { return O_BINARY | O_NOINHERIT;} - inline void os::dll_unload(void *lib) { ::FreeLibrary((HMODULE)lib); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.cpp --- a/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -86,12 +86,6 @@ size_t os::Posix::_java_thread_min_stack_allowed = 86 * K; size_t os::Posix::_vm_internal_thread_min_stack_allowed = 128 * K; -int os::Solaris::max_register_window_saves_before_flushing() { - // We should detect this at run time. For now, filling - // in with a constant. - return 8; -} - static void handle_unflushed_register_windows(gwindows_t *win) { int restore_count = win->wbcnt; int i; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/aot/aotCodeHeap.cpp --- a/src/hotspot/share/aot/aotCodeHeap.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/aot/aotCodeHeap.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -93,7 +93,7 @@ Handle protection_domain(thread, caller->method_holder()->protection_domain()); // Ignore wrapping L and ; - if (name[0] == 'L') { + if (name[0] == JVM_SIGNATURE_CLASS) { assert(len > 2, "small name %s", name); name++; len -= 2; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/c1/c1_InstructionPrinter.cpp --- a/src/hotspot/share/c1/c1_InstructionPrinter.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/c1/c1_InstructionPrinter.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2017, 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 @@ -33,19 +33,11 @@ #ifndef PRODUCT const char* InstructionPrinter::basic_type_name(BasicType type) { - switch (type) { - case T_BOOLEAN: return "boolean"; - case T_BYTE : return "byte"; - case T_CHAR : return "char"; - case T_SHORT : return "short"; - case T_INT : return "int"; - case T_LONG : return "long"; - case T_FLOAT : return "float"; - case T_DOUBLE : return "double"; - case T_ARRAY : return "array"; - case T_OBJECT : return "object"; - default : return "???"; + const char* n = type2name(type); + if (n == NULL || type > T_VOID) { + return "???"; } + return n; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/ci/ciEnv.cpp --- a/src/hotspot/share/ci/ciEnv.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/ci/ciEnv.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -413,8 +413,8 @@ // Now we need to check the SystemDictionary Symbol* sym = name->get_symbol(); - if (sym->char_at(0) == 'L' && - sym->char_at(sym->utf8_length()-1) == ';') { + if (sym->char_at(0) == JVM_SIGNATURE_CLASS && + sym->char_at(sym->utf8_length()-1) == JVM_SIGNATURE_ENDCLASS) { // This is a name from a signature. Strip off the trimmings. // Call recursive to keep scope of strippedsym. TempNewSymbol strippedsym = SymbolTable::new_symbol(sym->as_utf8()+1, @@ -440,7 +440,7 @@ // setup up the proper type to return on OOM ciKlass* fail_type; - if (sym->char_at(0) == '[') { + if (sym->char_at(0) == JVM_SIGNATURE_ARRAY) { fail_type = _unloaded_ciobjarrayklass; } else { fail_type = _unloaded_ciinstance_klass; @@ -466,8 +466,8 @@ // we must build an array type around it. The CI requires array klasses // to be loaded if their element klasses are loaded, except when memory // is exhausted. - if (sym->char_at(0) == '[' && - (sym->char_at(1) == '[' || sym->char_at(1) == 'L')) { + if (sym->char_at(0) == JVM_SIGNATURE_ARRAY && + (sym->char_at(1) == JVM_SIGNATURE_ARRAY || sym->char_at(1) == JVM_SIGNATURE_CLASS)) { // We have an unloaded array. // Build it on the fly if the element class exists. TempNewSymbol elem_sym = SymbolTable::new_symbol(sym->as_utf8()+1, diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/ci/ciInstanceKlass.cpp --- a/src/hotspot/share/ci/ciInstanceKlass.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/ci/ciInstanceKlass.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2018, 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 @@ -116,7 +116,7 @@ jobject loader, jobject protection_domain) : ciKlass(name, T_OBJECT) { - assert(name->char_at(0) != '[', "not an instance klass"); + assert(name->char_at(0) != JVM_SIGNATURE_ARRAY, "not an instance klass"); _init_state = (InstanceKlass::ClassState)0; _nonstatic_field_size = -1; _has_nonstatic_fields = false; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/ci/ciObjArrayKlass.cpp --- a/src/hotspot/share/ci/ciObjArrayKlass.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/ci/ciObjArrayKlass.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2017, 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 @@ -112,16 +112,16 @@ Symbol* base_name_sym = element_name->get_symbol(); char* name; - if (base_name_sym->char_at(0) == '[' || - (base_name_sym->char_at(0) == 'L' && // watch package name 'Lxx' - base_name_sym->char_at(element_len-1) == ';')) { + if (base_name_sym->char_at(0) == JVM_SIGNATURE_ARRAY || + (base_name_sym->char_at(0) == JVM_SIGNATURE_CLASS && // watch package name 'Lxx' + base_name_sym->char_at(element_len-1) == JVM_SIGNATURE_ENDCLASS)) { int new_len = element_len + dimension + 1; // for the ['s and '\0' name = CURRENT_THREAD_ENV->name_buffer(new_len); int pos = 0; for ( ; pos < dimension; pos++) { - name[pos] = '['; + name[pos] = JVM_SIGNATURE_ARRAY; } strncpy(name+pos, (char*)element_name->base(), element_len); name[new_len-1] = '\0'; @@ -133,11 +133,11 @@ name = CURRENT_THREAD_ENV->name_buffer(new_len); int pos = 0; for ( ; pos < dimension; pos++) { - name[pos] = '['; + name[pos] = JVM_SIGNATURE_ARRAY; } - name[pos++] = 'L'; + name[pos++] = JVM_SIGNATURE_CLASS; strncpy(name+pos, (char*)element_name->base(), element_len); - name[new_len-2] = ';'; + name[new_len-2] = JVM_SIGNATURE_ENDCLASS; name[new_len-1] = '\0'; } return ciSymbol::make(name); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/ci/ciObjectFactory.cpp --- a/src/hotspot/share/ci/ciObjectFactory.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/ci/ciObjectFactory.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -486,7 +486,7 @@ // Two cases: this is an unloaded ObjArrayKlass or an // unloaded InstanceKlass. Deal with both. - if (name->char_at(0) == '[') { + if (name->char_at(0) == JVM_SIGNATURE_ARRAY) { // Decompose the name.' FieldArrayInfo fd; BasicType element_type = FieldType::get_array_info(name->get_symbol(), diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/ci/ciReplay.cpp --- a/src/hotspot/share/ci/ciReplay.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/ci/ciReplay.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -814,18 +814,18 @@ } oop java_mirror = k->java_mirror(); - if (field_signature[0] == '[') { + if (field_signature[0] == JVM_SIGNATURE_ARRAY) { int length = parse_int("array length"); oop value = NULL; - if (field_signature[1] == '[') { + if (field_signature[1] == JVM_SIGNATURE_ARRAY) { // multi dimensional array ArrayKlass* kelem = (ArrayKlass *)parse_klass(CHECK); if (kelem == NULL) { return; } int rank = 0; - while (field_signature[rank] == '[') { + while (field_signature[rank] == JVM_SIGNATURE_ARRAY) { rank++; } jint* dims = NEW_RESOURCE_ARRAY(jint, rank); @@ -851,7 +851,8 @@ value = oopFactory::new_intArray(length, CHECK); } else if (strcmp(field_signature, "[J") == 0) { value = oopFactory::new_longArray(length, CHECK); - } else if (field_signature[0] == '[' && field_signature[1] == 'L') { + } else if (field_signature[0] == JVM_SIGNATURE_ARRAY && + field_signature[1] == JVM_SIGNATURE_CLASS) { Klass* kelem = resolve_klass(field_signature + 1, CHECK); value = oopFactory::new_objArray(kelem, length, CHECK); } else { @@ -892,7 +893,7 @@ } else if (strcmp(field_signature, "Ljava/lang/String;") == 0) { Handle value = java_lang_String::create_from_str(string_value, CHECK); java_mirror->obj_field_put(fd.offset(), value()); - } else if (field_signature[0] == 'L') { + } else if (field_signature[0] == JVM_SIGNATURE_CLASS) { Klass* k = resolve_klass(string_value, CHECK); oop value = InstanceKlass::cast(k)->allocate_instance(CHECK); java_mirror->obj_field_put(fd.offset(), value); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/classFileParser.cpp --- a/src/hotspot/share/classfile/classFileParser.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/classFileParser.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -731,7 +731,7 @@ const unsigned int name_len = name->utf8_length(); if (tag == JVM_CONSTANT_Methodref && name_len != 0 && - name->char_at(0) == '<' && + name->char_at(0) == JVM_SIGNATURE_SPECIAL && name != vmSymbols::object_initializer_name()) { classfile_parse_error( "Bad method name at constant pool index %u in class file %s", @@ -4961,24 +4961,25 @@ if (length == 0) return false; // Must have at least one char. for (const char* p = name; p != name + length; p++) { switch(*p) { - case '.': - case ';': - case '[': + case JVM_SIGNATURE_DOT: + case JVM_SIGNATURE_ENDCLASS: + case JVM_SIGNATURE_ARRAY: // do not permit '.', ';', or '[' return false; - case '/': + case JVM_SIGNATURE_SLASH: // check for '//' or leading or trailing '/' which are not legal // unqualified name must not be empty if (type == ClassFileParser::LegalClass) { - if (p == name || p+1 >= name+length || *(p+1) == '/') { + if (p == name || p+1 >= name+length || + *(p+1) == JVM_SIGNATURE_SLASH) { return false; } } else { return false; // do not permit '/' unless it's class name } break; - case '<': - case '>': + case JVM_SIGNATURE_SPECIAL: + case JVM_SIGNATURE_ENDSPECIAL: // do not permit '<' or '>' in method names if (type == ClassFileParser::LegalMethod) { return false; @@ -5015,7 +5016,7 @@ last_is_slash = false; continue; } - if (slash_ok && ch == '/') { + if (slash_ok && ch == JVM_SIGNATURE_SLASH) { if (last_is_slash) { return NULL; // Don't permit consecutive slashes } @@ -5095,14 +5096,14 @@ const char* const p = skip_over_field_name(signature + 1, true, --length); // The next character better be a semicolon - if (p && (p - signature) > 1 && p[0] == ';') { + if (p && (p - signature) > 1 && p[0] == JVM_SIGNATURE_ENDCLASS) { return p + 1; } } else { // Skip leading 'L' and ignore first appearance of ';' signature++; - const char* c = (const char*) memchr(signature, ';', length - 1); + const char* c = (const char*) memchr(signature, JVM_SIGNATURE_ENDCLASS, length - 1); // Format check signature if (c != NULL) { int newlen = c - (char*) signature; @@ -5151,7 +5152,7 @@ p = skip_over_field_signature(bytes, false, length, CHECK); legal = (p != NULL) && ((p - bytes) == (int)length); } else if (_major_version < JAVA_1_5_VERSION) { - if (bytes[0] != '<') { + if (bytes[0] != JVM_SIGNATURE_SPECIAL) { p = skip_over_field_name(bytes, true, length); legal = (p != NULL) && ((p - bytes) == (int)length); } @@ -5186,7 +5187,7 @@ if (length > 0) { if (_major_version < JAVA_1_5_VERSION) { - if (bytes[0] != '<') { + if (bytes[0] != JVM_SIGNATURE_SPECIAL) { const char* p = skip_over_field_name(bytes, false, length); legal = (p != NULL) && ((p - bytes) == (int)length); } @@ -5219,7 +5220,7 @@ bool legal = false; if (length > 0) { - if (bytes[0] == '<') { + if (bytes[0] == JVM_SIGNATURE_SPECIAL) { if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) { legal = true; } @@ -5303,7 +5304,7 @@ // The first non-signature thing better be a ')' if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) { length--; - if (name->utf8_length() > 0 && name->char_at(0) == '<') { + if (name->utf8_length() > 0 && name->char_at(0) == JVM_SIGNATURE_SPECIAL) { // All internal methods must return void if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) { return args_size; @@ -5705,7 +5706,7 @@ // its _class_name field. void ClassFileParser::prepend_host_package_name(const InstanceKlass* unsafe_anonymous_host, TRAPS) { ResourceMark rm(THREAD); - assert(strrchr(_class_name->as_C_string(), '/') == NULL, + assert(strrchr(_class_name->as_C_string(), JVM_SIGNATURE_SLASH) == NULL, "Unsafe anonymous class should not be in a package"); const char* host_pkg_name = ClassLoader::package_from_name(unsafe_anonymous_host->name()->as_C_string(), NULL); @@ -5738,7 +5739,7 @@ assert(_unsafe_anonymous_host != NULL, "Expected an unsafe anonymous class"); const jbyte* anon_last_slash = UTF8::strrchr((const jbyte*)_class_name->base(), - _class_name->utf8_length(), '/'); + _class_name->utf8_length(), JVM_SIGNATURE_SLASH); if (anon_last_slash == NULL) { // Unnamed package prepend_host_package_name(_unsafe_anonymous_host, CHECK); } else { @@ -6343,7 +6344,7 @@ if (class_name != NULL) { ResourceMark rm; char* name = class_name->as_C_string(); - return strchr(name, '.') == NULL; + return strchr(name, JVM_SIGNATURE_DOT) == NULL; } else { return true; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/classListParser.cpp --- a/src/hotspot/share/classfile/classListParser.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/classListParser.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -229,17 +229,17 @@ jio_fprintf(defaultStream::error_stream(), "}\n"); } -void ClassListParser::print_actual_interfaces(InstanceKlass *ik) { +void ClassListParser::print_actual_interfaces(InstanceKlass* ik) { int n = ik->local_interfaces()->length(); jio_fprintf(defaultStream::error_stream(), "Actual interfaces[%d] = {\n", n); for (int i = 0; i < n; i++) { - InstanceKlass* e = InstanceKlass::cast(ik->local_interfaces()->at(i)); + InstanceKlass* e = ik->local_interfaces()->at(i); jio_fprintf(defaultStream::error_stream(), " %s\n", e->name()->as_klass_external_name()); } jio_fprintf(defaultStream::error_stream(), "}\n"); } -void ClassListParser::error(const char *msg, ...) { +void ClassListParser::error(const char* msg, ...) { va_list ap; va_start(ap, msg); int error_index = _token - _line; @@ -328,7 +328,7 @@ Klass* ClassListParser::load_current_class(TRAPS) { TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name); - Klass *klass = NULL; + Klass* klass = NULL; if (!is_loading_from_source()) { // Load classes for the boot/platform/app loaders only. if (is_super_specified()) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/classLoader.cpp --- a/src/hotspot/share/classfile/classLoader.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/classLoader.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -187,7 +187,7 @@ *bad_class_name = false; } - const char* const last_slash = strrchr(class_name, '/'); + const char* const last_slash = strrchr(class_name, JVM_SIGNATURE_SLASH); if (last_slash == NULL) { // No package name return NULL; @@ -195,16 +195,16 @@ char* class_name_ptr = (char*) class_name; // Skip over '['s - if (*class_name_ptr == '[') { + if (*class_name_ptr == JVM_SIGNATURE_ARRAY) { do { class_name_ptr++; - } while (*class_name_ptr == '['); + } while (*class_name_ptr == JVM_SIGNATURE_ARRAY); // Fully qualified class names should not contain a 'L'. // Set bad_class_name to true to indicate that the package name // could not be obtained due to an error condition. // In this situation, is_same_class_package returns false. - if (*class_name_ptr == 'L') { + if (*class_name_ptr == JVM_SIGNATURE_CLASS) { if (bad_class_name != NULL) { *bad_class_name = true; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/defaultMethods.cpp --- a/src/hotspot/share/classfile/defaultMethods.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/defaultMethods.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -146,7 +146,7 @@ return interface_index() >= number_of_interfaces(); } InstanceKlass* interface_at(int index) { - return InstanceKlass::cast(_class->local_interfaces()->at(index)); + return _class->local_interfaces()->at(index); } InstanceKlass* next_super() { return _class->java_super(); } InstanceKlass* next_interface() { @@ -1012,7 +1012,7 @@ klass->class_loader_data(), new_size, NULL, CHECK); // original_ordering might be empty if this class has no methods of its own - if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) { + if (JvmtiExport::can_maintain_original_method_order() || Arguments::is_dumping_archive()) { merged_ordering = MetadataFactory::new_array( klass->class_loader_data(), new_size, CHECK); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/dictionary.hpp --- a/src/hotspot/share/classfile/dictionary.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/dictionary.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -156,7 +156,6 @@ // Tells whether the initiating class' protection domain can access the klass in this entry bool is_valid_protection_domain(Handle protection_domain) { if (!ProtectionDomainVerification) return true; - if (!SystemDictionary::has_checkPackageAccess()) return true; return protection_domain() == NULL ? true diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/javaAssertions.cpp --- a/src/hotspot/share/classfile/javaAssertions.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/javaAssertions.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -79,7 +79,7 @@ // JVM_DesiredAssertionStatus pass the external_name() to // JavaAssertion::enabled(), but that is done once per loaded class. for (int i = 0; i < len; ++i) { - if (name_copy[i] == '.') name_copy[i] = '/'; + if (name_copy[i] == JVM_SIGNATURE_DOT) name_copy[i] = JVM_SIGNATURE_SLASH; } if (TraceJavaAssertions) { @@ -135,7 +135,7 @@ for (index = len - 1; p != 0; p = p->next(), --index) { assert(index >= 0, "length does not match list"); Handle s = java_lang_String::create_from_str(p->name(), CHECK); - s = java_lang_String::char_converter(s, '/', '.', CHECK); + s = java_lang_String::char_converter(s, JVM_SIGNATURE_SLASH, JVM_SIGNATURE_DOT, CHECK); names->obj_at_put(index, s()); enabled->bool_at_put(index, p->enabled()); } @@ -163,10 +163,10 @@ // does not include a package, length will be 0 which will match items for the // default package (from options "-ea:..." or "-da:..."). size_t len = strlen(classname); - for (/* empty */; len > 0 && classname[len] != '/'; --len) /* empty */; + for (/* empty */; len > 0 && classname[len] != JVM_SIGNATURE_SLASH; --len) /* empty */; do { - assert(len == 0 || classname[len] == '/', "not a package name"); + assert(len == 0 || classname[len] == JVM_SIGNATURE_SLASH, "not a package name"); for (OptionList* p = _packages; p != 0; p = p->next()) { if (strncmp(p->name(), classname, len) == 0 && p->name()[len] == '\0') { return p; @@ -175,7 +175,7 @@ // Find the length of the next package, taking care to avoid decrementing // past 0 (len is unsigned). - while (len > 0 && classname[--len] != '/') /* empty */; + while (len > 0 && classname[--len] != JVM_SIGNATURE_SLASH) /* empty */; } while (len > 0); return 0; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/javaClasses.cpp --- a/src/hotspot/share/classfile/javaClasses.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/javaClasses.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -377,7 +377,7 @@ if (_to_java_string_fn == NULL) { void *lib_handle = os::native_java_library(); - _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "JNU_NewStringPlatform")); + _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "NewStringPlatform")); if (_to_java_string_fn == NULL) { fatal("NewStringPlatform missing"); } @@ -1545,7 +1545,7 @@ int java_lang_Class::classRedefinedCount_offset = -1; #define CLASS_FIELDS_DO(macro) \ - macro(classRedefinedCount_offset, k, "classRedefinedCount", int_signature, false) ; \ + macro(classRedefinedCount_offset, k, "classRedefinedCount", int_signature, false); \ macro(_class_loader_offset, k, "classLoader", classloader_signature, false); \ macro(_component_mirror_offset, k, "componentType", class_signature, false); \ macro(_module_offset, k, "module", module_signature, false); \ @@ -1938,7 +1938,6 @@ return method != NULL && (method->constants()->version() == version); } - // This class provides a simple wrapper over the internal structure of // exception backtrace to insulate users of the backtrace from needing // to know what it looks like. @@ -1950,7 +1949,11 @@ typeArrayOop _methods; typeArrayOop _bcis; objArrayOop _mirrors; - typeArrayOop _names; // needed to insulate method name against redefinition + typeArrayOop _names; // Needed to insulate method name against redefinition. + // This is set to a java.lang.Boolean(true) if the top frame + // of the backtrace is omitted because it shall be hidden. + // Else it is null. + oop _has_hidden_top_frame; int _index; NoSafepointVerifier _nsv; @@ -1960,6 +1963,7 @@ trace_mirrors_offset = java_lang_Throwable::trace_mirrors_offset, trace_names_offset = java_lang_Throwable::trace_names_offset, trace_next_offset = java_lang_Throwable::trace_next_offset, + trace_hidden_offset = java_lang_Throwable::trace_hidden_offset, trace_size = java_lang_Throwable::trace_size, trace_chunk_size = java_lang_Throwable::trace_chunk_size }; @@ -1985,11 +1989,15 @@ assert(names != NULL, "names array should be initialized in backtrace"); return names; } + static oop get_has_hidden_top_frame(objArrayHandle chunk) { + oop hidden = chunk->obj_at(trace_hidden_offset); + return hidden; + } public: // constructor for new backtrace - BacktraceBuilder(TRAPS): _head(NULL), _methods(NULL), _bcis(NULL), _mirrors(NULL), _names(NULL) { + BacktraceBuilder(TRAPS): _head(NULL), _methods(NULL), _bcis(NULL), _mirrors(NULL), _names(NULL), _has_hidden_top_frame(NULL) { expand(CHECK); _backtrace = Handle(THREAD, _head); _index = 0; @@ -2000,6 +2008,7 @@ _bcis = get_bcis(backtrace); _mirrors = get_mirrors(backtrace); _names = get_names(backtrace); + _has_hidden_top_frame = get_has_hidden_top_frame(backtrace); assert(_methods->length() == _bcis->length() && _methods->length() == _mirrors->length() && _mirrors->length() == _names->length(), @@ -2037,6 +2046,7 @@ new_head->obj_at_put(trace_bcis_offset, new_bcis()); new_head->obj_at_put(trace_mirrors_offset, new_mirrors()); new_head->obj_at_put(trace_names_offset, new_names()); + new_head->obj_at_put(trace_hidden_offset, NULL); _head = new_head(); _methods = new_methods(); @@ -2077,6 +2087,16 @@ _index++; } + void set_has_hidden_top_frame(TRAPS) { + if (_has_hidden_top_frame == NULL) { + jvalue prim; + prim.z = 1; + PauseNoSafepointVerifier pnsv(&_nsv); + _has_hidden_top_frame = java_lang_boxing_object::create(T_BOOLEAN, &prim, CHECK); + _head->obj_at_put(trace_hidden_offset, _has_hidden_top_frame); + } + } + }; struct BacktraceElement : public StackObj { @@ -2406,7 +2426,13 @@ } } if (method->is_hidden()) { - if (skip_hidden) continue; + if (skip_hidden) { + if (total_count == 0) { + // The top frame will be hidden from the stack trace. + bt.set_has_hidden_top_frame(CHECK); + } + continue; + } } bt.push(method, bci, CHECK); total_count++; @@ -2523,6 +2549,37 @@ } } +bool java_lang_Throwable::get_top_method_and_bci(oop throwable, Method** method, int* bci) { + Thread* THREAD = Thread::current(); + objArrayHandle result(THREAD, objArrayOop(backtrace(throwable))); + BacktraceIterator iter(result, THREAD); + // No backtrace available. + if (!iter.repeat()) return false; + + // If the exception happened in a frame that has been hidden, i.e., + // omitted from the back trace, we can not compute the message. + oop hidden = ((objArrayOop)backtrace(throwable))->obj_at(trace_hidden_offset); + if (hidden != NULL) { + return false; + } + + // Get first backtrace element. + BacktraceElement bte = iter.next(THREAD); + + InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(bte._mirror())); + assert(holder != NULL, "first element should be non-null"); + Method* m = holder->method_with_orig_idnum(bte._method_id, bte._version); + + // Original version is no longer available. + if (m == NULL || !version_matches(m, bte._version)) { + return false; + } + + *method = m; + *bci = bte._bci; + return true; +} + oop java_lang_StackTraceElement::create(const methodHandle& method, int bci, TRAPS) { // Allocate java.lang.StackTraceElement instance InstanceKlass* k = SystemDictionary::StackTraceElement_klass(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/javaClasses.hpp --- a/src/hotspot/share/classfile/javaClasses.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/javaClasses.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -201,7 +201,9 @@ static inline bool value_equals(typeArrayOop str_value1, typeArrayOop str_value2); // Conversion between '.' and '/' formats - static Handle externalize_classname(Handle java_string, TRAPS) { return char_converter(java_string, '/', '.', THREAD); } + static Handle externalize_classname(Handle java_string, TRAPS) { + return char_converter(java_string, JVM_SIGNATURE_SLASH, JVM_SIGNATURE_DOT, THREAD); + } // Conversion static Symbol* as_symbol(oop java_string); @@ -518,7 +520,8 @@ trace_mirrors_offset = 2, trace_names_offset = 3, trace_next_offset = 4, - trace_size = 5, + trace_hidden_offset = 5, + trace_size = 6, trace_chunk_size = 32 }; @@ -568,6 +571,8 @@ static void java_printStackTrace(Handle throwable, TRAPS); // Debugging friend class JavaClasses; + // Gets the method and bci of the top frame (TOS). Returns false if this failed. + static bool get_top_method_and_bci(oop throwable, Method** method, int* bci); }; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/modules.cpp --- a/src/hotspot/share/classfile/modules.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/modules.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -331,7 +331,7 @@ if (!h_loader.is_null() && !SystemDictionary::is_platform_class_loader(h_loader()) && (strncmp(package_name, JAVAPKG, JAVAPKG_LEN) == 0 && - (package_name[JAVAPKG_LEN] == '/' || package_name[JAVAPKG_LEN] == '\0'))) { + (package_name[JAVAPKG_LEN] == JVM_SIGNATURE_SLASH || package_name[JAVAPKG_LEN] == '\0'))) { const char* class_loader_name = loader_data->loader_name_and_id(); size_t pkg_len = strlen(package_name); char* pkg_name = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, pkg_len + 1); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/systemDictionary.cpp --- a/src/hotspot/share/classfile/systemDictionary.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/systemDictionary.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -109,8 +109,6 @@ oop SystemDictionary::_java_system_loader = NULL; oop SystemDictionary::_java_platform_loader = NULL; -bool SystemDictionary::_has_checkPackageAccess = false; - // Default ProtectionDomainCacheSize value const int defaultProtectionDomainCacheSize = 1009; @@ -447,8 +445,6 @@ Handle class_loader, Handle protection_domain, TRAPS) { - if(!has_checkPackageAccess()) return; - // Now we have to call back to java to check if the initating class has access JavaValue result(T_VOID); LogTarget(Debug, protectiondomain) lt; @@ -1993,14 +1989,14 @@ resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK); // Preload ref klasses and set reference types - InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER); + WK_KLASS(Reference_klass)->set_reference_type(REF_OTHER); InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass)); resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK); - InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT); - InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK); - InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL); - InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM); + WK_KLASS(SoftReference_klass)->set_reference_type(REF_SOFT); + WK_KLASS(WeakReference_klass)->set_reference_type(REF_WEAK); + WK_KLASS(FinalReference_klass)->set_reference_type(REF_FINAL); + WK_KLASS(PhantomReference_klass)->set_reference_type(REF_PHANTOM); // JSR 292 classes WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass); @@ -2021,11 +2017,6 @@ //_box_klasses[T_OBJECT] = WK_KLASS(object_klass); //_box_klasses[T_ARRAY] = WK_KLASS(object_klass); - { // Compute whether we should use checkPackageAccess or NOT - Method* method = InstanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature()); - _has_checkPackageAccess = (method != NULL); - } - #ifdef ASSERT if (UseSharedSpaces) { assert(JvmtiExport::is_early_phase(), @@ -2533,7 +2524,7 @@ // It's a primitive. (Void has a primitive mirror too.) char ch = type->char_at(0); - assert(is_java_primitive(char2type(ch)) || ch == 'V', ""); + assert(is_java_primitive(char2type(ch)) || ch == JVM_SIGNATURE_VOID, ""); return Handle(THREAD, find_java_mirror_for_type(ch)); } else if (FieldType::is_obj(type) || FieldType::is_array(type)) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/systemDictionary.hpp --- a/src/hotspot/share/classfile/systemDictionary.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/systemDictionary.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -155,6 +155,7 @@ do_klass(reflect_ConstantPool_klass, reflect_ConstantPool ) \ do_klass(reflect_UnsafeStaticFieldAccessorImpl_klass, reflect_UnsafeStaticFieldAccessorImpl ) \ do_klass(reflect_CallerSensitive_klass, reflect_CallerSensitive ) \ + do_klass(reflect_NativeConstructorAccessorImpl_klass, reflect_NativeConstructorAccessorImpl ) \ \ /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \ do_klass(DirectMethodHandle_klass, java_lang_invoke_DirectMethodHandle ) \ @@ -429,9 +430,6 @@ } public: - // Tells whether ClassLoader.checkPackageAccess is present - static bool has_checkPackageAccess() { return _has_checkPackageAccess; } - static bool Parameter_klass_loaded() { return WK_KLASS(reflect_Parameter_klass) != NULL; } static bool Class_klass_loaded() { return WK_KLASS(Class_klass) != NULL; } static bool Cloneable_klass_loaded() { return WK_KLASS(Cloneable_klass) != NULL; } @@ -666,8 +664,6 @@ static oop _java_system_loader; static oop _java_platform_loader; - static bool _has_checkPackageAccess; - public: static TableStatistics placeholders_statistics(); static TableStatistics loader_constraints_statistics(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/verificationType.cpp --- a/src/hotspot/share/classfile/verificationType.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/verificationType.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -71,7 +71,7 @@ if (log_is_enabled(Debug, class, resolve)) { Verifier::trace_class_resolution(from_class, klass); } - return InstanceKlass::cast(from_class)->is_subclass_of(this_class); + return from_class->is_subclass_of(this_class); } return false; @@ -122,19 +122,19 @@ assert(is_array() && name()->utf8_length() >= 2, "Must be a valid array"); Symbol* component; switch (name()->char_at(1)) { - case 'Z': return VerificationType(Boolean); - case 'B': return VerificationType(Byte); - case 'C': return VerificationType(Char); - case 'S': return VerificationType(Short); - case 'I': return VerificationType(Integer); - case 'J': return VerificationType(Long); - case 'F': return VerificationType(Float); - case 'D': return VerificationType(Double); - case '[': + case JVM_SIGNATURE_BOOLEAN: return VerificationType(Boolean); + case JVM_SIGNATURE_BYTE: return VerificationType(Byte); + case JVM_SIGNATURE_CHAR: return VerificationType(Char); + case JVM_SIGNATURE_SHORT: return VerificationType(Short); + case JVM_SIGNATURE_INT: return VerificationType(Integer); + case JVM_SIGNATURE_LONG: return VerificationType(Long); + case JVM_SIGNATURE_FLOAT: return VerificationType(Float); + case JVM_SIGNATURE_DOUBLE: return VerificationType(Double); + case JVM_SIGNATURE_ARRAY: component = context->create_temporary_symbol( name(), 1, name()->utf8_length()); return VerificationType::reference_type(component); - case 'L': + case JVM_SIGNATURE_CLASS: component = context->create_temporary_symbol( name(), 2, name()->utf8_length() - 1); return VerificationType::reference_type(component); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/verificationType.hpp --- a/src/hotspot/share/classfile/verificationType.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/verificationType.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -209,24 +209,24 @@ bool is_x_array(char sig) const { return is_null() || (is_array() && (name()->char_at(1) == sig)); } - bool is_int_array() const { return is_x_array('I'); } - bool is_byte_array() const { return is_x_array('B'); } - bool is_bool_array() const { return is_x_array('Z'); } - bool is_char_array() const { return is_x_array('C'); } - bool is_short_array() const { return is_x_array('S'); } - bool is_long_array() const { return is_x_array('J'); } - bool is_float_array() const { return is_x_array('F'); } - bool is_double_array() const { return is_x_array('D'); } - bool is_object_array() const { return is_x_array('L'); } - bool is_array_array() const { return is_x_array('['); } + bool is_int_array() const { return is_x_array(JVM_SIGNATURE_INT); } + bool is_byte_array() const { return is_x_array(JVM_SIGNATURE_BYTE); } + bool is_bool_array() const { return is_x_array(JVM_SIGNATURE_BOOLEAN); } + bool is_char_array() const { return is_x_array(JVM_SIGNATURE_CHAR); } + bool is_short_array() const { return is_x_array(JVM_SIGNATURE_SHORT); } + bool is_long_array() const { return is_x_array(JVM_SIGNATURE_LONG); } + bool is_float_array() const { return is_x_array(JVM_SIGNATURE_FLOAT); } + bool is_double_array() const { return is_x_array(JVM_SIGNATURE_DOUBLE); } + bool is_object_array() const { return is_x_array(JVM_SIGNATURE_CLASS); } + bool is_array_array() const { return is_x_array(JVM_SIGNATURE_ARRAY); } bool is_reference_array() const { return is_object_array() || is_array_array(); } bool is_object() const { return (is_reference() && !is_null() && name()->utf8_length() >= 1 && - name()->char_at(0) != '['); } + name()->char_at(0) != JVM_SIGNATURE_ARRAY); } bool is_array() const { return (is_reference() && !is_null() && name()->utf8_length() >= 2 && - name()->char_at(0) == '['); } + name()->char_at(0) == JVM_SIGNATURE_ARRAY); } bool is_uninitialized() const { return ((_u._data & Uninitialized) == Uninitialized); } bool is_uninitialized_this() const @@ -322,7 +322,7 @@ int dimensions() const { assert(is_array(), "Must be an array"); int index = 0; - while (name()->char_at(index) == '[') index++; + while (name()->char_at(index) == JVM_SIGNATURE_ARRAY) index++; return index; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/verifier.cpp --- a/src/hotspot/share/classfile/verifier.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/verifier.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -2852,7 +2852,7 @@ } } - if (method_name->char_at(0) == '<') { + if (method_name->char_at(0) == JVM_SIGNATURE_SPECIAL) { // Make sure can only be invoked by invokespecial if (opcode != Bytecodes::_invokespecial || method_name != vmSymbols::object_initializer_name()) { @@ -3028,21 +3028,23 @@ // Check for more than MAX_ARRAY_DIMENSIONS length = (int)strlen(component_name); if (length > MAX_ARRAY_DIMENSIONS && - component_name[MAX_ARRAY_DIMENSIONS - 1] == '[') { + component_name[MAX_ARRAY_DIMENSIONS - 1] == JVM_SIGNATURE_ARRAY) { verify_error(ErrorContext::bad_code(bci), "Illegal anewarray instruction, array has more than 255 dimensions"); } // add one dimension to component length++; arr_sig_str = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, length + 1); - int n = os::snprintf(arr_sig_str, length + 1, "[%s", component_name); + int n = os::snprintf(arr_sig_str, length + 1, "%c%s", + JVM_SIGNATURE_ARRAY, component_name); assert(n == length, "Unexpected number of characters in string"); } else { // it's an object or interface const char* component_name = component_type.name()->as_utf8(); // add one dimension to component with 'L' prepended and ';' postpended. length = (int)strlen(component_name) + 3; arr_sig_str = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, length + 1); - int n = os::snprintf(arr_sig_str, length + 1, "[L%s;", component_name); + int n = os::snprintf(arr_sig_str, length + 1, "%c%c%s;", + JVM_SIGNATURE_ARRAY, JVM_SIGNATURE_CLASS, component_name); assert(n == length, "Unexpected number of characters in string"); } Symbol* arr_sig = create_temporary_symbol(arr_sig_str, length); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/vmSymbols.cpp --- a/src/hotspot/share/classfile/vmSymbols.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/vmSymbols.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -970,7 +970,7 @@ case F_RNY:fname = "native synchronized "; break; default: break; } - const char* kptr = strrchr(kname, '/'); + const char* kptr = strrchr(kname, JVM_SIGNATURE_SLASH); if (kptr != NULL) kname = kptr + 1; int len = jio_snprintf(buf, buflen, "%s: %s%s.%s%s", str, fname, kname, mname, sname); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/classfile/vmSymbols.hpp --- a/src/hotspot/share/classfile/vmSymbols.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/classfile/vmSymbols.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -243,6 +243,7 @@ template(reflect_Reflection, "jdk/internal/reflect/Reflection") \ template(reflect_CallerSensitive, "jdk/internal/reflect/CallerSensitive") \ template(reflect_CallerSensitive_signature, "Ljdk/internal/reflect/CallerSensitive;") \ + template(reflect_NativeConstructorAccessorImpl, "jdk/internal/reflect/NativeConstructorAccessorImpl")\ template(checkedExceptions_name, "checkedExceptions") \ template(clazz_name, "clazz") \ template(exceptionTypes_name, "exceptionTypes") \ diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/compiler/methodMatcher.cpp --- a/src/hotspot/share/compiler/methodMatcher.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/compiler/methodMatcher.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -264,11 +264,13 @@ c_match = check_mode(class_name, error_msg); m_match = check_mode(method_name, error_msg); - if ((strchr(class_name, '<') != NULL) || (strchr(class_name, '>') != NULL)) { + if ((strchr(class_name, JVM_SIGNATURE_SPECIAL) != NULL) || + (strchr(class_name, JVM_SIGNATURE_ENDSPECIAL) != NULL)) { error_msg = "Chars '<' and '>' not allowed in class name"; return; } - if ((strchr(method_name, '<') != NULL) || (strchr(method_name, '>') != NULL)) { + if ((strchr(method_name, JVM_SIGNATURE_SPECIAL) != NULL) || + (strchr(method_name, JVM_SIGNATURE_ENDSPECIAL) != NULL)) { if ((strncmp("", method_name, 255) != 0) && (strncmp("", method_name, 255) != 0)) { error_msg = "Chars '<' and '>' only allowed in and "; return; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/epsilon/epsilonArguments.cpp --- a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -45,13 +45,25 @@ FLAG_SET_DEFAULT(ExitOnOutOfMemoryError, true); } + // Warn users that non-resizable heap might be better for some configurations. + // We are not adjusting the heap size by ourselves, because it affects startup time. + if (InitialHeapSize != MaxHeapSize) { + log_warning(gc)("Consider setting -Xms equal to -Xmx to avoid resizing hiccups"); + } + + // Warn users that AlwaysPreTouch might be better for some configurations. + // We are not turning this on by ourselves, because it affects startup time. + if (FLAG_IS_DEFAULT(AlwaysPreTouch) && !AlwaysPreTouch) { + log_warning(gc)("Consider enabling -XX:+AlwaysPreTouch to avoid memory commit hiccups"); + } + if (EpsilonMaxTLABSize < MinTLABSize) { - warning("EpsilonMaxTLABSize < MinTLABSize, adjusting it to " SIZE_FORMAT, MinTLABSize); + log_warning(gc)("EpsilonMaxTLABSize < MinTLABSize, adjusting it to " SIZE_FORMAT, MinTLABSize); EpsilonMaxTLABSize = MinTLABSize; } if (!EpsilonElasticTLAB && EpsilonElasticTLABDecay) { - warning("Disabling EpsilonElasticTLABDecay because EpsilonElasticTLAB is disabled"); + log_warning(gc)("Disabling EpsilonElasticTLABDecay because EpsilonElasticTLAB is disabled"); FLAG_SET_DEFAULT(EpsilonElasticTLABDecay, false); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/g1/g1CollectedHeap.cpp --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1630,7 +1630,6 @@ } jint G1CollectedHeap::initialize() { - os::enable_vtime(); // Necessary to satisfy locking discipline assertions. @@ -3614,6 +3613,7 @@ p->record_or_add_time_secs(termination_phase, worker_id, cl.term_time()); p->record_or_add_thread_work_item(termination_phase, worker_id, cl.term_attempts()); } + assert(pss->trim_ticks().seconds() == 0.0, "Unexpected partial trimming during evacuation"); } virtual void start_work(uint worker_id) { } @@ -3655,22 +3655,14 @@ class G1EvacuateRegionsTask : public G1EvacuateRegionsBaseTask { G1RootProcessor* _root_processor; - void verify_trim_ticks(G1ParScanThreadState* pss, const char* location) { - assert(pss->trim_ticks().seconds() == 0.0, "Unexpected partial trimming during evacuation at %s %.3lf " JLONG_FORMAT, location, pss->trim_ticks().seconds(), pss->trim_ticks().value()); - } - void scan_roots(G1ParScanThreadState* pss, uint worker_id) { _root_processor->evacuate_roots(pss, worker_id); - verify_trim_ticks(pss, "roots"); _g1h->rem_set()->scan_heap_roots(pss, worker_id, G1GCPhaseTimes::ScanHR, G1GCPhaseTimes::ObjCopy); - verify_trim_ticks(pss, "heap roots"); _g1h->rem_set()->scan_collection_set_regions(pss, worker_id, G1GCPhaseTimes::ScanHR, G1GCPhaseTimes::CodeRoots, G1GCPhaseTimes::ObjCopy); - verify_trim_ticks(pss, "scan cset"); } void evacuate_live_objects(G1ParScanThreadState* pss, uint worker_id) { G1EvacuateRegionsBaseTask::evacuate_live_objects(pss, worker_id, G1GCPhaseTimes::ObjCopy, G1GCPhaseTimes::Termination); - verify_trim_ticks(pss, "evac live"); } void start_work(uint worker_id) { @@ -4076,7 +4068,7 @@ Atomic::add(r->rem_set()->occupied_locked(), &_rs_length); if (!is_young) { - g1h->_hot_card_cache->reset_card_counts(r); + g1h->hot_card_cache()->reset_card_counts(r); } if (!evacuation_failed) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/g1/g1CollectedHeap.hpp --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -129,7 +129,6 @@ }; class G1CollectedHeap : public CollectedHeap { - friend class G1FreeCollectionSetTask; friend class VM_CollectForMetadataAllocation; friend class VM_G1CollectForAllocation; friend class VM_G1CollectFull; @@ -1138,7 +1137,7 @@ return _reserved.contains(addr); } - G1HotCardCache* g1_hot_card_cache() const { return _hot_card_cache; } + G1HotCardCache* hot_card_cache() const { return _hot_card_cache; } G1CardTable* card_table() const { return _card_table; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -114,8 +114,9 @@ hr->rem_set()->clear(); hr->clear_cardtable(); - if (_g1h->g1_hot_card_cache()->use_cache()) { - _g1h->g1_hot_card_cache()->reset_card_counts(hr); + G1HotCardCache* hcc = _g1h->hot_card_cache(); + if (hcc->use_cache()) { + hcc->reset_card_counts(hr); } } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/g1/g1RemSet.cpp --- a/src/hotspot/share/gc/g1/g1RemSet.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1RemSet.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -487,7 +487,7 @@ G1CardTable* ct, G1HotCardCache* hot_card_cache) : _scan_state(new G1RemSetScanState()), - _prev_period_summary(), + _prev_period_summary(false), _g1h(g1h), _ct(ct), _g1p(_g1h->policy()), @@ -1404,7 +1404,7 @@ if ((G1SummarizeRSetStatsPeriod > 0) && log_is_enabled(Trace, gc, remset) && (period_count % G1SummarizeRSetStatsPeriod == 0)) { - G1RemSetSummary current(this); + G1RemSetSummary current; _prev_period_summary.subtract_from(¤t); Log(gc, remset) log; @@ -1421,7 +1421,7 @@ Log(gc, remset, exit) log; if (log.is_trace()) { log.trace(" Cumulative RS summary"); - G1RemSetSummary current(this); + G1RemSetSummary current; ResourceMark rm; LogStream ls(log.trace()); current.print_on(&ls); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/g1/g1RemSetSummary.cpp --- a/src/hotspot/share/gc/g1/g1RemSetSummary.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1RemSetSummary.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -81,8 +81,7 @@ return _rs_threads_vtimes[thread]; } -G1RemSetSummary::G1RemSetSummary() : - _rem_set(NULL), +G1RemSetSummary::G1RemSetSummary(bool should_update) : _total_mutator_refined_cards(0), _total_concurrent_refined_cards(0), _num_coarsenings(0), @@ -91,17 +90,10 @@ _sampling_thread_vtime(0.0f) { memset(_rs_threads_vtimes, 0, sizeof(double) * _num_vtimes); -} -G1RemSetSummary::G1RemSetSummary(G1RemSet* rem_set) : - _rem_set(rem_set), - _total_mutator_refined_cards(0), - _total_concurrent_refined_cards(0), - _num_coarsenings(0), - _num_vtimes(G1ConcurrentRefine::max_num_threads()), - _rs_threads_vtimes(NEW_C_HEAP_ARRAY(double, _num_vtimes, mtGC)), - _sampling_thread_vtime(0.0f) { - update(); + if (should_update) { + update(); + } } G1RemSetSummary::~G1RemSetSummary() { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/g1/g1RemSetSummary.hpp --- a/src/hotspot/share/gc/g1/g1RemSetSummary.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/g1/g1RemSetSummary.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -36,8 +36,6 @@ private: friend class GetRSThreadVTimeClosure; - G1RemSet* _rem_set; - size_t _total_mutator_refined_cards; size_t _total_concurrent_refined_cards; @@ -57,8 +55,7 @@ void update(); public: - G1RemSetSummary(); - G1RemSetSummary(G1RemSet* remset); + G1RemSetSummary(bool should_update = true); ~G1RemSetSummary(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp --- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -211,34 +211,41 @@ LIRGenerator* gen = access.gen(); DecoratorSet decorators = access.decorators(); - if ((decorators & IN_NATIVE) != 0) { + bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode(); + + if ((decorators & IN_NATIVE) != 0 && !is_traversal_mode) { assert(access.is_oop(), "IN_NATIVE access only for oop values"); BarrierSetC1::load_at_resolved(access, result); LIR_OprList* args = new LIR_OprList(); + LIR_Opr addr = access.resolved_addr(); + addr = ensure_in_register(gen, addr); args->append(result); + args->append(addr); BasicTypeList signature; signature.append(T_OBJECT); + signature.append(T_ADDRESS); LIR_Opr call_result = gen->call_runtime(&signature, args, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native), objectType, NULL); __ move(call_result, result); - return; - } - - if (ShenandoahLoadRefBarrier) { - LIR_Opr tmp = gen->new_register(T_OBJECT); - BarrierSetC1::load_at_resolved(access, tmp); - tmp = load_reference_barrier(access.gen(), tmp, access.resolved_addr()); - __ move(tmp, result); } else { - BarrierSetC1::load_at_resolved(access, result); + if (ShenandoahLoadRefBarrier) { + LIR_Opr tmp = gen->new_register(T_OBJECT); + BarrierSetC1::load_at_resolved(access, tmp); + tmp = load_reference_barrier(access.gen(), tmp, access.resolved_addr()); + __ move(tmp, result); + } else { + BarrierSetC1::load_at_resolved(access, result); + } } if (ShenandoahKeepAliveBarrier) { bool is_weak = (decorators & ON_WEAK_OOP_REF) != 0; bool is_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0; bool is_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0; - if (is_weak || is_phantom || is_anonymous) { + bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0 || is_traversal_mode; + + if ((is_weak || is_phantom || is_anonymous) && keep_alive) { // Register the value in the referent field with the pre-barrier LabelObj *Lcont_anonymous; if (is_anonymous) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -536,9 +536,12 @@ bool mismatched = (decorators & C2_MISMATCHED) != 0; bool unknown = (decorators & ON_UNKNOWN_OOP_REF) != 0; bool on_heap = (decorators & IN_HEAP) != 0; - bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0; + bool on_weak_ref = (decorators & (ON_WEAK_OOP_REF | ON_PHANTOM_OOP_REF)) != 0; bool is_unordered = (decorators & MO_UNORDERED) != 0; bool need_cpu_mem_bar = !is_unordered || mismatched || !on_heap; + bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode(); + bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0 || is_traversal_mode; + bool in_native = (decorators & IN_NATIVE) != 0; Node* top = Compile::current()->top(); @@ -547,7 +550,7 @@ if (access.is_oop()) { if (ShenandoahLoadRefBarrier) { - load = new ShenandoahLoadReferenceBarrierNode(NULL, load, (decorators & IN_NATIVE) != 0); + load = new ShenandoahLoadReferenceBarrierNode(NULL, load, in_native && !is_traversal_mode); if (access.is_parse_access()) { load = static_cast(access).kit()->gvn().transform(load); } else { @@ -563,7 +566,7 @@ // Also we need to add memory barrier to prevent commoning reads // from this field across safepoint since GC can change its value. bool need_read_barrier = ShenandoahKeepAliveBarrier && - (on_heap && (on_weak || (unknown && offset != top && obj != top))); + (on_weak_ref || (unknown && offset != top && obj != top)); if (!access.is_oop() || !need_read_barrier) { return load; @@ -573,7 +576,7 @@ C2ParseAccess& parse_access = static_cast(access); GraphKit* kit = parse_access.kit(); - if (on_weak) { + if (on_weak_ref && keep_alive) { // Use the pre-barrier to record the value in the referent field satb_write_barrier_pre(kit, false /* do_load */, NULL /* obj */, NULL /* adr */, max_juint /* alias_idx */, NULL /* val */, NULL /* val_type */, diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1033,7 +1033,7 @@ address calladdr = is_native ? CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native) : target; - const char* name = is_native ? "oop_load_from_native_barrier" : "load_reference_barrier"; + const char* name = is_native ? "load_reference_barrier_native" : "load_reference_barrier"; Node* call = new CallLeafNode(ShenandoahBarrierSetC2::shenandoah_load_reference_barrier_Type(), calladdr, name, TypeRawPtr::BOTTOM); call->init_req(TypeFunc::Control, ctrl); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -29,6 +29,11 @@ #include "logging/log.hpp" #include "logging/logTag.hpp" +ShenandoahPassiveHeuristics::ShenandoahPassiveHeuristics() : ShenandoahHeuristics() { + // Passive runs with max speed for allocation, because GC is always STW + SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahPacing); +} + bool ShenandoahPassiveHeuristics::should_start_gc() const { // Never do concurrent GCs. return false; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -28,7 +28,9 @@ class ShenandoahPassiveHeuristics : public ShenandoahHeuristics { public: - virtual bool should_start_gc() const; + ShenandoahPassiveHeuristics(); + + virtual bool should_start_gc() const; virtual bool should_process_references(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -75,6 +75,9 @@ RegionData *data = get_region_data_cache(heap->num_regions()); size_t cnt = 0; + // About to choose the collection set, make sure we have pinned regions in correct state + heap->assert_pinned_region_status(); + // Step 0. Prepare all regions for (size_t i = 0; i < heap->num_regions(); i++) { ShenandoahHeapRegion* r = heap->get_region(i); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -59,6 +59,9 @@ RegionData *data = get_region_data_cache(heap->num_regions()); size_t cnt = 0; + // About to choose the collection set, make sure we have pinned regions in correct state + heap->assert_pinned_region_status(); + // Step 0. Prepare all regions for (size_t i = 0; i < heap->num_regions(); i++) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -262,27 +262,39 @@ } } -oop ShenandoahBarrierSet::oop_load_from_native_barrier(oop obj) { +oop ShenandoahBarrierSet::load_reference_barrier_native(oop obj, oop* load_addr) { + return load_reference_barrier_native_impl(obj, load_addr); +} + +oop ShenandoahBarrierSet::load_reference_barrier_native(oop obj, narrowOop* load_addr) { + // Assumption: narrow oop version should not be used anywhere. + ShouldNotReachHere(); + return NULL; +} + +template +oop ShenandoahBarrierSet::load_reference_barrier_native_impl(oop obj, T* load_addr) { if (CompressedOops::is_null(obj)) { return NULL; } ShenandoahMarkingContext* const marking_context = _heap->marking_context(); - - if (_heap->is_evacuation_in_progress()) { - // Normal GC - if (!marking_context->is_marked(obj)) { + if (_heap->is_evacuation_in_progress() && !marking_context->is_marked(obj)) { + Thread* thr = Thread::current(); + if (thr->is_Java_thread()) { return NULL; - } - } else if (_heap->is_concurrent_traversal_in_progress()) { - // Traversal GC - if (marking_context->is_complete() && - !marking_context->is_marked(resolve_forwarded_not_null(obj))) { - return NULL; + } else { + return obj; } } - return load_reference_barrier_not_null(obj); + oop fwd = load_reference_barrier_not_null(obj); + if (load_addr != NULL && fwd != obj) { + // Since we are here and we know the load address, update the reference. + ShenandoahHeap::cas_oop(fwd, load_addr, obj); + } + + return fwd; } void ShenandoahBarrierSet::clone_barrier_runtime(oop src) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -84,8 +84,6 @@ void write_ref_field_work(void* v, oop o, bool release = false); - oop oop_load_from_native_barrier(oop obj); - virtual void on_thread_create(Thread* thread); virtual void on_thread_destroy(Thread* thread); virtual void on_thread_attach(Thread* thread); @@ -106,6 +104,9 @@ template oop load_reference_barrier_mutator_work(oop obj, T* load_addr); + oop load_reference_barrier_native(oop obj, oop* load_addr); + oop load_reference_barrier_native(oop obj, narrowOop* load_addr); + void enqueue(oop obj); private: @@ -118,6 +119,9 @@ oop load_reference_barrier_impl(oop obj); + template + oop load_reference_barrier_native_impl(oop obj, T* load_addr); + static void keep_alive_if_weak(DecoratorSet decorators, oop value) { assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Reference strength must be known"); const bool on_strong_oop_ref = (decorators & ON_STRONG_OOP_REF) != 0; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -69,7 +69,7 @@ template inline oop ShenandoahBarrierSet::AccessBarrier::oop_load_not_in_heap(T* addr) { oop value = Raw::oop_load_not_in_heap(addr); - value = ShenandoahBarrierSet::barrier_set()->oop_load_from_native_barrier(value); + value = ShenandoahBarrierSet::barrier_set()->load_reference_barrier_native(value, addr); keep_alive_if_weak(decorators, value); return value; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -27,6 +27,7 @@ class ShenandoahHeap; class ShenandoahMarkingContext; +class ShenandoahHeapRegionSet; class Thread; class ShenandoahForwardedIsAliveClosure: public BoolObjectClosure { @@ -65,6 +66,20 @@ inline void do_oop_work(T* p); }; +class ShenandoahTraversalUpdateRefsClosure: public OopClosure { +private: + ShenandoahHeap* const _heap; + ShenandoahHeapRegionSet* const _traversal_set; + +public: + inline ShenandoahTraversalUpdateRefsClosure(); + inline void do_oop(oop* p); + inline void do_oop(narrowOop* p); +private: + template + inline void do_oop_work(T* p); +}; + class ShenandoahEvacuateUpdateRootsClosure: public BasicOopIterateClosure { private: ShenandoahHeap* _heap; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -26,6 +26,7 @@ #include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahClosures.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" +#include "gc/shenandoah/shenandoahTraversalGC.hpp" #include "oops/compressedOops.inline.hpp" #include "runtime/thread.hpp" @@ -78,6 +79,29 @@ void ShenandoahUpdateRefsClosure::do_oop(oop* p) { do_oop_work(p); } void ShenandoahUpdateRefsClosure::do_oop(narrowOop* p) { do_oop_work(p); } +ShenandoahTraversalUpdateRefsClosure::ShenandoahTraversalUpdateRefsClosure() : + _heap(ShenandoahHeap::heap()), + _traversal_set(ShenandoahHeap::heap()->traversal_gc()->traversal_set()) { + assert(_heap->is_traversal_mode(), "Why we here?"); +} + +template +void ShenandoahTraversalUpdateRefsClosure::do_oop_work(T* p) { + T o = RawAccess<>::oop_load(p); + if (!CompressedOops::is_null(o)) { + oop obj = CompressedOops::decode_not_null(o); + if (_heap->in_collection_set(obj) || _traversal_set->is_in((HeapWord*)obj)) { + obj = ShenandoahBarrierSet::resolve_forwarded_not_null(obj); + RawAccess::oop_store(p, obj); + } else { + shenandoah_assert_not_forwarded(p, obj); + } + } +} + +void ShenandoahTraversalUpdateRefsClosure::do_oop(oop* p) { do_oop_work(p); } +void ShenandoahTraversalUpdateRefsClosure::do_oop(narrowOop* p) { do_oop_work(p); } + ShenandoahEvacuateUpdateRootsClosure::ShenandoahEvacuateUpdateRootsClosure() : _heap(ShenandoahHeap::heap()), _thread(Thread::current()) { } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -319,13 +319,20 @@ }; void ShenandoahConcurrentMark::update_thread_roots(ShenandoahPhaseTimings::Phase root_phase) { - WorkGang* workers = _heap->workers(); - bool is_par = workers->active_workers() > 1; + assert(ShenandoahSafepoint::is_at_shenandoah_safepoint(), "Must be at a safepoint"); + + ShenandoahGCPhase phase(root_phase); + #if COMPILER2_OR_JVMCI DerivedPointerTable::clear(); #endif + + WorkGang* workers = _heap->workers(); + bool is_par = workers->active_workers() > 1; + ShenandoahUpdateThreadRootsTask task(is_par, root_phase); workers->run_task(&task); + #if COMPILER2_OR_JVMCI DerivedPointerTable::update_pointers(); #endif @@ -435,8 +442,6 @@ weak_refs_work(full_gc); } - _heap->parallel_cleaning(full_gc); - assert(task_queues()->is_empty(), "Should be empty"); TASKQUEUE_STATS_ONLY(task_queues()->print_taskqueue_stats()); TASKQUEUE_STATS_ONLY(task_queues()->reset_taskqueue_stats()); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1478,6 +1478,12 @@ if (!cancelled_gc()) { concurrent_mark()->finish_mark_from_roots(/* full_gc = */ false); + // Marking is completed, deactivate SATB barrier + set_concurrent_mark_in_progress(false); + mark_complete_marking_context(); + + parallel_cleaning(false /* full gc*/); + if (has_forwarded_objects()) { // Degen may be caused by failed evacuation of roots if (is_degenerated_gc_in_progress()) { @@ -1485,39 +1491,50 @@ } else { concurrent_mark()->update_thread_roots(ShenandoahPhaseTimings::update_roots); } + set_has_forwarded_objects(false); } if (ShenandoahVerify) { verifier()->verify_roots_no_forwarded(); } - - stop_concurrent_marking(); - + // All allocations past TAMS are implicitly live, adjust the region data. + // Bitmaps/TAMS are swapped at this point, so we need to poll complete bitmap. { ShenandoahGCPhase phase(ShenandoahPhaseTimings::complete_liveness); - - // All allocations past TAMS are implicitly live, adjust the region data. - // Bitmaps/TAMS are swapped at this point, so we need to poll complete bitmap. ShenandoahCompleteLivenessClosure cl; parallel_heap_region_iterate(&cl); } + // Force the threads to reacquire their TLABs outside the collection set. + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::retire_tlabs); + make_parsable(true); + } + + // We are about to select the collection set, make sure it knows about + // current pinning status. Also, this allows trashing more regions that + // now have their pinning status dropped. + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::sync_pinned); + sync_pinned_region_status(); + } + + // Trash the collection set left over from previous cycle, if any. + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::trash_cset); + trash_cset_regions(); + } + { - ShenandoahGCPhase prepare_evac(ShenandoahPhaseTimings::prepare_evac); - - make_parsable(true); - - trash_cset_regions(); - - { - ShenandoahHeapLocker locker(lock()); - _collection_set->clear(); - _free_set->clear(); - - heuristics()->choose_collection_set(_collection_set); - - _free_set->rebuild(); - } + ShenandoahGCPhase phase(ShenandoahPhaseTimings::prepare_evac); + + ShenandoahHeapLocker locker(lock()); + _collection_set->clear(); + _free_set->clear(); + + heuristics()->choose_collection_set(_collection_set); + + _free_set->rebuild(); } // If collection set has candidates, start evacuation. @@ -1562,8 +1579,10 @@ } } else { + // If this cycle was updating references, we need to keep the has_forwarded_objects + // flag on, for subsequent phases to deal with it. concurrent_mark()->cancel(); - stop_concurrent_marking(); + set_concurrent_mark_in_progress(false); if (process_references()) { // Abandon reference processing right away: pre-cleaning must have failed. @@ -1580,7 +1599,10 @@ set_evacuation_in_progress(false); - retire_and_reset_gclabs(); + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::final_evac_retire_gclabs); + retire_and_reset_gclabs(); + } if (ShenandoahVerify) { verifier()->verify_after_evacuation(); @@ -1776,6 +1798,7 @@ // it, we fail degeneration right away and slide into Full GC to recover. { + sync_pinned_region_status(); collection_set()->clear_current_index(); ShenandoahHeapRegion* r; @@ -1855,17 +1878,6 @@ op_full(GCCause::_shenandoah_upgrade_to_full_gc); } -void ShenandoahHeap::stop_concurrent_marking() { - assert(is_concurrent_mark_in_progress(), "How else could we get here?"); - set_concurrent_mark_in_progress(false); - if (!cancelled_gc()) { - // If we needed to update refs, and concurrent marking has been cancelled, - // we need to finish updating references. - set_has_forwarded_objects(false); - mark_complete_marking_context(); - } -} - void ShenandoahHeap::force_satb_flush_all_threads() { if (!is_concurrent_mark_in_progress() && !is_concurrent_traversal_in_progress()) { // No need to flush SATBs @@ -1902,7 +1914,7 @@ } void ShenandoahHeap::set_concurrent_traversal_in_progress(bool in_progress) { - set_gc_state_mask(TRAVERSAL | HAS_FORWARDED | UPDATEREFS, in_progress); + set_gc_state_mask(TRAVERSAL, in_progress); ShenandoahBarrierSet::satb_mark_queue_set().set_active_all_threads(in_progress, !in_progress); } @@ -2034,11 +2046,19 @@ // Cleanup weak roots ShenandoahGCPhase phase(timing_phase); if (has_forwarded_objects()) { - ShenandoahForwardedIsAliveClosure is_alive; - ShenandoahUpdateRefsClosure keep_alive; - ShenandoahParallelWeakRootsCleaningTask - cleaning_task(&is_alive, &keep_alive, num_workers); - _workers->run_task(&cleaning_task); + if (is_traversal_mode()) { + ShenandoahForwardedIsAliveClosure is_alive; + ShenandoahTraversalUpdateRefsClosure keep_alive; + ShenandoahParallelWeakRootsCleaningTask + cleaning_task(&is_alive, &keep_alive, num_workers); + _workers->run_task(&cleaning_task); + } else { + ShenandoahForwardedIsAliveClosure is_alive; + ShenandoahUpdateRefsClosure keep_alive; + ShenandoahParallelWeakRootsCleaningTask + cleaning_task(&is_alive, &keep_alive, num_workers); + _workers->run_task(&cleaning_task); + } } else { ShenandoahIsAliveClosure is_alive; #ifdef ASSERT @@ -2060,7 +2080,12 @@ } void ShenandoahHeap::set_has_forwarded_objects(bool cond) { - set_gc_state_mask(HAS_FORWARDED, cond); + if (is_traversal_mode()) { + set_gc_state_mask(HAS_FORWARDED | UPDATEREFS, cond); + } else { + set_gc_state_mask(HAS_FORWARDED, cond); + } + } void ShenandoahHeap::set_process_references(bool pr) { @@ -2127,16 +2152,45 @@ } oop ShenandoahHeap::pin_object(JavaThread* thr, oop o) { - ShenandoahHeapLocker locker(lock()); - heap_region_containing(o)->make_pinned(); + heap_region_containing(o)->record_pin(); return o; } void ShenandoahHeap::unpin_object(JavaThread* thr, oop o) { + heap_region_containing(o)->record_unpin(); +} + +void ShenandoahHeap::sync_pinned_region_status() { ShenandoahHeapLocker locker(lock()); - heap_region_containing(o)->make_unpinned(); + + for (size_t i = 0; i < num_regions(); i++) { + ShenandoahHeapRegion *r = get_region(i); + if (r->is_active()) { + if (r->is_pinned()) { + if (r->pin_count() == 0) { + r->make_unpinned(); + } + } else { + if (r->pin_count() > 0) { + r->make_pinned(); + } + } + } + } + + assert_pinned_region_status(); } +#ifdef ASSERT +void ShenandoahHeap::assert_pinned_region_status() { + for (size_t i = 0; i < num_regions(); i++) { + ShenandoahHeapRegion* r = get_region(i); + assert((r->is_pinned() && r->pin_count() > 0) || (!r->is_pinned() && r->pin_count() == 0), + "Region " SIZE_FORMAT " pinning status is inconsistent", i); + } +} +#endif + GCTimer* ShenandoahHeap::gc_timer() const { return _gc_timer; } @@ -2229,7 +2283,10 @@ set_evacuation_in_progress(false); - retire_and_reset_gclabs(); + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_update_refs_retire_gclabs); + retire_and_reset_gclabs(); + } if (ShenandoahVerify) { if (!is_degenerated_gc_in_progress()) { @@ -2239,15 +2296,20 @@ } set_update_refs_in_progress(true); - make_parsable(true); - for (uint i = 0; i < num_regions(); i++) { - ShenandoahHeapRegion* r = get_region(i); - r->set_concurrent_iteration_safe_limit(r->top()); + + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_update_refs_prepare); + + make_parsable(true); + for (uint i = 0; i < num_regions(); i++) { + ShenandoahHeapRegion* r = get_region(i); + r->set_concurrent_iteration_safe_limit(r->top()); + } + + // Reset iterator. + _update_refs_iterator.reset(); } - // Reset iterator. - _update_refs_iterator.reset(); - if (ShenandoahPacing) { pacer()->setup_for_updaterefs(); } @@ -2258,7 +2320,7 @@ // Check if there is left-over work, and finish it if (_update_refs_iterator.has_next()) { - ShenandoahGCPhase final_work(ShenandoahPhaseTimings::final_update_refs_finish_work); + ShenandoahGCPhase phase(ShenandoahPhaseTimings::final_update_refs_finish_work); // Finish updating references where we left off. clear_cancelled_gc(); @@ -2287,9 +2349,18 @@ verifier()->verify_roots_in_to_space(); } - ShenandoahGCPhase final_update_refs(ShenandoahPhaseTimings::final_update_refs_recycle); - - trash_cset_regions(); + // Drop unnecessary "pinned" state from regions that does not have CP marks + // anymore, as this would allow trashing them below. + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::final_update_refs_sync_pinned); + sync_pinned_region_status(); + } + + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::final_update_refs_trash_cset); + trash_cset_regions(); + } + set_has_forwarded_objects(false); set_update_refs_in_progress(false); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -43,6 +43,7 @@ class ShenandoahGCStateResetter; class ShenandoahHeuristics; class ShenandoahMarkingContext; +class ShenandoahMarkCompact; class ShenandoahMode; class ShenandoahPhaseTimings; class ShenandoahHeap; @@ -574,6 +575,9 @@ oop pin_object(JavaThread* thread, oop obj); void unpin_object(JavaThread* thread, oop obj); + void sync_pinned_region_status(); + void assert_pinned_region_status() NOT_DEBUG_RETURN; + // ---------- Allocation support // private: @@ -713,8 +717,6 @@ void deduplicate_string(oop str); - void stop_concurrent_marking(); - private: void trash_cset_regions(); void update_heap_references(bool concurrent); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -130,15 +130,18 @@ } inline oop ShenandoahHeap::cas_oop(oop n, oop* addr, oop c) { + assert(is_aligned(addr, HeapWordSize), "Address should be aligned: " PTR_FORMAT, p2i(addr)); return (oop) Atomic::cmpxchg(n, addr, c); } inline oop ShenandoahHeap::cas_oop(oop n, narrowOop* addr, narrowOop c) { + assert(is_aligned(addr, sizeof(narrowOop)), "Address should be aligned: " PTR_FORMAT, p2i(addr)); narrowOop val = CompressedOops::encode(n); return CompressedOops::decode((narrowOop) Atomic::cmpxchg(val, addr, c)); } inline oop ShenandoahHeap::cas_oop(oop n, narrowOop* addr, oop c) { + assert(is_aligned(addr, sizeof(narrowOop)), "Address should be aligned: " PTR_FORMAT, p2i(addr)); narrowOop cmp = CompressedOops::encode(c); narrowOop val = CompressedOops::encode(n); return CompressedOops::decode((narrowOop) Atomic::cmpxchg(val, addr, cmp)); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -59,7 +59,6 @@ _reserved(MemRegion(start, size_words)), _region_number(index), _new_top(NULL), - _critical_pins(0), _empty_time(os::elapsedTime()), _state(committed ? _empty_committed : _empty_uncommitted), _tlab_allocs(0), @@ -69,7 +68,8 @@ _seqnum_first_alloc_gc(0), _seqnum_last_alloc_mutator(0), _seqnum_last_alloc_gc(0), - _live_data(0) { + _live_data(0), + _critical_pins(0) { ContiguousSpace::initialize(_reserved, true, committed); } @@ -187,25 +187,20 @@ void ShenandoahHeapRegion::make_pinned() { _heap->assert_heaplock_owned_by_current_thread(); + assert(pin_count() > 0, "Should have pins: " SIZE_FORMAT, pin_count()); + switch (_state) { case _regular: - assert (_critical_pins == 0, "sanity"); set_state(_pinned); case _pinned_cset: case _pinned: - _critical_pins++; return; case _humongous_start: - assert (_critical_pins == 0, "sanity"); set_state(_pinned_humongous_start); case _pinned_humongous_start: - _critical_pins++; return; case _cset: - guarantee(_heap->cancelled_gc(), "only valid when evac has been cancelled"); - assert (_critical_pins == 0, "sanity"); _state = _pinned_cset; - _critical_pins++; return; default: report_illegal_transition("pinning"); @@ -214,32 +209,20 @@ void ShenandoahHeapRegion::make_unpinned() { _heap->assert_heaplock_owned_by_current_thread(); + assert(pin_count() == 0, "Should not have pins: " SIZE_FORMAT, pin_count()); + switch (_state) { case _pinned: - assert (_critical_pins > 0, "sanity"); - _critical_pins--; - if (_critical_pins == 0) { - set_state(_regular); - } + set_state(_regular); return; case _regular: case _humongous_start: - assert (_critical_pins == 0, "sanity"); return; case _pinned_cset: - guarantee(_heap->cancelled_gc(), "only valid when evac has been cancelled"); - assert (_critical_pins > 0, "sanity"); - _critical_pins--; - if (_critical_pins == 0) { - set_state(_cset); - } + set_state(_cset); return; case _pinned_humongous_start: - assert (_critical_pins > 0, "sanity"); - _critical_pins--; - if (_critical_pins == 0) { - set_state(_humongous_start); - } + set_state(_humongous_start); return; default: report_illegal_transition("unpinning"); @@ -434,7 +417,7 @@ st->print("|G " SIZE_FORMAT_W(5) "%1s", byte_size_in_proper_unit(get_gclab_allocs()), proper_unit_for_byte_size(get_gclab_allocs())); st->print("|S " SIZE_FORMAT_W(5) "%1s", byte_size_in_proper_unit(get_shared_allocs()), proper_unit_for_byte_size(get_shared_allocs())); st->print("|L " SIZE_FORMAT_W(5) "%1s", byte_size_in_proper_unit(get_live_data_bytes()), proper_unit_for_byte_size(get_live_data_bytes())); - st->print("|CP " SIZE_FORMAT_W(3), _critical_pins); + st->print("|CP " SIZE_FORMAT_W(3), pin_count()); st->print("|SN " UINT64_FORMAT_X_W(12) ", " UINT64_FORMAT_X_W(8) ", " UINT64_FORMAT_X_W(8) ", " UINT64_FORMAT_X_W(8), seqnum_first_alloc_mutator(), seqnum_last_alloc_mutator(), seqnum_first_alloc_gc(), seqnum_last_alloc_gc()); @@ -702,3 +685,16 @@ } _state = to; } + +void ShenandoahHeapRegion::record_pin() { + Atomic::add((size_t)1, &_critical_pins); +} + +void ShenandoahHeapRegion::record_unpin() { + assert(pin_count() > 0, "Region " SIZE_FORMAT " should have non-zero pins", region_number()); + Atomic::sub((size_t)1, &_critical_pins); +} + +size_t ShenandoahHeapRegion::pin_count() const { + return Atomic::load(&_critical_pins); +} diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -203,6 +203,10 @@ RegionState state() const { return _state; } int state_ordinal() const { return region_state_to_ordinal(_state); } + void record_pin(); + void record_unpin(); + size_t pin_count() const; + private: static size_t RegionCount; static size_t RegionSizeBytes; @@ -238,7 +242,6 @@ // Rarely updated fields HeapWord* _new_top; - size_t _critical_pins; double _empty_time; // Seldom updated fields @@ -255,6 +258,7 @@ uint64_t _seqnum_last_alloc_gc; volatile size_t _live_data; + volatile size_t _critical_pins; // Claim some space at the end to protect next region DEFINE_PAD_MINUS_SIZE(0, DEFAULT_CACHE_LINE_SIZE, 0); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahHeuristics.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -120,6 +120,9 @@ ShenandoahHeap* heap = ShenandoahHeap::heap(); + // Check all pinned regions have updated status before choosing the collection set. + heap->assert_pinned_region_status(); + // Step 1. Build up the region candidates we care about, rejecting losers and accepting winners right away. size_t num_regions = heap->num_regions(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahLock.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -41,6 +41,9 @@ ShenandoahLock() : _state(unlocked), _owner(NULL) {}; void lock() { +#ifdef ASSERT + assert(_owner != Thread::current(), "reentrant locking attempt, would deadlock"); +#endif Thread::SpinAcquire(&_state, "Shenandoah Heap Lock"); #ifdef ASSERT assert(_state == locked, "must be locked"); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -110,7 +110,7 @@ // b. Cancel concurrent mark, if in progress if (heap->is_concurrent_mark_in_progress()) { heap->concurrent_mark()->cancel(); - heap->stop_concurrent_marking(); + heap->set_concurrent_mark_in_progress(false); } assert(!heap->is_concurrent_mark_in_progress(), "sanity"); @@ -128,6 +128,9 @@ // e. Set back forwarded objects bit back, in case some steps above dropped it. heap->set_has_forwarded_objects(has_forwarded_objects); + // f. Sync pinned region status from the CP marks + heap->sync_pinned_region_status(); + // The rest of prologue: BiasedLocking::preserve_marks(); _preserved_marks->init(heap->workers()->active_workers()); @@ -240,8 +243,8 @@ cm->update_roots(ShenandoahPhaseTimings::full_gc_roots); cm->mark_roots(ShenandoahPhaseTimings::full_gc_roots); cm->finish_mark_from_roots(/* full_gc = */ true); - heap->mark_complete_marking_context(); + heap->parallel_cleaning(true /* full_gc */); } class ShenandoahPrepareForCompactionObjectClosure : public ObjectClosure { @@ -505,6 +508,10 @@ ShenandoahHeap* heap = ShenandoahHeap::heap(); + // About to figure out which regions can be compacted, make sure pinning status + // had been updated in GC prologue. + heap->assert_pinned_region_status(); + { // Trash the immediately collectible regions before computing addresses ShenandoahTrashImmediateGarbageClosure tigcl; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -214,15 +214,30 @@ _mark_context(ShenandoahHeap::heap()->marking_context()) { } - template + template void work(T* p); }; +class ShenandoahTraversalRootsClosure : public ShenandoahTraversalSuperClosure { +private: + template + inline void do_oop_work(T* p) { work(p); } + +public: + ShenandoahTraversalRootsClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : + ShenandoahTraversalSuperClosure(q, rp) {} + + virtual void do_oop(narrowOop* p) { do_oop_work(p); } + virtual void do_oop(oop* p) { do_oop_work(p); } + + virtual bool do_metadata() { return false; } +}; + class ShenandoahTraversalClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -237,7 +252,7 @@ class ShenandoahTraversalMetadataClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalMetadataClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -252,7 +267,7 @@ class ShenandoahTraversalDedupClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalDedupClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -267,7 +282,7 @@ class ShenandoahTraversalMetadataDedupClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalMetadataDedupClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -282,7 +297,7 @@ class ShenandoahTraversalDegenClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalDegenClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -297,7 +312,7 @@ class ShenandoahTraversalMetadataDegenClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalMetadataDegenClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -312,7 +327,7 @@ class ShenandoahTraversalDedupDegenClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalDedupDegenClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -327,7 +342,7 @@ class ShenandoahTraversalMetadataDedupDegenClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalMetadataDedupDegenClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -38,9 +38,9 @@ _heap->maybe_update_with_forwarded(p); } -template +template inline void ShenandoahTraversalSuperClosure::work(T* p) { - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } #endif // SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -100,8 +100,10 @@ f(purge_par, " Parallel Cleanup") \ f(purge_cldg, " CLDG") \ f(complete_liveness, " Complete Liveness") \ + f(retire_tlabs, " Retire TLABs") \ + f(sync_pinned, " Sync Pinned") \ + f(trash_cset, " Trash CSet") \ f(prepare_evac, " Prepare Evacuation") \ - f(recycle_regions, " Recycle regions") \ \ /* Per-thread timer block, should have "roots" counters in consistent order */ \ f(init_evac, " Initial Evacuation") \ @@ -127,9 +129,12 @@ \ f(final_evac_gross, "Pause Final Evac (G)") \ f(final_evac, "Pause Final Evac (N)") \ + f(final_evac_retire_gclabs, " Retire GCLABs") \ \ f(init_update_refs_gross, "Pause Init Update Refs (G)") \ f(init_update_refs, "Pause Init Update Refs (N)") \ + f(init_update_refs_retire_gclabs, " Retire GCLABs") \ + f(init_update_refs_prepare, " Prepare") \ \ f(final_update_refs_gross, "Pause Final Update Refs (G)") \ f(final_update_refs, "Pause Final Update Refs (N)") \ @@ -157,7 +162,8 @@ f(final_update_refs_string_dedup_queue_roots, " UR: Dedup Queue Roots") \ f(final_update_refs_finish_queues, " UR: Finish Queues") \ \ - f(final_update_refs_recycle, " Recycle") \ + f(final_update_refs_sync_pinned, " Sync Pinned") \ + f(final_update_refs_trash_cset, " Trash CSet") \ \ f(degen_gc_gross, "Pause Degenerated GC (G)") \ f(degen_gc, "Pause Degenerated GC (N)") \ @@ -189,6 +195,7 @@ f(traversal_gc_prepare, " Prepare") \ f(traversal_gc_make_parsable, " Make Parsable") \ f(traversal_gc_resize_tlabs, " Resize TLABs") \ + f(traversal_gc_prepare_sync_pinned, " Sync Pinned") \ \ /* Per-thread timer block, should have "roots" counters in consistent order */ \ f(init_traversal_gc_work, " Work") \ @@ -260,6 +267,7 @@ f(final_traversal_update_string_dedup_queue_roots, " TU: Dedup Queue Roots") \ f(final_traversal_update_finish_queues, " TU: Finish Queues") \ \ + f(traversal_gc_sync_pinned, " Sync Pinned") \ f(traversal_gc_cleanup, " Cleanup") \ \ f(full_gc_gross, "Pause Full GC (G)") \ diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -189,6 +189,18 @@ _thread_roots(n_workers > 1) { } +void ShenandoahRootUpdater::strong_roots_do(uint worker_id, OopClosure* oops_cl) { + CodeBlobToOopClosure update_blobs(oops_cl, CodeBlobToOopClosure::FixRelocations); + CLDToOopClosure clds(oops_cl, ClassLoaderData::_claim_strong); + + _serial_roots.oops_do(oops_cl, worker_id); + _vm_roots.oops_do(oops_cl, worker_id); + + _thread_roots.oops_do(oops_cl, NULL, worker_id); + _cld_roots.cld_do(&clds, worker_id); + _code_roots.code_blobs_do(&update_blobs, worker_id); +} + ShenandoahRootAdjuster::ShenandoahRootAdjuster(uint n_workers, ShenandoahPhaseTimings::Phase phase) : ShenandoahRootProcessor(phase), _thread_roots(n_workers > 1) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -304,6 +304,8 @@ template void roots_do(uint worker_id, IsAlive* is_alive, KeepAlive* keep_alive); + + void strong_roots_do(uint worker_id, OopClosure* oops_cl); }; // Adjuster all roots at a safepoint during full gc diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -82,6 +82,6 @@ ShenandoahBarrierSet::barrier_set()->clone_barrier(s); JRT_END -JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_native(oopDesc * src)) - return (oopDesc*) ShenandoahBarrierSet::barrier_set()->oop_load_from_native_barrier(oop(src)); +JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_native(oopDesc * src, oop* load_addr)) + return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier_native(oop(src), load_addr); JRT_END diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -42,7 +42,7 @@ static oopDesc* load_reference_barrier_fixup(oopDesc* src, oop* load_addr); static oopDesc* load_reference_barrier_fixup_narrow(oopDesc* src, narrowOop* load_addr); - static oopDesc* load_reference_barrier_native(oopDesc* src); + static oopDesc* load_reference_barrier_native(oopDesc* src, oop* load_addr); static void shenandoah_clone_barrier(oopDesc* src); }; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -186,7 +186,7 @@ // Step 1: Process ordinary GC roots. { - ShenandoahTraversalClosure roots_cl(q, rp); + ShenandoahTraversalRootsClosure roots_cl(q, rp); ShenandoahMarkCLDClosure cld_cl(&roots_cl); MarkingCodeBlobClosure code_cl(&roots_cl, CodeBlobToOopClosure::FixRelocations); if (unload_classes) { @@ -266,7 +266,7 @@ // in similar way during nmethod-register process. Therefore, we don't need to rescan code // roots here. if (!_heap->is_degenerated_gc_in_progress()) { - ShenandoahTraversalClosure roots_cl(q, rp); + ShenandoahTraversalRootsClosure roots_cl(q, rp); ShenandoahTraversalSATBThreadsClosure tc(&satb_cl); if (unload_classes) { ShenandoahRemarkCLDClosure remark_cld_cl(&roots_cl); @@ -340,9 +340,6 @@ } void ShenandoahTraversalGC::prepare() { - _heap->collection_set()->clear(); - assert(_heap->collection_set()->count() == 0, "collection set not clear"); - { ShenandoahGCPhase phase(ShenandoahPhaseTimings::traversal_gc_make_parsable); _heap->make_parsable(true); @@ -356,15 +353,26 @@ assert(_heap->marking_context()->is_bitmap_clear(), "need clean mark bitmap"); assert(!_heap->marking_context()->is_complete(), "should not be complete"); - ShenandoahFreeSet* free_set = _heap->free_set(); + // About to choose the collection set, make sure we know which regions are pinned. + { + ShenandoahGCPhase phase_cleanup(ShenandoahPhaseTimings::traversal_gc_prepare_sync_pinned); + _heap->sync_pinned_region_status(); + } + ShenandoahCollectionSet* collection_set = _heap->collection_set(); + { + ShenandoahHeapLocker lock(_heap->lock()); - // Find collection set - _heap->heuristics()->choose_collection_set(collection_set); - prepare_regions(); + collection_set->clear(); + assert(collection_set->count() == 0, "collection set not clear"); - // Rebuild free set - free_set->rebuild(); + // Find collection set + _heap->heuristics()->choose_collection_set(collection_set); + prepare_regions(); + + // Rebuild free set + _heap->free_set()->rebuild(); + } log_info(gc, ergo)("Collectable Garbage: " SIZE_FORMAT "%s, " SIZE_FORMAT "%s CSet, " SIZE_FORMAT " CSet regions", byte_size_in_proper_unit(collection_set->garbage()), proper_unit_for_byte_size(collection_set->garbage()), @@ -385,11 +393,11 @@ { ShenandoahGCPhase phase_prepare(ShenandoahPhaseTimings::traversal_gc_prepare); - ShenandoahHeapLocker lock(_heap->lock()); prepare(); } _heap->set_concurrent_traversal_in_progress(true); + _heap->set_has_forwarded_objects(true); bool process_refs = _heap->process_references(); if (process_refs) { @@ -601,14 +609,24 @@ TASKQUEUE_STATS_ONLY(_task_queues->reset_taskqueue_stats()); // No more marking expected + _heap->set_concurrent_traversal_in_progress(false); _heap->mark_complete_marking_context(); fixup_roots(); _heap->parallel_cleaning(false); + _heap->set_has_forwarded_objects(false); + // Resize metaspace MetaspaceGC::compute_new_size(); + // Need to see that pinned region status is updated: newly pinned regions must not + // be trashed. New unpinned regions should be trashed. + { + ShenandoahGCPhase phase_cleanup(ShenandoahPhaseTimings::traversal_gc_sync_pinned); + _heap->sync_pinned_region_status(); + } + // Still good? We can now trash the cset, and make final verification { ShenandoahGCPhase phase_cleanup(ShenandoahPhaseTimings::traversal_gc_cleanup); @@ -651,7 +669,6 @@ } assert(_task_queues->is_empty(), "queues must be empty after traversal GC"); - _heap->set_concurrent_traversal_in_progress(false); assert(!_heap->cancelled_gc(), "must not be cancelled when getting out here"); if (ShenandoahVerify) { @@ -697,8 +714,7 @@ void work(uint worker_id) { ShenandoahParallelWorkerSession worker_session(worker_id); ShenandoahTraversalFixRootsClosure cl; - ShenandoahForwardedIsAliveClosure is_alive; - _rp->roots_do(worker_id, &is_alive, &cl); + _rp->strong_roots_do(worker_id, &cl); } }; @@ -751,7 +767,7 @@ template inline void do_oop_work(T* p) { - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } public: @@ -773,7 +789,7 @@ template inline void do_oop_work(T* p) { - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } public: @@ -796,7 +812,7 @@ template inline void do_oop_work(T* p) { ShenandoahEvacOOMScope evac_scope; - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } public: @@ -819,7 +835,7 @@ template inline void do_oop_work(T* p) { ShenandoahEvacOOMScope evac_scope; - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } public: diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -48,7 +48,7 @@ void concurrent_traversal_collection(); void final_traversal_collection(); - template + template inline void process_oop(T* p, Thread* thread, ShenandoahObjToScanQueue* queue, ShenandoahMarkingContext* const mark_context); bool check_and_handle_cancelled_gc(ShenandoahTaskTerminator* terminator, bool sts_yield); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -35,12 +35,13 @@ #include "oops/compressedOops.inline.hpp" #include "oops/oop.inline.hpp" -template +template void ShenandoahTraversalGC::process_oop(T* p, Thread* thread, ShenandoahObjToScanQueue* queue, ShenandoahMarkingContext* const mark_context) { T o = RawAccess<>::oop_load(p); if (!CompressedOops::is_null(o)) { oop obj = CompressedOops::decode_not_null(o); if (DEGEN) { + assert(!ATOMIC_UPDATE, "Degen path assumes non-atomic updates"); oop forw = ShenandoahBarrierSet::resolve_forwarded_not_null(obj); if (obj != forw) { // Update reference. @@ -54,7 +55,11 @@ } shenandoah_assert_forwarded_except(p, obj, _heap->cancelled_gc()); // Update reference. - ShenandoahHeap::cas_oop(forw, p, obj); + if (ATOMIC_UPDATE) { + ShenandoahHeap::cas_oop(forw, p, obj); + } else { + RawAccess::oop_store(p, forw); + } obj = forw; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zArray.hpp --- a/src/hotspot/share/gc/z/zArray.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zArray.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -74,15 +74,13 @@ template class ZArrayIterator : public ZArrayIteratorImpl { public: - ZArrayIterator(ZArray* array) : - ZArrayIteratorImpl(array) {} + ZArrayIterator(ZArray* array); }; template class ZArrayParallelIterator : public ZArrayIteratorImpl { public: - ZArrayParallelIterator(ZArray* array) : - ZArrayIteratorImpl(array) {} + ZArrayParallelIterator(ZArray* array); }; #endif // SHARE_GC_Z_ZARRAY_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zArray.inline.hpp --- a/src/hotspot/share/gc/z/zArray.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zArray.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -117,4 +117,12 @@ return false; } +template +inline ZArrayIterator::ZArrayIterator(ZArray* array) : + ZArrayIteratorImpl(array) {} + +template +inline ZArrayParallelIterator::ZArrayParallelIterator(ZArray* array) : + ZArrayIteratorImpl(array) {} + #endif // SHARE_GC_Z_ZARRAY_INLINE_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zCPU.cpp --- a/src/hotspot/share/gc/z/zCPU.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zCPU.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -22,15 +22,15 @@ */ #include "precompiled.hpp" -#include "gc/z/zCPU.hpp" +#include "gc/z/zCPU.inline.hpp" #include "logging/log.hpp" #include "memory/padded.inline.hpp" #include "runtime/os.hpp" #include "runtime/thread.inline.hpp" #include "utilities/debug.hpp" -#define ZCPU_UNKNOWN_AFFINITY (Thread*)-1; -#define ZCPU_UNKNOWN_SELF (Thread*)-2; +#define ZCPU_UNKNOWN_AFFINITY ((Thread*)-1) +#define ZCPU_UNKNOWN_SELF ((Thread*)-2) PaddedEnd* ZCPU::_affinity = NULL; THREAD_LOCAL Thread* ZCPU::_self = ZCPU_UNKNOWN_SELF; @@ -51,20 +51,13 @@ os::initial_active_processor_count()); } -uint32_t ZCPU::count() { - return os::processor_count(); -} - -uint32_t ZCPU::id() { - assert(_affinity != NULL, "Not initialized"); - - // Fast path - if (_affinity[_cpu]._thread == _self) { - return _cpu; +uint32_t ZCPU::id_slow() { + // Set current thread + if (_self == ZCPU_UNKNOWN_SELF) { + _self = Thread::current(); } - // Slow path - _self = Thread::current(); + // Set current CPU _cpu = os::processor_id(); // Update affinity table diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zCPU.hpp --- a/src/hotspot/share/gc/z/zCPU.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zCPU.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -40,6 +40,8 @@ static THREAD_LOCAL Thread* _self; static THREAD_LOCAL uint32_t _cpu; + static uint32_t id_slow(); + public: static void initialize(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zCPU.inline.hpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hotspot/share/gc/z/zCPU.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,47 @@ +/* + * 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_Z_ZCPU_INLINE_HPP +#define SHARE_GC_Z_ZCPU_INLINE_HPP + +#include "gc/z/zCPU.hpp" +#include "runtime/os.hpp" +#include "utilities/debug.hpp" + +inline uint32_t ZCPU::count() { + return os::processor_count(); +} + +inline uint32_t ZCPU::id() { + assert(_affinity != NULL, "Not initialized"); + + // Fast path + if (_affinity[_cpu]._thread == _self) { + return _cpu; + } + + // Slow path + return id_slow(); +} + +#endif // SHARE_GC_Z_ZCPU_INLINE_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zDirector.cpp --- a/src/hotspot/share/gc/z/zDirector.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zDirector.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -48,14 +48,6 @@ ZStatAllocRate::avg_sd() / M); } -bool ZDirector::is_first() const { - return ZStatCycle::ncycles() == 0; -} - -bool ZDirector::is_warm() const { - return ZStatCycle::ncycles() >= 3; -} - bool ZDirector::rule_timer() const { if (ZCollectionInterval == 0) { // Rule disabled @@ -73,7 +65,7 @@ } bool ZDirector::rule_warmup() const { - if (is_warm()) { + if (ZStatCycle::is_warm()) { // Rule disabled return false; } @@ -93,7 +85,7 @@ } bool ZDirector::rule_allocation_rate() const { - if (is_first()) { + if (ZStatCycle::is_first()) { // Rule disabled return false; } @@ -140,7 +132,7 @@ } bool ZDirector::rule_proactive() const { - if (!ZProactive || !is_warm()) { + if (!ZProactive || !ZStatCycle::is_warm()) { // Rule disabled return false; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zDirector.hpp --- a/src/hotspot/share/gc/z/zDirector.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zDirector.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -36,9 +36,6 @@ void sample_allocation_rate() const; - bool is_first() const; - bool is_warm() const; - bool rule_timer() const; bool rule_warmup() const; bool rule_allocation_rate() const; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zDriver.cpp --- a/src/hotspot/share/gc/z/zDriver.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zDriver.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -250,11 +250,17 @@ case GCCause::_z_allocation_stall: case GCCause::_z_proactive: case GCCause::_z_high_usage: - case GCCause::_metadata_GC_threshold: // Start asynchronous GC _gc_cycle_port.send_async(cause); break; + case GCCause::_metadata_GC_threshold: + // Start asynchronous GC, but only if the GC is warm + if (ZStatCycle::is_warm()) { + _gc_cycle_port.send_async(cause); + } + break; + case GCCause::_gc_locker: // Restart VM operation previously blocked by the GC locker _gc_locker_port.signal(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zHeap.cpp --- a/src/hotspot/share/gc/z/zHeap.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zHeap.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -34,7 +34,7 @@ #include "gc/z/zRelocationSetSelector.hpp" #include "gc/z/zResurrection.hpp" #include "gc/z/zStat.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zVerify.hpp" #include "gc/z/zWorkers.inline.hpp" #include "logging/log.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zList.hpp --- a/src/hotspot/share/gc/z/zList.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zList.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -25,7 +25,6 @@ #define SHARE_GC_Z_ZLIST_HPP #include "memory/allocation.hpp" -#include "utilities/debug.hpp" template class ZList; @@ -38,27 +37,15 @@ ZListNode* _next; ZListNode* _prev; - ZListNode(ZListNode* next, ZListNode* prev) : - _next(next), - _prev(prev) {} + ZListNode(ZListNode* next, ZListNode* prev); - void set_unused() { - _next = NULL; - _prev = NULL; - } + void set_unused(); public: - ZListNode() { - set_unused(); - } + ZListNode(); + ~ZListNode(); - ~ZListNode() { - set_unused(); - } - - bool is_unused() const { - return _next == NULL && _prev == NULL; - } + bool is_unused() const; }; // Doubly linked list @@ -72,139 +59,34 @@ ZList(const ZList& list); ZList& operator=(const ZList& list); - void verify() const { - assert(_head._next->_prev == &_head, "List corrupt"); - assert(_head._prev->_next == &_head, "List corrupt"); - } - - void insert(ZListNode* before, ZListNode* node) { - verify(); + void verify() const; - assert(node->is_unused(), "Already in a list"); - node->_prev = before; - node->_next = before->_next; - before->_next = node; - node->_next->_prev = node; + void insert(ZListNode* before, ZListNode* node); - _size++; - } - - ZListNode* cast_to_inner(T* elem) const { - return &elem->_node; - } - - T* cast_to_outer(ZListNode* node) const { - return (T*)((uintptr_t)node - offset_of(T, _node)); - } + ZListNode* cast_to_inner(T* elem) const; + T* cast_to_outer(ZListNode* node) const; public: - ZList() : - _head(&_head, &_head), - _size(0) { - verify(); - } - - size_t size() const { - verify(); - return _size; - } + ZList(); - bool is_empty() const { - return _size == 0; - } - - T* first() const { - return is_empty() ? NULL : cast_to_outer(_head._next); - } - - T* last() const { - return is_empty() ? NULL : cast_to_outer(_head._prev); - } + size_t size() const; + bool is_empty() const; - T* next(T* elem) const { - verify(); - ZListNode* next = cast_to_inner(elem)->_next; - return (next == &_head) ? NULL : cast_to_outer(next); - } - - T* prev(T* elem) const { - verify(); - ZListNode* prev = cast_to_inner(elem)->_prev; - return (prev == &_head) ? NULL : cast_to_outer(prev); - } - - void insert_first(T* elem) { - insert(&_head, cast_to_inner(elem)); - } - - void insert_last(T* elem) { - insert(_head._prev, cast_to_inner(elem)); - } - - void insert_before(T* before, T* elem) { - insert(cast_to_inner(before)->_prev, cast_to_inner(elem)); - } - - void insert_after(T* after, T* elem) { - insert(cast_to_inner(after), cast_to_inner(elem)); - } - - void remove(T* elem) { - verify(); + T* first() const; + T* last() const; + T* next(T* elem) const; + T* prev(T* elem) const; - ZListNode* const node = cast_to_inner(elem); - assert(!node->is_unused(), "Not in a list"); - - ZListNode* const next = node->_next; - ZListNode* const prev = node->_prev; - assert(next->_prev == node, "List corrupt"); - assert(prev->_next == node, "List corrupt"); - - prev->_next = next; - next->_prev = prev; - node->set_unused(); - - _size--; - } - - T* remove_first() { - T* elem = first(); - if (elem != NULL) { - remove(elem); - } - - return elem; - } + void insert_first(T* elem); + void insert_last(T* elem); + void insert_before(T* before, T* elem); + void insert_after(T* after, T* elem); - T* remove_last() { - T* elem = last(); - if (elem != NULL) { - remove(elem); - } - - return elem; - } - - void transfer(ZList* list) { - verify(); + void remove(T* elem); + T* remove_first(); + T* remove_last(); - if (!list->is_empty()) { - list->_head._next->_prev = _head._prev; - list->_head._prev->_next = _head._prev->_next; - - _head._prev->_next = list->_head._next; - _head._prev = list->_head._prev; - - list->_head._next = &list->_head; - list->_head._prev = &list->_head; - - _size += list->_size; - list->_size = 0; - - list->verify(); - verify(); - } - } + void transfer(ZList* list); }; template @@ -226,15 +108,13 @@ template class ZListIterator : public ZListIteratorImpl { public: - ZListIterator(const ZList* list) : - ZListIteratorImpl(list) {} + ZListIterator(const ZList* list); }; template class ZListReverseIterator : public ZListIteratorImpl { public: - ZListReverseIterator(const ZList* list) : - ZListIteratorImpl(list) {} + ZListReverseIterator(const ZList* list); }; #endif // SHARE_GC_Z_ZLIST_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zList.inline.hpp --- a/src/hotspot/share/gc/z/zList.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zList.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -25,14 +25,193 @@ #define SHARE_GC_Z_ZLIST_INLINE_HPP #include "gc/z/zList.hpp" +#include "utilities/debug.hpp" + +template +inline ZListNode::ZListNode(ZListNode* next, ZListNode* prev) : + _next(next), + _prev(prev) {} + +template +inline void ZListNode::set_unused() { + _next = NULL; + _prev = NULL; +} + +template +inline ZListNode::ZListNode() { + set_unused(); +} + +template +inline ZListNode::~ZListNode() { + set_unused(); +} + +template +inline bool ZListNode::is_unused() const { + return _next == NULL && _prev == NULL; +} + +template +inline void ZList::verify() const { + assert(_head._next->_prev == &_head, "List corrupt"); + assert(_head._prev->_next == &_head, "List corrupt"); +} + +template +inline void ZList::insert(ZListNode* before, ZListNode* node) { + verify(); + + assert(node->is_unused(), "Already in a list"); + node->_prev = before; + node->_next = before->_next; + before->_next = node; + node->_next->_prev = node; + + _size++; +} + +template +inline ZListNode* ZList::cast_to_inner(T* elem) const { + return &elem->_node; +} + +template +inline T* ZList::cast_to_outer(ZListNode* node) const { + return (T*)((uintptr_t)node - offset_of(T, _node)); +} + +template +inline ZList::ZList() : + _head(&_head, &_head), + _size(0) { + verify(); +} + +template +inline size_t ZList::size() const { + verify(); + return _size; +} + +template +inline bool ZList::is_empty() const { + return _size == 0; +} + +template +inline T* ZList::first() const { + return is_empty() ? NULL : cast_to_outer(_head._next); +} + +template +inline T* ZList::last() const { + return is_empty() ? NULL : cast_to_outer(_head._prev); +} + +template +inline T* ZList::next(T* elem) const { + verify(); + ZListNode* next = cast_to_inner(elem)->_next; + return (next == &_head) ? NULL : cast_to_outer(next); +} + +template +inline T* ZList::prev(T* elem) const { + verify(); + ZListNode* prev = cast_to_inner(elem)->_prev; + return (prev == &_head) ? NULL : cast_to_outer(prev); +} + +template +inline void ZList::insert_first(T* elem) { + insert(&_head, cast_to_inner(elem)); +} + +template +inline void ZList::insert_last(T* elem) { + insert(_head._prev, cast_to_inner(elem)); +} + +template +inline void ZList::insert_before(T* before, T* elem) { + insert(cast_to_inner(before)->_prev, cast_to_inner(elem)); +} + +template +inline void ZList::insert_after(T* after, T* elem) { + insert(cast_to_inner(after), cast_to_inner(elem)); +} + +template +inline void ZList::remove(T* elem) { + verify(); + + ZListNode* const node = cast_to_inner(elem); + assert(!node->is_unused(), "Not in a list"); + + ZListNode* const next = node->_next; + ZListNode* const prev = node->_prev; + assert(next->_prev == node, "List corrupt"); + assert(prev->_next == node, "List corrupt"); + + prev->_next = next; + next->_prev = prev; + node->set_unused(); + + _size--; +} + +template +inline T* ZList::remove_first() { + T* elem = first(); + if (elem != NULL) { + remove(elem); + } + + return elem; +} + +template +inline T* ZList::remove_last() { + T* elem = last(); + if (elem != NULL) { + remove(elem); + } + + return elem; +} + +template +inline void ZList::transfer(ZList* list) { + verify(); + + if (!list->is_empty()) { + list->_head._next->_prev = _head._prev; + list->_head._prev->_next = _head._prev->_next; + + _head._prev->_next = list->_head._next; + _head._prev = list->_head._prev; + + list->_head._next = &list->_head; + list->_head._prev = &list->_head; + + _size += list->_size; + list->_size = 0; + + list->verify(); + verify(); + } +} template -ZListIteratorImpl::ZListIteratorImpl(const ZList* list) : +inline ZListIteratorImpl::ZListIteratorImpl(const ZList* list) : _list(list), _next(forward ? list->first() : list->last()) {} template -bool ZListIteratorImpl::next(T** elem) { +inline bool ZListIteratorImpl::next(T** elem) { if (_next != NULL) { *elem = _next; _next = forward ? _list->next(_next) : _list->prev(_next); @@ -43,4 +222,12 @@ return false; } +template +inline ZListIterator::ZListIterator(const ZList* list) : + ZListIteratorImpl(list) {} + +template +inline ZListReverseIterator::ZListReverseIterator(const ZList* list) : + ZListIteratorImpl(list) {} + #endif // SHARE_GC_Z_ZLIST_INLINE_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zLiveMap.cpp --- a/src/hotspot/share/gc/z/zLiveMap.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zLiveMap.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -25,7 +25,7 @@ #include "gc/z/zHeap.inline.hpp" #include "gc/z/zLiveMap.inline.hpp" #include "gc/z/zStat.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "logging/log.hpp" #include "runtime/atomic.hpp" #include "runtime/orderAccess.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zMark.cpp --- a/src/hotspot/share/gc/z/zMark.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zMark.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -34,7 +34,7 @@ #include "gc/z/zRootsIterator.hpp" #include "gc/z/zStat.hpp" #include "gc/z/zTask.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zThreadLocalAllocBuffer.hpp" #include "gc/z/zUtils.inline.hpp" #include "gc/z/zWorkers.inline.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zMemory.inline.hpp --- a/src/hotspot/share/gc/z/zMemory.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zMemory.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -24,6 +24,7 @@ #ifndef SHARE_GC_Z_ZMEMORY_INLINE_HPP #define SHARE_GC_Z_ZMEMORY_INLINE_HPP +#include "gc/z/zList.inline.hpp" #include "gc/z/zMemory.hpp" #include "utilities/debug.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zObjectAllocator.cpp --- a/src/hotspot/share/gc/z/zObjectAllocator.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 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 @@ -28,8 +28,9 @@ #include "gc/z/zObjectAllocator.hpp" #include "gc/z/zPage.inline.hpp" #include "gc/z/zStat.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zUtils.inline.hpp" +#include "gc/z/zValue.inline.hpp" #include "logging/log.hpp" #include "runtime/atomic.hpp" #include "runtime/safepoint.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zObjectAllocator.hpp --- a/src/hotspot/share/gc/z/zObjectAllocator.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zObjectAllocator.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zPage.cpp --- a/src/hotspot/share/gc/z/zPage.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zPage.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -22,6 +22,7 @@ */ #include "precompiled.hpp" +#include "gc/z/zList.inline.hpp" #include "gc/z/zPage.inline.hpp" #include "gc/z/zPhysicalMemory.inline.hpp" #include "gc/z/zVirtualMemory.inline.hpp" @@ -52,6 +53,8 @@ assert_initialized(); } +ZPage::~ZPage() {} + void ZPage::assert_initialized() const { assert(!_virtual.is_null(), "Should not be null"); assert(!_physical.is_null(), "Should not be null"); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zPage.hpp --- a/src/hotspot/share/gc/z/zPage.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zPage.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -56,6 +56,7 @@ public: ZPage(const ZVirtualMemory& vmem, const ZPhysicalMemory& pmem); ZPage(uint8_t type, const ZVirtualMemory& vmem, const ZPhysicalMemory& pmem); + ~ZPage(); uint32_t object_max_count() const; size_t object_alignment_shift() const; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zPageCache.cpp --- a/src/hotspot/share/gc/z/zPageCache.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zPageCache.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -27,6 +27,7 @@ #include "gc/z/zPage.inline.hpp" #include "gc/z/zPageCache.hpp" #include "gc/z/zStat.hpp" +#include "gc/z/zValue.inline.hpp" #include "logging/log.hpp" static const ZStatCounter ZCounterPageCacheHitL1("Memory", "Page Cache Hit L1", ZStatUnitOpsPerSecond); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zPageCache.inline.hpp --- a/src/hotspot/share/gc/z/zPageCache.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zPageCache.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -26,6 +26,7 @@ #include "gc/z/zList.inline.hpp" #include "gc/z/zPageCache.hpp" +#include "gc/z/zValue.inline.hpp" inline size_t ZPageCache::available() const { return _available; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zReferenceProcessor.cpp --- a/src/hotspot/share/gc/z/zReferenceProcessor.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zReferenceProcessor.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -32,6 +32,7 @@ #include "gc/z/zTask.hpp" #include "gc/z/zTracer.inline.hpp" #include "gc/z/zUtils.inline.hpp" +#include "gc/z/zValue.inline.hpp" #include "memory/universe.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/os.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zRelocate.cpp --- a/src/hotspot/share/gc/z/zRelocate.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zRelocate.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -33,6 +33,7 @@ #include "gc/z/zRootsIterator.hpp" #include "gc/z/zStat.hpp" #include "gc/z/zTask.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zThreadLocalAllocBuffer.hpp" #include "gc/z/zWorkers.hpp" #include "logging/log.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zStat.cpp --- a/src/hotspot/share/gc/z/zStat.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zStat.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -23,7 +23,7 @@ #include "precompiled.hpp" #include "gc/z/zCollectedHeap.hpp" -#include "gc/z/zCPU.hpp" +#include "gc/z/zCPU.inline.hpp" #include "gc/z/zGlobals.hpp" #include "gc/z/zHeap.inline.hpp" #include "gc/z/zLargePages.inline.hpp" @@ -716,7 +716,7 @@ } void ZStatSubPhase::register_end(const Ticks& start, const Ticks& end) const { - ZTracer::tracer()->report_thread_phase(*this, start, end); + ZTracer::tracer()->report_thread_phase(name(), start, end); const Tickspan duration = end - start; ZStatSample(_sampler, duration.value()); @@ -736,7 +736,7 @@ } void ZStatCriticalPhase::register_end(const Ticks& start, const Ticks& end) const { - ZTracer::tracer()->report_thread_phase(*this, start, end); + ZTracer::tracer()->report_thread_phase(name(), start, end); const Tickspan duration = end - start; ZStatSample(_sampler, duration.value()); @@ -759,7 +759,7 @@ // // Stat sample/inc // -void ZStatSample(const ZStatSampler& sampler, uint64_t value, bool trace) { +void ZStatSample(const ZStatSampler& sampler, uint64_t value) { ZStatSamplerData* const cpu_data = sampler.get(); Atomic::add(1u, &cpu_data->_nsamples); Atomic::add(value, &cpu_data->_sum); @@ -782,18 +782,14 @@ max = prev_max; } - if (trace) { - ZTracer::tracer()->report_stat_sampler(sampler, value); - } + ZTracer::tracer()->report_stat_sampler(sampler, value); } -void ZStatInc(const ZStatCounter& counter, uint64_t increment, bool trace) { +void ZStatInc(const ZStatCounter& counter, uint64_t increment) { ZStatCounterData* const cpu_data = counter.get(); const uint64_t value = Atomic::add(increment, &cpu_data->_counter); - if (trace) { - ZTracer::tracer()->report_stat_counter(counter, increment, value); - } + ZTracer::tracer()->report_stat_counter(counter, increment, value); } void ZStatInc(const ZStatUnsampledCounter& counter, uint64_t increment) { @@ -1049,6 +1045,14 @@ _normalized_duration.add(normalized_duration); } +bool ZStatCycle::is_first() { + return _ncycles == 0; +} + +bool ZStatCycle::is_warm() { + return _ncycles >= 3; +} + uint64_t ZStatCycle::ncycles() { return _ncycles; } @@ -1215,6 +1219,20 @@ ZStatHeap::ZAtRelocateStart ZStatHeap::_at_relocate_start; ZStatHeap::ZAtRelocateEnd ZStatHeap::_at_relocate_end; +size_t ZStatHeap::capacity_high() { + return MAX4(_at_mark_start.capacity, + _at_mark_end.capacity, + _at_relocate_start.capacity, + _at_relocate_end.capacity); +} + +size_t ZStatHeap::capacity_low() { + return MIN4(_at_mark_start.capacity, + _at_mark_end.capacity, + _at_relocate_start.capacity, + _at_relocate_end.capacity); +} + size_t ZStatHeap::available(size_t used) { return _at_initialize.max_capacity - used; } @@ -1282,8 +1300,8 @@ size_t used_high, size_t used_low) { _at_relocate_end.capacity = capacity; - _at_relocate_end.capacity_high = capacity; - _at_relocate_end.capacity_low = _at_mark_start.capacity; + _at_relocate_end.capacity_high = capacity_high(); + _at_relocate_end.capacity_low = capacity_low(); _at_relocate_end.reserve = reserve(used); _at_relocate_end.reserve_high = reserve(used_low); _at_relocate_end.reserve_low = reserve(used_high); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zStat.hpp --- a/src/hotspot/share/gc/z/zStat.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zStat.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -315,8 +315,8 @@ // // Stat sample/increment // -void ZStatSample(const ZStatSampler& sampler, uint64_t value, bool trace = ZStatisticsForceTrace); -void ZStatInc(const ZStatCounter& counter, uint64_t increment = 1, bool trace = ZStatisticsForceTrace); +void ZStatSample(const ZStatSampler& sampler, uint64_t value); +void ZStatInc(const ZStatCounter& counter, uint64_t increment = 1); void ZStatInc(const ZStatUnsampledCounter& counter, uint64_t increment = 1); // @@ -374,6 +374,8 @@ static void at_start(); static void at_end(double boost_factor); + static bool is_first(); + static bool is_warm(); static uint64_t ncycles(); static const AbsSeq& normalized_duration(); static double time_since_last(); @@ -519,6 +521,8 @@ size_t free_low; } _at_relocate_end; + static size_t capacity_high(); + static size_t capacity_low(); static size_t available(size_t used); static size_t reserve(size_t used); static size_t free(size_t used); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zThread.cpp --- a/src/hotspot/share/gc/z/zThread.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zThread.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -22,7 +22,7 @@ */ #include "precompiled.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "runtime/thread.hpp" #include "utilities/debug.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zThread.hpp --- a/src/hotspot/share/gc/z/zThread.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zThread.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -26,7 +26,6 @@ #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" -#include "utilities/debug.hpp" class ZThread : public AllStatic { friend class ZTask; @@ -43,12 +42,7 @@ static THREAD_LOCAL uint _worker_id; static void initialize(); - - static void ensure_initialized() { - if (!_initialized) { - initialize(); - } - } + static void ensure_initialized(); static void set_worker(); static void set_runtime_worker(); @@ -59,36 +53,12 @@ public: static const char* name(); - - static uintptr_t id() { - ensure_initialized(); - return _id; - } - - static bool is_vm() { - ensure_initialized(); - return _is_vm; - } - - static bool is_java() { - ensure_initialized(); - return _is_java; - } - - static bool is_worker() { - ensure_initialized(); - return _is_worker; - } - - static bool is_runtime_worker() { - ensure_initialized(); - return _is_runtime_worker; - } - - static uint worker_id() { - assert(has_worker_id(), "Worker id not initialized"); - return _worker_id; - } + static uintptr_t id(); + static bool is_vm(); + static bool is_java(); + static bool is_worker(); + static bool is_runtime_worker(); + static uint worker_id(); }; #endif // SHARE_GC_Z_ZTHREAD_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zThread.inline.hpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hotspot/share/gc/z/zThread.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,66 @@ +/* + * 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 + * 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_Z_ZTHREAD_INLINE_HPP +#define SHARE_GC_Z_ZTHREAD_INLINE_HPP + +#include "gc/z/zThread.hpp" +#include "utilities/debug.hpp" + +inline void ZThread::ensure_initialized() { + if (!_initialized) { + initialize(); + } +} + +inline uintptr_t ZThread::id() { + ensure_initialized(); + return _id; +} + +inline bool ZThread::is_vm() { + ensure_initialized(); + return _is_vm; +} + +inline bool ZThread::is_java() { + ensure_initialized(); + return _is_java; +} + +inline bool ZThread::is_worker() { + ensure_initialized(); + return _is_worker; +} + +inline bool ZThread::is_runtime_worker() { + ensure_initialized(); + return _is_runtime_worker; +} + +inline uint ZThread::worker_id() { + assert(has_worker_id(), "Worker id not initialized"); + return _worker_id; +} + +#endif // SHARE_GC_Z_ZTHREAD_INLINE_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp --- a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "gc/z/zAddress.inline.hpp" #include "gc/z/zThreadLocalAllocBuffer.hpp" +#include "gc/z/zValue.inline.hpp" #include "runtime/globals.hpp" #include "runtime/thread.hpp" diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zTracer.cpp --- a/src/hotspot/share/gc/z/zTracer.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zTracer.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -22,18 +22,19 @@ */ #include "precompiled.hpp" +#include "gc/shared/gcId.hpp" #include "gc/z/zStat.hpp" #include "gc/z/zTracer.hpp" -#include "gc/shared/gcId.hpp" -#include "gc/shared/gcLocker.hpp" #include "jfr/jfrEvents.hpp" -#include "runtime/safepoint.hpp" #include "runtime/safepointVerifiers.hpp" +#include "utilities/debug.hpp" +#include "utilities/macros.hpp" #if INCLUDE_JFR #include "jfr/metadata/jfrSerializer.hpp" #endif #if INCLUDE_JFR + class ZStatisticsCounterTypeConstant : public JfrSerializer { public: virtual void serialize(JfrCheckpointWriter& writer) { @@ -66,7 +67,8 @@ true /* permit_cache */, new ZStatisticsSamplerTypeConstant()); } -#endif + +#endif // INCLUDE_JFR ZTracer* ZTracer::_tracer = NULL; @@ -79,24 +81,24 @@ JFR_ONLY(register_jfr_type_serializers()); } -void ZTracer::send_stat_counter(uint32_t counter_id, uint64_t increment, uint64_t value) { +void ZTracer::send_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value) { NoSafepointVerifier nsv; EventZStatisticsCounter e; if (e.should_commit()) { - e.set_id(counter_id); + e.set_id(counter.id()); e.set_increment(increment); e.set_value(value); e.commit(); } } -void ZTracer::send_stat_sampler(uint32_t sampler_id, uint64_t value) { +void ZTracer::send_stat_sampler(const ZStatSampler& sampler, uint64_t value) { NoSafepointVerifier nsv; EventZStatisticsSampler e; if (e.should_commit()) { - e.set_id(sampler_id); + e.set_id(sampler.id()); e.set_value(value); e.commit(); } @@ -115,7 +117,7 @@ } } -void ZTracer::send_page_alloc(size_t size, size_t used, size_t free, size_t cache, bool nonblocking, bool noreserve) { +void ZTracer::send_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags) { NoSafepointVerifier nsv; EventZPageAllocation e; @@ -124,28 +126,8 @@ e.set_usedAfter(used); e.set_freeAfter(free); e.set_inCacheAfter(cache); - e.set_nonBlocking(nonblocking); - e.set_noReserve(noreserve); + e.set_nonBlocking(flags.non_blocking()); + e.set_noReserve(flags.no_reserve()); e.commit(); } } - -void ZTracer::report_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value) { - send_stat_counter(counter.id(), increment, value); -} - -void ZTracer::report_stat_sampler(const ZStatSampler& sampler, uint64_t value) { - send_stat_sampler(sampler.id(), value); -} - -void ZTracer::report_thread_phase(const ZStatPhase& phase, const Ticks& start, const Ticks& end) { - send_thread_phase(phase.name(), start, end); -} - -void ZTracer::report_thread_phase(const char* name, const Ticks& start, const Ticks& end) { - send_thread_phase(name, start, end); -} - -void ZTracer::report_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags) { - send_page_alloc(size, used, free, cache, flags.non_blocking(), flags.no_reserve()); -} diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zTracer.hpp --- a/src/hotspot/share/gc/z/zTracer.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zTracer.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -37,10 +37,10 @@ ZTracer(); - void send_stat_counter(uint32_t counter_id, uint64_t increment, uint64_t value); - void send_stat_sampler(uint32_t sampler_id, uint64_t value); + void send_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value); + void send_stat_sampler(const ZStatSampler& sampler, uint64_t value); void send_thread_phase(const char* name, const Ticks& start, const Ticks& end); - void send_page_alloc(size_t size, size_t used, size_t free, size_t cache, bool nonblocking, bool noreserve); + void send_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags); public: static ZTracer* tracer(); @@ -48,7 +48,6 @@ void report_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value); void report_stat_sampler(const ZStatSampler& sampler, uint64_t value); - void report_thread_phase(const ZStatPhase& phase, const Ticks& start, const Ticks& end); void report_thread_phase(const char* name, const Ticks& start, const Ticks& end); void report_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags); }; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zTracer.inline.hpp --- a/src/hotspot/share/gc/z/zTracer.inline.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zTracer.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -24,12 +24,38 @@ #ifndef SHARE_GC_Z_ZTRACER_INLINE_HPP #define SHARE_GC_Z_ZTRACER_INLINE_HPP +#include "gc/z/zStat.hpp" #include "gc/z/zTracer.hpp" +#include "jfr/jfrEvents.hpp" inline ZTracer* ZTracer::tracer() { return _tracer; } +inline void ZTracer::report_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value) { + if (EventZStatisticsCounter::is_enabled()) { + send_stat_counter(counter, increment, value); + } +} + +inline void ZTracer::report_stat_sampler(const ZStatSampler& sampler, uint64_t value) { + if (EventZStatisticsSampler::is_enabled()) { + send_stat_sampler(sampler, value); + } +} + +inline void ZTracer::report_thread_phase(const char* name, const Ticks& start, const Ticks& end) { + if (EventZThreadPhase::is_enabled()) { + send_thread_phase(name, start, end); + } +} + +inline void ZTracer::report_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags) { + if (EventZPageAllocation::is_enabled()) { + send_page_alloc(size, used, free, cache, flags); + } +} + inline ZTraceThreadPhase::ZTraceThreadPhase(const char* name) : _start(Ticks::now()), _name(name) {} diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zValue.hpp --- a/src/hotspot/share/gc/z/zValue.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zValue.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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,13 +25,11 @@ #define SHARE_GC_Z_ZVALUE_HPP #include "memory/allocation.hpp" -#include "gc/z/zCPU.hpp" -#include "gc/z/zGlobals.hpp" -#include "gc/z/zNUMA.hpp" -#include "gc/z/zThread.hpp" -#include "gc/z/zUtils.hpp" -#include "runtime/globals.hpp" -#include "utilities/align.hpp" +#include "utilities/globalDefinitions.hpp" + +// +// Storage +// template class ZValueStorage : public AllStatic { @@ -42,202 +40,93 @@ public: static const size_t offset = 4 * K; - static uintptr_t alloc(size_t size) { - guarantee(size <= offset, "Allocation too large"); - - // Allocate entry in existing memory block - const uintptr_t addr = align_up(_top, S::alignment()); - _top = addr + size; - - if (_top < _end) { - // Success - return addr; - } - - // Allocate new block of memory - const size_t block_alignment = offset; - const size_t block_size = offset * S::count(); - _top = ZUtils::alloc_aligned(block_alignment, block_size); - _end = _top + offset; - - // Retry allocation - return alloc(size); - } + static uintptr_t alloc(size_t size); }; -template uintptr_t ZValueStorage::_end = 0; -template uintptr_t ZValueStorage::_top = 0; - class ZContendedStorage : public ZValueStorage { public: - static size_t alignment() { - return ZCacheLineSize; - } - - static uint32_t count() { - return 1; - } - - static uint32_t id() { - return 0; - } + static size_t alignment(); + static uint32_t count(); + static uint32_t id(); }; class ZPerCPUStorage : public ZValueStorage { public: - static size_t alignment() { - return sizeof(uintptr_t); - } - - static uint32_t count() { - return ZCPU::count(); - } - - static uint32_t id() { - return ZCPU::id(); - } + static size_t alignment(); + static uint32_t count(); + static uint32_t id(); }; class ZPerNUMAStorage : public ZValueStorage { public: - static size_t alignment() { - return sizeof(uintptr_t); - } - - static uint32_t count() { - return ZNUMA::count(); - } - - static uint32_t id() { - return ZNUMA::id(); - } + static size_t alignment(); + static uint32_t count(); + static uint32_t id(); }; class ZPerWorkerStorage : public ZValueStorage { public: - static size_t alignment() { - return sizeof(uintptr_t); - } - - static uint32_t count() { - return MAX2(ParallelGCThreads, ConcGCThreads); - } - - static uint32_t id() { - return ZThread::worker_id(); - } + static size_t alignment(); + static uint32_t count(); + static uint32_t id(); }; -template -class ZValueIterator; +// +// Value +// template class ZValue : public CHeapObj { private: const uintptr_t _addr; - uintptr_t value_addr(uint32_t value_id) const { - return _addr + (value_id * S::offset); - } + uintptr_t value_addr(uint32_t value_id) const; public: - ZValue() : - _addr(S::alloc(sizeof(T))) { - // Initialize all instances - ZValueIterator iter(this); - for (T* addr; iter.next(&addr);) { - ::new (addr) T; - } - } + ZValue(); + ZValue(const T& value); - ZValue(const T& value) : - _addr(S::alloc(sizeof(T))) { - // Initialize all instances - ZValueIterator iter(this); - for (T* addr; iter.next(&addr);) { - ::new (addr) T(value); - } - } - - // Not implemented - ZValue(const ZValue& value); - ZValue& operator=(const ZValue& value); + const T* addr(uint32_t value_id = S::id()) const; + T* addr(uint32_t value_id = S::id()); - const T* addr(uint32_t value_id = S::id()) const { - return reinterpret_cast(value_addr(value_id)); - } - - T* addr(uint32_t value_id = S::id()) { - return reinterpret_cast(value_addr(value_id)); - } - - const T& get(uint32_t value_id = S::id()) const { - return *addr(value_id); - } + const T& get(uint32_t value_id = S::id()) const; + T& get(uint32_t value_id = S::id()); - T& get(uint32_t value_id = S::id()) { - return *addr(value_id); - } - - void set(const T& value, uint32_t value_id = S::id()) { - get(value_id) = value; - } - - void set_all(const T& value) { - ZValueIterator iter(this); - for (T* addr; iter.next(&addr);) { - *addr = value; - } - } + void set(const T& value, uint32_t value_id = S::id()); + void set_all(const T& value); }; template class ZContended : public ZValue { public: - ZContended() : - ZValue() {} - - ZContended(const T& value) : - ZValue(value) {} - - using ZValue::operator=; + ZContended(); + ZContended(const T& value); }; template class ZPerCPU : public ZValue { public: - ZPerCPU() : - ZValue() {} - - ZPerCPU(const T& value) : - ZValue(value) {} - - using ZValue::operator=; + ZPerCPU(); + ZPerCPU(const T& value); }; template class ZPerNUMA : public ZValue { public: - ZPerNUMA() : - ZValue() {} - - ZPerNUMA(const T& value) : - ZValue(value) {} - - using ZValue::operator=; + ZPerNUMA(); + ZPerNUMA(const T& value); }; template class ZPerWorker : public ZValue { public: - ZPerWorker() : - ZValue() {} + ZPerWorker(); + ZPerWorker(const T& value); +}; - ZPerWorker(const T& value) : - ZValue(value) {} - - using ZValue::operator=; -}; +// +// Iterator +// template class ZValueIterator { @@ -246,38 +135,27 @@ uint32_t _value_id; public: - ZValueIterator(ZValue* value) : - _value(value), - _value_id(0) {} + ZValueIterator(ZValue* value); - bool next(T** value) { - if (_value_id < S::count()) { - *value = _value->addr(_value_id++); - return true; - } - return false; - } + bool next(T** value); }; template class ZPerCPUIterator : public ZValueIterator { public: - ZPerCPUIterator(ZPerCPU* value) : - ZValueIterator(value) {} + ZPerCPUIterator(ZPerCPU* value); }; template class ZPerNUMAIterator : public ZValueIterator { public: - ZPerNUMAIterator(ZPerNUMA* value) : - ZValueIterator(value) {} + ZPerNUMAIterator(ZPerNUMA* value); }; template class ZPerWorkerIterator : public ZValueIterator { public: - ZPerWorkerIterator(ZPerWorker* value) : - ZValueIterator(value) {} + ZPerWorkerIterator(ZPerWorker* value); }; template @@ -287,38 +165,27 @@ uint32_t _value_id; public: - ZValueConstIterator(const ZValue* value) : - _value(value), - _value_id(0) {} + ZValueConstIterator(const ZValue* value); - bool next(const T** value) { - if (_value_id < S::count()) { - *value = _value->addr(_value_id++); - return true; - } - return false; - } + bool next(const T** value); }; template class ZPerCPUConstIterator : public ZValueConstIterator { public: - ZPerCPUConstIterator(const ZPerCPU* value) : - ZValueConstIterator(value) {} + ZPerCPUConstIterator(const ZPerCPU* value); }; template class ZPerNUMAConstIterator : public ZValueConstIterator { public: - ZPerNUMAConstIterator(const ZPerNUMA* value) : - ZValueConstIterator(value) {} + ZPerNUMAConstIterator(const ZPerNUMA* value); }; template class ZPerWorkerConstIterator : public ZValueConstIterator { public: - ZPerWorkerConstIterator(const ZPerWorker* value) : - ZValueConstIterator(value) {} + ZPerWorkerConstIterator(const ZPerWorker* value); }; #endif // SHARE_GC_Z_ZVALUE_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zValue.inline.hpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hotspot/share/gc/z/zValue.inline.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,264 @@ +/* + * 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 + * 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_Z_ZVALUE_INLINE_HPP +#define SHARE_GC_Z_ZVALUE_INLINE_HPP + +#include "gc/z/zCPU.inline.hpp" +#include "gc/z/zGlobals.hpp" +#include "gc/z/zNUMA.hpp" +#include "gc/z/zThread.inline.hpp" +#include "gc/z/zUtils.hpp" +#include "gc/z/zValue.hpp" +#include "runtime/globals.hpp" +#include "utilities/align.hpp" + +// +// Storage +// + +template uintptr_t ZValueStorage::_end = 0; +template uintptr_t ZValueStorage::_top = 0; + +template +uintptr_t ZValueStorage::alloc(size_t size) { + assert(size <= offset, "Allocation too large"); + + // Allocate entry in existing memory block + const uintptr_t addr = align_up(_top, S::alignment()); + _top = addr + size; + + if (_top < _end) { + // Success + return addr; + } + + // Allocate new block of memory + const size_t block_alignment = offset; + const size_t block_size = offset * S::count(); + _top = ZUtils::alloc_aligned(block_alignment, block_size); + _end = _top + offset; + + // Retry allocation + return alloc(size); +} + +inline size_t ZContendedStorage::alignment() { + return ZCacheLineSize; +} + +inline uint32_t ZContendedStorage::count() { + return 1; +} + +inline uint32_t ZContendedStorage::id() { + return 0; +} + +inline size_t ZPerCPUStorage::alignment() { + return sizeof(uintptr_t); +} + +inline uint32_t ZPerCPUStorage::count() { + return ZCPU::count(); +} + +inline uint32_t ZPerCPUStorage::id() { + return ZCPU::id(); +} + +inline size_t ZPerNUMAStorage::alignment() { + return sizeof(uintptr_t); +} + +inline uint32_t ZPerNUMAStorage::count() { + return ZNUMA::count(); +} + +inline uint32_t ZPerNUMAStorage::id() { + return ZNUMA::id(); +} + +inline size_t ZPerWorkerStorage::alignment() { + return sizeof(uintptr_t); +} + +inline uint32_t ZPerWorkerStorage::count() { + return MAX2(ParallelGCThreads, ConcGCThreads); +} + +inline uint32_t ZPerWorkerStorage::id() { + return ZThread::worker_id(); +} + +// +// Value +// + +template +inline uintptr_t ZValue::value_addr(uint32_t value_id) const { + return _addr + (value_id * S::offset); +} + +template +inline ZValue::ZValue() : + _addr(S::alloc(sizeof(T))) { + // Initialize all instances + ZValueIterator iter(this); + for (T* addr; iter.next(&addr);) { + ::new (addr) T; + } +} + +template +inline ZValue::ZValue(const T& value) : + _addr(S::alloc(sizeof(T))) { + // Initialize all instances + ZValueIterator iter(this); + for (T* addr; iter.next(&addr);) { + ::new (addr) T(value); + } +} + +template +inline const T* ZValue::addr(uint32_t value_id) const { + return reinterpret_cast(value_addr(value_id)); +} + +template +inline T* ZValue::addr(uint32_t value_id) { + return reinterpret_cast(value_addr(value_id)); +} + +template +inline const T& ZValue::get(uint32_t value_id) const { + return *addr(value_id); +} + +template +inline T& ZValue::get(uint32_t value_id) { + return *addr(value_id); +} + +template +inline void ZValue::set(const T& value, uint32_t value_id) { + get(value_id) = value; +} + +template +inline void ZValue::set_all(const T& value) { + ZValueIterator iter(this); + for (T* addr; iter.next(&addr);) { + *addr = value; + } +} + +template +inline ZContended::ZContended() : + ZValue() {} + +template +inline ZContended::ZContended(const T& value) : + ZValue(value) {} + +template +inline ZPerCPU::ZPerCPU() : + ZValue() {} + +template +inline ZPerCPU::ZPerCPU(const T& value) : + ZValue(value) {} + +template +inline ZPerNUMA::ZPerNUMA() : + ZValue() {} + +template +inline ZPerNUMA::ZPerNUMA(const T& value) : + ZValue(value) {} + +template +inline ZPerWorker::ZPerWorker() : + ZValue() {} + +template +inline ZPerWorker::ZPerWorker(const T& value) : + ZValue(value) {} + +// +// Iterator +// + +template +inline ZValueIterator::ZValueIterator(ZValue* value) : + _value(value), + _value_id(0) {} + +template +inline bool ZValueIterator::next(T** value) { + if (_value_id < S::count()) { + *value = _value->addr(_value_id++); + return true; + } + return false; +} + +template +inline ZPerCPUIterator::ZPerCPUIterator(ZPerCPU* value) : + ZValueIterator(value) {} + +template +inline ZPerNUMAIterator::ZPerNUMAIterator(ZPerNUMA* value) : + ZValueIterator(value) {} + +template +inline ZPerWorkerIterator::ZPerWorkerIterator(ZPerWorker* value) : + ZValueIterator(value) {} + +template +inline ZValueConstIterator::ZValueConstIterator(const ZValue* value) : + _value(value), + _value_id(0) {} + +template +inline bool ZValueConstIterator::next(const T** value) { + if (_value_id < S::count()) { + *value = _value->addr(_value_id++); + return true; + } + return false; +} + +template +inline ZPerCPUConstIterator::ZPerCPUConstIterator(const ZPerCPU* value) : + ZValueConstIterator(value) {} + +template +inline ZPerNUMAConstIterator::ZPerNUMAConstIterator(const ZPerNUMA* value) : + ZValueConstIterator(value) {} + +template +inline ZPerWorkerConstIterator::ZPerWorkerConstIterator(const ZPerWorker* value) : + ZValueConstIterator(value) {} + +#endif // SHARE_GC_Z_ZVALUE_INLINE_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/zWeakRootsProcessor.hpp --- a/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -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,8 +24,6 @@ #ifndef SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP #define SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP -#include "gc/z/zValue.hpp" - class ZWorkers; class ZWeakRootsProcessor { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/gc/z/z_globals.hpp --- a/src/hotspot/share/gc/z/z_globals.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/gc/z/z_globals.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -67,9 +67,6 @@ "Time between statistics print outs (in seconds)") \ range(1, (uint)-1) \ \ - diagnostic(bool, ZStatisticsForceTrace, false, \ - "Force tracing of ZStats") \ - \ diagnostic(bool, ZProactive, true, \ "Enable proactive GC cycles") \ \ diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/include/jvm.h --- a/src/hotspot/share/include/jvm.h Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/include/jvm.h Wed Oct 23 14:01:17 2019 -0400 @@ -192,6 +192,13 @@ JVM_InitStackTraceElement(JNIEnv* env, jobject element, jobject stackFrameInfo); /* + * java.lang.NullPointerException + */ + +JNIEXPORT jstring JNICALL +JVM_GetExtendedNPEMessage(JNIEnv *env, jthrowable throwable); + +/* * java.lang.StackWalker */ enum { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/interpreter/bytecodeUtils.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hotspot/share/interpreter/bytecodeUtils.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,1481 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * 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. + * + */ + +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc/shared/gcLocker.hpp" +#include "interpreter/bytecodeUtils.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/signature.hpp" +#include "runtime/safepointVerifiers.hpp" +#include "utilities/events.hpp" +#include "utilities/ostream.hpp" + +class SimulatedOperandStack; +class ExceptionMessageBuilder; + +// The entries of a SimulatedOperandStack. They carry the analysis +// information gathered for the slot. +class StackSlotAnalysisData { + private: + + friend class SimulatedOperandStack; + friend class ExceptionMessageBuilder; + + unsigned int _bci:17; // The bci of the bytecode that pushed the current value on the operand stack. + // INVALID if ambiguous, e.g. after a control flow merge. + // 16 bits for bci (max bytecode size) and one for INVALID. + unsigned int _type:15; // The BasicType of the value on the operand stack. + + // Merges this slot data with the given one and returns the result. If + // the bcis of the two merged objects are different, the bci of the result + // will be undefined. If the types are different, the result type is T_CONFLICT. + // (An exception is if one type is an array and the other is object, then + // the result type will be T_OBJECT). + StackSlotAnalysisData merge(StackSlotAnalysisData other); + + public: + + // Creates a new object with an invalid bci and the given type. + StackSlotAnalysisData(BasicType type = T_CONFLICT); + + // Creates a new object with the given bci and type. + StackSlotAnalysisData(int bci, BasicType type); + + enum { + // An invalid bytecode index, as > 65535. + INVALID = 0x1FFFF + }; + + // Returns the bci. If the bci is invalid, INVALID is returned. + unsigned int get_bci(); + + // Returns true, if the bci is not invalid. + bool has_bci() { return get_bci() != INVALID; } + + // Returns the type of the slot data. + BasicType get_type(); +}; + +// A stack consisting of SimulatedOperandStackEntries. +// This represents the analysis information for the operand stack +// for a given bytecode at a given bci. +// It also holds an additional field that serves to collect +// information whether local slots were written. +class SimulatedOperandStack: CHeapObj { + + private: + + friend class ExceptionMessageBuilder; + friend class StackSlotAnalysisData; + + // The stack. + GrowableArray _stack; + + // Optimized bytecode can reuse local variable slots for several + // local variables. + // If there is no variable name information, we print 'parameter' + // if a parameter maps to a local slot. Once a local slot has been + // written, we don't know any more whether it was written as the + // corresponding parameter, or whether another local has been + // mapped to the slot. So we don't want to print 'parameter' any + // more, but 'local'. Similary for 'this'. + // Therefore, during the analysis, we mark a bit for local slots that + // get written and propagate this information. + // We only run the analysis for 64 slots. If a method has more + // parameters, we print 'local' in all cases. + uint64_t _written_local_slots; + + SimulatedOperandStack(): _written_local_slots(0) { }; + SimulatedOperandStack(const SimulatedOperandStack ©); + + // Pushes the given slot data. + void push_raw(StackSlotAnalysisData slotData); + + // Like push_raw, but if the slotData has type long or double, we push two. + void push(StackSlotAnalysisData slotData); + + // Like push(slotData), but using bci/type to create an instance of + // StackSlotAnalysisData first. + void push(int bci, BasicType type); + + // Pops the given number of entries. + void pop(int slots); + + // Merges this with the given stack by merging all entries. The + // size of the stacks must be the same. + void merge(SimulatedOperandStack const& other); + + public: + + // Returns the size of the stack. + int get_size() const; + + // Returns the slot data at the given index. Slot 0 is top of stack. + StackSlotAnalysisData get_slot_data(int slot); + + // Mark that local slot i was written. + void set_local_slot_written(int i); + + // Check whether local slot i was written by this or a previous bytecode. + bool local_slot_was_written(int i); +}; + +// Helper class to build internal exception messages for exceptions +// that are thrown because prerequisites to execute a bytecode +// are not met. +// E.g., if a NPE is thrown because an iload can not be executed +// by the VM because the reference to load from is null. +// +// It analyses the bytecode to assemble Java-like message text +// to give precise information where in a larger expression the +// exception occured. +// +// To assemble this message text, it is needed to know how +// operand stack slot entries were pushed on the operand stack. +// This class contains an analysis over the bytecodes to compute +// this information. The information is stored in a +// SimulatedOperandStack for each bytecode. +class ExceptionMessageBuilder : public StackObj { + + // The stacks for each bytecode. + GrowableArray* _stacks; + + // The method. + Method* _method; + + // The number of entries used (the sum of all entries of all stacks). + int _nr_of_entries; + + // If true, we have added at least one new stack. + bool _added_one; + + // If true, we have processed all bytecodes. + bool _all_processed; + + // The maximum number of entries we want to use. This is used to + // limit the amount of memory we waste for insane methods (as they + // appear in JCK tests). + static const int _max_entries = 1000000; + + static const int _max_cause_detail = 5; + + // Merges the stack the the given bci with the given stack. If there + // is no stack at the bci, we just put the given stack there. This + // method doesn't takes ownership of the stack. + void merge(int bci, SimulatedOperandStack* stack); + + // Processes the instruction at the given bci in the method. Returns + // the size of the instruction. + int do_instruction(int bci); + + bool print_NPE_cause0(outputStream *os, int bci, int slot, int max_detail, + bool inner_expr = false, const char *prefix = NULL); + + public: + + // Creates an ExceptionMessageBuilder object and runs the analysis + // building SimulatedOperandStacks for each bytecode in the given + // method (the method must be rewritten already). Note that you're + // not allowed to use this object when crossing a safepoint! If the + // bci is != -1, we only create the stacks as far as needed to get a + // stack for the bci. + ExceptionMessageBuilder(Method* method, int bci = -1); + + // Releases the resources. + ~ExceptionMessageBuilder(); + + // Returns the number of stacks (this is the size of the method). + int get_size() { return _stacks->length() - 1; } + + // Assuming that a NullPointerException was thrown at the given bci, + // we return the nr of the slot holding the null reference. If this + // NPE is created by hand, we return -2 as the slot. If there + // cannot be a NullPointerException at the bci, -1 is returned. + int get_NPE_null_slot(int bci); + + // Prints a java-like expression for the bytecode that pushed + // the value to the given slot being live at the given bci. + // It constructs the expression by recursing backwards over the + // bytecode using the results of the analysis done in the + // constructor of ExceptionMessageBuilder. + // os: The stream to print the message to. + // bci: The index of the bytecode that caused the NPE. + // slot: The slot on the operand stack that contains null. + // The slots are numbered from TOS downwards, i.e., + // TOS has the slot number 0, that below 1 and so on. + // + // Returns false if nothing was printed, else true. + bool print_NPE_cause(outputStream *os, int bci, int slot); + + // Prints a string describing the failed action. + void print_NPE_failed_action(outputStream *os, int bci); +}; + +// Replaces the following well-known class names: +// java.lang.Object -> Object +// java.lang.String -> String +static char *trim_well_known_class_names_from_signature(char *signature) { + size_t len = strlen(signature); + size_t skip_len = strlen("java.lang."); + size_t min_pattern_len = strlen("java.lang.String"); + if (len < min_pattern_len) return signature; + + for (size_t isrc = 0, idst = 0; isrc <= len; isrc++, idst++) { + // We must be careful not to trim names like test.java.lang.String. + if ((isrc == 0 && strncmp(signature + isrc, "java.lang.Object", min_pattern_len) == 0) || + (isrc == 0 && strncmp(signature + isrc, "java.lang.String", min_pattern_len) == 0) || + (isrc > 1 && strncmp(signature + isrc-2, ", java.lang.Object", min_pattern_len+2) == 0) || + (isrc > 1 && strncmp(signature + isrc-2, ", java.lang.String", min_pattern_len+2) == 0) ) { + isrc += skip_len; + } + if (idst != isrc) { + signature[idst] = signature[isrc]; + } + } + return signature; +} + +// Replaces the following well-known class names: +// java.lang.Object -> Object +// java.lang.String -> String +static void print_klass_name(outputStream *os, Symbol *klass) { + const char *name = klass->as_klass_external_name(); + if (strcmp(name, "java.lang.Object") == 0) name = "Object"; + if (strcmp(name, "java.lang.String") == 0) name = "String"; + os->print("%s", name); +} + +// Prints the name of the method that is described at constant pool +// index cp_index in the constant pool of method 'method'. +static void print_method_name(outputStream *os, Method* method, int cp_index) { + ResourceMark rm; + ConstantPool* cp = method->constants(); + Symbol* klass = cp->klass_ref_at_noresolve(cp_index); + Symbol* name = cp->name_ref_at(cp_index); + Symbol* signature = cp->signature_ref_at(cp_index); + + print_klass_name(os, klass); + os->print(".%s(", name->as_C_string()); + stringStream sig; + signature->print_as_signature_external_parameters(&sig); + os->print("%s)", trim_well_known_class_names_from_signature(sig.as_string())); +} + +// Prints the name of the field that is described at constant pool +// index cp_index in the constant pool of method 'method'. +static void print_field_and_class(outputStream *os, Method* method, int cp_index) { + ResourceMark rm; + ConstantPool* cp = method->constants(); + Symbol* klass = cp->klass_ref_at_noresolve(cp_index); + Symbol *name = cp->name_ref_at(cp_index); + print_klass_name(os, klass); + os->print(".%s", name->as_C_string()); +} + +// Returns the name of the field that is described at constant pool +// index cp_index in the constant pool of method 'method'. +static char const* get_field_name(Method* method, int cp_index) { + Symbol* name = method->constants()->name_ref_at(cp_index); + return name->as_C_string(); +} + +static void print_local_var(outputStream *os, unsigned int bci, Method* method, int slot, bool is_parameter) { + if (method->has_localvariable_table()) { + for (int i = 0; i < method->localvariable_table_length(); i++) { + LocalVariableTableElement* elem = method->localvariable_table_start() + i; + unsigned int start = elem->start_bci; + unsigned int end = start + elem->length; + + if ((bci >= start) && (bci < end) && (elem->slot == slot)) { + ConstantPool* cp = method->constants(); + char *var = cp->symbol_at(elem->name_cp_index)->as_C_string(); + os->print("%s", var); + + return; + } + } + } + + // Handle at least some cases we know. + if (!method->is_static() && (slot == 0) && is_parameter) { + os->print("this"); + } else { + int curr = method->is_static() ? 0 : 1; + SignatureStream ss(method->signature()); + int param_index = 1; + bool found = false; + + for (SignatureStream ss(method->signature()); !ss.is_done(); ss.next()) { + if (ss.at_return_type()) { + continue; + } + int size = type2size[ss.type()]; + if ((slot >= curr) && (slot < curr + size)) { + found = true; + break; + } + param_index += 1; + curr += size; + } + + if (found && is_parameter) { + os->print("", param_index); + } else { + // This is the best we can do. + os->print("", slot); + } + } +} + +StackSlotAnalysisData::StackSlotAnalysisData(BasicType type) : _bci(INVALID), _type(type) {} + +StackSlotAnalysisData::StackSlotAnalysisData(int bci, BasicType type) : _bci(bci), _type(type) { + assert(bci >= 0, "BCI must be >= 0"); + assert(bci < 65536, "BCI must be < 65536"); +} + +unsigned int StackSlotAnalysisData::get_bci() { + return _bci; +} + +BasicType StackSlotAnalysisData::get_type() { + return (BasicType)_type; +} + +StackSlotAnalysisData StackSlotAnalysisData::merge(StackSlotAnalysisData other) { + if (get_type() != other.get_type()) { + if (((get_type() == T_OBJECT) || (get_type() == T_ARRAY)) && + ((other.get_type() == T_OBJECT) || (other.get_type() == T_ARRAY))) { + if (get_bci() == other.get_bci()) { + return StackSlotAnalysisData(get_bci(), T_OBJECT); + } else { + return StackSlotAnalysisData(T_OBJECT); + } + } else { + return StackSlotAnalysisData(T_CONFLICT); + } + } + + if (get_bci() == other.get_bci()) { + return *this; + } else { + return StackSlotAnalysisData(get_type()); + } +} + +SimulatedOperandStack::SimulatedOperandStack(const SimulatedOperandStack ©) { + for (int i = 0; i < copy.get_size(); i++) { + push_raw(copy._stack.at(i)); + } + _written_local_slots = copy._written_local_slots; +} + +void SimulatedOperandStack::push_raw(StackSlotAnalysisData slotData) { + if (slotData.get_type() == T_VOID) { + return; + } + + _stack.push(slotData); +} + +void SimulatedOperandStack::push(StackSlotAnalysisData slotData) { + if (type2size[slotData.get_type()] == 2) { + push_raw(slotData); + push_raw(slotData); + } else { + push_raw(slotData); + } +} + +void SimulatedOperandStack::push(int bci, BasicType type) { + push(StackSlotAnalysisData(bci, type)); +} + +void SimulatedOperandStack::pop(int slots) { + for (int i = 0; i < slots; ++i) { + _stack.pop(); + } + + assert(get_size() >= 0, "Popped too many slots"); +} + +void SimulatedOperandStack::merge(SimulatedOperandStack const& other) { + assert(get_size() == other.get_size(), "Stacks not of same size"); + + for (int i = get_size() - 1; i >= 0; --i) { + _stack.at_put(i, _stack.at(i).merge(other._stack.at(i))); + } + _written_local_slots = _written_local_slots | other._written_local_slots; +} + +int SimulatedOperandStack::get_size() const { + return _stack.length(); +} + +StackSlotAnalysisData SimulatedOperandStack::get_slot_data(int slot) { + assert(slot >= 0, "Slot=%d < 0", slot); + assert(slot < get_size(), "Slot=%d >= size=%d", slot, get_size()); + + return _stack.at(get_size() - slot - 1); +} + +void SimulatedOperandStack::set_local_slot_written(int i) { + // Local slots > 63 are very unlikely. Consider these + // as written all the time. Saves space and complexity + // for dynamic data size. + if (i > 63) return; + _written_local_slots = _written_local_slots | (1ULL << i); +} + +bool SimulatedOperandStack::local_slot_was_written(int i) { + if (i > 63) return true; + return (_written_local_slots & (1ULL << i)) != 0; +} + +ExceptionMessageBuilder::ExceptionMessageBuilder(Method* method, int bci) : + _method(method), _nr_of_entries(0), + _added_one(true), _all_processed(false) { + + ConstMethod* const_method = method->constMethod(); + const int len = const_method->code_size(); + + assert(bci >= 0, "BCI too low: %d", bci); + assert(bci < len, "BCI too large: %d size: %d", bci, len); + + _stacks = new GrowableArray (len + 1); + + for (int i = 0; i <= len; ++i) { + _stacks->push(NULL); + } + + // Initialize stack a bci 0. + _stacks->at_put(0, new SimulatedOperandStack()); + + // And initialize the start of all exception handlers. + if (const_method->has_exception_handler()) { + ExceptionTableElement *et = const_method->exception_table_start(); + for (int i = 0; i < const_method->exception_table_length(); ++i) { + u2 index = et[i].handler_pc; + + if (_stacks->at(index) == NULL) { + _stacks->at_put(index, new SimulatedOperandStack()); + _stacks->at(index)->push(index, T_OBJECT); + } + } + } + + // Do this until each bytecode has a stack or we haven't + // added a new stack in one iteration. + while (!_all_processed && _added_one) { + _all_processed = true; + _added_one = false; + + for (int i = 0; i < len; ) { + // Analyse bytecode i. Step by size of the analyzed bytecode to next bytecode. + i += do_instruction(i); + + // If we want the data only for a certain bci, we can possibly end early. + if ((bci == i) && (_stacks->at(i) != NULL)) { + _all_processed = true; + break; + } + + if (_nr_of_entries > _max_entries) { + return; + } + } + } +} + +ExceptionMessageBuilder::~ExceptionMessageBuilder() { + if (_stacks != NULL) { + for (int i = 0; i < _stacks->length(); ++i) { + delete _stacks->at(i); + } + } +} + +void ExceptionMessageBuilder::merge(int bci, SimulatedOperandStack* stack) { + assert(stack != _stacks->at(bci), "Cannot merge itself"); + + if (_stacks->at(bci) != NULL) { + stack->merge(*_stacks->at(bci)); + } else { + // Got a new stack, so count the entries. + _nr_of_entries += stack->get_size(); + } + + // Replace the stack at this bci with a copy of our new merged stack. + delete _stacks->at(bci); + _stacks->at_put(bci, new SimulatedOperandStack(*stack)); +} + +int ExceptionMessageBuilder::do_instruction(int bci) { + ConstMethod* const_method = _method->constMethod(); + address code_base = _method->constMethod()->code_base(); + + // We use the java code, since we don't want to cope with all the fast variants. + int len = Bytecodes::java_length_at(_method, code_base + bci); + + // If we have no stack for this bci, we cannot process the bytecode now. + if (_stacks->at(bci) == NULL) { + _all_processed = false; + return len; + } + + // Make a local copy of the stack for this bci to work on. + SimulatedOperandStack* stack = new SimulatedOperandStack(*_stacks->at(bci)); + + // dest_bci is != -1 if we branch. + int dest_bci = -1; + + // This is for table and lookup switch. + static const int initial_length = 2; + GrowableArray dests(initial_length); + + bool flow_ended = false; + + // Get the bytecode. + bool is_wide = false; + Bytecodes::Code raw_code = Bytecodes::code_at(_method, code_base + bci); + Bytecodes::Code code = Bytecodes::java_code_at(_method, code_base + bci); + int pos = bci + 1; + + if (code == Bytecodes::_wide) { + is_wide = true; + code = Bytecodes::java_code_at(_method, code_base + bci + 1); + pos += 1; + } + + // Now simulate the action of each bytecode. + switch (code) { + case Bytecodes::_nop: + case Bytecodes::_aconst_null: + case Bytecodes::_iconst_m1: + case Bytecodes::_iconst_0: + case Bytecodes::_iconst_1: + case Bytecodes::_iconst_2: + case Bytecodes::_iconst_3: + case Bytecodes::_iconst_4: + case Bytecodes::_iconst_5: + case Bytecodes::_lconst_0: + case Bytecodes::_lconst_1: + case Bytecodes::_fconst_0: + case Bytecodes::_fconst_1: + case Bytecodes::_fconst_2: + case Bytecodes::_dconst_0: + case Bytecodes::_dconst_1: + case Bytecodes::_bipush: + case Bytecodes::_sipush: + case Bytecodes::_iload: + case Bytecodes::_lload: + case Bytecodes::_fload: + case Bytecodes::_dload: + case Bytecodes::_aload: + case Bytecodes::_iload_0: + case Bytecodes::_iload_1: + case Bytecodes::_iload_2: + case Bytecodes::_iload_3: + case Bytecodes::_lload_0: + case Bytecodes::_lload_1: + case Bytecodes::_lload_2: + case Bytecodes::_lload_3: + case Bytecodes::_fload_0: + case Bytecodes::_fload_1: + case Bytecodes::_fload_2: + case Bytecodes::_fload_3: + case Bytecodes::_dload_0: + case Bytecodes::_dload_1: + case Bytecodes::_dload_2: + case Bytecodes::_dload_3: + case Bytecodes::_aload_0: + case Bytecodes::_aload_1: + case Bytecodes::_aload_2: + case Bytecodes::_aload_3: + case Bytecodes::_iinc: + case Bytecodes::_new: + stack->push(bci, Bytecodes::result_type(code)); + break; + + case Bytecodes::_ldc: + case Bytecodes::_ldc_w: + case Bytecodes::_ldc2_w: { + int cp_index; + ConstantPool* cp = _method->constants(); + + if (code == Bytecodes::_ldc) { + cp_index = *(uint8_t*) (code_base + pos); + + if (raw_code == Bytecodes::_fast_aldc) { + cp_index = cp->object_to_cp_index(cp_index); + } + } else { + if (raw_code == Bytecodes::_fast_aldc_w) { + cp_index = Bytes::get_native_u2(code_base + pos); + cp_index = cp->object_to_cp_index(cp_index); + } + else { + cp_index = Bytes::get_Java_u2(code_base + pos); + } + } + + constantTag tag = cp->tag_at(cp_index); + if (tag.is_klass() || tag.is_unresolved_klass() || + tag.is_method() || tag.is_interface_method() || + tag.is_field() || tag.is_string()) { + stack->push(bci, T_OBJECT); + } else if (tag.is_int()) { + stack->push(bci, T_INT); + } else if (tag.is_long()) { + stack->push(bci, T_LONG); + } else if (tag.is_float()) { + stack->push(bci, T_FLOAT); + } else if (tag.is_double()) { + stack->push(bci, T_DOUBLE); + } else { + assert(false, "Unexpected tag"); + } + break; + } + + case Bytecodes::_iaload: + case Bytecodes::_faload: + case Bytecodes::_aaload: + case Bytecodes::_baload: + case Bytecodes::_caload: + case Bytecodes::_saload: + case Bytecodes::_laload: + case Bytecodes::_daload: + stack->pop(2); + stack->push(bci, Bytecodes::result_type(code)); + break; + + case Bytecodes::_istore: + case Bytecodes::_lstore: + case Bytecodes::_fstore: + case Bytecodes::_dstore: + case Bytecodes::_astore: + int index; + if (is_wide) { + index = Bytes::get_Java_u2(code_base + bci + 2); + } else { + index = *(uint8_t*) (code_base + bci + 1); + } + stack->set_local_slot_written(index); + stack->pop(-Bytecodes::depth(code)); + break; + case Bytecodes::_istore_0: + case Bytecodes::_lstore_0: + case Bytecodes::_fstore_0: + case Bytecodes::_dstore_0: + case Bytecodes::_astore_0: + stack->set_local_slot_written(0); + stack->pop(-Bytecodes::depth(code)); + break; + case Bytecodes::_istore_1: + case Bytecodes::_fstore_1: + case Bytecodes::_lstore_1: + case Bytecodes::_dstore_1: + case Bytecodes::_astore_1: + stack->set_local_slot_written(1); + stack->pop(-Bytecodes::depth(code)); + break; + case Bytecodes::_istore_2: + case Bytecodes::_lstore_2: + case Bytecodes::_fstore_2: + case Bytecodes::_dstore_2: + case Bytecodes::_astore_2: + stack->set_local_slot_written(2); + stack->pop(-Bytecodes::depth(code)); + break; + case Bytecodes::_istore_3: + case Bytecodes::_lstore_3: + case Bytecodes::_fstore_3: + case Bytecodes::_dstore_3: + case Bytecodes::_astore_3: + stack->set_local_slot_written(3); + stack->pop(-Bytecodes::depth(code)); + break; + case Bytecodes::_iastore: + case Bytecodes::_lastore: + case Bytecodes::_fastore: + case Bytecodes::_dastore: + case Bytecodes::_aastore: + case Bytecodes::_bastore: + case Bytecodes::_castore: + case Bytecodes::_sastore: + case Bytecodes::_pop: + case Bytecodes::_pop2: + case Bytecodes::_monitorenter: + case Bytecodes::_monitorexit: + case Bytecodes::_breakpoint: + stack->pop(-Bytecodes::depth(code)); + break; + + case Bytecodes::_dup: + stack->push_raw(stack->get_slot_data(0)); + break; + + case Bytecodes::_dup_x1: { + StackSlotAnalysisData top1 = stack->get_slot_data(0); + StackSlotAnalysisData top2 = stack->get_slot_data(1); + stack->pop(2); + stack->push_raw(top1); + stack->push_raw(top2); + stack->push_raw(top1); + break; + } + + case Bytecodes::_dup_x2: { + StackSlotAnalysisData top1 = stack->get_slot_data(0); + StackSlotAnalysisData top2 = stack->get_slot_data(1); + StackSlotAnalysisData top3 = stack->get_slot_data(2); + stack->pop(3); + stack->push_raw(top1); + stack->push_raw(top3); + stack->push_raw(top2); + stack->push_raw(top1); + break; + } + + case Bytecodes::_dup2: + stack->push_raw(stack->get_slot_data(1)); + // The former '0' entry is now at '1'. + stack->push_raw(stack->get_slot_data(1)); + break; + + case Bytecodes::_dup2_x1: { + StackSlotAnalysisData top1 = stack->get_slot_data(0); + StackSlotAnalysisData top2 = stack->get_slot_data(1); + StackSlotAnalysisData top3 = stack->get_slot_data(2); + stack->pop(3); + stack->push_raw(top2); + stack->push_raw(top1); + stack->push_raw(top3); + stack->push_raw(top2); + stack->push_raw(top1); + break; + } + + case Bytecodes::_dup2_x2: { + StackSlotAnalysisData top1 = stack->get_slot_data(0); + StackSlotAnalysisData top2 = stack->get_slot_data(1); + StackSlotAnalysisData top3 = stack->get_slot_data(2); + StackSlotAnalysisData top4 = stack->get_slot_data(3); + stack->pop(4); + stack->push_raw(top2); + stack->push_raw(top1); + stack->push_raw(top4); + stack->push_raw(top3); + stack->push_raw(top2); + stack->push_raw(top1); + break; + } + + case Bytecodes::_swap: { + StackSlotAnalysisData top1 = stack->get_slot_data(0); + StackSlotAnalysisData top2 = stack->get_slot_data(1); + stack->pop(2); + stack->push(top1); + stack->push(top2); + break; + } + + case Bytecodes::_iadd: + case Bytecodes::_ladd: + case Bytecodes::_fadd: + case Bytecodes::_dadd: + case Bytecodes::_isub: + case Bytecodes::_lsub: + case Bytecodes::_fsub: + case Bytecodes::_dsub: + case Bytecodes::_imul: + case Bytecodes::_lmul: + case Bytecodes::_fmul: + case Bytecodes::_dmul: + case Bytecodes::_idiv: + case Bytecodes::_ldiv: + case Bytecodes::_fdiv: + case Bytecodes::_ddiv: + case Bytecodes::_irem: + case Bytecodes::_lrem: + case Bytecodes::_frem: + case Bytecodes::_drem: + case Bytecodes::_iand: + case Bytecodes::_land: + case Bytecodes::_ior: + case Bytecodes::_lor: + case Bytecodes::_ixor: + case Bytecodes::_lxor: + stack->pop(2 * type2size[Bytecodes::result_type(code)]); + stack->push(bci, Bytecodes::result_type(code)); + break; + + case Bytecodes::_ineg: + case Bytecodes::_lneg: + case Bytecodes::_fneg: + case Bytecodes::_dneg: + stack->pop(type2size[Bytecodes::result_type(code)]); + stack->push(bci, Bytecodes::result_type(code)); + break; + + case Bytecodes::_ishl: + case Bytecodes::_lshl: + case Bytecodes::_ishr: + case Bytecodes::_lshr: + case Bytecodes::_iushr: + case Bytecodes::_lushr: + stack->pop(1 + type2size[Bytecodes::result_type(code)]); + stack->push(bci, Bytecodes::result_type(code)); + break; + + case Bytecodes::_i2l: + case Bytecodes::_i2f: + case Bytecodes::_i2d: + case Bytecodes::_f2i: + case Bytecodes::_f2l: + case Bytecodes::_f2d: + case Bytecodes::_i2b: + case Bytecodes::_i2c: + case Bytecodes::_i2s: + stack->pop(1); + stack->push(bci, Bytecodes::result_type(code)); + break; + + case Bytecodes::_l2i: + case Bytecodes::_l2f: + case Bytecodes::_l2d: + case Bytecodes::_d2i: + case Bytecodes::_d2l: + case Bytecodes::_d2f: + stack->pop(2); + stack->push(bci, Bytecodes::result_type(code)); + break; + + case Bytecodes::_lcmp: + case Bytecodes::_fcmpl: + case Bytecodes::_fcmpg: + case Bytecodes::_dcmpl: + case Bytecodes::_dcmpg: + stack->pop(1 - Bytecodes::depth(code)); + stack->push(bci, T_INT); + break; + + case Bytecodes::_ifeq: + case Bytecodes::_ifne: + case Bytecodes::_iflt: + case Bytecodes::_ifge: + case Bytecodes::_ifgt: + case Bytecodes::_ifle: + case Bytecodes::_if_icmpeq: + case Bytecodes::_if_icmpne: + case Bytecodes::_if_icmplt: + case Bytecodes::_if_icmpge: + case Bytecodes::_if_icmpgt: + case Bytecodes::_if_icmple: + case Bytecodes::_if_acmpeq: + case Bytecodes::_if_acmpne: + case Bytecodes::_ifnull: + case Bytecodes::_ifnonnull: + stack->pop(-Bytecodes::depth(code)); + dest_bci = bci + (int16_t) Bytes::get_Java_u2(code_base + pos); + break; + + case Bytecodes::_jsr: + // NOTE: Bytecodes has wrong depth for jsr. + stack->push(bci, T_ADDRESS); + dest_bci = bci + (int16_t) Bytes::get_Java_u2(code_base + pos); + flow_ended = true; + break; + + case Bytecodes::_jsr_w: { + // NOTE: Bytecodes has wrong depth for jsr. + stack->push(bci, T_ADDRESS); + dest_bci = bci + (int32_t) Bytes::get_Java_u4(code_base + pos); + flow_ended = true; + break; + } + + case Bytecodes::_ret: + // We don't track local variables, so we cannot know were we + // return. This makes the stacks imprecise, but we have to + // live with that. + flow_ended = true; + break; + + case Bytecodes::_tableswitch: { + stack->pop(1); + pos = (pos + 3) & ~3; + dest_bci = bci + (int32_t) Bytes::get_Java_u4(code_base + pos); + int low = (int32_t) Bytes::get_Java_u4(code_base + pos + 4); + int high = (int32_t) Bytes::get_Java_u4(code_base + pos + 8); + + for (int64_t i = low; i <= high; ++i) { + dests.push(bci + (int32_t) Bytes::get_Java_u4(code_base + pos + 12 + 4 * (i - low))); + } + + break; + } + + case Bytecodes::_lookupswitch: { + stack->pop(1); + pos = (pos + 3) & ~3; + dest_bci = bci + (int32_t) Bytes::get_Java_u4(code_base + pos); + int nr_of_dests = (int32_t) Bytes::get_Java_u4(code_base + pos + 4); + + for (int i = 0; i < nr_of_dests; ++i) { + dests.push(bci + (int32_t) Bytes::get_Java_u4(code_base + pos + 12 + 8 * i)); + } + + break; + } + + case Bytecodes::_ireturn: + case Bytecodes::_lreturn: + case Bytecodes::_freturn: + case Bytecodes::_dreturn: + case Bytecodes::_areturn: + case Bytecodes::_return: + case Bytecodes::_athrow: + stack->pop(-Bytecodes::depth(code)); + flow_ended = true; + break; + + case Bytecodes::_getstatic: + case Bytecodes::_getfield: { + // Find out the type of the field accessed. + int cp_index = Bytes::get_native_u2(code_base + pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + ConstantPool* cp = _method->constants(); + int name_and_type_index = cp->name_and_type_ref_index_at(cp_index); + int type_index = cp->signature_ref_index_at(name_and_type_index); + Symbol* signature = cp->symbol_at(type_index); + // Simulate the bytecode: pop the address, push the 'value' loaded + // from the field. + stack->pop(1 - Bytecodes::depth(code)); + stack->push(bci, char2type((char) signature->char_at(0))); + break; + } + + case Bytecodes::_putstatic: + case Bytecodes::_putfield: { + int cp_index = Bytes::get_native_u2(code_base + pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + ConstantPool* cp = _method->constants(); + int name_and_type_index = cp->name_and_type_ref_index_at(cp_index); + int type_index = cp->signature_ref_index_at(name_and_type_index); + Symbol* signature = cp->symbol_at(type_index); + ResultTypeFinder result_type(signature); + stack->pop(type2size[char2type((char) signature->char_at(0))] - Bytecodes::depth(code) - 1); + break; + } + + case Bytecodes::_invokevirtual: + case Bytecodes::_invokespecial: + case Bytecodes::_invokestatic: + case Bytecodes::_invokeinterface: + case Bytecodes::_invokedynamic: { + ConstantPool* cp = _method->constants(); + int cp_index; + + if (code == Bytecodes::_invokedynamic) { + cp_index = ((int) Bytes::get_native_u4(code_base + pos)); + } else { + cp_index = Bytes::get_native_u2(code_base + pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + } + + int name_and_type_index = cp->name_and_type_ref_index_at(cp_index); + int type_index = cp->signature_ref_index_at(name_and_type_index); + Symbol* signature = cp->symbol_at(type_index); + + if ((code != Bytecodes::_invokestatic) && (code != Bytecodes::_invokedynamic)) { + // Pop receiver. + stack->pop(1); + } + + stack->pop(ArgumentSizeComputer(signature).size()); + ResultTypeFinder result_type(signature); + stack->push(bci, result_type.type()); + break; + } + + case Bytecodes::_newarray: + case Bytecodes::_anewarray: + case Bytecodes::_instanceof: + stack->pop(1); + stack->push(bci, Bytecodes::result_type(code)); + break; + + case Bytecodes::_arraylength: + // The return type of arraylength is wrong in the bytecodes table (T_VOID). + stack->pop(1); + stack->push(bci, T_INT); + break; + + case Bytecodes::_checkcast: + break; + + case Bytecodes::_multianewarray: + stack->pop(*(uint8_t*) (code_base + pos + 2)); + stack->push(bci, T_OBJECT); + break; + + case Bytecodes::_goto: + stack->pop(-Bytecodes::depth(code)); + dest_bci = bci + (int16_t) Bytes::get_Java_u2(code_base + pos); + flow_ended = true; + break; + + + case Bytecodes::_goto_w: + stack->pop(-Bytecodes::depth(code)); + dest_bci = bci + (int32_t) Bytes::get_Java_u4(code_base + pos); + flow_ended = true; + break; + + default: + // Allow at least the bcis which have stack info to work. + _all_processed = false; + _added_one = false; + delete stack; + + return len; + } + + // Put new stack to the next instruction, if we might reach it from + // this bci. + if (!flow_ended) { + if (_stacks->at(bci + len) == NULL) { + _added_one = true; + } + merge(bci + len, stack); + } + + // Put the stack to the branch target too. + if (dest_bci != -1) { + if (_stacks->at(dest_bci) == NULL) { + _added_one = true; + } + merge(dest_bci, stack); + } + + // If we have more than one branch target, process these too. + for (int64_t i = 0; i < dests.length(); ++i) { + if (_stacks->at(dests.at(i)) == NULL) { + _added_one = true; + } + merge(dests.at(i), stack); + } + + delete stack; + + return len; +} + +#define INVALID_BYTECODE_ENCOUNTERED -1 +#define NPE_EXPLICIT_CONSTRUCTED -2 +int ExceptionMessageBuilder::get_NPE_null_slot(int bci) { + // Get the bytecode. + address code_base = _method->constMethod()->code_base(); + Bytecodes::Code code = Bytecodes::java_code_at(_method, code_base + bci); + int pos = bci + 1; // Position of argument of the bytecode. + if (code == Bytecodes::_wide) { + code = Bytecodes::java_code_at(_method, code_base + bci + 1); + pos += 1; + } + + switch (code) { + case Bytecodes::_getfield: + case Bytecodes::_arraylength: + case Bytecodes::_athrow: + case Bytecodes::_monitorenter: + case Bytecodes::_monitorexit: + return 0; + case Bytecodes::_iaload: + case Bytecodes::_faload: + case Bytecodes::_aaload: + case Bytecodes::_baload: + case Bytecodes::_caload: + case Bytecodes::_saload: + case Bytecodes::_laload: + case Bytecodes::_daload: + return 1; + case Bytecodes::_iastore: + case Bytecodes::_fastore: + case Bytecodes::_aastore: + case Bytecodes::_bastore: + case Bytecodes::_castore: + case Bytecodes::_sastore: + return 2; + case Bytecodes::_lastore: + case Bytecodes::_dastore: + return 3; + case Bytecodes::_putfield: { + int cp_index = Bytes::get_native_u2(code_base + pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + ConstantPool* cp = _method->constants(); + int name_and_type_index = cp->name_and_type_ref_index_at(cp_index); + int type_index = cp->signature_ref_index_at(name_and_type_index); + Symbol* signature = cp->symbol_at(type_index); + return type2size[char2type((char) signature->char_at(0))]; + } + case Bytecodes::_invokevirtual: + case Bytecodes::_invokespecial: + case Bytecodes::_invokeinterface: { + int cp_index = Bytes::get_native_u2(code_base+ pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + ConstantPool* cp = _method->constants(); + int name_and_type_index = cp->name_and_type_ref_index_at(cp_index); + int name_index = cp->name_ref_index_at(name_and_type_index); + Symbol* name = cp->symbol_at(name_index); + + // Assume the the call of a constructor can never cause a NullPointerException + // (which is true in Java). This is mainly used to avoid generating wrong + // messages for NullPointerExceptions created explicitly by new in Java code. + if (name != vmSymbols::object_initializer_name()) { + int type_index = cp->signature_ref_index_at(name_and_type_index); + Symbol* signature = cp->symbol_at(type_index); + // The 'this' parameter was null. Return the slot of it. + return ArgumentSizeComputer(signature).size(); + } else { + return NPE_EXPLICIT_CONSTRUCTED; + } + } + + default: + break; + } + + return INVALID_BYTECODE_ENCOUNTERED; +} + +bool ExceptionMessageBuilder::print_NPE_cause(outputStream* os, int bci, int slot) { + if (print_NPE_cause0(os, bci, slot, _max_cause_detail, false, " because \"")) { + os->print("\" is null"); + return true; + } + return false; +} + +// Recursively print what was null. +// +// Go to the bytecode that pushed slot 'slot' on the operand stack +// at bytecode 'bci'. Compute a message for that bytecode. If +// necessary (array, field), recur further. +// At most do max_detail recursions. +// Prefix is used to print a proper beginning of the whole +// sentence. +// inner_expr is used to omit some text, like 'static' in +// inner expressions like array subscripts. +// +// Returns true if something was printed. +// +bool ExceptionMessageBuilder::print_NPE_cause0(outputStream* os, int bci, int slot, + int max_detail, + bool inner_expr, const char *prefix) { + assert(bci >= 0, "BCI too low"); + assert(bci < get_size(), "BCI too large"); + + if (max_detail <= 0) { + return false; + } + + if (_stacks->at(bci) == NULL) { + return false; + } + + SimulatedOperandStack* stack = _stacks->at(bci); + assert(slot >= 0, "Slot nr. too low"); + assert(slot < stack->get_size(), "Slot nr. too large"); + + StackSlotAnalysisData slotData = stack->get_slot_data(slot); + + if (!slotData.has_bci()) { + return false; + } + + // Get the bytecode. + unsigned int source_bci = slotData.get_bci(); + address code_base = _method->constMethod()->code_base(); + Bytecodes::Code code = Bytecodes::java_code_at(_method, code_base + source_bci); + bool is_wide = false; + int pos = source_bci + 1; + + if (code == Bytecodes::_wide) { + is_wide = true; + code = Bytecodes::java_code_at(_method, code_base + source_bci + 1); + pos += 1; + } + + if (max_detail == _max_cause_detail && + prefix != NULL && + code != Bytecodes::_invokevirtual && + code != Bytecodes::_invokespecial && + code != Bytecodes::_invokestatic && + code != Bytecodes::_invokeinterface) { + os->print("%s", prefix); + } + + switch (code) { + case Bytecodes::_iload_0: + case Bytecodes::_aload_0: + print_local_var(os, source_bci, _method, 0, !stack->local_slot_was_written(0)); + return true; + + case Bytecodes::_iload_1: + case Bytecodes::_aload_1: + print_local_var(os, source_bci, _method, 1, !stack->local_slot_was_written(1)); + return true; + + case Bytecodes::_iload_2: + case Bytecodes::_aload_2: + print_local_var(os, source_bci, _method, 2, !stack->local_slot_was_written(2)); + return true; + + case Bytecodes::_iload_3: + case Bytecodes::_aload_3: + print_local_var(os, source_bci, _method, 3, !stack->local_slot_was_written(3)); + return true; + + case Bytecodes::_iload: + case Bytecodes::_aload: { + int index; + if (is_wide) { + index = Bytes::get_Java_u2(code_base + source_bci + 2); + } else { + index = *(uint8_t*) (code_base + source_bci + 1); + } + print_local_var(os, source_bci, _method, index, !stack->local_slot_was_written(index)); + return true; + } + + case Bytecodes::_aconst_null: + os->print("null"); + return true; + case Bytecodes::_iconst_m1: + os->print("-1"); + return true; + case Bytecodes::_iconst_0: + os->print("0"); + return true; + case Bytecodes::_iconst_1: + os->print("1"); + return true; + case Bytecodes::_iconst_2: + os->print("2"); + return true; + case Bytecodes::_iconst_3: + os->print("3"); + return true; + case Bytecodes::_iconst_4: + os->print("4"); + return true; + case Bytecodes::_iconst_5: + os->print("5"); + return true; + case Bytecodes::_bipush: { + jbyte con = *(jbyte*) (code_base + source_bci + 1); + os->print("%d", con); + return true; + } + case Bytecodes::_sipush: { + u2 con = Bytes::get_Java_u2(code_base + source_bci + 1); + os->print("%d", con); + return true; + } + case Bytecodes::_iaload: + case Bytecodes::_aaload: { + // Print the 'name' of the array. Go back to the bytecode that + // pushed the array reference on the operand stack. + if (!print_NPE_cause0(os, source_bci, 1, max_detail - 1, inner_expr)) { + // Returned false. Max recursion depth was reached. Print dummy. + os->print(""); + } + os->print("["); + // Print the index expression. Go back to the bytecode that + // pushed the index on the operand stack. + // inner_expr == true so we don't print unwanted strings + // as "The return value of'". And don't decrement max_detail so we always + // get a value here and only cancel out on the dereference. + if (!print_NPE_cause0(os, source_bci, 0, max_detail, true)) { + // Returned false. We don't print complex array index expressions. Print placeholder. + os->print("..."); + } + os->print("]"); + return true; + } + + case Bytecodes::_getstatic: { + int cp_index = Bytes::get_native_u2(code_base + pos) + ConstantPool::CPCACHE_INDEX_TAG; + print_field_and_class(os, _method, cp_index); + return true; + } + + case Bytecodes::_getfield: { + // Print the sender. Go back to the bytecode that + // pushed the sender on the operand stack. + if (print_NPE_cause0(os, source_bci, 0, max_detail - 1, inner_expr)) { + os->print("."); + } + int cp_index = Bytes::get_native_u2(code_base + pos) + ConstantPool::CPCACHE_INDEX_TAG; + os->print("%s", get_field_name(_method, cp_index)); + return true; + } + + case Bytecodes::_invokevirtual: + case Bytecodes::_invokespecial: + case Bytecodes::_invokestatic: + case Bytecodes::_invokeinterface: { + int cp_index = Bytes::get_native_u2(code_base + pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + if (max_detail == _max_cause_detail && !inner_expr) { + os->print(" because the return value of \""); + } + print_method_name(os, _method, cp_index); + return true; + } + + default: break; + } + return false; +} + +void ExceptionMessageBuilder::print_NPE_failed_action(outputStream *os, int bci) { + + // Get the bytecode. + address code_base = _method->constMethod()->code_base(); + Bytecodes::Code code = Bytecodes::java_code_at(_method, code_base + bci); + int pos = bci + 1; + if (code == Bytecodes::_wide) { + code = Bytecodes::java_code_at(_method, code_base + bci + 1); + pos += 1; + } + + switch (code) { + case Bytecodes::_iaload: + os->print("Cannot load from int array"); break; + case Bytecodes::_faload: + os->print("Cannot load from float array"); break; + case Bytecodes::_aaload: + os->print("Cannot load from object array"); break; + case Bytecodes::_baload: + os->print("Cannot load from byte/boolean array"); break; + case Bytecodes::_caload: + os->print("Cannot load from char array"); break; + case Bytecodes::_saload: + os->print("Cannot load from short array"); break; + case Bytecodes::_laload: + os->print("Cannot load from long array"); break; + case Bytecodes::_daload: + os->print("Cannot load from double array"); break; + + case Bytecodes::_iastore: + os->print("Cannot store to int array"); break; + case Bytecodes::_fastore: + os->print("Cannot store to float array"); break; + case Bytecodes::_aastore: + os->print("Cannot store to object array"); break; + case Bytecodes::_bastore: + os->print("Cannot store to byte/boolean array"); break; + case Bytecodes::_castore: + os->print("Cannot store to char array"); break; + case Bytecodes::_sastore: + os->print("Cannot store to short array"); break; + case Bytecodes::_lastore: + os->print("Cannot store to long array"); break; + case Bytecodes::_dastore: + os->print("Cannot store to double array"); break; + + case Bytecodes::_arraylength: + os->print("Cannot read the array length"); break; + case Bytecodes::_athrow: + os->print("Cannot throw exception"); break; + case Bytecodes::_monitorenter: + os->print("Cannot enter synchronized block"); break; + case Bytecodes::_monitorexit: + os->print("Cannot exit synchronized block"); break; + case Bytecodes::_getfield: { + int cp_index = Bytes::get_native_u2(code_base + pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + ConstantPool* cp = _method->constants(); + int name_and_type_index = cp->name_and_type_ref_index_at(cp_index); + int name_index = cp->name_ref_index_at(name_and_type_index); + Symbol* name = cp->symbol_at(name_index); + os->print("Cannot read field \"%s\"", name->as_C_string()); + } break; + case Bytecodes::_putfield: { + int cp_index = Bytes::get_native_u2(code_base + pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + os->print("Cannot assign field \"%s\"", get_field_name(_method, cp_index)); + } break; + case Bytecodes::_invokevirtual: + case Bytecodes::_invokespecial: + case Bytecodes::_invokeinterface: { + int cp_index = Bytes::get_native_u2(code_base+ pos) DEBUG_ONLY(+ ConstantPool::CPCACHE_INDEX_TAG); + os->print("Cannot invoke \""); + print_method_name(os, _method, cp_index); + os->print("\""); + } break; + + default: + assert(0, "We should have checked this bytecode in get_NPE_null_slot()."); + break; + } +} + +// Main API +bool BytecodeUtils::get_NPE_message_at(outputStream* ss, Method* method, int bci) { + + NoSafepointVerifier _nsv; // Cannot use this object over a safepoint. + + // If this NPE was created via reflection, we have no real NPE. + if (method->method_holder() == + SystemDictionary::reflect_NativeConstructorAccessorImpl_klass()) { + return false; + } + + // Analyse the bytecodes. + ResourceMark rm; + ExceptionMessageBuilder emb(method, bci); + + // The slot of the operand stack that contains the null reference. + // Also checks for NPE explicitly constructed and returns NPE_EXPLICIT_CONSTRUCTED. + int slot = emb.get_NPE_null_slot(bci); + + // Build the message. + if (slot == NPE_EXPLICIT_CONSTRUCTED) { + // We don't want to print a message. + return false; + } else if (slot == INVALID_BYTECODE_ENCOUNTERED) { + // We encountered a bytecode that does not dereference a reference. + DEBUG_ONLY(ss->print("There cannot be a NullPointerException at bci %d of method %s", + bci, method->external_name())); + NOT_DEBUG(return false); + } else { + // Print string describing which action (bytecode) could not be + // performed because of the null reference. + emb.print_NPE_failed_action(ss, bci); + // Print a description of what is null. + if (!emb.print_NPE_cause(ss, bci, slot)) { + // Nothing was printed. End the sentence without the 'because' + // subordinate sentence. + } + } + return true; +} diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/interpreter/bytecodeUtils.hpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hotspot/share/interpreter/bytecodeUtils.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * 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. + * + */ + +#ifndef SHARE_INTERPRETER_BYTECODEUTILS_HPP +#define SHARE_INTERPRETER_BYTECODEUTILS_HPP + +#include "memory/allocation.hpp" +#include "utilities/globalDefinitions.hpp" + +class Method; +class outputStream; + +class BytecodeUtils : public AllStatic { + public: + // NPE extended message. Return true if string is printed. + static bool get_NPE_message_at(outputStream* ss, Method* method, int bci); +}; + +#endif // SHARE_INTERPRETER_BYTECODEUTILS_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/interpreter/interpreterRuntime.cpp --- a/src/hotspot/share/interpreter/interpreterRuntime.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1249,15 +1249,15 @@ char sig_type = '\0'; switch(cp_entry->flag_state()) { - case btos: sig_type = 'B'; break; - case ztos: sig_type = 'Z'; break; - case ctos: sig_type = 'C'; break; - case stos: sig_type = 'S'; break; - case itos: sig_type = 'I'; break; - case ftos: sig_type = 'F'; break; - case atos: sig_type = 'L'; break; - case ltos: sig_type = 'J'; break; - case dtos: sig_type = 'D'; break; + case btos: sig_type = JVM_SIGNATURE_BYTE; break; + case ztos: sig_type = JVM_SIGNATURE_BOOLEAN; break; + case ctos: sig_type = JVM_SIGNATURE_CHAR; break; + case stos: sig_type = JVM_SIGNATURE_SHORT; break; + case itos: sig_type = JVM_SIGNATURE_INT; break; + case ftos: sig_type = JVM_SIGNATURE_FLOAT; break; + case atos: sig_type = JVM_SIGNATURE_CLASS; break; + case ltos: sig_type = JVM_SIGNATURE_LONG; break; + case dtos: sig_type = JVM_SIGNATURE_DOUBLE; break; default: ShouldNotReachHere(); return; } bool is_static = (obj == NULL); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/jvmci/compilerRuntime.cpp --- a/src/hotspot/share/jvmci/compilerRuntime.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/jvmci/compilerRuntime.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -73,7 +73,7 @@ Handle protection_domain(THREAD, caller->method_holder()->protection_domain()); // Ignore wrapping L and ; - if (name[0] == 'L') { + if (name[0] == JVM_SIGNATURE_CLASS) { assert(len > 2, "small name %s", name); name++; len -= 2; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp --- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -535,8 +535,8 @@ JVMCI_THROW_MSG_NULL(ClassNotFoundException, str); } } else { - if (class_name->char_at(0) == 'L' && - class_name->char_at(class_name->utf8_length()-1) == ';') { + if (class_name->char_at(0) == JVM_SIGNATURE_CLASS && + class_name->char_at(class_name->utf8_length()-1) == JVM_SIGNATURE_ENDCLASS) { // This is a name from a signature. Strip off the trimmings. // Call recursive to keep scope of strippedsym. TempNewSymbol strippedsym = SymbolTable::new_symbol(class_name->as_utf8()+1, diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/jvmci/jvmciRuntime.cpp --- a/src/hotspot/share/jvmci/jvmciRuntime.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -980,8 +980,8 @@ JVMCI_EXCEPTION_CONTEXT; // Now we need to check the SystemDictionary - if (sym->char_at(0) == 'L' && - sym->char_at(sym->utf8_length()-1) == ';') { + if (sym->char_at(0) == JVM_SIGNATURE_CLASS && + sym->char_at(sym->utf8_length()-1) == JVM_SIGNATURE_ENDCLASS) { // This is a name from a signature. Strip off the trimmings. // Call recursive to keep scope of strippedsym. TempNewSymbol strippedsym = SymbolTable::new_symbol(sym->as_utf8()+1, @@ -1013,8 +1013,8 @@ // we must build an array type around it. The CI requires array klasses // to be loaded if their element klasses are loaded, except when memory // is exhausted. - if (sym->char_at(0) == '[' && - (sym->char_at(1) == '[' || sym->char_at(1) == 'L')) { + if (sym->char_at(0) == JVM_SIGNATURE_ARRAY && + (sym->char_at(1) == JVM_SIGNATURE_ARRAY || sym->char_at(1) == JVM_SIGNATURE_CLASS)) { // We have an unloaded array. // Build it on the fly if the element class exists. TempNewSymbol elem_sym = SymbolTable::new_symbol(sym->as_utf8()+1, @@ -1271,7 +1271,7 @@ if (method_holder->is_instance_klass()) { return InstanceKlass::cast(method_holder); } else if (method_holder->is_array_klass()) { - return InstanceKlass::cast(SystemDictionary::Object_klass()); + return SystemDictionary::Object_klass(); } else { ShouldNotReachHere(); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/memory/heapInspection.cpp --- a/src/hotspot/share/memory/heapInspection.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/memory/heapInspection.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -72,8 +72,8 @@ ResourceMark rm; const char* name1 = e1->klass()->external_name(); const char* name2 = e2->klass()->external_name(); - bool d1 = (name1[0] == '['); - bool d2 = (name2[0] == '['); + bool d1 = (name1[0] == JVM_SIGNATURE_ARRAY); + bool d2 = (name2[0] == JVM_SIGNATURE_ARRAY); if (d1 && !d2) { return -1; } else if (d2 && !d1) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/oops/generateOopMap.cpp --- a/src/hotspot/share/oops/generateOopMap.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/oops/generateOopMap.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -1993,14 +1993,14 @@ // This is used to parse the signature for fields, since they are very simple... CellTypeState *GenerateOopMap::sigchar_to_effect(char sigch, int bci, CellTypeState *out) { // Object and array - if (sigch=='L' || sigch=='[') { + if (sigch==JVM_SIGNATURE_CLASS || sigch==JVM_SIGNATURE_ARRAY) { out[0] = CellTypeState::make_line_ref(bci); out[1] = CellTypeState::bottom; return out; } - if (sigch == 'J' || sigch == 'D' ) return vvCTS; // Long and Double - if (sigch == 'V' ) return epsilonCTS; // Void - return vCTS; // Otherwise + if (sigch == JVM_SIGNATURE_LONG || sigch == JVM_SIGNATURE_DOUBLE) return vvCTS; // Long and Double + if (sigch == JVM_SIGNATURE_VOID) return epsilonCTS; // Void + return vCTS; // Otherwise } long GenerateOopMap::_total_byte_count = 0; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/oops/instanceKlass.cpp --- a/src/hotspot/share/oops/instanceKlass.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/oops/instanceKlass.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -2497,10 +2497,18 @@ #endif } +static void method_release_C_heap_structures(Method* m) { + m->release_C_heap_structures(); +} + void InstanceKlass::release_C_heap_structures(InstanceKlass* ik) { // Clean up C heap ik->release_C_heap_structures(); ik->constants()->release_C_heap_structures(); + + // Deallocate and call destructors for MDO mutexes + ik->methods_do(method_release_C_heap_structures); + } void InstanceKlass::release_C_heap_structures() { @@ -2586,7 +2594,7 @@ // Add L as type indicator int dest_index = 0; - dest[dest_index++] = 'L'; + dest[dest_index++] = JVM_SIGNATURE_CLASS; // Add the actual class name for (int src_index = 0; src_index < src_length; ) { @@ -2599,7 +2607,7 @@ } // Add the semicolon and the NULL - dest[dest_index++] = ';'; + dest[dest_index++] = JVM_SIGNATURE_ENDCLASS; dest[dest_index] = '\0'; return dest; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/oops/klass.hpp --- a/src/hotspot/share/oops/klass.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/oops/klass.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -340,19 +340,17 @@ static ByteSize access_flags_offset() { return in_ByteSize(offset_of(Klass, _access_flags)); } // Unpacking layout_helper: - enum { - _lh_neutral_value = 0, // neutral non-array non-instance value - _lh_instance_slow_path_bit = 0x01, - _lh_log2_element_size_shift = BitsPerByte*0, - _lh_log2_element_size_mask = BitsPerLong-1, - _lh_element_type_shift = BitsPerByte*1, - _lh_element_type_mask = right_n_bits(BitsPerByte), // shifted mask - _lh_header_size_shift = BitsPerByte*2, - _lh_header_size_mask = right_n_bits(BitsPerByte), // shifted mask - _lh_array_tag_bits = 2, - _lh_array_tag_shift = BitsPerInt - _lh_array_tag_bits, - _lh_array_tag_obj_value = ~0x01 // 0x80000000 >> 30 - }; + static const int _lh_neutral_value = 0; // neutral non-array non-instance value + static const int _lh_instance_slow_path_bit = 0x01; + static const int _lh_log2_element_size_shift = BitsPerByte*0; + static const int _lh_log2_element_size_mask = BitsPerLong-1; + static const int _lh_element_type_shift = BitsPerByte*1; + static const int _lh_element_type_mask = right_n_bits(BitsPerByte); // shifted mask + static const int _lh_header_size_shift = BitsPerByte*2; + static const int _lh_header_size_mask = right_n_bits(BitsPerByte); // shifted mask + static const int _lh_array_tag_bits = 2; + static const int _lh_array_tag_shift = BitsPerInt - _lh_array_tag_bits; + static const int _lh_array_tag_obj_value = ~0x01; // 0x80000000 >> 30 static const unsigned int _lh_array_tag_type_value = 0Xffffffff; // ~0x00, // 0xC0000000 >> 30 diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/oops/method.cpp --- a/src/hotspot/share/oops/method.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/oops/method.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -118,11 +118,6 @@ void Method::deallocate_contents(ClassLoaderData* loader_data) { MetadataFactory::free_metadata(loader_data, constMethod()); set_constMethod(NULL); -#if INCLUDE_JVMCI - if (method_data()) { - FailedSpeculation::free_failed_speculations(method_data()->get_failed_speculations_address()); - } -#endif MetadataFactory::free_metadata(loader_data, method_data()); set_method_data(NULL); MetadataFactory::free_metadata(loader_data, method_counters()); @@ -131,6 +126,16 @@ if (code() != NULL) _code = NULL; } +void Method::release_C_heap_structures() { + if (method_data()) { +#if INCLUDE_JVMCI + FailedSpeculation::free_failed_speculations(method_data()->get_failed_speculations_address()); +#endif + // Destroy MethodData + method_data()->~MethodData(); + } +} + address Method::get_i2c_entry() { assert(adapter() != NULL, "must have"); return adapter()->get_i2c_entry(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/oops/method.hpp --- a/src/hotspot/share/oops/method.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/oops/method.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -1006,6 +1006,8 @@ // Deallocation function for redefine classes or if an error occurs void deallocate_contents(ClassLoaderData* loader_data); + void release_C_heap_structures(); + Method* get_new_method() const { InstanceKlass* holder = method_holder(); Method* new_method = holder->method_with_idnum(orig_method_idnum()); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/oops/methodData.hpp --- a/src/hotspot/share/oops/methodData.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/oops/methodData.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -2445,7 +2445,7 @@ virtual void metaspace_pointers_do(MetaspaceClosure* iter); virtual MetaspaceObj::Type type() const { return MethodDataType; } - // Deallocation support - no pointer fields to deallocate + // Deallocation support - no metaspace pointer fields to deallocate void deallocate_contents(ClassLoaderData* loader_data) {} // GC support diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/oops/objArrayKlass.cpp --- a/src/hotspot/share/oops/objArrayKlass.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/oops/objArrayKlass.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -106,14 +106,14 @@ int len = element_klass->name()->utf8_length(); char *new_str = NEW_RESOURCE_ARRAY(char, len + 4); int idx = 0; - new_str[idx++] = '['; + new_str[idx++] = JVM_SIGNATURE_ARRAY; if (element_klass->is_instance_klass()) { // it could be an array or simple type - new_str[idx++] = 'L'; + new_str[idx++] = JVM_SIGNATURE_CLASS; } memcpy(&new_str[idx], name_str, len * sizeof(char)); idx += len; if (element_klass->is_instance_klass()) { - new_str[idx++] = ';'; + new_str[idx++] = JVM_SIGNATURE_ENDCLASS; } new_str[idx++] = '\0'; name = SymbolTable::new_permanent_symbol(new_str); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/oops/symbol.cpp --- a/src/hotspot/share/oops/symbol.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/oops/symbol.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -201,8 +201,8 @@ int length = (int)strlen(str); // Turn all '/'s into '.'s (also for array klasses) for (int index = 0; index < length; index++) { - if (str[index] == '/') { - str[index] = '.'; + if (str[index] == JVM_SIGNATURE_SLASH) { + str[index] = JVM_SIGNATURE_DOT; } } return str; @@ -210,8 +210,8 @@ static void print_class(outputStream *os, char *class_str, int len) { for (int i = 0; i < len; ++i) { - if (class_str[i] == '/') { - os->put('.'); + if (class_str[i] == JVM_SIGNATURE_SLASH) { + os->put(JVM_SIGNATURE_DOT); } else { os->put(class_str[i]); } @@ -221,9 +221,9 @@ static void print_array(outputStream *os, char *array_str, int len) { int dimensions = 0; for (int i = 0; i < len; ++i) { - if (array_str[i] == '[') { + if (array_str[i] == JVM_SIGNATURE_ARRAY) { dimensions++; - } else if (array_str[i] == 'L') { + } else if (array_str[i] == JVM_SIGNATURE_CLASS) { // Expected format: L;. Skip 'L' and ';' delimiting the type name. print_class(os, array_str+i+1, len-i-2); break; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/opto/convertnode.cpp --- a/src/hotspot/share/opto/convertnode.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/opto/convertnode.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -532,6 +532,11 @@ } //============================================================================= +RoundDoubleModeNode* RoundDoubleModeNode::make(PhaseGVN& gvn, Node* arg, RoundDoubleModeNode::RoundingMode rmode) { + ConINode* rm = gvn.intcon(rmode); + return new RoundDoubleModeNode(arg, (Node *)rm); +} + //------------------------------Identity--------------------------------------- // Remove redundant roundings. Node* RoundDoubleModeNode::Identity(PhaseGVN* phase) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/opto/convertnode.hpp --- a/src/hotspot/share/opto/convertnode.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/opto/convertnode.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -215,7 +215,13 @@ //-----------------------------RoundDoubleModeNode----------------------------- class RoundDoubleModeNode: public Node { public: + enum RoundingMode { + rmode_rint = 0, + rmode_floor = 1, + rmode_ceil = 2 + }; RoundDoubleModeNode(Node *in1, Node * rmode): Node(0, in1, rmode) {} + static RoundDoubleModeNode* make(PhaseGVN& gvn, Node* arg, RoundDoubleModeNode::RoundingMode rmode); virtual int Opcode() const; virtual const Type *bottom_type() const { return Type::DOUBLE; } virtual uint ideal_reg() const { return Op_RegD; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/opto/library_call.cpp --- a/src/hotspot/share/opto/library_call.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/opto/library_call.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1822,9 +1822,9 @@ switch (id) { case vmIntrinsics::_dabs: n = new AbsDNode( arg); break; case vmIntrinsics::_dsqrt: n = new SqrtDNode(C, control(), arg); break; - case vmIntrinsics::_ceil: n = new RoundDoubleModeNode(arg, makecon(TypeInt::make(2))); break; - case vmIntrinsics::_floor: n = new RoundDoubleModeNode(arg, makecon(TypeInt::make(1))); break; - case vmIntrinsics::_rint: n = new RoundDoubleModeNode(arg, makecon(TypeInt::make(0))); break; + case vmIntrinsics::_ceil: n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_ceil); break; + case vmIntrinsics::_floor: n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_floor); break; + case vmIntrinsics::_rint: n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_rint); break; default: fatal_unexpected_iid(id); break; } set_result(_gvn.transform(n)); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/opto/memnode.cpp --- a/src/hotspot/share/opto/memnode.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/opto/memnode.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -736,9 +736,7 @@ // Also, asserts a cross-check of the type against the expected address type. const TypePtr* MemNode::calculate_adr_type(const Type* t, const TypePtr* cross_check) { if (t == Type::TOP) return NULL; // does not touch memory any more? - #ifdef PRODUCT - cross_check = NULL; - #else + #ifdef ASSERT if (!VerifyAliases || VMError::is_error_reported() || Node::in_dump()) cross_check = NULL; #endif const TypePtr* tp = t->isa_ptr(); @@ -3534,37 +3532,51 @@ // within the initialization without creating a vicious cycle, such as: // { Foo p = new Foo(); p.next = p; } // True for constants and parameters and small combinations thereof. -bool InitializeNode::detect_init_independence(Node* n, int& count) { - if (n == NULL) return true; // (can this really happen?) - if (n->is_Proj()) n = n->in(0); - if (n == this) return false; // found a cycle - if (n->is_Con()) return true; - if (n->is_Start()) return true; // params, etc., are OK - if (n->is_Root()) return true; // even better - - Node* ctl = n->in(0); - if (ctl != NULL && !ctl->is_top()) { - if (ctl->is_Proj()) ctl = ctl->in(0); - if (ctl == this) return false; - - // If we already know that the enclosing memory op is pinned right after - // the init, then any control flow that the store has picked up - // must have preceded the init, or else be equal to the init. - // Even after loop optimizations (which might change control edges) - // a store is never pinned *before* the availability of its inputs. - if (!MemNode::all_controls_dominate(n, this)) - return false; // failed to prove a good control - } - - // Check data edges for possible dependencies on 'this'. - if ((count += 1) > 20) return false; // complexity limit - for (uint i = 1; i < n->req(); i++) { - Node* m = n->in(i); - if (m == NULL || m == n || m->is_top()) continue; - uint first_i = n->find_edge(m); - if (i != first_i) continue; // process duplicate edge just once - if (!detect_init_independence(m, count)) { - return false; +bool InitializeNode::detect_init_independence(Node* value, PhaseGVN* phase) { + ResourceMark rm; + Unique_Node_List worklist; + worklist.push(value); + + uint complexity_limit = 20; + for (uint j = 0; j < worklist.size(); j++) { + if (j >= complexity_limit) { + return false; // Bail out if processed too many nodes + } + + Node* n = worklist.at(j); + if (n == NULL) continue; // (can this really happen?) + if (n->is_Proj()) n = n->in(0); + if (n == this) return false; // found a cycle + if (n->is_Con()) continue; + if (n->is_Start()) continue; // params, etc., are OK + if (n->is_Root()) continue; // even better + + // There cannot be any dependency if 'n' is a CFG node that dominates the current allocation + if (n->is_CFG() && phase->is_dominator(n, allocation())) { + continue; + } + + Node* ctl = n->in(0); + if (ctl != NULL && !ctl->is_top()) { + if (ctl->is_Proj()) ctl = ctl->in(0); + if (ctl == this) return false; + + // If we already know that the enclosing memory op is pinned right after + // the init, then any control flow that the store has picked up + // must have preceded the init, or else be equal to the init. + // Even after loop optimizations (which might change control edges) + // a store is never pinned *before* the availability of its inputs. + if (!MemNode::all_controls_dominate(n, this)) + return false; // failed to prove a good control + } + + // Check data edges for possible dependencies on 'this'. + for (uint i = 1; i < n->req(); i++) { + Node* m = n->in(i); + if (m == NULL || m == n || m->is_top()) continue; + + // Only process data inputs once + worklist.push(m); } } @@ -3575,7 +3587,7 @@ // an initialization. Returns zero if a check fails. // On success, returns the (constant) offset to which the store applies, // within the initialized memory. -intptr_t InitializeNode::can_capture_store(StoreNode* st, PhaseTransform* phase, bool can_reshape) { +intptr_t InitializeNode::can_capture_store(StoreNode* st, PhaseGVN* phase, bool can_reshape) { const int FAIL = 0; if (st->req() != MemNode::ValueIn + 1) return FAIL; // an inscrutable StoreNode (card mark?) @@ -3597,8 +3609,8 @@ return FAIL; // mismatched access } Node* val = st->in(MemNode::ValueIn); - int complexity_count = 0; - if (!detect_init_independence(val, complexity_count)) + + if (!detect_init_independence(val, phase)) return FAIL; // stored value must be 'simple enough' // The Store can be captured only if nothing after the allocation @@ -3796,7 +3808,7 @@ // rawstore1 rawstore2) // Node* InitializeNode::capture_store(StoreNode* st, intptr_t start, - PhaseTransform* phase, bool can_reshape) { + PhaseGVN* phase, bool can_reshape) { assert(stores_are_sane(phase), ""); if (start < 0) return NULL; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/opto/memnode.hpp --- a/src/hotspot/share/opto/memnode.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/opto/memnode.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -1387,11 +1387,11 @@ // See if this store can be captured; return offset where it initializes. // Return 0 if the store cannot be moved (any sort of problem). - intptr_t can_capture_store(StoreNode* st, PhaseTransform* phase, bool can_reshape); + intptr_t can_capture_store(StoreNode* st, PhaseGVN* phase, bool can_reshape); // Capture another store; reformat it to write my internal raw memory. // Return the captured copy, else NULL if there is some sort of problem. - Node* capture_store(StoreNode* st, intptr_t start, PhaseTransform* phase, bool can_reshape); + Node* capture_store(StoreNode* st, intptr_t start, PhaseGVN* phase, bool can_reshape); // Find captured store which corresponds to the range [start..start+size). // Return my own memory projection (meaning the initial zero bits) @@ -1414,7 +1414,7 @@ Node* make_raw_address(intptr_t offset, PhaseTransform* phase); - bool detect_init_independence(Node* n, int& count); + bool detect_init_independence(Node* value, PhaseGVN* phase); void coalesce_subword_stores(intptr_t header_size, Node* size_in_bytes, PhaseGVN* phase); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/opto/phaseX.cpp --- a/src/hotspot/share/opto/phaseX.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/opto/phaseX.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -899,7 +899,7 @@ while (d != n) { n = IfNode::up_one_dom(n, linear_only); i++; - if (n == NULL || i >= 10) { + if (n == NULL || i >= 100) { return false; } } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/jni.cpp --- a/src/hotspot/share/prims/jni.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/jni.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -2151,7 +2151,7 @@ if (JvmtiExport::should_post_field_modification()) { jvalue field_value; field_value.l = value; - o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, 'L', (jvalue *)&field_value); + o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, JVM_SIGNATURE_CLASS, (jvalue *)&field_value); } HeapAccess::oop_store_at(o, offset, JNIHandles::resolve(value)); HOTSPOT_JNI_SETOBJECTFIELD_RETURN(); @@ -2177,34 +2177,34 @@ field_value.unionType = value; \ o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, SigType, (jvalue *)&field_value); \ } \ - if (SigType == 'Z') { value = ((jboolean)value) & 1; } \ + if (SigType == JVM_SIGNATURE_BOOLEAN) { value = ((jboolean)value) & 1; } \ o->Fieldname##_field_put(offset, value); \ ReturnProbe; \ JNI_END -DEFINE_SETFIELD(jboolean, bool, Boolean, 'Z', z +DEFINE_SETFIELD(jboolean, bool, Boolean, JVM_SIGNATURE_BOOLEAN, z , HOTSPOT_JNI_SETBOOLEANFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETBOOLEANFIELD_RETURN()) -DEFINE_SETFIELD(jbyte, byte, Byte, 'B', b +DEFINE_SETFIELD(jbyte, byte, Byte, JVM_SIGNATURE_BYTE, b , HOTSPOT_JNI_SETBYTEFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETBYTEFIELD_RETURN()) -DEFINE_SETFIELD(jchar, char, Char, 'C', c +DEFINE_SETFIELD(jchar, char, Char, JVM_SIGNATURE_CHAR, c , HOTSPOT_JNI_SETCHARFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETCHARFIELD_RETURN()) -DEFINE_SETFIELD(jshort, short, Short, 'S', s +DEFINE_SETFIELD(jshort, short, Short, JVM_SIGNATURE_SHORT, s , HOTSPOT_JNI_SETSHORTFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETSHORTFIELD_RETURN()) -DEFINE_SETFIELD(jint, int, Int, 'I', i +DEFINE_SETFIELD(jint, int, Int, JVM_SIGNATURE_INT, i , HOTSPOT_JNI_SETINTFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETINTFIELD_RETURN()) -DEFINE_SETFIELD(jlong, long, Long, 'J', j +DEFINE_SETFIELD(jlong, long, Long, JVM_SIGNATURE_LONG, j , HOTSPOT_JNI_SETLONGFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETLONGFIELD_RETURN()) // Float and double probes don't return value because dtrace doesn't currently support it -DEFINE_SETFIELD(jfloat, float, Float, 'F', f +DEFINE_SETFIELD(jfloat, float, Float, JVM_SIGNATURE_FLOAT, f , HOTSPOT_JNI_SETFLOATFIELD_ENTRY(env, obj, (uintptr_t)fieldID), HOTSPOT_JNI_SETFLOATFIELD_RETURN()) -DEFINE_SETFIELD(jdouble, double, Double, 'D', d +DEFINE_SETFIELD(jdouble, double, Double, JVM_SIGNATURE_DOUBLE, d , HOTSPOT_JNI_SETDOUBLEFIELD_ENTRY(env, obj, (uintptr_t)fieldID), HOTSPOT_JNI_SETDOUBLEFIELD_RETURN()) @@ -2352,7 +2352,7 @@ if (JvmtiExport::should_post_field_modification()) { jvalue field_value; field_value.l = value; - JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, 'L', (jvalue *)&field_value); + JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, JVM_SIGNATURE_CLASS, (jvalue *)&field_value); } id->holder()->java_mirror()->obj_field_put(id->offset(), JNIHandles::resolve(value)); HOTSPOT_JNI_SETSTATICOBJECTFIELD_RETURN(); @@ -2376,34 +2376,34 @@ field_value.unionType = value; \ JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \ } \ - if (SigType == 'Z') { value = ((jboolean)value) & 1; } \ + if (SigType == JVM_SIGNATURE_BOOLEAN) { value = ((jboolean)value) & 1; } \ id->holder()->java_mirror()-> Fieldname##_field_put (id->offset(), value); \ ReturnProbe;\ JNI_END -DEFINE_SETSTATICFIELD(jboolean, bool, Boolean, 'Z', z +DEFINE_SETSTATICFIELD(jboolean, bool, Boolean, JVM_SIGNATURE_BOOLEAN, z , HOTSPOT_JNI_SETSTATICBOOLEANFIELD_ENTRY(env, clazz, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETSTATICBOOLEANFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jbyte, byte, Byte, 'B', b +DEFINE_SETSTATICFIELD(jbyte, byte, Byte, JVM_SIGNATURE_BYTE, b , HOTSPOT_JNI_SETSTATICBYTEFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICBYTEFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jchar, char, Char, 'C', c +DEFINE_SETSTATICFIELD(jchar, char, Char, JVM_SIGNATURE_CHAR, c , HOTSPOT_JNI_SETSTATICCHARFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICCHARFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jshort, short, Short, 'S', s +DEFINE_SETSTATICFIELD(jshort, short, Short, JVM_SIGNATURE_SHORT, s , HOTSPOT_JNI_SETSTATICSHORTFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICSHORTFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jint, int, Int, 'I', i +DEFINE_SETSTATICFIELD(jint, int, Int, JVM_SIGNATURE_INT, i , HOTSPOT_JNI_SETSTATICINTFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICINTFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jlong, long, Long, 'J', j +DEFINE_SETSTATICFIELD(jlong, long, Long, JVM_SIGNATURE_LONG, j , HOTSPOT_JNI_SETSTATICLONGFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICLONGFIELD_RETURN()) // Float and double probes don't return value because dtrace doesn't currently support it -DEFINE_SETSTATICFIELD(jfloat, float, Float, 'F', f +DEFINE_SETSTATICFIELD(jfloat, float, Float, JVM_SIGNATURE_FLOAT, f , HOTSPOT_JNI_SETSTATICFLOATFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_SETSTATICFLOATFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jdouble, double, Double, 'D', d +DEFINE_SETSTATICFIELD(jdouble, double, Double, JVM_SIGNATURE_DOUBLE, d , HOTSPOT_JNI_SETSTATICDOUBLEFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_SETSTATICDOUBLEFIELD_RETURN()) diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/jniCheck.cpp --- a/src/hotspot/share/prims/jniCheck.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/jniCheck.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -266,7 +266,7 @@ /* check for proper subclass hierarchy */ JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fid); Klass* f_oop = id->holder(); - if (!InstanceKlass::cast(k_oop)->is_subtype_of(f_oop)) + if (!k_oop->is_subtype_of(f_oop)) ReportJNIFatalError(thr, fatal_wrong_static_field); /* check for proper field type */ @@ -513,7 +513,7 @@ assert(klass != NULL, "klass argument must have a value"); if (!klass->is_instance_klass() || - !InstanceKlass::cast(klass)->is_subclass_of(SystemDictionary::Throwable_klass())) { + !klass->is_subclass_of(SystemDictionary::Throwable_klass())) { ReportJNIFatalError(thr, fatal_class_not_a_throwable_class); } } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/jvm.cpp --- a/src/hotspot/share/prims/jvm.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/jvm.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -38,6 +38,7 @@ #include "classfile/vmSymbols.hpp" #include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/bytecode.hpp" +#include "interpreter/bytecodeUtils.hpp" #include "jfr/jfrEvents.hpp" #include "logging/log.hpp" #include "memory/heapShared.hpp" @@ -531,13 +532,37 @@ // java.lang.Throwable ////////////////////////////////////////////////////// - JVM_ENTRY(void, JVM_FillInStackTrace(JNIEnv *env, jobject receiver)) JVMWrapper("JVM_FillInStackTrace"); Handle exception(thread, JNIHandles::resolve_non_null(receiver)); java_lang_Throwable::fill_in_stack_trace(exception); JVM_END +// java.lang.NullPointerException /////////////////////////////////////////// + +JVM_ENTRY(jstring, JVM_GetExtendedNPEMessage(JNIEnv *env, jthrowable throwable)) + if (!ShowCodeDetailsInExceptionMessages) return NULL; + + oop exc = JNIHandles::resolve_non_null(throwable); + + Method* method; + int bci; + if (!java_lang_Throwable::get_top_method_and_bci(exc, &method, &bci)) { + return NULL; + } + if (method->is_native()) { + return NULL; + } + + stringStream ss; + bool ok = BytecodeUtils::get_NPE_message_at(&ss, method, bci); + if (ok) { + oop result = java_lang_String::create_oop_from_str(ss.base(), CHECK_0); + return (jstring) JNIHandles::make_local(env, result); + } else { + return NULL; + } +JVM_END // java.lang.StackTraceElement ////////////////////////////////////////////// @@ -2283,7 +2308,7 @@ ConstantPool* cp = InstanceKlass::cast(k)->constants(); for (int index = cp->length() - 1; index >= 0; index--) { constantTag tag = cp->tag_at(index); - types[index] = (tag.is_unresolved_klass()) ? JVM_CONSTANT_Class : tag.value(); + types[index] = (tag.is_unresolved_klass()) ? (unsigned char) JVM_CONSTANT_Class : tag.value(); } } JVM_END diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/jvmtiEnvBase.cpp --- a/src/hotspot/share/prims/jvmtiEnvBase.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1361,7 +1361,7 @@ NULL_CHECK(ob_k, JVMTI_ERROR_INVALID_OBJECT); // Method return type signature. - char* ty_sign = 1 + strchr(signature->as_C_string(), ')'); + char* ty_sign = 1 + strchr(signature->as_C_string(), JVM_SIGNATURE_ENDFUNC); if (!VM_GetOrSetLocal::is_assignable(ty_sign, ob_k, current_thread)) { return JVMTI_ERROR_TYPE_MISMATCH; diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/jvmtiExport.cpp --- a/src/hotspot/share/prims/jvmtiExport.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/jvmtiExport.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1994,7 +1994,9 @@ address location, Klass* field_klass, Handle object, jfieldID field, char sig_type, jvalue *value) { - if (sig_type == 'I' || sig_type == 'Z' || sig_type == 'B' || sig_type == 'C' || sig_type == 'S') { + if (sig_type == JVM_SIGNATURE_INT || sig_type == JVM_SIGNATURE_BOOLEAN || + sig_type == JVM_SIGNATURE_BYTE || sig_type == JVM_SIGNATURE_CHAR || + sig_type == JVM_SIGNATURE_SHORT) { // 'I' instructions are used for byte, char, short and int. // determine which it really is, and convert fieldDescriptor fd; @@ -2005,22 +2007,22 @@ // convert value from int to appropriate type switch (fd.field_type()) { case T_BOOLEAN: - sig_type = 'Z'; + sig_type = JVM_SIGNATURE_BOOLEAN; value->i = 0; // clear it value->z = (jboolean)ival; break; case T_BYTE: - sig_type = 'B'; + sig_type = JVM_SIGNATURE_BYTE; value->i = 0; // clear it value->b = (jbyte)ival; break; case T_CHAR: - sig_type = 'C'; + sig_type = JVM_SIGNATURE_CHAR; value->i = 0; // clear it value->c = (jchar)ival; break; case T_SHORT: - sig_type = 'S'; + sig_type = JVM_SIGNATURE_SHORT; value->i = 0; // clear it value->s = (jshort)ival; break; @@ -2035,11 +2037,11 @@ } } - assert(sig_type != '[', "array should have sig_type == 'L'"); + assert(sig_type != JVM_SIGNATURE_ARRAY, "array should have sig_type == 'L'"); bool handle_created = false; // convert oop to JNI handle. - if (sig_type == 'L') { + if (sig_type == JVM_SIGNATURE_CLASS) { handle_created = true; value->l = (jobject)JNIHandles::make_local(thread, (oop)value->l); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/jvmtiImpl.cpp --- a/src/hotspot/share/prims/jvmtiImpl.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/jvmtiImpl.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -588,7 +588,8 @@ assert(klass != NULL, "klass must not be NULL"); int len = (int) strlen(ty_sign); - if (ty_sign[0] == 'L' && ty_sign[len-1] == ';') { // Need pure class/interface name + if (ty_sign[0] == JVM_SIGNATURE_CLASS && + ty_sign[len-1] == JVM_SIGNATURE_ENDCLASS) { // Need pure class/interface name ty_sign++; len -= 2; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/jvmtiRedefineClasses.cpp --- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -2166,14 +2166,14 @@ switch (tag) { // These BaseType tag values are from Table 4.2 in VM spec: - case 'B': // byte - case 'C': // char - case 'D': // double - case 'F': // float - case 'I': // int - case 'J': // long - case 'S': // short - case 'Z': // boolean + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN: // The remaining tag values are from Table 4.8 in the 2nd-edition of // the VM spec: @@ -2244,7 +2244,7 @@ } break; - case '[': + case JVM_SIGNATURE_ARRAY: { if ((byte_i_ref + 2) > annotations_typeArray->length()) { // not enough room for a num_values field diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/jvmtiTagMap.cpp --- a/src/hotspot/share/prims/jvmtiTagMap.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/jvmtiTagMap.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1032,7 +1032,7 @@ // helper function to tell if a field is a primitive field or not static inline bool is_primitive_field_type(char type) { - return (type != 'L' && type != '['); + return (type != JVM_SIGNATURE_CLASS && type != JVM_SIGNATURE_ARRAY); } // helper function to copy the value from location addr to jvalue. diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/methodHandles.cpp --- a/src/hotspot/share/prims/methodHandles.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/methodHandles.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -542,18 +542,22 @@ const int len = sig->utf8_length(); for (int i = 0; i < len; i++) { switch (sig->char_at(i)) { - case 'L': + case JVM_SIGNATURE_CLASS: // only java/lang/Object is valid here if (sig->index_of_at(i, OBJ_SIG, OBJ_SIG_LEN) != i) return false; i += OBJ_SIG_LEN-1; //-1 because of i++ in loop continue; - case '(': case ')': case 'V': - case 'I': case 'J': case 'F': case 'D': + case JVM_SIGNATURE_FUNC: + case JVM_SIGNATURE_ENDFUNC: + case JVM_SIGNATURE_VOID: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_DOUBLE: continue; - //case '[': - //case 'Z': case 'B': case 'C': case 'S': default: + // subword types (T_BYTE etc.), arrays return false; } } @@ -567,7 +571,7 @@ } else if (is_basic_type_signature(sig)) { sig->increment_refcount(); return sig; // that was easy - } else if (sig->char_at(0) != '(') { + } else if (sig->char_at(0) != JVM_SIGNATURE_FUNC) { BasicType bt = char2type(sig->char_at(0)); if (is_subword_type(bt)) { bsig = vmSymbols::int_signature(); @@ -578,7 +582,7 @@ } else { ResourceMark rm; stringStream buffer(128); - buffer.put('('); + buffer.put(JVM_SIGNATURE_FUNC); int arg_pos = 0, keep_arg_pos = -1; if (keep_last_arg) keep_arg_pos = ArgumentCount(sig).size() - 1; @@ -586,7 +590,7 @@ BasicType bt = ss.type(); size_t this_arg_pos = buffer.size(); if (ss.at_return_type()) { - buffer.put(')'); + buffer.put(JVM_SIGNATURE_ENDFUNC); } if (arg_pos == keep_arg_pos) { buffer.write((char*) ss.raw_bytes(), @@ -621,25 +625,26 @@ for (int i = 0; i < len; i++) { char ch = sig->char_at(i); switch (ch) { - case '(': case ')': + case JVM_SIGNATURE_FUNC: + case JVM_SIGNATURE_ENDFUNC: prev_type = false; st->put(ch); continue; - case '[': + case JVM_SIGNATURE_ARRAY: if (!keep_basic_names && keep_arrays) st->put(ch); array++; continue; - case 'L': + case JVM_SIGNATURE_CLASS: { if (prev_type) st->put(','); int start = i+1, slash = start; - while (++i < len && (ch = sig->char_at(i)) != ';') { - if (ch == '/' || ch == '.' || ch == '$') slash = i+1; + while (++i < len && (ch = sig->char_at(i)) != JVM_SIGNATURE_ENDCLASS) { + if (ch == JVM_SIGNATURE_SLASH || ch == JVM_SIGNATURE_DOT || ch == '$') slash = i+1; } if (slash < i) start = slash; if (!keep_basic_names) { - st->put('L'); + st->put(JVM_SIGNATURE_CLASS); } else { for (int j = start; j < i; j++) st->put(sig->char_at(j)); @@ -650,7 +655,7 @@ default: { if (array && char2type(ch) != T_ILLEGAL && !keep_arrays) { - ch = '['; + ch = JVM_SIGNATURE_ARRAY; array = 0; } if (prev_type) st->put(','); @@ -978,7 +983,7 @@ } if (sig != NULL) { if (sig->utf8_length() == 0) return 0; // a match is not possible - if (sig->char_at(0) == '(') + if (sig->char_at(0) == JVM_SIGNATURE_FUNC) match_flags &= ~(IS_FIELD | IS_TYPE); else match_flags &= ~(IS_CONSTRUCTOR | IS_METHOD); @@ -1456,7 +1461,7 @@ { Symbol* type = caller->constants()->signature_ref_at(bss_index_in_pool); Handle th; - if (type->char_at(0) == '(') { + if (type->char_at(0) == JVM_SIGNATURE_FUNC) { th = SystemDictionary::find_method_handle_type(type, caller, CHECK); } else { th = SystemDictionary::find_java_mirror_for_type(type, caller, SignatureStream::NCDFError, CHECK); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/prims/nativeLookup.cpp --- a/src/hotspot/share/prims/nativeLookup.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/prims/nativeLookup.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -106,7 +106,7 @@ st.print("__"); // find ')' int end; - for (end = 0; end < signature->utf8_length() && signature->char_at(end) != ')'; end++); + for (end = 0; end < signature->utf8_length() && signature->char_at(end) != JVM_SIGNATURE_ENDFUNC; end++); // skip first '(' mangle_name_on(&st, signature, 1, end); return st.as_string(); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/arguments.cpp --- a/src/hotspot/share/runtime/arguments.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/arguments.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -3968,6 +3968,11 @@ "Shared spaces are not supported in this VM\n"); return JNI_ERR; } + if (DumpLoadedClassList != NULL) { + jio_fprintf(defaultStream::error_stream(), + "DumpLoadedClassList is not supported in this VM\n"); + return JNI_ERR; + } if ((UseSharedSpaces && FLAG_IS_CMDLINE(UseSharedSpaces)) || log_is_enabled(Info, cds)) { warning("Shared spaces are not supported in this VM"); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/deoptimization.cpp --- a/src/hotspot/share/runtime/deoptimization.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/deoptimization.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -295,7 +295,7 @@ // Reallocate the non-escaping objects and restore their fields. Then // relock objects if synchronization on them was eliminated. - if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateAllocations)) { + if (jvmci_enabled || (DoEscapeAnalysis && EliminateAllocations)) { realloc_failures = eliminate_allocations(thread, exec_mode, cm, deoptee, map, chunk); } #endif // COMPILER2_OR_JVMCI diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/fieldType.cpp --- a/src/hotspot/share/runtime/fieldType.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/fieldType.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -39,28 +39,28 @@ // Check if it is a valid array signature bool FieldType::is_valid_array_signature(Symbol* sig) { assert(sig->utf8_length() > 1, "this should already have been checked"); - assert(sig->char_at(0) == '[', "this should already have been checked"); + assert(sig->char_at(0) == JVM_SIGNATURE_ARRAY, "this should already have been checked"); // The first character is already checked int i = 1; int len = sig->utf8_length(); // First skip all '['s - while(i < len - 1 && sig->char_at(i) == '[') i++; + while(i < len - 1 && sig->char_at(i) == JVM_SIGNATURE_ARRAY) i++; // Check type switch(sig->char_at(i)) { - case 'B': // T_BYTE - case 'C': // T_CHAR - case 'D': // T_DOUBLE - case 'F': // T_FLOAT - case 'I': // T_INT - case 'J': // T_LONG - case 'S': // T_SHORT - case 'Z': // T_BOOLEAN + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN: // If it is an array, the type is the last character return (i + 1 == len); - case 'L': + case JVM_SIGNATURE_CLASS: // If it is an object, the last character must be a ';' - return sig->char_at(len - 1) == ';'; + return sig->char_at(len - 1) == JVM_SIGNATURE_ENDCLASS; } return false; @@ -71,7 +71,7 @@ assert(basic_type(signature) == T_ARRAY, "must be array"); int index = 1; int dim = 1; - while (signature->char_at(index) == '[') { + while (signature->char_at(index) == JVM_SIGNATURE_ARRAY) { index++; dim++; } @@ -80,7 +80,7 @@ BasicType element_type = char2type(element[0]); if (element_type == T_OBJECT) { int len = (int)strlen(element); - assert(element[len-1] == ';', "last char should be a semicolon"); + assert(element[len-1] == JVM_SIGNATURE_ENDCLASS, "last char should be a semicolon"); element[len-1] = '\0'; // chop off semicolon fd._object_key = SymbolTable::new_symbol(element + 1); } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/fieldType.hpp --- a/src/hotspot/share/runtime/fieldType.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/fieldType.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -58,14 +58,16 @@ static BasicType basic_type(Symbol* signature); // Testing - static bool is_array(Symbol* signature) { return signature->utf8_length() > 1 && signature->char_at(0) == '[' && is_valid_array_signature(signature); } + static bool is_array(Symbol* signature) { return signature->utf8_length() > 1 && + signature->char_at(0) == JVM_SIGNATURE_ARRAY && + is_valid_array_signature(signature); } static bool is_obj(Symbol* signature) { int sig_length = signature->utf8_length(); // Must start with 'L' and end with ';' return (sig_length >= 2 && - (signature->char_at(0) == 'L') && - (signature->char_at(sig_length - 1) == ';')); + (signature->char_at(0) == JVM_SIGNATURE_CLASS) && + (signature->char_at(sig_length - 1) == JVM_SIGNATURE_ENDCLASS)); } // Parse field and extract array information. Works for T_ARRAY only. diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/globals.hpp --- a/src/hotspot/share/runtime/globals.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/globals.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -643,6 +643,10 @@ product(bool, OmitStackTraceInFastThrow, true, \ "Omit backtraces for some 'hot' exceptions in optimized code") \ \ + manageable(bool, ShowCodeDetailsInExceptionMessages, false, \ + "Show exception messages from RuntimeExceptions that contain " \ + "snippets of the failing code. Disable this to improve privacy.") \ + \ product(bool, PrintWarnings, true, \ "Print JVM warnings to output stream") \ \ diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/mutexLocker.cpp --- a/src/hotspot/share/runtime/mutexLocker.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/mutexLocker.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -334,12 +334,12 @@ #if INCLUDE_JVMTI def(CDSClassFileStream_lock , PaddedMutex , max_nonleaf, false, _safepoint_check_always); #endif + def(DumpTimeTable_lock , PaddedMutex , leaf, true, _safepoint_check_never); +#endif // INCLUDE_CDS #if INCLUDE_JVMCI def(JVMCI_lock , PaddedMonitor, nonleaf+2, true, _safepoint_check_always); #endif - def(DumpTimeTable_lock , PaddedMutex , leaf, true, _safepoint_check_never); -#endif // INCLUDE_CDS } GCMutexLocker::GCMutexLocker(Mutex* mutex) { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/os.hpp --- a/src/hotspot/share/runtime/os.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/os.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -47,8 +47,6 @@ // OS services (time, I/O) as well as other functionality with system- // dependent code. -typedef void (*dll_func)(...); - class Thread; class JavaThread; class NativeCallStack; @@ -195,14 +193,9 @@ // The "virtual time" of a thread is the amount of time a thread has // actually run. The first function indicates whether the OS supports - // this functionality for the current thread, and if so: - // * the second enables vtime tracking (if that is required). - // * the third tells whether vtime is enabled. - // * the fourth returns the elapsed virtual time for the current - // thread. + // this functionality for the current thread, and if so the second + // returns the elapsed virtual time for the current thread. static bool supports_vtime(); - static bool enable_vtime(); - static bool vtime_enabled(); static double elapsedVTime(); // Return current local time in a string (YYYY-MM-DD HH:MM:SS). @@ -254,14 +247,6 @@ return _initial_active_processor_count; } - // Bind processes to processors. - // This is a two step procedure: - // first you generate a distribution of processes to processors, - // then you bind processes according to that distribution. - // Compute a distribution for number of processes to processors. - // Stores the processor id's into the distribution array argument. - // Returns true if it worked, false if it didn't. - static bool distribute_processes(uint length, uint* distribution); // Binds the current process to a processor. // Returns true if it worked, false if it didn't. static bool bind_to_processor(uint processor_id); @@ -496,7 +481,6 @@ static void verify_stack_alignment() PRODUCT_RETURN; static bool message_box(const char* title, const char* message); - static char* do_you_want_to_debug(const char* message); // run cmd in a separate process and return its exit code; or -1 on failures static int fork_and_exec(char *cmd, bool use_vfork_if_available = false); @@ -520,7 +504,6 @@ static void die(); // File i/o operations - static const int default_file_open_flags(); static int open(const char *path, int oflag, int mode); static FILE* open(int fd, const char* mode); static FILE* fopen(const char* path, const char* mode); @@ -668,9 +651,6 @@ // Will not change the value of errno. static const char* errno_name(int e); - // Determines whether the calling process is being debugged by a user-mode debugger. - static bool is_debugger_attached(); - // wait for a key press if PauseAtExit is set static void wait_for_keypress_at_exit(void); @@ -966,10 +946,6 @@ return _state == SR_RUNNING; } - bool is_suspend_request() const { - return _state == SR_SUSPEND_REQUEST; - } - bool is_suspended() const { return _state == SR_SUSPENDED; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/sharedRuntime.cpp --- a/src/hotspot/share/runtime/sharedRuntime.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/sharedRuntime.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -2990,28 +2990,28 @@ sig_bt[cnt++] = T_OBJECT; // Receiver is argument 0; not in signature } - while (*s != ')') { // Find closing right paren - switch (*s++) { // Switch on signature character - case 'B': sig_bt[cnt++] = T_BYTE; break; - case 'C': sig_bt[cnt++] = T_CHAR; break; - case 'D': sig_bt[cnt++] = T_DOUBLE; sig_bt[cnt++] = T_VOID; break; - case 'F': sig_bt[cnt++] = T_FLOAT; break; - case 'I': sig_bt[cnt++] = T_INT; break; - case 'J': sig_bt[cnt++] = T_LONG; sig_bt[cnt++] = T_VOID; break; - case 'S': sig_bt[cnt++] = T_SHORT; break; - case 'Z': sig_bt[cnt++] = T_BOOLEAN; break; - case 'V': sig_bt[cnt++] = T_VOID; break; - case 'L': // Oop - while (*s++ != ';'); // Skip signature + while (*s != JVM_SIGNATURE_ENDFUNC) { // Find closing right paren + switch (*s++) { // Switch on signature character + case JVM_SIGNATURE_BYTE: sig_bt[cnt++] = T_BYTE; break; + case JVM_SIGNATURE_CHAR: sig_bt[cnt++] = T_CHAR; break; + case JVM_SIGNATURE_DOUBLE: sig_bt[cnt++] = T_DOUBLE; sig_bt[cnt++] = T_VOID; break; + case JVM_SIGNATURE_FLOAT: sig_bt[cnt++] = T_FLOAT; break; + case JVM_SIGNATURE_INT: sig_bt[cnt++] = T_INT; break; + case JVM_SIGNATURE_LONG: sig_bt[cnt++] = T_LONG; sig_bt[cnt++] = T_VOID; break; + case JVM_SIGNATURE_SHORT: sig_bt[cnt++] = T_SHORT; break; + case JVM_SIGNATURE_BOOLEAN: sig_bt[cnt++] = T_BOOLEAN; break; + case JVM_SIGNATURE_VOID: sig_bt[cnt++] = T_VOID; break; + case JVM_SIGNATURE_CLASS: // Oop + while (*s++ != JVM_SIGNATURE_ENDCLASS); // Skip signature sig_bt[cnt++] = T_OBJECT; break; - case '[': { // Array + case JVM_SIGNATURE_ARRAY: { // Array do { // Skip optional size while (*s >= '0' && *s <= '9') s++; - } while (*s++ == '['); // Nested arrays? + } while (*s++ == JVM_SIGNATURE_ARRAY); // Nested arrays? // Skip element type - if (s[-1] == 'L') - while (*s++ != ';'); // Skip signature + if (s[-1] == JVM_SIGNATURE_CLASS) + while (*s++ != JVM_SIGNATURE_ENDCLASS); // Skip signature sig_bt[cnt++] = T_ARRAY; break; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/signature.cpp --- a/src/hotspot/share/runtime/signature.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/signature.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -63,41 +63,41 @@ // compiler bug (was problem - gri 4/27/2000). int size = -1; switch(_signature->char_at(_index)) { - case 'B': do_byte (); if (_parameter_index < 0 ) _return_type = T_BYTE; - _index++; size = T_BYTE_size ; break; - case 'C': do_char (); if (_parameter_index < 0 ) _return_type = T_CHAR; - _index++; size = T_CHAR_size ; break; - case 'D': do_double(); if (_parameter_index < 0 ) _return_type = T_DOUBLE; - _index++; size = T_DOUBLE_size ; break; - case 'F': do_float (); if (_parameter_index < 0 ) _return_type = T_FLOAT; - _index++; size = T_FLOAT_size ; break; - case 'I': do_int (); if (_parameter_index < 0 ) _return_type = T_INT; - _index++; size = T_INT_size ; break; - case 'J': do_long (); if (_parameter_index < 0 ) _return_type = T_LONG; - _index++; size = T_LONG_size ; break; - case 'S': do_short (); if (_parameter_index < 0 ) _return_type = T_SHORT; - _index++; size = T_SHORT_size ; break; - case 'Z': do_bool (); if (_parameter_index < 0 ) _return_type = T_BOOLEAN; - _index++; size = T_BOOLEAN_size; break; - case 'V': do_void (); if (_parameter_index < 0 ) _return_type = T_VOID; - _index++; size = T_VOID_size; ; break; - case 'L': + case JVM_SIGNATURE_BYTE: do_byte(); if (_parameter_index < 0 ) _return_type = T_BYTE; + _index++; size = T_BYTE_size; break; + case JVM_SIGNATURE_CHAR: do_char(); if (_parameter_index < 0 ) _return_type = T_CHAR; + _index++; size = T_CHAR_size; break; + case JVM_SIGNATURE_DOUBLE: do_double(); if (_parameter_index < 0 ) _return_type = T_DOUBLE; + _index++; size = T_DOUBLE_size; break; + case JVM_SIGNATURE_FLOAT: do_float(); if (_parameter_index < 0 ) _return_type = T_FLOAT; + _index++; size = T_FLOAT_size; break; + case JVM_SIGNATURE_INT: do_int(); if (_parameter_index < 0 ) _return_type = T_INT; + _index++; size = T_INT_size; break; + case JVM_SIGNATURE_LONG: do_long(); if (_parameter_index < 0 ) _return_type = T_LONG; + _index++; size = T_LONG_size; break; + case JVM_SIGNATURE_SHORT: do_short(); if (_parameter_index < 0 ) _return_type = T_SHORT; + _index++; size = T_SHORT_size; break; + case JVM_SIGNATURE_BOOLEAN: do_bool(); if (_parameter_index < 0 ) _return_type = T_BOOLEAN; + _index++; size = T_BOOLEAN_size; break; + case JVM_SIGNATURE_VOID: do_void(); if (_parameter_index < 0 ) _return_type = T_VOID; + _index++; size = T_VOID_size; break; + case JVM_SIGNATURE_CLASS: { int begin = ++_index; Symbol* sig = _signature; - while (sig->char_at(_index++) != ';') ; + while (sig->char_at(_index++) != JVM_SIGNATURE_ENDCLASS) ; do_object(begin, _index); } if (_parameter_index < 0 ) _return_type = T_OBJECT; size = T_OBJECT_size; break; - case '[': + case JVM_SIGNATURE_ARRAY: { int begin = ++_index; Symbol* sig = _signature; - while (sig->char_at(_index) == '[') { + while (sig->char_at(_index) == JVM_SIGNATURE_ARRAY) { _index++; } - if (sig->char_at(_index) == 'L') { - while (sig->char_at(_index++) != ';') ; + if (sig->char_at(_index) == JVM_SIGNATURE_CLASS) { + while (sig->char_at(_index++) != JVM_SIGNATURE_ENDCLASS) ; } else { _index++; } @@ -128,9 +128,9 @@ // Parse parameters _index = 0; _parameter_index = 0; - expect('('); - while (_signature->char_at(_index) != ')') _parameter_index += parse_type(); - expect(')'); + expect(JVM_SIGNATURE_FUNC); + while (_signature->char_at(_index) != JVM_SIGNATURE_ENDFUNC) _parameter_index += parse_type(); + expect(JVM_SIGNATURE_ENDFUNC); _parameter_index = 0; } @@ -202,36 +202,36 @@ void SignatureIterator::iterate_returntype() { // Ignore parameters _index = 0; - expect('('); + expect(JVM_SIGNATURE_FUNC); Symbol* sig = _signature; // Need to skip over each type in the signature's argument list until a // closing ')' is found., then get the return type. We cannot just scan // for the first ')' because ')' is a legal character in a type name. - while (sig->char_at(_index) != ')') { + while (sig->char_at(_index) != JVM_SIGNATURE_ENDFUNC) { switch(sig->char_at(_index)) { - case 'B': - case 'C': - case 'D': - case 'F': - case 'I': - case 'J': - case 'S': - case 'Z': - case 'V': + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN: + case JVM_SIGNATURE_VOID: { _index++; } break; - case 'L': + case JVM_SIGNATURE_CLASS: { - while (sig->char_at(_index++) != ';') ; + while (sig->char_at(_index++) != JVM_SIGNATURE_ENDCLASS) ; } break; - case '[': + case JVM_SIGNATURE_ARRAY: { - while (sig->char_at(++_index) == '[') ; - if (sig->char_at(_index) == 'L') { - while (sig->char_at(_index++) != ';') ; + while (sig->char_at(++_index) == JVM_SIGNATURE_ARRAY) ; + if (sig->char_at(_index) == JVM_SIGNATURE_CLASS) { + while (sig->char_at(_index++) != JVM_SIGNATURE_ENDCLASS) ; } else { _index++; } @@ -242,7 +242,7 @@ break; } } - expect(')'); + expect(JVM_SIGNATURE_ENDFUNC); // Parse return type _parameter_index = -1; parse_type(); @@ -255,9 +255,9 @@ // Parse parameters _parameter_index = 0; _index = 0; - expect('('); - while (_signature->char_at(_index) != ')') _parameter_index += parse_type(); - expect(')'); + expect(JVM_SIGNATURE_FUNC); + while (_signature->char_at(_index) != JVM_SIGNATURE_ENDFUNC) _parameter_index += parse_type(); + expect(JVM_SIGNATURE_ENDFUNC); // Parse return type _parameter_index = -1; parse_type(); @@ -289,39 +289,39 @@ void SignatureStream::next_non_primitive(int t) { switch (t) { - case 'L': { + case JVM_SIGNATURE_CLASS: { _type = T_OBJECT; Symbol* sig = _signature; - while (sig->char_at(_end++) != ';'); + while (sig->char_at(_end++) != JVM_SIGNATURE_ENDCLASS); break; } - case '[': { + case JVM_SIGNATURE_ARRAY: { _type = T_ARRAY; Symbol* sig = _signature; char c = sig->char_at(_end); while ('0' <= c && c <= '9') c = sig->char_at(_end++); - while (sig->char_at(_end) == '[') { + while (sig->char_at(_end) == JVM_SIGNATURE_ARRAY) { _end++; c = sig->char_at(_end); while ('0' <= c && c <= '9') c = sig->char_at(_end++); } switch(sig->char_at(_end)) { - case 'B': - case 'C': - case 'D': - case 'F': - case 'I': - case 'J': - case 'S': - case 'Z':_end++; break; + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN:_end++; break; default: { - while (sig->char_at(_end++) != ';'); + while (sig->char_at(_end++) != JVM_SIGNATURE_ENDCLASS); break; } } break; } - case ')': _end++; next(); _at_return_type = true; break; + case JVM_SIGNATURE_ENDFUNC: _end++; next(); _at_return_type = true; break; default : ShouldNotReachHere(); } } @@ -341,8 +341,8 @@ int begin = _begin; int end = _end; - if ( _signature->char_at(_begin) == 'L' - && _signature->char_at(_end-1) == ';') { + if ( _signature->char_at(_begin) == JVM_SIGNATURE_CLASS + && _signature->char_at(_end-1) == JVM_SIGNATURE_ENDCLASS) { begin++; end--; } @@ -407,8 +407,8 @@ int begin = _begin; int end = _end; - if ( _signature->char_at(_begin) == 'L' - && _signature->char_at(_end-1) == ';') { + if ( _signature->char_at(_begin) == JVM_SIGNATURE_CLASS + && _signature->char_at(_end-1) == JVM_SIGNATURE_ENDCLASS) { begin++; end--; } @@ -436,9 +436,9 @@ const char* method_sig = (const char*)sig->bytes(); ssize_t len = sig->utf8_length(); ssize_t index = 0; - if (method_sig != NULL && len > 1 && method_sig[index] == '(') { + if (method_sig != NULL && len > 1 && method_sig[index] == JVM_SIGNATURE_FUNC) { ++index; - while (index < len && method_sig[index] != ')') { + while (index < len && method_sig[index] != JVM_SIGNATURE_ENDFUNC) { ssize_t res = is_valid_type(&method_sig[index], len - index); if (res == -1) { return false; @@ -446,7 +446,7 @@ index += res; } } - if (index < len && method_sig[index] == ')') { + if (index < len && method_sig[index] == JVM_SIGNATURE_ENDFUNC) { // check the return type ++index; return (is_valid_type(&method_sig[index], len - index) == (len - index)); @@ -469,21 +469,28 @@ ssize_t index = 0; // Iterate over any number of array dimensions - while (index < limit && type[index] == '[') ++index; + while (index < limit && type[index] == JVM_SIGNATURE_ARRAY) ++index; if (index >= limit) { return -1; } switch (type[index]) { - case 'B': case 'C': case 'D': case 'F': case 'I': - case 'J': case 'S': case 'Z': case 'V': + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN: + case JVM_SIGNATURE_VOID: return index + 1; - case 'L': + case JVM_SIGNATURE_CLASS: for (index = index + 1; index < limit; ++index) { char c = type[index]; switch (c) { - case ';': + case JVM_SIGNATURE_ENDCLASS: return index + 1; - case '\0': case '.': case '[': + case '\0': case JVM_SIGNATURE_DOT: case JVM_SIGNATURE_ARRAY: return -1; default: ; // fall through } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/runtime/signature.hpp --- a/src/hotspot/share/runtime/signature.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/runtime/signature.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -379,15 +379,15 @@ _begin = _end; int t = sig->char_at(_begin); switch (t) { - case 'B': _type = T_BYTE; break; - case 'C': _type = T_CHAR; break; - case 'D': _type = T_DOUBLE; break; - case 'F': _type = T_FLOAT; break; - case 'I': _type = T_INT; break; - case 'J': _type = T_LONG; break; - case 'S': _type = T_SHORT; break; - case 'Z': _type = T_BOOLEAN; break; - case 'V': _type = T_VOID; break; + case JVM_SIGNATURE_BYTE: _type = T_BYTE; break; + case JVM_SIGNATURE_CHAR: _type = T_CHAR; break; + case JVM_SIGNATURE_DOUBLE: _type = T_DOUBLE; break; + case JVM_SIGNATURE_FLOAT: _type = T_FLOAT; break; + case JVM_SIGNATURE_INT: _type = T_INT; break; + case JVM_SIGNATURE_LONG: _type = T_LONG; break; + case JVM_SIGNATURE_SHORT: _type = T_SHORT; break; + case JVM_SIGNATURE_BOOLEAN: _type = T_BOOLEAN; break; + case JVM_SIGNATURE_VOID: _type = T_VOID; break; default : next_non_primitive(t); return; } diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/services/diagnosticArgument.cpp --- a/src/hotspot/share/services/diagnosticArgument.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/services/diagnosticArgument.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -151,7 +151,13 @@ ResourceMark rm; char* buf = NEW_RESOURCE_ARRAY(char, len + 1); + +PRAGMA_DIAG_PUSH +PRAGMA_STRINGOP_TRUNCATION_IGNORED + // This code can incorrectly cause a "stringop-truncation" warning with gcc strncpy(buf, str, len); +PRAGMA_DIAG_POP + buf[len] = '\0'; Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_IllegalArgumentException(), "Boolean parsing error in command argument '%s'. Could not parse: %s.\n", _name, buf); diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/utilities/compilerWarnings.hpp --- a/src/hotspot/share/utilities/compilerWarnings.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/utilities/compilerWarnings.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -62,4 +62,8 @@ #define PRAGMA_FORMAT_IGNORED #endif +#ifndef PRAGMA_STRINGOP_TRUNCATION_IGNORED +#define PRAGMA_STRINGOP_TRUNCATION_IGNORED +#endif + #endif // SHARE_UTILITIES_COMPILERWARNINGS_HPP diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/utilities/compilerWarnings_gcc.hpp --- a/src/hotspot/share/utilities/compilerWarnings_gcc.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/utilities/compilerWarnings_gcc.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -50,6 +50,12 @@ #define PRAGMA_FORMAT_IGNORED PRAGMA_DISABLE_GCC_WARNING("-Wformat") +// Disable -Wstringop-truncation which is introduced in GCC 8. +// https://gcc.gnu.org/gcc-8/changes.html +#if !defined(__clang_major__) && (__GNUC__ >= 8) +#define PRAGMA_STRINGOP_TRUNCATION_IGNORED PRAGMA_DISABLE_GCC_WARNING("-Wstringop-truncation") +#endif + #if defined(__clang_major__) && \ (__clang_major__ >= 4 || \ (__clang_major__ >= 3 && __clang_minor__ >= 1)) || \ diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/utilities/globalDefinitions.cpp --- a/src/hotspot/share/utilities/globalDefinitions.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/utilities/globalDefinitions.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -178,7 +178,16 @@ // Map BasicType to signature character -char type2char_tab[T_CONFLICT+1]={ 0, 0, 0, 0, 'Z', 'C', 'F', 'D', 'B', 'S', 'I', 'J', 'L', '[', 'V', 0, 0, 0, 0, 0}; +char type2char_tab[T_CONFLICT+1] = { + 0, 0, 0, 0, + JVM_SIGNATURE_BOOLEAN, JVM_SIGNATURE_CHAR, + JVM_SIGNATURE_FLOAT, JVM_SIGNATURE_DOUBLE, + JVM_SIGNATURE_BYTE, JVM_SIGNATURE_SHORT, + JVM_SIGNATURE_INT, JVM_SIGNATURE_LONG, + JVM_SIGNATURE_CLASS, JVM_SIGNATURE_ARRAY, + JVM_SIGNATURE_VOID, 0, + 0, 0, 0, 0 +}; // Map BasicType to Java type name const char* type2name_tab[T_CONFLICT+1] = { diff -r bc43733cd5cf -r 015949faea55 src/hotspot/share/utilities/globalDefinitions.hpp --- a/src/hotspot/share/utilities/globalDefinitions.hpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/hotspot/share/utilities/globalDefinitions.hpp Wed Oct 23 14:01:17 2019 -0400 @@ -29,6 +29,9 @@ #include "utilities/debug.hpp" #include "utilities/macros.hpp" +// Get constants like JVM_T_CHAR and JVM_SIGNATURE_INT, before pulling in . +#include "classfile_constants.h" + #include COMPILER_HEADER(utilities/globalDefinitions) // Defaults for macros that might be defined per compiler. @@ -570,14 +573,22 @@ // NOTE: replicated in SA in vm/agent/sun/jvm/hotspot/runtime/BasicType.java enum BasicType { - T_BOOLEAN = 4, - T_CHAR = 5, - T_FLOAT = 6, - T_DOUBLE = 7, - T_BYTE = 8, - T_SHORT = 9, - T_INT = 10, - T_LONG = 11, +// The values T_BOOLEAN..T_LONG (4..11) are derived from the JVMS. + T_BOOLEAN = JVM_T_BOOLEAN, + T_CHAR = JVM_T_CHAR, + T_FLOAT = JVM_T_FLOAT, + T_DOUBLE = JVM_T_DOUBLE, + T_BYTE = JVM_T_BYTE, + T_SHORT = JVM_T_SHORT, + T_INT = JVM_T_INT, + T_LONG = JVM_T_LONG, + // The remaining values are not part of any standard. + // T_OBJECT and T_VOID denote two more semantic choices + // for method return values. + // T_OBJECT and T_ARRAY describe signature syntax. + // T_ADDRESS, T_METADATA, T_NARROWOOP, T_NARROWKLASS describe + // internal references within the JVM as if they were Java + // types in their own right. T_OBJECT = 12, T_ARRAY = 13, T_VOID = 14, @@ -602,6 +613,10 @@ return (t == T_BYTE || t == T_SHORT); } +inline bool is_double_word_type(BasicType t) { + return (t == T_DOUBLE || t == T_LONG); +} + inline bool is_reference_type(BasicType t) { return (t == T_OBJECT || t == T_ARRAY); } @@ -609,17 +624,17 @@ // Convert a char from a classfile signature to a BasicType inline BasicType char2type(char c) { switch( c ) { - case 'B': return T_BYTE; - case 'C': return T_CHAR; - case 'D': return T_DOUBLE; - case 'F': return T_FLOAT; - case 'I': return T_INT; - case 'J': return T_LONG; - case 'S': return T_SHORT; - case 'Z': return T_BOOLEAN; - case 'V': return T_VOID; - case 'L': return T_OBJECT; - case '[': return T_ARRAY; + case JVM_SIGNATURE_BYTE: return T_BYTE; + case JVM_SIGNATURE_CHAR: return T_CHAR; + case JVM_SIGNATURE_DOUBLE: return T_DOUBLE; + case JVM_SIGNATURE_FLOAT: return T_FLOAT; + case JVM_SIGNATURE_INT: return T_INT; + case JVM_SIGNATURE_LONG: return T_LONG; + case JVM_SIGNATURE_SHORT: return T_SHORT; + case JVM_SIGNATURE_BOOLEAN: return T_BOOLEAN; + case JVM_SIGNATURE_VOID: return T_VOID; + case JVM_SIGNATURE_CLASS: return T_OBJECT; + case JVM_SIGNATURE_ARRAY: return T_ARRAY; } return T_ILLEGAL; } diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/io/FilePermission.java --- a/src/java.base/share/classes/java/io/FilePermission.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/io/FilePermission.java Wed Oct 23 14:01:17 2019 -0400 @@ -367,12 +367,22 @@ this.mask = mask; if (cpath.equals("<>")) { + allFiles = true; directory = true; recursive = true; cpath = ""; return; } + // Validate path by platform's default file system + try { + String name = cpath.endsWith("*") ? cpath.substring(0, cpath.length() - 1) + "-" : cpath; + builtInFS.getPath(new File(name).getPath()); + } catch (InvalidPathException ipe) { + invalid = true; + return; + } + // store only the canonical cpath if possible cpath = AccessController.doPrivileged(new PrivilegedAction<>() { public String run() { @@ -463,13 +473,16 @@ *

* The default value of the {@code jdk.io.permissionsUseCanonicalPath} * system property is {@code false} in this implementation. + *

+ * The value can also be set with a security property using the same name, + * but setting a system property will override the security property value. * * @param path the pathname of the file/directory. * @param actions the action string. * - * @throws IllegalArgumentException - * If actions is {@code null}, empty or contains an action - * other than the specified possible actions. + * @throws IllegalArgumentException if actions is {@code null}, empty, + * malformed or contains an action other than the specified + * possible actions */ public FilePermission(String path, String actions) { super(path); @@ -573,19 +586,19 @@ * @return the effective mask */ boolean impliesIgnoreMask(FilePermission that) { + if (this == that) { + return true; + } + if (allFiles) { + return true; + } + if (this.invalid || that.invalid) { + return false; + } + if (that.allFiles) { + return false; + } if (FilePermCompat.nb) { - if (this == that) { - return true; - } - if (allFiles) { - return true; - } - if (this.invalid || that.invalid) { - return false; - } - if (that.allFiles) { - return false; - } // Left at least same level of wildness as right if ((this.recursive && that.recursive) != that.recursive || (this.directory && that.directory) != that.directory) { @@ -783,10 +796,10 @@ FilePermission that = (FilePermission) obj; + if (this.invalid || that.invalid) { + return false; + } if (FilePermCompat.nb) { - if (this.invalid || that.invalid) { - return false; - } return (this.mask == that.mask) && (this.allFiles == that.allFiles) && this.npath.equals(that.npath) && @@ -795,6 +808,7 @@ (this.recursive == that.recursive); } else { return (this.mask == that.mask) && + (this.allFiles == that.allFiles) && this.cpath.equals(that.cpath) && (this.directory == that.directory) && (this.recursive == that.recursive); @@ -921,17 +935,18 @@ } // make sure we didn't just match the tail of a word - // like "ackbarfaccept". Also, skip to the comma. + // like "ackbarfdelete". Also, skip to the comma. boolean seencomma = false; while (i >= matchlen && !seencomma) { - switch(a[i-matchlen]) { - case ',': - seencomma = true; - break; + switch (c = a[i-matchlen]) { case ' ': case '\r': case '\n': case '\f': case '\t': break; default: + if (c == ',' && i > matchlen) { + seencomma = true; + break; + } throw new IllegalArgumentException( "invalid permission: " + actions); } @@ -1127,10 +1142,10 @@ * * @param permission the Permission object to add. * - * @throws IllegalArgumentException - if the permission is not a + * @throws IllegalArgumentException if the permission is not a * FilePermission * - * @throws SecurityException - if this FilePermissionCollection object + * @throws SecurityException if this FilePermissionCollection object * has been marked readonly */ @Override diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/lang/NullPointerException.java --- a/src/java.base/share/classes/java/lang/NullPointerException.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/lang/NullPointerException.java Wed Oct 23 14:01:17 2019 -0400 @@ -70,4 +70,35 @@ public NullPointerException(String s) { super(s); } + + /** + * Returns the detail message string of this throwable. + * + *

If a non-null message was supplied in a constructor it is + * returned. Otherwise, an implementation specific message or + * {@code null} is returned. + * + * @implNote + * If no explicit message was passed to the constructor, and as + * long as certain internal information is available, a verbose + * description of the null reference is returned. + * The internal information is not available in deserialized + * NullPointerExceptions. + * + * @return the detail message string, which may be {@code null}. + */ + public String getMessage() { + String message = super.getMessage(); + if (message == null) { + return getExtendedNPEMessage(); + } + return message; + } + + /** + * Get an extended exception message. This returns a string describing + * the location and cause of the exception. It returns null for + * exceptions where this is not applicable. + */ + private native String getExtendedNPEMessage(); } diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/lang/String.java --- a/src/java.base/share/classes/java/lang/String.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/lang/String.java Wed Oct 23 14:01:17 2019 -0400 @@ -2888,6 +2888,15 @@ } /** + * {@preview Associated with text blocks, a preview feature of + * the Java language. + * + * This method is associated with text blocks, a preview + * feature of the Java language. Programs can only use this + * method when preview features are enabled. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Returns a string whose value is this string, with incidental * {@linkplain Character#isWhitespace(int) white space} removed from * the beginning and end of every line. @@ -2963,10 +2972,9 @@ * * @since 13 * - * @deprecated This method is associated with text blocks, a preview language feature. - * Text blocks and/or this method may be changed or removed in a future release. */ - @Deprecated(forRemoval=true, since="13") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.TEXT_BLOCKS, + essentialAPI=true) public String stripIndent() { int length = length(); if (length == 0) { @@ -3005,6 +3013,15 @@ } /** + * {@preview Associated with text blocks, a preview feature of + * the Java language. + * + * This method is associated with text blocks, a preview + * feature of the Java language. Programs can only use this + * method when preview features are enabled. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Returns a string whose value is this string, with escape sequences * translated as if in a string literal. *

@@ -3079,11 +3096,9 @@ * @jls 3.10.7 Escape Sequences * * @since 13 - * - * @deprecated This method is associated with text blocks, a preview language feature. - * Text blocks and/or this method may be changed or removed in a future release. */ - @Deprecated(forRemoval=true, since="13") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.TEXT_BLOCKS, + essentialAPI=true) public String translateEscapes() { if (isEmpty()) { return ""; @@ -3309,6 +3324,15 @@ } /** + * {@preview Associated with text blocks, a preview feature of + * the Java language. + * + * This method is associated with text blocks, a preview + * feature of the Java language. Programs can only use this + * method when preview features are enabled. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Formats using this string as the format string, and the supplied * arguments. * @@ -3324,10 +3348,9 @@ * * @since 13 * - * @deprecated This method is associated with text blocks, a preview language feature. - * Text blocks and/or this method may be changed or removed in a future release. */ - @Deprecated(forRemoval=true, since="13") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.TEXT_BLOCKS, + essentialAPI=true) public String formatted(Object... args) { return new Formatter().format(this, args).toString(); } diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/lang/System.java --- a/src/java.base/share/classes/java/lang/System.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/lang/System.java Wed Oct 23 14:01:17 2019 -0400 @@ -94,10 +94,8 @@ public final class System { /* Register the natives via the static initializer. * - * VM will invoke the initializeSystemClass method to complete - * the initialization for this class separated from clinit. - * Note that to use properties set by the VM, see the constraints - * described in the initializeSystemClass method. + * The VM will invoke the initPhase1 method to complete the initialization + * of this class separate from . */ private static native void registerNatives(); static { diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/net/DatagramSocket.java --- a/src/java.base/share/classes/java/net/DatagramSocket.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/net/DatagramSocket.java Wed Oct 23 14:01:17 2019 -0400 @@ -888,14 +888,14 @@ } /** Enable/disable SO_TIMEOUT with the specified timeout, in - * milliseconds. With this option set to a non-zero timeout, + * milliseconds. With this option set to a positive timeout value, * a call to receive() for this DatagramSocket * will block for only this amount of time. If the timeout expires, * a java.net.SocketTimeoutException is raised, though the - * DatagramSocket is still valid. The option must be enabled - * prior to entering the blocking operation to have effect. The - * timeout must be {@code > 0}. - * A timeout of zero is interpreted as an infinite timeout. + * DatagramSocket is still valid. A timeout of zero is interpreted + * as an infinite timeout. + * The option must be enabled prior to entering the blocking + * operation to have effect. * * @param timeout the specified timeout in milliseconds. * @throws SocketException if there is an error in the underlying protocol, such as an UDP error. diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/net/InetSocketAddress.java --- a/src/java.base/share/classes/java/net/InetSocketAddress.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/net/InetSocketAddress.java Wed Oct 23 14:01:17 2019 -0400 @@ -101,11 +101,20 @@ @Override public String toString() { + + String formatted; + if (isUnresolved()) { - return hostname + ":" + port; + formatted = hostname + "/"; } else { - return addr.toString() + ":" + port; + formatted = addr.toString(); + if (addr instanceof Inet6Address) { + int i = formatted.lastIndexOf("/"); + formatted = formatted.substring(0, i + 1) + + "[" + formatted.substring(i + 1) + "]"; + } } + return formatted + ":" + port; } @Override @@ -367,7 +376,9 @@ * Constructs a string representation of this InetSocketAddress. * This String is constructed by calling toString() on the InetAddress * and concatenating the port number (with a colon). If the address - * is unresolved then the part before the colon will only contain the hostname. + * is an IPv6 address, the IPv6 literal is enclosed in square brackets. + * If the address is {@linkplain #isUnresolved() unresolved}, + * {@code } is displayed in place of the address literal. * * @return a string representation of this object. */ diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/net/NetPermission.java --- a/src/java.base/share/classes/java/net/NetPermission.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/net/NetPermission.java Wed Oct 23 14:01:17 2019 -0400 @@ -145,6 +145,15 @@ * * * + * setSocketImpl + * The ability to create a sub-class of Socket or ServerSocket with a + * user specified SocketImpl. + * Malicious user-defined SocketImpls can change the behavior of + * Socket and ServerSocket in surprising ways, by virtue of their + * ability to access the protected fields of SocketImpl. + * + * + * * specifyStreamHandler * The ability * to specify a stream handler when constructing a URL diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/net/ServerSocket.java --- a/src/java.base/share/classes/java/net/ServerSocket.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/net/ServerSocket.java Wed Oct 23 14:01:17 2019 -0400 @@ -32,6 +32,7 @@ import java.util.Set; import java.util.Collections; +import sun.security.util.SecurityConstants; import sun.net.PlatformSocketImpl; /** @@ -73,13 +74,25 @@ * * @throws NullPointerException if impl is {@code null}. * + * @throws SecurityException if a security manager is set and + * its {@code checkPermission} method doesn't allow + * {@code NetPermission("setSocketImpl")}. * @since 12 */ protected ServerSocket(SocketImpl impl) { Objects.requireNonNull(impl); + checkPermission(); this.impl = impl; } + private static Void checkPermission() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(SecurityConstants.SET_SOCKETIMPL_PERMISSION); + } + return null; + } + /** * Creates an unbound server socket. * @@ -736,14 +749,15 @@ /** * Enable/disable {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT} with the - * specified timeout, in milliseconds. With this option set to a non-zero - * timeout, a call to accept() for this ServerSocket + * specified timeout, in milliseconds. With this option set to a positive + * timeout value, a call to accept() for this ServerSocket * will block for only this amount of time. If the timeout expires, * a java.net.SocketTimeoutException is raised, though the - * ServerSocket is still valid. The option must be enabled - * prior to entering the blocking operation to have effect. The - * timeout must be {@code > 0}. - * A timeout of zero is interpreted as an infinite timeout. + * ServerSocket is still valid. A timeout of zero is interpreted as an + * infinite timeout. + * The option must be enabled prior to entering the blocking + * operation to have effect. + * * @param timeout the specified timeout, in milliseconds * @throws SocketException if there is an error in the underlying protocol, * such as a TCP error diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/net/Socket.java --- a/src/java.base/share/classes/java/net/Socket.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/net/Socket.java Wed Oct 23 14:01:17 2019 -0400 @@ -25,6 +25,8 @@ package java.net; +import sun.security.util.SecurityConstants; + import java.io.InputStream; import java.io.OutputStream; import java.io.IOException; @@ -182,12 +184,28 @@ * * @throws SocketException if there is an error in the underlying protocol, * such as a TCP error. + * + * @throws SecurityException if {@code impl} is non-null and a security manager is set + * and its {@code checkPermission} method doesn't allow {@code NetPermission("setSocketImpl")}. + * * @since 1.1 */ protected Socket(SocketImpl impl) throws SocketException { + checkPermission(impl); this.impl = impl; } + private static Void checkPermission(SocketImpl impl) { + if (impl == null) { + return null; + } + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(SecurityConstants.SET_SOCKETIMPL_PERMISSION); + } + return null; + } + /** * Creates a stream socket and connects it to the specified port * number on the named host. @@ -1153,13 +1171,12 @@ /** * Enable/disable {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT} * with the specified timeout, in milliseconds. With this option set - * to a non-zero timeout, a read() call on the InputStream associated with + * to a positive timeout value, a read() call on the InputStream associated with * this Socket will block for only this amount of time. If the timeout * expires, a java.net.SocketTimeoutException is raised, though the - * Socket is still valid. The option must be enabled - * prior to entering the blocking operation to have effect. The - * timeout must be {@code > 0}. - * A timeout of zero is interpreted as an infinite timeout. + * Socket is still valid. A timeout of zero is interpreted as an infinite timeout. + * The option must be enabled prior to entering the blocking operation + * to have effect. * * @param timeout the specified timeout, in milliseconds. * @throws SocketException if there is an error in the underlying protocol, diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/net/SocketPermission.java --- a/src/java.base/share/classes/java/net/SocketPermission.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/net/SocketPermission.java Wed Oct 23 14:01:17 2019 -0400 @@ -287,6 +287,11 @@ * @param host the hostname or IP address of the computer, optionally * including a colon followed by a port or port range. * @param action the action string. + * + * @throws NullPointerException if any parameters are null + * @throws IllegalArgumentException if the format of {@code host} is + * invalid, or if the {@code action} string is empty, malformed, or + * contains an action other than the specified possible actions */ public SocketPermission(String host, String action) { super(getHost(host)); @@ -589,14 +594,15 @@ // like "ackbarfaccept". Also, skip to the comma. boolean seencomma = false; while (i >= matchlen && !seencomma) { - switch(a[i-matchlen]) { - case ',': - seencomma = true; - break; + switch (c = a[i-matchlen]) { case ' ': case '\r': case '\n': case '\f': case '\t': break; default: + if (c == ',' && i > matchlen) { + seencomma = true; + break; + } throw new IllegalArgumentException( "invalid permission: " + action); } @@ -1361,10 +1367,10 @@ * * @param permission the Permission object to add. * - * @throws IllegalArgumentException - if the permission is not a + * @throws IllegalArgumentException if the permission is not a * SocketPermission * - * @throws SecurityException - if this SocketPermissionCollection object + * @throws SecurityException if this SocketPermissionCollection object * has been marked readonly */ @Override diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/net/URL.java --- a/src/java.base/share/classes/java/net/URL.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/net/URL.java Wed Oct 23 14:01:17 2019 -0400 @@ -484,6 +484,16 @@ throw new MalformedURLException(s); } } + if ("jar".equalsIgnoreCase(protocol)) { + if (handler instanceof sun.net.www.protocol.jar.Handler) { + // URL.openConnection() would throw a confusing exception + // so generate a better exception here instead. + String s = ((sun.net.www.protocol.jar.Handler) handler).checkNestedProtocol(file); + if (s != null) { + throw new MalformedURLException(s); + } + } + } } /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/security/AllPermission.java --- a/src/java.base/share/classes/java/security/AllPermission.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/security/AllPermission.java Wed Oct 23 14:01:17 2019 -0400 @@ -178,10 +178,10 @@ * * @param permission the Permission object to add. * - * @throws IllegalArgumentException - if the permission is not a + * @throws IllegalArgumentException if the permission is not an * AllPermission * - * @throws SecurityException - if this AllPermissionCollection object + * @throws SecurityException if this AllPermissionCollection object * has been marked readonly */ diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/security/BasicPermission.java --- a/src/java.base/share/classes/java/security/BasicPermission.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/security/BasicPermission.java Wed Oct 23 14:01:17 2019 -0400 @@ -349,13 +349,13 @@ * * @param permission the Permission object to add. * - * @throws IllegalArgumentException - if the permission is not a + * @throws IllegalArgumentException if the permission is not a * BasicPermission, or if * the permission is not of the * same Class as the other * permissions in this collection. * - * @throws SecurityException - if this BasicPermissionCollection object + * @throws SecurityException if this BasicPermissionCollection object * has been marked readonly */ @Override diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/security/PermissionCollection.java --- a/src/java.base/share/classes/java/security/PermissionCollection.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/security/PermissionCollection.java Wed Oct 23 14:01:17 2019 -0400 @@ -107,9 +107,9 @@ * * @param permission the Permission object to add. * - * @throws SecurityException - if this PermissionCollection object + * @throws SecurityException if this PermissionCollection object * has been marked readonly - * @throws IllegalArgumentException - if this PermissionCollection + * @throws IllegalArgumentException if this PermissionCollection * object is a homogeneous collection and the permission * is not of the correct type. */ diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/security/Policy.java --- a/src/java.base/share/classes/java/security/Policy.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/security/Policy.java Wed Oct 23 14:01:17 2019 -0400 @@ -837,7 +837,7 @@ * * @param permission the Permission object to add. * - * @throws SecurityException - if this PermissionCollection object + * @throws SecurityException if this PermissionCollection object * has been marked readonly */ @Override public void add(Permission permission) { diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/PropertyPermission.java --- a/src/java.base/share/classes/java/util/PropertyPermission.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/PropertyPermission.java Wed Oct 23 14:01:17 2019 -0400 @@ -463,10 +463,10 @@ * * @param permission the Permission object to add. * - * @throws IllegalArgumentException - if the permission is not a + * @throws IllegalArgumentException if the permission is not a * PropertyPermission * - * @throws SecurityException - if this PropertyPermissionCollection + * @throws SecurityException if this PropertyPermissionCollection * object has been marked readonly */ @Override diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java --- a/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java Wed Oct 23 14:01:17 2019 -0400 @@ -100,6 +100,7 @@ private static final long serialVersionUID = -817911632652898426L; /** The queued items */ + @SuppressWarnings("serial") // Conditionally serializable final Object[] items; /** items index for next take, poll, peek or remove */ @@ -120,9 +121,11 @@ final ReentrantLock lock; /** Condition for waiting takes */ + @SuppressWarnings("serial") // Classes implementing Condition may be serializable. private final Condition notEmpty; /** Condition for waiting puts */ + @SuppressWarnings("serial") // Classes implementing Condition may be serializable. private final Condition notFull; /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java --- a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java Wed Oct 23 14:01:17 2019 -0400 @@ -4584,6 +4584,7 @@ public static class KeySetView extends CollectionView implements Set, java.io.Serializable { private static final long serialVersionUID = 7249069246763182397L; + @SuppressWarnings("serial") // Conditionally serializable private final V value; KeySetView(ConcurrentHashMap map, V value) { // non-public super(map); diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java --- a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java Wed Oct 23 14:01:17 2019 -0400 @@ -334,6 +334,7 @@ * nested classes.) * @serial */ + @SuppressWarnings("serial") // Conditionally serializable final Comparator comparator; /** Lazily initialized topmost index of the skiplist. */ @@ -2375,8 +2376,10 @@ /** Underlying map */ final ConcurrentSkipListMap m; /** lower bound key, or null if from start */ + @SuppressWarnings("serial") // Conditionally serializable private final K lo; /** upper bound key, or null if to end */ + @SuppressWarnings("serial") // Conditionally serializable private final K hi; /** inclusion flag for lo */ private final boolean loInclusive; diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java --- a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java Wed Oct 23 14:01:17 2019 -0400 @@ -103,6 +103,7 @@ * element. This field is declared final for the sake of thread * safety, which entails some ugliness in clone(). */ + @SuppressWarnings("serial") // Conditionally serializable private final ConcurrentNavigableMap m; /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java --- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java Wed Oct 23 14:01:17 2019 -0400 @@ -1374,7 +1374,9 @@ */ static final class AdaptedRunnable extends ForkJoinTask implements RunnableFuture { + @SuppressWarnings("serial") // Conditionally serializable final Runnable runnable; + @SuppressWarnings("serial") // Conditionally serializable T result; AdaptedRunnable(Runnable runnable, T result) { if (runnable == null) throw new NullPointerException(); @@ -1396,6 +1398,7 @@ */ static final class AdaptedRunnableAction extends ForkJoinTask implements RunnableFuture { + @SuppressWarnings("serial") // Conditionally serializable final Runnable runnable; AdaptedRunnableAction(Runnable runnable) { if (runnable == null) throw new NullPointerException(); @@ -1415,6 +1418,7 @@ * Adapter for Runnables in which failure forces worker exception. */ static final class RunnableExecuteAction extends ForkJoinTask { + @SuppressWarnings("serial") // Conditionally serializable final Runnable runnable; RunnableExecuteAction(Runnable runnable) { if (runnable == null) throw new NullPointerException(); @@ -1434,7 +1438,9 @@ */ static final class AdaptedCallable extends ForkJoinTask implements RunnableFuture { + @SuppressWarnings("serial") // Conditionally serializable final Callable callable; + @SuppressWarnings("serial") // Conditionally serializable T result; AdaptedCallable(Callable callable) { if (callable == null) throw new NullPointerException(); diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java --- a/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java Wed Oct 23 14:01:17 2019 -0400 @@ -159,9 +159,11 @@ final ReentrantLock lock = new ReentrantLock(); /** Condition for waiting takes */ + @SuppressWarnings("serial") // Classes implementing Condition may be serializable. private final Condition notEmpty = lock.newCondition(); /** Condition for waiting puts */ + @SuppressWarnings("serial") // Classes implementing Condition may be serializable. private final Condition notFull = lock.newCondition(); /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java --- a/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java Wed Oct 23 14:01:17 2019 -0400 @@ -156,12 +156,14 @@ private final ReentrantLock takeLock = new ReentrantLock(); /** Wait queue for waiting takes */ + @SuppressWarnings("serial") // Classes implementing Condition may be serializable. private final Condition notEmpty = takeLock.newCondition(); /** Lock held by put, offer, etc */ private final ReentrantLock putLock = new ReentrantLock(); /** Wait queue for waiting puts */ + @SuppressWarnings("serial") // Classes implementing Condition may be serializable. private final Condition notFull = putLock.newCondition(); /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java --- a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java Wed Oct 23 14:01:17 2019 -0400 @@ -173,6 +173,7 @@ /** * Condition for blocking when empty. */ + @SuppressWarnings("serial") // Classes implementing Condition may be serializable. private final Condition notEmpty = lock.newCondition(); /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/RecursiveTask.java --- a/src/java.base/share/classes/java/util/concurrent/RecursiveTask.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/RecursiveTask.java Wed Oct 23 14:01:17 2019 -0400 @@ -71,6 +71,7 @@ /** * The result of the computation. */ + @SuppressWarnings("serial") // Conditionally serializable V result; /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java --- a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java Wed Oct 23 14:01:17 2019 -0400 @@ -604,8 +604,10 @@ private static final long serialVersionUID = 6138294804551838833L; /** Thread this worker is running in. Null if factory fails. */ + @SuppressWarnings("serial") // Unlikely to be serializable final Thread thread; /** Initial task to run. Possibly null. */ + @SuppressWarnings("serial") // Not statically typed as Serializable Runnable firstTask; /** Per-thread task counter */ volatile long completedTasks; diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java --- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java Wed Oct 23 14:01:17 2019 -0400 @@ -60,6 +60,7 @@ } } + @SuppressWarnings("serial") // Conditionally serializable private volatile V value; /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java --- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java Wed Oct 23 14:01:17 2019 -0400 @@ -55,6 +55,7 @@ private static final long serialVersionUID = -6209656149925076980L; private static final VarHandle AA = MethodHandles.arrayElementVarHandle(Object[].class); + @SuppressWarnings("serial") // Conditionally serializable private final Object[] array; // must have exact type Object[] /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java --- a/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java Wed Oct 23 14:01:17 2019 -0400 @@ -84,6 +84,7 @@ public class DoubleAccumulator extends Striped64 implements Serializable { private static final long serialVersionUID = 7249069246863182397L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final DoubleBinaryOperator function; private final long identity; // use long representation @@ -245,6 +246,7 @@ * The function used for updates. * @serial */ + @SuppressWarnings("serial") // Not statically typed as Serializable private final DoubleBinaryOperator function; /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java --- a/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java Wed Oct 23 14:01:17 2019 -0400 @@ -82,6 +82,7 @@ public class LongAccumulator extends Striped64 implements Serializable { private static final long serialVersionUID = 7249069246863182397L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final LongBinaryOperator function; private final long identity; @@ -239,6 +240,7 @@ * The function used for updates. * @serial */ + @SuppressWarnings("serial") // Not statically typed as Serializable private final LongBinaryOperator function; /** diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/java/util/regex/Pattern.java --- a/src/java.base/share/classes/java/util/regex/Pattern.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/java/util/regex/Pattern.java Wed Oct 23 14:01:17 2019 -0400 @@ -1427,7 +1427,11 @@ localTCNCount = 0; if (!pattern.isEmpty()) { - compile(); + try { + compile(); + } catch (StackOverflowError soe) { + throw error("Stack overflow during pattern compilation"); + } } else { root = new Start(lastAccept); matchRoot = lastAccept; @@ -1965,6 +1969,10 @@ int ch = temp[cursor++]; while (ch != 0 && !isLineSeparator(ch)) ch = temp[cursor++]; + if (ch == 0 && cursor > patternLength) { + cursor = patternLength; + ch = temp[cursor++]; + } return ch; } @@ -1975,6 +1983,10 @@ int ch = temp[++cursor]; while (ch != 0 && !isLineSeparator(ch)) ch = temp[++cursor]; + if (ch == 0 && cursor > patternLength) { + cursor = patternLength; + ch = temp[cursor]; + } return ch; } @@ -3415,9 +3427,10 @@ private int N() { if (read() == '{') { int i = cursor; - while (cursor < patternLength && read() != '}') {} - if (cursor > patternLength) - throw error("Unclosed character name escape sequence"); + while (read() != '}') { + if (cursor >= patternLength) + throw error("Unclosed character name escape sequence"); + } String name = new String(temp, i, cursor - i - 1); try { return Character.codePointOf(name); diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/jdk/internal/PreviewFeature.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.base/share/classes/jdk/internal/PreviewFeature.java Wed Oct 23 14:01:17 2019 -0400 @@ -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. 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.internal; + +import java.lang.annotation.*; + +/** + * Indicates the API declaration in question is associated with a + * preview feature. See JEP 12: "Preview Language and VM + * Features" (http://openjdk.java.net/jeps/12). + * @since 14 + */ +// Match the meaningful targets of java.lang.Deprecated, omit local +// variables and parameter declarations +@Target({ElementType.METHOD, + ElementType.CONSTRUCTOR, + ElementType.FIELD, + ElementType.PACKAGE, + ElementType.MODULE, + ElementType.TYPE}) + // CLASS retention will hopefully be sufficient for the purposes at hand +@Retention(RetentionPolicy.CLASS) +// *Not* @Documented +public @interface PreviewFeature { + /** + * Name of the preview feature the annotated API is associated + * with. + */ + public Feature feature(); + + public boolean essentialAPI() default false; + + public enum Feature { + SWITCH_EXPRESSIONS, + TEXT_BLOCKS; + } +} diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/module-info.java --- a/src/java.base/share/classes/module-info.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/module-info.java Wed Oct 23 14:01:17 2019 -0400 @@ -135,7 +135,8 @@ exports com.sun.security.ntlm to java.security.sasl; exports jdk.internal to - jdk.jfr; + jdk.jfr, + jdk.compiler; exports jdk.internal.access to java.desktop, java.logging, diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java --- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Wed Oct 23 14:01:17 2019 -0400 @@ -2171,6 +2171,10 @@ } while (retryTunnel < maxRedirects); if (retryTunnel >= maxRedirects || (respCode != HTTP_OK)) { + if (respCode != HTTP_PROXY_AUTH) { + // remove all but authenticate responses + responses.reset(); + } throw new IOException("Unable to tunnel through proxy."+ " Proxy returns \"" + statusLine + "\""); diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java --- a/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -121,6 +121,13 @@ return h; } + public String checkNestedProtocol(String spec) { + if (spec.regionMatches(true, 0, "jar:", 0, 4)) { + return "Nested JAR URLs are not supported"; + } else { + return null; + } + } @Override @SuppressWarnings("deprecation") @@ -146,6 +153,12 @@ : false; spec = spec.substring(start, limit); + String exceptionMessage = checkNestedProtocol(spec); + if (exceptionMessage != null) { + // NPE will be transformed into MalformedURLException by the caller + throw new NullPointerException(exceptionMessage); + } + if (absoluteSpec) { file = parseAbsoluteSpec(spec); } else if (!refOnly) { diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java --- a/src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java Wed Oct 23 14:01:17 2019 -0400 @@ -37,6 +37,9 @@ import java.nio.channels.IllegalBlockingModeException; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; import java.util.Set; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -59,7 +62,12 @@ private volatile int timeout; static ServerSocket create(ServerSocketChannelImpl ssc) { - return new ServerSocketAdaptor(ssc); + PrivilegedExceptionAction pa = () -> new ServerSocketAdaptor(ssc); + try { + return AccessController.doPrivileged(pa); + } catch (PrivilegedActionException pae) { + throw new InternalError("Should not reach here", pae); + } } private ServerSocketAdaptor(ServerSocketChannelImpl ssc) { diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java --- a/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java Wed Oct 23 14:01:17 2019 -0400 @@ -36,6 +36,9 @@ import java.net.SocketOption; import java.net.StandardSocketOptions; import java.nio.channels.SocketChannel; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; import java.util.Set; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -61,10 +64,11 @@ } static Socket create(SocketChannelImpl sc) { + PrivilegedExceptionAction pa = () -> new SocketAdaptor(sc); try { - return new SocketAdaptor(sc); - } catch (SocketException e) { - throw new InternalError("Should not reach here"); + return AccessController.doPrivileged(pa); + } catch (PrivilegedActionException pae) { + throw new InternalError("Should not reach here", pae); } } diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java --- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Wed Oct 23 14:01:17 2019 -0400 @@ -201,7 +201,7 @@ // Primary XDH (RFC 7748) curves NamedGroup.X25519, - // Primary NIST curves (e.g. used in TLSv1.3) + // Primary NIST Suite B curves NamedGroup.SECP256_R1, NamedGroup.SECP384_R1, NamedGroup.SECP521_R1, @@ -209,17 +209,6 @@ // Secondary XDH curves NamedGroup.X448, - // Secondary NIST curves - NamedGroup.SECT283_K1, - NamedGroup.SECT283_R1, - NamedGroup.SECT409_K1, - NamedGroup.SECT409_R1, - NamedGroup.SECT571_K1, - NamedGroup.SECT571_R1, - - // non-NIST curves - NamedGroup.SECP256_K1, - // FFDHE (RFC 7919) NamedGroup.FFDHE_2048, NamedGroup.FFDHE_3072, diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/sun/security/util/FilePermCompat.java --- a/src/java.base/share/classes/sun/security/util/FilePermCompat.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/sun/security/util/FilePermCompat.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -42,8 +42,11 @@ public static final boolean compat; static { - String flag = GetPropertyAction.privilegedGetProperty( - "jdk.io.permissionsUseCanonicalPath", "false"); + String flag = SecurityProperties.privilegedGetOverridable( + "jdk.io.permissionsUseCanonicalPath"); + if (flag == null) { + flag = "false"; + } switch (flag) { case "true": nb = false; diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/classes/sun/security/util/SecurityConstants.java --- a/src/java.base/share/classes/sun/security/util/SecurityConstants.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/classes/sun/security/util/SecurityConstants.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -97,6 +97,10 @@ public static final NetPermission GET_RESPONSECACHE_PERMISSION = new NetPermission("getResponseCache"); + // java.net.ServerSocket, java.net.Socket + public static final NetPermission SET_SOCKETIMPL_PERMISSION = + new NetPermission("setSocketImpl"); + // java.lang.SecurityManager, sun.applet.AppletPanel public static final RuntimePermission CREATE_CLASSLOADER_PERMISSION = new RuntimePermission("createClassLoader"); diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/conf/security/java.security --- a/src/java.base/share/conf/security/java.security Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/conf/security/java.security Wed Oct 23 14:01:17 2019 -0400 @@ -1213,3 +1213,51 @@ # if this property is not enabled. # jdk.security.caDistrustPolicies=SYMANTEC_TLS + +# +# FilePermission path canonicalization +# +# This security property dictates how the path argument is processed and stored +# while constructing a FilePermission object. If the value is set to true, the +# path argument is canonicalized and FilePermission methods (such as implies, +# equals, and hashCode) are implemented based on this canonicalized result. +# Otherwise, the path argument is not canonicalized and FilePermission methods are +# implemented based on the original input. See the implementation note of the +# FilePermission class for more details. +# +# If a system property of the same name is also specified, it supersedes the +# security property value defined here. +# +# The default value for this property is false. +# +jdk.io.permissionsUseCanonicalPath=false + + +# +# Policies for the proxy_impersonator Kerberos ccache configuration entry +# +# The proxy_impersonator ccache configuration entry indicates that the ccache +# is a synthetic delegated credential for use with S4U2Proxy by an intermediate +# server. The ccache file should also contain the TGT of this server and +# an evidence ticket from the default principal of the ccache to this server. +# +# This security property determines how Java uses this configuration entry. +# There are 3 possible values: +# +# no-impersonate - Ignore this configuration entry, and always act as +# the owner of the TGT (if it exists). +# +# try-impersonate - Try impersonation when this configuration entry exists. +# If no matching TGT or evidence ticket is found, +# fallback to no-impersonate. +# +# always-impersonate - Always impersonate when this configuration entry exists. +# If no matching TGT or evidence ticket is found, +# no initial credential is read from the ccache. +# +# The default value is "always-impersonate". +# +# If a system property of the same name is also specified, it supersedes the +# security property value defined here. +# +#jdk.security.krb5.default.initiate.credential=always-impersonate diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/native/include/classfile_constants.h.template --- a/src/java.base/share/native/include/classfile_constants.h.template Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/native/include/classfile_constants.h.template Wed Oct 23 14:01:17 2019 -0400 @@ -144,6 +144,10 @@ /* Type signatures */ enum { + JVM_SIGNATURE_SLASH = '/', + JVM_SIGNATURE_DOT = '.', + JVM_SIGNATURE_SPECIAL = '<', + JVM_SIGNATURE_ENDSPECIAL = '>', JVM_SIGNATURE_ARRAY = '[', JVM_SIGNATURE_BYTE = 'B', JVM_SIGNATURE_CHAR = 'C', diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/native/libjava/NullPointerException.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.base/share/native/libjava/NullPointerException.c Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * 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. 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 "jni.h" +#include "jvm.h" + +#include "java_lang_NullPointerException.h" + +JNIEXPORT jstring JNICALL +Java_java_lang_NullPointerException_getExtendedNPEMessage(JNIEnv *env, jobject throwable) +{ + return JVM_GetExtendedNPEMessage(env, throwable); +} diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/native/libjava/jni_util.c --- a/src/java.base/share/native/libjava/jni_util.c Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/native/libjava/jni_util.c Wed Oct 23 14:01:17 2019 -0400 @@ -791,6 +791,13 @@ CHECK_NULL(String_value_ID); } +// This alias is used for compatibility with 32 bit Windows +JNIEXPORT jstring +NewStringPlatform(JNIEnv *env, const char *str) +{ + return JNU_NewStringPlatform(env, str); +} + JNIEXPORT jstring JNICALL JNU_NewStringPlatform(JNIEnv *env, const char *str) { diff -r bc43733cd5cf -r 015949faea55 src/java.base/share/native/libjava/jni_util.h --- a/src/java.base/share/native/libjava/jni_util.h Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/share/native/libjava/jni_util.h Wed Oct 23 14:01:17 2019 -0400 @@ -93,6 +93,9 @@ JNU_ThrowIOExceptionWithLastError(JNIEnv *env, const char *defaultDetail); /* Convert between Java strings and i18n C strings */ +JNIEXPORT jstring +NewStringPlatform(JNIEnv *env, const char *str); + JNIEXPORT const char * GetStringPlatformChars(JNIEnv *env, jstring jstr, jboolean *isCopy); diff -r bc43733cd5cf -r 015949faea55 src/java.base/windows/classes/java/lang/ProcessImpl.java --- a/src/java.base/windows/classes/java/lang/ProcessImpl.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.base/windows/classes/java/lang/ProcessImpl.java Wed Oct 23 14:01:17 2019 -0400 @@ -38,6 +38,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; +import java.util.Locale; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; @@ -46,6 +47,8 @@ import jdk.internal.access.JavaIOFileDescriptorAccess; import jdk.internal.access.SharedSecrets; import jdk.internal.ref.CleanerFactory; +import sun.security.action.GetBooleanAction; +import sun.security.action.GetPropertyAction; /* This class is for the exclusive use of ProcessBuilder.start() to * create new processes. @@ -209,12 +212,15 @@ private static final int VERIFICATION_CMD_BAT = 0; private static final int VERIFICATION_WIN32 = 1; - private static final int VERIFICATION_LEGACY = 2; + private static final int VERIFICATION_WIN32_SAFE = 2; // inside quotes not allowed + private static final int VERIFICATION_LEGACY = 3; + // See Command shell overview for documentation of special characters. + // https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-xp/bb490954(v=technet.10) private static final char ESCAPE_VERIFICATION[][] = { // We guarantee the only command file execution for implicit [cmd.exe] run. // http://technet.microsoft.com/en-us/library/bb490954.aspx {' ', '\t', '<', '>', '&', '|', '^'}, - + {' ', '\t', '<', '>'}, {' ', '\t', '<', '>'}, {' ', '\t'} }; @@ -231,8 +237,25 @@ cmdbuf.append(' '); String s = cmd[i]; if (needsEscaping(verificationType, s)) { - cmdbuf.append('"').append(s); + cmdbuf.append('"'); + if (verificationType == VERIFICATION_WIN32_SAFE) { + // Insert the argument, adding '\' to quote any interior quotes + int length = s.length(); + for (int j = 0; j < length; j++) { + char c = s.charAt(j); + if (c == DOUBLEQUOTE) { + int count = countLeadingBackslash(verificationType, s, j); + while (count-- > 0) { + cmdbuf.append(BACKSLASH); // double the number of backslashes + } + cmdbuf.append(BACKSLASH); // backslash to quote the quote + } + cmdbuf.append(c); + } + } else { + cmdbuf.append(s); + } // The code protects the [java.exe] and console command line // parser, that interprets the [\"] combination as an escape // sequence for the ["] char. @@ -245,8 +268,9 @@ // command line parser. The case of the [""] tail escape // sequence could not be realized due to the argument validation // procedure. - if ((verificationType != VERIFICATION_CMD_BAT) && s.endsWith("\\")) { - cmdbuf.append('\\'); + int count = countLeadingBackslash(verificationType, s, s.length()); + while (count-- > 0) { + cmdbuf.append(BACKSLASH); // double the number of backslashes } cmdbuf.append('"'); } else { @@ -256,26 +280,16 @@ return cmdbuf.toString(); } - private static boolean isQuoted(boolean noQuotesInside, String arg, - String errorMessage) { - int lastPos = arg.length() - 1; - if (lastPos >=1 && arg.charAt(0) == '"' && arg.charAt(lastPos) == '"') { - // The argument has already been quoted. - if (noQuotesInside) { - if (arg.indexOf('"', 1) != lastPos) { - // There is ["] inside. - throw new IllegalArgumentException(errorMessage); - } - } - return true; - } - if (noQuotesInside) { - if (arg.indexOf('"') >= 0) { - // There is ["] inside. - throw new IllegalArgumentException(errorMessage); - } - } - return false; + /** + * Return the argument without quotes (1st and last) if present, else the arg. + * @param str a string + * @return the string without 1st and last quotes + */ + private static String unQuote(String str) { + int len = str.length(); + return (len >= 2 && str.charAt(0) == DOUBLEQUOTE && str.charAt(len - 1) == DOUBLEQUOTE) + ? str.substring(1, len - 1) + : str; } private static boolean needsEscaping(int verificationType, String arg) { @@ -286,9 +300,26 @@ // For [.exe] or [.com] file the unpaired/internal ["] // in the argument is not a problem. - boolean argIsQuoted = isQuoted( - (verificationType == VERIFICATION_CMD_BAT), - arg, "Argument has embedded quote, use the explicit CMD.EXE call."); + String unquotedArg = unQuote(arg); + boolean argIsQuoted = !arg.equals(unquotedArg); + boolean embeddedQuote = unquotedArg.indexOf(DOUBLEQUOTE) >= 0; + + switch (verificationType) { + case VERIFICATION_CMD_BAT: + if (embeddedQuote) { + throw new IllegalArgumentException("Argument has embedded quote, " + + "use the explicit CMD.EXE call."); + } + break; // break determine whether to quote + case VERIFICATION_WIN32_SAFE: + if (argIsQuoted && embeddedQuote) { + throw new IllegalArgumentException("Malformed argument has embedded quote: " + + unquotedArg); + } + break; + default: + break; + } if (!argIsQuoted) { char testEscape[] = ESCAPE_VERIFICATION[verificationType]; @@ -304,13 +335,13 @@ private static String getExecutablePath(String path) throws IOException { - boolean pathIsQuoted = isQuoted(true, path, - "Executable name has embedded quote, split the arguments"); - + String name = unQuote(path); + if (name.indexOf(DOUBLEQUOTE) >= 0) { + throw new IllegalArgumentException("Executable name has embedded quote, " + + "split the arguments: " + name); + } // Win32 CreateProcess requires path to be normalized - File fileToRun = new File(pathIsQuoted - ? path.substring(1, path.length() - 1) - : path); + File fileToRun = new File(name); // From the [CreateProcess] function documentation: // @@ -325,13 +356,26 @@ // sequence:..." // // In practice ANY non-existent path is extended by [.exe] extension - // in the [CreateProcess] funcion with the only exception: + // in the [CreateProcess] function with the only exception: // the path ends by (.) return fileToRun.getPath(); } + /** + * An executable is any program that is an EXE or does not have an extension + * and the Windows createProcess will be looking for .exe. + * The comparison is case insensitive based on the name. + * @param executablePath the executable file + * @return true if the path ends in .exe or does not have an extension. + */ + private boolean isExe(String executablePath) { + File file = new File(executablePath); + String upName = file.getName().toUpperCase(Locale.ROOT); + return (upName.endsWith(".EXE") || upName.indexOf('.') < 0); + } + // Old version that can be bypassed private boolean isShellFile(String executablePath) { String upPath = executablePath.toUpperCase(); return (upPath.endsWith(".CMD") || upPath.endsWith(".BAT")); @@ -342,6 +386,21 @@ return argbuf.append('"').append(arg).append('"').toString(); } + // Count backslashes before start index of string. + // .bat files don't include backslashes as part of the quote + private static int countLeadingBackslash(int verificationType, + CharSequence input, int start) { + if (verificationType == VERIFICATION_CMD_BAT) + return 0; + int j; + for (j = start - 1; j >= 0 && input.charAt(j) == BACKSLASH; j--) { + // just scanning backwards + } + return (start - 1) - j; // number of BACKSLASHES + } + + private static final char DOUBLEQUOTE = '\"'; + private static final char BACKSLASH = '\\'; private final long handle; private final ProcessHandle processHandle; @@ -358,15 +417,13 @@ throws IOException { String cmdstr; - SecurityManager security = System.getSecurityManager(); - boolean allowAmbiguousCommands = false; - if (security == null) { - allowAmbiguousCommands = true; - String value = System.getProperty("jdk.lang.Process.allowAmbiguousCommands"); - if (value != null) - allowAmbiguousCommands = !"false".equalsIgnoreCase(value); - } - if (allowAmbiguousCommands) { + final SecurityManager security = System.getSecurityManager(); + final String value = GetPropertyAction. + privilegedGetProperty("jdk.lang.Process.allowAmbiguousCommands", + (security == null ? "true" : "false")); + final boolean allowAmbiguousCommands = !"false".equalsIgnoreCase(value); + + if (allowAmbiguousCommands && security == null) { // Legacy mode. // Normalize path if possible. @@ -413,11 +470,12 @@ // Quotation protects from interpretation of the [path] argument as // start of longer path with spaces. Quotation has no influence to // [.exe] extension heuristic. + boolean isShell = allowAmbiguousCommands ? isShellFile(executablePath) + : !isExe(executablePath); cmdstr = createCommandLine( - // We need the extended verification procedure for CMD files. - isShellFile(executablePath) - ? VERIFICATION_CMD_BAT - : VERIFICATION_WIN32, + // We need the extended verification procedures + isShell ? VERIFICATION_CMD_BAT + : (allowAmbiguousCommands ? VERIFICATION_WIN32 : VERIFICATION_WIN32_SAFE), quoteString(executablePath), cmd); } diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/classes/java/awt/Font.java --- a/src/java.desktop/share/classes/java/awt/Font.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/classes/java/awt/Font.java Wed Oct 23 14:01:17 2019 -0400 @@ -1929,6 +1929,7 @@ // value is the default. if (fRequestedAttributes != null) { + try { values = getAttributeValues(); // init AttributeValues extras = AttributeValues.fromSerializableHashtable(fRequestedAttributes); @@ -1938,10 +1939,13 @@ values = getAttributeValues().merge(extras); this.nonIdentityTx = values.anyNonDefault(EXTRA_MASK); this.hasLayoutAttributes = values.anyNonDefault(LAYOUT_MASK); - + } catch (Throwable t) { + throw new IOException(t); + } finally { fRequestedAttributes = null; // don't need it any more } } + } /** * Returns the number of glyphs in this {@code Font}. Glyph codes diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/classes/sun/font/CMap.java --- a/src/java.desktop/share/classes/sun/font/CMap.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/classes/sun/font/CMap.java Wed Oct 23 14:01:17 2019 -0400 @@ -130,7 +130,7 @@ static final char noSuchChar = (char)0xfffd; static final int SHORTMASK = 0x0000ffff; - static final int INTMASK = 0xffffffff; + static final int INTMASK = 0x7fffffff; static final char[][] converterMaps = new char[7][]; @@ -919,7 +919,11 @@ bbuffer.position(12); bbuffer.get(is32); - nGroups = bbuffer.getInt(); + nGroups = bbuffer.getInt() & INTMASK; + // A map group record is three uint32's making for 12 bytes total + if (bbuffer.remaining() < (12 * (long)nGroups)) { + throw new RuntimeException("Format 8 table exceeded"); + } startCharCode = new int[nGroups]; endCharCode = new int[nGroups]; startGlyphID = new int[nGroups]; @@ -947,9 +951,13 @@ CMapFormat10(ByteBuffer bbuffer, int offset, char[] xlat) { + bbuffer.position(offset+12); firstCode = bbuffer.getInt() & INTMASK; entryCount = bbuffer.getInt() & INTMASK; - bbuffer.position(offset+20); + // each glyph is a uint16, so 2 bytes per value. + if (bbuffer.remaining() < (2 * (long)entryCount)) { + throw new RuntimeException("Format 10 table exceeded"); + } CharBuffer buffer = bbuffer.asCharBuffer(); glyphIdArray = new char[entryCount]; for (int i=0; i< entryCount; i++) { @@ -989,11 +997,15 @@ throw new RuntimeException("xlat array for cmap fmt=12"); } - numGroups = buffer.getInt(offset+12); + buffer.position(offset+12); + numGroups = buffer.getInt() & INTMASK; + // A map group record is three uint32's making for 12 bytes total + if (buffer.remaining() < (12 * (long)numGroups)) { + throw new RuntimeException("Format 12 table exceeded"); + } startCharCode = new long[numGroups]; endCharCode = new long[numGroups]; startGlyphID = new int[numGroups]; - buffer.position(offset+16); buffer = buffer.slice(); IntBuffer ibuffer = buffer.asIntBuffer(); for (int i=0; i 0) { buffer.position(offset+tableOffset); numUVSMapping[i] = buffer.getInt() & INTMASK; + // a UVS mapping record is one 3 byte int + uint16 + // making for 5 bytes per record. + if (buffer.remaining() < (5 * (long)numUVSMapping[i])) { + throw new RuntimeException("Variations exceed buffer"); + } unicodeValue[i] = new int[numUVSMapping[i]]; glyphID[i] = new char[numUVSMapping[i]]; diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/classes/sun/font/FileFont.java --- a/src/java.desktop/share/classes/sun/font/FileFont.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/classes/sun/font/FileFont.java Wed Oct 23 14:01:17 2019 -0400 @@ -172,7 +172,7 @@ } } if (scaler != null) { - scaler.dispose(); + scaler.disposeScaler(); } scaler = FontScaler.getNullScaler(); } diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/classes/sun/font/FontScaler.java --- a/src/java.desktop/share/classes/sun/font/FontScaler.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/classes/sun/font/FontScaler.java Wed Oct 23 14:01:17 2019 -0400 @@ -173,6 +173,12 @@ scaler context objects! */ public void dispose() {} + /** + * Used when the native resources held by the scaler need + * to be released before the 2D disposer runs. + */ + public void disposeScaler() {} + /* At the moment these 3 methods are needed for Type1 fonts only. * For Truetype fonts we extract required info outside of scaler * on java layer. diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java --- a/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java Wed Oct 23 14:01:17 2019 -0400 @@ -163,6 +163,9 @@ .getNullScaler().getGlyphVectorOutline(0L, glyphs, numGlyphs, x, y); } + /* This method should not be called directly, in case + * it is being invoked from a thread with a native context. + */ public synchronized void dispose() { if (nativeScaler != 0L) { disposeNativeScaler(font.get(), nativeScaler); @@ -170,6 +173,21 @@ } } + public synchronized void disposeScaler() { + if (nativeScaler != 0L) { + /* + * The current thread may be calling this method from the context + * of a JNI up-call. It will hold the native lock from the + * original down-call so can directly enter dispose and free + * the resources. So we need to schedule the disposal to happen + * only once we've returned from native. So by running the dispose + * on another thread which does nothing except that disposal we + * are sure that this is safe. + */ + new Thread(null, () -> dispose(), "free scaler", 0, false).start(); + } + } + synchronized int getNumGlyphs() throws FontScalerException { if (nativeScaler != 0L) { return getNumGlyphsNative(nativeScaler); @@ -206,7 +224,7 @@ return getUnitsPerEMNative(nativeScaler); } - long createScalerContext(double[] matrix, + synchronized long createScalerContext(double[] matrix, int aa, int fm, float boldness, float italic, boolean disableHinting) { if (nativeScaler != 0L) { @@ -236,7 +254,7 @@ private native GeneralPath getGlyphVectorOutlineNative(Font2D font, long pScalerContext, long pScaler, int[] glyphs, int numGlyphs, float x, float y); - native Point2D.Float getGlyphPointNative(Font2D font, + private native Point2D.Float getGlyphPointNative(Font2D font, long pScalerContext, long pScaler, int glyphCode, int ptNumber); private native void disposeNativeScaler(Font2D font2D, long pScaler); @@ -247,7 +265,7 @@ private native long getUnitsPerEMNative(long pScaler); - native long createScalerContextNative(long pScaler, double[] matrix, + private native long createScalerContextNative(long pScaler, double[] matrix, int aa, int fm, float boldness, float italic); /* Freetype scaler context does not contain any pointers that diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/classes/sun/font/GlyphList.java --- a/src/java.desktop/share/classes/sun/font/GlyphList.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/classes/sun/font/GlyphList.java Wed Oct 23 14:01:17 2019 -0400 @@ -303,6 +303,14 @@ */ public void setGlyphIndex(int i) { glyphindex = i; + if (images[i] == 0L) { + metrics[0] = (int)gposx; + metrics[1] = (int)gposy; + metrics[2] = 0; + metrics[3] = 0; + metrics[4] = 0; + return; + } float gx = StrikeCache.unsafe.getFloat(images[i]+StrikeCache.topLeftXOffset); float gy = @@ -341,6 +349,9 @@ graybits = new byte[len]; } } + if (images[glyphindex] == 0L) { + return graybits; + } long pixelDataAddress = StrikeCache.unsafe.getAddress(images[glyphindex] + StrikeCache.pixelDataOffset); @@ -448,6 +459,9 @@ char gw, gh; float gx, gy, gx0, gy0, gx1, gy1; for (int i=0; i data.length) { + if (offset < 0 || length < 0 || offset + length < length || + offset + length > data.length) { throw new ArrayIndexOutOfBoundsException("bad offset/length"); } if (font.hasLayoutAttributes()) { @@ -3053,7 +3054,8 @@ if (data == null) { throw new NullPointerException("byte data is null"); } - if (offset < 0 || length < 0 || offset + length > data.length) { + if (offset < 0 || length < 0 || offset + length < length || + offset + length > data.length) { throw new ArrayIndexOutOfBoundsException("bad offset/length"); } /* Byte data is interpreted as 8-bit ASCII. Re-use drawChars loops */ diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c --- a/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, 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 @@ -208,21 +208,22 @@ j2d_glPixelZoom(scalex, -scaley); + GLvoid *pSrc = PtrCoord(srcInfo->rasBase, sx1, srcInfo->pixelStride, + sy1, srcInfo->scanStride); + // in case pixel stride is not a multiple of scanline stride the copy // has to be done line by line (see 6207877) if (srcInfo->scanStride % srcInfo->pixelStride != 0) { jint width = sx2-sx1; jint height = sy2-sy1; - GLvoid *pSrc = srcInfo->rasBase; - while (height > 0) { j2d_glDrawPixels(width, 1, pf->format, pf->type, pSrc); - j2d_glBitmap(0, 0, 0, 0, (GLfloat)0, (GLfloat)-1, NULL); + j2d_glBitmap(0, 0, 0, 0, (GLfloat)0, (GLfloat)-scaley, NULL); pSrc = PtrAddBytes(pSrc, srcInfo->scanStride); height--; } } else { - j2d_glDrawPixels(sx2-sx1, sy2-sy1, pf->format, pf->type, srcInfo->rasBase); + j2d_glDrawPixels(sx2-sx1, sy2-sy1, pf->format, pf->type, pSrc); } j2d_glPixelZoom(1.0, 1.0); @@ -317,12 +318,11 @@ ty2 = ((GLdouble)sh) / th; if (swsurface) { + GLvoid *pSrc = PtrCoord(srcInfo->rasBase, + sx, srcInfo->pixelStride, + sy, srcInfo->scanStride); if (slowPath) { jint tmph = sh; - GLvoid *pSrc = PtrCoord(srcInfo->rasBase, - sx, srcInfo->pixelStride, - sy, srcInfo->scanStride); - while (tmph > 0) { j2d_glTexSubImage2D(GL_TEXTURE_2D, 0, 0, sh - tmph, sw, 1, @@ -332,16 +332,10 @@ tmph--; } } else { - j2d_glPixelStorei(GL_UNPACK_SKIP_PIXELS, sx); - j2d_glPixelStorei(GL_UNPACK_SKIP_ROWS, sy); - j2d_glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, sw, sh, pf->format, pf->type, - srcInfo->rasBase); - - j2d_glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); - j2d_glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); + pSrc); } // the texture image is "right side up", so we align the @@ -638,8 +632,9 @@ J2dTraceLn4(J2D_TRACE_VERBOSE, " dx1=%f dy1=%f dx2=%f dy2=%f", dx1, dy1, dx2, dy2); - j2d_glPixelStorei(GL_UNPACK_SKIP_PIXELS, sx1); - j2d_glPixelStorei(GL_UNPACK_SKIP_ROWS, sy1); + // Note: we will calculate x/y positions in the raster manually + j2d_glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); + j2d_glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); j2d_glPixelStorei(GL_UNPACK_ROW_LENGTH, srcInfo.scanStride / srcInfo.pixelStride); j2d_glPixelStorei(GL_UNPACK_ALIGNMENT, pf.alignment); @@ -696,8 +691,6 @@ } } - j2d_glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); - j2d_glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); j2d_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); j2d_glPixelStorei(GL_UNPACK_ALIGNMENT, 4); } @@ -717,8 +710,8 @@ juint step = 0; // vertical flip and convert argbpre to argb if necessary for (; i < h / 2; ++i) { - juint *r1 = PtrAddBytes(pDst, (i * scanStride)); - juint *r2 = PtrAddBytes(pDst, (h - i - 1) * scanStride); + juint *r1 = PtrPixelsRow(pDst, i, scanStride); + juint *r2 = PtrPixelsRow(pDst, h - i - 1, scanStride); if (tempRow) { // fast path memcpy(tempRow, r1, clippedStride); @@ -740,7 +733,7 @@ } // convert the middle line if necessary if (convert && h % 2) { - juint *r1 = PtrAddBytes(pDst, (i * scanStride)); + juint *r1 = PtrPixelsRow(pDst, i, scanStride); for (step = 0; step < w; ++step) { LoadIntArgbPreTo1IntArgb(r1, 0, step, r1[step]); } @@ -813,7 +806,7 @@ height = srcInfo.bounds.y2 - srcInfo.bounds.y1; pDst = PtrAddBytes(pDst, dstx * dstInfo.pixelStride); - pDst = PtrAddBytes(pDst, dsty * dstInfo.scanStride); + pDst = PtrPixelsRow(pDst, dsty, dstInfo.scanStride); j2d_glPixelStorei(GL_PACK_ROW_LENGTH, dstInfo.scanStride / dstInfo.pixelStride); diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h --- a/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h Wed Oct 23 14:01:17 2019 -0400 @@ -490,6 +490,8 @@ #define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, \ ((ptrdiff_t)(y))*(yinc) + \ ((ptrdiff_t)(x))*(xinc)) +#define PtrPixelsRow(p, y, scanStride) PtrAddBytes(p, \ + ((intptr_t) (y)) * (scanStride)) /* * The function to call with an array of NativePrimitive structures diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h --- a/src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h Wed Oct 23 14:01:17 2019 -0400 @@ -137,7 +137,7 @@ do { \ juint w = WIDTH; \ jint tmpsxloc = SXLOC; \ - SRCPTR = PtrAddBytes(SRCBASE, ((SYLOC >> SHIFT) * srcScan)); \ + SRCPTR = PtrPixelsRow(SRCBASE, (SYLOC >> SHIFT), srcScan); \ Init ## DSTTYPE ## StoreVarsX(DSTPREFIX, DSTINFO); \ do { \ jint XVAR = (tmpsxloc >> SHIFT); \ @@ -2067,7 +2067,7 @@ \ Init ## SRC ## LoadVars(SrcRead, pSrcInfo); \ while (pRGB < pEnd) { \ - SRC ## DataType *pRow = PtrAddBytes(pBase, WholeOfLong(ylong) * scan); \ + SRC ## DataType *pRow = PtrPixelsRow(pBase, WholeOfLong(ylong), scan); \ Copy ## SRC ## ToIntArgbPre(pRGB, 0, \ SrcRead, pRow, WholeOfLong(xlong)); \ pRGB++; \ @@ -2115,7 +2115,7 @@ ydelta &= scan; \ \ xwhole += cx; \ - pRow = PtrAddBytes(pSrcInfo->rasBase, (ywhole + cy) * scan); \ + pRow = PtrPixelsRow(pSrcInfo->rasBase, ywhole + cy, scan); \ Copy ## SRC ## ToIntArgbPre(pRGB, 0, SrcRead, pRow, xwhole); \ Copy ## SRC ## ToIntArgbPre(pRGB, 1, SrcRead, pRow, xwhole+xdelta); \ pRow = PtrAddBytes(pRow, ydelta); \ @@ -2173,7 +2173,7 @@ ydelta1 += (isneg & -scan); \ \ xwhole += cx; \ - pRow = PtrAddBytes(pSrcInfo->rasBase, (ywhole + cy) * scan); \ + pRow = PtrPixelsRow(pSrcInfo->rasBase, ywhole + cy, scan); \ pRow = PtrAddBytes(pRow, ydelta0); \ Copy ## SRC ## ToIntArgbPre(pRGB, 0, SrcRead, pRow, xwhole+xdelta0); \ Copy ## SRC ## ToIntArgbPre(pRGB, 1, SrcRead, pRow, xwhole ); \ diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/native/libfontmanager/DrawGlyphList.c --- a/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c Wed Oct 23 14:01:17 2019 -0400 @@ -532,6 +532,12 @@ */ if (subPixPos && len > 0) { ginfo = (GlyphInfo*)imagePtrs[0]; + if (ginfo == NULL) { + (*env)->ReleasePrimitiveArrayCritical(env, glyphImages, + imagePtrs, JNI_ABORT); + free(gbv); + return (GlyphBlitVector*)NULL; + } /* rowBytes==width tests if its a B&W or LCD glyph */ if (ginfo->width == ginfo->rowBytes) { subPixPos = JNI_FALSE; @@ -561,6 +567,12 @@ jfloat px, py; ginfo = (GlyphInfo*)imagePtrs[g]; + if (ginfo == NULL) { + (*env)->ReleasePrimitiveArrayCritical(env, glyphImages, + imagePtrs, JNI_ABORT); + free(gbv); + return (GlyphBlitVector*)NULL; + } gbv->glyphs[g].glyphInfo = ginfo; gbv->glyphs[g].pixels = ginfo->image; gbv->glyphs[g].width = ginfo->width; @@ -636,6 +648,12 @@ } else { for (g=0; gReleasePrimitiveArrayCritical(env, glyphImages, + imagePtrs, JNI_ABORT); + free(gbv); + return (GlyphBlitVector*)NULL; + } gbv->glyphs[g].glyphInfo = ginfo; gbv->glyphs[g].pixels = ginfo->image; gbv->glyphs[g].width = ginfo->width; diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/native/libfontmanager/freetypeScaler.c --- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c Wed Oct 23 14:01:17 2019 -0400 @@ -154,7 +154,31 @@ jobject bBuffer; int bread = 0; - if (numBytes == 0) return 0; + /* A call with numBytes == 0 is a seek. It should return 0 if the + * seek position is within the file and non-zero otherwise. + * For all other cases, ie numBytes !=0, return the number of bytes + * actually read. This applies to truncated reads and also failed reads. + */ + + if (numBytes == 0) { + if (offset > scalerInfo->fileSize) { + return -1; + } else { + return 0; + } + } + + if (offset + numBytes < offset) { + return 0; // ft should not do this, but just in case. + } + + if (offset >= scalerInfo->fileSize) { + return 0; + } + + if (offset + numBytes > scalerInfo->fileSize) { + numBytes = scalerInfo->fileSize - offset; + } /* Large reads will bypass the cache and data copying */ if (numBytes > FILEDATACACHESIZE) { @@ -164,7 +188,11 @@ scalerInfo->font2D, sunFontIDs.ttReadBlockMID, bBuffer, offset, numBytes); - return bread; + if (bread < 0) { + return 0; + } else { + return bread; + } } else { /* We probably hit bug 4845371. For reasons that * are currently unclear, the call stacks after the initial @@ -179,9 +207,18 @@ (*env)->CallObjectMethod(env, scalerInfo->font2D, sunFontIDs.ttReadBytesMID, offset, numBytes); - (*env)->GetByteArrayRegion(env, byteArray, - 0, numBytes, (jbyte*)destBuffer); - return numBytes; + /* If there's an OutofMemoryError then byteArray will be null */ + if (byteArray == NULL) { + return 0; + } else { + jsize len = (*env)->GetArrayLength(env, byteArray); + if (len < numBytes) { + numBytes = len; // don't get more bytes than there are .. + } + (*env)->GetByteArrayRegion(env, byteArray, + 0, numBytes, (jbyte*)destBuffer); + return numBytes; + } } } /* Do we have a cache hit? */ else if (scalerInfo->fontDataOffset <= offset && @@ -203,6 +240,11 @@ sunFontIDs.ttReadBlockMID, bBuffer, offset, scalerInfo->fontDataLength); + if (bread <= 0) { + return 0; + } else if (bread < numBytes) { + numBytes = bread; + } memcpy(destBuffer, scalerInfo->fontData, numBytes); return numBytes; } @@ -593,16 +635,17 @@ to avoid unnecesary work with bitmaps. */ GlyphInfo *info; - jfloat advance; + jfloat advance = 0.0f; jlong image; image = Java_sun_font_FreetypeFontScaler_getGlyphImageNative( env, scaler, font2D, pScalerContext, pScaler, glyphCode); info = (GlyphInfo*) jlong_to_ptr(image); - advance = info->advanceX; - - free(info); + if (info != NULL) { + advance = info->advanceX; + free(info); + } return advance; } @@ -630,10 +673,14 @@ pScalerContext, pScaler, glyphCode); info = (GlyphInfo*) jlong_to_ptr(image); - (*env)->SetFloatField(env, metrics, sunFontIDs.xFID, info->advanceX); - (*env)->SetFloatField(env, metrics, sunFontIDs.yFID, info->advanceY); - - free(info); + if (info != NULL) { + (*env)->SetFloatField(env, metrics, sunFontIDs.xFID, info->advanceX); + (*env)->SetFloatField(env, metrics, sunFontIDs.yFID, info->advanceY); + free(info); + } else { + (*env)->SetFloatField(env, metrics, sunFontIDs.xFID, 0.0f); + (*env)->SetFloatField(env, metrics, sunFontIDs.yFID, 0.0f); + } } @@ -740,6 +787,13 @@ } +/* JDK does not use glyph images for fonts with a + * pixel size > 100 (see THRESHOLD in OutlineTextRenderer.java) + * so if the glyph bitmap image dimension is > 1024 pixels, + * something is up. + */ +#define MAX_GLYPH_DIM 1024 + /* * Class: sun_font_FreetypeFontScaler * Method: getGlyphImageNative @@ -813,6 +867,14 @@ /* generate bitmap if it is not done yet e.g. if algorithmic styling is performed and style was added to outline */ if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) { + FT_BBox bbox; + FT_Outline_Get_CBox(&(ftglyph->outline), &bbox); + int w = (int)((bbox.xMax>>6)-(bbox.xMin>>6)); + int h = (int)((bbox.yMax>>6)-(bbox.yMin>>6)); + if (w > MAX_GLYPH_DIM || h > MAX_GLYPH_DIM) { + glyphInfo = getNullGlyphImage(); + return ptr_to_jlong(glyphInfo); + } error = FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target)); if (error != 0) { return ptr_to_jlong(getNullGlyphImage()); @@ -821,6 +883,11 @@ width = (UInt16) ftglyph->bitmap.width; height = (UInt16) ftglyph->bitmap.rows; + if (width > MAX_GLYPH_DIM || height > MAX_GLYPH_DIM) { + glyphInfo = getNullGlyphImage(); + return ptr_to_jlong(glyphInfo); + } + imageSize = width*height; glyphInfo = (GlyphInfo*) malloc(sizeof(GlyphInfo) + imageSize); diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc --- a/src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc Wed Oct 23 14:01:17 2019 -0400 @@ -351,6 +351,9 @@ } length = env->GetArrayLength(tableBytes); buffer = calloc(length, sizeof(jbyte)); + if (buffer == NULL) { + return NULL; + } env->GetByteArrayRegion(tableBytes, 0, length, (jbyte*)buffer); return hb_blob_create((const char *)buffer, length, diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/unix/classes/sun/font/XRGlyphCache.java --- a/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java Wed Oct 23 14:01:17 2019 -0400 @@ -114,6 +114,9 @@ for (int i = 0; i < glyphList.getNumGlyphs(); i++) { XRGlyphCacheEntry glyph; + if (imgPtrs[i] == 0L) { + continue; + } // Find uncached glyphs and queue them for upload if ((glyph = getEntryForPointer(imgPtrs[i])) == null) { glyph = new XRGlyphCacheEntry(imgPtrs[i], glyphList); diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/unix/classes/sun/font/XRTextRenderer.java --- a/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java Wed Oct 23 14:01:17 2019 -0400 @@ -88,6 +88,9 @@ for (int i = 0; i < gl.getNumGlyphs(); i++) { gl.setGlyphIndex(i); XRGlyphCacheEntry cacheEntry = cachedGlyphs[i]; + if (cacheEntry == null) { + continue; + } eltList.getGlyphs().addInt(cacheEntry.getGlyphID()); int glyphSet = cacheEntry.getGlyphSet(); diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c --- a/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c Wed Oct 23 14:01:17 2019 -0400 @@ -273,6 +273,7 @@ unsigned int imageSize; JNIEnv *env; + FONT_AWT_LOCK(); /* XTextExtents16(xFont, xChar, 1, &direction, &ascent, &descent, &xcs); */ XQueryTextExtents16(awt_display,xFont->fid, xChar, 1, @@ -280,8 +281,11 @@ width = xcs.rbearing - xcs.lbearing; height = xcs.ascent+xcs.descent; imageSize = width*height; - glyphInfo = (GlyphInfo*)malloc(sizeof(GlyphInfo)+imageSize); + if (glyphInfo == NULL) { + AWT_UNLOCK(); + return (jlong)(uintptr_t)NULL; + } glyphInfo->cellInfo = NULL; glyphInfo->width = width; glyphInfo->height = height; diff -r bc43733cd5cf -r 015949faea55 src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp --- a/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp Wed Oct 23 14:01:17 2019 -0400 @@ -1092,7 +1092,9 @@ { #ifndef PtrAddBytes #define PtrAddBytes(p, b) ((void *) (((intptr_t) (p)) + (b))) -#define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, (y)*(yinc) + (x)*(xinc)) +#define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, \ + ((ptrdiff_t)(y))*(yinc) + \ + ((ptrdiff_t)(x))*(xinc)) #endif // PtrAddBytes HRESULT res = S_OK; diff -r bc43733cd5cf -r 015949faea55 src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java --- a/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -450,7 +450,7 @@ * @return nothing - this method always throw an exception. * The return type makes it possible to write * 

 throw throwException(clazz,cause);
- * @throws SecurityException - if cause is a SecurityException + * @throws SecurityException if cause is a SecurityException * @throws NotCompliantMBeanException otherwise. **/ static NotCompliantMBeanException throwException(Class notCompliant, diff -r bc43733cd5cf -r 015949faea55 src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java --- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java Wed Oct 23 14:01:17 2019 -0400 @@ -41,6 +41,7 @@ import java.net.http.HttpClient; import java.net.http.HttpHeaders; import java.net.http.HttpRequest; + import jdk.internal.net.http.common.HttpHeadersBuilder; import jdk.internal.net.http.common.Utils; import jdk.internal.net.http.websocket.OpeningHandshake; @@ -152,13 +153,14 @@ /** Returns a new instance suitable for redirection. */ public static HttpRequestImpl newInstanceForRedirection(URI uri, String method, - HttpRequestImpl other) { - return new HttpRequestImpl(uri, method, other); + HttpRequestImpl other, + boolean mayHaveBody) { + return new HttpRequestImpl(uri, method, other, mayHaveBody); } /** Returns a new instance suitable for authentication. */ public static HttpRequestImpl newInstanceForAuthentication(HttpRequestImpl other) { - HttpRequestImpl request = new HttpRequestImpl(other.uri(), other.method(), other); + HttpRequestImpl request = new HttpRequestImpl(other.uri(), other.method(), other, true); if (request.isWebSocket()) { Utils.setWebSocketUpgradeHeaders(request); } @@ -171,7 +173,8 @@ */ private HttpRequestImpl(URI uri, String method, - HttpRequestImpl other) { + HttpRequestImpl other, + boolean mayHaveBody) { assert method == null || Utils.isValidName(method); this.method = method == null? "GET" : method; this.userHeaders = other.userHeaders; @@ -184,13 +187,21 @@ this.proxy = other.proxy; this.expectContinue = other.expectContinue; this.secure = uri.getScheme().toLowerCase(Locale.US).equals("https"); - this.requestPublisher = other.requestPublisher; // may be null + this.requestPublisher = mayHaveBody ? publisher(other) : null; // may be null this.acc = other.acc; this.timeout = other.timeout; this.version = other.version(); this.authority = null; } + private BodyPublisher publisher(HttpRequestImpl other) { + BodyPublisher res = other.requestPublisher; + if (!Objects.equals(method, other.method)) { + res = null; + } + return res; + } + /* used for creating CONNECT requests */ HttpRequestImpl(String method, InetSocketAddress authority, HttpHeaders headers) { // TODO: isWebSocket flag is not specified, but the assumption is that diff -r bc43733cd5cf -r 015949faea55 src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java --- a/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -89,6 +89,31 @@ } } + private static boolean isRedirecting(int statusCode) { + // < 300: not a redirect codes + if (statusCode < 300) return false; + // 309-399 Unassigned => don't follow + // > 399: not a redirect code + if (statusCode > 308) return false; + switch (statusCode) { + // 300: MultipleChoice => don't follow + case 300: + return false; + // 304: Not Modified => don't follow + case 304: + return false; + // 305: Proxy Redirect => don't follow. + case 305: + return false; + // 306: Unused => don't follow + case 306: + return false; + // 301, 302, 303, 307, 308: OK to follow. + default: + return true; + } + } + /** * Checks to see if a new request is needed and returns it. * Null means response is ok to return to user. @@ -102,13 +127,13 @@ if (rcode == HTTP_NOT_MODIFIED) return null; - if (rcode >= 300 && rcode <= 399) { + if (isRedirecting(rcode)) { URI redir = getRedirectedURI(r.headers()); String newMethod = redirectedMethod(rcode, method); Log.logTrace("response code: {0}, redirected URI: {1}", rcode, redir); if (canRedirect(redir) && ++exchange.numberOfRedirects < max_redirects) { Log.logTrace("redirect to: {0} with method: {1}", redir, newMethod); - return HttpRequestImpl.newInstanceForRedirection(redir, newMethod, request); + return HttpRequestImpl.newInstanceForRedirection(redir, newMethod, request, rcode != 303); } else { Log.logTrace("not redirecting"); return null; diff -r bc43733cd5cf -r 015949faea55 src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java --- a/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java Wed Oct 23 14:01:17 2019 -0400 @@ -318,14 +318,19 @@ @Override protected long upstreamWindowUpdate(long currentWindow, long downstreamQsize) { - if (readBuf.remaining() > TARGET_BUFSIZE) { - if (debugr.on()) - debugr.log("readBuf has more than TARGET_BUFSIZE: %d", - readBuf.remaining()); - return 0; - } else { - return super.upstreamWindowUpdate(currentWindow, downstreamQsize); + if (needsMoreData()) { + // run the scheduler to see if more data should be requested + if (debugr.on()) { + int remaining = readBuf.remaining(); + if (remaining > TARGET_BUFSIZE) { + // just some logging to check how much we have in the read buffer + debugr.log("readBuf has more than TARGET_BUFSIZE: %d", + remaining); + } + } + scheduler.runOrSchedule(); } + return 0; // we will request more from the scheduler loop (processData). } // readBuf is kept ready for reading outside of this method @@ -368,6 +373,32 @@ // we had before calling unwrap() again. volatile int minBytesRequired; + // We might need to request more data if: + // - we have a subscription from upstream + // - and we don't have enough data to decrypt in the read buffer + // - *and* - either we're handshaking, and more data is required (NEED_UNWRAP), + // - or we have demand from downstream, but we have nothing decrypted + // to forward downstream. + boolean needsMoreData() { + if (upstreamSubscription != null && readBuf.remaining() <= minBytesRequired && + (engine.getHandshakeStatus() == HandshakeStatus.NEED_UNWRAP + || !downstreamSubscription.demand.isFulfilled() && hasNoOutputData())) { + return true; + } + return false; + } + + // If the readBuf has not enough data, and we either need to + // unwrap (handshaking) or we have demand from downstream, + // then request more data + void requestMoreDataIfNeeded() { + if (needsMoreData()) { + // request more will only request more if our + // demand from upstream is fulfilled + requestMore(); + } + } + // work function where it all happens final void processData() { try { @@ -434,6 +465,7 @@ outgoing(Utils.EMPTY_BB_LIST, true); // complete ALPN if not yet completed setALPN(); + requestMoreDataIfNeeded(); return; } if (result.handshaking()) { @@ -451,8 +483,10 @@ handleError(ex); return; } - if (handshaking && !complete) + if (handshaking && !complete) { + requestMoreDataIfNeeded(); return; + } } if (!complete) { synchronized (readBufferLock) { @@ -466,6 +500,8 @@ // activity. setALPN(); outgoing(Utils.EMPTY_BB_LIST, true); + } else { + requestMoreDataIfNeeded(); } } catch (Throwable ex) { errorCommon(ex); diff -r bc43733cd5cf -r 015949faea55 src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriberWrapper.java --- a/src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriberWrapper.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriberWrapper.java Wed Oct 23 14:01:17 2019 -0400 @@ -26,9 +26,7 @@ package jdk.internal.net.http.common; import java.io.Closeable; -import java.lang.System.Logger.Level; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.CompletableFuture; @@ -318,11 +316,33 @@ downstreamSubscriber.onNext(b); datasent = true; } - if (datasent) upstreamWindowUpdate(); + + // If we have sent some decrypted data downstream, + // or if: + // - there's nothing more available to send downstream + // - and we still have some demand from downstream + // - and upstream is not completed yet + // - and our demand from upstream has reached 0, + // then check whether we should request more data from + // upstream + if (datasent || outputQ.isEmpty() + && !downstreamSubscription.demand.isFulfilled() + && !upstreamCompleted + && upstreamWindow.get() == 0) { + upstreamWindowUpdate(); + } checkCompletion(); } } + final int outputQueueSize() { + return outputQ.size(); + } + + final boolean hasNoOutputData() { + return outputQ.isEmpty(); + } + void upstreamWindowUpdate() { long downstreamQueueSize = outputQ.size(); long upstreamWindowSize = upstreamWindow.get(); @@ -341,7 +361,7 @@ throw new IllegalStateException("Single shot publisher"); } this.upstreamSubscription = subscription; - upstreamRequest(upstreamWindowUpdate(0, 0)); + upstreamRequest(initialUpstreamDemand()); if (debug.on()) debug.log("calling downstreamSubscriber::onSubscribe on %s", downstreamSubscriber); @@ -356,7 +376,6 @@ if (prev <= 0) throw new IllegalStateException("invalid onNext call"); incomingCaller(item, false); - upstreamWindowUpdate(); } private void upstreamRequest(long n) { @@ -365,6 +384,16 @@ upstreamSubscription.request(n); } + /** + * Initial demand that should be requested + * from upstream when we get the upstream subscription + * from {@link #onSubscribe(Flow.Subscription)}. + * @return The initial demand to request from upstream. + */ + protected long initialUpstreamDemand() { + return 1; + } + protected void requestMore() { if (upstreamWindow.get() == 0) { upstreamRequest(1); diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, 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 @@ -107,6 +107,7 @@ /** * @serial the group's monitor */ + @SuppressWarnings("serial") // Not statically typed as Serializable private ActivationMonitor monitor; /** diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, 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 @@ -49,6 +49,7 @@ /** * @serial The group's activation system. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private ActivationSystem system; /** diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java --- a/src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/java/rmi/server/UnicastRemoteObject.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -189,12 +189,14 @@ /** * @serial client-side socket factory (if any) */ + @SuppressWarnings("serial") // Not statically typed as Serializable private RMIClientSocketFactory csf = null; /** * @serial server-side socket factory (if any) to use when * exporting object */ + @SuppressWarnings("serial") // Not statically typed as Serializable private RMIServerSocketFactory ssf = null; /* indicate compatibility with JDK 1.1.x version of class */ diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java --- a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java Wed Oct 23 14:01:17 2019 -0400 @@ -27,13 +27,8 @@ package sun.rmi.registry; import java.io.IOException; -import java.io.InputStream; -import java.rmi.AccessException; -import java.rmi.server.RemoteCall; -import sun.rmi.transport.Connection; import sun.rmi.transport.StreamRemoteCall; -import sun.rmi.transport.tcp.TCPConnection; /** * Skeleton to dispatch RegistryImpl methods. @@ -56,7 +51,7 @@ return operations.clone(); } - public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall call, int opnum, long hash) + public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall remoteCall, int opnum, long hash) throws java.lang.Exception { if (opnum < 0) { if (hash == 7583982177005850366L) { @@ -78,6 +73,7 @@ } sun.rmi.registry.RegistryImpl server = (sun.rmi.registry.RegistryImpl) obj; + StreamRemoteCall call = (StreamRemoteCall) remoteCall; switch (opnum) { case 0: // bind(String, Remote) { @@ -90,7 +86,8 @@ java.io.ObjectInput in = call.getInputStream(); $param_String_1 = (java.lang.String) in.readObject(); $param_Remote_2 = (java.rmi.Remote) in.readObject(); - } catch (java.io.IOException | java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | ClassNotFoundException e) { + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); } finally { call.releaseInputStream(); @@ -123,7 +120,8 @@ try { java.io.ObjectInput in = call.getInputStream(); $param_String_1 = (java.lang.String) in.readObject(); - } catch (java.io.IOException | java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | ClassNotFoundException e) { + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); } finally { call.releaseInputStream(); @@ -149,7 +147,8 @@ java.io.ObjectInput in = call.getInputStream(); $param_String_1 = (java.lang.String) in.readObject(); $param_Remote_2 = (java.rmi.Remote) in.readObject(); - } catch (java.io.IOException | java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | java.lang.ClassNotFoundException e) { + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); } finally { call.releaseInputStream(); @@ -172,7 +171,8 @@ try { java.io.ObjectInput in = call.getInputStream(); $param_String_1 = (java.lang.String) in.readObject(); - } catch (java.io.IOException | java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | ClassNotFoundException e) { + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); } finally { call.releaseInputStream(); diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Stub.java --- a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Stub.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Stub.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -24,6 +24,11 @@ */ package sun.rmi.registry; + +import java.io.IOException; + +import sun.rmi.transport.StreamRemoteCall; + /** * Stubs to invoke RegistryImpl remote methods. * Originally generated from RMIC but frozen to match RegistryImpl_Skel. @@ -57,7 +62,7 @@ public void bind(java.lang.String $param_String_1, java.rmi.Remote $param_Remote_2) throws java.rmi.AccessException, java.rmi.AlreadyBoundException, java.rmi.RemoteException { try { - java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject) this, operations, 0, interfaceHash); + StreamRemoteCall call = (StreamRemoteCall)ref.newCall(this, operations, 0, interfaceHash); try { java.io.ObjectOutput out = call.getOutputStream(); out.writeObject($param_String_1); @@ -82,15 +87,14 @@ public java.lang.String[] list() throws java.rmi.AccessException, java.rmi.RemoteException { try { - java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject) this, operations, 1, interfaceHash); + StreamRemoteCall call = (StreamRemoteCall)ref.newCall(this, operations, 1, interfaceHash); ref.invoke(call); java.lang.String[] $result; try { java.io.ObjectInput in = call.getInputStream(); $result = (java.lang.String[]) in.readObject(); - } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("error unmarshalling return", e); - } catch (java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | ClassNotFoundException e) { + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling return", e); } finally { ref.done(call); @@ -109,7 +113,7 @@ public java.rmi.Remote lookup(java.lang.String $param_String_1) throws java.rmi.AccessException, java.rmi.NotBoundException, java.rmi.RemoteException { try { - java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject) this, operations, 2, interfaceHash); + StreamRemoteCall call = (StreamRemoteCall)ref.newCall(this, operations, 2, interfaceHash); try { java.io.ObjectOutput out = call.getOutputStream(); out.writeObject($param_String_1); @@ -121,9 +125,8 @@ try { java.io.ObjectInput in = call.getInputStream(); $result = (java.rmi.Remote) in.readObject(); - } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("error unmarshalling return", e); - } catch (java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | ClassNotFoundException e) { + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling return", e); } finally { ref.done(call); @@ -144,7 +147,7 @@ public void rebind(java.lang.String $param_String_1, java.rmi.Remote $param_Remote_2) throws java.rmi.AccessException, java.rmi.RemoteException { try { - java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject) this, operations, 3, interfaceHash); + StreamRemoteCall call = (StreamRemoteCall)ref.newCall(this, operations, 3, interfaceHash); try { java.io.ObjectOutput out = call.getOutputStream(); out.writeObject($param_String_1); @@ -167,7 +170,7 @@ public void unbind(java.lang.String $param_String_1) throws java.rmi.AccessException, java.rmi.NotBoundException, java.rmi.RemoteException { try { - java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject) this, operations, 4, interfaceHash); + StreamRemoteCall call = (StreamRemoteCall)ref.newCall(this, operations, 4, interfaceHash); try { java.io.ObjectOutput out = call.getOutputStream(); out.writeObject($param_String_1); diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java --- a/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2003, 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,6 +38,7 @@ * * @author Ann Wollrath */ +@SuppressWarnings("serial") // Externalizable class w/o no-arg c'tor public class ActivatableServerRef extends UnicastServerRef2 { private static final long serialVersionUID = 2002967993223003793L; diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/sun/rmi/server/Activation.java --- a/src/java.rmi/share/classes/sun/rmi/server/Activation.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/sun/rmi/server/Activation.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, 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 @@ -145,9 +145,11 @@ private static boolean debugExec; /** maps activation id to its respective group id */ + @SuppressWarnings("serial") // Conditionally serializable private Map idTable = new ConcurrentHashMap<>(); /** maps group id to its GroupEntry groups */ + @SuppressWarnings("serial") // Conditionally serializable private Map groupTable = new ConcurrentHashMap<>(); @@ -297,6 +299,7 @@ private static final String NAME = ActivationSystem.class.getName(); private static final long serialVersionUID = 4877330021609408794L; + @SuppressWarnings("serial") // Not statically typed as Serializable private ActivationSystem systemStub = null; SystemRegistryImpl(int port, @@ -498,6 +501,7 @@ * with RegistryImpl.checkAccess(). * The kind of access is retained for an exception if one is thrown. */ + @SuppressWarnings("serial") // Externalizable class w/o no-arg c'tor static class SameHostOnlyServerRef extends UnicastServerRef { private static final long serialVersionUID = 1234L; private String accessKind; // an exception message @@ -873,7 +877,9 @@ ActivationGroupDesc desc = null; ActivationGroupID groupID = null; long incarnation = 0; + @SuppressWarnings("serial") // Conditionally serializable Map objects = new HashMap<>(); + @SuppressWarnings("serial") // Conditionally serializable Set restartSet = new HashSet<>(); transient ActivationInstantiator group = null; diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java --- a/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -69,6 +69,7 @@ new Hashtable<>(); private boolean groupInactive = false; private final ActivationGroupID groupID; + @SuppressWarnings("serial") // Conditionally serializable private final List lockedIDs = new ArrayList<>(); /** diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java --- a/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -25,6 +25,8 @@ package sun.rmi.transport; +import java.io.IOException; + /** * Skeleton to dispatch DGC methods. * Originally generated by RMIC but frozen to match the stubs. @@ -43,12 +45,13 @@ return operations.clone(); } - public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall call, int opnum, long hash) + public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall remoteCall, int opnum, long hash) throws java.lang.Exception { if (hash != interfaceHash) throw new java.rmi.server.SkeletonMismatchException("interface hash mismatch"); sun.rmi.transport.DGCImpl server = (sun.rmi.transport.DGCImpl) obj; + StreamRemoteCall call = (StreamRemoteCall) remoteCall; switch (opnum) { case 0: // clean(ObjID[], long, VMID, boolean) { @@ -62,9 +65,8 @@ $param_long_2 = in.readLong(); $param_VMID_3 = (java.rmi.dgc.VMID) in.readObject(); $param_boolean_4 = in.readBoolean(); - } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); - } catch (java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | ClassNotFoundException e) { + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); } finally { call.releaseInputStream(); @@ -88,9 +90,8 @@ $param_arrayOf_ObjID_1 = (java.rmi.server.ObjID[]) in.readObject(); $param_long_2 = in.readLong(); $param_Lease_3 = (java.rmi.dgc.Lease) in.readObject(); - } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); - } catch (java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | ClassNotFoundException e) { + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); } finally { call.releaseInputStream(); diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Stub.java --- a/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Stub.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Stub.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -25,16 +25,17 @@ package sun.rmi.transport; +import sun.rmi.transport.tcp.TCPConnection; + +import java.io.IOException; import java.io.ObjectInputFilter; -import java.io.ObjectInputStream; +import java.rmi.RemoteException; import java.rmi.dgc.Lease; import java.rmi.dgc.VMID; import java.rmi.server.UID; import java.security.AccessController; import java.security.PrivilegedAction; - -import sun.rmi.server.UnicastRef; -import sun.rmi.transport.tcp.TCPConnection; +import java.util.ArrayList; /** * Stubs to invoke DGC remote methods. @@ -72,7 +73,9 @@ public void clean(java.rmi.server.ObjID[] $param_arrayOf_ObjID_1, long $param_long_2, java.rmi.dgc.VMID $param_VMID_3, boolean $param_boolean_4) throws java.rmi.RemoteException { try { - java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject) this, operations, 0, interfaceHash); + StreamRemoteCall call = (StreamRemoteCall)ref.newCall((java.rmi.server.RemoteObject) this, + operations, 0, interfaceHash); + call.setObjectInputFilter(DGCImpl_Stub::leaseFilter); try { java.io.ObjectOutput out = call.getOutputStream(); out.writeObject($param_arrayOf_ObjID_1); @@ -97,7 +100,10 @@ public java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[] $param_arrayOf_ObjID_1, long $param_long_2, java.rmi.dgc.Lease $param_Lease_3) throws java.rmi.RemoteException { try { - java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject) this, operations, 1, interfaceHash); + StreamRemoteCall call = + (StreamRemoteCall)ref.newCall((java.rmi.server.RemoteObject) this, + operations, 1, interfaceHash); + call.setObjectInputFilter(DGCImpl_Stub::leaseFilter); try { java.io.ObjectOutput out = call.getOutputStream(); out.writeObject($param_arrayOf_ObjID_1); @@ -108,26 +114,16 @@ } ref.invoke(call); java.rmi.dgc.Lease $result; - Connection connection = ((StreamRemoteCall) call).getConnection(); + Connection connection = call.getConnection(); try { java.io.ObjectInput in = call.getInputStream(); - - if (in instanceof ObjectInputStream) { - /** - * Set a filter on the stream for the return value. - */ - ObjectInputStream ois = (ObjectInputStream) in; - AccessController.doPrivileged((PrivilegedAction)() -> { - ois.setObjectInputFilter(DGCImpl_Stub::leaseFilter); - return null; - }); - } $result = (java.rmi.dgc.Lease) in.readObject(); - } catch (java.io.IOException | java.lang.ClassNotFoundException e) { + } catch (ClassCastException | IOException | ClassNotFoundException e) { if (connection instanceof TCPConnection) { // Modified to prevent re-use of the connection after an exception ((TCPConnection) connection).getChannel().free(connection, false); } + call.discardPendingRefs(); throw new java.rmi.UnmarshalException("error unmarshalling return", e); } finally { ref.done(call); @@ -146,6 +142,11 @@ * ObjectInputFilter to filter DGCClient return value (a Lease). * The list of acceptable classes is very short and explicit. * The depth and array sizes are limited. + *

+ * The filter must accept normal and exception returns. + * A DGC server may throw exceptions that may have a cause + * and suppressed exceptions. + * Only exceptions in {@code java.base} and {@code java.rmi} are allowed. * * @param filterInfo access to class, arrayLength, etc. * @return {@link ObjectInputFilter.Status#ALLOWED} if allowed, @@ -172,7 +173,14 @@ } return (clazz == UID.class || clazz == VMID.class || - clazz == Lease.class) + clazz == Lease.class || + (Throwable.class.isAssignableFrom(clazz) && + (Object.class.getModule() == clazz.getModule() || + RemoteException.class.getModule() == clazz.getModule())) || + clazz == StackTraceElement.class || + clazz == ArrayList.class || // for suppressed exceptions, if any + clazz == Object.class || + clazz.getName().equals("java.util.Collections$EmptyList")) ? ObjectInputFilter.Status.ALLOWED : ObjectInputFilter.Status.REJECTED; } diff -r bc43733cd5cf -r 015949faea55 src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java --- a/src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.rmi/share/classes/sun/rmi/transport/StreamRemoteCall.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -29,6 +29,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.io.ObjectInput; +import java.io.ObjectInputFilter; import java.io.ObjectOutput; import java.io.StreamCorruptedException; import java.rmi.RemoteException; @@ -36,6 +37,9 @@ import java.rmi.UnmarshalException; import java.rmi.server.ObjID; import java.rmi.server.RemoteCall; +import java.security.AccessController; +import java.security.PrivilegedAction; + import sun.rmi.runtime.Log; import sun.rmi.server.UnicastRef; import sun.rmi.transport.tcp.TCPEndpoint; @@ -50,6 +54,7 @@ private ConnectionInputStream in = null; private ConnectionOutputStream out = null; private Connection conn; + private ObjectInputFilter filter = null; private boolean resultStarted = false; private Exception serverException = null; @@ -123,6 +128,13 @@ } } + public void setObjectInputFilter(ObjectInputFilter filter) { + if (in != null) { + throw new IllegalStateException("set filter must occur before calling getInputStream"); + } + this.filter = filter; + } + /** * Get the InputStream the stub/skeleton should get results/arguments * from. @@ -132,6 +144,12 @@ Transport.transportLog.log(Log.VERBOSE, "getting input stream"); in = new ConnectionInputStream(conn.getInputStream()); + if (filter != null) { + AccessController.doPrivileged((PrivilegedAction) () -> { + in.setObjectInputFilter(filter); + return null; + }); + } } return in; } @@ -251,6 +269,7 @@ try { ex = in.readObject(); } catch (Exception e) { + discardPendingRefs(); throw new UnmarshalException("Error unmarshaling return", e); } @@ -259,6 +278,7 @@ if (ex instanceof Exception) { exceptionReceivedFromServer((Exception) ex); } else { + discardPendingRefs(); throw new UnmarshalException("Return type not Exception"); } // Exception is thrown before fallthrough can occur diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c --- a/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c Wed Oct 23 14:01:17 2019 -0400 @@ -247,6 +247,7 @@ int netypes; jint *etypes = NULL; + int proxy_flag = 0; /* Initialize the Kerberos 5 context */ err = krb5_init_context (&kcontext); @@ -259,6 +260,48 @@ err = krb5_cc_set_flags (kcontext, ccache, flags); /* turn off OPENCLOSE */ } + // First round read. The proxy_impersonator config flag is not supported. + // This ccache will not be used if this flag exists. + if (!err) { + err = krb5_cc_start_seq_get (kcontext, ccache, &cursor); + } + + if (!err) { + while ((err = krb5_cc_next_cred (kcontext, ccache, &cursor, &creds)) == 0) { + char *serverName = NULL; + + if (!err) { + err = krb5_unparse_name (kcontext, creds.server, &serverName); + printiferr (err, "while unparsing server name"); + } + + if (!err) { + if (!strcmp(serverName, "krb5_ccache_conf_data/proxy_impersonator@X-CACHECONF:")) { + proxy_flag = 1; + } + } + + if (serverName != NULL) { krb5_free_unparsed_name (kcontext, serverName); } + + krb5_free_cred_contents (kcontext, &creds); + + if (proxy_flag) break; + } + + if (err == KRB5_CC_END) { err = 0; } + printiferr (err, "while retrieving a ticket"); + } + + if (!err) { + err = krb5_cc_end_seq_get (kcontext, ccache, &cursor); + printiferr (err, "while finishing ticket retrieval"); + } + + if (proxy_flag) { + goto outer_cleanup; + } + // End of first round read + if (!err) { err = krb5_cc_start_seq_get (kcontext, ccache, &cursor); } @@ -388,6 +431,7 @@ printiferr (err, "while finishing ticket retrieval"); } +outer_cleanup: if (!err) { flags = KRB5_TC_OPENCLOSE; /* restore OPENCLOSE mode */ err = krb5_cc_set_flags (kcontext, ccache, flags); diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java Wed Oct 23 14:01:17 2019 -0400 @@ -49,4 +49,12 @@ public void kerberosTicketSetServerAlias(KerberosTicket t, KerberosPrincipal a) { t.serverAlias = a; } + + public KerberosTicket kerberosTicketGetProxy(KerberosTicket t) { + return t.proxy; + } + + public void kerberosTicketSetProxy(KerberosTicket t, KerberosTicket p) { + t.proxy = p; + } } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java Wed Oct 23 14:01:17 2019 -0400 @@ -29,11 +29,13 @@ import java.util.Date; import java.util.Arrays; import java.net.InetAddress; +import java.util.Objects; import javax.crypto.SecretKey; import javax.security.auth.Refreshable; import javax.security.auth.Destroyable; import javax.security.auth.RefreshFailedException; import javax.security.auth.DestroyFailedException; + import sun.security.util.HexDumpEncoder; /** @@ -190,8 +192,13 @@ * @serial */ + private InetAddress[] clientAddresses; - private InetAddress[] clientAddresses; + /** + * Evidence ticket if proxy_impersonator. This field can be accessed + * by KerberosSecrets. It's serialized. + */ + KerberosTicket proxy = null; private transient boolean destroyed = false; @@ -711,6 +718,7 @@ "Renew Till = " + String.valueOf(renewTill) + "\n" + "Client Addresses " + (clientAddresses == null ? " Null " : caddrString.toString() + + (proxy == null ? "" : "\nwith a proxy ticket") + "\n")); } @@ -748,6 +756,10 @@ // clientAddress may be null, the array's hashCode is 0 result = result * 37 + Arrays.hashCode(clientAddresses); + + if (proxy != null) { + result = result * 37 + proxy.hashCode(); + } return result * 37 + Arrays.hashCode(flags); } @@ -820,6 +832,10 @@ } } + if (!Objects.equals(proxy, otherTicket.proxy)) { + return false; + } + return true; } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java --- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Context.java Wed Oct 23 14:01:17 2019 -0400 @@ -617,6 +617,8 @@ if (myCred == null) { myCred = Krb5InitCredential.getInstance(caller, myName, GSSCredential.DEFAULT_LIFETIME); + myCred = Krb5ProxyCredential.tryImpersonation( + caller, (Krb5InitCredential)myCred); } else if (!myCred.isInitiatorCredential()) { throw new GSSException(errorCode, -1, "No TGT available"); @@ -653,8 +655,8 @@ // highly consider just calling: // Subject.getSubject // SubjectComber.find - // instead of Krb5Util.getTicket - return Krb5Util.getTicket( + // instead of Krb5Util.getServiceTicket + return Krb5Util.getServiceTicket( GSSCaller.CALLER_UNKNOWN, // since it's useSubjectCredsOnly here, // don't worry about the null diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java --- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java Wed Oct 23 14:01:17 2019 -0400 @@ -57,6 +57,7 @@ private Krb5NameElement name; @SuppressWarnings("serial") // Not statically typed as Serializable private Credentials krb5Credentials; + public KerberosTicket proxyTicket; private Krb5InitCredential(Krb5NameElement name, byte[] asn1Encoding, @@ -175,7 +176,7 @@ KerberosPrincipal serverAlias = KerberosSecrets .getJavaxSecurityAuthKerberosAccess() .kerberosTicketGetServerAlias(tgt); - return new Krb5InitCredential(name, + Krb5InitCredential result = new Krb5InitCredential(name, tgt.getEncoded(), tgt.getClient(), clientAlias, @@ -189,6 +190,9 @@ tgt.getEndTime(), tgt.getRenewTill(), tgt.getClientAddresses()); + result.proxyTicket = KerberosSecrets.getJavaxSecurityAuthKerberosAccess(). + kerberosTicketGetProxy(tgt); + return result; } static Krb5InitCredential getInstance(Krb5NameElement name, @@ -371,9 +375,9 @@ public KerberosTicket run() throws Exception { // It's OK to use null as serverPrincipal. TGT is almost // the first ticket for a principal and we use list. - return Krb5Util.getTicket( + return Krb5Util.getInitialTicket( realCaller, - clientPrincipal, null, acc); + clientPrincipal, acc); }}); } catch (PrivilegedActionException e) { GSSException ge = diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java --- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -124,6 +124,8 @@ usage == GSSCredential.INITIATE_AND_ACCEPT) { credElement = Krb5InitCredential.getInstance (caller, (Krb5NameElement) name, initLifetime); + credElement = Krb5ProxyCredential.tryImpersonation( + caller, (Krb5InitCredential)credElement); checkInitCredPermission ((Krb5NameElement) credElement.getName()); } else if (usage == GSSCredential.ACCEPT_ONLY) { diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java --- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -144,7 +144,7 @@ return new Krb5NameElement(principalName, gssNameStr, gssNameType); } - static Krb5NameElement getInstance(PrincipalName principalName) { + public static Krb5NameElement getInstance(PrincipalName principalName) { return new Krb5NameElement(principalName, principalName.getName(), Krb5MechFactory.NT_GSS_KRB5_PRINCIPAL); diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java --- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 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 @@ -26,10 +26,17 @@ package sun.security.jgss.krb5; import org.ietf.jgss.*; +import sun.security.jgss.GSSCaller; import sun.security.jgss.spi.*; -import java.util.Date; + +import java.io.IOException; + +import sun.security.krb5.Credentials; +import sun.security.krb5.KrbException; import sun.security.krb5.internal.Ticket; +import javax.security.auth.kerberos.KerberosTicket; + /** * Implements the krb5 proxy credential element used in constrained * delegation. It is used in both impersonation (where there is no Kerberos 5 @@ -112,4 +119,24 @@ throw new GSSException(GSSException.FAILURE, -1, "Only an initiate credentials can impersonate"); } + + // Try to see if a default credential should act as an impersonator. + static Krb5CredElement tryImpersonation(GSSCaller caller, + Krb5InitCredential initiator) throws GSSException { + + try { + KerberosTicket proxy = initiator.proxyTicket; + if (proxy != null) { + Credentials proxyCreds = Krb5Util.ticketToCreds(proxy); + return new Krb5ProxyCredential(initiator, + Krb5NameElement.getInstance(proxyCreds.getClient()), + proxyCreds.getTicket()); + } else { + return initiator; + } + } catch (KrbException | IOException e) { + throw new GSSException(GSSException.DEFECTIVE_CREDENTIAL, -1, + "Cannot create proxy credential"); + } + } } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java --- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5Util.java Wed Oct 23 14:01:17 2019 -0400 @@ -60,11 +60,8 @@ /** * Retrieves the ticket corresponding to the client/server principal * pair from the Subject in the specified AccessControlContext. - * If the ticket can not be found in the Subject, and if - * useSubjectCredsOnly is false, then obtain ticket from - * a LoginContext. */ - static KerberosTicket getTicket(GSSCaller caller, + static KerberosTicket getServiceTicket(GSSCaller caller, String clientPrincipal, String serverPrincipal, AccessControlContext acc) throws LoginException { @@ -74,11 +71,31 @@ SubjectComber.find(accSubj, serverPrincipal, clientPrincipal, KerberosTicket.class); + return ticket; + } + + /** + * Retrieves the initial TGT corresponding to the client principal + * from the Subject in the specified AccessControlContext. + * If the ticket can not be found in the Subject, and if + * useSubjectCredsOnly is false, then obtain ticket from + * a LoginContext. + */ + static KerberosTicket getInitialTicket(GSSCaller caller, + String clientPrincipal, + AccessControlContext acc) throws LoginException { + + // Try to get ticket from acc's Subject + Subject accSubj = Subject.getSubject(acc); + KerberosTicket ticket = + SubjectComber.find(accSubj, null, clientPrincipal, + KerberosTicket.class); + // Try to get ticket from Subject obtained from GSSUtil if (ticket == null && !GSSUtil.useSubjectCredsOnly(caller)) { Subject subject = GSSUtil.login(caller, GSSUtil.GSS_KRB5_MECH_OID); ticket = SubjectComber.find(subject, - serverPrincipal, clientPrincipal, KerberosTicket.class); + null, clientPrincipal, KerberosTicket.class); } return ticket; } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java --- a/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java Wed Oct 23 14:01:17 2019 -0400 @@ -59,13 +59,23 @@ KerberosTime endTime; KerberosTime renewTill; HostAddresses cAddr; - EncryptionKey serviceKey; AuthorizationData authzData; private static boolean DEBUG = Krb5.DEBUG; private static CredentialsCache cache; static boolean alreadyLoaded = false; private static boolean alreadyTried = false; + private Credentials proxy = null; + + public Credentials getProxy() { + return proxy; + } + + public Credentials setProxy(Credentials proxy) { + this.proxy = proxy; + return this; + } + // Read native ticket with session key type in the given list private static native Credentials acquireDefaultNativeCreds(int[] eTypes); @@ -361,20 +371,19 @@ return null; } - sun.security.krb5.internal.ccache.Credentials tgtCred = - ccache.getDefaultCreds(); + Credentials tgtCred = ccache.getInitialCreds(); if (tgtCred == null) { return null; } - if (EType.isSupported(tgtCred.getEType())) { - return tgtCred.setKrbCreds(); + if (EType.isSupported(tgtCred.key.getEType())) { + return tgtCred; } else { if (DEBUG) { System.out.println( ">>> unsupported key type found the default TGT: " + - tgtCred.getEType()); + tgtCred.key.getEType()); } return null; } @@ -409,20 +418,19 @@ cache = CredentialsCache.getInstance(); } if (cache != null) { - sun.security.krb5.internal.ccache.Credentials temp = - cache.getDefaultCreds(); + Credentials temp = cache.getInitialCreds(); if (temp != null) { if (DEBUG) { System.out.println(">>> KrbCreds found the default ticket" + " granting ticket in credential cache."); } - if (EType.isSupported(temp.getEType())) { - result = temp.setKrbCreds(); + if (EType.isSupported(temp.key.getEType())) { + result = temp; } else { if (DEBUG) { System.out.println( ">>> unsupported key type found the default TGT: " + - temp.getEType()); + temp.key.getEType()); } } } @@ -499,10 +507,6 @@ return cache; } - public EncryptionKey getServiceKey() { - return serviceKey; - } - /* * Prints out debug info. */ diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java --- a/src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java Wed Oct 23 14:01:17 2019 -0400 @@ -28,8 +28,6 @@ import javax.security.auth.kerberos.KerberosPrincipal; import javax.security.auth.kerberos.KerberosTicket; import javax.security.auth.kerberos.KeyTab; -import sun.security.krb5.EncryptionKey; -import sun.security.krb5.PrincipalName; /** * An unsafe tunnel to get non-public access to classes in the @@ -49,4 +47,13 @@ public KerberosPrincipal kerberosTicketGetServerAlias(KerberosTicket t); public void kerberosTicketSetServerAlias(KerberosTicket t, KerberosPrincipal a); + /** + * Returns the proxy for a KerberosTicket. + */ + public KerberosTicket kerberosTicketGetProxy(KerberosTicket t); + + /** + * Sets the proxy for a KerberosTicket. + */ + public void kerberosTicketSetProxy(KerberosTicket t, KerberosTicket p); } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/krb5/Realm.java --- a/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/krb5/Realm.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -186,7 +186,6 @@ return false; for (int i = 0; i < name.length(); i++) { if (name.charAt(i) == '/' || - name.charAt(i) == ':' || name.charAt(i) == '\0') { return false; } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Wed Oct 23 14:01:17 2019 -0400 @@ -325,16 +325,13 @@ } /** - * Reads the next cred in stream. - * @return the next cred, null if ticket or second_ticket unparseable. + * Reads the next cred or config entry in stream. + * @return the next cred or config entry, null if data unparseable. * - * Note: MIT krb5 1.8.1 might generate a config entry with server principal - * X-CACHECONF:/krb5_ccache_conf_data/fast_avail/krbtgt/REALM@REALM. The - * entry is used by KDC to inform the client that it support certain - * features. Its ticket is not a valid krb5 ticket and thus this method - * returns null. + * When data is unparseable, this method makes sure the correct number of + * bytes are consumed so it's safe to start reading the next element. */ - Credentials readCred(int version) throws IOException,RealmException, KrbApErrException, Asn1Exception { + Object readCred(int version) throws IOException,RealmException, KrbApErrException, Asn1Exception { PrincipalName cpname = null; try { cpname = readPrincipal(version); @@ -396,12 +393,23 @@ } try { + if (spname.getRealmString().equals("X-CACHECONF:")) { + String[] nameParts = spname.getNameStrings(); + if (nameParts[0].equals("krb5_ccache_conf_data")) { + return new CredentialsCache.ConfigEntry(nameParts[1], + nameParts.length > 2 ? new PrincipalName(nameParts[2]) : null, + ticketData); + } + } return new Credentials(cpname, spname, key, authtime, starttime, - endtime, renewTill, skey, tFlags, - addrs, auData, - ticketData != null ? new Ticket(ticketData) : null, - ticketData2 != null ? new Ticket(ticketData2) : null); + endtime, renewTill, skey, tFlags, + addrs, auData, + ticketData != null ? new Ticket(ticketData) : null, + ticketData2 != null ? new Ticket(ticketData2) : null); } catch (Exception e) { // If any of new Ticket(*) fails. + if (DEBUG) { + e.printStackTrace(System.out); + } return null; } } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java Wed Oct 23 14:01:17 2019 -0400 @@ -31,7 +31,6 @@ package sun.security.krb5.internal.ccache; import java.io.IOException; -import java.io.FileOutputStream; import java.io.OutputStream; import sun.security.krb5.internal.util.KrbDataOutputStream; import sun.security.krb5.*; @@ -98,6 +97,21 @@ writeTicket(creds.secondTicket); } + public void addConfigEntry(PrincipalName cname, CredentialsCache.ConfigEntry e) + throws IOException { + cname.writePrincipal(this); + e.getSName().writePrincipal(this); + write16(0); write16(0); write32(0); + write32(0); write32(0); write32(0); write32(0); + write8(0); + write32(0); + write32(0); + write32(0); + write32(e.getData().length); + write(e.getData()); + write32(0); + } + void writeTicket(Ticket t) throws IOException, Asn1Exception { if (t == null) { write32(0); diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java Wed Oct 23 14:01:17 2019 -0400 @@ -169,6 +169,18 @@ return sname; } + public Ticket getTicket() throws RealmException { + return ticket; + } + + public PrincipalName getServicePrincipal2() throws RealmException { + return secondTicket == null ? null : secondTicket.sname; + } + + public PrincipalName getClientPrincipal() throws RealmException { + return cname; + } + public sun.security.krb5.Credentials setKrbCreds() { // Note: We will not pass authorizationData to s.s.k.Credentials. The // field in that class will be passed to Krb5Context as the return @@ -209,7 +221,15 @@ return key.getEType(); } + public EncryptionKey getKey() { + return key; + } + public int getTktEType() { return ticket.encPart.getEType(); } + + public int getTktEType2() { + return (secondTicket == null) ? 0 : secondTicket.encPart.getEType(); + } } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java Wed Oct 23 14:01:17 2019 -0400 @@ -32,14 +32,9 @@ import sun.security.krb5.*; import sun.security.krb5.internal.*; -import java.util.StringTokenizer; -import java.util.Vector; + +import java.util.List; import java.io.IOException; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.BufferedReader; -import java.io.InputStreamReader; /** * CredentialsCache stores credentials(tickets, session keys, etc) in a semi-permanent store @@ -120,6 +115,62 @@ public abstract void save() throws IOException, KrbException; public abstract Credentials[] getCredsList(); public abstract Credentials getDefaultCreds(); + public abstract sun.security.krb5.Credentials getInitialCreds(); public abstract Credentials getCreds(PrincipalName sname); public abstract Credentials getCreds(LoginOptions options, PrincipalName sname); + public abstract void addConfigEntry(ConfigEntry e); + public abstract List getConfigEntries(); + + public ConfigEntry getConfigEntry(String name) { + List entries = getConfigEntries(); + if (entries != null) { + for (ConfigEntry e : entries) { + if (e.getName().equals(name)) { + return e; + } + } + } + return null; + } + + public static class ConfigEntry { + + public ConfigEntry(String name, PrincipalName princ, byte[] data) { + this.name = name; + this.princ = princ; + this.data = data; + } + + private final String name; + private final PrincipalName princ; + private final byte[] data; // not worth cloning + + public String getName() { + return name; + } + + public PrincipalName getPrinc() { + return princ; + } + + public byte[] getData() { + return data; + } + + @Override + public String toString() { + return name + (princ != null ? ("." + princ) : "") + + ": " + new String(data); + } + + public PrincipalName getSName() { + try { + return new PrincipalName("krb5_ccache_conf_data/" + name + + (princ != null ? ("/" + princ) : "") + + "@X-CACHECONF:"); + } catch (RealmException e) { + throw new AssertionError(e); + } + } + } } diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -36,6 +36,12 @@ import sun.security.action.GetPropertyAction; import sun.security.krb5.*; import sun.security.krb5.internal.*; +import sun.security.util.SecurityProperties; + +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.StringTokenizer; import java.util.Vector; import java.io.IOException; @@ -182,9 +188,13 @@ primaryPrincipal = p; credentialsList = new Vector(); while (cis.available() > 0) { - Credentials cred = cis.readCred(version); + Object cred = cis.readCred(version); if (cred != null) { - credentialsList.addElement(cred); + if (cred instanceof Credentials) { + credentialsList.addElement((Credentials)cred); + } else { + addConfigEntry((CredentialsCache.ConfigEntry)cred); + } } } } @@ -255,6 +265,9 @@ cos.addCreds(tmp[i]); } } + for (ConfigEntry e : getConfigEntries()) { + cos.addConfigEntry(primaryPrincipal, e); + } } } @@ -307,6 +320,17 @@ } } + private List configEntries = new ArrayList<>(); + + @Override + public void addConfigEntry(ConfigEntry e) { + configEntries.add(e); + } + + @Override + public List getConfigEntries() { + return Collections.unmodifiableList(configEntries); + } /** * Gets a credentials for a specified service. @@ -326,6 +350,81 @@ return null; } + public sun.security.krb5.Credentials getInitialCreds() { + + Credentials defaultCreds = getDefaultCreds(); + if (defaultCreds == null) { + return null; + } + sun.security.krb5.Credentials tgt = defaultCreds.setKrbCreds(); + + CredentialsCache.ConfigEntry entry = getConfigEntry("proxy_impersonator"); + if (entry == null) { + if (DEBUG) { + System.out.println("get normal credential"); + } + return tgt; + } + + boolean force; + String prop = SecurityProperties.privilegedGetOverridable( + "jdk.security.krb5.default.initiate.credential"); + if (prop == null) { + prop = "always-impersonate"; + } + switch (prop) { + case "no-impersonate": // never try impersonation + if (DEBUG) { + System.out.println("get normal credential"); + } + return tgt; + case "try-impersonate": + force = false; + break; + case "always-impersonate": + force = true; + break; + default: + throw new RuntimeException( + "Invalid jdk.security.krb5.default.initiate.credential"); + } + + try { + PrincipalName service = new PrincipalName( + new String(entry.getData(), StandardCharsets.UTF_8)); + if (!tgt.getClient().equals(service)) { + if (DEBUG) { + System.out.println("proxy_impersonator does not match service name"); + } + return force ? null : tgt; + } + PrincipalName client = getPrimaryPrincipal(); + Credentials proxy = null; + for (Credentials c : getCredsList()) { + if (c.getClientPrincipal().equals(client) + && c.getServicePrincipal().equals(service)) { + proxy = c; + break; + } + } + if (proxy == null) { + if (DEBUG) { + System.out.println("Cannot find evidence ticket in ccache"); + } + return force ? null : tgt; + } + if (DEBUG) { + System.out.println("Get proxied credential"); + } + return tgt.setProxy(proxy.setKrbCreds()); + } catch (KrbException e) { + if (DEBUG) { + System.out.println("Impersonation with ccache failed"); + } + return force ? null : tgt; + } + } + public Credentials getDefaultCreds() { Credentials[] list = getCredsList(); if (list == null) { diff -r bc43733cd5cf -r 015949faea55 src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java --- a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -31,6 +31,8 @@ package sun.security.krb5.internal.tools; import java.net.InetAddress; +import java.util.List; + import sun.security.krb5.*; import sun.security.krb5.internal.*; import sun.security.krb5.internal.ccache.*; @@ -249,6 +251,8 @@ String endtime; String renewTill; String servicePrincipal; + PrincipalName servicePrincipal2; + String clientPrincipal; if (creds[i].getStartTime() != null) { starttime = format(creds[i].getStartTime()); } else { @@ -260,6 +264,18 @@ System.out.println("[" + (i + 1) + "] " + " Service Principal: " + servicePrincipal); + servicePrincipal2 = + creds[i].getServicePrincipal2(); + if (servicePrincipal2 != null) { + System.out.println(" Second Service: " + + servicePrincipal2); + } + clientPrincipal = + creds[i].getClientPrincipal().toString(); + if (!clientPrincipal.equals(defaultPrincipal)) { + System.out.println(" Client Principal: " + + clientPrincipal); + } System.out.println(" Valid starting: " + starttime); System.out.println(" Expires: " + endtime); if (creds[i].getRenewTill() != null) { @@ -270,8 +286,15 @@ if (options[0] == 'e') { String eskey = EType.toString(creds[i].getEType()); String etkt = EType.toString(creds[i].getTktEType()); - System.out.println(" EType (skey, tkt): " - + eskey + ", " + etkt); + if (creds[i].getTktEType2() == 0) { + System.out.println(" EType (skey, tkt): " + + eskey + ", " + etkt); + } else { + String etkt2 = EType.toString(creds[i].getTktEType2()); + System.out.println(" EType (skey, tkts): " + + eskey + ", " + etkt + + ", " + etkt2); + } } if (options[1] == 'f') { System.out.println(" Flags: " + @@ -310,6 +333,15 @@ } else { System.out.println("\nNo entries found."); } + + List configEntries + = cache.getConfigEntries(); + if (configEntries != null && !configEntries.isEmpty()) { + System.out.println("\nConfig entries:"); + for (CredentialsCache.ConfigEntry e : configEntries) { + System.out.println(" " + e); + } + } } void displayMessage(String target) { diff -r bc43733cd5cf -r 015949faea55 src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java --- a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java Wed Oct 23 14:01:17 2019 -0400 @@ -134,7 +134,8 @@ } public XMLDSigRI() { - /* We are the XMLDSig provider */ + // This is the JDK XMLDSig provider, synced from + // Apache Santuario XML Security for Java, version 2.1.3 super("XMLDSig", VER, INFO); final Provider p = this; diff -r bc43733cd5cf -r 015949faea55 src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java --- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java Wed Oct 23 14:01:17 2019 -0400 @@ -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. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -40,7 +40,7 @@ * The XPath class wraps an expression object and provides general services * for execution of that expression. * @xsl.usage advanced - * @LastModified: Oct 2017 + * @LastModified: May 2019 */ public class XPath implements Serializable, ExpressionOwner { @@ -179,10 +179,12 @@ else if (MATCH == type) parser.initMatchPattern(compiler, exprString, prefixResolver); else - throw new RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_DEAL_XPATH_TYPE, new Object[]{Integer.toString(type)})); //"Can not deal with XPath type: " + type); + throw new RuntimeException(XSLMessages.createXPATHMessage( + XPATHErrorResources.ER_CANNOT_DEAL_XPATH_TYPE, + new Object[]{Integer.toString(type)})); // System.out.println("----------------"); - Expression expr = compiler.compile(0); + Expression expr = compiler.compileExpression(0); // System.out.println("expr: "+expr); this.setExpression(expr); @@ -234,7 +236,7 @@ //"Can not deal with XPath type: " + type); // System.out.println("----------------"); - Expression expr = compiler.compile(0); + Expression expr = compiler.compileExpression(0); // System.out.println("expr: "+expr); this.setExpression(expr); diff -r bc43733cd5cf -r 015949faea55 src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java --- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java Wed Oct 23 14:01:17 2019 -0400 @@ -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. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -37,7 +37,7 @@ * Walker for the OP_VARIABLE, or OP_EXTFUNCTION, or OP_FUNCTION, or OP_GROUP, * op codes. * @see XPath FilterExpr descriptions - * @LastModified: Oct 2017 + * @LastModified: May 2019 */ public class FilterExprWalker extends AxesWalker { @@ -77,7 +77,7 @@ m_mustHardReset = true; case OpCodes.OP_GROUP : case OpCodes.OP_VARIABLE : - m_expr = compiler.compile(opPos); + m_expr = compiler.compileExpression(opPos); m_expr.exprSetParent(this); //if((OpCodes.OP_FUNCTION == stepType) && (m_expr instanceof com.sun.org.apache.xalan.internal.templates.FuncKey)) if(m_expr instanceof com.sun.org.apache.xpath.internal.operations.Variable) @@ -87,7 +87,7 @@ } break; default : - m_expr = compiler.compile(opPos + 2); + m_expr = compiler.compileExpression(opPos + 2); m_expr.exprSetParent(this); } // if(m_expr instanceof WalkingIterator) diff -r bc43733cd5cf -r 015949faea55 src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java --- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java Wed Oct 23 14:01:17 2019 -0400 @@ -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. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -41,7 +41,7 @@ * which are built from the opcode map output, and an analysis engine * for the location path expressions in order to provide optimization hints. * - * @LastModified: Oct 2017 + * @LastModified: May 2019 */ public class WalkerFactory { @@ -1008,10 +1008,10 @@ case OpCodes.OP_EXTFUNCTION : case OpCodes.OP_FUNCTION : case OpCodes.OP_GROUP : - expr = compiler.compile(opPos); + expr = compiler.compileExpression(opPos); break; default : - expr = compiler.compile(opPos + 2); + expr = compiler.compileExpression(opPos + 2); } axis = Axis.FILTEREDLIST; diff -r bc43733cd5cf -r 015949faea55 src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java --- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,6 +1,5 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -70,9 +69,12 @@ * of operation codes (op map) and then builds from that into an Expression * tree. * @xsl.usage advanced + * @LastModified: May 2019 */ public class Compiler extends OpMap { + // count the number of operations or calls to compileOperation + int countOp; /** * Construct a Compiler object with a specific ErrorListener and @@ -106,15 +108,40 @@ /** * Execute the XPath object from a given opcode position. + * + * Note that this method is added so that when StackOverflowError is caught + * the address space can be freed to this point allowing further activities + * such as reporting the error. + * * @param opPos The current position in the xpath.m_opMap array. * @return The result of the XPath. * * @throws TransformerException if there is a syntax or other error. * @xsl.usage advanced */ - public Expression compile(int opPos) throws TransformerException + public Expression compileExpression(int opPos) throws TransformerException + { + try { + countOp = 0; + return compile(opPos); + } catch (StackOverflowError sof) { + error(XPATHErrorResources.ER_COMPILATION_TOO_MANY_OPERATION, new Object[]{countOp}); + } + return null; + } + + /** + * This method handles the actual compilation process. It is called from the + * compileExpression method as well as the subsequent processes. See the note + * for compileExpression. + * + * @param opPos The current position in the xpath.m_opMap array. + * @return The result of the XPath. + * + * @throws TransformerException if there is a syntax or other error. + */ + private Expression compile(int opPos) throws TransformerException { - int op = getOp(opPos); Expression expr = null; @@ -210,6 +237,7 @@ private Expression compileOperation(Operation operation, int opPos) throws TransformerException { + ++countOp; int leftPos = getFirstChildPos(opPos); int rightPos = getNextOpPos(leftPos); diff -r bc43733cd5cf -r 015949faea55 src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java --- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java Wed Oct 23 14:01:17 2019 -0400 @@ -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. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -34,6 +34,7 @@ * Tokenizes and parses XPath expressions. This should really be named * XPathParserImpl, and may be renamed in the future. * @xsl.usage general + * @LastModified: May 2019 */ public class XPathParser { @@ -71,6 +72,9 @@ protected final static int FILTER_MATCH_PRIMARY = 1; protected final static int FILTER_MATCH_PREDICATES = 2; + // counts open predicates + private int countPredicate; + /** * The parser constructor. */ @@ -157,6 +161,9 @@ } else throw e; + } catch (StackOverflowError sof) { + error(XPATHErrorResources.ER_PREDICATE_TOO_MANY_OPEN, + new Object[]{m_token, m_queueMark, countPredicate}); } compiler.shrink(); @@ -190,7 +197,12 @@ m_ops.setOp(OpMap.MAPINDEX_LENGTH, 2); nextToken(); - Pattern(); + try { + Pattern(); + } catch (StackOverflowError sof) { + error(XPATHErrorResources.ER_PREDICATE_TOO_MANY_OPEN, + new Object[]{m_token, m_queueMark, countPredicate}); + } if (null != m_token) { @@ -741,7 +753,7 @@ */ protected void Expr() throws javax.xml.transform.TransformerException { - OrExpr(); + OrExpr(); } /** @@ -1883,11 +1895,12 @@ */ protected void Predicate() throws javax.xml.transform.TransformerException { - if (tokenIs('[')) { + countPredicate++; nextToken(); PredicateExpr(); + countPredicate--; consumeExpected(']'); } } diff -r bc43733cd5cf -r 015949faea55 src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java --- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,6 +1,5 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -32,6 +31,7 @@ * Also you need to update the count of messages(MAX_CODE)or * the count of warnings(MAX_WARNING) [ Information purpose only] * @xsl.usage advanced + * @LastModified: May 2019 */ public class XPATHErrorResources extends ListResourceBundle { @@ -150,6 +150,10 @@ "ER_FOUND_COMMA_BUT_NO_FOLLOWING_ARG"; public static final String ER_PREDICATE_ILLEGAL_SYNTAX = "ER_PREDICATE_ILLEGAL_SYNTAX"; + public static final String ER_PREDICATE_TOO_MANY_OPEN = + "ER_PREDICATE_TOO_MANY_OPEN"; + public static final String ER_COMPILATION_TOO_MANY_OPERATION = + "ER_COMPILATION_TOO_MANY_OPERATION"; public static final String ER_ILLEGAL_AXIS_NAME = "ER_ILLEGAL_AXIS_NAME"; public static final String ER_UNKNOWN_NODETYPE = "ER_UNKNOWN_NODETYPE"; public static final String ER_PATTERN_LITERAL_NEEDS_BE_QUOTED = @@ -464,6 +468,12 @@ { ER_PREDICATE_ILLEGAL_SYNTAX, "'..[predicate]' or '.[predicate]' is illegal syntax. Use 'self::node()[predicate]' instead."}, + { ER_PREDICATE_TOO_MANY_OPEN, + "Stack overflow while parsing {0} at {1}. Too many open predicates({2})."}, + + { ER_COMPILATION_TOO_MANY_OPERATION, + "Stack overflow while compiling the expression. Too many operations({0})."}, + { ER_ILLEGAL_AXIS_NAME, "illegal axis name: {0}"}, diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java --- a/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java Wed Oct 23 14:01:17 2019 -0400 @@ -55,17 +55,25 @@ ExpressionTree getExpression(); /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Returns the labels for this case. * For default case, returns an empty list. * * @return labels for this case * @since 12 * - * @deprecated This method is modeling a case with multiple labels, + * @preview This method is modeling a case with multiple labels, * which is part of a preview feature and may be removed * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) List getExpressions(); /** @@ -78,6 +86,14 @@ List getStatements(); /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * For case with kind {@linkplain CaseKind#RULE}, * returns the statement or expression after the arrow. * Returns {@code null} for case with kind @@ -85,32 +101,41 @@ * * @return case value or null * @since 12 - * - * @deprecated This method is modeling a rule case, - * which is part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) public default Tree getBody() { return null; } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Returns the kind of this case. * * @return the kind of this case * @since 12 - * - * @deprecated This method is used to model a rule case, - * which is part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public default CaseKind getCaseKind() { return CaseKind.STATEMENT; } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This enum is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * The syntatic form of this case: *

    *
  • STATEMENT: {@code case : }
    • @@ -118,12 +143,9 @@ *
* * @since 12 - * - * @deprecated This enum is used to model a rule case, - * which is part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public enum CaseKind { /** * Case is in the form: {@code case : }. diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java --- a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java Wed Oct 23 14:01:17 2019 -0400 @@ -28,6 +28,14 @@ import java.util.List; /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This interface is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * A tree node for a {@code switch} expression. * * For example: @@ -40,12 +48,8 @@ * @jls 15.29 Switch Expressions * * @since 12 - * - * @deprecated This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ -@Deprecated(forRemoval=true, since="12") +@jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) public interface SwitchExpressionTree extends ExpressionTree { /** * Returns the expression for the {@code switch} expression. diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java --- a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java Wed Oct 23 14:01:17 2019 -0400 @@ -240,17 +240,20 @@ SWITCH(SwitchTree.class), /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This enum constant is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Used for instances of {@link SwitchExpressionTree}. * * @since 12 - * - * @deprecated - * This enum constant is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") SWITCH_EXPRESSION(SwitchExpressionTree.class), /** @@ -659,17 +662,20 @@ OTHER(null), /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This enum constant is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Used for instances of {@link YieldTree}. * * @since 13 - * - * @deprecated - * This enum constant is modeling yield statement, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="13") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") YIELD(YieldTree.class); diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java --- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java Wed Oct 23 14:01:17 2019 -0400 @@ -354,20 +354,23 @@ R visitSwitch(SwitchTree node, P p); /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Visits a SwitchExpressionTree node. * * @param node the node being visited * @param p a parameter value * @return a result value * @since 12 - * - * @deprecated - * This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") R visitSwitchExpression(SwitchExpressionTree node, P p); /** @@ -557,18 +560,21 @@ R visitOther(Tree node, P p); /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Visits a YieldTree node. * @param node the node being visited * @param p a parameter value * @return a result value * @since 13 - * - * @deprecated - * This method is modeling yield statement, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="13") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") R visitYield(YieldTree node, P p); } diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java --- a/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java Wed Oct 23 14:01:17 2019 -0400 @@ -26,6 +26,14 @@ package com.sun.source.tree; /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * A tree node for a {@code yield} statement. * * For example: @@ -36,12 +44,8 @@ * @jls section TODO * * @since 13 - * - * @deprecated This class is modeling yield from switch expressions, - * which are part of a preview feature and may be removed if - * the preview feature is removed. */ -@Deprecated(forRemoval=true, since="13") +@jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) public interface YieldTree extends StatementTree { /** diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java --- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java Wed Oct 23 14:01:17 2019 -0400 @@ -264,20 +264,23 @@ } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * {@inheritDoc} This implementation calls {@code defaultAction}. * * @param node {@inheritDoc} * @param p {@inheritDoc} * @return the result of {@code defaultAction} - * - * @deprecated - * This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ @Override - @Deprecated(forRemoval=true, since="12") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public R visitSwitchExpression(SwitchExpressionTree node, P p) { return defaultAction(node, p); } @@ -791,8 +794,8 @@ * @return the result of {@code defaultAction} */ @Override - @Deprecated(forRemoval=true, since="13") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public R visitYield(YieldTree node, P p) { return defaultAction(node, p); } diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java --- a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java Wed Oct 23 14:01:17 2019 -0400 @@ -26,7 +26,6 @@ package com.sun.source.util; import com.sun.source.tree.*; -import com.sun.source.tree.CaseTree.CaseKind; /** * A TreeVisitor that visits all the child tree nodes. @@ -335,20 +334,23 @@ } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * {@inheritDoc} This implementation scans the children in left to right order. * * @param node {@inheritDoc} * @param p {@inheritDoc} * @return the result of scanning - * - * @deprecated - * This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ @Override - @Deprecated(forRemoval=true, since="12") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public R visitSwitchExpression(SwitchExpressionTree node, P p) { R r = scan(node.getExpression(), p); r = scanAndReduce(node.getCases(), p, r); @@ -363,10 +365,10 @@ * @return the result of scanning */ @Override - @SuppressWarnings("removal") + @SuppressWarnings("preview") public R visitCase(CaseTree node, P p) { R r = scan(node.getExpressions(), p); - if (node.getCaseKind() == CaseKind.RULE) + if (node.getCaseKind() == CaseTree.CaseKind.RULE) r = scanAndReduce(node.getBody(), p, r); else r = scanAndReduce(node.getStatements(), p, r); @@ -936,20 +938,23 @@ } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * {@inheritDoc} This implementation returns {@code null}. * * @param node {@inheritDoc} * @param p {@inheritDoc} * @return the result of scanning - * - * @deprecated - * This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ @Override - @Deprecated(forRemoval=true, since="13") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public R visitYield(YieldTree node, P p) { return scan(node.getValue(), p); } diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java Wed Oct 23 14:01:17 2019 -0400 @@ -52,6 +52,7 @@ import com.sun.source.util.TaskListener; import com.sun.source.util.TreeScanner; import com.sun.tools.javac.code.Kinds; +import com.sun.tools.javac.code.Preview; import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.code.Symtab; import com.sun.tools.javac.code.Type; @@ -257,6 +258,8 @@ ((ReusableJavaCompiler)ReusableJavaCompiler.instance(this)).clear(); Types.instance(this).newRound(); Check.instance(this).newRound(); + Check.instance(this).clear(); //clear mandatory warning handlers + Preview.instance(this).clear(); //clear mandatory warning handlers Modules.instance(this).newRound(); Annotate.instance(this).newRound(); CompileStates.instance(this).clear(); diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java Wed Oct 23 14:01:17 2019 -0400 @@ -286,7 +286,17 @@ /** * Flag to indicate the given ModuleSymbol is an automatic module. */ - public static final long AUTOMATIC_MODULE = 1L<<52; + public static final long AUTOMATIC_MODULE = 1L<<52; //ModuleSymbols only + + /** + * Flag to indicate the given PackageSymbol contains any non-.java and non-.class resources. + */ + public static final long HAS_RESOURCE = 1L<<52; //PackageSymbols only + + /** + * Flag to indicate the given ParamSymbol has a user-friendly name filled. + */ + public static final long NAME_FILLED = 1L<<52; //ParamSymbols only /** * Flag to indicate the given ModuleSymbol is a system module. @@ -304,9 +314,9 @@ public static final long DEPRECATED_REMOVAL = 1L<<55; /** - * Flag to indicate the given PackageSymbol contains any non-.java and non-.class resources. + * Flag to indicate the API element in question is for a preview API. */ - public static final long HAS_RESOURCE = 1L<<56; + public static final long PREVIEW_API = 1L<<56; //any Symbol kind /** * Flag for synthesized default constructors of anonymous classes that have an enclosing expression. @@ -320,9 +330,9 @@ public static final long BODY_ONLY_FINALIZE = 1L<<17; //blocks only /** - * Flag to indicate the given ParamSymbol has a user-friendly name filled. + * Flag to indicate the API element in question is for a preview API. */ - public static final long NAME_FILLED = 1L<<58; //ParamSymbols only + public static final long PREVIEW_ESSENTIAL_API = 1L<<58; //any Symbol kind /** Modifier masks. */ @@ -441,7 +451,9 @@ HAS_RESOURCE(Flags.HAS_RESOURCE), POTENTIALLY_AMBIGUOUS(Flags.POTENTIALLY_AMBIGUOUS), ANONCONSTR_BASED(Flags.ANONCONSTR_BASED), - NAME_FILLED(Flags.NAME_FILLED); + NAME_FILLED(Flags.NAME_FILLED), + PREVIEW_API(Flags.PREVIEW_API), + PREVIEW_ESSENTIAL_API(Flags.PREVIEW_ESSENTIAL_API); Flag(long flag) { this.value = flag; diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java Wed Oct 23 14:01:17 2019 -0400 @@ -122,6 +122,9 @@ values.add(LintCategory.OPENS); values.add(LintCategory.MODULE); values.add(LintCategory.REMOVAL); + if (!options.isSet(Option.PREVIEW)) { + values.add(LintCategory.PREVIEW); + } } // Look for specific overrides diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java Wed Oct 23 14:01:17 2019 -0400 @@ -27,7 +27,6 @@ import com.sun.tools.javac.code.Lint.LintCategory; import com.sun.tools.javac.code.Source.Feature; -import com.sun.tools.javac.comp.Infer; import com.sun.tools.javac.jvm.Target; import com.sun.tools.javac.resources.CompilerProperties.Errors; import com.sun.tools.javac.resources.CompilerProperties.Warnings; @@ -36,17 +35,14 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import com.sun.tools.javac.util.JCDiagnostic.Error; import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition; +import com.sun.tools.javac.util.JCDiagnostic.Warning; import com.sun.tools.javac.util.Log; import com.sun.tools.javac.util.MandatoryWarningHandler; -import com.sun.tools.javac.util.Name; import com.sun.tools.javac.util.Options; import javax.tools.JavaFileObject; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Optional; -import java.util.Set; import static com.sun.tools.javac.main.Option.PREVIEW; @@ -62,7 +58,7 @@ */ public class Preview { - /** flag: are preview featutres enabled */ + /** flag: are preview features enabled */ private final boolean enabled; /** the diag handler to manage preview feature usage diagnostics */ @@ -151,6 +147,10 @@ } } + public void reportPreviewWarning(DiagnosticPosition pos, Warning warnKey) { + previewHandler.report(pos, warnKey); + } + /** * Are preview features enabled? * @return true, if preview features are enabled. @@ -206,4 +206,9 @@ public void reportDeferredDiagnostics() { previewHandler.reportDeferredDiagnostic(); } + + public void clear() { + previewHandler.clear(); + } + } diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java Wed Oct 23 14:01:17 2019 -0400 @@ -378,6 +378,10 @@ return (flags_field & DEPRECATED_REMOVAL) != 0; } + public boolean isPreviewApi() { + return (flags_field & PREVIEW_API) != 0; + } + public boolean isDeprecatableViaAnnotation() { switch (getKind()) { case LOCAL_VARIABLE: diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java Wed Oct 23 14:01:17 2019 -0400 @@ -214,6 +214,7 @@ public final Type documentedType; public final Type elementTypeType; public final Type functionalInterfaceType; + public final Type previewFeatureType; /** The symbol representing the length field of an array. */ @@ -570,6 +571,7 @@ lambdaMetafactory = enterClass("java.lang.invoke.LambdaMetafactory"); stringConcatFactory = enterClass("java.lang.invoke.StringConcatFactory"); functionalInterfaceType = enterClass("java.lang.FunctionalInterface"); + previewFeatureType = enterClass("jdk.internal.PreviewFeature"); synthesizeEmptyInterfaceIfMissing(autoCloseableType); synthesizeEmptyInterfaceIfMissing(cloneableType); diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java Wed Oct 23 14:01:17 2019 -0400 @@ -364,12 +364,17 @@ && (toAnnotate.kind == MDL || toAnnotate.owner.kind != MTH) && types.isSameType(c.type, syms.deprecatedType)) { toAnnotate.flags_field |= (Flags.DEPRECATED | Flags.DEPRECATED_ANNOTATION); - Attribute fr = c.member(names.forRemoval); - if (fr instanceof Attribute.Constant) { - Attribute.Constant v = (Attribute.Constant) fr; - if (v.type == syms.booleanType && ((Integer) v.value) != 0) { - toAnnotate.flags_field |= Flags.DEPRECATED_REMOVAL; - } + if (isAttributeTrue(c.member(names.forRemoval))) { + toAnnotate.flags_field |= Flags.DEPRECATED_REMOVAL; + } + } + + // Note: @Deprecated has no effect on local variables and parameters + if (!c.type.isErroneous() + && types.isSameType(c.type, syms.previewFeatureType)) { + toAnnotate.flags_field |= Flags.PREVIEW_API; + if (isAttributeTrue(c.member(names.essentialAPI))) { + toAnnotate.flags_field |= Flags.PREVIEW_ESSENTIAL_API; } } } @@ -397,6 +402,16 @@ toAnnotate.setDeclarationAttributes(attrs); } } + //where: + private boolean isAttributeTrue(Attribute attr) { + if (attr instanceof Attribute.Constant) { + Attribute.Constant v = (Attribute.Constant) attr; + if (v.type == syms.booleanType && ((Integer) v.value) != 0) { + return true; + } + } + return false; + } /** * Attribute and store a semantic representation of the annotation tree {@code tree} into the diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Wed Oct 23 14:01:17 2019 -0400 @@ -32,7 +32,7 @@ import javax.lang.model.element.ElementKind; import javax.tools.JavaFileObject; -import com.sun.source.tree.CaseTree.CaseKind; +import com.sun.source.tree.CaseTree; import com.sun.source.tree.IdentifierTree; import com.sun.source.tree.MemberReferenceTree.ReferenceMode; import com.sun.source.tree.MemberSelectTree; @@ -1486,8 +1486,8 @@ // check that there are no duplicate case labels or default clauses. Set labels = new HashSet<>(); // The set of case labels. boolean hasDefault = false; // Is there a default label? - @SuppressWarnings("removal") - CaseKind caseKind = null; + @SuppressWarnings("preview") + CaseTree.CaseKind caseKind = null; boolean wasError = false; for (List l = cases; l.nonEmpty(); l = l.tail) { JCCase c = l.head; @@ -4092,6 +4092,7 @@ chk.checkDeprecated(tree.pos(), env.info.scope.owner, sym); chk.checkSunAPI(tree.pos(), sym); chk.checkProfile(tree.pos(), sym); + chk.checkPreview(tree.pos(), sym); } // If symbol is a variable, check that its type and diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Wed Oct 23 14:01:17 2019 -0400 @@ -93,6 +93,7 @@ private final Source source; private final Target target; private final Profile profile; + private final Preview preview; private final boolean warnOnAnyAccessToMembers; // The set of lint options currently in effect. It is initialized @@ -139,6 +140,7 @@ syntheticNameChar = target.syntheticNameChar(); profile = Profile.instance(context); + preview = Preview.instance(context); boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION); boolean verboseRemoval = lint.isEnabled(LintCategory.REMOVAL); @@ -224,6 +226,23 @@ } } + /** Warn about deprecated symbol. + * @param pos Position to be used for error reporting. + * @param sym The deprecated symbol. + */ + void warnPreview(DiagnosticPosition pos, Symbol sym) { + warnPreview(pos, Warnings.IsPreview(sym)); + } + + /** Log a preview warning. + * @param pos Position to be used for error reporting. + * @param msg A Warning describing the problem. + */ + public void warnPreview(DiagnosticPosition pos, Warning warnKey) { + if (!lint.isSuppressed(LintCategory.PREVIEW)) + preview.reportPreviewWarning(pos, warnKey); + } + /** Warn about unchecked operation. * @param pos Position to be used for error reporting. * @param msg A string describing the problem. @@ -434,6 +453,13 @@ localClassNameIndexes.clear(); } + public void clear() { + deprecationHandler.clear(); + removalHandler.clear(); + uncheckedHandler.clear(); + sunApiHandler.clear(); + } + public void putCompiled(ClassSymbol csym) { compiled.put(Pair.of(csym.packge().modle, csym.flatname), csym); } @@ -3290,6 +3316,16 @@ } } + void checkPreview(DiagnosticPosition pos, Symbol s) { + if ((s.flags() & PREVIEW_API) != 0) { + if ((s.flags() & PREVIEW_ESSENTIAL_API) != 0 && !preview.isEnabled()) { + log.error(pos, Errors.IsPreview(s)); + } else { + deferredLintHandler.report(() -> warnPreview(pos, s)); + } + } + } + /* ************************************************************************* * Check for recursive annotation elements. **************************************************************************/ diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java Wed Oct 23 14:01:17 2019 -0400 @@ -30,7 +30,6 @@ import java.util.function.Function; import java.util.stream.Stream; -import com.sun.source.tree.CaseTree.CaseKind; import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.Kinds.KindSelector; import com.sun.tools.javac.code.Scope.WriteableScope; diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java Wed Oct 23 14:01:17 2019 -0400 @@ -2819,6 +2819,7 @@ typeargtypes, allowBoxing, useVarargs); chk.checkDeprecated(pos, env.info.scope.owner, sym); + chk.checkPreview(pos, sym); return sym; } diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java Wed Oct 23 14:01:17 2019 -0400 @@ -1156,19 +1156,26 @@ JCAnnotation a = al.head; if (a.annotationType.type == syms.deprecatedType) { sym.flags_field |= (Flags.DEPRECATED | Flags.DEPRECATED_ANNOTATION); - a.args.stream() - .filter(e -> e.hasTag(ASSIGN)) - .map(e -> (JCAssign) e) - .filter(assign -> TreeInfo.name(assign.lhs) == names.forRemoval) - .findFirst() - .ifPresent(assign -> { - JCExpression rhs = TreeInfo.skipParens(assign.rhs); - if (rhs.hasTag(LITERAL) - && Boolean.TRUE.equals(((JCLiteral) rhs).getValue())) { - sym.flags_field |= DEPRECATED_REMOVAL; - } - }); + setFlagIfAttributeTrue(a, sym, names.forRemoval, DEPRECATED_REMOVAL); + } else if (a.annotationType.type == syms.previewFeatureType) { + sym.flags_field |= Flags.PREVIEW_API; + setFlagIfAttributeTrue(a, sym, names.essentialAPI, PREVIEW_ESSENTIAL_API); } } } + //where: + private void setFlagIfAttributeTrue(JCAnnotation a, Symbol sym, Name attribute, long flag) { + a.args.stream() + .filter(e -> e.hasTag(ASSIGN)) + .map(e -> (JCAssign) e) + .filter(assign -> TreeInfo.name(assign.lhs) == attribute) + .findFirst() + .ifPresent(assign -> { + JCExpression rhs = TreeInfo.skipParens(assign.rhs); + if (rhs.hasTag(LITERAL) + && Boolean.TRUE.equals(((JCLiteral) rhs).getValue())) { + sym.flags_field |= flag; + } + }); + } } diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java Wed Oct 23 14:01:17 2019 -0400 @@ -44,6 +44,7 @@ import java.nio.file.Path; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Objects; @@ -173,6 +174,10 @@ private long lastUsedTime = System.currentTimeMillis(); protected long deferredCloseTimeout = 0; + public void clear() { + new HashSet<>(options.keySet()).forEach(k -> options.remove(k)); + } + protected ClassLoader getClassLoader(URL[] urls) { ClassLoader thisClassLoader = getClass().getClassLoader(); diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Wed Oct 23 14:01:17 2019 -0400 @@ -1395,20 +1395,27 @@ repeatable = proxy; } else if (proxy.type.tsym == syms.deprecatedType.tsym) { sym.flags_field |= (DEPRECATED | DEPRECATED_ANNOTATION); - for (Pair v : proxy.values) { - if (v.fst == names.forRemoval && v.snd instanceof Attribute.Constant) { - Attribute.Constant c = (Attribute.Constant)v.snd; - if (c.type == syms.booleanType && ((Integer)c.value) != 0) { - sym.flags_field |= DEPRECATED_REMOVAL; - } - } - } + setFlagIfAttributeTrue(proxy, sym, names.forRemoval, DEPRECATED_REMOVAL); + } else if (proxy.type.tsym == syms.previewFeatureType.tsym) { + sym.flags_field |= PREVIEW_API; + setFlagIfAttributeTrue(proxy, sym, names.essentialAPI, PREVIEW_ESSENTIAL_API); } proxies.append(proxy); } } annotate.normal(new AnnotationCompleter(sym, proxies.toList())); } + //where: + private void setFlagIfAttributeTrue(CompoundAnnotationProxy proxy, Symbol sym, Name attribute, long flag) { + for (Pair v : proxy.values) { + if (v.fst == attribute && v.snd instanceof Attribute.Constant) { + Attribute.Constant c = (Attribute.Constant)v.snd; + if (c.type == syms.booleanType && ((Integer)c.value) != 0) { + sym.flags_field |= flag; + } + } + } + } /** Read parameter annotations. */ diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Wed Oct 23 14:01:17 2019 -0400 @@ -29,7 +29,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import com.sun.source.tree.CaseTree.CaseKind; +import com.sun.source.tree.CaseTree; import com.sun.source.tree.MemberReferenceTree.ReferenceMode; import com.sun.source.tree.ModuleTree.ModuleKind; @@ -1432,8 +1432,8 @@ } List stats = null; JCTree body = null; - @SuppressWarnings("removal") - CaseKind kind; + @SuppressWarnings("preview") + CaseTree.CaseKind kind; switch (token.kind) { case ARROW: checkSourceLevel(Feature.SWITCH_RULE); @@ -2897,8 +2897,8 @@ nextToken(); checkSourceLevel(Feature.SWITCH_MULTIPLE_CASE_LABELS); }; - @SuppressWarnings("removal") - CaseKind caseKind; + @SuppressWarnings("preview") + CaseTree.CaseKind caseKind; JCTree body = null; if (token.kind == ARROW) { checkSourceLevel(Feature.SWITCH_RULE); @@ -2922,8 +2922,8 @@ } case DEFAULT: { nextToken(); - @SuppressWarnings("removal") - CaseKind caseKind; + @SuppressWarnings("preview") + CaseTree.CaseKind caseKind; JCTree body = null; if (token.kind == ARROW) { checkSourceLevel(Feature.SWITCH_RULE); diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Oct 23 14:01:17 2019 -0400 @@ -1775,6 +1775,14 @@ {0} in {1} has been deprecated and marked for removal # 0: symbol +compiler.warn.is.preview=\ + {0} is an API that is part of a preview feature + +# 0: symbol +compiler.err.is.preview=\ + {0} is an API that is part of a preview feature + +# 0: symbol compiler.warn.has.been.deprecated.module=\ module {0} has been deprecated diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java Wed Oct 23 14:01:17 2019 -0400 @@ -47,7 +47,6 @@ import javax.tools.JavaFileManager.Location; -import com.sun.source.tree.CaseTree.CaseKind; import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.tools.javac.code.Directive.ExportsDirective; import com.sun.tools.javac.code.Directive.OpensDirective; @@ -1250,17 +1249,17 @@ public static class JCCase extends JCStatement implements CaseTree { //as CaseKind is deprecated for removal (as it is part of a preview feature), //using indirection through these fields to avoid unnecessary @SuppressWarnings: - @SuppressWarnings("removal") + @SuppressWarnings("preview") public static final CaseKind STATEMENT = CaseKind.STATEMENT; - @SuppressWarnings("removal") + @SuppressWarnings("preview") public static final CaseKind RULE = CaseKind.RULE; - @SuppressWarnings("removal") + @SuppressWarnings("preview") public final CaseKind caseKind; public List pats; public List stats; public JCTree body; public boolean completesNormally; - protected JCCase(@SuppressWarnings("removal") CaseKind caseKind, List pats, + protected JCCase(@SuppressWarnings("preview") CaseKind caseKind, List pats, List stats, JCTree body) { Assert.checkNonNull(pats); Assert.check(pats.isEmpty() || pats.head != null); @@ -1277,18 +1276,18 @@ @Override @DefinedBy(Api.COMPILER_TREE) public JCExpression getExpression() { return pats.head; } @Override @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public List getExpressions() { return pats; } @Override @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public List getStatements() { return caseKind == CaseKind.STATEMENT ? stats : null; } @Override @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public JCTree getBody() { return body; } @Override @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public CaseKind getCaseKind() { return caseKind; } @@ -1305,7 +1304,7 @@ /** * A "switch ( ) { }" construction. */ - @SuppressWarnings("removal") + @SuppressWarnings("preview") public static class JCSwitchExpression extends JCPolyExpression implements SwitchExpressionTree { public JCExpression selector; public List cases; @@ -1586,7 +1585,7 @@ /** * A break-with from a switch expression. */ - @SuppressWarnings("removal") + @SuppressWarnings("preview") public static class JCYield extends JCStatement implements YieldTree { public JCExpression value; public JCTree target; @@ -3105,7 +3104,7 @@ JCLabeledStatement Labelled(Name label, JCStatement body); JCSwitch Switch(JCExpression selector, List cases); JCSwitchExpression SwitchExpression(JCExpression selector, List cases); - JCCase Case(@SuppressWarnings("removal") CaseKind caseKind, List pat, + JCCase Case(@SuppressWarnings("preview") CaseTree.CaseKind caseKind, List pat, List stats, JCTree body); JCSynchronized Synchronized(JCExpression lock, JCBlock body); JCTry Try(JCBlock body, List catchers, JCBlock finalizer); diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java Wed Oct 23 14:01:17 2019 -0400 @@ -27,7 +27,6 @@ import java.io.*; -import com.sun.source.tree.CaseTree.CaseKind; import com.sun.source.tree.MemberReferenceTree.ReferenceMode; import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.tools.javac.code.*; diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java Wed Oct 23 14:01:17 2019 -0400 @@ -144,7 +144,7 @@ } @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public JCTree visitYield(YieldTree node, P p) { JCYield t = (JCYield) node; JCExpression value = copy(t.value, p); @@ -380,7 +380,7 @@ } @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public JCTree visitSwitchExpression(SwitchExpressionTree node, P p) { JCSwitchExpression t = (JCSwitchExpression) node; JCExpression selector = copy(t.selector, p); diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java Wed Oct 23 14:01:17 2019 -0400 @@ -27,7 +27,7 @@ import java.util.Iterator; -import com.sun.source.tree.CaseTree.CaseKind; +import com.sun.source.tree.CaseTree; import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.source.tree.Tree.Kind; import com.sun.tools.javac.code.*; @@ -274,7 +274,7 @@ return tree; } - public JCCase Case(@SuppressWarnings("removal") CaseKind caseKind, List pats, + public JCCase Case(@SuppressWarnings("preview") CaseTree.CaseKind caseKind, List pats, List stats, JCTree body) { JCCase tree = new JCCase(caseKind, pats, stats, body); tree.pos = pos; diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java Wed Oct 23 14:01:17 2019 -0400 @@ -186,18 +186,18 @@ /** * The log to which to report warnings. */ - private Log log; + private final Log log; /** * Whether or not to report individual warnings, or simply to report a * single aggregate warning at the end of the compilation. */ - private boolean verbose; + private final boolean verbose; /** * The common prefix for all I18N message keys generated by this handler. */ - private String prefix; + private final String prefix; /** * A set containing the names of the source files for which specific @@ -262,4 +262,11 @@ else log.note(file, new Note("compiler", msg, args)); } + + public void clear() { + sourcesWithReportedWarnings = null; + deferredDiagnosticKind = null; + deferredDiagnosticSource = null; + deferredDiagnosticArg = null; + } } diff -r bc43733cd5cf -r 015949faea55 src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java Wed Oct 23 14:01:17 2019 -0400 @@ -86,6 +86,7 @@ public final Name error; public final Name finalize; public final Name forRemoval; + public final Name essentialAPI; public final Name getClass; public final Name hasNext; public final Name hashCode; @@ -236,6 +237,7 @@ error = fromString(""); finalize = fromString("finalize"); forRemoval = fromString("forRemoval"); + essentialAPI = fromString("essentialAPI"); getClass = fromString("getClass"); hasNext = fromString("hasNext"); hashCode = fromString("hashCode"); diff -r bc43733cd5cf -r 015949faea55 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java Wed Oct 23 14:01:17 2019 -0400 @@ -130,10 +130,19 @@ if (c.contains(pc)) { CodeBlob cb = c.findBlobUnsafe(pc); if (cb.isNMethod()) { - names = getJavaNames(th, f.localVariableBase()); - // just print compiled code, if can't determine method - if (names == null || names.length == 0) { - out.println(""); + if (cb.isNativeMethod()) { + out.print(((CompiledMethod)cb).getMethod().externalNameAndSignature()); + long diff = pc.minus(cb.codeBegin()); + if (diff != 0L) { + out.print(" + 0x" + Long.toHexString(diff)); + } + out.println(" (Native method)"); + } else { + names = getJavaNames(th, f.localVariableBase()); + // just print compiled code, if can't determine method + if (names == null || names.length == 0) { + out.println(""); + } } } else if (cb.isBufferBlob()) { out.println(""); diff -r bc43733cd5cf -r 015949faea55 src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016, 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 @@ -127,8 +127,8 @@ return new HotSpotConstantReflectionProvider(runtime); } - private static RegisterConfig createRegisterConfig(AArch64HotSpotVMConfig config, TargetDescription target) { - return new AArch64HotSpotRegisterConfig(target, config.useCompressedOops); + private static RegisterConfig createRegisterConfig(TargetDescription target) { + return new AArch64HotSpotRegisterConfig(target); } protected HotSpotCodeCacheProvider createCodeCache(HotSpotJVMCIRuntime runtime, TargetDescription target, RegisterConfig regConfig) { @@ -167,7 +167,7 @@ metaAccess = createMetaAccess(runtime); } try (InitTimer rt = timer("create RegisterConfig")) { - regConfig = createRegisterConfig(config, target); + regConfig = createRegisterConfig(target); } try (InitTimer rt = timer("create CodeCache provider")) { codeCache = createCodeCache(runtime, target, regConfig); diff -r bc43733cd5cf -r 015949faea55 src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016, 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 @@ -126,11 +126,19 @@ public static final Register threadRegister = r28; public static final Register fp = r29; - private static final RegisterArray reservedRegisters = new RegisterArray(rscratch1, rscratch2, threadRegister, fp, lr, r31, zr, sp); + /** + * The heapBaseRegister, i.e. r27, is reserved unconditionally because HotSpot does not intend + * to support it as an allocatable register even when compressed oops is off. This register is + * excluded from callee-saved register at + * cpu/aarch64/sharedRuntime_aarch64.cpp:RegisterSaver::save_live_registers, which may lead to + * dereferencing unknown value from the stack at + * share/runtime/stackValue.cpp:StackValue::create_stack_value during deoptimization. + */ + private static final RegisterArray reservedRegisters = new RegisterArray(rscratch1, rscratch2, heapBaseRegister, threadRegister, fp, lr, r31, zr, sp); - private static RegisterArray initAllocatable(Architecture arch, boolean reserveForHeapBase) { + private static RegisterArray initAllocatable(Architecture arch) { RegisterArray allRegisters = arch.getAvailableValueRegisters(); - Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0)]; + Register[] registers = new Register[allRegisters.size() - reservedRegisters.size()]; List reservedRegistersList = reservedRegisters.asList(); int idx = 0; @@ -139,12 +147,7 @@ // skip reserved registers continue; } - assert !(reg.equals(threadRegister) || reg.equals(fp) || reg.equals(lr) || reg.equals(r31) || reg.equals(zr) || reg.equals(sp)); - if (reserveForHeapBase && reg.equals(heapBaseRegister)) { - // skip heap base register - continue; - } - + assert !(reg.equals(heapBaseRegister) || reg.equals(threadRegister) || reg.equals(fp) || reg.equals(lr) || reg.equals(r31) || reg.equals(zr) || reg.equals(sp)) : reg; registers[idx++] = reg; } @@ -152,8 +155,8 @@ return new RegisterArray(registers); } - public AArch64HotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops) { - this(target, initAllocatable(target.arch, useCompressedOops)); + public AArch64HotSpotRegisterConfig(TargetDescription target) { + this(target, initAllocatable(target.arch)); assert callerSaved.size() >= allocatable.size(); } diff -r bc43733cd5cf -r 015949faea55 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java Wed Oct 23 14:01:17 2019 -0400 @@ -332,36 +332,26 @@ } //------------------Start of Serializable Implementation---------------------// - private final static Map serializedForms = new HashMap<>(); + private final Map serializedForms = new HashMap<>(); - public SortedSet getSerializableFields(Utils utils, TypeElement klass) { - NewSerializedForm sf = serializedForms.get(klass); - if (sf == null) { - sf = new NewSerializedForm(utils, configuration.docEnv.getElementUtils(), klass); - serializedForms.put(klass, sf); - } - return sf.fields; + private NewSerializedForm getSerializedForm(TypeElement typeElem) { + return serializedForms.computeIfAbsent(typeElem, + te -> new NewSerializedForm(utils, configuration.docEnv.getElementUtils(), te)); } - public SortedSet getSerializationMethods(Utils utils, TypeElement klass) { - NewSerializedForm sf = serializedForms.get(klass); - if (sf == null) { - sf = new NewSerializedForm(utils, configuration.docEnv.getElementUtils(), klass); - serializedForms.put(klass, sf); - } - return sf.methods; + public SortedSet getSerializableFields(TypeElement typeElem) { + return getSerializedForm(typeElem).fields; } - public boolean definesSerializableFields(Utils utils, TypeElement klass) { - if (!utils.isSerializable(klass) || utils.isExternalizable(klass)) { + public SortedSet getSerializationMethods(TypeElement typeElem) { + return getSerializedForm(typeElem).methods; + } + + public boolean definesSerializableFields(TypeElement typeElem) { + if (!utils.isSerializable(typeElem) || utils.isExternalizable(typeElem)) { return false; } else { - NewSerializedForm sf = serializedForms.get(klass); - if (sf == null) { - sf = new NewSerializedForm(utils, configuration.docEnv.getElementUtils(), klass); - serializedForms.put(klass, sf); - } - return sf.definesSerializableFields; + return getSerializedForm(typeElem).definesSerializableFields; } } diff -r bc43733cd5cf -r 015949faea55 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/JavaScriptScanner.java --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/JavaScriptScanner.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/JavaScriptScanner.java Wed Oct 23 14:01:17 2019 -0400 @@ -61,34 +61,8 @@ public Void visitAttribute(AttributeTree tree, Consumer f) { String name = tree.getName().toString().toLowerCase(Locale.ENGLISH); switch (name) { - // See https://www.w3.org/TR/html-markup/global-attributes.html#common.attrs.event-handler - case "onabort": case "onblur": case "oncanplay": case "oncanplaythrough": - case "onchange": case "onclick": case "oncontextmenu": case "ondblclick": - case "ondrag": case "ondragend": case "ondragenter": case "ondragleave": - case "ondragover": case "ondragstart": case "ondrop": case "ondurationchange": - case "onemptied": case "onended": case "onerror": case "onfocus": case "oninput": - case "oninvalid": case "onkeydown": case "onkeypress": case "onkeyup": - case "onload": case "onloadeddata": case "onloadedmetadata": case "onloadstart": - case "onmousedown": case "onmousemove": case "onmouseout": case "onmouseover": - case "onmouseup": case "onmousewheel": case "onpause": case "onplay": - case "onplaying": case "onprogress": case "onratechange": case "onreadystatechange": - case "onreset": case "onscroll": case "onseeked": case "onseeking": - case "onselect": case "onshow": case "onstalled": case "onsubmit": case "onsuspend": - case "ontimeupdate": case "onvolumechange": case "onwaiting": - // See https://www.w3.org/TR/html4/sgml/dtd.html - // Most of the attributes that take a %Script are also defined as event handlers - // in HTML 5. The one exception is onunload. - // case "onchange": case "onclick": case "ondblclick": case "onfocus": - // case "onkeydown": case "onkeypress": case "onkeyup": case "onload": - // case "onmousedown": case "onmousemove": case "onmouseout": case "onmouseover": - // case "onmouseup": case "onreset": case "onselect": case "onsubmit": - case "onunload": - f.accept(getCurrentPath()); - break; - - // See https://www.w3.org/TR/html4/sgml/dtd.html - // https://www.w3.org/TR/html5/ + // https://www.w3.org/TR/html52/fullindex.html#attributes-table // These are all the attributes that take a %URI or a valid URL potentially surrounded // by spaces case "action": case "cite": case "classid": case "codebase": case "data": @@ -102,6 +76,14 @@ } } break; + // See https://www.w3.org/TR/html52/webappapis.html#events-event-handlers + // An event handler has a name, which always starts with "on" and is followed by + // the name of the event for which it is intended. + default: + if (name.startsWith("on")) { + f.accept(getCurrentPath()); + } + break; } return super.visitAttribute(tree, f); } diff -r bc43733cd5cf -r 015949faea55 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2018, 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 @@ -417,15 +417,15 @@ } public SortedSet serializableFields(TypeElement aclass) { - return configuration.workArounds.getSerializableFields(this, aclass); + return configuration.workArounds.getSerializableFields(aclass); } public SortedSet serializationMethods(TypeElement aclass) { - return configuration.workArounds.getSerializationMethods(this, aclass); + return configuration.workArounds.getSerializationMethods(aclass); } public boolean definesSerializableFields(TypeElement aclass) { - return configuration.workArounds.definesSerializableFields(this, aclass); + return configuration.workArounds.definesSerializableFields( aclass); } public String modifiersToString(Element e, boolean trailingSpace) { diff -r bc43733cd5cf -r 015949faea55 src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2017, 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 @@ -36,6 +36,7 @@ private static final long serialVersionUID = 6066780907971918568L; + @SuppressWarnings("serial") // Not statically typed as Serializable ObjectReference exception; public InvocationException(ObjectReference exception) { diff -r bc43733cd5cf -r 015949faea55 src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2017, 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 @@ -40,6 +40,7 @@ private static final long serialVersionUID = -3042212603611350941L; + @SuppressWarnings("serial") // Conditionally serializable List names; /** diff -r bc43733cd5cf -r 015949faea55 src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2017, 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 @@ -38,6 +38,7 @@ private static final long serialVersionUID = 6408644824640801020L; + @SuppressWarnings("serial") // Not statically typed as Serializable Process process; public VMStartException(Process process) { diff -r bc43733cd5cf -r 015949faea55 src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java Wed Oct 23 14:01:17 2019 -0400 @@ -57,6 +57,9 @@ * This class is also used by {@link RecordedObject#toString()} */ public final class PrettyWriter extends EventPrintWriter { + private static final Duration MILLSECOND = Duration.ofMillis(1); + private static final Duration SECOND = Duration.ofSeconds(1); + private static final Duration MINUTE = Duration.ofMinutes(1); private static final String TYPE_OLD_OBJECT = Type.TYPES_PREFIX + "OldObject"; private final static DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ofPattern("HH:mm:ss.SSS"); private final static Long ZERO = 0L; @@ -550,19 +553,14 @@ println("N/A"); return true; } - double s = d.toNanosPart() / 1000_000_000.0 + d.toSecondsPart(); - if (s < 1.0) { - if (s < 0.001) { - println(String.format("%.3f", s * 1_000_000) + " us"); - } else { - println(String.format("%.3f", s * 1_000) + " ms"); - } + if(d.compareTo(MILLSECOND) < 0){ + println(String.format("%.3f us", (double)d.toNanos() / 1_000)); + } else if(d.compareTo(SECOND) < 0){ + println(String.format("%.3f ms", (double)d.toNanos() / 1_000_000)); + } else if(d.compareTo(MINUTE) < 0){ + println(String.format("%.3f s", (double)d.toMillis() / 1_000)); } else { - if (s < 1000.0) { - println(String.format("%.3f", s) + " s"); - } else { - println(String.format("%.0f", s) + " s"); - } + println(String.format("%d s", d.toSeconds())); } return true; } diff -r bc43733cd5cf -r 015949faea55 src/jdk.jfr/share/conf/jfr/default.jfc --- a/src/jdk.jfr/share/conf/jfr/default.jfc Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.jfr/share/conf/jfr/default.jfc Wed Oct 23 14:01:17 2019 -0400 @@ -689,13 +689,13 @@ - true - 10 ms + false + 0 ms - true - 10 ms + false + 0 ms diff -r bc43733cd5cf -r 015949faea55 src/jdk.jfr/share/conf/jfr/profile.jfc --- a/src/jdk.jfr/share/conf/jfr/profile.jfc Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.jfr/share/conf/jfr/profile.jfc Wed Oct 23 14:01:17 2019 -0400 @@ -689,13 +689,13 @@ - 10 ms - true + 0 ms + false - true - 10 ms + false + 0 ms diff -r bc43733cd5cf -r 015949faea55 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, 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 @@ -82,6 +82,8 @@ } } catch (final PatternSyntaxException e2) { throwParserException("syntax", e2.getMessage()); + } catch (StackOverflowError e3) { + throw new RuntimeException(e3); } } diff -r bc43733cd5cf -r 015949faea55 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, 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 @@ -82,6 +82,8 @@ } } catch (final PatternSyntaxException | JOniException e2) { throwParserException("syntax", e2.getMessage()); + } catch (StackOverflowError e3) { + throw new RuntimeException(e3); } } diff -r bc43733cd5cf -r 015949faea55 src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Wed Oct 23 13:53:41 2019 -0400 +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -644,6 +644,7 @@ // renew if ticket is old. Credentials newCred = renewCredentials(cred); if (newCred != null) { + newCred.setProxy(cred.getProxy()); cred = newCred; } } @@ -1070,6 +1071,10 @@ // create Kerberos Ticket if (isInitiator) { kerbTicket = Krb5Util.credsToTicket(cred); + if (cred.getProxy() != null) { + KerberosSecrets.getJavaxSecurityAuthKerberosAccess() + .kerberosTicketSetProxy(kerbTicket,Krb5Util.credsToTicket(cred.getProxy())); + } } if (storeKey && encKeys != null) { diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/ProblemList.txt --- a/test/hotspot/jtreg/ProblemList.txt Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/ProblemList.txt Wed Oct 23 14:01:17 2019 -0400 @@ -108,6 +108,7 @@ serviceability/sa/ClhsdbJdis.java 8193639 solaris-all serviceability/sa/ClhsdbJhisto.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbJstack.java 8193639 solaris-all +serviceability/sa/ClhsdbJstackXcompStress.java 8193639,8231635 solaris-all,windows-x64 serviceability/sa/ClhsdbLongConstant.java 8193639 solaris-all serviceability/sa/ClhsdbPmap.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbPrintAll.java 8193639 solaris-all diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java --- a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java Wed Oct 23 14:01:17 2019 -0400 @@ -27,7 +27,7 @@ * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @requires vm.aot + * @requires vm.aot & vm.cds * @build compiler.aot.fingerprint.SelfChanged * compiler.aot.AotCompiler * diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/compiler/c2/CompareKlassPointersTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/compiler/c2/CompareKlassPointersTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,70 @@ +/* + * 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 8220416 + * @summary This test uses a class pointer comparison optimization which was not applied anymore since JDK-6964458 resulting in a better IR. + * + * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline + * -XX:CompileOnly=compiler.c2.CompareKlassPointersTest::test compiler.c2.CompareKlassPointersTest + */ + +package compiler.c2; + + + +public class CompareKlassPointersTest { + + static A a; + + public static void main(String[] args) { + a = new C(); + for (int i = 0; i < 10_000; i++) { + test(); + } + } + + public static int test() { + Object a = getA(); + + /* + * This check is now optimized away which was not the case before anymore since JDK-6964458: + * The klass pointer comparison optimization sees that the check is always false since a and B are always unrelated klasses + */ + if (a instanceof B) { + return 1; + } + return 0; + } + + private static Object getA() { + return a; + } +} + +class A { } + +class B { } + +class C extends A { } diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/compiler/escapeAnalysis/TestEliminateAllocation.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestEliminateAllocation.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,74 @@ +/* + * 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 8231412 + * @summary The enhancement eliminates all allocations in the loop body of test() due to an improved field zeroing elimination dominance check. + * @run main/othervm -XX:-TieredCompilation -XX:CompileCommand=compileonly,compiler.escapeAnalysis.TestEliminateAllocation::test + * compiler.escapeAnalysis.TestEliminateAllocation + */ + +package compiler.escapeAnalysis; + +public class TestEliminateAllocation { + + public static int a = 20; + public static int b = 30; + public static int c = 40; + + public void test() { + int i = 0; + + /* + * The resulting IR for the loop body contains 2 allocations, one Wrapper and an int array + * The array field store in the Wrapper object 'wrapper.arr = arr' cannot be capturued due to an early bail out. + * Therefore, the initial value of wrapper.arr is null. + * As a result, the escape analysis marks the array allocation as not scalar replaceable: + * 'wrapper.arr' which is null is merged with the int array object in the assignment 'wrapper.arr = arr'. + * Both null and the int array are treated as different objects. As a result the array allocation cannot be eliminated. + * + * The new enhancement does not bail out early anymore and therefore escape analysis does not mark it as + * not scalar replaceable. This results in elimination of all allocations in this method. + */ + do { + int[] arr = new int[] { a / b / c }; + Wrapper wrapper = new Wrapper(); + wrapper.setArr(arr); + i++; + } + while (i < 10); + } + + public static void main(String[] strArr) { + TestEliminateAllocation _instance = new TestEliminateAllocation(); + for (int i = 0; i < 10_000; i++ ) { + _instance.test(); + } + } +} + +class Wrapper { + int[] arr; + void setArr(int... many) { arr = many; } +} diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/compiler/loopopts/superword/SuperWordIntermediateUse.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/compiler/loopopts/superword/SuperWordIntermediateUse.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 8230062 + * @summary The IR of this test contains a reduction chain which corresponds to a pack in which the 2nd last element has a usage outside of the optimized loop. + * + * @run main/othervm -Xbatch -XX:CompileCommand=compileonly,compiler.loopopts.superword.SuperWordIntermediateUse::test + * compiler.loopopts.superword.SuperWordIntermediateUse + */ + +package compiler.loopopts.superword; + +public class SuperWordIntermediateUse { + + private int iFld; + private int[] iArr = new int[1024]; + + public void test() { + int local = 4; + + /** + * Before unrolling this loop: + * iFld: AddI 1 = -85 + Phi 1 + * local: MulI 2 = Phi 1 * LoadI 3 + * + * This loop is now unrolled. 'local' is a reduction. The loop is first copied: + * iFldCopy: AddI C1 = -85 + Phi C1 + * localCopy: MulI C2 = Phi C1 * LoadI C3 + * + * iFld: AddI 1 = -85 + Phi 1 + * local: MulI 2 = Phi 1 * LoadI 3 + * + * Then, the unnecessary nodes like phis are removed from the original loop by igvn: + * (iFldCopy: AddI C1 = -85 + Phi C1) field store optimized away + * localCopy: MulI C2 = Phi C1 * LoadI C3 + * + * iFld: AddI 1 = -85 + MulI C2 + * local: MulI 2 = MulI C2 * LoadI 3 -> Input into Phi C1 + * + * As a result AddI 1 has an input from MulI C2 which isn't the last operation in the reduction chain + * Phi C1 -> MulI C2 -> MulI 2 -> Phi C1 and therefore not the last element in a pack. + * Additionally, AddI 1 does not belong to the loop being optimized: The store node for iFld is put outside of the loop being optimized. + * This triggers the assertion bug when unrolled at least 4 times which creates packs of at least size 4. + */ + for (int i = 0; i < 1024; i++) { + iFld = -85; + iFld = iFld + local; + local = local * iArr[i]; + iArr[i] = 3; // Just used to trigger SuperWord optimization + } + } + + public static void main(String[] strArr) { + SuperWordIntermediateUse instance = new SuperWordIntermediateUse(); + for (int i = 0; i < 1000; i++) { + instance.test(); + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/gc/CriticalNativeArgs.java --- a/test/hotspot/jtreg/gc/CriticalNativeArgs.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/gc/CriticalNativeArgs.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Red Hat, Inc. and/or its affiliates. + * Copyright (c) 2018, 2019, Red Hat, Inc. and/or its affiliates. * * 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 @@ -28,7 +28,7 @@ * @key gc * @bug 8199868 * @library / - * @requires (os.arch =="x86_64" | os.arch == "amd64") & vm.gc.Epsilon & !vm.graal.enabled + * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Epsilon & !vm.graal.enabled * @summary test argument unpacking nmethod wrapper of critical native method * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xcomp -Xmx256M -XX:+CriticalJNINatives gc.CriticalNativeArgs */ @@ -38,7 +38,7 @@ * @key gc * @bug 8199868 * @library / - * @requires (os.arch =="x86_64" | os.arch == "amd64") & vm.gc.Shenandoah & !vm.graal.enabled + * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Shenandoah & !vm.graal.enabled * @summary test argument unpacking nmethod wrapper of critical native method * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive -XX:+ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.CriticalNativeArgs * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive -XX:-ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.CriticalNativeArgs diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java --- a/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java Wed Oct 23 14:01:17 2019 -0400 @@ -26,7 +26,12 @@ * @key gc * @requires vm.gc.Epsilon & !vm.graal.enabled * @summary Basic sanity test for Epsilon - * @run main/othervm -Xmx1g -XX:+AlwaysPreTouch -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch + * @run main/othervm -Xms128m -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch + * @run main/othervm -Xms128m -Xmx1g -XX:-AlwaysPreTouch -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch + * @run main/othervm -Xms128m -Xmx1g -XX:+AlwaysPreTouch -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch + * @run main/othervm -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch + * @run main/othervm -Xmx1g -XX:-AlwaysPreTouch -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch + * @run main/othervm -Xmx1g -XX:+AlwaysPreTouch -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch */ package gc.epsilon; diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java --- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java Wed Oct 23 14:01:17 2019 -0400 @@ -29,14 +29,14 @@ * @modules java.base/jdk.internal.misc * java.management * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive - * -XX:+ShenandoahDegeneratedGC -XX:+ShenandoahVerify -XX:+VerifyObjectEquals + * -XX:+ShenandoahDegeneratedGC -XX:+ShenandoahVerify * TestVerifyJCStress * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive - * -XX:-ShenandoahDegeneratedGC -XX:+ShenandoahVerify -XX:+VerifyObjectEquals + * -XX:-ShenandoahDegeneratedGC -XX:+ShenandoahVerify * TestVerifyJCStress */ @@ -48,14 +48,14 @@ * @modules java.base/jdk.internal.misc * java.management * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive - * -XX:+ShenandoahVerify -XX:+VerifyObjectEquals -XX:+ShenandoahVerifyOptoBarriers + * -XX:+ShenandoahVerify -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers * TestVerifyJCStress * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact - * -XX:+ShenandoahVerify -XX:+VerifyObjectEquals -XX:+ShenandoahVerifyOptoBarriers + * -XX:+ShenandoahVerify -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers * TestVerifyJCStress */ @@ -67,9 +67,9 @@ * @modules java.base/jdk.internal.misc * java.management * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=traversal - * -XX:+ShenandoahVerify -XX:+VerifyObjectEquals -XX:+ShenandoahVerifyOptoBarriers + * -XX:+ShenandoahVerify -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers * TestVerifyJCStress */ diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/gc/stress/CriticalNativeStress.java --- a/test/hotspot/jtreg/gc/stress/CriticalNativeStress.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/gc/stress/CriticalNativeStress.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Red Hat, Inc. and/or its affiliates. + * Copyright (c) 2018, 2019, Red Hat, Inc. and/or its affiliates. * * 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 @@ -31,7 +31,7 @@ * @key gc * @bug 8199868 * @library / - * @requires (os.arch =="x86_64" | os.arch == "amd64") & vm.gc.Epsilon & !vm.graal.enabled + * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Epsilon & !vm.graal.enabled * @summary test argument pinning by nmethod wrapper of critical native method * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xcomp -Xmx1G -XX:+CriticalJNINatives gc.stress.CriticalNativeStress */ @@ -41,7 +41,7 @@ * @key gc * @bug 8199868 * @library / - * @requires (os.arch =="x86_64" | os.arch == "amd64") & vm.gc.Shenandoah & !vm.graal.enabled + * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Shenandoah & !vm.graal.enabled * @summary test argument pinning by nmethod wrapper of critical native method * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive -XX:-ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.stress.CriticalNativeStress * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive -XX:+ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.stress.CriticalNativeStress diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java --- a/test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java Wed Oct 23 14:01:17 2019 -0400 @@ -25,6 +25,7 @@ * @test Default CDS archive file * @summary JDK platforms/binaries do not support default CDS archive should * not contain classes.jsa in the default location. + * @requires vm.cds * @library /test/lib * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NPEInHiddenTopFrameTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NPEInHiddenTopFrameTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * 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 + * @summary Test NullPointerException messages thrown in frames that + * are hidden in the backtrace/stackTrace. + * @bug 8218628 + * @library /test/lib + * @compile -g NPEInHiddenTopFrameTest.java + * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-ShowHiddenFrames -XX:+ShowCodeDetailsInExceptionMessages NPEInHiddenTopFrameTest hidden + * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+ShowCodeDetailsInExceptionMessages NPEInHiddenTopFrameTest visible + */ + +import jdk.test.lib.Asserts; + +public class NPEInHiddenTopFrameTest { + + @FunctionalInterface + private static interface SomeFunctionalInterface { + String someMethod(String a, String b); + } + + public static void checkMessage(String expression, + String obtainedMsg, String expectedMsg) { + System.out.println(); + System.out.println(" source code: " + expression); + System.out.println(" thrown msg: " + obtainedMsg); + if (obtainedMsg == null && expectedMsg == null) return; + System.out.println("expected msg: " + expectedMsg); + Asserts.assertEquals(expectedMsg, obtainedMsg); + } + + public static void main(String[] args) throws Exception { + boolean framesAreHidden = false; + if (args.length > 0) { + String arg = args[0]; + if (arg.equals("hidden")) framesAreHidden = true; + } + + try { + final SomeFunctionalInterface concatter = String::concat; + final String nullString = null; + if (concatter != null) { + // This throws NPE from the lambda expression which is a hidden frame. + concatter.someMethod(nullString, "validString"); + } + } catch (NullPointerException e) { + checkMessage("concatter.someMethod(nullString, \"validString\");", e.getMessage(), + framesAreHidden ? + // This is the message that would be printed if the wrong method/bci are used: + // "Cannot invoke 'NPEInHiddenTopFrameTest$SomeFunctionalInterface.someMethod(String, String)'" + + // " because 'concatter' is null." + // But the NPE message generation now recognizes this situation and skips the + // message. So we expect null: + null : + // This is the correct message, but it describes code generated on-the-fly. + // You get it if you disable hiding frames (-XX:+ShowHiddenframes). + "Cannot invoke \"String.concat(String)\" because \"\" is null" ); + e.printStackTrace(); + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NullPointerExceptionTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/NullPointerExceptionTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,1782 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * 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 + * @summary Test extended NullPointerException message for + * classfiles generated with debug information. In this case the name + * of the variable containing the array is printed. + * @bug 8218628 + * @modules java.base/java.lang:open + * java.base/jdk.internal.org.objectweb.asm + * @library /test/lib + * @compile -g NullPointerExceptionTest.java + * @run main/othervm -XX:MaxJavaStackTraceDepth=1 -XX:+ShowCodeDetailsInExceptionMessages NullPointerExceptionTest hasDebugInfo + */ +/** + * @test + * @summary Test extended NullPointerException message for class + * files generated without debugging information. The message lists + * detailed information about the entity that is null. + * @bug 8218628 + * @modules java.base/java.lang:open + * java.base/jdk.internal.org.objectweb.asm + * @library /test/lib + * @compile NullPointerExceptionTest.java + * @run main/othervm -XX:MaxJavaStackTraceDepth=1 -XX:+ShowCodeDetailsInExceptionMessages NullPointerExceptionTest + */ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.lang.invoke.MethodHandles.Lookup; +import java.util.ArrayList; + +import jdk.internal.org.objectweb.asm.ClassWriter; +import jdk.internal.org.objectweb.asm.Label; +import jdk.internal.org.objectweb.asm.MethodVisitor; +import jdk.test.lib.Asserts; + +import static java.lang.invoke.MethodHandles.lookup; +import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; +import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL; +import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; +import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE; +import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD; +import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC; +import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1; +import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_2; +import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN; +import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; +import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; + +/** + * Tests NullPointerExceptions + */ +public class NullPointerExceptionTest { + + // Some fields used in the test. + static Object nullStaticField; + NullPointerExceptionTest nullInstanceField; + static int[][][][] staticArray; + static long[][] staticLongArray = new long[1000][]; + DoubleArrayGen dag; + ArrayList names = new ArrayList<>(); + ArrayList curr; + static boolean hasDebugInfo = false; + + static { + staticArray = new int[1][][][]; + staticArray[0] = new int[1][][]; + staticArray[0][0] = new int[1][]; + } + + public static void checkMessage(Throwable t, String expression, + String obtainedMsg, String expectedMsg) { + System.out.println("\nSource code:\n " + expression + "\n\nOutput:"); + t.printStackTrace(System.out); + if (obtainedMsg != expectedMsg && // E.g. both are null. + !obtainedMsg.equals(expectedMsg)) { + System.out.println("expected msg: " + expectedMsg); + Asserts.assertEquals(expectedMsg, obtainedMsg); + } + System.out.println("\n----"); + } + + public static void main(String[] args) throws Exception { + NullPointerExceptionTest t = new NullPointerExceptionTest(); + if (args.length > 0) { + hasDebugInfo = true; + } + + System.out.println("Tests for the first part of the message:"); + System.out.println("========================================\n"); + + // Test the message printed for the failed action. + t.testFailedAction(); + + System.out.println("Tests for the second part of the message:"); + System.out.println("=========================================\n"); + // Test the method printed for the null entity. + t.testNullEntity(); + + System.out.println("Further tests:"); + System.out.println("==============\n"); + + // Test if parameters are used in the code. + // This is relevant if there is no debug information. + t.testParameters(); + + // Test that no message is printed for exceptions + // allocated explicitly. + t.testCreation(); + + // Test that no message is printed for exceptions + // thrown in native methods. + t.testNative(); + + // Test that two calls to getMessage() return the same + // message. + // It is a design decision that it returns two different + // String objects. + t.testSameMessage(); + + // Test serialization. + // It is a design decision that after serialization the + // the message is lost. + t.testSerialization(); + + // Test that messages are printed for code generated + // on-the-fly. + t.testGeneratedCode(); + + // Some more interesting complex messages. + t.testComplexMessages(); + } + + // Helper method to cause test case. + private double callWithTypes(String[][] dummy1, int[][][] dummy2, float dummy3, long dummy4, short dummy5, + boolean dummy6, byte dummy7, double dummy8, char dummy9) { + return 0.0; + } + + @SuppressWarnings("null") + public void testFailedAction() { + int[] ia1 = null; + float[] fa1 = null; + Object[] oa1 = null; + boolean[] za1 = null; + byte[] ba1 = null; + char[] ca1 = null; + short[] sa1 = null; + long[] la1 = null; + double[] da1 = null; + + // iaload + try { + int val = ia1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "int val = ia1[0];", e.getMessage(), + "Cannot load from int array because " + + (hasDebugInfo ? "\"ia1\"" : "\"\"") + " is null"); + } + // faload + try { + float val = fa1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "float val = fa1[0];", e.getMessage(), + "Cannot load from float array because " + + (hasDebugInfo ? "\"fa1\"" : "\"\"") + " is null"); + } + // aaload + try { + Object val = oa1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "Object val = oa1[0];", e.getMessage(), + "Cannot load from object array because " + + (hasDebugInfo ? "\"oa1\"" : "\"\"") + " is null"); + } + // baload (boolean) + try { + boolean val = za1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "boolean val = za1[0];", e.getMessage(), + "Cannot load from byte/boolean array because " + + (hasDebugInfo ? "\"za1\"" : "\"\"") + " is null"); + } + // baload (byte) + try { + byte val = ba1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "byte val = ba1[0];", e.getMessage(), + "Cannot load from byte/boolean array because " + + (hasDebugInfo ? "\"ba1\"" : "\"\"") + " is null"); + } + // caload + try { + char val = ca1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "char val = ca1[0];", e.getMessage(), + "Cannot load from char array because " + + (hasDebugInfo ? "\"ca1\"" : "\"\"") + " is null"); + } + // saload + try { + short val = sa1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "short val = sa1[0];", e.getMessage(), + "Cannot load from short array because " + + (hasDebugInfo ? "\"sa1\"" : "\"\"") + " is null"); + } + // laload + try { + long val = la1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "long val = la1[0];", e.getMessage(), + "Cannot load from long array because " + + (hasDebugInfo ? "\"la1\"" : "\"\"") + " is null"); + } + // daload + try { + double val = da1[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "double val = da1[0];", e.getMessage(), + "Cannot load from double array because " + + (hasDebugInfo ? "\"da1\"" : "\"\"") + " is null"); + } + + // iastore + try { + ia1[0] = 0; + System.out.println(ia1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "ia1[0] = 0;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"ia1\"" : "\"\"") + " is null"); + } + // fastore + try { + fa1[0] = 0.7f; + System.out.println(fa1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "fa1[0] = 0.7f;", e.getMessage(), + "Cannot store to float array because " + + (hasDebugInfo ? "\"fa1\"" : "\"\"") + " is null"); + } + // aastore + try { + oa1[0] = new Object(); + System.out.println(oa1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "oa1[0] = new Object();", e.getMessage(), + "Cannot store to object array because " + + (hasDebugInfo ? "\"oa1\"" : "\"\"") + " is null"); + } + // bastore (boolean) + try { + za1[0] = false; + System.out.println(za1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "za1[0] = false;", e.getMessage(), + "Cannot store to byte/boolean array because " + + (hasDebugInfo ? "\"za1\"" : "\"\"") + " is null"); + } + // bastore (byte) + try { + ba1[0] = 0; + System.out.println(ba1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "ba1[0] = 0;", e.getMessage(), + "Cannot store to byte/boolean array because " + + (hasDebugInfo ? "\"ba1\"" : "\"\"") + " is null"); + } + // castore + try { + ca1[0] = 0; + System.out.println(ca1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "ca1[0] = 0;", e.getMessage(), + "Cannot store to char array because " + + (hasDebugInfo ? "\"ca1\"" : "\"\"") + " is null"); + } + // sastore + try { + sa1[0] = 0; + System.out.println(sa1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "sa1[0] = 0;", e.getMessage(), + "Cannot store to short array because " + + (hasDebugInfo ? "\"sa1\"" : "\"\"") + " is null"); + } + // lastore + try { + la1[0] = 0; + System.out.println(la1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "la1[0] = 0;", e.getMessage(), + "Cannot store to long array because " + + (hasDebugInfo ? "\"la1\"" : "\"\"") + " is null"); + } + // dastore + try { + da1[0] = 0; + System.out.println(da1[0]); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "da1[0] = 0;", e.getMessage(), + "Cannot store to double array because " + + (hasDebugInfo ? "\"da1\"" : "\"\"") + " is null"); + } + + // arraylength + try { + int val = za1.length; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, " int val = za1.length;", e.getMessage(), + "Cannot read the array length because " + + (hasDebugInfo ? "\"za1\"" : "\"\"") + " is null"); + } + // athrow + try { + RuntimeException exc = null; + throw exc; + } catch (NullPointerException e) { + checkMessage(e, "throw exc;", e.getMessage(), + "Cannot throw exception because " + + (hasDebugInfo ? "\"exc\"" : "\"\"") + " is null"); + } + // monitorenter + try { + synchronized (nullInstanceField) { + // desired + } + } catch (NullPointerException e) { + checkMessage(e, "synchronized (nullInstanceField) { ... }", e.getMessage(), + "Cannot enter synchronized block because " + + "\"this.nullInstanceField\" is null"); + } + // monitorexit + // No test available + + // getfield + try { + Object val = nullInstanceField.nullInstanceField; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "Object val = nullInstanceField.nullInstanceField;", e.getMessage(), + "Cannot read field \"nullInstanceField\" because " + + "\"this.nullInstanceField\" is null"); + } + // putfield + try { + nullInstanceField.nullInstanceField = new NullPointerExceptionTest(); + System.out.println(nullInstanceField.nullInstanceField); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "nullInstanceField.nullInstanceField = new NullPointerExceptionTest();", e.getMessage(), + "Cannot assign field \"nullInstanceField\" because " + + "\"this.nullInstanceField\" is null"); + } + // invokevirtual + try { + String val = nullInstanceField.toString(); + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "String val = nullInstanceField.toString();", e.getMessage(), + "Cannot invoke \"Object.toString()\" because " + + "\"this.nullInstanceField\" is null"); + } + // invokeinterface + try { + NullPointerExceptionTest obj = this; + Object val = obj.dag.getArray(); + Asserts.assertNull(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "Object val = obj.dag.getArray();", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest$DoubleArrayGen.getArray()\" because " + + (hasDebugInfo ? "\"obj" : "\"") + ".dag\" is null"); + } + // invokespecial + G g = null; + try { + byte[] classBytes = G.generateSub2GTestClass(); + Lookup lookup = lookup(); + Class clazz = lookup.defineClass(classBytes); + g = (G) clazz.getDeclaredConstructor().newInstance(); + } catch (Exception e) { + e.printStackTrace(); + Asserts.fail("Generating class Sub2G failed."); + } + try { + g.m2("Beginning"); + } catch (NullPointerException e) { + checkMessage(e, "return super.m2(x).substring(2); // ... where super is null by bytecode manipulation.", e.getMessage(), + "Cannot invoke \"G.m2(String)\" because \"null\" is null"); + } + // Test parameter and return types + try { + boolean val = (nullInstanceField.callWithTypes(null, null, 0.0f, 0L, (short)0, false, (byte)0, 0.0, 'x') == 0.0); + Asserts.assertTrue(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "boolean val = (nullInstanceField.callWithTypes(null, null, 0.0f, 0L, (short)0, false, (byte)0, 0.0, 'x') == 0.0);", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest.callWithTypes(String[][], int[][][], float, long, short, boolean, byte, double, char)\" because " + + "\"this.nullInstanceField\" is null"); + } + } + + static void test_iload() { + int i0 = 0; + int i1 = 1; + int i2 = 2; + int i3 = 3; + @SuppressWarnings("unused") + int i4 = 4; + int i5 = 5; + + int[][] a = new int[6][]; + + // iload_0 + try { + a[i0][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[i0][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[i0]\"" : "\"[]\"") + " is null"); + } + // iload_1 + try { + a[i1][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[i1][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[i1]\"" : "\"[]\"") + " is null"); + } + // iload_2 + try { + a[i2][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[i2][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[i2]\"" : "\"[]\"") + " is null"); + } + // iload_3 + try { + a[i3][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[i3][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[i3]\"" : "\"[]\"") + " is null"); + } + // iload + try { + a[i5][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[i5][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[i5]\"" : "\"[]\"") + " is null"); + } + } + + // Other datatyes than int are not needed. + // If we implement l2d and similar bytecodes, we can print + // long expressions as array indexes. Then these here could + // be used. + static void test_lload() { + long long0 = 0L; // l0 looks like 10. Therefore long0. + long long1 = 1L; + long long2 = 2L; + long long3 = 3L; + @SuppressWarnings("unused") + long long4 = 4L; + long long5 = 5L; + + int[][] a = new int[6][]; + + // lload_0 + try { + a[(int)long0][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)long0][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + // lload_1 + try { + a[(int)long1][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)long1][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + // lload_2 + try { + a[(int)long2][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)long2][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + // lload_3 + try { + a[(int)long3][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)long3][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + // lload + try { + a[(int)long5][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)long5][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + } + + static void test_fload() { + float f0 = 0.0f; + float f1 = 1.0f; + float f2 = 2.0f; + float f3 = 3.0f; + @SuppressWarnings("unused") + float f4 = 4.0f; + float f5 = 5.0f; + + int[][] a = new int[6][]; + + // fload_0 + try { + a[(int)f0][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)f0][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + // fload_1 + try { + a[(int)f1][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)f1][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + // fload_2 + try { + a[(int)f2][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)f2][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + // fload_3 + try { + a[(int)f3][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)f3][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + // fload + try { + a[(int)f5][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)f5][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[...]\"" : "\"[...]\"") + " is null"); + } + } + + @SuppressWarnings("null") + static void test_aload() { + F f0 = null; + F f1 = null; + F f2 = null; + F f3 = null; + @SuppressWarnings("unused") + F f4 = null; + F f5 = null; + + // aload_0 + try { + f0.i = 33; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "f0.i = 33;", e.getMessage(), + "Cannot assign field \"i\" because " + + (hasDebugInfo ? "\"f0\"" : "\"\"") + " is null"); + } + // aload_1 + try { + f1.i = 33; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "f1.i = 33;", e.getMessage(), + "Cannot assign field \"i\" because " + + (hasDebugInfo ? "\"f1\"" : "\"\"") + " is null"); + } + // aload_2 + try { + f2.i = 33; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "f2.i = 33;", e.getMessage(), + "Cannot assign field \"i\" because " + + (hasDebugInfo ? "\"f2\"" : "\"\"") + " is null"); + } + // aload_3 + try { + f3.i = 33; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "f3.i = 33;", e.getMessage(), + "Cannot assign field \"i\" because " + + (hasDebugInfo ? "\"f3\"" : "\"\"") + " is null"); + } + // aload + try { + f5.i = 33; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "f5.i = 33;", e.getMessage(), + "Cannot assign field \"i\" because " + + (hasDebugInfo ? "\"f5\"" : "\"\"") + " is null"); + } + } + + // Helper class for test cases. + class A { + public B to_b; + public B getB() { return to_b; } + } + + // Helper class for test cases. + class B { + public C to_c; + public B to_b; + public C getC() { return to_c; } + public B getBfromB() { return to_b; } + } + + // Helper class for test cases. + class C { + public D to_d; + public D getD() { return to_d; } + } + + // Helper class for test cases. + class D { + public int num; + public int[][] ar; + } + + + @SuppressWarnings("null") + public void testArrayChasing() { + int[][][][][][] a = null; + try { + a[0][0][0][0][0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[0][0][0][0][0] = 99; // a is null", e.getMessage(), + "Cannot load from object array because " + + (hasDebugInfo ? "\"a\"" : "\"\"") + " is null"); + } + a = new int[1][][][][][]; + try { + a[0][0][0][0][0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[0][0][0][0][0] = 99; // a[0] is null", e.getMessage(), + "Cannot load from object array because " + + (hasDebugInfo ? "\"a[0]\"" : "\"[0]\"") + " is null"); + } + a[0] = new int[1][][][][]; + try { + a[0][0][0][0][0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[0][0][0][0][0] = 99; // a[0][0] is null", e.getMessage(), + "Cannot load from object array because " + + (hasDebugInfo ? "\"a[0][0]\"" : "\"[0][0]\"") + " is null"); + } + a[0][0] = new int[1][][][]; + try { + a[0][0][0][0][0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[0][0][0][0][0] = 99; // a[0][0][0] is null", e.getMessage(), + "Cannot load from object array because " + + (hasDebugInfo ? "\"a[0][0][0]\"" : "\"[0][0][0]\"") + " is null"); + } + try { + System.out.println(a[0][0][0].length); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[0][0][0].length; // a[0][0][0] is null", e.getMessage(), + "Cannot read the array length because " + + (hasDebugInfo ? "\"a[0][0][0]\"" : "\"[0][0][0]\"") + " is null"); + } + a[0][0][0] = new int[1][][]; + try { + a[0][0][0][0][0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[0][0][0][0][0] = 99; // a[0][0][0][0] is null", e.getMessage(), + "Cannot load from object array because " + + (hasDebugInfo ? "\"a[0][0][0][0]\"" : "\"[0][0][0][0]\"") + " is null"); + } + a[0][0][0][0] = new int[1][]; + // Reaching max recursion depth. Prints . + try { + a[0][0][0][0][0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[0][0][0][0][0] = 99; // a[0][0][0][0][0] is null", e.getMessage(), + "Cannot store to int array because " + + "\"[0][0][0][0][0]\" is null"); + } + a[0][0][0][0][0] = new int[1]; + try { + a[0][0][0][0][0][0] = 99; + } catch (NullPointerException e) { + Asserts.fail(); + } + } + + @SuppressWarnings("null") + public void testPointerChasing() { + A a = null; + try { + a.to_b.to_c.to_d.num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.to_b.to_c.to_d.num = 99; // a is null", e.getMessage(), + "Cannot read field \"to_b\" because " + + (hasDebugInfo ? "\"a\"" : "\"\"") + " is null"); + } + a = new A(); + try { + a.to_b.to_c.to_d.num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.to_b.to_c.to_d.num = 99; // a.to_b is null", e.getMessage(), + "Cannot read field \"to_c\" because " + + (hasDebugInfo ? "\"a.to_b\"" : "\".to_b\"") + " is null"); + } + a.to_b = new B(); + try { + a.to_b.to_c.to_d.num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.to_b.to_c.to_d.num = 99; // a.to_b.to_c is null", e.getMessage(), + "Cannot read field \"to_d\" because " + + (hasDebugInfo ? "\"a.to_b.to_c\"" : "\".to_b.to_c\"") + " is null"); + } + a.to_b.to_c = new C(); + try { + a.to_b.to_c.to_d.num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.to_b.to_c.to_d.num = 99; // a.to_b.to_c.to_d is null", e.getMessage(), + "Cannot assign field \"num\" because " + + (hasDebugInfo ? "\"a.to_b.to_c.to_d\"" : "\".to_b.to_c.to_d\"") + " is null"); + } + } + + @SuppressWarnings("null") + public void testMethodChasing() { + A a = null; + try { + a.getB().getBfromB().getC().getD().num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().getC().getD().num = 99; // a is null", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest$A.getB()\" because " + + (hasDebugInfo ? "\"a" : "\"") + "\" is null"); + } + a = new A(); + try { + a.getB().getBfromB().getC().getD().num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().getC().getD().num = 99; // a.getB() is null", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest$B.getBfromB()\" because " + + "the return value of \"NullPointerExceptionTest$A.getB()\" is null"); + } + a.to_b = new B(); + try { + a.getB().getBfromB().getC().getD().num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().getC().getD().num = 99; // a.getB().getBfromB() is null", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest$B.getC()\" because " + + "the return value of \"NullPointerExceptionTest$B.getBfromB()\" is null"); + } + a.to_b.to_b = new B(); + try { + a.getB().getBfromB().getC().getD().num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().getC().getD().num = 99; // a.getB().getBfromB().getC() is null", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest$C.getD()\" because " + + "the return value of \"NullPointerExceptionTest$B.getC()\" is null"); + } + a.to_b.to_b.to_c = new C(); + try { + a.getB().getBfromB().getC().getD().num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().getC().getD().num = 99; // a.getB().getBfromB().getC().getD() is null", e.getMessage(), + "Cannot assign field \"num\" because " + + "the return value of \"NullPointerExceptionTest$C.getD()\" is null"); + } + } + + @SuppressWarnings("null") + public void testMixedChasing() { + A a = null; + try { + a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; // a is null", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest$A.getB()\" because " + + (hasDebugInfo ? "\"a\"" : "\"\"") + " is null"); + } + a = new A(); + try { + a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; // a.getB() is null", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest$B.getBfromB()\" because " + + "the return value of \"NullPointerExceptionTest$A.getB()\" is null"); + } + a.to_b = new B(); + try { + a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; // a.getB().getBfromB() is null", e.getMessage(), + "Cannot read field \"to_c\" because " + + "the return value of \"NullPointerExceptionTest$B.getBfromB()\" is null"); + } + a.to_b.to_b = new B(); + try { + a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; // a.getB().getBfromB().to_c is null", e.getMessage(), + "Cannot read field \"to_d\" because " + + "\"NullPointerExceptionTest$B.getBfromB().to_c\" is null"); + } + a.to_b.to_b.to_c = new C(); + try { + a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; // a.getB().getBfromB().to_c.to_d is null", e.getMessage(), + "Cannot read field \"ar\" because " + + "\"NullPointerExceptionTest$B.getBfromB().to_c.to_d\" is null"); + } + a.to_b.to_b.to_c.to_d = new D(); + try { + a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; // a.getB().getBfromB().to_c.to_d.ar is null", e.getMessage(), + "Cannot load from object array because " + + "\"NullPointerExceptionTest$B.getBfromB().to_c.to_d.ar\" is null"); + } + try { + a.getB().getBfromB().getC().getD().ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().getC().getD().ar[0][0] = 99; // a.getB().getBfromB().getC().getD().ar is null", e.getMessage(), + "Cannot load from object array because " + + "\"NullPointerExceptionTest$C.getD().ar\" is null"); + } + a.to_b.to_b.to_c.to_d.ar = new int[1][]; + try { + a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().to_c.to_d.ar[0][0] = 99; // a.getB().getBfromB().to_c.to_d.ar[0] is null", e.getMessage(), + "Cannot store to int array because " + + "\"NullPointerExceptionTest$B.getBfromB().to_c.to_d.ar[0]\" is null"); + } + try { + a.getB().getBfromB().getC().getD().ar[0][0] = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.getB().getBfromB().getC().getD().ar[0][0] = 99; // a.getB().getBfromB().getC().getD().ar[0] is null", e.getMessage(), + "Cannot store to int array because " + + "\"NullPointerExceptionTest$C.getD().ar[0]\" is null"); + } + } + + // Helper method to cause test case. + private Object returnNull(String[][] dummy1, int[][][] dummy2, float dummy3) { + return null; + } + + // Helper method to cause test case. + private NullPointerExceptionTest returnMeAsNull(Throwable dummy1, int dummy2, char dummy3) { + return null; + } + + // Helper interface for test cases. + static interface DoubleArrayGen { + public double[] getArray(); + } + + // Helper class for test cases. + static class DoubleArrayGenImpl implements DoubleArrayGen { + @Override + public double[] getArray() { + return null; + } + } + + // Helper class for test cases. + static class NullPointerGenerator { + public static Object nullReturner(boolean dummy1) { + return null; + } + + public Object returnMyNull(double dummy1, long dummy2, short dummy3) { + return null; + } + } + + // Helper method to cause test case. + public void ImplTestLoadedFromMethod(DoubleArrayGen gen) { + try { + (gen.getArray())[0] = 1.0; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "(gen.getArray())[0] = 1.0;", e.getMessage(), + "Cannot store to double array because " + + "the return value of \"NullPointerExceptionTest$DoubleArrayGen.getArray()\" is null"); + } + } + + public void testNullEntity() { + int[][] a = new int[820][]; + + test_iload(); + test_lload(); + test_fload(); + // test_dload(); + test_aload(); + // aload_0: 'this' + try { + this.nullInstanceField.nullInstanceField = new NullPointerExceptionTest(); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "this.nullInstanceField.nullInstanceField = new NullPointerExceptionTest();", e.getMessage(), + "Cannot assign field \"nullInstanceField\" because \"this.nullInstanceField\" is null"); + } + + // aconst_null + try { + throw null; + } catch (NullPointerException e) { + checkMessage(e, "throw null;", e.getMessage(), + "Cannot throw exception because \"null\" is null"); + } + // iconst_0 + try { + a[0][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[0][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[0]\"" : "\"[0]\"") + " is null"); + } + // iconst_1 + try { + a[1][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[1][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[1]\"" : "\"[1]\"") + " is null"); + } + // iconst_2 + try { + a[2][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[2][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[2]\"" : "\"[2]\"") + " is null"); + } + // iconst_3 + try { + a[3][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[3][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[3]\"" : "\"[3]\"") + " is null"); + } + // iconst_4 + try { + a[4][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[4][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[4]\"" : "\"[4]\"") + " is null"); + } + // iconst_5 + try { + a[5][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[5][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[5]\"" : "\"[5]\"") + " is null"); + } + // long --> iconst + try { + a[(int)0L][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[(int)0L][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[0]\"" : "\"[0]\"") + " is null"); + } + // bipush + try { + a[139 /*0x77*/][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[139][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[139]\"" : "\"[139]\"") + " is null"); + } + // sipush + try { + a[819 /*0x333*/][0] = 77; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a[819][0] = 77;", e.getMessage(), + "Cannot store to int array because " + + (hasDebugInfo ? "\"a[819]\"" : "\"[819]\"") + " is null"); + } + + // aaload, with recursive descend. + testArrayChasing(); + + // getstatic + try { + boolean val = (((float[]) nullStaticField)[0] == 1.0f); + Asserts.assertTrue(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "boolean val = (((float[]) nullStaticField)[0] == 1.0f);", e.getMessage(), + "Cannot load from float array because \"NullPointerExceptionTest.nullStaticField\" is null"); + } + + // getfield, with recursive descend. + testPointerChasing(); + + // invokestatic + try { + char val = ((char[]) NullPointerGenerator.nullReturner(false))[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "char val = ((char[]) NullPointerGenerator.nullReturner(false))[0];", e.getMessage(), + "Cannot load from char array because " + + "the return value of \"NullPointerExceptionTest$NullPointerGenerator.nullReturner(boolean)\" is null"); + } + // invokevirtual + try { + char val = ((char[]) (new NullPointerGenerator().returnMyNull(1, 1, (short) 1)))[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "char val = ((char[]) (new NullPointerGenerator().returnMyNull(1, 1, (short) 1)))[0];", e.getMessage(), + "Cannot load from char array because " + + "the return value of \"NullPointerExceptionTest$NullPointerGenerator.returnMyNull(double, long, short)\" is null"); + } + // Call with array arguments. + try { + double val = ((double[]) returnNull(null, null, 1f))[0]; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "double val = ((double[]) returnNull(null, null, 1f))[0];", e.getMessage(), + "Cannot load from double array because " + + "the return value of \"NullPointerExceptionTest.returnNull(String[][], int[][][], float)\" is null"); + } + // invokespecial + try { + SubG g = new SubG(); + g.m2("Beginning"); + } catch (NullPointerException e) { + checkMessage(e, "return super.m2(x).substring(2);", e.getMessage(), + "Cannot invoke \"String.substring(int)\" because " + + "the return value of \"G.m2(String)\" is null"); + } + // invokeinterface + ImplTestLoadedFromMethod(new DoubleArrayGenImpl()); + try { + returnMeAsNull(null, 1, 'A').dag = new DoubleArrayGenImpl(); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "returnMeAsNull(null, 1, 'A').dag = new DoubleArrayGenImpl();", e.getMessage(), + "Cannot assign field \"dag\" because " + + "the return value of \"NullPointerExceptionTest.returnMeAsNull(java.lang.Throwable, int, char)\" is null"); + } + testMethodChasing(); + + // Mixed recursive descend. + testMixedChasing(); + } + + // Assure 64 parameters are printed as 'parameteri'. + public String manyParameters( + int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, + int i11, int i12, int i13, int i14, int i15, int i16, int i17, int i18, int i19, int i20, + int i21, int i22, int i23, int i24, int i25, int i26, int i27, int i28, int i29, int i30, + int i31, int i32, int i33, int i34, int i35, int i36, int i37, int i38, int i39, int i40, + int i41, int i42, int i43, int i44, int i45, int i46, int i47, int i48, int i49, int i50, + int i51, int i52, int i53, int i54, int i55, int i56, int i57, int i58, int i59, int i60, + int i61, int i62, int i63, int i64, int i65, int i66, int i67, int i68, int i69, int i70) { + String[][][][] ar5 = new String[1][1][1][1]; + int[][][] idx3 = new int[1][1][1]; + int[][] idx2 = new int[1][1]; + return ar5[i70] + [idx2[i65][i64]] + [idx3[i63][i62][i47]] + [idx3[idx2[i33][i32]][i31][i17]] + .substring(2); + } + + // The double placeholder takes two slots on the stack. + public void testParametersTestMethod(A a, double placeholder, B b, Integer i) throws Exception { + try { + a.to_b.to_c.to_d.num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "a.to_b.to_c.to_d.num = 99; // to_c is null, a is a parameter.", e.getMessage(), + "Cannot read field \"to_d\" because \"" + + (hasDebugInfo ? "a" : "") + ".to_b.to_c\" is null"); + } + + try { + b.to_c.to_d.num = 99; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "b.to_c.to_d.num = 99; // b is null and b is a parameter.", e.getMessage(), + "Cannot read field \"to_c\" because " + + // We expect number '3' for the parameter. + (hasDebugInfo ? "\"b\"" : "\"\"") + " is null"); + } + + + try { + @SuppressWarnings("unused") + int my_i = i; + } catch (NullPointerException e) { + checkMessage(e, "int my_i = i; // i is a parameter of type Integer.", e.getMessage(), + "Cannot invoke \"java.lang.Integer.intValue()\" because " + + (hasDebugInfo ? "\"i\"" : "\"\"") + " is null"); + } + + // If no debug information is available, only 64 parameters (this and i1 through i63) + // will be reported in the message as 'parameteri'. Others will be reported as 'locali'. + try { + manyParameters(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + } catch (NullPointerException e) { + checkMessage(e, "return ar5[i70][idx2[i65][i64]][idx3[i63][i62][i47]][idx3[idx2[i33][i32]][i31][i17]].substring(2);", e.getMessage(), + "Cannot invoke \"String.substring(int)\" because " + + (hasDebugInfo ? + "\"ar5[i70][idx2[i65][i64]][idx3[i63][i62][i47]][idx3[idx2[i33][i32]][i31][i17]]\"" : + "\"[][[][]][[][]" + + "[]][[[][]][][]]\"") + + " is null"); + } + } + + + public void testParameters() throws Exception { + A a = new A(); + a.to_b = new B(); + testParametersTestMethod(a, 0.0, null, null); + } + + + public void testCreation() throws Exception { + // If allocated with new, the message should not be generated. + Asserts.assertNull(new NullPointerException().getMessage()); + String msg = new String("A pointless message"); + Asserts.assertTrue(new NullPointerException(msg).getMessage() == msg); + + // If created via reflection, the message should not be generated. + Exception ex = NullPointerException.class.getDeclaredConstructor().newInstance(); + Asserts.assertNull(ex.getMessage()); + } + + public void testNative() throws Exception { + // If NPE is thrown in a native method, the message should + // not be generated. + try { + Class.forName(null); + Asserts.fail(); + } catch (NullPointerException e) { + Asserts.assertNull(e.getMessage()); + } + + } + + // Test we get the same message calling npe.getMessage() twice. + @SuppressWarnings("null") + public void testSameMessage() throws Exception { + Object null_o = null; + String expectedMsg = + "Cannot invoke \"Object.hashCode()\" because " + + (hasDebugInfo ? "\"null_o" : "\"") + "\" is null"; + + try { + null_o.hashCode(); + Asserts.fail(); + } catch (NullPointerException e) { + String msg1 = e.getMessage(); + checkMessage(e, "null_o.hashCode()", msg1, expectedMsg); + String msg2 = e.getMessage(); + Asserts.assertTrue(msg1.equals(msg2)); + // It was decided that getMessage should generate the + // message anew on every call, so this does not hold. + //Asserts.assertTrue(msg1 == msg2); + Asserts.assertFalse(msg1 == msg2); + } + } + + @SuppressWarnings("null") + public void testSerialization() throws Exception { + // NPE without message. + Object o1 = new NullPointerException(); + ByteArrayOutputStream bos1 = new ByteArrayOutputStream(); + ObjectOutputStream oos1 = new ObjectOutputStream(bos1); + oos1.writeObject(o1); + ByteArrayInputStream bis1 = new ByteArrayInputStream(bos1.toByteArray()); + ObjectInputStream ois1 = new ObjectInputStream(bis1); + Exception ex1 = (Exception) ois1.readObject(); + Asserts.assertNull(ex1.getMessage()); + + // NPE with custom message. + String msg2 = "A useless message"; + Object o2 = new NullPointerException(msg2); + ByteArrayOutputStream bos2 = new ByteArrayOutputStream(); + ObjectOutputStream oos2 = new ObjectOutputStream(bos2); + oos2.writeObject(o2); + ByteArrayInputStream bis2 = new ByteArrayInputStream(bos2.toByteArray()); + ObjectInputStream ois2 = new ObjectInputStream(bis2); + Exception ex2 = (Exception) ois2.readObject(); + Asserts.assertEquals(ex2.getMessage(), msg2); + + // NPE with generated message. + Object null_o3 = null; + Object o3 = null; + String msg3 = null; + try { + int hc = null_o3.hashCode(); + System.out.println(hc); + Asserts.fail(); + } catch (NullPointerException npe3) { + o3 = npe3; + msg3 = npe3.getMessage(); + checkMessage(npe3, "int hc = null_o3.hashCode();", msg3, + "Cannot invoke \"Object.hashCode()\" because " + + (hasDebugInfo ? "\"null_o3\"" : "\"\"") + " is null"); + } + ByteArrayOutputStream bos3 = new ByteArrayOutputStream(); + ObjectOutputStream oos3 = new ObjectOutputStream(bos3); + oos3.writeObject(o3); + ByteArrayInputStream bis3 = new ByteArrayInputStream(bos3.toByteArray()); + ObjectInputStream ois3 = new ObjectInputStream(bis3); + Exception ex3 = (Exception) ois3.readObject(); + // It was decided that getMessage should not store the + // message in Throwable.detailMessage or implement writeReplace(), + // thus it can not be recovered by serialization. + //Asserts.assertEquals(ex3.getMessage(), msg3); + Asserts.assertEquals(ex3.getMessage(), null); + } + + static int index17 = 17; + int getIndex17() { return 17; }; + + @SuppressWarnings({ "unused", "null" }) + public void testComplexMessages() { + try { + staticLongArray[0][0] = 2L; + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "staticLongArray[0][0] = 2L;", e.getMessage(), + "Cannot store to long array because " + + "\"NullPointerExceptionTest.staticLongArray[0]\" is null"); + } + + try { + NullPointerExceptionTest obj = this; + Object val = obj.dag.getArray().clone(); + Asserts.assertNull(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "Object val = obj.dag.getArray().clone();", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest$DoubleArrayGen.getArray()\" because " + + (hasDebugInfo ? "\"obj" : "\"") + ".dag\" is null"); + } + try { + int indexes[] = new int[1]; + NullPointerExceptionTest[] objs = new NullPointerExceptionTest[] {this}; + Object val = objs[indexes[0]].nullInstanceField.returnNull(null, null, 1f); + Asserts.assertNull(val); + Asserts.fail(); + } catch (NullPointerException e) { + checkMessage(e, "Object val = objs[indexes[0]].nullInstanceField.returnNull(null, null, 1f);", e.getMessage(), + "Cannot invoke \"NullPointerExceptionTest.returnNull(String[][], int[][][], float)\" because " + + (hasDebugInfo ? "\"objs[indexes" : "\"[") + "[0]].nullInstanceField\" is null"); + } + + try { + int indexes[] = new int[1]; + NullPointerExceptionTest[][] objs = + new NullPointerExceptionTest[][] {new NullPointerExceptionTest[] {this}}; + synchronized (objs[indexes[0]][0].nullInstanceField) { + Asserts.fail(); + } + } catch (NullPointerException e) { + checkMessage(e, "synchronized (objs[indexes[0]][0].nullInstanceField) { ... }", e.getMessage(), + "Cannot enter synchronized block because " + + (hasDebugInfo ? "\"objs[indexes" : "\"[" ) + "[0]][0].nullInstanceField\" is null"); + } + + try { + // If we can get the value from more than one bci, we cannot know which one + // is null. Make sure we don't print the wrong value. + String s = null; + @SuppressWarnings("unused") + byte[] val = (Math.random() < 0.5 ? s : (new String[1])[0]).getBytes(); + } catch (NullPointerException e) { + checkMessage(e, "byte[] val = (Math.random() < 0.5 ? s : (new String[1])[0]).getBytes();", e.getMessage(), + "Cannot invoke \"String.getBytes()\""); + } + + try { + // If we can get the value from more than one bci, we cannot know which one + // is null. Make sure we don't print the wrong value. Also make sure if + // we don't print the failed action we don't print a string at all. + int[][] a = new int[1][]; + int[][] b = new int[2][]; + long index = 0; + @SuppressWarnings("unused") + int val = (Math.random() < 0.5 ? a[(int)index] : b[(int)index])[13]; + } catch (NullPointerException e) { + checkMessage(e, "int val = (Math.random() < 0.5 ? a[(int)index] : b[(int)index])[13]", e.getMessage(), + "Cannot load from int array"); + } + + try { + // If we can get the value from more than one bci, we cannot know which one + // is null. Make sure we don't print the wrong value. Also make sure if + // we don't print the failed action we don't print a string at all. + int[][] a = new int[1][]; + int[][] b = new int[2][]; + long index = 0; + int val = (Math.random() < 0.5 ? a : b)[(int)index][13]; + } catch (NullPointerException e) { + checkMessage(e, "int val = (Math.random() < 0.5 ? a : b)[(int)index][13]", e.getMessage(), + "Cannot load from int array because \"[...]\" is null"); + } + + try { + C c1 = new C(); + C c2 = new C(); + (Math.random() < 0.5 ? c1 : c2).to_d.num = 77; + } catch (NullPointerException e) { + checkMessage(e, "(Math.random() < 0.5 ? c1 : c2).to_d.num = 77;", e.getMessage(), + "Cannot assign field \"num\" because \"to_d\" is null"); + } + + // Static variable as array index. + try { + staticLongArray[index17][0] = 2L; + } catch (NullPointerException e) { + checkMessage(e, "staticLongArray[index17][0] = 2L;", e.getMessage(), + "Cannot store to long array because " + + "\"NullPointerExceptionTest.staticLongArray[NullPointerExceptionTest.index17]\" is null"); + } + + // Method call as array index. + try { + staticLongArray[getIndex17()][0] = 2L; + } catch (NullPointerException e) { + checkMessage(e, "staticLongArray[getIndex17()][0] = 2L;", e.getMessage(), + "Cannot store to long array because " + + "\"NullPointerExceptionTest.staticLongArray[NullPointerExceptionTest.getIndex17()]\" is null"); + } + + // Unboxing. + Integer a = null; + try { + int b = a; + } catch (NullPointerException e) { + checkMessage(e, "Integer a = null; int b = a;", e.getMessage(), + "Cannot invoke \"java.lang.Integer.intValue()\" because " + + (hasDebugInfo ? "\"a\"" : "\"\"") + " is null"); + } + + // Unboxing by hand. Has the same message as above. + try { + int b = a.intValue(); + } catch (NullPointerException e) { + checkMessage(e, "Integer a = null; int b = a.intValue();", e.getMessage(), + "Cannot invoke \"java.lang.Integer.intValue()\" because " + + (hasDebugInfo ? "\"a\"" : "\"\"") + " is null"); + } + } + + // Generates: + // class E implements E0 { + // public int throwNPE(F f) { + // return f.i; + // } + // public void throwNPE_reuseStackSlot1(String s1) { + // System.out.println(s1.substring(1)); + // String s1_2 = null; // Reuses slot 1. + // System.out.println(s1_2.substring(1)); + // } + // public void throwNPE_reuseStackSlot4(String s1, String s2, String s3, String s4) { + // System.out.println(s4.substring(1)); + // String s4_2 = null; // Reuses slot 4. + // System.out.println(s4_2.substring(1)); + // } + // } + // + // This code was adapted from output of + // java jdk.internal.org.objectweb.asm.util.ASMifier E0.class + static byte[] generateTestClass() { + ClassWriter cw = new ClassWriter(0); + MethodVisitor mv; + + cw.visit(50, ACC_SUPER, "E", null, "java/lang/Object", new String[] { "E0" }); + + { + mv = cw.visitMethod(0, "", "()V", null, null); + mv.visitCode(); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V", false); + mv.visitInsn(RETURN); + mv.visitMaxs(1, 1); + mv.visitEnd(); + } + + { + mv = cw.visitMethod(ACC_PUBLIC, "throwNPE", "(LF;)I", null, null); + mv.visitCode(); + Label label0 = new Label(); + mv.visitLabel(label0); + mv.visitLineNumber(118, label0); + mv.visitVarInsn(ALOAD, 1); + mv.visitFieldInsn(GETFIELD, "F", "i", "I"); + mv.visitInsn(IRETURN); + Label label1 = new Label(); + mv.visitLabel(label1); + mv.visitLocalVariable("this", "LE;", null, label0, label1, 0); + mv.visitLocalVariable("f", "LE;", null, label0, label1, 1); + mv.visitMaxs(1, 2); + mv.visitEnd(); + } + + { + mv = cw.visitMethod(ACC_PUBLIC, "throwNPE_reuseStackSlot1", "(Ljava/lang/String;)V", null, null); + mv.visitCode(); + Label label0 = new Label(); + mv.visitLabel(label0); + mv.visitLineNumber(7, label0); + mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;"); + mv.visitVarInsn(ALOAD, 1); + mv.visitInsn(ICONST_1); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "substring", "(I)Ljava/lang/String;", false); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false); + Label label1 = new Label(); + mv.visitLabel(label1); + mv.visitLineNumber(8, label1); + mv.visitInsn(ACONST_NULL); + mv.visitVarInsn(ASTORE, 1); + Label label2 = new Label(); + mv.visitLabel(label2); + mv.visitLineNumber(9, label2); + mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;"); + mv.visitVarInsn(ALOAD, 1); + mv.visitInsn(ICONST_1); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "substring", "(I)Ljava/lang/String;", false); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false); + Label label3 = new Label(); + mv.visitLabel(label3); + mv.visitLineNumber(10, label3); + mv.visitInsn(RETURN); + mv.visitMaxs(3, 3); + mv.visitEnd(); + } + + { + mv = cw.visitMethod(ACC_PUBLIC, "throwNPE_reuseStackSlot4", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", null, null); + mv.visitCode(); + Label label0 = new Label(); + mv.visitLabel(label0); + mv.visitLineNumber(12, label0); + mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;"); + mv.visitVarInsn(ALOAD, 4); + mv.visitInsn(ICONST_1); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "substring", "(I)Ljava/lang/String;", false); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false); + Label label1 = new Label(); + mv.visitLabel(label1); + mv.visitLineNumber(13, label1); + mv.visitInsn(ACONST_NULL); + mv.visitVarInsn(ASTORE, 4); + Label label2 = new Label(); + mv.visitLabel(label2); + mv.visitLineNumber(14, label2); + mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;"); + mv.visitVarInsn(ALOAD, 4); + mv.visitInsn(ICONST_1); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "substring", "(I)Ljava/lang/String;", false); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false); + Label label3 = new Label(); + mv.visitLabel(label3); + mv.visitLineNumber(15, label3); + mv.visitInsn(RETURN); + mv.visitMaxs(3, 6); + mv.visitEnd(); + } + + cw.visitEnd(); + + return cw.toByteArray(); + } + + // Assign to a parameter. + // Without debug information, this will print "parameter1" if a NPE + // is raised in the first line because null was passed to the method. + // It will print "local1" if a NPE is raised in line three. + public void assign_to_parameter(String s1) { + System.out.println(s1.substring(1)); + s1 = null; + System.out.println(s1.substring(2)); + } + + // Tests that a class generated on the fly is handled properly. + public void testGeneratedCode() throws Exception { + byte[] classBytes = generateTestClass(); + Lookup lookup = lookup(); + Class clazz = lookup.defineClass(classBytes); + E0 e = (E0) clazz.getDeclaredConstructor().newInstance(); + try { + e.throwNPE(null); + } catch (NullPointerException ex) { + checkMessage(ex, "return f.i;", + ex.getMessage(), + "Cannot read field \"i\" because \"f\" is null"); + } + + // Optimized bytecode can reuse local variable slots for several + // local variables. + // If there is no variable name information, we print 'parameteri' + // if a parameter maps to a local slot. Once a local slot has been + // written, we don't know any more whether it was written as the + // corresponding parameter, or whether another local has been + // mapped to the slot. So we don't want to print 'parameteri' any + // more, but 'locali'. Similary for 'this'. + + // Expect message saying "parameter0". + try { + e.throwNPE_reuseStackSlot1(null); + } catch (NullPointerException ex) { + checkMessage(ex, "s1.substring(1)", + ex.getMessage(), + "Cannot invoke \"String.substring(int)\" because \"\" is null"); + } + // Expect message saying "local0". + try { + e.throwNPE_reuseStackSlot1("aa"); + } catch (NullPointerException ex) { + checkMessage(ex, "s1_2.substring(1)", + ex.getMessage(), + "Cannot invoke \"String.substring(int)\" because \"\" is null"); + } + // Expect message saying "parameter4". + try { + e.throwNPE_reuseStackSlot4("aa", "bb", "cc", null); + } catch (NullPointerException ex) { + checkMessage(ex, "s4.substring(1)", + ex.getMessage(), + "Cannot invoke \"String.substring(int)\" because \"\" is null"); + } + // Expect message saying "local4". + try { + e.throwNPE_reuseStackSlot4("aa", "bb", "cc", "dd"); + } catch (NullPointerException ex) { + checkMessage(ex, "s4_2.substring(1)", + ex.getMessage(), + "Cannot invoke \"String.substring(int)\" because \"\" is null"); + } + + // Unfortunately, with the fix for optimized code as described above + // we don't write 'parameteri' any more after the parameter variable + // has been assigned. + + if (!hasDebugInfo) { + // Expect message saying "parameter1". + try { + assign_to_parameter(null); + } catch (NullPointerException ex) { + checkMessage(ex, "s1.substring(1)", + ex.getMessage(), + "Cannot invoke \"String.substring(int)\" because \"\" is null"); + } + // The message says "local1" although "parameter1" would be correct. + try { + assign_to_parameter("aaa"); + } catch (NullPointerException ex) { + checkMessage(ex, "s1.substring(2)", + ex.getMessage(), + "Cannot invoke \"String.substring(int)\" because \"\" is null"); + } + } + } +} + +// Helper interface for test cases needed for generateTestClass(). +interface E0 { + public int throwNPE(F f); + public void throwNPE_reuseStackSlot1(String s1); + public void throwNPE_reuseStackSlot4(String s1, String s2, String s3, String s4); +} + +// Helper class for test cases needed for generateTestClass(). +class F { + int i; +} + +// For invokespecial test cases. +class G { + public String m2(String x) { + return null; + } + + // This generates the following class: + // + // class Sub2G extends G { + // public String m2(String x) { + // super = null; // Possible in raw bytecode. + // return super.m2(x).substring(2); // Uses invokespecial. + // } + // } + // + // This code was adapted from output of + // java jdk.internal.org.objectweb.asm.util.ASMifier Sub2G.class + static byte[] generateSub2GTestClass() { + ClassWriter cw = new ClassWriter(0); + MethodVisitor mv; + + cw.visit(50, ACC_SUPER, "Sub2G", null, "G", null); + + { + mv = cw.visitMethod(0, "", "()V", null, null); + mv.visitCode(); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn(INVOKESPECIAL, "G", "", "()V", false); + mv.visitInsn(RETURN); + mv.visitMaxs(1, 1); + mv.visitEnd(); + } + { + mv = cw.visitMethod(ACC_PUBLIC, "m2", "(Ljava/lang/String;)Ljava/lang/String;", null, null); + mv.visitCode(); + mv.visitInsn(ACONST_NULL); // Will cause NPE. + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn(INVOKESPECIAL, "G", "m2", "(Ljava/lang/String;)Ljava/lang/String;", false); + mv.visitInsn(ICONST_2); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "substring", "(I)Ljava/lang/String;", false); + mv.visitInsn(ARETURN); + mv.visitMaxs(2, 2); + mv.visitEnd(); + } + + cw.visitEnd(); + + return cw.toByteArray(); + } +} +class SubG extends G { + public String m2(String x) { + return super.m2(x).substring(2); + } +} diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/SuppressMessagesTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/runtime/exceptionMsgs/NullPointerException/SuppressMessagesTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * 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 + * @summary Test that the default of flag ShowCodeDetailsInExceptionMessages is 'false', + * i.e., make sure the VM does not print the message on default. + * @bug 8218628 + * @library /test/lib + * @compile -g SuppressMessagesTest.java + * @run main/othervm SuppressMessagesTest noMessage + */ +/** + * @test + * @summary Test that the messages are suppressed if flag ShowCodeDetailsInExceptionMessages is 'false'. + * @bug 8218628 + * @library /test/lib + * @compile -g SuppressMessagesTest.java + * @run main/othervm -XX:-ShowCodeDetailsInExceptionMessages SuppressMessagesTest noMessage + */ +/** + * @test + * @summary Test that the messages are printed if flag ShowCodeDetailsInExceptionMessages is 'true'. + * @bug 8218628 + * @library /test/lib + * @compile -g SuppressMessagesTest.java + * @run main/othervm -XX:+ShowCodeDetailsInExceptionMessages SuppressMessagesTest printMessage + */ + +import jdk.test.lib.Asserts; + +class A { + int aFld; +} + +// Tests that the messages are suppressed by flag ShowCodeDetailsInExceptionMessages. +public class SuppressMessagesTest { + + public static void main(String[] args) throws Exception { + A a = null; + + if (args.length != 1) { + Asserts.fail("You must specify one arg for this test"); + } + + try { + @SuppressWarnings("null") + int val = a.aFld; + System.out.println(val); + Asserts.fail(); + } catch (NullPointerException e) { + System.out.println("Stacktrace of the expected exception:"); + e.printStackTrace(System.out); + if (args[0].equals("noMessage")) { + Asserts.assertNull(e.getMessage()); + } else { + Asserts.assertEquals(e.getMessage(), "Cannot read field \"aFld\" because \"a\" is null"); + } + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/runtime/signal/TestSiginfo.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/hotspot/jtreg/runtime/signal/TestSiginfo.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,35 @@ +/* + * 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 != "windows" & os.family != "aix" + * + * @summary tests the SIGINFO signal (available on BSD platforms) + * VM testbase keywords: [signal, runtime, linux, solaris, macosx] + * + * @library /test/lib + * @run main/native SigTestDriver SIGINFO + */ + diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java --- a/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -36,13 +36,12 @@ /* * @test * @summary Test of diagnostic command GC.run - * @requires vm.gc != "Z" * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.internal.jvmstat/sun.jvmstat.monitor - * @run testng/othervm -Xlog:gc=debug:RunGC.gclog -XX:-ExplicitGCInvokesConcurrent RunGCTest + * @run testng/othervm -Xlog:gc:RunGC.gclog -XX:-ExplicitGCInvokesConcurrent RunGCTest */ public class RunGCTest { public void run(CommandExecutor executor) { @@ -58,7 +57,7 @@ } OutputAnalyzer output = new OutputAnalyzer(gcLog, ""); - output.shouldContain("Pause Full (Diagnostic Command)"); + output.shouldContain("(Diagnostic Command)"); } @Test diff -r bc43733cd5cf -r 015949faea55 test/hotspot/jtreg/serviceability/logging/TestQuotedLogOutputs.java --- a/test/hotspot/jtreg/serviceability/logging/TestQuotedLogOutputs.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/hotspot/jtreg/serviceability/logging/TestQuotedLogOutputs.java Wed Oct 23 14:01:17 2019 -0400 @@ -26,6 +26,7 @@ * @summary Ensure proper parsing of quoted output names for -Xlog arguments. * @modules java.base/jdk.internal.misc * @library /test/lib + * @run main/othervm TestQuotedLogOutputs */ import java.io.File; diff -r bc43733cd5cf -r 015949faea55 test/jdk/TEST.ROOT --- a/test/jdk/TEST.ROOT Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/TEST.ROOT Wed Oct 23 14:01:17 2019 -0400 @@ -22,7 +22,8 @@ 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 \ +exclusiveAccess.dirs=java/math/BigInteger/largeMemory \ +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 \ diff -r bc43733cd5cf -r 015949faea55 test/jdk/com/sun/jdi/MonitorEventTest.java --- a/test/jdk/com/sun/jdi/MonitorEventTest.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/com/sun/jdi/MonitorEventTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, 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 @@ -31,15 +31,22 @@ * @run compile -g MonitorEventTest.java * @run driver MonitorEventTest */ -import com.sun.jdi.*; -import com.sun.jdi.event.*; -import com.sun.jdi.request.*; - -import java.util.*; +import com.sun.jdi.ReferenceType; +import com.sun.jdi.ThreadReference; +import com.sun.jdi.event.BreakpointEvent; +import com.sun.jdi.event.MonitorContendedEnterEvent; +import com.sun.jdi.event.MonitorContendedEnteredEvent; +import com.sun.jdi.event.MonitorWaitEvent; +import com.sun.jdi.event.MonitorWaitedEvent; +import com.sun.jdi.request.EventRequest; +import com.sun.jdi.request.MonitorContendedEnterRequest; +import com.sun.jdi.request.MonitorContendedEnteredRequest; +import com.sun.jdi.request.MonitorWaitRequest; +import com.sun.jdi.request.MonitorWaitedRequest; /********** target program **********/ -class MonitorTestTarg { +class MonitorEventTestTarg { public static Object endingMonitor; public static Object startingMonitor; public static final long timeout = 30 * 6000; // milliseconds @@ -91,13 +98,13 @@ class myThread extends Thread { public void run() { - synchronized(MonitorTestTarg.startingMonitor) { - MonitorTestTarg.startingMonitor.notify(); + synchronized(MonitorEventTestTarg.startingMonitor) { + MonitorEventTestTarg.startingMonitor.notify(); } // contended enter wait until main thread release monitor - MonitorTestTarg.aboutEnterLock = true; - synchronized (MonitorTestTarg.endingMonitor) { + MonitorEventTestTarg.aboutEnterLock = true; + synchronized (MonitorEventTestTarg.endingMonitor) { } } } @@ -108,7 +115,6 @@ public class MonitorEventTest extends TestScaffold { ReferenceType targetClass; ThreadReference mainThread; - List monitors; MonitorContendedEnterRequest contendedEnterRequest; MonitorWaitedRequest monitorWaitedRequest; MonitorContendedEnteredRequest contendedEnteredRequest; @@ -160,11 +166,10 @@ * Get to the top of main() * to determine targetClass and mainThread */ - BreakpointEvent bpe = startToMain("MonitorTestTarg"); + BreakpointEvent bpe = startToMain("MonitorEventTestTarg"); targetClass = bpe.location().declaringType(); mainThread = bpe.thread(); - int initialSize = mainThread.frames().size(); if (vm().canRequestMonitorEvents()) { contendedEnterRequest = eventRequestManager().createMonitorContendedEnterRequest(); contendedEnterRequest.setSuspendPolicy(EventRequest.SUSPEND_NONE); @@ -183,7 +188,7 @@ } - resumeTo("MonitorTestTarg", "foo", "()V"); + resumeTo("MonitorEventTestTarg", "foo", "()V"); /* * resume until end diff -r bc43733cd5cf -r 015949faea55 test/jdk/com/sun/jdi/MonitorFrameInfo.java --- a/test/jdk/com/sun/jdi/MonitorFrameInfo.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/com/sun/jdi/MonitorFrameInfo.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, 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 @@ -33,15 +33,17 @@ * @run compile -g MonitorFrameInfo.java * @run driver MonitorFrameInfo */ -import com.sun.jdi.*; -import com.sun.jdi.event.*; -import com.sun.jdi.request.*; +import java.util.List; -import java.util.*; +import com.sun.jdi.InvalidStackFrameException; +import com.sun.jdi.MonitorInfo; +import com.sun.jdi.ReferenceType; +import com.sun.jdi.ThreadReference; +import com.sun.jdi.event.BreakpointEvent; /********** target program **********/ -class MonitorTestTarg { +class MonitorFrameInfoTarg { static void foo3() { System.out.println("executing foo3"); @@ -71,7 +73,7 @@ public class MonitorFrameInfo extends TestScaffold { ReferenceType targetClass; ThreadReference mainThread; - List monitors; + List monitors; static int expectedCount = 2; static int[] expectedDepth = { 1, 3 }; @@ -93,13 +95,13 @@ * Get to the top of main() * to determine targetClass and mainThread */ - BreakpointEvent bpe = startToMain("MonitorTestTarg"); + BreakpointEvent bpe = startToMain("MonitorFrameInfoTarg"); targetClass = bpe.location().declaringType(); mainThread = bpe.thread(); int initialSize = mainThread.frames().size(); - resumeTo("MonitorTestTarg", "foo3", "()V"); + resumeTo("MonitorFrameInfoTarg", "foo3", "()V"); if (!mainThread.frame(0).location().method().name() .equals("foo3")) { diff -r bc43733cd5cf -r 015949faea55 test/jdk/com/sun/jdi/RedefineImplementor.java --- a/test/jdk/com/sun/jdi/RedefineImplementor.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/com/sun/jdi/RedefineImplementor.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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,14 +44,14 @@ } public static void main(String[] args) { - Runnable r = new B(); - B.func(r); - B.func(r); // @1 breakpoint + Runnable r = new RedefineImplementorB(); + RedefineImplementorB.func(r); + RedefineImplementorB.func(r); // @1 breakpoint } } -class B extends RedefineImplementorTarg { +class RedefineImplementorB extends RedefineImplementorTarg { static void func(Runnable r) { r.run(); } diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/awt/FontMetrics/SpaceAdvance.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/awt/FontMetrics/SpaceAdvance.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,49 @@ +/* + * 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 8227662 + */ + +import java.awt.Font; +import java.awt.FontMetrics ; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; + +public class SpaceAdvance { + public static void main(String[] args) throws Exception { + + BufferedImage bi = new BufferedImage(1,1,1); + Graphics2D g2d = bi.createGraphics(); + Font font = new Font(Font.DIALOG, Font.PLAIN, 12); + if (!font.canDisplay(' ')) { + return; + } + g2d.setFont(font); + FontMetrics fm = g2d.getFontMetrics(); + if (fm.charWidth(' ') == 0) { + throw new RuntimeException("Space has char width of 0"); + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/awt/image/DrawImage/IncorrectManagedImageSourceOffset.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/awt/image/DrawImage/IncorrectManagedImageSourceOffset.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,188 @@ +/* + * 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. + */ + +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsEnvironment; +import java.awt.Image; +import java.awt.Transparency; +import java.awt.color.ColorSpace; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.ComponentColorModel; +import java.awt.image.DataBuffer; +import java.awt.image.Raster; +import java.awt.image.VolatileImage; +import java.awt.image.WritableRaster; +import java.io.File; +import java.io.IOException; + +import javax.imageio.ImageIO; + +import sun.awt.image.SunWritableRaster; + +import static java.awt.Transparency.BITMASK; +import static java.awt.Transparency.OPAQUE; +import static java.awt.Transparency.TRANSLUCENT; +import static java.awt.image.BufferedImage.TYPE_3BYTE_BGR; +import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR; +import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR_PRE; +import static java.awt.image.BufferedImage.TYPE_BYTE_BINARY; +import static java.awt.image.BufferedImage.TYPE_BYTE_INDEXED; +import static java.awt.image.BufferedImage.TYPE_CUSTOM; +import static java.awt.image.BufferedImage.TYPE_INT_ARGB; +import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE; +import static java.awt.image.BufferedImage.TYPE_INT_BGR; +import static java.awt.image.BufferedImage.TYPE_INT_RGB; + +/** + * @test + * @key headful + * @bug 8029253 6207877 + * @summary Tests asymmetric source offsets when managed image is drawn to VI. + * Results of the blit to compatibleImage are used for comparison. + * @author Sergey Bylokhov + * @modules java.desktop/sun.awt.image + * @run main/othervm -Dsun.java2d.accthreshold=0 IncorrectManagedImageSourceOffset + * @run main/othervm -Dsun.java2d.accthreshold=0 -Dsun.java2d.uiScale=1 IncorrectManagedImageSourceOffset + * @run main/othervm -Dsun.java2d.accthreshold=0 -Dsun.java2d.uiScale=2 IncorrectManagedImageSourceOffset + */ +public final class IncorrectManagedImageSourceOffset { + + // See the same test for unmanaged images: IncorrectUnmanagedImageSourceOffset + + private static final int[] TYPES = {TYPE_INT_RGB, TYPE_INT_ARGB, + TYPE_INT_ARGB_PRE, TYPE_INT_BGR, + TYPE_3BYTE_BGR, TYPE_4BYTE_ABGR, + TYPE_4BYTE_ABGR_PRE, + /*TYPE_USHORT_565_RGB, + TYPE_USHORT_555_RGB, TYPE_BYTE_GRAY, + TYPE_USHORT_GRAY,*/ TYPE_BYTE_BINARY, + TYPE_BYTE_INDEXED, TYPE_CUSTOM}; + private static final int[] TRANSPARENCIES = {OPAQUE, BITMASK, TRANSLUCENT}; + + public static void main(final String[] args) throws IOException { + for (final int viType : TRANSPARENCIES) { + for (final int biType : TYPES) { + BufferedImage bi = makeManagedBI(biType); + fill(bi); + test(bi, viType); + } + } + } + + private static void test(BufferedImage bi, int type) + throws IOException { + GraphicsEnvironment ge = GraphicsEnvironment + .getLocalGraphicsEnvironment(); + GraphicsConfiguration gc = ge.getDefaultScreenDevice() + .getDefaultConfiguration(); + VolatileImage vi = gc.createCompatibleVolatileImage(511, 255, type); + BufferedImage gold = gc.createCompatibleImage(511, 255, type); + // draw to compatible Image + Graphics2D big = gold.createGraphics(); + // force scaled blit + big.drawImage(bi, 7, 11, 127, 111, 7, 11, 127 * 2, 111, null); + big.dispose(); + // draw to volatile image + BufferedImage snapshot; + while (true) { + vi.validate(gc); + if (vi.validate(gc) != VolatileImage.IMAGE_OK) { + try { + Thread.sleep(100); + } catch (final InterruptedException ignored) { + } + continue; + } + Graphics2D vig = vi.createGraphics(); + // force scaled blit + vig.drawImage(bi, 7, 11, 127, 111, 7, 11, 127 * 2, 111, null); + vig.dispose(); + snapshot = vi.getSnapshot(); + if (vi.contentsLost()) { + try { + Thread.sleep(100); + } catch (final InterruptedException ignored) { + } + continue; + } + break; + } + // validate images + for (int x = 7; x < 127; ++x) { + for (int y = 11; y < 111; ++y) { + if (gold.getRGB(x, y) != snapshot.getRGB(x, y)) { + ImageIO.write(gold, "png", new File("gold.png")); + ImageIO.write(snapshot, "png", new File("bi.png")); + throw new RuntimeException("Test failed."); + } + } + } + } + + private static BufferedImage makeManagedBI(final int type) { + final BufferedImage bi; + if (type == TYPE_CUSTOM) { + bi = makeCustomManagedBI(); + } else { + bi = new BufferedImage(511, 255, type); + } + bi.setAccelerationPriority(1.0f); + return bi; + } + + /** + * Returns the custom buffered image, which mostly identical to + * BufferedImage.(w,h,TYPE_3BYTE_BGR), but uses the bigger scanlineStride. + * This means that the raster will have gaps, between the rows. + */ + private static BufferedImage makeCustomManagedBI() { + int w = 511, h = 255; + ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB); + int[] nBits = {8, 8, 8}; + int[] bOffs = {2, 1, 0}; + ColorModel colorModel = new ComponentColorModel(cs, nBits, false, false, + Transparency.OPAQUE, + DataBuffer.TYPE_BYTE); + WritableRaster raster = + Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, w, h, + w * 3 + 2, 3, bOffs, null); + BufferedImage bi = new BufferedImage(colorModel, raster, true, null); + SunWritableRaster.makeTrackable(raster.getDataBuffer()); + SunWritableRaster.markDirty(bi); + return bi; + } + + private static void fill(final Image image) { + final Graphics2D graphics = (Graphics2D) image.getGraphics(); + graphics.setComposite(AlphaComposite.Src); + for (int i = 0; i < image.getHeight(null); ++i) { + graphics.setColor(new Color(i, 0, 0)); + graphics.fillRect(0, i, image.getWidth(null), 1); + } + graphics.dispose(); + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageSourceOffset.java --- a/test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageSourceOffset.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/awt/image/DrawImage/IncorrectUnmanagedImageSourceOffset.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016, 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 @@ -27,30 +27,52 @@ import java.awt.GraphicsConfiguration; import java.awt.GraphicsEnvironment; import java.awt.Image; +import java.awt.Transparency; +import java.awt.color.ColorSpace; import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.ComponentColorModel; import java.awt.image.DataBuffer; import java.awt.image.DataBufferByte; import java.awt.image.DataBufferInt; import java.awt.image.DataBufferShort; +import java.awt.image.Raster; import java.awt.image.VolatileImage; +import java.awt.image.WritableRaster; import java.io.File; import java.io.IOException; import javax.imageio.ImageIO; -import static java.awt.Transparency.*; -import static java.awt.image.BufferedImage.*; +import static java.awt.Transparency.BITMASK; +import static java.awt.Transparency.OPAQUE; +import static java.awt.Transparency.TRANSLUCENT; +import static java.awt.image.BufferedImage.TYPE_3BYTE_BGR; +import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR; +import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR_PRE; +import static java.awt.image.BufferedImage.TYPE_BYTE_BINARY; +import static java.awt.image.BufferedImage.TYPE_BYTE_INDEXED; +import static java.awt.image.BufferedImage.TYPE_CUSTOM; +import static java.awt.image.BufferedImage.TYPE_INT_ARGB; +import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE; +import static java.awt.image.BufferedImage.TYPE_INT_BGR; +import static java.awt.image.BufferedImage.TYPE_INT_RGB; /** * @test * @key headful - * @bug 8029253 + * @bug 8029253 6207877 * @summary Tests asymmetric source offsets when unmanaged image is drawn to VI. * Results of the blit to compatibleImage are used for comparison. * @author Sergey Bylokhov + * @run main/othervm IncorrectUnmanagedImageSourceOffset + * @run main/othervm -Dsun.java2d.uiScale=1 IncorrectUnmanagedImageSourceOffset + * @run main/othervm -Dsun.java2d.uiScale=2 IncorrectUnmanagedImageSourceOffset */ public final class IncorrectUnmanagedImageSourceOffset { + // See the same test for managed images: IncorrectManagedImageSourceOffset + private static final int[] TYPES = {TYPE_INT_RGB, TYPE_INT_ARGB, TYPE_INT_ARGB_PRE, TYPE_INT_BGR, TYPE_3BYTE_BGR, TYPE_4BYTE_ABGR, @@ -58,7 +80,7 @@ /*TYPE_USHORT_565_RGB, TYPE_USHORT_555_RGB, TYPE_BYTE_GRAY, TYPE_USHORT_GRAY,*/ TYPE_BYTE_BINARY, - TYPE_BYTE_INDEXED}; + TYPE_BYTE_INDEXED, TYPE_CUSTOM}; private static final int[] TRANSPARENCIES = {OPAQUE, BITMASK, TRANSLUCENT}; public static void main(final String[] args) throws IOException { @@ -122,7 +144,12 @@ } private static BufferedImage makeUnmanagedBI(final int type) { - final BufferedImage bi = new BufferedImage(511, 255, type); + final BufferedImage bi; + if (type == TYPE_CUSTOM) { + bi = makeCustomUnmanagedBI(); + } else { + bi = new BufferedImage(511, 255, type); + } final DataBuffer db = bi.getRaster().getDataBuffer(); if (db instanceof DataBufferInt) { ((DataBufferInt) db).getData(); @@ -130,15 +157,30 @@ ((DataBufferShort) db).getData(); } else if (db instanceof DataBufferByte) { ((DataBufferByte) db).getData(); - } else { - try { - bi.setAccelerationPriority(0.0f); - } catch (final Throwable ignored) { - } } + bi.setAccelerationPriority(0.0f); return bi; } + /** + * Returns the custom buffered image, which mostly identical to + * BufferedImage.(w,h,TYPE_3BYTE_BGR), but uses the bigger scanlineStride. + * This means that the raster will have gaps, between the rows. + */ + private static BufferedImage makeCustomUnmanagedBI() { + int w = 511, h = 255; + ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB); + int[] nBits = {8, 8, 8}; + int[] bOffs = {2, 1, 0}; + ColorModel colorModel = new ComponentColorModel(cs, nBits, false, false, + Transparency.OPAQUE, + DataBuffer.TYPE_BYTE); + WritableRaster raster = + Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, w, h, + w * 3 + 2, 3, bOffs, null); + return new BufferedImage(colorModel, raster, true, null); + } + private static void fill(final Image image) { final Graphics2D graphics = (Graphics2D) image.getGraphics(); graphics.setComposite(AlphaComposite.Src); diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/awt/image/DrawImage/SimpleManagedImage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/awt/image/DrawImage/SimpleManagedImage.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,196 @@ +/* + * 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. + */ + +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsEnvironment; +import java.awt.Image; +import java.awt.Transparency; +import java.awt.color.ColorSpace; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.ComponentColorModel; +import java.awt.image.DataBuffer; +import java.awt.image.Raster; +import java.awt.image.VolatileImage; +import java.awt.image.WritableRaster; +import java.io.File; +import java.io.IOException; + +import javax.imageio.ImageIO; + +import sun.awt.image.SunWritableRaster; + +import static java.awt.Transparency.BITMASK; +import static java.awt.Transparency.OPAQUE; +import static java.awt.Transparency.TRANSLUCENT; +import static java.awt.image.BufferedImage.TYPE_3BYTE_BGR; +import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR; +import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR_PRE; +import static java.awt.image.BufferedImage.TYPE_BYTE_BINARY; +import static java.awt.image.BufferedImage.TYPE_BYTE_INDEXED; +import static java.awt.image.BufferedImage.TYPE_CUSTOM; +import static java.awt.image.BufferedImage.TYPE_INT_ARGB; +import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE; +import static java.awt.image.BufferedImage.TYPE_INT_BGR; +import static java.awt.image.BufferedImage.TYPE_INT_RGB; + +/** + * @test + * @key headful + * @bug 8029253 6207877 + * @summary Tests the case when managed image is drawn to VI. + * Results of the blit to compatibleImage are used for comparison. + * @author Sergey Bylokhov + * @modules java.desktop/sun.awt.image + * @run main/othervm -Dsun.java2d.accthreshold=0 SimpleManagedImage + * @run main/othervm -Dsun.java2d.accthreshold=0 -Dsun.java2d.uiScale=1 SimpleManagedImage + * @run main/othervm -Dsun.java2d.accthreshold=0 -Dsun.java2d.uiScale=2 SimpleManagedImage + */ +public final class SimpleManagedImage { + + // See the same test for unmanaged images: SimpleUnmanagedImage + + private static final int[] TYPES = {TYPE_INT_RGB, TYPE_INT_ARGB, + TYPE_INT_ARGB_PRE, TYPE_INT_BGR, + TYPE_3BYTE_BGR, TYPE_4BYTE_ABGR, + TYPE_4BYTE_ABGR_PRE, + /*TYPE_USHORT_565_RGB, + TYPE_USHORT_555_RGB, TYPE_BYTE_GRAY, + TYPE_USHORT_GRAY,*/ TYPE_BYTE_BINARY, + TYPE_BYTE_INDEXED, TYPE_CUSTOM}; + private static final int[] TRANSPARENCIES = {OPAQUE, BITMASK, TRANSLUCENT}; + + public static void main(final String[] args) throws IOException { + for (final int viType : TRANSPARENCIES) { + for (final int biType : TYPES) { + BufferedImage bi = makeManagedBI(biType); + fill(bi); + test(bi, viType); + } + } + } + + private static void test(BufferedImage bi, int type) + throws IOException { + GraphicsEnvironment ge = GraphicsEnvironment + .getLocalGraphicsEnvironment(); + GraphicsConfiguration gc = ge.getDefaultScreenDevice() + .getDefaultConfiguration(); + VolatileImage vi = gc.createCompatibleVolatileImage(1000, 1000, type); + BufferedImage gold = gc.createCompatibleImage(1000, 1000, type); + // draw to compatible Image + init(gold); + Graphics2D big = gold.createGraphics(); + big.drawImage(bi, 7, 11, null); + big.dispose(); + // draw to volatile image + BufferedImage snapshot; + while (true) { + vi.validate(gc); + if (vi.validate(gc) != VolatileImage.IMAGE_OK) { + try { + Thread.sleep(100); + } catch (final InterruptedException ignored) { + } + continue; + } + init(vi); + Graphics2D vig = vi.createGraphics(); + vig.drawImage(bi, 7, 11, null); + vig.dispose(); + snapshot = vi.getSnapshot(); + if (vi.contentsLost()) { + try { + Thread.sleep(100); + } catch (final InterruptedException ignored) { + } + continue; + } + break; + } + // validate images + for (int x = 0; x < 1000; ++x) { + for (int y = 0; y < 1000; ++y) { + if (gold.getRGB(x, y) != snapshot.getRGB(x, y)) { + ImageIO.write(gold, "png", new File("gold.png")); + ImageIO.write(snapshot, "png", new File("bi.png")); + throw new RuntimeException("Test failed."); + } + } + } + } + + private static BufferedImage makeManagedBI(final int type) { + final BufferedImage bi; + if (type == TYPE_CUSTOM) { + bi = makeCustomManagedBI(); + } else { + bi = new BufferedImage(511, 255, type); + } + bi.setAccelerationPriority(1.0f); + return bi; + } + + /** + * Returns the custom buffered image, which mostly identical to + * BufferedImage.(w,h,TYPE_3BYTE_BGR), but uses the bigger scanlineStride. + * This means that the raster will have gaps, between the rows. + */ + private static BufferedImage makeCustomManagedBI() { + int w = 511, h = 255; + ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB); + int[] nBits = {8, 8, 8}; + int[] bOffs = {2, 1, 0}; + ColorModel colorModel = new ComponentColorModel(cs, nBits, false, false, + Transparency.OPAQUE, + DataBuffer.TYPE_BYTE); + WritableRaster raster = + Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, w, h, + w * 3 + 2, 3, bOffs, null); + BufferedImage bi = new BufferedImage(colorModel, raster, true, null); + SunWritableRaster.makeTrackable(raster.getDataBuffer()); + SunWritableRaster.markDirty(bi); + return bi; + } + + private static void init(final Image image) { + final Graphics2D graphics = (Graphics2D) image.getGraphics(); + graphics.setComposite(AlphaComposite.Src); + graphics.setColor(new Color(0, 0, 0, 0)); + graphics.fillRect(0, 0, image.getWidth(null), image.getHeight(null)); + graphics.dispose(); + } + + private static void fill(final Image image) { + final Graphics2D graphics = (Graphics2D) image.getGraphics(); + graphics.setComposite(AlphaComposite.Src); + for (int i = 0; i < image.getHeight(null); ++i) { + graphics.setColor(new Color(i, 0, 0)); + graphics.fillRect(0, i, image.getWidth(null), 1); + } + graphics.dispose(); + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/awt/image/DrawImage/SimpleUnmanagedImage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/awt/image/DrawImage/SimpleUnmanagedImage.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,201 @@ +/* + * 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. + */ + +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsEnvironment; +import java.awt.Image; +import java.awt.Transparency; +import java.awt.color.ColorSpace; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.ComponentColorModel; +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferByte; +import java.awt.image.DataBufferInt; +import java.awt.image.DataBufferShort; +import java.awt.image.Raster; +import java.awt.image.VolatileImage; +import java.awt.image.WritableRaster; +import java.io.File; +import java.io.IOException; + +import javax.imageio.ImageIO; + +import static java.awt.Transparency.BITMASK; +import static java.awt.Transparency.OPAQUE; +import static java.awt.Transparency.TRANSLUCENT; +import static java.awt.image.BufferedImage.TYPE_3BYTE_BGR; +import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR; +import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR_PRE; +import static java.awt.image.BufferedImage.TYPE_BYTE_BINARY; +import static java.awt.image.BufferedImage.TYPE_BYTE_INDEXED; +import static java.awt.image.BufferedImage.TYPE_CUSTOM; +import static java.awt.image.BufferedImage.TYPE_INT_ARGB; +import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE; +import static java.awt.image.BufferedImage.TYPE_INT_BGR; +import static java.awt.image.BufferedImage.TYPE_INT_RGB; + +/** + * @test + * @key headful + * @bug 8029253 6207877 + * @summary Tests the case when unmanaged image is drawn to VI. + * Results of the blit to compatibleImage are used for comparison. + * @author Sergey Bylokhov + * @run main/othervm SimpleUnmanagedImage + * @run main/othervm -Dsun.java2d.uiScale=1 SimpleUnmanagedImage + * @run main/othervm -Dsun.java2d.uiScale=2 SimpleUnmanagedImage + */ +public final class SimpleUnmanagedImage { + + // See the same test for managed images: SimpleManagedImage + + private static final int[] TYPES = {TYPE_INT_RGB, TYPE_INT_ARGB, + TYPE_INT_ARGB_PRE, TYPE_INT_BGR, + TYPE_3BYTE_BGR, TYPE_4BYTE_ABGR, + TYPE_4BYTE_ABGR_PRE, + /*TYPE_USHORT_565_RGB, + TYPE_USHORT_555_RGB, TYPE_BYTE_GRAY, + TYPE_USHORT_GRAY,*/ TYPE_BYTE_BINARY, + TYPE_BYTE_INDEXED, TYPE_CUSTOM}; + private static final int[] TRANSPARENCIES = {OPAQUE, BITMASK, TRANSLUCENT}; + + public static void main(final String[] args) throws IOException { + for (final int viType : TRANSPARENCIES) { + for (final int biType : TYPES) { + BufferedImage bi = makeUnmanagedBI(biType); + fill(bi); + test(bi, viType); + } + } + } + + private static void test(BufferedImage bi, int type) + throws IOException { + GraphicsEnvironment ge = GraphicsEnvironment + .getLocalGraphicsEnvironment(); + GraphicsConfiguration gc = ge.getDefaultScreenDevice() + .getDefaultConfiguration(); + VolatileImage vi = gc.createCompatibleVolatileImage(1000, 1000, type); + BufferedImage gold = gc.createCompatibleImage(1000, 1000, type); + // draw to compatible Image + init(gold); + Graphics2D big = gold.createGraphics(); + big.drawImage(bi, 7, 11, null); + big.dispose(); + // draw to volatile image + BufferedImage snapshot; + while (true) { + vi.validate(gc); + if (vi.validate(gc) != VolatileImage.IMAGE_OK) { + try { + Thread.sleep(100); + } catch (final InterruptedException ignored) { + } + continue; + } + init(vi); + Graphics2D vig = vi.createGraphics(); + vig.drawImage(bi, 7, 11, null); + vig.dispose(); + snapshot = vi.getSnapshot(); + if (vi.contentsLost()) { + try { + Thread.sleep(100); + } catch (final InterruptedException ignored) { + } + continue; + } + break; + } + // validate images + for (int x = 0; x < 1000; ++x) { + for (int y = 0; y < 1000; ++y) { + if (gold.getRGB(x, y) != snapshot.getRGB(x, y)) { + ImageIO.write(gold, "png", new File("gold.png")); + ImageIO.write(snapshot, "png", new File("bi.png")); + throw new RuntimeException("Test failed."); + } + } + } + } + + private static BufferedImage makeUnmanagedBI(final int type) { + final BufferedImage bi; + if (type == TYPE_CUSTOM) { + bi = makeCustomUnmanagedBI(); + } else { + bi = new BufferedImage(511, 255, type); + } + final DataBuffer db = bi.getRaster().getDataBuffer(); + if (db instanceof DataBufferInt) { + ((DataBufferInt) db).getData(); + } else if (db instanceof DataBufferShort) { + ((DataBufferShort) db).getData(); + } else if (db instanceof DataBufferByte) { + ((DataBufferByte) db).getData(); + } + bi.setAccelerationPriority(0.0f); + return bi; + } + + /** + * Returns the custom buffered image, which mostly identical to + * BufferedImage.(w,h,TYPE_3BYTE_BGR), but uses the bigger scanlineStride. + * This means that the raster will have gaps, between the rows. + */ + private static BufferedImage makeCustomUnmanagedBI() { + int w = 511, h = 255; + ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB); + int[] nBits = {8, 8, 8}; + int[] bOffs = {2, 1, 0}; + ColorModel colorModel = new ComponentColorModel(cs, nBits, false, false, + Transparency.OPAQUE, + DataBuffer.TYPE_BYTE); + WritableRaster raster = + Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, w, h, + w * 3 + 2, 3, bOffs, null); + return new BufferedImage(colorModel, raster, true, null); + } + + private static void init(final Image image) { + final Graphics2D graphics = (Graphics2D) image.getGraphics(); + graphics.setComposite(AlphaComposite.Src); + graphics.setColor(new Color(0, 0, 0, 0)); + graphics.fillRect(0, 0, image.getWidth(null), image.getHeight(null)); + graphics.dispose(); + } + + private static void fill(final Image image) { + final Graphics2D graphics = (Graphics2D) image.getGraphics(); + graphics.setComposite(AlphaComposite.Src); + for (int i = 0; i < image.getHeight(null); ++i) { + graphics.setColor(new Color(i, 0, 0)); + graphics.fillRect(0, i, image.getWidth(null), 1); + } + graphics.dispose(); + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/io/FilePermission/SpecTests.java --- a/test/jdk/java/io/FilePermission/SpecTests.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/io/FilePermission/SpecTests.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 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 @@ -22,11 +22,10 @@ */ /** - * * @test - * @bug 4955804 - * @summary Tests for FilePermission constructor spec for null - * and empty String parameters + * @bug 4955804 8230407 + * @summary Tests for FilePermission constructor spec for null, + * empty and misformated String parameters */ import java.io.*; @@ -37,10 +36,11 @@ String ILE = "java.lang.IllegalArgumentException"; String NPE = "java.lang.NullPointerException"; - String names[] = {"", null, "foo", "foo", "foo", "foo"}; + String names[] = {"", null, "foo", "foo", "foo", "foo", "foo"}; String actions[] = {"read", "read", "", null, "junk", - "read,write,execute,delete,rename"}; - String exps[] = { null, NPE, ILE, ILE, ILE, ILE }; + "read,write,execute,delete,rename", + ",read"}; + String exps[] = { null, NPE, ILE, ILE, ILE, ILE, ILE }; FilePermission permit; for (int i = 0; i < names.length; i++) { @@ -54,15 +54,19 @@ " for name:" + names[i] + " actions:" + actions[i]); } else { - System.out.println(names[i] + ", [" + actions[i] + "] " + - "resulted in " + exps[i] + " as Expected"); + System.out.println(names[i] + ", [" + actions[i] + "] " + + "resulted in " + exps[i] + " as Expected"); + continue; } - } - if (exps[i] == null) { + } + if (exps[i] == null) { System.out.println(names[i] + ", [" + actions[i] + "] " + - "resulted in No Exception as Expected"); + "resulted in No Exception as Expected"); + } else { + throw new Exception("Expecting: " + exps[i] + + " for name:" + names[i] + + " actions:" + actions[i]); } } - } } diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/lang/String/Formatted.java --- a/test/jdk/java/lang/String/Formatted.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/lang/String/Formatted.java Wed Oct 23 14:01:17 2019 -0400 @@ -25,7 +25,8 @@ * @test * bug 8203444 * @summary Unit tests for instance versions of String#format - * @run main Formatted + * @compile --enable-preview -source 14 Formatted.java + * @run main/othervm --enable-preview Formatted */ import java.util.Locale; diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/lang/String/StripIndent.java --- a/test/jdk/java/lang/String/StripIndent.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/lang/String/StripIndent.java Wed Oct 23 14:01:17 2019 -0400 @@ -25,7 +25,8 @@ * @test * @bug 8223775 * @summary This exercises String#stripIndent patterns and limits. - * @run main StripIndent + * @compile --enable-preview -source 14 StripIndent.java + * @run main/othervm --enable-preview StripIndent */ public class StripIndent { diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/lang/String/TranslateEscapes.java --- a/test/jdk/java/lang/String/TranslateEscapes.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/lang/String/TranslateEscapes.java Wed Oct 23 14:01:17 2019 -0400 @@ -25,7 +25,8 @@ * @test * @bug 8223780 * @summary This exercises String#translateEscapes patterns and limits. - * @run main TranslateEscapes + * @compile --enable-preview -source 14 TranslateEscapes.java + * @run main/othervm --enable-preview TranslateEscapes */ public class TranslateEscapes { diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/lang/ThreadLocal/ReplaceStaleEntry.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/lang/ThreadLocal/ReplaceStaleEntry.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,83 @@ +/* + * 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 8209824 + * @summary per latest JDK code coverage report, 2 methods replaceStaleEntry + * and prevIndex in ThreadLocal.ThreadLocalMap are not touched + * by any JDK regression tests, this is to trigger the code paths. + * @modules java.base/java.lang:+open + * @run testng ReplaceStaleEntry + */ + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +import static org.testng.Assert.assertEquals; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +public class ReplaceStaleEntry { + + public static int INITIAL_CAPACITY; + + @BeforeClass + public static void setup() throws Exception { + Class clazz = Class.forName("java.lang.ThreadLocal$ThreadLocalMap"); + Field f = clazz.getDeclaredField("INITIAL_CAPACITY"); + f.setAccessible(true); + INITIAL_CAPACITY = f.getInt(null); + System.out.println("INITIAL_CAPACITY: " + INITIAL_CAPACITY); + } + + /** + * This test triggers the code path to replaceStaleEntry, so as prevIndex is + * triggered too as it's called by replaceStaleEntry. + * The code paths must be triggered by reusing an already used entry in the + * map's entry table. The code below + * 1. first occupies the entries + * 2. then expunges the entries by removing strong references to thread locals + * 3. then reuse some of entries by adding more thread locals to the thread + * and, the above steps are run for several times by adding more and more + * thread locals, also trigger rehash of the map. + */ + @Test + public static void test() { + Map locals = new HashMap<>(); + for (int j = 1; j < 32; j *= 2) { + int loop = INITIAL_CAPACITY * j; + for (int i = 0; i < loop; i++) { + ThreadLocal l = new ThreadLocal(); + l.set(i); + locals.put(i, l); + } + locals.keySet().stream().forEach(i -> { + assertEquals((int)locals.get(i).get(), (int)i, "Unexpected thread local value!"); + }); + locals.clear(); + System.gc(); + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/math/BigInteger/DivisionOverflow.java --- a/test/jdk/java/math/BigInteger/DivisionOverflow.java Wed Oct 23 13:53:41 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2011, 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. - */ - -/* - * @test - * @bug 8022780 - * @summary Test division of large values - * @run main/othervm -Xshare:off DivisionOverflow - * @author Dmitry Nadezhin - */ -import java.math.BigInteger; - -public class DivisionOverflow { - - public static void main(String[] args) { - try { - BigInteger a = BigInteger.ONE.shiftLeft(2147483646); - BigInteger b = BigInteger.ONE.shiftLeft(1568); - BigInteger[] qr = a.divideAndRemainder(b); - BigInteger q = qr[0]; - BigInteger r = qr[1]; - if (!r.equals(BigInteger.ZERO)) { - throw new RuntimeException("Incorrect signum() of remainder " + r.signum()); - } - if (q.bitLength() != 2147482079) { - throw new RuntimeException("Incorrect bitLength() of quotient " + q.bitLength()); - } - System.out.println("Division of large values passed without overflow."); - } catch (OutOfMemoryError e) { - // possible - System.err.println("DivisionOverflow skipped: OutOfMemoryError"); - System.err.println("Run jtreg with -javaoption:-Xmx8g"); - } - } -} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/math/BigInteger/StringConstructorOverflow.java --- a/test/jdk/java/math/BigInteger/StringConstructorOverflow.java Wed Oct 23 13:53:41 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +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. - * - * 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 8021204 - * @summary Test constructor BigInteger(String val, int radix) on very long string - * @ignore This test has huge memory requirements - * @run main/othervm -Xshare:off -Xmx8g StringConstructorOverflow - * @author Dmitry Nadezhin - */ -import java.math.BigInteger; - -public class StringConstructorOverflow { - - // String with hexadecimal value pow(2,pow(2,34))+1 - private static String makeLongHexString() { - StringBuilder sb = new StringBuilder(); - sb.append('1'); - for (int i = 0; i < (1 << 30) - 1; i++) { - sb.append('0'); - } - sb.append('1'); - return sb.toString(); - } - - public static void main(String[] args) { - try { - BigInteger bi = new BigInteger(makeLongHexString(), 16); - if (bi.compareTo(BigInteger.ONE) <= 0) { - throw new RuntimeException("Incorrect result " + bi.toString()); - } - } catch (ArithmeticException e) { - // expected - System.out.println("Overflow is reported by ArithmeticException, as expected"); - } catch (OutOfMemoryError e) { - // possible - System.err.println("StringConstructorOverflow skipped: OutOfMemoryError"); - System.err.println("Run jtreg with -javaoption:-Xmx8g"); - } - } -} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/math/BigInteger/SymmetricRangeTests.java --- a/test/jdk/java/math/BigInteger/SymmetricRangeTests.java Wed Oct 23 13:53:41 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,665 +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. - * - * 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 - * @library /test/lib - * @ignore This test has huge memory requirements - * @run main/timeout=180/othervm -Xmx8g SymmetricRangeTests - * @bug 6910473 8021204 8021203 9005933 8074460 8078672 - * @summary Test range of BigInteger values (use -Dseed=X to set PRNG seed) - * @author Dmitry Nadezhin - * @key randomness - */ -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.Arrays; -import java.math.BigInteger; -import java.util.Random; -import jdk.test.lib.RandomFactory; - -public class SymmetricRangeTests { - - private static final BigInteger MAX_VALUE = makeMaxValue(); - private static final BigInteger MIN_VALUE = MAX_VALUE.negate(); - - private static BigInteger makeMaxValue() { - byte[] ba = new byte[1 << 28]; - Arrays.fill(ba, (byte) 0xFF); - ba[0] = (byte) 0x7F; - return new BigInteger(ba); - } - - private static void check(String msg, BigInteger actual, BigInteger expected) { - if (!actual.equals(expected)) { - throw new RuntimeException(msg + ".bitLength()=" + actual.bitLength()); - } - } - - private static void check(String msg, double actual, double expected) { - if (actual != expected) { - throw new RuntimeException(msg + "=" + actual); - } - } - - private static void check(String msg, float actual, float expected) { - if (actual != expected) { - throw new RuntimeException(msg + "=" + actual); - } - } - - private static void check(String msg, long actual, long expected) { - if (actual != expected) { - throw new RuntimeException(msg + "=" + actual); - } - } - - private static void check(String msg, int actual, int expected) { - if (actual != expected) { - throw new RuntimeException(msg + "=" + actual); - } - } - - private static void testOverflowInMakePositive() { - System.out.println("Testing overflow in BigInteger.makePositive"); - byte[] ba = new byte[Integer.MAX_VALUE - 2]; - ba[0] = (byte) 0x80; - try { - BigInteger actual = new BigInteger(ba); - throw new RuntimeException("new BigInteger(ba).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testBug8021204() { - System.out.println("Testing Bug 8021204"); - StringBuilder sb = new StringBuilder(); - sb.append('1'); - for (int i = 0; i < (1 << 30) - 1; i++) { - sb.append('0'); - } - sb.append('1'); - String s = sb.toString(); - sb = null; - try { - BigInteger actual = new BigInteger(s, 16); - throw new RuntimeException("new BigInteger(\"1000...001\").bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testOverflowInBitSieve() { - System.out.println("Testing overflow in BitSieve.sieveSingle"); - int bitLength = (5 << 27) - 1; - try { - Random random = RandomFactory.getRandom(); - BigInteger actual = new BigInteger(bitLength, 0, random); - throw new RuntimeException("new BigInteger(bitLength, 0, null).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - try { - BigInteger bi = BigInteger.ONE.shiftLeft(bitLength - 1).subtract(BigInteger.ONE); - BigInteger actual = bi.nextProbablePrime(); - throw new RuntimeException("bi.nextActualPrime().bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testAdd() { - System.out.println("Testing BigInteger.add"); - try { - BigInteger actual = MAX_VALUE.add(BigInteger.ONE); - throw new RuntimeException("BigInteger.MAX_VALUE.add(BigInteger.ONE).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testSubtract() { - System.out.println("Testing BigInteger.subtract"); - try { - BigInteger actual = MIN_VALUE.subtract(BigInteger.ONE); - throw new RuntimeException("BigInteger.MIN_VALUE.subtract(BigInteger.ONE).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testMultiply() { - System.out.println("Testing BigInteger.multiply"); - int py = 2000; - int px = Integer.MAX_VALUE - py; - BigInteger x = BigInteger.ONE.shiftLeft(px); - BigInteger y = BigInteger.ONE.shiftLeft(py); - try { - BigInteger actual = x.multiply(y); - throw new RuntimeException("(1 << " + px + " ) * (1 << " + py + ").bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testDivide() { - System.out.println("Testing BigInteger.divide"); - check("BigInteger.MIN_VALUE.divide(BigInteger.valueOf(-1))", - MIN_VALUE.divide(BigInteger.valueOf(-1)), MAX_VALUE); - check("BigInteger.MIN_VALUE.divide(BigInteger.ONE)", - MIN_VALUE.divide(BigInteger.ONE), MIN_VALUE); - } - - private static void testDivideAndRemainder(String msg, BigInteger dividend, BigInteger divisor, - BigInteger expectedQuotent, BigInteger expectedRemainder) { - BigInteger[] qr = dividend.divideAndRemainder(divisor); - check(msg + "[0]", qr[0], expectedQuotent); - check(msg + "[1]", qr[1], expectedRemainder); - } - - private static void testDivideAndRemainder() { - System.out.println("Testing BigInteger.divideAndRemainder"); - testDivideAndRemainder("BigInteger.MIN_VALUE.divideAndRemainder(BigInteger.valueOf(-1))", - MIN_VALUE, BigInteger.valueOf(-1), - MAX_VALUE, - BigInteger.ZERO); - } - - private static void testBug9005933() { - System.out.println("Testing Bug 9005933"); - int dividendPow = 2147483646; - int divisorPow = 1568; - BigInteger dividend = BigInteger.ONE.shiftLeft(dividendPow); - BigInteger divisor = BigInteger.ONE.shiftLeft(divisorPow); - testDivideAndRemainder("(1 << " + dividendPow + ").divideAndRemainder(1 << " + divisorPow + ")", - dividend, divisor, - BigInteger.ONE.shiftLeft(dividendPow - divisorPow), - BigInteger.ZERO); - } - - private static void testRemainder() { - System.out.println("Testing BigInteger.remainder"); - check("BigInteger.MIN_VALUE.remainder(BigInteger.valueOf(-1))", - MIN_VALUE.remainder(BigInteger.valueOf(-1)), BigInteger.ZERO); - } - - private static void testPow() { - System.out.println("Testing BigInteger.pow"); - check("BigInteger.MIN_VALUE.pow(1)", - MIN_VALUE.pow(1), MIN_VALUE); - try { - BigInteger actual = BigInteger.valueOf(4).pow(Integer.MAX_VALUE); - throw new RuntimeException("BigInteger.valueOf(4).pow(Integer.MAX_VALUE).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testGcd() { - System.out.println("Testing BigInteger.gcd"); - check("BigInteger.MIN_VALUE.gcd(BigInteger.MIN_VALUE)", - MIN_VALUE.gcd(MIN_VALUE), MAX_VALUE); - check("BigInteger.MIN_VALUE.gcd(BigInteger.ZERO)", - MIN_VALUE.gcd(BigInteger.ZERO), MAX_VALUE); - check("BigInteger.ZERO.gcd(MIN_VALUE)", - BigInteger.ZERO.gcd(MIN_VALUE), MAX_VALUE); - } - - private static void testAbs() { - System.out.println("Testing BigInteger.abs"); - check("BigInteger.MIN_VALUE.abs()", - MIN_VALUE.abs(), MAX_VALUE); - check("BigInteger.MAX_VALUE.abs()", - MAX_VALUE.abs(), MAX_VALUE); - } - - private static void testNegate() { - System.out.println("Testing BigInteger.negate"); - check("BigInteger.MIN_VALUE.negate()", - MIN_VALUE.negate(), MAX_VALUE); - check("BigInteger.MAX_VALUE.negate()", - MAX_VALUE.negate(), MIN_VALUE); - } - - private static void testMod() { - System.out.println("Testing BigInteger.mod"); - check("BigInteger.MIN_VALUE.mod(BigInteger.MAX_VALUE)", - MIN_VALUE.mod(MAX_VALUE), BigInteger.ZERO); - check("BigInteger.MAX_VALUE.mod(BigInteger.MAX_VALUE)", - MIN_VALUE.mod(MAX_VALUE), BigInteger.ZERO); - } - - private static void testModPow() { - System.out.println("Testing BigInteger.modPow"); - BigInteger x = BigInteger.valueOf(3); - BigInteger m = BigInteger.valueOf(-4).subtract(MIN_VALUE); - check("BigInteger.valueOf(3).modPow(BigInteger.ONE, m)", - x.modPow(BigInteger.ONE, m), x); - } - - // slow test - private static void testModInverse() { - System.out.println("Testing BigInteger.modInverse"); - check("BigInteger.MIN_VALUE.modInverse(BigInteger.MAX_VALUE)", - MIN_VALUE.modInverse(MAX_VALUE), MAX_VALUE.subtract(BigInteger.ONE)); - } - - private static void testShiftLeft() { - System.out.println("Testing BigInteger.shiftLeft"); - try { - BigInteger actual = MIN_VALUE.shiftLeft(1); - throw new RuntimeException("BigInteger.MIN_VALUE.shiftLeft(1).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - try { - BigInteger actual = MAX_VALUE.shiftLeft(1); - throw new RuntimeException("BigInteger.MAX_VALUE.shiftLeft(1).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testShiftRight() { - System.out.println("Testing BigInteger.shiftRight"); - try { - BigInteger actual = MIN_VALUE.shiftRight(-1); - throw new RuntimeException("BigInteger.MIN_VALUE.shiftRight(-1).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - try { - BigInteger actual = MAX_VALUE.shiftRight(-1); - throw new RuntimeException("BigInteger.MAX_VALUE.shiftRight(-1).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testAnd() { - System.out.println("Testing BigInteger.and"); - check("BigInteger.MIN_VALUE.and(BigInteger.MIN_VALUE)", - MIN_VALUE.and(MIN_VALUE), MIN_VALUE); - check("BigInteger.MAX_VALUE.and(BigInteger.MAX_VALUE)", - MAX_VALUE.and(MAX_VALUE), MAX_VALUE); - check("BigInteger.MIN_VALUE.and(BigInteger.MAX_VALUE)", - MIN_VALUE.and(MAX_VALUE), BigInteger.ONE); - try { - BigInteger actual = MIN_VALUE.and(BigInteger.valueOf(-2)); - throw new RuntimeException("BigInteger.MIN_VALUE.and(-2)).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testOr() { - System.out.println("Testing BigInteger.or"); - check("BigInteger.MIN_VALUE.or(BigInteger.MIN_VALUE)", - MIN_VALUE.or(MIN_VALUE), MIN_VALUE); - check("BigInteger.MAX_VALUE.or(BigInteger.MAX_VALUE)", - MAX_VALUE.or(MAX_VALUE), MAX_VALUE); - check("BigInteger.MIN_VALUE.and(BigInteger.MAX_VALUE)", - MIN_VALUE.or(MAX_VALUE), BigInteger.valueOf(-1)); - } - - private static void testXor() { - System.out.println("Testing BigInteger.xor"); - check("BigInteger.MIN_VALUE.xor(BigInteger.MIN_VALUE)", - MIN_VALUE.xor(MIN_VALUE), BigInteger.ZERO); - check("BigInteger.MAX_VALUE.xor(BigInteger.MAX_VALUE)", - MAX_VALUE.xor(MAX_VALUE), BigInteger.ZERO); - check("BigInteger.MIN_VALUE.xor(BigInteger.MAX_VALUE)", - MIN_VALUE.xor(MAX_VALUE), BigInteger.valueOf(-2)); - try { - BigInteger actual = MIN_VALUE.xor(BigInteger.ONE); - throw new RuntimeException("BigInteger.MIN_VALUE.xor(BigInteger.ONE)).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testNot() { - System.out.println("Testing BigInteger.not"); - check("BigInteger.MIN_VALUE.not()", - MIN_VALUE.not(), MAX_VALUE.subtract(BigInteger.ONE)); - try { - BigInteger actual = MAX_VALUE.not(); - throw new RuntimeException("BigInteger.MAX_VALUE.not()).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testSetBit() { - System.out.println("Testing BigInteger.setBit"); - check("BigInteger.MIN_VALUE.setBit(" + Integer.MAX_VALUE + ")", - MIN_VALUE.setBit(Integer.MAX_VALUE), MIN_VALUE); - try { - BigInteger actual = MAX_VALUE.setBit(Integer.MAX_VALUE); - throw new RuntimeException("BigInteger.MAX_VALUE.setBit(" + Integer.MAX_VALUE + ").bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testClearBit() { - System.out.println("Testing BigInteger.clearBit"); - check("BigInteger.MAX_VALUE.clearBit(" + Integer.MAX_VALUE + ")", - MAX_VALUE.clearBit(Integer.MAX_VALUE), MAX_VALUE); - try { - BigInteger actual = MIN_VALUE.clearBit(Integer.MAX_VALUE); - throw new RuntimeException("BigInteger.MIN_VALUE.clearBit(" + Integer.MAX_VALUE + ").bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - try { - BigInteger actual = MIN_VALUE.clearBit(0); - throw new RuntimeException("BigInteger.MIN_VALUE.clearBit(0).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testFlipBit() { - System.out.println("Testing BigInteger.flipBit"); - try { - BigInteger actual = MIN_VALUE.flipBit(Integer.MAX_VALUE); - throw new RuntimeException("BigInteger.MIN_VALUE.flipBit(" + Integer.MAX_VALUE + ").bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - try { - BigInteger actual = MIN_VALUE.flipBit(0); - throw new RuntimeException("BigInteger.MIN_VALUE.flipBit(0).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - try { - BigInteger actual = MAX_VALUE.flipBit(Integer.MAX_VALUE); - throw new RuntimeException("BigInteger.MAX_VALUE.flipBit(" + Integer.MAX_VALUE + ").bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testGetLowestSetBit() { - System.out.println("Testing BigInteger.getLowestSetBit"); - check("BigInteger.MIN_VALUE.getLowestSetBit()", - MIN_VALUE.getLowestSetBit(), 0); - check("BigInteger.MAX_VALUE.getLowestSetBit()", - MAX_VALUE.getLowestSetBit(), 0); - } - - private static void testBitLength() { - System.out.println("Testing BigInteger.bitLength"); - check("BigInteger.MIN_NEXT.bitLength()", - MIN_VALUE.bitLength(), Integer.MAX_VALUE); - check("BigInteger.MAX_VALUE.bitLength()", - MAX_VALUE.bitLength(), Integer.MAX_VALUE); - } - - private static void testBitCount() { - System.out.println("Testing BigInteger.bitCount"); - check("BigInteger.MIN_VALUE.bitCount()", - MIN_VALUE.bitCount(), Integer.MAX_VALUE - 1); - check("BigInteger.MAX_VALUE.bitCount()", - MAX_VALUE.bitCount(), Integer.MAX_VALUE); - } - - private static void testToString(String msg, int radix, BigInteger bi, int length, String startsWith, char c) { - String s = bi.toString(radix); - if (s.length() != length) { - throw new RuntimeException(msg + ".length=" + s.length()); - } - if (!s.startsWith(startsWith)) { - throw new RuntimeException(msg + "[0]=" + s.substring(0, startsWith.length())); - } - for (int i = startsWith.length(); i < s.length(); i++) { - if (s.charAt(i) != c) { - throw new RuntimeException(msg + "[" + i + "]='" + s.charAt(i) + "'"); - } - } - } - - private static void testToString() { - System.out.println("Testing BigInteger.toString"); - testToString("BigInteger.MIN_VALUE.toString(16)=", 16, - BigInteger.valueOf(-1).shiftLeft(Integer.MAX_VALUE - 1), - (1 << 29) + 1, "-4", '0'); - } - - private static void testToByteArrayWithConstructor(String msg, BigInteger bi, int length, byte msb, byte b, byte lsb) { - byte[] ba = bi.toByteArray(); - if (ba.length != length) { - throw new RuntimeException(msg + ".length=" + ba.length); - } - if (ba[0] != msb) { - throw new RuntimeException(msg + "[0]=" + ba[0]); - } - for (int i = 1; i < ba.length - 1; i++) { - if (ba[i] != b) { - throw new RuntimeException(msg + "[" + i + "]=" + ba[i]); - } - } - if (ba[ba.length - 1] != lsb) { - throw new RuntimeException(msg + "[" + (ba.length - 1) + "]=" + ba[ba.length - 1]); - } - BigInteger actual = new BigInteger(ba); - if (!actual.equals(bi)) { - throw new RuntimeException(msg + ".bitLength()=" + actual.bitLength()); - } - } - - private static void testToByteArrayWithConstructor() { - System.out.println("Testing BigInteger.toByteArray with constructor"); - testToByteArrayWithConstructor("BigInteger.MIN_VALUE.toByteArray()", - MIN_VALUE, (1 << 28), (byte) 0x80, (byte) 0x00, (byte) 0x01); - testToByteArrayWithConstructor("BigInteger.MAX_VALUE.toByteArray()", - MAX_VALUE, (1 << 28), (byte) 0x7f, (byte) 0xff, (byte) 0xff); - - byte[] ba = new byte[1 << 28]; - ba[0] = (byte) 0x80; - try { - BigInteger actual = new BigInteger(-1, ba); - throw new RuntimeException("new BigInteger(-1, ba).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - try { - BigInteger actual = new BigInteger(1, ba); - throw new RuntimeException("new BigInteger(1, ba).bitLength()=" + actual.bitLength()); - } catch (ArithmeticException e) { - // expected - } - } - - private static void testIntValue() { - System.out.println("Testing BigInteger.intValue"); - check("BigInteger.MIN_VALUE.intValue()", - MIN_VALUE.intValue(), 1); - check("BigInteger.MAX_VALUE.floatValue()", - MAX_VALUE.intValue(), -1); - } - - private static void testLongValue() { - System.out.println("Testing BigInteger.longValue"); - check("BigInteger.MIN_VALUE.longValue()", - MIN_VALUE.longValue(), 1L); - check("BigInteger.MAX_VALUE.longValue()", - MAX_VALUE.longValue(), -1L); - } - - private static void testFloatValue() { - System.out.println("Testing BigInteger.floatValue, Bug 8021203"); - check("BigInteger.MIN_VALUE_.floatValue()", - MIN_VALUE.floatValue(), Float.NEGATIVE_INFINITY); - check("BigInteger.MAX_VALUE.floatValue()", - MAX_VALUE.floatValue(), Float.POSITIVE_INFINITY); - } - - private static void testDoubleValue() { - System.out.println("Testing BigInteger.doubleValue, Bug 8021203"); - check("BigInteger.MIN_VALUE.doubleValue()", - MIN_VALUE.doubleValue(), Double.NEGATIVE_INFINITY); - check("BigInteger.MAX_VALUE.doubleValue()", - MAX_VALUE.doubleValue(), Double.POSITIVE_INFINITY); - } - - private static void testSerialization(String msg, BigInteger bi) { - try { - ByteArrayOutputStream baOut = new ByteArrayOutputStream((1 << 28) + 1000); - ObjectOutputStream out = new ObjectOutputStream(baOut); - out.writeObject(bi); - out.close(); - out = null; - byte[] ba = baOut.toByteArray(); - baOut = null; - ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(ba)); - BigInteger actual = (BigInteger) in.readObject(); - if (!actual.equals(bi)) { - throw new RuntimeException(msg + ".bitLength()=" + actual.bitLength()); - } - } catch (IOException | ClassNotFoundException e) { - throw new RuntimeException(msg + " raised exception ", e); - } - } - - private static void testSerialization() { - System.out.println("Testing BigInteger serialization"); - testSerialization("BigInteger.MIN_VALUE.intValue()", - MIN_VALUE); - testSerialization("BigInteger.MAX_VALUE.floatValue()", - MAX_VALUE); - } - - private static void testLongValueExact() { - System.out.println("Testing BigInteger.longValueExact"); - try { - long actual = MIN_VALUE.longValueExact(); - throw new RuntimeException("BigInteger.MIN_VALUE.longValueExact()= " + actual); - } catch (ArithmeticException e) { - // excpected - } - try { - long actual = MAX_VALUE.longValueExact(); - throw new RuntimeException("BigInteger.MAX_VALUE.longValueExact()= " + actual); - } catch (ArithmeticException e) { - // excpected - } - } - - private static void testIntValueExact() { - System.out.println("Testing BigInteger.intValueExact"); - try { - long actual = MIN_VALUE.intValueExact(); - throw new RuntimeException("BigInteger.MIN_VALUE.intValueExact()= " + actual); - } catch (ArithmeticException e) { - // excpected - } - try { - long actual = MAX_VALUE.intValueExact(); - throw new RuntimeException("BigInteger.MAX_VALUE.intValueExact()= " + actual); - } catch (ArithmeticException e) { - // excpected - } - } - - private static void testShortValueExact() { - System.out.println("Testing BigInteger.shortValueExact"); - try { - long actual = MIN_VALUE.shortValueExact(); - throw new RuntimeException("BigInteger.MIN_VALUE.shortValueExact()= " + actual); - } catch (ArithmeticException e) { - // excpected - } - try { - long actual = MAX_VALUE.shortValueExact(); - throw new RuntimeException("BigInteger.MAX_VALUE.shortValueExact()= " + actual); - } catch (ArithmeticException e) { - // excpected - } - } - - private static void testByteValueExact() { - System.out.println("Testing BigInteger.byteValueExact"); - try { - long actual = MIN_VALUE.byteValueExact(); - throw new RuntimeException("BigInteger.MIN_VALUE.byteValueExact()= " + actual); - } catch (ArithmeticException e) { - // excpected - } - try { - long actual = MAX_VALUE.byteValueExact(); - throw new RuntimeException("BigInteger.MAX_VALUE.byteValueExact()= " + actual); - } catch (ArithmeticException e) { - // excpected - } - } - - public static void main(String... args) { - testOverflowInMakePositive(); - testBug8021204(); - testOverflowInBitSieve(); - testAdd(); - testSubtract(); - testMultiply(); - testDivide(); - testDivideAndRemainder(); - testBug9005933(); - testRemainder(); - testPow(); - testGcd(); - testAbs(); - testNegate(); - testMod(); - testModPow(); -// testModInverse(); - testShiftLeft(); - testShiftRight(); - testAnd(); - testOr(); - testXor(); - testNot(); - testSetBit(); - testClearBit(); - testFlipBit(); - testGetLowestSetBit(); - testBitLength(); - testBitCount(); - testToString(); - testToByteArrayWithConstructor(); - testIntValue(); - testLongValue(); - testFloatValue(); - testDoubleValue(); - testSerialization(); - testLongValueExact(); - testIntValueExact(); - testShortValueExact(); - testByteValueExact(); - } -} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/math/BigInteger/largeMemory/DivisionOverflow.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/math/BigInteger/largeMemory/DivisionOverflow.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,56 @@ +/* + * 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 + * 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 8022780 + * @summary Test division of large values + * @requires os.maxMemory > 8g + * @run main/othervm -Xshare:off -Xmx8g DivisionOverflow + * @author Dmitry Nadezhin + */ +import java.math.BigInteger; + +public class DivisionOverflow { + + public static void main(String[] args) { + try { + BigInteger a = BigInteger.ONE.shiftLeft(2147483646); + BigInteger b = BigInteger.ONE.shiftLeft(1568); + BigInteger[] qr = a.divideAndRemainder(b); + BigInteger q = qr[0]; + BigInteger r = qr[1]; + if (!r.equals(BigInteger.ZERO)) { + throw new RuntimeException("Incorrect signum() of remainder " + r.signum()); + } + if (q.bitLength() != 2147482079) { + throw new RuntimeException("Incorrect bitLength() of quotient " + q.bitLength()); + } + System.out.println("Division of large values passed without overflow."); + } catch (OutOfMemoryError e) { + // possible + System.err.println("DivisionOverflow skipped: OutOfMemoryError"); + System.err.println("Run jtreg with -javaoption:-Xmx8g"); + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/math/BigInteger/largeMemory/StringConstructorOverflow.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/math/BigInteger/largeMemory/StringConstructorOverflow.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,62 @@ +/* + * 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. + * + * 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 8021204 + * @summary Test constructor BigInteger(String val, int radix) on very long string + * @requires os.maxMemory > 8g + * @run main/othervm -Xshare:off -Xmx8g StringConstructorOverflow + * @author Dmitry Nadezhin + */ +import java.math.BigInteger; + +public class StringConstructorOverflow { + + // String with hexadecimal value pow(2,pow(2,34))+1 + private static String makeLongHexString() { + StringBuilder sb = new StringBuilder(); + sb.append('1'); + for (int i = 0; i < (1 << 30) - 1; i++) { + sb.append('0'); + } + sb.append('1'); + return sb.toString(); + } + + public static void main(String[] args) { + try { + BigInteger bi = new BigInteger(makeLongHexString(), 16); + if (bi.compareTo(BigInteger.ONE) <= 0) { + throw new RuntimeException("Incorrect result " + bi.toString()); + } + } catch (ArithmeticException e) { + // expected + System.out.println("Overflow is reported by ArithmeticException, as expected"); + } catch (OutOfMemoryError e) { + // possible + System.err.println("StringConstructorOverflow skipped: OutOfMemoryError"); + System.err.println("Run jtreg with -javaoption:-Xmx8g"); + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/math/BigInteger/largeMemory/SymmetricRangeTests.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/math/BigInteger/largeMemory/SymmetricRangeTests.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,665 @@ +/* + * 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. + * + * 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 6910473 8021204 8021203 9005933 8074460 8078672 + * @summary Test range of BigInteger values (use -Dseed=X to set PRNG seed) + * @library /test/lib + * @requires os.maxMemory > 8g + * @run main/timeout=180/othervm -Xmx8g SymmetricRangeTests + * @author Dmitry Nadezhin + * @key randomness + */ +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.Arrays; +import java.math.BigInteger; +import java.util.Random; +import jdk.test.lib.RandomFactory; + +public class SymmetricRangeTests { + + private static final BigInteger MAX_VALUE = makeMaxValue(); + private static final BigInteger MIN_VALUE = MAX_VALUE.negate(); + + private static BigInteger makeMaxValue() { + byte[] ba = new byte[1 << 28]; + Arrays.fill(ba, (byte) 0xFF); + ba[0] = (byte) 0x7F; + return new BigInteger(ba); + } + + private static void check(String msg, BigInteger actual, BigInteger expected) { + if (!actual.equals(expected)) { + throw new RuntimeException(msg + ".bitLength()=" + actual.bitLength()); + } + } + + private static void check(String msg, double actual, double expected) { + if (actual != expected) { + throw new RuntimeException(msg + "=" + actual); + } + } + + private static void check(String msg, float actual, float expected) { + if (actual != expected) { + throw new RuntimeException(msg + "=" + actual); + } + } + + private static void check(String msg, long actual, long expected) { + if (actual != expected) { + throw new RuntimeException(msg + "=" + actual); + } + } + + private static void check(String msg, int actual, int expected) { + if (actual != expected) { + throw new RuntimeException(msg + "=" + actual); + } + } + + private static void testOverflowInMakePositive() { + System.out.println("Testing overflow in BigInteger.makePositive"); + byte[] ba = new byte[Integer.MAX_VALUE - 2]; + ba[0] = (byte) 0x80; + try { + BigInteger actual = new BigInteger(ba); + throw new RuntimeException("new BigInteger(ba).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testBug8021204() { + System.out.println("Testing Bug 8021204"); + StringBuilder sb = new StringBuilder(); + sb.append('1'); + for (int i = 0; i < (1 << 30) - 1; i++) { + sb.append('0'); + } + sb.append('1'); + String s = sb.toString(); + sb = null; + try { + BigInteger actual = new BigInteger(s, 16); + throw new RuntimeException("new BigInteger(\"1000...001\").bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testOverflowInBitSieve() { + System.out.println("Testing overflow in BitSieve.sieveSingle"); + int bitLength = (5 << 27) - 1; + try { + Random random = RandomFactory.getRandom(); + BigInteger actual = new BigInteger(bitLength, 0, random); + throw new RuntimeException("new BigInteger(bitLength, 0, null).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + try { + BigInteger bi = BigInteger.ONE.shiftLeft(bitLength - 1).subtract(BigInteger.ONE); + BigInteger actual = bi.nextProbablePrime(); + throw new RuntimeException("bi.nextActualPrime().bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testAdd() { + System.out.println("Testing BigInteger.add"); + try { + BigInteger actual = MAX_VALUE.add(BigInteger.ONE); + throw new RuntimeException("BigInteger.MAX_VALUE.add(BigInteger.ONE).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testSubtract() { + System.out.println("Testing BigInteger.subtract"); + try { + BigInteger actual = MIN_VALUE.subtract(BigInteger.ONE); + throw new RuntimeException("BigInteger.MIN_VALUE.subtract(BigInteger.ONE).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testMultiply() { + System.out.println("Testing BigInteger.multiply"); + int py = 2000; + int px = Integer.MAX_VALUE - py; + BigInteger x = BigInteger.ONE.shiftLeft(px); + BigInteger y = BigInteger.ONE.shiftLeft(py); + try { + BigInteger actual = x.multiply(y); + throw new RuntimeException("(1 << " + px + " ) * (1 << " + py + ").bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testDivide() { + System.out.println("Testing BigInteger.divide"); + check("BigInteger.MIN_VALUE.divide(BigInteger.valueOf(-1))", + MIN_VALUE.divide(BigInteger.valueOf(-1)), MAX_VALUE); + check("BigInteger.MIN_VALUE.divide(BigInteger.ONE)", + MIN_VALUE.divide(BigInteger.ONE), MIN_VALUE); + } + + private static void testDivideAndRemainder(String msg, BigInteger dividend, BigInteger divisor, + BigInteger expectedQuotent, BigInteger expectedRemainder) { + BigInteger[] qr = dividend.divideAndRemainder(divisor); + check(msg + "[0]", qr[0], expectedQuotent); + check(msg + "[1]", qr[1], expectedRemainder); + } + + private static void testDivideAndRemainder() { + System.out.println("Testing BigInteger.divideAndRemainder"); + testDivideAndRemainder("BigInteger.MIN_VALUE.divideAndRemainder(BigInteger.valueOf(-1))", + MIN_VALUE, BigInteger.valueOf(-1), + MAX_VALUE, + BigInteger.ZERO); + } + + private static void testBug9005933() { + System.out.println("Testing Bug 9005933"); + int dividendPow = 2147483646; + int divisorPow = 1568; + BigInteger dividend = BigInteger.ONE.shiftLeft(dividendPow); + BigInteger divisor = BigInteger.ONE.shiftLeft(divisorPow); + testDivideAndRemainder("(1 << " + dividendPow + ").divideAndRemainder(1 << " + divisorPow + ")", + dividend, divisor, + BigInteger.ONE.shiftLeft(dividendPow - divisorPow), + BigInteger.ZERO); + } + + private static void testRemainder() { + System.out.println("Testing BigInteger.remainder"); + check("BigInteger.MIN_VALUE.remainder(BigInteger.valueOf(-1))", + MIN_VALUE.remainder(BigInteger.valueOf(-1)), BigInteger.ZERO); + } + + private static void testPow() { + System.out.println("Testing BigInteger.pow"); + check("BigInteger.MIN_VALUE.pow(1)", + MIN_VALUE.pow(1), MIN_VALUE); + try { + BigInteger actual = BigInteger.valueOf(4).pow(Integer.MAX_VALUE); + throw new RuntimeException("BigInteger.valueOf(4).pow(Integer.MAX_VALUE).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testGcd() { + System.out.println("Testing BigInteger.gcd"); + check("BigInteger.MIN_VALUE.gcd(BigInteger.MIN_VALUE)", + MIN_VALUE.gcd(MIN_VALUE), MAX_VALUE); + check("BigInteger.MIN_VALUE.gcd(BigInteger.ZERO)", + MIN_VALUE.gcd(BigInteger.ZERO), MAX_VALUE); + check("BigInteger.ZERO.gcd(MIN_VALUE)", + BigInteger.ZERO.gcd(MIN_VALUE), MAX_VALUE); + } + + private static void testAbs() { + System.out.println("Testing BigInteger.abs"); + check("BigInteger.MIN_VALUE.abs()", + MIN_VALUE.abs(), MAX_VALUE); + check("BigInteger.MAX_VALUE.abs()", + MAX_VALUE.abs(), MAX_VALUE); + } + + private static void testNegate() { + System.out.println("Testing BigInteger.negate"); + check("BigInteger.MIN_VALUE.negate()", + MIN_VALUE.negate(), MAX_VALUE); + check("BigInteger.MAX_VALUE.negate()", + MAX_VALUE.negate(), MIN_VALUE); + } + + private static void testMod() { + System.out.println("Testing BigInteger.mod"); + check("BigInteger.MIN_VALUE.mod(BigInteger.MAX_VALUE)", + MIN_VALUE.mod(MAX_VALUE), BigInteger.ZERO); + check("BigInteger.MAX_VALUE.mod(BigInteger.MAX_VALUE)", + MIN_VALUE.mod(MAX_VALUE), BigInteger.ZERO); + } + + private static void testModPow() { + System.out.println("Testing BigInteger.modPow"); + BigInteger x = BigInteger.valueOf(3); + BigInteger m = BigInteger.valueOf(-4).subtract(MIN_VALUE); + check("BigInteger.valueOf(3).modPow(BigInteger.ONE, m)", + x.modPow(BigInteger.ONE, m), x); + } + + // slow test + private static void testModInverse() { + System.out.println("Testing BigInteger.modInverse"); + check("BigInteger.MIN_VALUE.modInverse(BigInteger.MAX_VALUE)", + MIN_VALUE.modInverse(MAX_VALUE), MAX_VALUE.subtract(BigInteger.ONE)); + } + + private static void testShiftLeft() { + System.out.println("Testing BigInteger.shiftLeft"); + try { + BigInteger actual = MIN_VALUE.shiftLeft(1); + throw new RuntimeException("BigInteger.MIN_VALUE.shiftLeft(1).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + try { + BigInteger actual = MAX_VALUE.shiftLeft(1); + throw new RuntimeException("BigInteger.MAX_VALUE.shiftLeft(1).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testShiftRight() { + System.out.println("Testing BigInteger.shiftRight"); + try { + BigInteger actual = MIN_VALUE.shiftRight(-1); + throw new RuntimeException("BigInteger.MIN_VALUE.shiftRight(-1).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + try { + BigInteger actual = MAX_VALUE.shiftRight(-1); + throw new RuntimeException("BigInteger.MAX_VALUE.shiftRight(-1).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testAnd() { + System.out.println("Testing BigInteger.and"); + check("BigInteger.MIN_VALUE.and(BigInteger.MIN_VALUE)", + MIN_VALUE.and(MIN_VALUE), MIN_VALUE); + check("BigInteger.MAX_VALUE.and(BigInteger.MAX_VALUE)", + MAX_VALUE.and(MAX_VALUE), MAX_VALUE); + check("BigInteger.MIN_VALUE.and(BigInteger.MAX_VALUE)", + MIN_VALUE.and(MAX_VALUE), BigInteger.ONE); + try { + BigInteger actual = MIN_VALUE.and(BigInteger.valueOf(-2)); + throw new RuntimeException("BigInteger.MIN_VALUE.and(-2)).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testOr() { + System.out.println("Testing BigInteger.or"); + check("BigInteger.MIN_VALUE.or(BigInteger.MIN_VALUE)", + MIN_VALUE.or(MIN_VALUE), MIN_VALUE); + check("BigInteger.MAX_VALUE.or(BigInteger.MAX_VALUE)", + MAX_VALUE.or(MAX_VALUE), MAX_VALUE); + check("BigInteger.MIN_VALUE.and(BigInteger.MAX_VALUE)", + MIN_VALUE.or(MAX_VALUE), BigInteger.valueOf(-1)); + } + + private static void testXor() { + System.out.println("Testing BigInteger.xor"); + check("BigInteger.MIN_VALUE.xor(BigInteger.MIN_VALUE)", + MIN_VALUE.xor(MIN_VALUE), BigInteger.ZERO); + check("BigInteger.MAX_VALUE.xor(BigInteger.MAX_VALUE)", + MAX_VALUE.xor(MAX_VALUE), BigInteger.ZERO); + check("BigInteger.MIN_VALUE.xor(BigInteger.MAX_VALUE)", + MIN_VALUE.xor(MAX_VALUE), BigInteger.valueOf(-2)); + try { + BigInteger actual = MIN_VALUE.xor(BigInteger.ONE); + throw new RuntimeException("BigInteger.MIN_VALUE.xor(BigInteger.ONE)).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testNot() { + System.out.println("Testing BigInteger.not"); + check("BigInteger.MIN_VALUE.not()", + MIN_VALUE.not(), MAX_VALUE.subtract(BigInteger.ONE)); + try { + BigInteger actual = MAX_VALUE.not(); + throw new RuntimeException("BigInteger.MAX_VALUE.not()).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testSetBit() { + System.out.println("Testing BigInteger.setBit"); + check("BigInteger.MIN_VALUE.setBit(" + Integer.MAX_VALUE + ")", + MIN_VALUE.setBit(Integer.MAX_VALUE), MIN_VALUE); + try { + BigInteger actual = MAX_VALUE.setBit(Integer.MAX_VALUE); + throw new RuntimeException("BigInteger.MAX_VALUE.setBit(" + Integer.MAX_VALUE + ").bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testClearBit() { + System.out.println("Testing BigInteger.clearBit"); + check("BigInteger.MAX_VALUE.clearBit(" + Integer.MAX_VALUE + ")", + MAX_VALUE.clearBit(Integer.MAX_VALUE), MAX_VALUE); + try { + BigInteger actual = MIN_VALUE.clearBit(Integer.MAX_VALUE); + throw new RuntimeException("BigInteger.MIN_VALUE.clearBit(" + Integer.MAX_VALUE + ").bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + try { + BigInteger actual = MIN_VALUE.clearBit(0); + throw new RuntimeException("BigInteger.MIN_VALUE.clearBit(0).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testFlipBit() { + System.out.println("Testing BigInteger.flipBit"); + try { + BigInteger actual = MIN_VALUE.flipBit(Integer.MAX_VALUE); + throw new RuntimeException("BigInteger.MIN_VALUE.flipBit(" + Integer.MAX_VALUE + ").bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + try { + BigInteger actual = MIN_VALUE.flipBit(0); + throw new RuntimeException("BigInteger.MIN_VALUE.flipBit(0).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + try { + BigInteger actual = MAX_VALUE.flipBit(Integer.MAX_VALUE); + throw new RuntimeException("BigInteger.MAX_VALUE.flipBit(" + Integer.MAX_VALUE + ").bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testGetLowestSetBit() { + System.out.println("Testing BigInteger.getLowestSetBit"); + check("BigInteger.MIN_VALUE.getLowestSetBit()", + MIN_VALUE.getLowestSetBit(), 0); + check("BigInteger.MAX_VALUE.getLowestSetBit()", + MAX_VALUE.getLowestSetBit(), 0); + } + + private static void testBitLength() { + System.out.println("Testing BigInteger.bitLength"); + check("BigInteger.MIN_NEXT.bitLength()", + MIN_VALUE.bitLength(), Integer.MAX_VALUE); + check("BigInteger.MAX_VALUE.bitLength()", + MAX_VALUE.bitLength(), Integer.MAX_VALUE); + } + + private static void testBitCount() { + System.out.println("Testing BigInteger.bitCount"); + check("BigInteger.MIN_VALUE.bitCount()", + MIN_VALUE.bitCount(), Integer.MAX_VALUE - 1); + check("BigInteger.MAX_VALUE.bitCount()", + MAX_VALUE.bitCount(), Integer.MAX_VALUE); + } + + private static void testToString(String msg, int radix, BigInteger bi, int length, String startsWith, char c) { + String s = bi.toString(radix); + if (s.length() != length) { + throw new RuntimeException(msg + ".length=" + s.length()); + } + if (!s.startsWith(startsWith)) { + throw new RuntimeException(msg + "[0]=" + s.substring(0, startsWith.length())); + } + for (int i = startsWith.length(); i < s.length(); i++) { + if (s.charAt(i) != c) { + throw new RuntimeException(msg + "[" + i + "]='" + s.charAt(i) + "'"); + } + } + } + + private static void testToString() { + System.out.println("Testing BigInteger.toString"); + testToString("BigInteger.MIN_VALUE.toString(16)=", 16, + BigInteger.valueOf(-1).shiftLeft(Integer.MAX_VALUE - 1), + (1 << 29) + 1, "-4", '0'); + } + + private static void testToByteArrayWithConstructor(String msg, BigInteger bi, int length, byte msb, byte b, byte lsb) { + byte[] ba = bi.toByteArray(); + if (ba.length != length) { + throw new RuntimeException(msg + ".length=" + ba.length); + } + if (ba[0] != msb) { + throw new RuntimeException(msg + "[0]=" + ba[0]); + } + for (int i = 1; i < ba.length - 1; i++) { + if (ba[i] != b) { + throw new RuntimeException(msg + "[" + i + "]=" + ba[i]); + } + } + if (ba[ba.length - 1] != lsb) { + throw new RuntimeException(msg + "[" + (ba.length - 1) + "]=" + ba[ba.length - 1]); + } + BigInteger actual = new BigInteger(ba); + if (!actual.equals(bi)) { + throw new RuntimeException(msg + ".bitLength()=" + actual.bitLength()); + } + } + + private static void testToByteArrayWithConstructor() { + System.out.println("Testing BigInteger.toByteArray with constructor"); + testToByteArrayWithConstructor("BigInteger.MIN_VALUE.toByteArray()", + MIN_VALUE, (1 << 28), (byte) 0x80, (byte) 0x00, (byte) 0x01); + testToByteArrayWithConstructor("BigInteger.MAX_VALUE.toByteArray()", + MAX_VALUE, (1 << 28), (byte) 0x7f, (byte) 0xff, (byte) 0xff); + + byte[] ba = new byte[1 << 28]; + ba[0] = (byte) 0x80; + try { + BigInteger actual = new BigInteger(-1, ba); + throw new RuntimeException("new BigInteger(-1, ba).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + try { + BigInteger actual = new BigInteger(1, ba); + throw new RuntimeException("new BigInteger(1, ba).bitLength()=" + actual.bitLength()); + } catch (ArithmeticException e) { + // expected + } + } + + private static void testIntValue() { + System.out.println("Testing BigInteger.intValue"); + check("BigInteger.MIN_VALUE.intValue()", + MIN_VALUE.intValue(), 1); + check("BigInteger.MAX_VALUE.floatValue()", + MAX_VALUE.intValue(), -1); + } + + private static void testLongValue() { + System.out.println("Testing BigInteger.longValue"); + check("BigInteger.MIN_VALUE.longValue()", + MIN_VALUE.longValue(), 1L); + check("BigInteger.MAX_VALUE.longValue()", + MAX_VALUE.longValue(), -1L); + } + + private static void testFloatValue() { + System.out.println("Testing BigInteger.floatValue, Bug 8021203"); + check("BigInteger.MIN_VALUE_.floatValue()", + MIN_VALUE.floatValue(), Float.NEGATIVE_INFINITY); + check("BigInteger.MAX_VALUE.floatValue()", + MAX_VALUE.floatValue(), Float.POSITIVE_INFINITY); + } + + private static void testDoubleValue() { + System.out.println("Testing BigInteger.doubleValue, Bug 8021203"); + check("BigInteger.MIN_VALUE.doubleValue()", + MIN_VALUE.doubleValue(), Double.NEGATIVE_INFINITY); + check("BigInteger.MAX_VALUE.doubleValue()", + MAX_VALUE.doubleValue(), Double.POSITIVE_INFINITY); + } + + private static void testSerialization(String msg, BigInteger bi) { + try { + ByteArrayOutputStream baOut = new ByteArrayOutputStream((1 << 28) + 1000); + ObjectOutputStream out = new ObjectOutputStream(baOut); + out.writeObject(bi); + out.close(); + out = null; + byte[] ba = baOut.toByteArray(); + baOut = null; + ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(ba)); + BigInteger actual = (BigInteger) in.readObject(); + if (!actual.equals(bi)) { + throw new RuntimeException(msg + ".bitLength()=" + actual.bitLength()); + } + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(msg + " raised exception ", e); + } + } + + private static void testSerialization() { + System.out.println("Testing BigInteger serialization"); + testSerialization("BigInteger.MIN_VALUE.intValue()", + MIN_VALUE); + testSerialization("BigInteger.MAX_VALUE.floatValue()", + MAX_VALUE); + } + + private static void testLongValueExact() { + System.out.println("Testing BigInteger.longValueExact"); + try { + long actual = MIN_VALUE.longValueExact(); + throw new RuntimeException("BigInteger.MIN_VALUE.longValueExact()= " + actual); + } catch (ArithmeticException e) { + // excpected + } + try { + long actual = MAX_VALUE.longValueExact(); + throw new RuntimeException("BigInteger.MAX_VALUE.longValueExact()= " + actual); + } catch (ArithmeticException e) { + // excpected + } + } + + private static void testIntValueExact() { + System.out.println("Testing BigInteger.intValueExact"); + try { + long actual = MIN_VALUE.intValueExact(); + throw new RuntimeException("BigInteger.MIN_VALUE.intValueExact()= " + actual); + } catch (ArithmeticException e) { + // excpected + } + try { + long actual = MAX_VALUE.intValueExact(); + throw new RuntimeException("BigInteger.MAX_VALUE.intValueExact()= " + actual); + } catch (ArithmeticException e) { + // excpected + } + } + + private static void testShortValueExact() { + System.out.println("Testing BigInteger.shortValueExact"); + try { + long actual = MIN_VALUE.shortValueExact(); + throw new RuntimeException("BigInteger.MIN_VALUE.shortValueExact()= " + actual); + } catch (ArithmeticException e) { + // excpected + } + try { + long actual = MAX_VALUE.shortValueExact(); + throw new RuntimeException("BigInteger.MAX_VALUE.shortValueExact()= " + actual); + } catch (ArithmeticException e) { + // excpected + } + } + + private static void testByteValueExact() { + System.out.println("Testing BigInteger.byteValueExact"); + try { + long actual = MIN_VALUE.byteValueExact(); + throw new RuntimeException("BigInteger.MIN_VALUE.byteValueExact()= " + actual); + } catch (ArithmeticException e) { + // excpected + } + try { + long actual = MAX_VALUE.byteValueExact(); + throw new RuntimeException("BigInteger.MAX_VALUE.byteValueExact()= " + actual); + } catch (ArithmeticException e) { + // excpected + } + } + + public static void main(String... args) { + testOverflowInMakePositive(); + testBug8021204(); + testOverflowInBitSieve(); + testAdd(); + testSubtract(); + testMultiply(); + testDivide(); + testDivideAndRemainder(); + testBug9005933(); + testRemainder(); + testPow(); + testGcd(); + testAbs(); + testNegate(); + testMod(); + testModPow(); +// testModInverse(); + testShiftLeft(); + testShiftRight(); + testAnd(); + testOr(); + testXor(); + testNot(); + testSetBit(); + testClearBit(); + testFlipBit(); + testGetLowestSetBit(); + testBitLength(); + testBitCount(); + testToString(); + testToByteArrayWithConstructor(); + testIntValue(); + testLongValue(); + testFloatValue(); + testDoubleValue(); + testSerialization(); + testLongValueExact(); + testIntValueExact(); + testShortValueExact(); + testByteValueExact(); + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/net/InetSocketAddress/ToString.java --- a/test/jdk/java/net/InetSocketAddress/ToString.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/net/InetSocketAddress/ToString.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 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,19 +23,141 @@ /* * @test - * @bug 4464064 - * @summary InetSocketAddress.toString() throws NPE with unresolved address + * @bug 8225499 4464064 + * @library /test/lib + * @summary InetSocketAddress::toString not friendly to IPv6 literal addresses + * @run testng/othervm ToString + * @run testng/othervm -Djava.net.preferIPv4Stack=true ToString + * @run testng/othervm -Djava.net.preferIPv6Addresses=true ToString */ import java.net.*; -import java.io.*; +import jdk.test.lib.net.IPSupport; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; public class ToString { - public static void main (String args[]){ + private static final String loopbackAddr; + private static final String wildcardAddr; + private static final String localAddr; + + static { + try { + InetAddress loopback = InetAddress.getLoopbackAddress(); + String addr = loopback.getHostAddress(); + if (loopback instanceof Inet6Address) { + addr = "[" + addr + "]"; + } + loopbackAddr = addr; + + InetSocketAddress isa = new InetSocketAddress((InetAddress) null, 80); + addr = isa.getAddress().toString(); + if (isa.getAddress() instanceof Inet6Address) { + addr = "::/[0:0:0:0:0:0:0:0]"; + } + wildcardAddr = addr; + + InetAddress ia = InetAddress.getLocalHost(); + addr = ia.toString(); + if (ia instanceof Inet6Address) { + addr = ia.getHostName() + "/[" + ia.getHostAddress() + "]"; + } + localAddr = addr; + + } catch (UnknownHostException uhe) { + throw new RuntimeException(uhe); + } + } + + @BeforeTest + public void setup() { + IPSupport.throwSkippedExceptionIfNonOperational(); + } + + @Test + // InetSocketAddress.toString() throws NPE with unresolved address + public static void NPETest() { + System.out.println(new InetSocketAddress("unresolved", 12345)); + } + + @DataProvider(name = "hostPortArgs") + public Object[][] createArgs1() { + return new Object[][]{ + // hostname, port number, expected string in format + // /: or + // /: if address is unresolved + {"::1", 80, "/[0:0:0:0:0:0:0:1]:80"}, + {"fedc:ba98:7654:3210:fedc:ba98:7654:3210", 80, "/[fedc:ba98:7654:3210:fedc:ba98:7654:3210]:80"}, + {"::192.9.5.5", 80, "/[0:0:0:0:0:0:c009:505]:80"}, + {"127.0.0.1", 80, "/127.0.0.1:80"}, + {"::ffff:192.0.2.128", 80, "/192.0.2.128:80"}, + {"0", 80, "/0.0.0.0:80"}, + {":", 80, ":/:80"}, + {":1", 80, ":1/:80"} + }; + } - System.out.println(new InetSocketAddress("unresolved", 12345)); + @Test(dataProvider = "hostPortArgs") + public static void testConstructor(String host, int port, String string) { + String received = new InetSocketAddress(host, port).toString(); + + if (!string.equals(received)) { + throw new RuntimeException("Expected: " + string + " Received: " + received); + } + } + + @DataProvider(name = "addrPortArgs") + public Object[][] createArgs2() { + InetAddress nullAddr = null; + try { + return new Object[][]{ + // InetAddress, port number, expected string + {InetAddress.getLoopbackAddress(), 80, "localhost/" + loopbackAddr + ":80"}, + {InetAddress.getLocalHost(), 80, localAddr + ":80"}, + {InetAddress.getByAddress(new byte[]{1, 1, 1, 1}), 80, "/1.1.1.1:80"}, + {InetAddress.getByAddress(new byte[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}), 80, "/[101:101:101:101:101:101:101:101]:80"}, + {InetAddress.getByName("225.225.225.0"), 80, "/225.225.225.0:80"}, + {nullAddr, 80, wildcardAddr + ":80"} + }; + } catch (UnknownHostException uhe) { + throw new RuntimeException("Data provider creation failed: " + uhe, uhe); + } + } + @Test(dataProvider = "addrPortArgs") + public static void testConstructor(InetAddress addr, int port, String string) { + String received = new InetSocketAddress(addr, port).toString(); + + if (!string.equals(received)) { + throw new RuntimeException("Expected: " + string + " Received: " + received); + } + } + + @DataProvider(name = "unresolved") + public Object[][] createArgs3() { + return new Object[][]{ + // hostname, port number, expected string + {"::1", 80, "::1/:80"}, + {"fedc:ba98:7654:3210:fedc:ba98:7654:3210", 80, "fedc:ba98:7654:3210:fedc:ba98:7654:3210/:80"}, + {"::192.9.5.5", 80, "::192.9.5.5/:80"}, + {"127.0.0.1", 80, "127.0.0.1/:80"}, + {"::ffff:192.0.2.128", 80, "::ffff:192.0.2.128/:80"}, + {"0", 80, "0/:80"}, + {"foo", 80, "foo/:80"}, + {":", 80, ":/:80"}, + {":1", 80, ":1/:80"} + }; + } + + @Test(dataProvider = "unresolved") + public static void testCreateUnresolved(String host, int port, String string) { + String received = InetSocketAddress.createUnresolved(host, port).toString(); + + if (!string.equals(received)) { + throw new RuntimeException("Expected: " + string + " Received: " + received); + } } } diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/net/SocketPermission/Ctor.java --- a/test/jdk/java/net/SocketPermission/Ctor.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/net/SocketPermission/Ctor.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 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,19 +23,64 @@ /* * @test - * @bug 4391898 + * @bug 4391898 8230407 * @summary SocketPermission(":",...) throws ArrayIndexOutOfBoundsException + * SocketPermission constructor argument checks + * @run testng Ctor */ -import java.net.*; +import java.net.SocketPermission; +import org.testng.annotations.Test; +import static java.lang.System.out; +import static org.testng.Assert.*; public class Ctor { - public static void main(String[] args) { - try { - SocketPermission sp = new java.net.SocketPermission(":", "connect"); - } catch (java.lang.ArrayIndexOutOfBoundsException e) { - throw new RuntimeException(e); - } - System.out.println("Test passed!!!"); + + static final Class NPE = NullPointerException.class; + static final Class IAE = IllegalArgumentException.class; + + @Test + public void positive() { + // ArrayIndexOutOfBoundsException is the bug, 4391898, exists + SocketPermission sp1 = new SocketPermission(":", "connect"); + } + + @Test + public void npe() { + NullPointerException e; + e = expectThrows(NPE, () -> new SocketPermission(null, null)); + out.println("caught expected NPE: " + e); + e = expectThrows(NPE, () -> new SocketPermission("foo", null)); + out.println("caught expected NPE: " + e); + e = expectThrows(NPE, () -> new SocketPermission(null, "connect")); + out.println("caught expected NPE: " + e); + } + + @Test + public void iae() { + IllegalArgumentException e; + // host + e = expectThrows(IAE, () -> new SocketPermission("1:2:3:4", "connect")); + out.println("caught expected IAE: " + e); + e = expectThrows(IAE, () -> new SocketPermission("foo:5-4", "connect")); + out.println("caught expected IAE: " + e); + + // actions + e = expectThrows(IAE, () -> new SocketPermission("foo", "")); + out.println("caught expected IAE: " + e); + e = expectThrows(IAE, () -> new SocketPermission("foo", "badAction")); + out.println("caught expected IAE: " + e); + e = expectThrows(IAE, () -> new SocketPermission("foo", "badAction,connect")); + out.println("caught expected IAE: " + e); + e = expectThrows(IAE, () -> new SocketPermission("foo", "badAction,,connect")); + out.println("caught expected IAE: " + e); + e = expectThrows(IAE, () -> new SocketPermission("foo", ",connect")); + out.println("caught expected IAE: " + e); + e = expectThrows(IAE, () -> new SocketPermission("foo", ",,connect")); + out.println("caught expected IAE: " + e); + e = expectThrows(IAE, () -> new SocketPermission("foo", "connect,")); + out.println("caught expected IAE: " + e); + e = expectThrows(IAE, () -> new SocketPermission("foo", "connect,,")); + out.println("caught expected IAE: " + e); } } diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/net/httpclient/HttpRedirectTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/net/httpclient/HttpRedirectTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,457 @@ +/* + * 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 com.sun.net.httpserver.HttpServer; +import com.sun.net.httpserver.HttpsConfigurator; +import com.sun.net.httpserver.HttpsServer; +import jdk.test.lib.net.SimpleSSLContext; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.AfterClass; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +/** + * @test + * @bug 8232625 + * @summary This test verifies that the HttpClient works correctly when redirecting a post request. + * @library /test/lib http2/server + * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DigestEchoServer HttpRedirectTest + * @modules java.net.http/jdk.internal.net.http.common + * java.net.http/jdk.internal.net.http.frame + * java.net.http/jdk.internal.net.http.hpack + * java.logging + * java.base/sun.net.www.http + * java.base/sun.net.www + * java.base/sun.net + * @run testng/othervm -Dtest.requiresHost=true + * -Djdk.httpclient.HttpClient.log=headers + * -Djdk.internal.httpclient.debug=false + * HttpRedirectTest + * + */ +public class HttpRedirectTest implements HttpServerAdapters { + static final String GET_RESPONSE_BODY = "Lorem ipsum dolor sit amet"; + static final String REQUEST_BODY = "Here it goes"; + static final SSLContext context; + static { + try { + context = new SimpleSSLContext().get(); + SSLContext.setDefault(context); + } catch (Exception x) { + throw new ExceptionInInitializerError(x); + } + } + + final AtomicLong requestCounter = new AtomicLong(); + final AtomicLong responseCounter = new AtomicLong(); + HttpTestServer http1Server; + HttpTestServer http2Server; + HttpTestServer https1Server; + HttpTestServer https2Server; + DigestEchoServer.TunnelingProxy proxy; + + URI http1URI; + URI https1URI; + URI http2URI; + URI https2URI; + InetSocketAddress proxyAddress; + ProxySelector proxySelector; + HttpClient client; + List> futures = new CopyOnWriteArrayList<>(); + Set pending = new CopyOnWriteArraySet<>(); + + final ExecutorService executor = new ThreadPoolExecutor(12, 60, 10, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); // Shared by HTTP/1.1 servers + final ExecutorService clientexec = new ThreadPoolExecutor(6, 12, 1, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); // Used by the client + + public HttpClient newHttpClient(ProxySelector ps) { + HttpClient.Builder builder = HttpClient + .newBuilder() + .sslContext(context) + .executor(clientexec) + .followRedirects(HttpClient.Redirect.ALWAYS) + .proxy(ps); + return builder.build(); + } + + @DataProvider(name="uris") + Object[][] testURIs() throws URISyntaxException { + List uris = List.of( + http1URI.resolve("direct/orig/"), + https1URI.resolve("direct/orig/"), + https1URI.resolve("proxy/orig/"), + http2URI.resolve("direct/orig/"), + https2URI.resolve("direct/orig/"), + https2URI.resolve("proxy/orig/")); + List> redirects = List.of( + Map.entry(301, "GET"), + Map.entry(308, "POST"), + Map.entry(302, "GET"), + Map.entry(303, "GET"), + Map.entry(307, "POST"), + Map.entry(300, "DO_NOT_FOLLOW"), + Map.entry(304, "DO_NOT_FOLLOW"), + Map.entry(305, "DO_NOT_FOLLOW"), + Map.entry(306, "DO_NOT_FOLLOW"), + Map.entry(309, "DO_NOT_FOLLOW"), + Map.entry(new Random().nextInt(90) + 310, "DO_NOT_FOLLOW") + ); + Object[][] tests = new Object[redirects.size() * uris.size()][3]; + int count = 0; + for (int i=0; i < uris.size(); i++) { + URI u = uris.get(i); + for (int j=0; j < redirects.size() ; j++) { + int code = redirects.get(j).getKey(); + String m = redirects.get(j).getValue(); + tests[count][0] = u.resolve(code +"/"); + tests[count][1] = code; + tests[count][2] = m; + count++; + } + } + return tests; + } + + @BeforeClass + public void setUp() throws Exception { + try { + InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0); + + // HTTP/1.1 + HttpServer server1 = HttpServer.create(sa, 0); + server1.setExecutor(executor); + http1Server = HttpTestServer.of(server1); + http1Server.addHandler(new HttpTestRedirectHandler("http", http1Server), + "/HttpRedirectTest/http1/"); + http1Server.start(); + http1URI = new URI("http://" + http1Server.serverAuthority() + "/HttpRedirectTest/http1/"); + + + // HTTPS/1.1 + HttpsServer sserver1 = HttpsServer.create(sa, 100); + sserver1.setExecutor(executor); + sserver1.setHttpsConfigurator(new HttpsConfigurator(context)); + https1Server = HttpTestServer.of(sserver1); + https1Server.addHandler(new HttpTestRedirectHandler("https", https1Server), + "/HttpRedirectTest/https1/"); + https1Server.start(); + https1URI = new URI("https://" + https1Server.serverAuthority() + "/HttpRedirectTest/https1/"); + + // HTTP/2.0 + http2Server = HttpTestServer.of( + new Http2TestServer("localhost", false, 0)); + http2Server.addHandler(new HttpTestRedirectHandler("http", http2Server), + "/HttpRedirectTest/http2/"); + http2Server.start(); + http2URI = new URI("http://" + http2Server.serverAuthority() + "/HttpRedirectTest/http2/"); + + // HTTPS/2.0 + https2Server = HttpTestServer.of( + new Http2TestServer("localhost", true, 0)); + https2Server.addHandler(new HttpTestRedirectHandler("https", https2Server), + "/HttpRedirectTest/https2/"); + https2Server.start(); + https2URI = new URI("https://" + https2Server.serverAuthority() + "/HttpRedirectTest/https2/"); + + proxy = DigestEchoServer.createHttpsProxyTunnel( + DigestEchoServer.HttpAuthSchemeType.NONE); + proxyAddress = proxy.getProxyAddress(); + proxySelector = new HttpProxySelector(proxyAddress); + client = newHttpClient(proxySelector); + System.out.println("Setup: done"); + } catch (Exception x) { + tearDown(); throw x; + } catch (Error e) { + tearDown(); throw e; + } + } + + private void testNonIdempotent(URI u, HttpRequest request, + int code, String method) throws Exception { + System.out.println("Testing with " + u); + CompletableFuture> respCf = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()); + HttpResponse resp = respCf.join(); + if (method.equals("DO_NOT_FOLLOW")) { + assertEquals(resp.statusCode(), code, u + ": status code"); + } else { + assertEquals(resp.statusCode(), 200, u + ": status code"); + } + if (method.equals("POST")) { + assertEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else if (code == 304) { + assertEquals(resp.body(), "", u + ": body"); + } else if (method.equals("DO_NOT_FOLLOW")) { + assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + assertNotEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else { + assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + } + } + + public void testIdempotent(URI u, HttpRequest request, + int code, String method) throws Exception { + CompletableFuture> respCf = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()); + HttpResponse resp = respCf.join(); + if (method.equals("DO_NOT_FOLLOW")) { + assertEquals(resp.statusCode(), code, u + ": status code"); + } else { + assertEquals(resp.statusCode(), 200, u + ": status code"); + } + if (method.equals("POST")) { + assertEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else if (code == 304) { + assertEquals(resp.body(), "", u + ": body"); + } else if (method.equals("DO_NOT_FOLLOW")) { + assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + assertNotEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else if (code == 303) { + assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + } else { + assertEquals(resp.body(), REQUEST_BODY, u + ": body"); + } + } + + @Test(dataProvider = "uris") + public void testPOST(URI uri, int code, String method) throws Exception { + URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet()); + HttpRequest request = HttpRequest.newBuilder(u) + .POST(HttpRequest.BodyPublishers.ofString(REQUEST_BODY)).build(); + // POST is not considered idempotent. + testNonIdempotent(u, request, code, method); + } + + @Test(dataProvider = "uris") + public void testPUT(URI uri, int code, String method) throws Exception { + URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet()); + System.out.println("Testing with " + u); + HttpRequest request = HttpRequest.newBuilder(u) + .PUT(HttpRequest.BodyPublishers.ofString(REQUEST_BODY)).build(); + // PUT is considered idempotent. + testIdempotent(u, request, code, method); + } + + @Test(dataProvider = "uris") + public void testFoo(URI uri, int code, String method) throws Exception { + URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet()); + System.out.println("Testing with " + u); + HttpRequest request = HttpRequest.newBuilder(u) + .method("FOO", + HttpRequest.BodyPublishers.ofString(REQUEST_BODY)).build(); + // FOO is considered idempotent. + testIdempotent(u, request, code, method); + } + + @Test(dataProvider = "uris") + public void testGet(URI uri, int code, String method) throws Exception { + URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet()); + System.out.println("Testing with " + u); + HttpRequest request = HttpRequest.newBuilder(u) + .method("GET", + HttpRequest.BodyPublishers.ofString(REQUEST_BODY)).build(); + CompletableFuture> respCf = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()); + HttpResponse resp = respCf.join(); + // body will be preserved except for 304 and 303: this is a GET. + if (method.equals("DO_NOT_FOLLOW")) { + assertEquals(resp.statusCode(), code, u + ": status code"); + } else { + assertEquals(resp.statusCode(), 200, u + ": status code"); + } + if (code == 304) { + assertEquals(resp.body(), "", u + ": body"); + } else if (method.equals("DO_NOT_FOLLOW")) { + assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + assertNotEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else if (code == 303) { + assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + } else { + assertEquals(resp.body(), REQUEST_BODY, u + ": body"); + } + } + + @AfterClass + public void tearDown() { + proxy = stop(proxy, DigestEchoServer.TunnelingProxy::stop); + http1Server = stop(http1Server, HttpTestServer::stop); + https1Server = stop(https1Server, HttpTestServer::stop); + http2Server = stop(http2Server, HttpTestServer::stop); + https2Server = stop(https2Server, HttpTestServer::stop); + client = null; + try { + executor.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + executor.shutdownNow(); + } + try { + clientexec.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + clientexec.shutdownNow(); + } + System.out.println("Teardown: done"); + } + + private interface Stoppable { public void stop(T service) throws Exception; } + + static T stop(T service, Stoppable stop) { + try { if (service != null) stop.stop(service); } catch (Throwable x) { }; + return null; + } + + static class HttpProxySelector extends ProxySelector { + private static final List NO_PROXY = List.of(Proxy.NO_PROXY); + private final List proxyList; + HttpProxySelector(InetSocketAddress proxyAddress) { + proxyList = List.of(new Proxy(Proxy.Type.HTTP, proxyAddress)); + } + + @Override + public List select(URI uri) { + // our proxy only supports tunneling + if (uri.getScheme().equalsIgnoreCase("https")) { + if (uri.getPath().contains("/proxy/")) { + return proxyList; + } + } + return NO_PROXY; + } + + @Override + public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { + System.err.println("Connection to proxy failed: " + ioe); + System.err.println("Proxy: " + sa); + System.err.println("\tURI: " + uri); + ioe.printStackTrace(); + } + } + + public static class HttpTestRedirectHandler implements HttpTestHandler { + static final AtomicLong respCounter = new AtomicLong(); + final String scheme; + final HttpTestServer server; + HttpTestRedirectHandler(String scheme, HttpTestServer server) { + this.scheme = scheme; + this.server = server; + } + + @Override + public void handle(HttpTestExchange t) throws IOException { + try (InputStream is = t.getRequestBody()) { + byte[] bytes = is.readAllBytes(); + URI u = t.getRequestURI(); + long responseID = Long.parseLong(u.getQuery().substring(2)); + String path = u.getPath(); + int i = path.lastIndexOf('/'); + String file = path.substring(i+1); + String parent = path.substring(0, i); + int code = 200; + if (file.equals("foo")) { + i = parent.lastIndexOf("/"); + code = Integer.parseInt(parent.substring(i+1)); + } + String response; + if (code == 200) { + if (t.getRequestMethod().equals("GET")) { + if (bytes.length == 0) { + response = GET_RESPONSE_BODY; + } else { + response = new String(bytes, StandardCharsets.UTF_8); + } + } else if (t.getRequestMethod().equals("POST")) { + response = new String(bytes, StandardCharsets.UTF_8); + } else { + response = new String(bytes, StandardCharsets.UTF_8); + } + } else if (code < 300 || code > 399) { + response = "Unexpected code: " + code; + code = 400; + } else { + try { + URI reloc = new URI(scheme, server.serverAuthority(), parent + "/bar", u.getQuery(), null); + t.getResponseHeaders().addHeader("Location", reloc.toASCIIString()); + if (code != 304) { + response = "Code: " + code; + } else response = null; + } catch (URISyntaxException x) { + x.printStackTrace(); + x.printStackTrace(System.out); + code = 400; + response = x.toString(); + } + } + + System.out.println("Server " + t.getRequestURI() + " sending response " + responseID); + System.out.println("code: " + code + " body: " + response); + t.sendResponseHeaders(code, code == 304 ? 0: -1); + if (code != 304) { + try (OutputStream os = t.getResponseBody()) { + bytes = response.getBytes(StandardCharsets.UTF_8); + os.write(bytes); + os.flush(); + } + } else { + bytes = new byte[0]; + } + + System.out.println("\tresp:" + responseID + ": wrote " + bytes.length + " bytes"); + } catch (Throwable e) { + e.printStackTrace(); + e.printStackTrace(System.out); + throw e; + } + } + } + +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/net/httpclient/HttpSlowServerTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/net/httpclient/HttpSlowServerTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,313 @@ +/* + * 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 com.sun.net.httpserver.HttpServer; +import com.sun.net.httpserver.HttpsConfigurator; +import com.sun.net.httpserver.HttpsServer; +import jdk.test.lib.net.SimpleSSLContext; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +/** + * @test + * @summary This test verifies that the HttpClient works correctly when connected to a + * slow server. + * @library /test/lib http2/server + * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DigestEchoServer HttpSlowServerTest + * @modules java.net.http/jdk.internal.net.http.common + * java.net.http/jdk.internal.net.http.frame + * java.net.http/jdk.internal.net.http.hpack + * java.logging + * java.base/sun.net.www.http + * java.base/sun.net.www + * java.base/sun.net + * @run main/othervm -Dtest.requiresHost=true + * -Djdk.httpclient.HttpClient.log=headers + * -Djdk.internal.httpclient.debug=false + * HttpSlowServerTest + * + */ +public class HttpSlowServerTest implements HttpServerAdapters { + static final List data = List.of( + "Lorem ipsum", + "dolor sit amet", + "consectetur adipiscing elit, sed do eiusmod tempor", + "quis nostrud exercitation ullamco", + "laboris nisi", + "ut", + "aliquip ex ea commodo consequat.", + "Duis aute irure dolor in reprehenderit in voluptate velit esse", + "cillum dolore eu fugiat nulla pariatur.", + "Excepteur sint occaecat cupidatat non proident." + ); + + static final SSLContext context; + static { + try { + context = new SimpleSSLContext().get(); + SSLContext.setDefault(context); + } catch (Exception x) { + throw new ExceptionInInitializerError(x); + } + } + + final AtomicLong requestCounter = new AtomicLong(); + final AtomicLong responseCounter = new AtomicLong(); + HttpTestServer http1Server; + HttpTestServer http2Server; + HttpTestServer https1Server; + HttpTestServer https2Server; + DigestEchoServer.TunnelingProxy proxy; + + URI http1URI; + URI https1URI; + URI http2URI; + URI https2URI; + InetSocketAddress proxyAddress; + ProxySelector proxySelector; + HttpClient client; + List> futures = new CopyOnWriteArrayList<>(); + Set pending = new CopyOnWriteArraySet<>(); + + final ExecutorService executor = new ThreadPoolExecutor(12, 60, 10, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); // Shared by HTTP/1.1 servers + final ExecutorService clientexec = new ThreadPoolExecutor(6, 12, 1, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); // Used by the client + + public HttpClient newHttpClient(ProxySelector ps) { + HttpClient.Builder builder = HttpClient + .newBuilder() + .sslContext(context) + .executor(clientexec) + .proxy(ps); + return builder.build(); + } + + public void setUp() throws Exception { + try { + InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0); + + // HTTP/1.1 + HttpServer server1 = HttpServer.create(sa, 0); + server1.setExecutor(executor); + http1Server = HttpTestServer.of(server1); + http1Server.addHandler(new HttpTestSlowHandler(), "/HttpSlowServerTest/http1/"); + http1Server.start(); + http1URI = new URI("http://" + http1Server.serverAuthority() + "/HttpSlowServerTest/http1/"); + + + // HTTPS/1.1 + HttpsServer sserver1 = HttpsServer.create(sa, 100); + sserver1.setExecutor(executor); + sserver1.setHttpsConfigurator(new HttpsConfigurator(context)); + https1Server = HttpTestServer.of(sserver1); + https1Server.addHandler(new HttpTestSlowHandler(), "/HttpSlowServerTest/https1/"); + https1Server.start(); + https1URI = new URI("https://" + https1Server.serverAuthority() + "/HttpSlowServerTest/https1/"); + + // HTTP/2.0 + http2Server = HttpTestServer.of( + new Http2TestServer("localhost", false, 0)); + http2Server.addHandler(new HttpTestSlowHandler(), "/HttpSlowServerTest/http2/"); + http2Server.start(); + http2URI = new URI("http://" + http2Server.serverAuthority() + "/HttpSlowServerTest/http2/"); + + // HTTPS/2.0 + https2Server = HttpTestServer.of( + new Http2TestServer("localhost", true, 0)); + https2Server.addHandler(new HttpTestSlowHandler(), "/HttpSlowServerTest/https2/"); + https2Server.start(); + https2URI = new URI("https://" + https2Server.serverAuthority() + "/HttpSlowServerTest/https2/"); + + proxy = DigestEchoServer.createHttpsProxyTunnel( + DigestEchoServer.HttpAuthSchemeType.NONE); + proxyAddress = proxy.getProxyAddress(); + proxySelector = new HttpProxySelector(proxyAddress); + client = newHttpClient(proxySelector); + System.out.println("Setup: done"); + } catch (Exception x) { + tearDown(); throw x; + } catch (Error e) { + tearDown(); throw e; + } + } + + public static void main(String[] args) throws Exception { + HttpSlowServerTest test = new HttpSlowServerTest(); + test.setUp(); + long start = System.nanoTime(); + try { + test.run(args); + } finally { + try { + long elapsed = System.nanoTime() - start; + System.out.println("*** Elapsed: " + Duration.ofNanos(elapsed)); + } finally { + test.tearDown(); + } + } + } + + public void run(String... args) throws Exception { + List serverURIs = List.of(http1URI, http2URI, https1URI, https2URI); + for (int i=0; i<20; i++) { + for (URI base : serverURIs) { + if (base.getScheme().equalsIgnoreCase("https")) { + URI proxy = i % 1 == 0 ? base.resolve(URI.create("proxy/foo?n="+requestCounter.incrementAndGet())) + : base.resolve(URI.create("direct/foo?n="+requestCounter.incrementAndGet())); + test(proxy); + } + } + for (URI base : serverURIs) { + URI direct = base.resolve(URI.create("direct/foo?n="+requestCounter.incrementAndGet())); + test(direct); + } + } + CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); + } + + public void test(URI uri) throws Exception { + System.out.println("Testing with " + uri); + pending.add(uri); + HttpRequest request = HttpRequest.newBuilder(uri).build(); + CompletableFuture> resp = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()) + .whenComplete((r, t) -> this.requestCompleted(request, r, t)); + futures.add(resp); + } + + private void requestCompleted(HttpRequest request, HttpResponse r, Throwable t) { + responseCounter.incrementAndGet(); + pending.remove(request.uri()); + System.out.println(request + " -> " + (t == null ? r : t) + + " [still pending: " + (requestCounter.get() - responseCounter.get()) +"]"); + if (pending.size() < 5 && requestCounter.get() > 100) { + pending.forEach(u -> System.out.println("\tpending: " + u)); + } + } + + public void tearDown() { + proxy = stop(proxy, DigestEchoServer.TunnelingProxy::stop); + http1Server = stop(http1Server, HttpTestServer::stop); + https1Server = stop(https1Server, HttpTestServer::stop); + http2Server = stop(http2Server, HttpTestServer::stop); + https2Server = stop(https2Server, HttpTestServer::stop); + client = null; + try { + executor.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + executor.shutdownNow(); + } + try { + clientexec.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + clientexec.shutdownNow(); + } + System.out.println("Teardown: done"); + } + + private interface Stoppable { public void stop(T service) throws Exception; } + + static T stop(T service, Stoppable stop) { + try { if (service != null) stop.stop(service); } catch (Throwable x) { }; + return null; + } + + static class HttpProxySelector extends ProxySelector { + private static final List NO_PROXY = List.of(Proxy.NO_PROXY); + private final List proxyList; + HttpProxySelector(InetSocketAddress proxyAddress) { + proxyList = List.of(new Proxy(Proxy.Type.HTTP, proxyAddress)); + } + + @Override + public List select(URI uri) { + // our proxy only supports tunneling + if (uri.getScheme().equalsIgnoreCase("https")) { + if (uri.getPath().contains("/proxy/")) { + return proxyList; + } + } + return NO_PROXY; + } + + @Override + public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { + System.err.println("Connection to proxy failed: " + ioe); + System.err.println("Proxy: " + sa); + System.err.println("\tURI: " + uri); + ioe.printStackTrace(); + } + } + + public static class HttpTestSlowHandler implements HttpTestHandler { + static final AtomicLong respCounter = new AtomicLong(); + @Override + public void handle(HttpTestExchange t) throws IOException { + try (InputStream is = t.getRequestBody(); + OutputStream os = t.getResponseBody()) { + byte[] bytes = is.readAllBytes(); + assert bytes.length == 0; + URI u = t.getRequestURI(); + long responseID = Long.parseLong(u.getQuery().substring(2)); + System.out.println("Server " + t.getRequestURI() + " sending response " + responseID); + t.sendResponseHeaders(200, -1); + for (String part : data) { + bytes = part.getBytes(StandardCharsets.UTF_8); + os.write(bytes); + os.flush(); + System.out.println("\tresp:" + responseID + ": wrote " + bytes.length + " bytes"); + // wait... + try { Thread.sleep(300); } catch (InterruptedException x) {}; + } + System.out.println("\tresp:" + responseID + ": done"); + } + } + } + +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/net/httpclient/LargeHandshakeTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/net/httpclient/LargeHandshakeTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,1200 @@ +/* + * 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 com.sun.net.httpserver.HttpServer; +import com.sun.net.httpserver.HttpsConfigurator; +import com.sun.net.httpserver.HttpsServer; + +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManagerFactory; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UncheckedIOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableKeyException; +import java.security.cert.CertificateException; +import java.time.Duration; +import java.util.Base64; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +/** + * @test + * @bug 8231449 + * @summary This test verifies that the HttpClient works correctly when the server + * sends a large certificate. This test will not pass without + * the fix for JDK-8231449. To regenerate the certificate, modify the + * COMMAND constant as you need, possibly changing the start date + * and validity of the certificate in the command, then run the test. + * The test will run with the old certificate, but will print the new command. + * Copy paste the new command printed by this test into a terminal. + * Then modify the at run line to pass the file generated by that command + * as first argument, and copy paste the new values of the COMMAND and + * BASE64_CERT constant printed by the test into the test. + * Then restore the original at run line and test again. + * @library /test/lib http2/server + * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DigestEchoServer LargeHandshakeTest + * @modules java.net.http/jdk.internal.net.http.common + * java.net.http/jdk.internal.net.http.frame + * java.net.http/jdk.internal.net.http.hpack + * java.logging + * java.base/sun.net.www.http + * java.base/sun.net.www + * java.base/sun.net + * @run main/othervm -Dtest.requiresHost=true + * -Djdk.httpclient.HttpClient.log=headers + * -Djdk.internal.httpclient.debug=true + * LargeHandshakeTest + * + */ +public class LargeHandshakeTest implements HttpServerAdapters { + + // Use this command to regenerate the keystore file whose content is + // base 64 encoded into this file (close your eyes): + private static final String COMMAND = + "keytool -genkeypair -keyalg RSA -startdate 2019/09/30 -valid" + + "ity 13000 -keysize 1024 -dname \"C=Duke, ST=CA-State, L=CA-Ci" + + "ty, O=CA-Org\" -deststoretype PKCS12 -alias server -keystore " + + "temp0.jks -storepass passphrase -ext san:critical=dns:localh" + + "ost,ip:127.0.0.1,ip:0:0:0:0:0:0:0:1,uri:http://www.example.c" + + "om/1.2.3.6.1.4.1.11129.666.666.666.999/041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100,uri:http://www.example.com/1.2.3.6.1.4.1.111" + + "29.666.666.666.999.2/041287234567896776987654327821000412872" + + "345678967769876543278210004128723456789677698765432782100041" + + "287234567896776987654327821000412872345678967769876543278210" + + "004128723456789677698765432782100041287234567896776987654327" + + "821000412872345678967769876543278210004128723456789677698765" + + "432782100041287234567896776987654327821000412872345678967769" + + "876543278210004128723456789677698765432782100041287234567896" + + "776987654327821000412872345678967769876543278210004128723456" + + "789677698765432782100041287234567896776987654327821000412872" + + "345678967769876543278210004128723456789677698765432782100041" + + "287234567896776987654327821000412872345678967769876543278210" + + "004128723456789677698765432782100041287234567896776987654327" + + "821000412872345678967769876543278210004128723456789677698765" + + "432782100041287234567896776987654327821000412872345678967769" + + "876543278210004128723456789677698765432782100041287234567896" + + "776987654327821000412872345678967769876543278210004128723456" + + "789677698765432782100041287234567896776987654327821000412872" + + "345678967769876543278210004128723456789677698765432782100041" + + "287234567896776987654327821000412872345678967769876543278210" + + "004128723456789677698765432782100041287234567896776987654327" + + "821000412872345678967769876543278210004128723456789677698765" + + "432782100041287234567896776987654327821000412872345678967769" + + "876543278210004128723456789677698765432782100041287234567896" + + "776987654327821000412872345678967769876543278210004128723456" + + "789677698765432782100041287234567896776987654327821000412872" + + "345678967769876543278210004128723456789677698765432782100,ur" + + "i:http://www.example.com/1.2.3.6.1.4.1.11129.666.666.666.999" + + ".2/041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "27821000412872345678967769876543278210001,uri:http://www.exa" + + "mple.com/1.2.3.6.1.4.1.11129.666.666.666.999.2/0412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "5678967769876543278210002,uri:http://www.example.com/1.2.3.6" + + ".1.4.1.11129.666.666.666.999.2/04128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210003,uri:http://www.example.com/1.2.3.6.1.4.1.11129.666" + + ".666.666.999.2/041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "96776987654327821000412872345678967769876543278210004,uri:ht" + + "tp://www.example.com/1.2.3.6.1.4.1.11129.666.666.666.999.2/0" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "1000412872345678967769876543278210005,uri:http://www.example" + + ".com/1.2.3.6.1.4.1.11129.666.666.666.999.2/04128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210006,uri:http://www.example.com/1.2.3.6.1.4" + + ".1.11129.666.666.666.999.2/041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "10007,uri:http://www.example.com/1.2.3.6.1.4.1.11129.666.666" + + ".666.999.2/0412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "6987654327821000412872345678967769876543278210008,uri:http:/" + + "/www.example.com/1.2.3.6.1.4.1.11129.666.666.666.999.2/04128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210009,uri:http://www.example.com" + + "/1.2.3.6.1.4.1.11129.666.666.666.999.2/041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "698765432782100041287234567896776987654327821000412872345678" + + "967769876543278210004128723456789677698765432782100041287234" + + "567896776987654327821000412872345678967769876543278210004128" + + "723456789677698765432782100041287234567896776987654327821000" + + "412872345678967769876543278210004128723456789677698765432782" + + "100041287234567896776987654327821000412872345678967769876543" + + "278210004128723456789677698765432782100041287234567896776987" + + "654327821000412872345678967769876543278210004128723456789677" + + "6987654327821000A"; + + // This is a Base64 encoded keystore containing our certificate. + // The keystore itself was produced with the command above, then its content + // base 64 encoded into the string below. The helper function to produce + // and format the string below are included in this file. + private static final String BASE64_CERT = + "MIJR0AIBAzCCUYoGCSqGSIb3DQEHAaCCUXsEglF3MIJRczCCAyAGCSqGSIb3" + + "DQEHAaCCAxEEggMNMIIDCTCCAwUGCyqGSIb3DQEMCgECoIICsjCCAq4wKAYK" + + "KoZIhvcNAQwBAzAaBBSx1wdTxGqb9z4exOHVZNswvFL+oQICBAAEggKA7JdM" + + "91kkP9QkG/igw2p+prxeEOQSmyScKMLtln81eKvT9zpvNjtT+hjABcH2QY8u" + + "1Z3Ji48Umoaxi38Fk58/VazFM6wpL47VVNJ2EeTdj8sFoo8ExCH8EHJNNaVK" + + "VNTG0YWOMa/HOPttl5wtD6pReGNOrVYVOnI2aY6zTqwI0sZS4uPczfb21vyI" + + "NyF4B0Z9WGl77PRoGwrSeoLspISBTq6/JE8UhMWtuz7xnXw04DGp4DeIOO9n" + + "E8+VBRKOELPqNaQ+VEgnwPNtPzjohi4Cwaf84c6vokAl1S/V6GzS0Al1mSGH" + + "syAaszDYWcXXp2JpSXVAztySWZErwHE49/P42taXdhJvOSfqYb6FHpdrCXST" + + "TPo+ULCGxQ83EGfnb/qaqAYZrS//+lzzqw18OY0JcF1i+cGHY8ofJK+bYr7x" + + "ZyC8pLut84pEWNTp1V7SQcMif2Gd2SO2Y+ua4isjfMLNeNE/4puCV1vYsyiz" + + "C9Gnp0Jywv13ioaC24Qy68uVQ81TvwizN3j7FxPCQOEEjXpfJ+5x2q0pUfqp" + + "Roy7ow3Z+d+/fpMIcgyMqWidzLBChRkx4Ugnh7rYBfY1ghchlu8WIIhiR/8p" + + "EBX5WQHyEtwrXOFiWxT+QwXWjbs9dQSUoCU1i2zwCFW9R8FkY2yb98QxF74z" + + "0TpyW+w6cGPUNUd2T143PL4eGt4rGUBUMewe2ENSgZCDstvtiNPfccW8f9tq" + + "G49pHBZt1ZIadM/DbCk1cqDD3u2/e7c57mInFkBBJKjl2K7GK9EYsiey+3Fk" + + "NvkxbaF+89OTqEDPP4E97EeHkk/MFe0bQ/a/aXZrTPSN7mNgusWBQyztnYex" + + "BRr8sPRhNDFAMBsGCSqGSIb3DQEJFDEOHgwAcwBlAHIAdgBlAHIwIQYJKoZI" + + "hvcNAQkVMRQEElRpbWUgMTU2OTk1MzczODEyNzCCTksGCSqGSIb3DQEHBqCC" + + "Tjwwgk44AgEAMIJOMQYJKoZIhvcNAQcBMCgGCiqGSIb3DQEMAQYwGgQUBIoZ" + + "0r5Kc2cs6fHseA1vKWpQi30CAgQAgIJN+Lch8gN0kyMcpdNDM2iAfBHd/kXZ" + + "4ye8lmGvvV0Yy9dd4Q6zmOmkPjWcusyh/vJdya8OG8Fxc/nQmyhB441qtJR5" + + "dwIQe/7lft2gDg2sBD0osPvEHesvFVr0+2cy22sdBXS4ihdtVTciPV+4v0EU" + + "AK6Lcib57Ml7MI6VhBGpWLkaZXv/25CqXGaiY85dSXPHMugvfJn8JoNxe+tN" + + "PDEAy5ar5bnSD9Xl8GyQwHFwQ1P+gEjwg0+hC6OQA6Eg0jBFhIL+dCf6FJwz" + + "J2HekpKXcyCTNTx0HB8AW3u4gVjao0B7oNr0GZprpPgYp4dl04Tar6fmb9MN" + + "w4MWkcySjX0wCNjpvE0bWlUx55jlN+25SWNEafmbzRNECW1hT6Xl3HLLNQQv" + + "8fIgkd2200+Ppwk+cG2dYMrl0MpHPxOo2l+nLNDI+a84v6R2Mqf3qVNfcRxZ" + + "Xmw0kJ1JNUKhd0Dy6FKB7tY1Gwc4rfQQgdUXTlnB96rUrSK2o91QZZ9rN3PD" + + "SbbQRzSBSPMDen+W5878kwd1BkDH1ao7qOHoGYYiYxczkMVncOtOIdg8VScU" + + "t/N1NS9Yrzlj0aAYwX5EYmYzFMiyXr+El/7VnrLHBiaYwJaYVw7a1HgkSXxb" + + "er/vgM639AIhT5ab9NFF+ib+7qwbWPzggIBtfm1bXiRPE6Ue0+aQ9g4vYSR7" + + "QNusu/2Kwyrd6cwqJnQnG53wiSXh3hs7dvNRYpM16iF1dTeud0FSpQx1tMFi" + + "Wp9cGwtUSzvLw1+5Mvz7igLTNAPyTMFNAYFR7JZgRjg1035Y7Xo4aXNMVtGp" + + "BCa+/eJzE33CHH2+kuSa13N6qHA2Ek33aR4Vi7P/QOI1aghsR6tL62ctoq4c" + + "FmRwvReYGdFK08+B2auPHOEPdGaPefydmPNnFLDguH6d2NYIH8cgzpjz48Gf" + + "i5UQfh/UJAxricLjuV2eor7gZCCaC9MfnLlHnDH5MYUQgDsGBTRxh6rpZxVo" + + "PFUm1DQCFdDHgmvVz+GAuiVzUu0TrUAxBeycl9lrDshgZj2jd9FU7XcMFwzC" + + "dMsWJaA8EC8u31vnpWWqK8C03pdXTbWOEJdIDMXKOzd2ZxjGPnBSNXNRsGzi" + + "RdEspHElrfGwHA5Vpsj4Q6tMZ8tZ+gSSmBrKP6xNUDNwi1bPayJw/dAKaC+D" + + "vp5sx/+nZcxSF/ig8ZM6aA3escS1GBNBWFrx2vEASHNpHZsTIOTuOM4e584/" + + "NJpNlRfaTzJ3i9/XoufnHbT5pmpZgxlZckYto3h6lL8R0bXthICRrI37Oh6s" + + "yfO7zhMiGoNdaFAnXTsMzA+Uwr1gesHWE9Rbd+jrkcGgL4Zst/A/c64F58qt" + + "J2RzA3xJCGQ6AXB3SlDHLObuYZ48TH4v2nJ4S8RTs/ant/T9DTRJyhQMa9+P" + + "QC8Ny1ejFOK71Oqjz7J2jGpoBm3gDRZDYeBa6ZiMeJf8Q+bkpbEgUQbdiXhn" + + "dpN7acdJTSHnO5/3Y4G1T6kLNzKc1+NYiYwH9Y6KIMa9IaocOA4wCHEFog7Z" + + "Ac6vFv6r9/cnXEIe9/t5gYLL7X/gU6HMqZFjM0QjRru/Sy9vYfpytqrnOf/q" + + "eOTJ9gRdIn7jNVTrgrE3ZgNvxYapaDMyFG/ixZV0cblsVJ6JO4MArOQq6q9/" + + "LWGtYYEDclyLNxUTYf0gHmVRhYV8rlyMKXtDu0aBOOn13dRxKKVN5pG+LrKe" + + "V+FZ3tDhYiFBxI/gkAiegSQlvknJlbEuanCWFq7sHOZ3C76L5G4qtRv7tHAs" + + "8rtqzhYnddxIkTcj4tkVYsFxkj1afSuLSSoYqc0jYZUXHkL+5U0ZRxhJbo6b" + + "/QVtiGXbS9i1em3+Yr47jHRH7f5Crlc2EdEzZaIm8tCw5G3CddXhhCpQTT3r" + + "Mjwep5/w2ai8qbGC1xo6AV7ZyQS535UbIhOYMPO7vd3oUBmQXyutSxx8Wedx" + + "HbIlBdZ44JlRWELdL6Ejo7PwhG0F3Zd3+FtasM13teYlbDWdFeoTF+inrXCG" + + "BCSqoUDYLAAxRK7oYKSDqfrcRioHO4AkeaF8x5YZpRSM73yawZaWeLVq1NKb" + + "DdeSJEjqDs5Ve6cA/jSLDtlJqudspFamzkdUWa4L1Tc15JY2YD8urNz/qXUK" + + "E74H2MtQWjrQ8Yjz7y+3yUTYd8Clp1dBKV2haIr+sCTnFtUXaQ9LZF5S+enU" + + "mOf7OmdFObwvV1f43HDuDSiFZpE+w57YmAgSIfWelKnGvvn1lBBWBomyVBKo" + + "69seibaSyUXyuq8q3525ZKpHIcic7doYOYgqU94HBQOwkwTtoiX3tKX4EgDa" + + "9AjYD4LHITkwgKzsQAe+3ASKq3SPFXi/UbYuZNXdkXgh7kqL6PZPD6ayIxOW" + + "f8E95fZRXPyNbKf5U9pp9hVKeuOPKbEYKsQNG0ZiephMmV3S6JjSqLo+qTU+" + + "QyGH3vhwlhda9cmxrpKCy0KM8AHyWoS4L5TAiJXp6moCttP0v8P/RRFtBePl" + + "53nyLwZ5SyXv4ifVayJyyeDXn08In9MINLRyjvNF2gHbHI7XbeQKqB3yIBC9" + + "sKpyShX6UKb1Dnd3Z19rT4a7QUkqfcodX9cU7tV6ncRuP5ZJRLHQQi9w/2DI" + + "Leu8Y43jJ/CWYo8Fb8IXHrWA/hwNT28Yr3OcZUIDFdbdxenTKyhMlDOQ87aU" + + "VXBCnq96jEAzY0NY3PZj+CBvts2wlCJJDhBCVTXM9OusZjH2/B6phWO7ybMq" + + "15QqYyypNM62oBlu82psklHRREO1D23MaOyoXSHYVFxvLMKxhstK3wd59cst" + + "8V/uvzzrURJu85X1X0cQJaKB+OjvBT8n8e9jzjATOTiGH2ULLSro2wc7Ne1r" + + "bEK4qHeuSwlvulvcqB7wK84PItmVOW+g9VuXA9QGGHxzybbs+/QaMqJzdN6C" + + "oS1Az5UmvZbdnSAuXtW8xiKJ+ELAGCjOcdkzQaAbd8Tq5hUXAgYeNQnoDjJz" + + "+a8CTk1IaGkeHlg7MrV98AuIQjUB16IU6gE4MH6ueOIZhF3PB2Fp0dGPXL6O" + + "KzIiC3jM7rIuTmOstI/t+XB3+BYxKvLuQhbV5n8sUBsGFFGBKoxIZawKG1Pk" + + "3Dny2rzcB2JkcOO8r6f0dA5V4PKIrhmVeQJyHgY+/fF+JMZxfjYmaSrwu/1R" + + "JnlDfDCIwNon7smi8QwXbEvRehI5a883yI07COM1paHBKNddlw4sfkfbIrNx" + + "LQJLb0mHgqvHAblivBmMuaiZaK0MVOgZTe4bYuYdRSN8/ueZDHOo7lyfXGzc" + + "8FEThaiGp5m/uWYJgG2FIRxM6by9PhusaTZgJ8DmjRLF5yDuR14gau6zj7GZ" + + "TMXGDIDTRWTKTP0/DYF+EEnuWJb2JrrxMnWH8X7xXhrRA6Ku3nqVEwy8eUnR" + + "WtLAQkApLOEhsp3wQyLRbaydcD1Si9s5JICy/m5Sv2NXseKbmAHDphTYuSGr" + + "Gjk5ryTEaaiULVvi7mv1HqDq3fli/PAzMIcsK0yaF9rQv7JjtsOtZtr77+zs" + + "vM8CSY835WpqTtjGDC+HWHulEADgS4ShpIrn3zgyEd1jrRY6rR5ZDuioc7sE" + + "2A/8w6I5KkmcXMu/jKoLjotdUvvGMMAIhqCZD8sD+F2jpNcCV3/7NpwaJSk+" + + "61rfPxzQRKu1jn/9TV7e5PyWQMkPOMbTMlA9jJPi5WEXNanIFTJBYgI6vmYc" + + "156uLrlXh4F5gpLN42JyhddSbV4dXXLt8an9X4dMAJmdgBmzFldFPU7I88Xm" + + "nuy3Rkqs2p4eb44b4oe9xdIyUw3fkfdoYzRx96X2Tvlx67BvbprglcdoiBce" + + "UitoMsN5tI9+o4/wp6SCU1nv97Yl/kGR6xyY/5irK3wVr2DsrRSF/WuycPFV" + + "3EOZLCoh/Y+9yH2dLlslarL2ZVIe701NTp/fN1GCQoCI2elSwXZAiJ446Fyv" + + "F5x8UTIbAZKiJfL8F09XVnNSRIp78rcNUUeFKehewGJ/I6WtD/SyGc7uTCKi" + + "EqXAwoQN+4GcncLQ2eqFFqR1aZLEcJKU79EpKu08rFTl0X9NaA7Qd0nXAiNF" + + "EUz1Xo33ReE9l67+QLXYK17UIqxkFQnawydZKt1T7HeRpTKEQzo9/wLk+IYD" + + "m5y8DXHK/d/kPySyLW4+srw3HRIe2Cuz9nNhPTUKtVC9CPt9NT9guhOhDGRA" + + "XBkF08Snjpn7wG6G1cE2gwU3W4oQIvCAwpdsJ8leg0fbosc1UD1QHR+3CxIU" + + "0yoPm19LygYjIyTg55bGBID0GV+DAHKUVHIUkBpaPM0PcSxsJgFv1seuQSJy" + + "dRUcKGzPg+xJhVvHuuAnnlBibjzrl/DBLCPgOl2kybpsv1sLJdTLEkwkv/yf" + + "83PdSz+uPha5hv7AGfxEaaUwbnktHultVbjO+IKBNqgjz763XgUAKbtfxW4u" + + "VLBESpZiVe/gzgNV7j+6+vHWsOC8GBMjJwHGAFfTyjYv9BmrxkQyabZ8wCb/" + + "5NPvaHBH+qkWVVWBaLZuOkgG9dmQI/oEcO2H9IDtve3OEXGuP2zG3xkk7h8W" + + "RwcHoz/anAbEHA1wmPYn/NFn2FZW3KxdyD0/URj4DaZqMYCJMCN8TkbLBxQk" + + "ZS+8VCcXMALybXUD9OLX/jUHaPqO70e9+o4cD+O/JfxKkTj5A2WD2345b8nK" + + "Lill7lJ5JlYekkGG4LQf92FbH0ytLSVB+A4oc7/nxI5ciWy5vDmaG+3HS5W2" + + "mGxnpLApVJZhhiJRB5fjfgRiuVbcGNWFQtgH2imMorrE0FzONSQfepLtBSQM" + + "Ec8NWgmEa5O0RIYLMblXisxt7jB0k8NqgiSm3dmNmR7GhbBt+mg95uCXWmB7" + + "nbcUaTWUw4Lb1EwVB/MmUEBjer/JYDADWz+NS/0VcAgBbjk7vrjAdgXkgiRB" + + "l9qBDioO73qjmjeTiCjoLsuEreXPu9WTaZDuyKO1uxHoesZE0AcWjcZgKVY+" + + "1Eqz3awCUxQTH+/1HsVxONmbYzJgMZ3f9Kuk7dxwFc0jgIw0LfFNnBDW3wY6" + + "nrdtm7vEuR0gfYU83oqXQqAMQGwMZXKXtibS7yPL+rinLwcoWYkZaIaI6LTb" + + "3DthepCtsYfIpaErOHMVOqxDUb4n5e0EUJiy7gw9JQjDX+VzpxAnt2Kc6/fl" + + "kon4xadP5oyNx3YU+jIywk8p/NMhDfia0fFvl2BHRcgFXHyOa8IPNmRb0CgO" + + "78Zbt3NG2+cFUx1WwOuCohfoYt/STUnxDXpOCrxYk2CD09Vm+2xC+7+VLfex" + + "UnKzKH0tWLNyzA5XKSHyLe6lJCO+mvgdp2vrO7i053YVfqfqWSL9rhR0tH5w" + + "NO8uUd1/ozkIjb74PSft0txTP25/c4/MEWy2JIg+HMM+2fmanJi4xJsuxBfq" + + "2p/7AYfmsp05TfoSLieWDBNx3lrADGUnuPf/o8Zo2tgn8ek4ig706kqzZy9W" + + "p1PaYNK6p/MLI86Sv6OLHf6fR0u6IsGPqMcYx9J7U5SCemntLvucfWRAqRn4" + + "5htDzdTFrtO2nXLNDxk20DQtol7yyBg3ngVX8XDhKReGdV/Z9kEeJhgzbxLT" + + "fbjoGQD5twirxYyV+eRqQZM7fu71Srg6lz7najEyH9pbQjpEPForDy5Briry" + + "nplWImdWd+KwG0N35+H48kpxAU09sOUGURzsUPdwTANQUnrWWMo5+UIjxXtR" + + "cDMuQmj8vlYH8iH0bKgexZMb7cRciRUF3az3lo24FA6l7e4SkyFErGJITGFN" + + "IHO7wDz9h4rLikjGkz4G1d04XQCxrpHSrW9fj808up1LSoaye5ijutJihEHu" + + "hkiFLi1nwuhd4ZrAZD+0VkTde9GAi9xPa8Cx+lh4JMB5mghk8uTjv7G4KqzE" + + "Wlpos30CMyCc5cBGqkCVLKt64+KgUyt0FnU6tbZve7i1/oYyUaWx7BCk6o9f" + + "9PuQM2bOwqhjRtpBR7q9Zb9H+qytAM8psLV6Sh9K0cK5Ug4BBEAtCK+JHBHG" + + "U3zkhu2FXlm0Mnp5xiaTvPwPWe0P/mrD4Fhgn2pbPvyJXTPgWV107zafKuLW" + + "34/+ML8oog69/oUOSAw4vaJx8PWguMRoQIsS6ATT2RhUVn/t21fJK9j6eF/B" + + "YG5IIEavyybQMILx86+SI5sLi9j+Xqd5bPLWnZTataP+voMTzyyYqAi6ybEl" + + "4QkWM0c8t141t7FULXHMTrKhdZDocb9plz3sfYk6cEqlOphvmhbZbT88iWJe" + + "ndBHJxY0SL0NQ7Yl6fg/DHt4goXSIWGL5IamBM8CZnVwyCHz7laP15Zsc92H" + + "DqWgbojeMxiPSVnFqxFzL/6TBBTQYuNl6+CgCOPIe88FwhZvfwzXVnQHb91i" + + "58t7pwXCURscYFK7iyxi7QTrofT0QM4upsI3zBqOO0X2SOW5H6Dx3uukNP2r" + + "Ud0AbXWHglnooaMNl/XRfYyb6VYg28r7qcfsSKlWuRenNf/ejaLl6GeO/ef9" + + "VI+ia0qv7S2Hi6xgdw3/NTqltehTyZylC7LtKr/TVRFdGLsFKtGvT/KGMYt4" + + "eUYR1zz61CVxAjjGAg+NlpTG8P50xralMthUppA7P6X4j4cDrD3E74HYg9Zv" + + "4PLAh6MOymj0YbW+/QjbO13DeSXxYX5/EGk78+sBOVSzvigI9NLvWHZMFylp" + + "mi5m3Wh7cQojpkeKXSw0XRd8lSeMN6lrzkMknniWfZZhK3idGCH3kHd7IGzC" + + "X67K3gf+8syXOIpoDfUJHVpfvKZCw5XN2huYNGKP8KqELMoDatmEoB4hoVq/" + + "VIssuwanWj3vDOxp7bYRUXID9dfTrgq5A5+1RuzrJVpmK+maTGypBDvemJhw" + + "OSP62Oa+1ryH3+e1yqWDbWJrDts1S1wqMRRG5LKP16e3ZUYo33Gir/qott4b" + + "J3PSvZn50KLnkyt1apUGE3pIyytvencsCca26qm+EGLYJXu+njUHIU+s4z5Y" + + "xxrR4xcqc4CKXKK5+z34YCkdGM8JME8fCinDgrsixnYCjyv367LrQ+/YRvtF" + + "6gF2XrCyPNTtRisqHg8Ug3CSKMPYJBXO2uu8/9dxF+r8LGv0pbVoPUBJpPiL" + + "+tnxY0ggyOiU2zsUfb3QcuHONXU/2qv9FxUzBZDUDVuhXeCgNDtfv5QN7R2S" + + "VoWWQDcQP5Vop61TXUhLnNaU6LwaXsVIIi9hbv4k7LV3tOxgjtyddymxch0x" + + "4mR6XCXVwPx3yVIEwju7ANKsDxR+yT7crRYpPstka9lY8Y73w5MIgz2LVk65" + + "xJ13puMbAGnCuSEuQgRdPHyt9JDp8KfvQ0/FegDE1axheKVAfCKgCuAudIxZ" + + "UGXjPXLh4hMp+o87hw0Mkr0tfmKBd3KzRkjZm854ksnURKPODIjEqhHcW4t3" + + "gRQ3cYiMqcv0cDd7cDw/4dFsfJs11aXSF674f1lhOjYqB2Xa7EMDQxJC2zw9" + + "6HPVKHmGGSNAv/UiJHjcQuJslGVq1SisnSWgpMND5+QnxHDBww1p7DqXpDQJ" + + "boHjZKPM/gi9N4GD6iHGbF4l8Mx1YzuzoAbqqg/6v+fmYQRUgzGnNRHW781F" + + "R6J6R6JwNOVTaSvlDFzQukHdwpyqcR4OM6XkaxNK3SMRWye4O1/U+12FhPYx" + + "5pPHMId8d8voJIIMPYRjFIkZAWpYbavjtV5x4xUWu/Ch6SeZ6uQu5h3WbFVe" + + "buXjnOQbVIixTh8qo1WXXKiG9DUYHowgz2XWC45izfOnt1xwWj1He0IQoYWg" + + "WkePdJPKfS5igRdzjwEp29RlLoqXj9TsICzYhWY626A3UjnTSOAg8Av2iWxx" + + "j+3I3zA5I34udiSf/4iyrWZHeaLP3S4wIDrTTNzOh18NvspyLJrjoRokXwoJ" + + "g5BnQan1rHl4p2e7oNLPhc9ewKF0QWdi2rJZDY6qO7sa6jt2C57g8jAYhAFS" + + "2cXjJNQAPCgoodeKTnJ/1R6Ykk+byXzeDc1NuHPHiNbtGu54Hz5Xd3P8hYJ3" + + "VBYvhkF90Rq7LvBBXyVTy8tL0I0N9BdCQrnd94HPm+fMj/nwc0pqCi9b68ex" + + "Gcr8YM3vSg9xRHEBXsWjL16oKchvwavauC2Uap/OEizdkQUKBZlzDazbXTN6" + + "dZpCyFcB+Ox/zgltv3jxum19WdgjyIddqBIyiKxFtC3XunK5yvmr/fFZV8X3" + + "vxbxV6y0QPqJDM2ctb/ndiYaGn60EJQjxETGIanp5szgKFBYs1p1mjyov5p6" + + "p76yEvTm+Ba+LX4ngM1AddqyfbPYscxtIyhUsqDqQ7vSNHQezTBcz63OclbJ" + + "G2SyQFZfZKIgUXiZt+ZC3BwKRBGQZUE+UIV9WjrIvhtZN7A1qdo42c0S/skz" + + "lHMKR75/PxVVXRaArCRytERwdLOvlyBE1xl3rxnxErTQHViP0xEzOfOpQ2M2" + + "Ds9TcXkm66ZRnJBuk+fp4m8iiz7IfRlrI8y4AUuI9LEaFOKkh0HH7sjSWzs5" + + "7uGe0eBZsLpzWoDd2Uacht9+xLcnn8tQQ32H0KHkZjm1UGtbSyUSvvoC8SQk" + + "U8QstWumKzrzf3/GYuW43N4TIBUvl7GWcpmpevuAicl6SVeDjyaSGp1n/OUM" + + "FH6e6kSgyDvrs/V/pQran+Dymby9DPV7fUWNo51rFdqvLhktICGGWRuUXjvA" + + "eOOk4JhsD4MSlKysuGfbcUhFnkhjFkctA63HEAPAKNLoQze2tRwG+tZhJuAp" + + "Q+3YEHce9DEVo/13eYVKRu4yFqD0G+KAkwcXHcFwH4b8ByTJ6K4BboRIpGAI" + + "sCWN2r4Yx6sH7hDgDH/ywTs3xTI+JBDGk4+15EXUSVA41bCKEsT3BiksVE7b" + + "Uo2eXPFkG7ikOuyMr5xfWtIN5v3tg/lE8K45LtWgOT2mZeEZVEVmgozGwR55" + + "OqZvFeqdZbV1l57N2vSf3YkJFU8CRwd6uDZ96C/Fax7aL4biwSragaXrYu04" + + "XqqWIJVYOZQnHHHTGSH+C8+NEZJiAEH2ILRlqa8VCTGPTVd96+tVriytRGFE" + + "wG2xl4jYviismG73MqzuCq6iwx+HaWTiGSlXzMfhKL0DE3rhPmWrKIjdR+Ub" + + "Lp1C/L2mM/y+DEMoj59/l+SwMaijQY6oUpOtVGS+Pm2C03JFNSFZyYo+HHAC" + + "OkBnWMUKCGWMWOejGaC4vtBxZsHn7Q5ij+9diNfxyLEWc08L/muJG46bzlHY" + + "+t6W/j4UdYuizHNm1og+DD17Kbxk7fjRsQr1ARKeDkw0RgVZrnMzfsVeNfP/" + + "tQVCeOlsgTa8x3j5eQsR7aJi1taen0BQATTprJmN0428+g3Sgh+4eLslkGfi" + + "9c5Ftpq6vM9bxE5w8PxjPdQdGQZdcNkDHEreAmGf8Tb/r0ODx9wMdYNRqbq0" + + "Uo2Y09Q9zm91bPC75IGGrLvzc1X0MXqQmQ0YsRFq7T8j9wZqS6+bveA/Svd8" + + "pwfzfR7GWDCd1lwzuP9QezVrYYcozCquJNMFgCu5hcCJUb0RdC8EBsxArcP4" + + "iEM5+R62j5eOOBMikMgLpRsTQCFxBgFLiqv1sLBe1xxPIjQhtx2FJvuxd6PS" + + "zOVdplRe8WbbN1XZUW5UQJH3fnD8OLpAlWS6xas3Qk0ZCl0jNqUYANUmnuJx" + + "SysQeI4HRF0pvthikuZBzpS6gkxDf+CyNbJa8DZrwc+cZje11KWkthn+DMdG" + + "sODZI4Z/wUGBRB9S4QQSaHUajYbJ/wfiYopt884ophtyjW14oBs67hmX/nZy" + + "cYxmJnEaqcoJvSDzVDnK7YVwV6dV5pmvFe20fWuk9nAdtWbUyk1dXwZrtx7y" + + "Yw6N93sAtlA+a0xwKDWK30PUU0DXuVnaw5pejrHznj1gM+zCycZ0jAQkq5Nv" + + "I3VkSo6+mDhD7VfR16p5+cPgjabFb1yJYjit44H+852Tr1bzekpO8qdDw0un" + + "AOjou03PaJURRqI7E4oHPA9kRIPEHzqJyIxVJrly8hSMbbVaviZOLSzbxrvI" + + "J8qWlIenjvtD2m86tDZ/0V7QEek5bjlpr9wY8sEGtBhuWdRukWhHLm2RlmPY" + + "2pqodKPSiDxAy1mDQiOEMAhHOfrABDKroLsVOBa+zZyR+MzUcBZk4mhXZUmo" + + "dTaMjxYykxeOqnnlapKaz7qwFswwRrXP7n/Pa9XTxKpJms2s2pJZdKhZlAvp" + + "E7KNlmCV8ag2hhDF300Wu+J7syVrNffpqnn4jT8bdgL8orfAXT3dgTzwplni" + + "Fa2C5FQlaeGSG/7yM7qUXChppyAOA0aa3Ujbet9tf2PiS4+dsLjV1ynanz72" + + "zC0bbfzdhZBMY/mYEq6GBAH8lHpAWaoVda66iIoBjNk6+qtv/ShnEFmRawLy" + + "3KWyNeVw4gJjvejp+4Ch2I0zNssPrqcF6ne3k/FxB67eng7kqkFZRfC5xbLq" + + "NVG28rtlDCVVWkcbyPgo3cMaym5ZEj6Hf8E+Z84PuFhQBw7gJao781M0ddV2" + + "RIypj36LsxzzhpSPfmM+GHBtLzvryNqxlzViaHcsPBoh75XL9tQSPVzT6436" + + "5c6dzaW7lkak2TiPoWucxZvjh1PVqoijWvHv/YGav9ffjJef9TfREsBQG+ym" + + "Sw7Z4l7RZaWjfr76sO/K5FKlUmw91k8LyFeRtZ8gBIrGdV1j1DsHktHuH8/K" + + "v/lHolVp0QPI7vyrXRcZd7ccJv05dm5mj+CNw7JHvAHeIps1goDamOCROexB" + + "ksW7YqAuzex8xajTKtaESP3D1kZYz9BZ16sM5LWNjPNdcLygVHMBV7oAVepj" + + "tOd6BYY4xfFDSWT6UFcz0v1GgdsQaszcQdCoRL1XrCatRKjSvQDN6QGXUc22" + + "Cy/JqD3HHc7cqL8y2WELIPZcLNyDFe3P5Psvkcs/hysQPs3XGhfbWrvSarmF" + + "AlwFT5hJEy+pXeb7x+jNjOxaj0vq/k1gyXm1y/pWPZvB//MjLA8tU6mQCyUC" + + "U9wjAtrieJRAdZc4pqqO7Ha1Iq50vtdLu0I2mNn6M9/b2IUfwqziE+rBdXH5" + + "Wj2n3+TQed5xzpJIqG7iJQbOEY4byZgVmSQCJHjWBU1yaK+gkTGunPbv56+P" + + "PNYZ5uUJPWCrWSkmRow4Z8B/Gi1IMKkAsEsv6i6HwomZZoj9tZGpXL27ZKxC" + + "fZMnyIN3QMXrtCb+RHcRSTWlgraLfVMZvjtYh2Kxwb1wB/Lv6ClHT/A69uYZ" + + "QNSDQCCxSOaAOQoACjh2bj38g08nA/rGXUYft9LTEKIkqUSf4fMTc3WzTaqN" + + "MzZ+iXnNMPDYWSWnVOZ21HpkOoOID0zRbk2jBy1B0xW9kcS86ekhkBXhKYxw" + + "x+J1k3WqsMVnsVqPWWTRU/G5OCfgsVXfYElFlrmM3f3jiMADkdBsfEqrpPt3" + + "0QsVHp4T8Q6WzkOV8D5lIGdLKsF++8LSjwLjhERWXdwooq+6KoLPm3cm9Tiu" + + "LMjtfIfVYfaw09zXmKqOkVONEsZDLHTztqmNWNJJB1Ay5iL7QPvSjKQS9WIQ" + + "TJOARZD0k+qUW/9a3QHaeg3O9aqYFMxf7QO4FCHf1TIMNnr5LGoUIxC3n7Ki" + + "cB9MlAunuFud8DiiB8/+3QgslIVknChjQiCeZPFsJIszUvPooQJsRDcGXADH" + + "kXInEcaqT9EsHYnWwDtmZ7gQd+NgT3IqvlRJRZ6KXmyuphamZKieRkOIplHV" + + "muUq1T60+6tBHld2033XYtS0qY81/fOY8WbvjCxUjF5xu/So1tmW0tqr0l3y" + + "GGp8jyNE6vL8/gJgobfXTVgnZhPB86D17FNWwEWHG/dBis7gmo0mkZRh9+gk" + + "PLAl8E3UFqWmTLknSqqcI6ajgkyI3nmphyLc5H2l2mUYRI+bCiOunlWGGzMq" + + "Qj2oSuGdOYX/hNn7MfAYmb1WNwpopBJYHA3VKIKCH4YDLz8h5LF9v1iHpZT3" + + "IiHf1WEwC7JpI3Q1S09sJMjSih5dctNkmoCG56gJ0ZjmJvYhWy+A9/Nyd9qp" + + "oj0E6j0hf6p8dovu1eE2BqKRydCa0T2i+bPnNnB21KU2MLgV5NGw4tyIfUoR" + + "Ui8QSHDynL1Ob1BUbKuqT5p0Ybqths/oWeBN032wA8DOblale/gyz0fXWWTh" + + "VqD5ktw5SGRJTmA/tJfhK7kFfMdk+9Fsvw/yV735NAcTorVbOPJoEWSsq7k5" + + "vY1qreQO6tRd6Gx8aeHW0st8w0Cyf3UpLi8x+NcX53WJaYBhXXJtYZlEnZ3W" + + "do1Ekrs6TWrnRzSUk1uD3Ku47Gpd02hOTfN0T5lUUjaoqRLuvwyYmQiU47Ww" + + "Wnb5ftTAoljtH2P4LXQZyqYWca+BgHdSjlaadtJ7hG88zgSHomwu/QVSVRSJ" + + "zqW+0ekjRr45/9gKNmaDdFwZ41HBgly98x4Z1LzcimtylmgTpAmowJRCBSV5" + + "uad7WgR5Pw2LKWx8YnPAD9aJ78DfSA4LqkULHOfVfqM1CIDO92Makz1gL6bM" + + "6jEpuNkQHE1FifU31Dof4JeoGC+w6V6UjtmUrilKgq98UPAHHU8Bs3ADfXIH" + + "w5Gz/LEjwmUL5pEeFft2PMzf9HkgKcuCFrg8by4PgIv4wMiE6gXZCMfE+Mzd" + + "fulMuy1opZB6LdObgrv8uzhfsplRaVl4utuTGqg3ZE7PyZ+a2nVTBDj3Blx9" + + "88gBN6wjC7MnTRR7C3PlVfX0ApBjmX84Eu9AF7R0zc+XlqsguJK7KKWq9BFL" + + "xXETLlygW2oux+30km40WiZC70wZJuG/Y8NzPwZd3JiJ5/cVWySyppfBD5cY" + + "k6as7/9oXDj5OfXilXXJNnzMSp9Q9h0P0do3qteAp3um6ixvnE/unKtCDua1" + + "KuYbV9ThI+RedYYkYdyKSgBiFxfUtMmYw1E3tqjxm4vNlGJijmBM4HbEmR3S" + + "okiE+52LKS4SiNRNfp6Hbnghld56n/Bpjv3jsMlwES7415uKmAfm7pRQrB6I" + + "6MhGGYhpATf+q3iImH5nSkYt6OCyBjjII17Dkrs+Au/wOk9xhY81j2lua4hC" + + "VAWiv8lXTznHxcHl0e9w7lr2rqdl74byKD0ey+GT15C/oRYGM2LNTwNK/K4I" + + "hh629dJF+od59sUGg3fJ4qPM4cK0M81VxE86TvZP6Nmbah9L+uqVrnA4IT6O" + + "BmiJub1LG0awl59Khw/Nvc1wxje0dr6cuHQuXM2CIYKfaIyjs1snuCpO0KgQ" + + "Tkz7DpQSe9RUo6aC2870GuvKlTLWkI0WI/oRLU0sjgssUXraZQ/8XeC9pS2X" + + "d5FlZX+gA1OM2x6v/DQLzDeN18R6i6UeQZSgDMv5PeCM+1amS+wVznR+2pzx" + + "KNlyPta/4XYWhX/2GB5lwHtYlKDOnI8+0gWU4Lp+mrfKSYdpvnAg4SKRwL8V" + + "h344eiwCCpdDDOuqN02dJs4H552sy1SFwMvBnsJCRtQUCq6SPiJ+lrVTPsQZ" + + "snJcwOKQHNGHkWs2rTPU7nrhbXaRUCcTcPKknAg3wdORtT54ASE73dkufPUS" + + "8hgbDJB8EwD+nKy0Y2y1KdsCCHjoHqtXOwaCoPHecBud71ontPj0XCZ54drN" + + "U4coNXGJjUtKhRPMC45US6AJRYu37P4crc043eO8D+E9MgE9cm8zCF1aRJe5" + + "lP2uQLvGXvg2qdbrQP/ebQNZ3QJ2LUT1km3ApZXRi0ht0a9SzWsRo5CSQY2k" + + "g8K6YbslkxCT/AvYEGWjEHx2kBj96lSTYYz7nXkJHzLX5kbgXWAHavzWN04L" + + "Hqf6pbzbbiNpJ7SpG1SUxZE9xU34BP2msOD4aOUPBJCfd3pE+5Nrnwudk3r1" + + "Lwp9YBlbbI2md/A6z0H5qKrWYyViiFbfmUKZ/BrSt8+g8Z0MY26V+7wQCmZu" + + "JbyOQkLbPG3YghMUK/T//1NbEsgVK43Bh5mvMZgLOWFOHf360y1RBNtJgcpF" + + "/Ckig/TSA25XC4l3MQ0bSEdszSjUkRlKk6WARrZ62EpCV5mNP6XMJOPRpNRl" + + "DHvumo89/PKxn9/0GqLSGqkC+yHxOhxqF/3pe9wduSuEamM2FFySftqO0BKU" + + "uvYDGs2USoeZCO4xXELDn93caAYRCUIEzFYU6dT9JGEEgapq6UrmiS2Hi6/X" + + "zYcs41tJtI143kOJ6NKq/YzvZTNnyOiTmXuKJwE5R4VdtkZ2PBD8MZvqMpk9" + + "reFXpubJBL9z7ZqvvchZ2AHsnKWCOQ/rG+rRXTuWMDF5hHIhr8NOy6Sp8X1k" + + "DC49CFKkSv23OxhLQLfRBQHcKQ5IH0sJTtbHviBq+vB9OV8dz3qpLvAbTB89" + + "tPrKfy7jsfPaFEJUy9bjJsk8gg70WLR32OucUO5AStWk39b2C6PEGewzp+Pe" + + "uy/SWBly28gN3Em4RsHUptWkyiOrw7sQhwalJV60rwqROCfSb01jLfAcBgDl" + + "1yZ08YSKsMvRGUCRID22eDBxl8fFeNHyfPWZrsGegLiWpG4SEhdz9MuayNCW" + + "+K/rq5wXnvgmVeDx9rgeCSuEc2+iGgyirvVcwINSPoJIejyfLP8A+dNQrS8b" + + "6n6ZWKEpiK+4K6gQJArgbdU/2QdzHmDH+b4ITnrhqA2SVH5kjdglYMWBZ45/" + + "/Q5LwMEdqv/P48eWWxN8XMoIkVf+FtqeHwfr48AZhINxbQROlqBS7hCNYj44" + + "BLipDiGmeGI3pYeWsoZqu7hCRMPb42ziwSGFdvv4Q2HFWdgDYvirxqh2SbgF" + + "aznvDQxq4Zzk+TiJbHgphDZJR+DEHYX5n9HbgLWOp2kYWKWT0BPwzS1w++vK" + + "+pMEmbn3C5d7OEBIJ9TTD/jZXB3KP9tUICFFaFXUrk2752fBfO9kA5xxbxDk" + + "ISUvhwBgiNGxet1T5SoRKPb61Zz3NY0SLr+GD5KfH4mJSF6tOUZ2iAP81uUs" + + "fwPIxqHh83mMS5PW/DAEeJT2FFcBMVaXdj6Xc1hvIGGXYjc3NQLxII5vbQVR" + + "3UGhRFSJEi0urSXTFUDMan2AO24mM+jnNRCOxOIAx98qj6DKTfkcBZidH9tG" + + "nJAOlISyY49hJvSk57tjc0oiSq8ojE9bxQQ007mc+XnKP9/5dXrTa/zUhCZi" + + "DIeqvdOZ1ugRt1garJv+BS0kRrMpahYxkqUJijkSE6U+4+5V3ssWhWu+3VM/" + + "LpKK/sKXImOzcBbcdvzPd1/2yUp+ZCzDRB9qeOmdhZtEgKHp3b2Xw7211jfP" + + "ZWG3ydrVCduI2m2Vo4Lb+4NddZj3yN6xeurZw/JZIuzBcmOg6viEu+Be38GP" + + "VWz4DV3lAK/2eVPGUMVIVXthJCFLKaT10psSNqFYWi92OxhOIu0End71Gb1H" + + "tupvmdPZWCQbhaW8l2RvYMZuJFKpH+reSP6FrgqmrxXGf+2EXzz6PdbeLmnB" + + "UB9QcTdu8tsIuUvzh2Axvrxmqi5rigefuQqwvSgl4KPC2mFI3cKrVJ3kB4Nz" + + "gMIpgW1FzVkiVQSHMTno/bm1LxzGv5Bcjx48NbL183kkAb3kYGNfZHEE7EIN" + + "/3EgK1RUUF0YC9EAYt5U/hnNOofK5rNTjYPepexhY5/4Ve5msVrtn3C2Nlp7" + + "gpnGtHvcm2yoPuWo5ASHh+wGZWwkUMz19x7176l2GczPSajuK6CT2i3xnZ8Q" + + "VGQALJ3Tg83Lqg7LfUhQIFYr6yPttZAjuETlWXxIa2IDsxj6Jz9WBzQHr8TE" + + "1NY9XmTY2eenwpmNOVHrwn3ADzW6OyDHfjv6IY+INC9CAnGSf1EMiwUPNOpr" + + "oYhGfRzTgLLJQTPTWwkn4rmds8eLVdp1gF4uK9fEdY17nJFe39I2Tui4yhwD" + + "Ue39/dGYG16nNTqYj/yt07oilo8PKAKczLLN20Le0aYmOBMGWx+5gWGiPQGk" + + "Jmq0LCHO5rHf7L1j53+efwedTj1Z+qv20IQINJcUvgUX4XfJewiUoLU9Nf8P" + + "jOTIzyR7lNWV75kK0JZJz1jww94GjuCq6F/qXwAM3P+X1VThbLKd+drT3YmP" + + "WVOeOYWPOXUrU3OowSzMGIE5sq7rQY5WwZWpE8O5lUJ6fZwx+MjKVnAYdzAJ" + + "rRxH7eBJOFwn/IGlgJDUdvOHy2bXX9kcVP/ShWuflU1e0y158UTGQNiIRjN2" + + "E19RBBgTru0eB0DZ/yke4BhkeIo5u0Rg91asZHp2RHONDyTppR8wSO7aMKRZ" + + "BQYEv87BIO+B06YsohMfWa7GwD4jFd3XAm12aXIukDo8sMJ6f/C70NwyNsNB" + + "wvjMvl+8E4jK1s5qgagPwECIdl6RBtf0m/CDm3FS1jD8ghJnvbHG7aZnafm3" + + "jTPJcAUDP0+GGtK4aFvqC6yvbUPotlWYyPDhMaOOFSwuFUqn9tzlY3NPlo4x" + + "28rietj+sZjSd+fdUiPP5q7T/VR/SsnzIWTgWOUyEGVeJczUpSdqNO3MJoY+" + + "5MV6+KRkRAbULuVC+N6whOfPW4aihfNVLEBkUfkpo9f0by7fpVU6eJTaqv4T" + + "Z3qW1t80ZVUXN6qRnjG2t7UmTqP2rTXurYseWBYZceo59zfQQSMo5cirpLbh" + + "SlCrVXP/CbUM+OMoiudWha/RZw4fdximFlo6R+TxMoWdWOAMc1kfyL5q7tZk" + + "kJfAj7r3Y4XBcNeQ9bqKKdBzJxUNRvU2Be47fEfbVpKqDWFlxeOrj6tRqjKK" + + "YUt7zjZpYGFqG3YzTfXZVSQ6Qwmxu/QM6vFVjbOpsScYal7Io1qLnDBSUmRb" + + "v/gong0EpsUNvjQ40B8jmNUNsTnRF8memZC7k2cKLnah5RXyuLFvN4cZFSar" + + "LPhBgDBWRgtEzeShPtQiYzJCelbelDoFBz/KfavE4MLRYgXf6/AE3U7CAwDq" + + "splXWaEuCGw7Snwpchk4gCXSiFjVDj2ao2WMA6y/zot6a27ppekkvQRFCtkL" + + "SXNkgJ/F0mvgp3mQBOvo7Yd4NPJV++tRFf4tHWbb8VIopwGynZlnlxXyil0c" + + "P1tRMXjBWDHFY5GYv48XTon13fw/GORM7XMTbv30KXQvTGpLk24IEjIG5iD1" + + "MrqQaAgkWkzBFPwnZpKIenpGmO0G06uW0+c3eJRbfkUaVlsDCnB+3+qZNYSw" + + "ugJsWuMUo/brItbV3Yrt2012ocymZSqOGtUewz+VSOopAHG+uIZi2L9h3/kj" + + "cJr4b5QSsmFoRCAR5j7TSkVpsfTK6YH43FbXxOHamseOOE18TY5BLb/tIlU+" + + "i8p59WnYo5sDy20o/sDM9N8L0Ks4Vma6DIdwYm0YGRzLBR9N5i+HjcprWz4x" + + "FxBHMVMalm7metqsOihfb7aj/iu36uZ9eAEJNZra2vUz3F2oFwlK0aJwznMT" + + "+k06Rqd2xZOKZxWqbVeWMb8EPiAvjwtAbmoXzTf7AZPChwAtb/fkd8QhKAHt" + + "Ge1akmgoY/puFLMJnFECvmy8dlzVfsAX7JhBlVRkeEDofUDCnkh7brT9qqrR" + + "gj92kv+jO5PS2svsFJa+3bB6tuKLe+AHnuvaB1aAdf4aPxFGwHAS2a5ANqJ4" + + "CskScf9J9kCm6KwO+CmhdcjlZFMs8S8CV7XVpNrlwWDV0CdwEmZMvIuIvUB8" + + "Ic58/kCZ8A7OwUVzMEtmJPuLBDVNrS2jLTb3CKjWw5EO9H15J5FseeTz4jWj" + + "7PfjV95NT/n0IqhN/1CsozW6Ko2LDrzH9AjD267p/cF62Hc0a7XI+FMF+d0v" + + "myz/L8RjdZzwiq/Xg+gYWLT8uAv48yazhy+3h95Ttf8IP8E1pSAEvyiuKUcA" + + "liw8aOjVpYaBJU3SZEy/T4QAyY1wmiyaReHXZ+ayWHB+HIiCNdNXj5koUOUc" + + "LVKQBdvgjvMMLIUlUCJB+armPQ63GNp5bBfI1lhvjrs/He1HfgKYf8H6kWwf" + + "BrBSYVno6HkRNKutUpc2nrXCHRqmJtuzB7uabtGFQEZbxP6OHY01k+tLPHUz" + + "EJ/tUGZ7mUfZp1m+PwbXlSjRMYJhLJPsNbczNkuFdfIAfAN8YlUjaeHQWAuJ" + + "KaA5iwxIqENVCZR48WUI4s/1uXO3VNa+UoSGI5N9FLgfsf/m/3Er8djDf/VH" + + "kW6nG3u8maC6xuTmHh2w0QSsLhjqkjuIBoY7T2Ye+phZYhcjLTuRkoJxNGXv" + + "foVPuNghwAHm2Jw1QN0LjWQp0aggReKLBIAb5sTLYLQltGHDNj6ime+gQmk2" + + "2kb2QlCP2sOP2zs2/D7CuUWHVeeA5hcJc2eWEWv/I5s6cYysTM13dleBwIu0" + + "+0Lyz34cvXrC+9agwHa+uAdO9KYfuk8PjRmVPY5rgL5ux7QbhgA5Ou/1GFm7" + + "66fbdqYHNN48Dof8WeNQTZE1qlHl2ftAKyFk9vH+2T/1knJVHpEo2Dh5KywQ" + + "M41C0Gla+cIj+Wpit9hVYyF+VMC4MYbJDDQ/f5VCuSMXJIFZ7wwV5EkCLZV4" + + "qlDC37hMec645uyutF+SAFAyyiOufGnyR/spllpPXf8pF/HXvtwkPCyN/IKE" + + "vp9YOKtXdGfQ0NksPRP6f/nfy8X49Nmr7N4oexlVB/2hfym9ApWw3zVMhWpr" + + "sk9EWMkVzNccL084P0UBYDRwVmaU0OJHU1zDs5MS/joegbwjO1gA2FJcFdoE" + + "vbbLWCDJGVkZWvfgPr28xxSZAhYuFO5zJ+Sn+36NXPsAwQlbyMWp7y5R/JBH" + + "zHrQmpEp6uyyyYqOFA4QIWW4RhBW30gABmq+Dc9qqEUyVjRd+8RXf1Qvin7F" + + "tD0cTAOl2UISjI7Z7JexkSFBcS1uEEgG2SkGYycFa3TapP2PXEdL77pN+FJ3" + + "tuefmxbW4UaQq5xDr59BmhJ6bZ887I6vwi1t5Q2rqTNRxZjePkCqhtZSV0E7" + + "JfWxMEPxxzJz5e4/PMMdMUeN2lG45WAbdJuWYsuC7gb3gVmtCkSyTJcF0Xos" + + "Uh/jsWbVPsDWOle55iWepn7i0HBUQONI0iv/BLFTbU1+19frmpB6MEmV+t+P" + + "cUeiVWy2uoRXXJiZgZ6uWAPtSedlFNO3DGCl6a/POkU0OBvW5UpVlpVAJ2qt" + + "qXbBz3OYJ5eOS9xqRpdvqtkzIB7eXO+2Icxq281+M6Ug5PFRgyLpk20RXkyR" + + "PEqmjBnTkR8Ku2B2F4SvQJsKK3dxjGdxwYr9+3ReS69grg4/4WtbD4iVf/lE" + + "G/UrIyW4nCL3/k0y2LL/pdbCPsoT3kSLvtNxKF7sFnLxvxvPxGMvYpnGyE9s" + + "UeOtPY5LsIjRX3eMuT+msI8fPrlOcZ2ejz5FRYvvChBxB6o9w9ybZlxx0SUh" + + "1yqqW+hjCY0bfzaOxEVs8ZfGKgfS16AVN0sArOBdS+FhK3zKSAubqx4IfZ0y" + + "luFVMPAGUUo558vyGZNhmW6U1FJczZWz+yFOZMcH9Y21GRkE+JKnBIEY+cuM" + + "RolrU0Tzj3USUC8xazB6ipNZNKepCCzcRy+B8ulGVeaZHFzVLe+yt1zPvFOJ" + + "BQOoGDe9ZDsqo1QJHxTh7eaEWr8hMfLs5bDanrN8mBjhom+1Ni7RQEg7qtbf" + + "kWd6RdB5gDEZDeFNP/16n1dFf1M/lLYfKWUuYLXueOX4s3dFFAxyKqy9NXVk" + + "X7/s+d9XTQfIax6Zh3SH5YF47yddlysYZu/HjhaO31yq1+hBLQgeBEl91vnT" + + "Qg6DlMnh36Vpsfc36UqKo/97LMioJq+4vViL2CqMlTboeepvgOMjdm0VfPn1" + + "cN0ithvdPi0pOPjArFjhcsdF2I9qQpQCPfC9n4xpaz1E1PQpek5x/LqueH8F" + + "UgiOGoUZWSdRaFjXu9KPP77mayqTT8SnCx0flb0E92mEpI4P4zq58/nOnVWN" + + "uGcOZ7AqZRwIfIHJSMlXgaHQGg8YDoDXJKgp28fZZzESjzEzKlE4zwQyyAFe" + + "jQSXjRexLS9YqWpWaIFaVaNy6b3zIohOjLMWATB+OeuR48JfUKIsaBUz+HdA" + + "Y33pgtJsb4tmC99SeS1sBfZAw3hUYWUE3y24+u6lRdw6AX3SvfhC5Vc8qVt7" + + "+GFWGlOH9MdHYcoNxPpB3N0HqQYZk5uGgcTgHneJ3oq9QLRzURvzjEupTzI/" + + "z36YZRA9vm+TgWoCrhUH2/52vJhKgjOY4usDvJFfEUWHv61fOAxzy8wLgu5v" + + "NXBX8ABR1txwpN08BCs1I3aoODlTz/T/WwPNfGptkP1sQ4PgHxJdCQsvi5WM" + + "L2sBq/ZmIf2SVNQaRI7MkeS0z3NdnqxzY+8wTVjQVZG0zbpNpg1G9fEk6Rkk" + + "wV0vHEGXnZJ3DXTzMexg6NSyE3GXMJHa9J2fP4lMuKc89XtGaA+CU28RgbkE" + + "Zs+Mlbu0YNvk7JABJ/UHxf8UNJY9YG5BdUvJbElrbajWnllEaRauDzjnvjkZ" + + "U4Uw4fdHmzpu0PUuM9Wm5UusD5lZfj0Xng+XO4Kea9RheukO7CCf01jZuFlu" + + "Xgbi1tbOkkVA0AvWbnp2Dv59O75kaaVq4kBJB1SxUFb2DTvHTA2b8NYEfeis" + + "eVIiKNW9fDMJbbmwySQftx0SRcrKbCloN8q7RAzmewiyVBtCI8a5CNw3qtEO" + + "RjZYDPmLXaFU+uc83/dIMh3jnJcbZyUvt/X1NMsrF+sSonKepfVhq4mtO5XM" + + "lQGTY5Wyl6ytdlMbK/vwp4MsZXFsAzP85AOpEI9cHUnlYM/Q8YTMeLZt60hD" + + "Mqq9SU0USmvqbhteriLTuTczrsaebhXHsPbdcq1zopsOtA03q2hyQPebYWP5" + + "x79K6lUVxOar3JvnguVfyOrDBPRXDphI1Ew5g8dlGP5OoOhGWT4/S4OEIa0K" + + "32dRruB7A/F31osJeK8J2pvoosZzLpxh7nyU3Jyc0c8uuQqj+1NiGvERfV9W" + + "a2UkCOHaLwmNRb43ifkYIW9R66mL3Mu+hWo3aXfDriYxZHG61blhFYNDxkUf" + + "qx3BlDmcjbWae8v6G/JI7mEK0XKRI5Z4NgheSSY7VBnj4nQRRht5efUq1TWt" + + "OpK4Ws29BRhSfgd7DtpVS9zSW48JCfxGTuNHHbXzSWrLSAU0OX42ycv74gm0" + + "Nv7XeLzs5Bp79Vkc/YZRxGa65h5AfQzKf001czPofnw58fHa6WUqD5m2pEBC" + + "0fC/YSIpV7wJfUBuj/JlWGiwAkWpkQihq7mW8GcxUTk2nLLrBbWr4X8QBdXZ" + + "s9dA11UTul6nVzGnFDrWRbHgcAmU4bxSEsMYL31tGg/jMKPx6blN/M3I+KKN" + + "U+9y1Arn/36z471rKz6Xgo5bP4qbRxLArWnmV4BpB14hL0JeQJaqJtFuNIxw" + + "+y04cXQjdHxmjluTC5F4hViPS5rY5+AM4C7IqR8fjmC/pLNhWQsnz3/rH2Ax" + + "3zPs0E3vdeZl3JRMUeWqRYLQuF/Q38u08/8PthUhYyT978xWJ6+t9rrC2iS0" + + "QbRNvmqE1TuROy3JcLz8ig4Ryo6thY7tKnKuRFmbBQHWk+43yU5hUqw2H3hX" + + "roIYd9NqTeImqfesegSnRpSBnOnFQLRkI8KZOIQeyYzKOWVJQw16xwSX+PdU" + + "4hc6pA6+pIm5k5KO/UzJGmWpzpH1HyHuSIjhLi/zRGBHOXPZHLtTHjQO0fZs" + + "WH1QcmVrrrRvHhTXzKqKsQRfKtkgjQRCJtNIB5tQjWfwNgW4Lu0psB3x0sSL" + + "GnKm+BKjgE7HMApctusBLXNwplxsp8PYyZOiQeL+6v+iUCDLDLI5Tv6XIONW" + + "GzxU6SAAcVhJ14gy+95ptYSdc9YioUHvAgcletAy7oWdnpIliUfmlOELyvZF" + + "kpixQDAyNSVUUWxGsad4dwYRv+Q57WMWkDQB/WfkBfqK6EO0DQg0FvJSQ2Ij" + + "Fj7O4vOPDyXt/ir1QUxfELactILEpBTf0UUgIJAjcnAI0waPu9fN/619eo7V" + + "VH8Wpk3HUU9LjOIIDC7BAPPTE2xDa3kAG9VGweIXpL6YyW4JnAVSkou1pZWt" + + "CW05eMRe0HkDpEJb4iz/UHn2KII4ZjJaFUgSWgNDRiHRvMoW4tIImHuI4+Y7" + + "rokPlAlmO8yEnsLyBVgiPr51Sq9RWPCL1y3bryOfUoGFc/cozQ1csN02Mncz" + + "YeSbbwt0toufO1ex/gfsiteqRgZvSIn91yMsFl7lzEi3kyJIhW7hBrPDfAHm" + + "TZ5Czrcs1z0+JKfU1PXcuaRm/Bw+OY/1v8Z+YYKIynupdgnLCY8LfruNzk5S" + + "e/mT0UwgtoJE+TvceiYGTw+Rkf0a4jZiTEcs3lF/IRvIOnd/+5m1eeWtGJp+" + + "z6rlPrlRWjrhl4Ufqxob6U5jjY1/7zAMV6Ge7RgkNJiRy0Brb5+phAHpkajC" + + "I/q4m/qBBm+gqRrfmFvPfo1CeijfMelIXMh3+p628kWGpIAypU3ocEcVcXXG" + + "B+K/n2zyfbBQtMQ+MEUurRbn4G90gyRaHKgf3SuQSM53c+OVfJGXhR4Gtki9" + + "NF3kCMt3wiGXi+c25NEs07LZ+xWfLeK0/0IrAHCmG8IcoO6T8pujgZUEyIHv" + + "9Za/9vrvP72UlQ4+z6yUg0RNwlHgWN2nF0xnTQZXySXaoAaqwGA8HetCbx7s" + + "ePd+VFl1/gApyxeGhWFTf0d3YiBLRCqvdFCsKrC/ni7aIGgbpuvjxmHiTAKa" + + "Jaick9xE7a13b2pY557OVq6ExqRiC3c28z4YuKXfJf6IIeBug1HY9yEnjU37" + + "eqNJL/XbyImo55ARAH61MwL1RSqu7uWJDui4GKCOKC+piqOwLDjSx8AyRVN8" + + "zbsTxKtN0N0AUBqstlxgrfbV3/BCqKSQHCaqlg0Nrzk0T53RZEHyNv16qtr2" + + "iF45GMDj3k/lP/NLU4DQX3R0zx1dQirSfUr0PJGxZdwnfHFzSZ7o5YaAnqdW" + + "j8t4DGsu5wdktDOfqRsXrX3eKmeps5ycRBKTUgPhoccH+PFtMXYjkTH49aW4" + + "hKgnJd5I49A5o/Vdd5Z3zNFF7eSUsMFA6pYxXOy4/wQYpu8vqmYBs5p/WBM3" + + "wJkp0iLaEsEvJGSRNjbyuhV+N16GamJVIQVk0X2HvzKVtL1cHHN2f9BkFbFC" + + "R2iW/I0ZFz/OECDOnlS1Ea/jGXuEIOB2+4O/Fki7kQ1opkc5pB5ehMMCetXP" + + "cPJrEyyQJXsG0ZiCmr9RtGoEKG6lfvNxFWBtXHjXrFXjZ/KRZi7BS6ZPIRb+" + + "YER6V8tyLNkL86xTjkm1oq9+opihDSf2+dve/u3YFooowsleeNynMVEyEPo2" + + "yOLB8FO/l60qpSOSrepG6kS37ifjrv1piMyqLxz9EWP33jG0ajCEj1hAoke2" + + "5uLFL0xaYT5Hbb3SPD6E5Kwm3GrP53VMGpzxFb3WirP2iW1pSLH5ZwBSiiJa" + + "awGW/1JAZ/AemOroG1jpFXYG30euz9cj1ha97GagqGgaklIQGbGejqj1lu7/" + + "H8Uu47sdFxrQTbs0enJEr7iZdOWHb/Gk1u6X2+1d1+2ifn5k4dd2QrKi4lKZ" + + "TnzU6InfbE6wl7kblSGnvxG5CdMs6vfcs1VQHbahPxyZ1ci7h3Yda6MV1xNv" + + "8gru+cCbr/x6v0L0L0rjSg2ZwFq+UCexc8t7ONv6y6KhjbUgGmy15GthHqYQ" + + "/wFMIeobeq7yd04vUMhsvSxfXL54RECwu0Wz9OXfPU8yGdLiUqGDlVM/lrCF" + + "H7zdSU+XKqOoxA/Wb8zayXZehYRQqnDVlJzA39Sp4KtPQdIapZ42ViJ8SWXI" + + "sgtztW588KRMxjtMxpIj5eKucFr9bqfYsaYU74t3JQUIeWrKMEGlftBrT5Tn" + + "BIPhOlTSMWe3pWOkJP76uUm/mqrz/LirLgzKrMpsw32eUSQsizWwXnC2a9pf" + + "VQcqDIQBgIRxI6bp4U4IQIhCezOhZe+02pt/R6el4fvDyhGh2sjcUyt50XHa" + + "tobMMkNVoQTWm1UUJpRB5n0CbtXDRkB54kL7IYlhsZVBYQqDMihNbTvcGfUE" + + "tz+Yw405OdLawX5VpV4azSeXxncq4LlHgE23JKIpZjnQ/ueb8c/6EUyfn1u7" + + "4+lGsqIK87fwPrGP6tgozyo8e+uzYl2wIKjL3p1ypi9IJodtMtQJT4Aw/Nyk" + + "d+fB2zS7h54vyh9XJBqXBlyBJTDoevGxACfCZMOagdR4kmysiWUEqcaPSslx" + + "9is9VTALHRpN7LeKyTnPnMzFb1otJ+tYncqtvaP0I8hRgtWHsbiBqpjDUZxF" + + "nOXaXzbuYdEV2rzcQ9msOCqejRctklNVGwrFdqEKUeOV4QwwGJv6wb6rRYaB" + + "qXB0/8CEkoNYOC/VU668RDOkwTFd12w/9TOgr88DHX0dN0OHLKa7/xzNji1k" + + "OVkQcT+Bcrqr2pUWkic30U+YU7mJSC49tssKTROJ6SM6m25jou/0YuuYTge0" + + "S/bn+Th6Y7YJ79eqvmG2OneqcCwE+SzpehGo/LeROeBH5w3rGTcl2qcxvRf1" + + "SyyJ5aGlh6fseWgcO1NW2oLr+ih6JCpDf4vRcYjdaZysmzB9y5kLOY3rPQbI" + + "OxqaO1KshMb3fGJIcK53lZBqHQfqQ7CgeYotq2OGUmKzr2BVmkah+YIMUrRE" + + "xVGSlMzJyDABEE5cTBvcmq8MJvTdFeQrOHkAHJ4Y10v0rb01hGkvJbSUq5a9" + + "B7f7ulZPnYpWmJZ8iDPs2eETUH/fm/a+B1i2kb7QCs50zGfp6grwmwMb7fd2" + + "DEOkjXS6VEOfnzS4jlNhBfGRD0GORIjRCI2arB1hjQvthLU14Q03ZetymTXE" + + "dMml0i+t7wNhESkAMwvfqkPrG72sg32w8yCKh9zE7YATcElTAobdxR9aU8ei" + + "ulXgMb/PnC15/SZTvGzK4E5FGjRbRYx0ZJsQYpdzx4D0L/Yx0BEODfIdbXDV" + + "kSRMtltmWx+88xlqzN28I43ezoe/8rU7WzQvJLs/9N7Ud9JS6H2pHJxqGYQs" + + "3Sk32tnWjIk57PXk/++6IwsGonmalUSP53cILKDerkkj8LkOtbCSdmQu5uTb" + + "dXdxM6Yo6nHStyJyHZUz52qDbZruVnBLS2HXjG0LOBNSU80jbkNzJ9+uSr81" + + "bsHaUlIsq7Wksrv1pfNIz8ieisEJnk3FE6nitwh6w5RYF7Kl21a1vEPQUipZ" + + "hfPBLGel0lBmBb36va4ge0nketjV01j4lBStIg5c6c+V00gwsu3/Aj+EaMy8" + + "jDW1nle5f1wG6KQxAqLo78BIOojlyQjR1rAbPS+rvxTjirQ60LEPeyEnljmG" + + "xVnGGliSrnlRuI5KAkQxLCUEQTTFy3Dj+1NAUkx4Xoi7ARsfvj0L7T36wq0Y" + + "+aFViAoYfBXqNqf5vLbXo8hcKIkfvUf5b90ivNPnQx/nUH6LsSaDAUEpR3CR" + + "8c3iNn7BURwoIjtAz3NfEgsQRYbyQIb4hgCODp2tnhl+GK1bKvkgnbRoxyCJ" + + "XsK6Ka9lLK6TGP2AG7zdJIBBvWF4yCsNdF06qYuN32L0t4OOP6cRMowDchoY" + + "vwXr9KWAvAc4Kq3KnwwUDPTISLp33n9LFItdgZNZeMjZ3hi7mSisMB4lK0lX" + + "L4T3G/GNH+sYKgS17BRU1Dw/Bmt9LGOmQIFLsKErqIV+cXsBLlNiuC5lzl5Q" + + "W3DTNJhErd3vaecEAJJlTfSjSQ9PLy7nDLv/RjzVKNgXSerqfuiM05McEm40" + + "g6jQDRalN1alU8Cz3GLRjsfNGdYTsh/jPD4+ZiEqnCJo7VMxs+kb38etoTlz" + + "Zs3hoJKH3euds2uSSGn1yPYb7J4QkG0toLIydkwAvMMdIhwQ1VN6bU8cYGax" + + "FtmaugxN+n+00lb2Rbpdp+yVchdeNx1Yal30XPugP7x1OrVAZw5InTNCU9zQ" + + "Fx8ria6g4+t1GgwBqmPi1noSHHG3bThI74oBTsg3L4esRW27OMrTTzYVNemt" + + "dvJXN8yedTY2rVqwbKJO7bGR2VcDDn8ZgoaPBIvQuLSRBIdbUSIeKuLiuHbK" + + "IbkwtZTyz7LvrE1SZ0oDpMf19pb9fZPi3v7yQpFLx0oqqSYdhrJyOfhNVZXU" + + "dc4vbE0qez8MX9PNmyMtt4yktA+FC+2FM4P9jjdvaIfdm2Q7NhxjffvuwBJW" + + "SIoHBSEmxfxZgGCo29pOy2TZt/VpU8zpGpRBaqx0F9L2YzRJgwgOTYbkhF4w" + + "w1w03jCk3UWEg1Eq6kr6ZOEY3Us8DLTnx1RGKeGEpJ/vqtKzX1+KJS1t4E5G" + + "3eqa7WUqcyNqII/9ShMZqdfmXj1llgfuD+31HjDXXVO8RFY2zG/OneMkJJP2" + + "WfCs+IyN0I1+u/UJVMVW1d9y09nbrjruXSjvI2NwALB8NgtTHYbu3aLi0c02" + + "ijIB19xcNdSjwsmpR87lp9VFqIGEPVcYb+E11OODliUPNRPig6kPcbzGGq4b" + + "2CmbVVjPURU0U5cXJv0jqxGl8C7AsDIaJkXwGvQlp0t2wL/Wl66mAqBCQmJO" + + "Uw3A7/NbqGbhky8r4XMBBk0bOBn2jUIXyfJG696QPR27NrMshZRFG8fKmRfm" + + "4inNQQtcu6uUOKcoppeghWHBkK134LCFJakVrgmo0QeUXvdlR79imF9iyFDc" + + "Z6Fayr5Mh0RiDS0DtI4E4k17OVTjPYenflXCSk5VDCN8kM8d34wQEX2lahR2" + + "oWTBvJAFrvMqBL3zjnzjnNavoVaMlJy/Ezjrr+vNraCbNSY69Icflfb0xUEa" + + "RsdADuCKDVXoAavcUKw9aXBTolmHvquBBnUsyi630i2mONUg7ylqJCvCTCGk" + + "EDq48TofcRnuafZt38iwv5PRmRkhnMSGLR3L5AxjCAnSAUvqKPytH4QQ7+PJ" + + "NHc5qetzZdz+jRkCdCnC5YonOWyzi5I20U3Cdl7pL7Ev5INyk8knQLY2a88f" + + "9cUiV5kwPTAhMAkGBSsOAwIaBQAEFM74e0Rbt2IGCAn48XjvdAcaIl6cBBSY" + + "pFDCs7BGKfo6O4hW9fB0/2HXqwICBAA="; + + // You can use this method to print the java code for the BASE64_CERT + // constant. It will open the keystore file provided as argument and + // it will Base64 encode its content - then print the code that you can + // cut and paste back in this test. + private static final String encodeKeyStoreToBase64(String keystorePath) throws IOException { + // e.g.: keystorePath="temp0.jks" + try (FileInputStream fis = new FileInputStream(keystorePath)) { + byte[] bytes = fis.readAllBytes(); + String encoded = Base64.getEncoder().encodeToString(bytes); + format("BASE64_CERT", encoded); + return encoded; + } + } + + private static void format(String name, String value) { + System.out.println("private static final String " + name + " ="); + int start = 0, end = 60; + while (start < value.length() - 1 && end < value.length()) { + System.out.print(" \""); + System.out.print(value.substring(start, end) + .replace("\"", "\\\"")); + System.out.println("\" +"); + start = end; + end += 60; + } + if (end > value.length()) end = value.length(); + System.out.print(" \""); + System.out.print(value.substring(start, end)); + System.out.println("\";"); + } + + private static SSLContext createSSLContext(InputStream i) { + try { + char[] passphrase = "passphrase".toCharArray(); + KeyStore ks = KeyStore.getInstance("PKCS12"); + ks.load(i, passphrase); + + KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX"); + kmf.init(ks, passphrase); + + TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX"); + tmf.init(ks); + + SSLContext ssl = SSLContext.getInstance("TLS"); + ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); + return ssl; + } catch (KeyManagementException | KeyStoreException | + UnrecoverableKeyException | CertificateException | + NoSuchAlgorithmException e) { + throw new RuntimeException(e.getMessage()); + } catch (IOException io) { + throw new UncheckedIOException(io); + } + } + + static final byte[] DATA; + + static { + DATA = new byte[1024]; + int len = 'z' - 'a'; + for (int i = 0; i < DATA.length; i++) { + DATA[i] = (byte) ('a' + (i % len)); + } + } + + final SSLContext context; + final AtomicLong requestCounter = new AtomicLong(); + final AtomicLong responseCounter = new AtomicLong(); + HttpTestServer http1Server; + HttpTestServer http2Server; + HttpTestServer https1Server; + HttpTestServer https2Server; + DigestEchoServer.TunnelingProxy proxy; + + URI http1URI; + URI https1URI; + URI http2URI; + URI https2URI; + InetSocketAddress proxyAddress; + ProxySelector proxySelector; + HttpClient client; + List> futures = new CopyOnWriteArrayList<>(); + Set pending = new CopyOnWriteArraySet<>(); + + final ExecutorService executor = new ThreadPoolExecutor(12, 60, 10, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); + final ExecutorService clientexec = new ThreadPoolExecutor(6, 12, 1, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); + + LargeHandshakeTest(String cert) { + byte[] decoded = Base64.getDecoder().decode(BASE64_CERT); + context = createSSLContext(new ByteArrayInputStream(decoded)); + SSLContext.setDefault(context); + } + + public HttpClient newHttpClient(ProxySelector ps) { + HttpClient.Builder builder = HttpClient + .newBuilder() + .sslContext(context) + .executor(clientexec) + .proxy(ps); + return builder.build(); + } + + public void setUp() throws Exception { + try { + InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0); + + // HTTP/1.1 + HttpServer server1 = HttpServer.create(sa, 0); + server1.setExecutor(executor); + http1Server = HttpTestServer.of(server1); + http1Server.addHandler(new HttpTestLargeHandler(), "/LargeHandshakeTest/http1/"); + http1Server.start(); + http1URI = new URI("http://" + http1Server.serverAuthority() + "/LargeHandshakeTest/http1/"); + + + // HTTPS/1.1 + HttpsServer sserver1 = HttpsServer.create(sa, 100); + sserver1.setExecutor(executor); + sserver1.setHttpsConfigurator(new HttpsConfigurator(context)); + https1Server = HttpTestServer.of(sserver1); + https1Server.addHandler(new HttpTestLargeHandler(), "/LargeHandshakeTest/https1/"); + https1Server.start(); + https1URI = new URI("https://" + https1Server.serverAuthority() + "/LargeHandshakeTest/https1/"); + + // HTTP/2.0 + http2Server = HttpTestServer.of( + new Http2TestServer("localhost", false, 0)); + http2Server.addHandler(new HttpTestLargeHandler(), "/LargeHandshakeTest/http2/"); + http2Server.start(); + http2URI = new URI("http://" + http2Server.serverAuthority() + "/LargeHandshakeTest/http2/"); + + // HTTPS/2.0 + https2Server = HttpTestServer.of( + new Http2TestServer("localhost", true, 0)); + https2Server.addHandler(new HttpTestLargeHandler(), "/LargeHandshakeTest/https2/"); + https2Server.start(); + https2URI = new URI("https://" + https2Server.serverAuthority() + "/LargeHandshakeTest/https2/"); + + proxy = DigestEchoServer.createHttpsProxyTunnel( + DigestEchoServer.HttpAuthSchemeType.NONE); + proxyAddress = proxy.getProxyAddress(); + proxySelector = new HttpProxySelector(proxyAddress); + client = newHttpClient(proxySelector); + System.out.println("Setup: done"); + } catch (Exception x) { + tearDown(); + throw x; + } catch (Error e) { + tearDown(); + throw e; + } + } + + public static void main(String[] args) throws Exception { + System.out.print("The certificate used in this test was generated " + + "with the following command:\n\t"); + System.out.println(COMMAND); + String cert; + if (args.length == 1) { + String storeFile = args[0]; + System.out.println("Parsing jks file: " + storeFile); + format("COMMAND", COMMAND); + cert = encodeKeyStoreToBase64(storeFile); + } else { + cert = BASE64_CERT; + } + LargeHandshakeTest test = new LargeHandshakeTest(cert); + + test.setUp(); + long start = System.nanoTime(); + try { + test.run(args); + } finally { + try { + long elapsed = System.nanoTime() - start; + System.out.println("*** Elapsed: " + Duration.ofNanos(elapsed)); + } finally { + test.tearDown(); + } + } + } + + public void run(String... args) throws Exception { + List serverURIs = List.of(http1URI, http2URI, https1URI, https2URI); + for (int i = 0; i < 5; i++) { + for (URI base : serverURIs) { + if (base.getScheme().equalsIgnoreCase("https")) { + URI proxy = i % 1 == 0 ? base.resolve(URI.create("proxy/foo?n=" + requestCounter.incrementAndGet())) + : base.resolve(URI.create("direct/foo?n=" + requestCounter.incrementAndGet())); + test(proxy); + } + } + for (URI base : serverURIs) { + URI direct = base.resolve(URI.create("direct/foo?n=" + requestCounter.incrementAndGet())); + test(direct); + } + } + CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); + } + + public void test(URI uri) throws Exception { + System.out.println("Testing with " + uri); + pending.add(uri); + HttpRequest request = HttpRequest.newBuilder(uri).build(); + CompletableFuture> resp = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()) + .whenComplete((r, t) -> this.requestCompleted(request, r, t)); + futures.add(resp); + } + + private void requestCompleted(HttpRequest request, HttpResponse r, Throwable t) { + responseCounter.incrementAndGet(); + pending.remove(request.uri()); + System.out.println(request + " -> " + (t == null ? r : t) + + " [still pending: " + (requestCounter.get() - responseCounter.get()) + "]"); + if (pending.size() < 10 && requestCounter.get() > 10) { + pending.forEach(u -> System.out.println("\tpending: " + u)); + } + } + + public void tearDown() { + proxy = stop(proxy, DigestEchoServer.TunnelingProxy::stop); + http1Server = stop(http1Server, HttpTestServer::stop); + https1Server = stop(https1Server, HttpTestServer::stop); + http2Server = stop(http2Server, HttpTestServer::stop); + https2Server = stop(https2Server, HttpTestServer::stop); + client = null; + try { + executor.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + executor.shutdownNow(); + } + try { + clientexec.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + clientexec.shutdownNow(); + } + System.out.println("Teardown: done"); + } + + private interface Stoppable { + public void stop(T service) throws Exception; + } + + static T stop(T service, Stoppable stop) { + try { + if (service != null) stop.stop(service); + } catch (Throwable x) { + } + ; + return null; + } + + static class HttpProxySelector extends ProxySelector { + private static final List NO_PROXY = List.of(Proxy.NO_PROXY); + private final List proxyList; + + HttpProxySelector(InetSocketAddress proxyAddress) { + proxyList = List.of(new Proxy(Proxy.Type.HTTP, proxyAddress)); + } + + @Override + public List select(URI uri) { + // our proxy only supports tunneling + if (uri.getScheme().equalsIgnoreCase("https")) { + if (uri.getPath().contains("/proxy/")) { + return proxyList; + } + } + return NO_PROXY; + } + + @Override + public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { + System.err.println("Connection to proxy failed: " + ioe); + System.err.println("Proxy: " + sa); + System.err.println("\tURI: " + uri); + ioe.printStackTrace(); + } + } + + public static class HttpTestLargeHandler implements HttpTestHandler { + @Override + public void handle(HttpTestExchange t) throws IOException { + try (InputStream is = t.getRequestBody(); + OutputStream os = t.getResponseBody()) { + byte[] bytes = is.readAllBytes(); + assert bytes.length == 0; + URI u = t.getRequestURI(); + long responseID = Long.parseLong(u.getQuery().substring(2)); + System.out.println("Server " + t.getRequestURI() + " sending response " + responseID); + t.sendResponseHeaders(200, DATA.length * 3); + for (int i = 0; i < 3; i++) { + os.write(DATA); + } + System.out.println("\tresp:" + responseID + ": done"); + } + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/net/httpclient/LargeResponseTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/net/httpclient/LargeResponseTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,305 @@ +/* + * 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 com.sun.net.httpserver.HttpServer; +import com.sun.net.httpserver.HttpsConfigurator; +import com.sun.net.httpserver.HttpsServer; +import jdk.test.lib.net.SimpleSSLContext; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +/** + * @test + * @bug 8231449 + * @summary This test verifies that the HttpClient works correctly when the server + * sends large amount of data. Note that this test will pass even without + * the fix for JDK-8231449, which is unfortunate. + * @library /test/lib http2/server + * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DigestEchoServer LargeResponseTest + * @modules java.net.http/jdk.internal.net.http.common + * java.net.http/jdk.internal.net.http.frame + * java.net.http/jdk.internal.net.http.hpack + * java.logging + * java.base/sun.net.www.http + * java.base/sun.net.www + * java.base/sun.net + * @run main/othervm -Dtest.requiresHost=true + * -Djdk.httpclient.HttpClient.log=headers + * -Djdk.internal.httpclient.debug=true + * LargeResponseTest + * + */ +public class LargeResponseTest implements HttpServerAdapters { + static final byte[] DATA; + static { + DATA = new byte[64 * 1024]; + int len = 'z' - 'a'; + for (int i=0; i < DATA.length; i++) { + DATA[i] = (byte) ('a' + (i % len)); + } + } + + static final SSLContext context; + static { + try { + context = new SimpleSSLContext().get(); + SSLContext.setDefault(context); + } catch (Exception x) { + throw new ExceptionInInitializerError(x); + } + } + + final AtomicLong requestCounter = new AtomicLong(); + final AtomicLong responseCounter = new AtomicLong(); + HttpTestServer http1Server; + HttpTestServer http2Server; + HttpTestServer https1Server; + HttpTestServer https2Server; + DigestEchoServer.TunnelingProxy proxy; + + URI http1URI; + URI https1URI; + URI http2URI; + URI https2URI; + InetSocketAddress proxyAddress; + ProxySelector proxySelector; + HttpClient client; + List> futures = new CopyOnWriteArrayList<>(); + Set pending = new CopyOnWriteArraySet<>(); + + final ExecutorService executor = new ThreadPoolExecutor(12, 60, 10, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); + final ExecutorService clientexec = new ThreadPoolExecutor(6, 12, 1, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); + + public HttpClient newHttpClient(ProxySelector ps) { + HttpClient.Builder builder = HttpClient + .newBuilder() + .sslContext(context) + .executor(clientexec) + .proxy(ps); + return builder.build(); + } + + public void setUp() throws Exception { + try { + InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0); + + // HTTP/1.1 + HttpServer server1 = HttpServer.create(sa, 0); + server1.setExecutor(executor); + http1Server = HttpTestServer.of(server1); + http1Server.addHandler(new HttpTestLargeHandler(), "/LargeResponseTest/http1/"); + http1Server.start(); + http1URI = new URI("http://" + http1Server.serverAuthority() + "/LargeResponseTest/http1/"); + + + // HTTPS/1.1 + HttpsServer sserver1 = HttpsServer.create(sa, 100); + sserver1.setExecutor(executor); + sserver1.setHttpsConfigurator(new HttpsConfigurator(context)); + https1Server = HttpTestServer.of(sserver1); + https1Server.addHandler(new HttpTestLargeHandler(), "/LargeResponseTest/https1/"); + https1Server.start(); + https1URI = new URI("https://" + https1Server.serverAuthority() + "/LargeResponseTest/https1/"); + + // HTTP/2.0 + http2Server = HttpTestServer.of( + new Http2TestServer("localhost", false, 0)); + http2Server.addHandler(new HttpTestLargeHandler(), "/LargeResponseTest/http2/"); + http2Server.start(); + http2URI = new URI("http://" + http2Server.serverAuthority() + "/LargeResponseTest/http2/"); + + // HTTPS/2.0 + https2Server = HttpTestServer.of( + new Http2TestServer("localhost", true, 0)); + https2Server.addHandler(new HttpTestLargeHandler(), "/LargeResponseTest/https2/"); + https2Server.start(); + https2URI = new URI("https://" + https2Server.serverAuthority() + "/LargeResponseTest/https2/"); + + proxy = DigestEchoServer.createHttpsProxyTunnel( + DigestEchoServer.HttpAuthSchemeType.NONE); + proxyAddress = proxy.getProxyAddress(); + proxySelector = new HttpProxySelector(proxyAddress); + client = newHttpClient(proxySelector); + System.out.println("Setup: done"); + } catch (Exception x) { + tearDown(); throw x; + } catch (Error e) { + tearDown(); throw e; + } + } + + public static void main(String[] args) throws Exception { + LargeResponseTest test = new LargeResponseTest(); + test.setUp(); + long start = System.nanoTime(); + try { + test.run(args); + } finally { + try { + long elapsed = System.nanoTime() - start; + System.out.println("*** Elapsed: " + Duration.ofNanos(elapsed)); + } finally { + test.tearDown(); + } + } + } + + public void run(String... args) throws Exception { + List serverURIs = List.of(http1URI, http2URI, https1URI, https2URI); + for (int i=0; i<5; i++) { + for (URI base : serverURIs) { + if (base.getScheme().equalsIgnoreCase("https")) { + URI proxy = i % 1 == 0 ? base.resolve(URI.create("proxy/foo?n="+requestCounter.incrementAndGet())) + : base.resolve(URI.create("direct/foo?n="+requestCounter.incrementAndGet())); + test(proxy); + } + } + for (URI base : serverURIs) { + URI direct = base.resolve(URI.create("direct/foo?n="+requestCounter.incrementAndGet())); + test(direct); + } + } + CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); + } + + public void test(URI uri) throws Exception { + System.out.println("Testing with " + uri); + pending.add(uri); + HttpRequest request = HttpRequest.newBuilder(uri).build(); + CompletableFuture> resp = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()) + .whenComplete((r, t) -> this.requestCompleted(request, r, t)); + futures.add(resp); + } + + private void requestCompleted(HttpRequest request, HttpResponse r, Throwable t) { + responseCounter.incrementAndGet(); + pending.remove(request.uri()); + System.out.println(request + " -> " + (t == null ? r : t) + + " [still pending: " + (requestCounter.get() - responseCounter.get()) +"]"); + if (pending.size() < 10 && requestCounter.get() > 10) { + pending.forEach(u -> System.out.println("\tpending: " + u)); + } + } + + public void tearDown() { + proxy = stop(proxy, DigestEchoServer.TunnelingProxy::stop); + http1Server = stop(http1Server, HttpTestServer::stop); + https1Server = stop(https1Server, HttpTestServer::stop); + http2Server = stop(http2Server, HttpTestServer::stop); + https2Server = stop(https2Server, HttpTestServer::stop); + client = null; + try { + executor.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + executor.shutdownNow(); + } + try { + clientexec.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + clientexec.shutdownNow(); + } + System.out.println("Teardown: done"); + } + + private interface Stoppable { public void stop(T service) throws Exception; } + + static T stop(T service, Stoppable stop) { + try { if (service != null) stop.stop(service); } catch (Throwable x) { }; + return null; + } + + static class HttpProxySelector extends ProxySelector { + private static final List NO_PROXY = List.of(Proxy.NO_PROXY); + private final List proxyList; + HttpProxySelector(InetSocketAddress proxyAddress) { + proxyList = List.of(new Proxy(Proxy.Type.HTTP, proxyAddress)); + } + + @Override + public List select(URI uri) { + // our proxy only supports tunneling + if (uri.getScheme().equalsIgnoreCase("https")) { + if (uri.getPath().contains("/proxy/")) { + return proxyList; + } + } + return NO_PROXY; + } + + @Override + public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { + System.err.println("Connection to proxy failed: " + ioe); + System.err.println("Proxy: " + sa); + System.err.println("\tURI: " + uri); + ioe.printStackTrace(); + } + } + + public static class HttpTestLargeHandler implements HttpTestHandler { + @Override + public void handle(HttpTestExchange t) throws IOException { + try (InputStream is = t.getRequestBody(); + OutputStream os = t.getResponseBody()) { + byte[] bytes = is.readAllBytes(); + assert bytes.length == 0; + URI u = t.getRequestURI(); + long responseID = Long.parseLong(u.getQuery().substring(2)); + System.out.println("Server " + t.getRequestURI() + " sending response " + responseID); + t.sendResponseHeaders(200, DATA.length * 3); + for (int i=0; i<3; i++) { + os.write(DATA); + } + System.out.println("\tresp:" + responseID + ": done"); + } + } + } + +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/net/httpclient/http2/RedirectTest.java --- a/test/jdk/java/net/httpclient/http2/RedirectTest.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/net/httpclient/http2/RedirectTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -87,6 +87,11 @@ } } + @Override + protected int redirectCode() { + return 308; // we need to use a code that preserves the body + } + public synchronized boolean error() { return error; } diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java --- a/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -42,11 +42,11 @@ is.readAllBytes(); String location = supplier.get(); System.err.printf("RedirectHandler request to %s from %s\n", - t.getRequestURI().toString(), t.getRemoteAddress().toString()); + t.getRequestURI().toString(), t.getRemoteAddress().toString()); System.err.println("Redirecting to: " + location); HttpHeadersBuilder headersBuilder = t.getResponseHeaders(); headersBuilder.addHeader("Location", location); - t.sendResponseHeaders(301, 1024); + t.sendResponseHeaders(redirectCode(), 1024); byte[] bb = new byte[1024]; OutputStream os = t.getResponseBody(); os.write(bb); @@ -55,6 +55,10 @@ } } + protected int redirectCode() { + return 301; + } + // override in sub-class to examine the exchange, but don't // alter transaction state by reading the request body etc. protected void examineExchange(Http2TestExchange t) { diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/rmi/testlibrary/TestSocketFactory.java --- a/test/jdk/java/rmi/testlibrary/TestSocketFactory.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/rmi/testlibrary/TestSocketFactory.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -92,7 +92,8 @@ static final byte[] EMPTY_BYTE_ARRAY = new byte[0]; - public static final boolean DEBUG = false; + // True to enable logging of matches and replacements. + private static volatile boolean debugLogging = false; /** * Debugging output can be synchronized with logging of RMI actions. @@ -100,8 +101,8 @@ * @param format a printf format * @param args any args */ - private static void DEBUG(String format, Object... args) { - if (DEBUG) { + public static void DEBUG(String format, Object... args) { + if (debugLogging) { System.err.printf(format, args); } } @@ -117,6 +118,17 @@ } /** + * Set debug to true to generate logging output of matches and substitutions. + * @param debug {@code true} to generate logging output + * @return the previous value + */ + public static boolean setDebug(boolean debug) { + boolean oldDebug = debugLogging; + debugLogging = debug; + return oldDebug; + } + + /** * Set the match and replacement bytes, with an empty trigger. * The match and replacements are propagated to all existing sockets. * diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/rmi/transport/closeServerSocket/CloseServerSocket.java --- a/test/jdk/java/rmi/transport/closeServerSocket/CloseServerSocket.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/rmi/transport/closeServerSocket/CloseServerSocket.java Wed Oct 23 14:01:17 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2016, 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 @@ -63,8 +63,19 @@ verifyPortInUse(PORT); UnicastRemoteObject.unexportObject(registry, true); System.err.println("- unexported registry"); - Thread.sleep(1000); // work around BindException (bug?) - verifyPortFree(PORT); + int tries = (int)TestLibrary.getTimeoutFactor(); + tries = Math.max(tries, 1); + while (tries-- > 0) { + Thread.sleep(1000); + try { + verifyPortFree(PORT); + break; + } catch (IOException ignore) { } + } + if (tries < 0) { + throw new RuntimeException("time out after tries: " + tries); + } + /* * The follow portion of this test is disabled temporarily @@ -101,6 +112,7 @@ private static void verifyPortInUse(int port) throws IOException { try { verifyPortFree(port); + throw new RuntimeException("port is not in use: " + port); } catch (BindException e) { System.err.println("- port " + port + " is in use"); return; diff -r bc43733cd5cf -r 015949faea55 test/jdk/java/security/testlibrary/Proc.java --- a/test/jdk/java/security/testlibrary/Proc.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/java/security/testlibrary/Proc.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -25,6 +25,9 @@ import java.io.File; import java.io.IOException; import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.io.UncheckedIOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -110,6 +113,7 @@ private List args = new ArrayList<>(); private Map env = new HashMap<>(); private Map prop = new HashMap(); + private Map secprop = new HashMap(); private boolean inheritIO = false; private boolean noDump = false; @@ -176,6 +180,11 @@ prop.put(a, b); return this; } + // Specifies a security property. Can be called multiple times. + public Proc secprop(String a, String b) { + secprop.put(a, b); + return this; + } // Inherit the value of a system property public Proc inheritProp(String k) { String v = System.getProperty(k); @@ -282,6 +291,17 @@ cmd.add(cp.stream().collect(Collectors.joining(File.pathSeparator))); } + if (!secprop.isEmpty()) { + Path p = Path.of(getId("security")); + try (OutputStream fos = Files.newOutputStream(p); + PrintStream ps = new PrintStream(fos)) { + secprop.forEach((k,v) -> ps.println(k + "=" + v)); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + prop.put("java.security.properties", p.toString()); + } + for (Entry e: prop.entrySet()) { cmd.add("-D" + e.getKey() + "=" + e.getValue()); } @@ -380,6 +400,12 @@ } return p.waitFor(); } + // Wait for process end with expected exit code + public void waitFor(int expected) throws Exception { + if (p.waitFor() != expected) { + throw new RuntimeException("Exit code not " + expected); + } + } // The following methods are used inside a proc diff -r bc43733cd5cf -r 015949faea55 test/jdk/javax/xml/crypto/dsig/Versions.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/javax/xml/crypto/dsig/Versions.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,82 @@ +/* + * 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 8232357 + * @library /test/lib + * @summary Compare version info of Santuario to legal notice + */ + +import jdk.test.lib.Asserts; + +import java.nio.file.Files; +import java.nio.file.Path; + +public class Versions { + + public static void main(String[] args) throws Exception { + + Path src = Path.of(System.getProperty("test.root"), + "../../src/java.xml.crypto"); + Path legal = Path.of(System.getProperty("test.jdk"), "legal"); + + Path provider = src.resolve( + "share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java"); + + Path mdInSrc = src.resolve( + "share/legal/santuario.md"); + Path mdInImage = legal.resolve( + "java.xml.crypto/santuario.md"); + + // Files in src should either both exist or not + if (!Files.exists(provider) && !Files.exists(mdInSrc)) { + System.out.println("Source not available. Cannot proceed."); + return; + } + + // The line containing the version number looks like + // // Apache Santuario XML Security for Java, version n.n.n + String s1 = Files.lines(provider) + .filter(s -> s.contains( + "// Apache Santuario XML Security for Java, version ")) + .findFirst() + .get() + .replaceFirst(".* ", ""); // keep chars after the last space + + // The first line of this file should look like + // ## Apache Santuario v2.1.3 + String s2 = Files.lines(mdInSrc) + .findFirst() + .get() + .replace("## Apache Santuario v", ""); + + Asserts.assertEQ(s1, s2); + + if (Files.exists(legal)) { + Asserts.assertTrue(Files.mismatch(mdInSrc, mdInImage) == -1); + } else { + System.out.println("Warning: skip image compare. Exploded build?"); + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/jdk/sun/misc/SunMiscSignalTest.java --- a/test/jdk/sun/misc/SunMiscSignalTest.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/sun/misc/SunMiscSignalTest.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -133,10 +133,12 @@ Object[][] posixNonOSXSignals = { {"BUS", IsSupported.YES, CanRegister.YES, CanRaise.YES, invokedXrs}, + {"INFO", IsSupported.NO, CanRegister.NO, CanRaise.NO, Invoked.NO}, }; Object[][] posixOSXSignals = { {"BUS", IsSupported.YES, CanRegister.NO, CanRaise.NO, Invoked.NO}, + {"INFO", IsSupported.YES, CanRegister.YES, CanRaise.YES, invokedXrs}, }; Object[][] windowsSignals = { diff -r bc43733cd5cf -r 015949faea55 test/jdk/sun/security/util/FilePermCompat/Flag.java --- a/test/jdk/sun/security/util/FilePermCompat/Flag.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/jdk/sun/security/util/FilePermCompat/Flag.java Wed Oct 23 14:01:17 2019 -0400 @@ -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 @@ -23,22 +23,84 @@ /* * @test - * @bug 8164705 + * @bug 8164705 8209901 + * @library /test/jdk/java/security/testlibrary + * @modules java.base/jdk.internal.misc * @summary check jdk.filepermission.canonicalize - * @run main/othervm/policy=flag.policy - * -Djdk.io.permissionsUseCanonicalPath=true Flag true true - * @run main/othervm/policy=flag.policy - * -Djdk.io.permissionsUseCanonicalPath=false Flag false true - * @run main/othervm/policy=flag.policy Flag false true */ import java.io.File; import java.io.FilePermission; import java.lang.*; +import java.nio.file.Path; public class Flag { public static void main(String[] args) throws Exception { + if (args.length == 0) { + String policy = Path.of( + System.getProperty("test.src"), "flag.policy").toString(); + + // effectively true + Proc.create("Flag") + .prop("java.security.manager", "") + .prop("java.security.policy", policy) + .prop("jdk.io.permissionsUseCanonicalPath", "true") + .args("run", "true", "true") + .start() + .waitFor(0); + Proc.create("Flag") + .prop("java.security.manager", "") + .prop("java.security.policy", policy) + .secprop("jdk.io.permissionsUseCanonicalPath", "true") + .args("run", "true", "true") + .start() + .waitFor(0); + Proc.create("Flag") + .prop("java.security.manager", "") + .prop("java.security.policy", policy) + .secprop("jdk.io.permissionsUseCanonicalPath", "false") + .prop("jdk.io.permissionsUseCanonicalPath", "true") + .args("run", "true", "true") + .start() + .waitFor(0); + + // effectively false + Proc.create("Flag") + .prop("java.security.manager", "") + .prop("java.security.policy", policy) + .prop("jdk.io.permissionsUseCanonicalPath", "false") + .args("run", "false", "true") + .start() + .waitFor(0); + Proc.create("Flag") + .prop("java.security.manager", "") + .prop("java.security.policy", policy) + .secprop("jdk.io.permissionsUseCanonicalPath", "false") + .args("run", "false", "true") + .start() + .waitFor(0); + Proc.create("Flag") + .prop("java.security.manager", "") + .prop("java.security.policy", policy) + .secprop("jdk.io.permissionsUseCanonicalPath", "true") + .prop("jdk.io.permissionsUseCanonicalPath", "false") + .args("run", "false", "true") + .start() + .waitFor(0); + Proc.create("Flag") + .prop("java.security.manager", "") + .prop("java.security.policy", policy) + .args("run", "false", "true") + .start() + .waitFor(0); + } else { + run(args); + } + } + + static void run(String[] args) throws Exception { + boolean test1; boolean test2; @@ -55,8 +117,8 @@ test2 = false; } - if (test1 != Boolean.parseBoolean(args[0]) || - test2 != Boolean.parseBoolean(args[1])) { + if (test1 != Boolean.parseBoolean(args[1]) || + test2 != Boolean.parseBoolean(args[2])) { throw new Exception("Test failed: " + test1 + " " + test2); } } diff -r bc43733cd5cf -r 015949faea55 test/langtools/jdk/javadoc/tool/TestScriptInComment.java --- a/test/langtools/jdk/javadoc/tool/TestScriptInComment.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/langtools/jdk/javadoc/tool/TestScriptInComment.java Wed Oct 23 14:01:17 2019 -0400 @@ -23,7 +23,7 @@ /** * @test - * @bug 8138725 + * @bug 8138725 8226765 * @summary test --allow-script-in-comments * @modules jdk.javadoc/jdk.javadoc.internal.tool */ @@ -63,6 +63,10 @@ WS("< script >#ALERT", false, "-Xdoclint:none"), // script tag with invalid white space SP("", true), // script tag with an attribute ON("x", true), // event handler attribute + OME("1", true), // onmouseenter event handler attribute + OML("1", true), // onmouseleave event handler attribute + OFI("x", true), // onfocusin event handler attribute + OBE("x", true), // bogus/future event handler attribute URI("x", true); // javascript URI /** diff -r bc43733cd5cf -r 015949faea55 test/langtools/tools/javac/diags/examples.not-yet.txt --- a/test/langtools/tools/javac/diags/examples.not-yet.txt Wed Oct 23 13:53:41 2019 -0400 +++ b/test/langtools/tools/javac/diags/examples.not-yet.txt Wed Oct 23 14:01:17 2019 -0400 @@ -11,6 +11,7 @@ compiler.err.invalid.repeatable.annotation.invalid.value # "can't" happen compiler.err.invalid.repeatable.annotation.multiple.values # can't happen compiler.err.io.exception # (javah.JavahTask?) +compiler.err.is.preview # difficult to produce reliably despite future changes to java.base compiler.err.limit.code # Code compiler.err.limit.code.too.large.for.try.stmt # Gen compiler.err.limit.dimensions # Gen @@ -111,6 +112,7 @@ compiler.warn.illegal.char.for.encoding compiler.warn.incubating.modules # requires adjusted classfile compiler.warn.invalid.archive.file +compiler.warn.is.preview # difficult to produce reliably despite future changes to java.base compiler.warn.override.bridge compiler.warn.position.overflow # CRTable: caused by files with long lines >= 1024 chars compiler.warn.proc.type.already.exists # JavacFiler: just mentioned in TODO diff -r bc43733cd5cf -r 015949faea55 test/langtools/tools/javac/lib/combo/ComboInstance.java --- a/test/langtools/tools/javac/lib/combo/ComboInstance.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/langtools/tools/javac/lib/combo/ComboInstance.java Wed Oct 23 14:01:17 2019 -0400 @@ -23,6 +23,7 @@ package combo; +import java.lang.reflect.Method; import javax.tools.StandardJavaFileManager; import java.util.Optional; @@ -57,6 +58,14 @@ env.info().lastError = Optional.of(ex); } finally { this.env = null; + try { + Class fmClass = env.fileManager().getClass(); + Method clear = fmClass.getMethod("clear"); + clear.setAccessible(true); + clear.invoke(env.fileManager()); + } catch (Exception ex) { + throw new IllegalStateException(ex); + } } } @@ -125,4 +134,4 @@ return success; } } -} \ No newline at end of file +} diff -r bc43733cd5cf -r 015949faea55 test/langtools/tools/javac/preview/PreviewErrors.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/langtools/tools/javac/preview/PreviewErrors.java Wed Oct 23 14:01:17 2019 -0400 @@ -0,0 +1,274 @@ +/* + * 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 8226585 + * @summary Verify behavior w.r.t. preview feature API errors and warnings + * @library /tools/lib /tools/javac/lib + * @modules + * java.base/jdk.internal + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.main + * jdk.compiler/com.sun.tools.javac.util + * @build toolbox.ToolBox toolbox.JavacTask + * @build combo.ComboTestHelper + * @compile --enable-preview -source ${jdk.version} PreviewErrors.java + * @run main/othervm --enable-preview PreviewErrors + */ + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import combo.ComboInstance; +import combo.ComboParameter; +import combo.ComboTask; +import combo.ComboTestHelper; +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; +import javax.tools.Diagnostic; + +import jdk.internal.PreviewFeature; + +import toolbox.JavacTask; +import toolbox.ToolBox; + +public class PreviewErrors extends ComboInstance { + + protected ToolBox tb; + + PreviewErrors() { + super(); + tb = new ToolBox(); + } + + public static void main(String... args) throws Exception { + new ComboTestHelper() + .withDimension("ESSENTIAL", (x, essential) -> x.essential = essential, EssentialAPI.values()) + .withDimension("PREVIEW", (x, preview) -> x.preview = preview, Preview.values()) + .withDimension("LINT", (x, lint) -> x.lint = lint, Lint.values()) + .withDimension("SUPPRESS", (x, suppress) -> x.suppress = suppress, Suppress.values()) + .withDimension("FROM", (x, from) -> x.from = from, PreviewFrom.values()) + .run(PreviewErrors::new); + } + + private EssentialAPI essential; + private Preview preview; + private Lint lint; + private Suppress suppress; + private PreviewFrom from; + + @Override + public void doWork() throws IOException { + Path base = Paths.get("."); + Path src = base.resolve("src"); + Path srcJavaBase = src.resolve("java.base"); + Path classes = base.resolve("classes"); + Path classesJavaBase = classes.resolve("java.base"); + + Files.createDirectories(classesJavaBase); + + String previewAPI = """ + package preview.api; + public class Extra { + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.${preview} + ${essential}) + public static void test() { } + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.${preview} + ${essential}) + public static class Clazz {} + } + """.replace("${preview}", PreviewFeature.Feature.values()[0].name()) + .replace("${essential}", essential.expand(null)); + + if (from == PreviewFrom.CLASS) { + tb.writeJavaFiles(srcJavaBase, previewAPI); + + new JavacTask(tb) + .outdir(classesJavaBase) + .options("--patch-module", "java.base=" + srcJavaBase.toString()) + .files(tb.findJavaFiles(srcJavaBase)) + .run() + .writeAll(); + } + + ComboTask task = newCompilationTask() + .withSourceFromTemplate(""" + package test; + public class Test { + #{SUPPRESS} + public void test() { + preview.api.Extra.test(); + preview.api.Extra.Clazz c; + } + } + """) + .withOption("-XDrawDiagnostics") + .withOption("-source") + .withOption(String.valueOf(Runtime.version().feature())); + + if (from == PreviewFrom.CLASS) { + task.withOption("--patch-module") + .withOption("java.base=" + classesJavaBase.toString()) + .withOption("--add-exports") + .withOption("java.base/preview.api=ALL-UNNAMED"); + } else { + task.withSourceFromTemplate("Extra", previewAPI) + .withOption("--add-exports") + .withOption("java.base/jdk.internal=ALL-UNNAMED"); + } + + if (preview.expand(null)!= null) { + task = task.withOption(preview.expand(null)); + } + + if (lint.expand(null) != null) { + task = task.withOption(lint.expand(null)); + } + + task.generate(result -> { + Set actual = Arrays.stream(Diagnostic.Kind.values()) + .flatMap(kind -> result.diagnosticsForKind(kind).stream()) + .map(d -> d.getLineNumber() + ":" + d.getColumnNumber() + ":" + d.getCode()) + .collect(Collectors.toSet()); + Set expected; + boolean ok; + if (essential == EssentialAPI.YES) { + if (preview == Preview.YES) { + if (suppress == Suppress.YES) { + expected = Set.of(); + } else if (lint == Lint.ENABLE_PREVIEW) { + expected = Set.of("5:26:compiler.warn.is.preview", "6:26:compiler.warn.is.preview"); + } else { + expected = Set.of("-1:-1:compiler.note.preview.filename", + "-1:-1:compiler.note.preview.recompile"); + } + ok = true; + } else { + expected = Set.of("5:26:compiler.err.is.preview", "6:26:compiler.err.is.preview"); + ok = false; + } + } else { + if (suppress == Suppress.YES) { + expected = Set.of(); + } else if ((preview == Preview.YES && (lint == Lint.NONE || lint == Lint.DISABLE_PREVIEW)) || + (preview == Preview.NO && lint == Lint.DISABLE_PREVIEW)) { + expected = Set.of("-1:-1:compiler.note.preview.filename", + "-1:-1:compiler.note.preview.recompile"); + } else { + expected = Set.of("5:26:compiler.warn.is.preview", "6:26:compiler.warn.is.preview"); + } + ok = true; + } + if (ok) { + if (!result.get().iterator().hasNext()) { + throw new IllegalStateException("Did not succeed as expected." + actual); + } + } else { + if (result.get().iterator().hasNext()) { + throw new IllegalStateException("Succeed unexpectedly."); + } + } + if (!expected.equals(actual)) { + throw new IllegalStateException("Unexpected output for " + essential + ", " + preview + ", " + lint + ", " + suppress + ", " + from + ": actual: \"" + actual + "\", expected: \"" + expected + "\""); + } + }); + } + + public enum EssentialAPI implements ComboParameter { + YES(", essentialAPI=true"), + NO(", essentialAPI=false"); + + private final String code; + + private EssentialAPI(String code) { + this.code = code; + } + + public String expand(String optParameter) { + return code; + } + } + + public enum Preview implements ComboParameter { + YES("--enable-preview"), + NO(null); + + private final String opt; + + private Preview(String opt) { + this.opt = opt; + } + + public String expand(String optParameter) { + return opt; + } + } + + public enum Lint implements ComboParameter { + NONE(null), + ENABLE_PREVIEW("-Xlint:preview"), + DISABLE_PREVIEW("-Xlint:-preview"); + + private final String opt; + + private Lint(String opt) { + this.opt = opt; + } + + public String expand(String optParameter) { + return opt; + } + } + + public enum Suppress implements ComboParameter { + YES("@SuppressWarnings(\"preview\")"), + NO(""); + + private final String code; + + private Suppress(String code) { + this.code = code; + } + + public String expand(String optParameter) { + return code; + } + } + + public enum PreviewFrom implements ComboParameter { + CLASS, + SOURCE; + + private PreviewFrom() { + } + + public String expand(String optParameter) { + throw new IllegalStateException(); + } + } +} diff -r bc43733cd5cf -r 015949faea55 test/langtools/tools/javac/tree/NoPrivateTypesExported.java --- a/test/langtools/tools/javac/tree/NoPrivateTypesExported.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/langtools/tools/javac/tree/NoPrivateTypesExported.java Wed Oct 23 14:01:17 2019 -0400 @@ -177,6 +177,7 @@ if (annotationElement.getAnnotation(Documented.class) == null) { note("Ignoring undocumented annotation: " + mirror.getAnnotationType()); + continue; } verifyTypeAcceptable(mirror.getAnnotationType(), acceptable); diff -r bc43733cd5cf -r 015949faea55 test/langtools/tools/jdeps/listdeps/ListModuleDeps.java --- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java Wed Oct 23 13:53:41 2019 -0400 +++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java Wed Oct 23 14:01:17 2019 -0400 @@ -92,6 +92,7 @@ public Object[][] jdkModules() { return new Object[][]{ {"jdk.compiler", new String[]{ + "java.base/jdk.internal", "java.base/jdk.internal.jmod", "java.base/jdk.internal.misc", "java.base/sun.reflect.annotation",