diff --git a/.hgtags b/.hgtags index 31032afb1f4..b3d62d64a7e 100644 --- a/.hgtags +++ b/.hgtags @@ -554,3 +554,4 @@ b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12-ga 46cf212cdccaf4fb064d913b12004007d3322b67 jdk-13+14 f855ec13aa2501ae184c8b3e0626a8cec9966116 jdk-13+15 9d0ae9508d5337b0dc7cc4684be42888c4023755 jdk-13+16 +93b702d2a0cb9e32160208f6700aede1f8492773 jdk-13+17 diff --git a/doc/building.html b/doc/building.html index dc6f097e35c..e2bc854968d 100644 --- a/doc/building.html +++ b/doc/building.html @@ -180,15 +180,15 @@ Linux -Oracle Enterprise Linux 6.4 / 7.1 (using kernel 3.8.13) +Oracle Enterprise Linux 6.4 / 7.6 Solaris -Solaris 11.1 SRU 21.4.1 / 11.2 SRU 5.5 +Solaris 11.3 macOS -Mac OS X 10.9 (Mavericks) / 10.10 (Yosemite) +Mac OS X 10.13 (High Sierra) Windows @@ -196,7 +196,7 @@ -

The double version numbers for Linux, Solaris and macOS is due to the hybrid model used at Oracle, where header files and external libraries from an older version are used when building on a more modern version of the OS.

+

The double version numbers for Linux and Solaris are due to the hybrid model used at Oracle, where header files and external libraries from an older version are used when building on a more modern version of the OS.

The Build Group has a wiki page with Supported Build Platforms. From time to time, this is updated by contributors to list successes or failures of building on different platforms.

Windows

Windows XP is not a supported platform, but all newer Windows should be able to build the JDK.

@@ -281,19 +281,19 @@ Linux -gcc 7.3.0 +gcc 8.2.0 macOS -Apple Xcode 9.4 (using clang 9.1.0) +Apple Xcode 10.1 (using clang 10.0.0) Solaris -Oracle Solaris Studio 12.4 (with compiler version 5.13) +Oracle Solaris Studio 12.6 (with compiler version 5.15) Windows -Microsoft Visual Studio 2017 update 15.5.5 +Microsoft Visual Studio 2017 update 15.9.6 diff --git a/doc/building.md b/doc/building.md index 2f64c7ee6b1..9d749b9859b 100644 --- a/doc/building.md +++ b/doc/building.md @@ -150,14 +150,14 @@ time of writing. Operating system Vendor/version used ----------------- ------------------------------------------------------- - Linux Oracle Enterprise Linux 6.4 / 7.1 (using kernel 3.8.13) - Solaris Solaris 11.1 SRU 21.4.1 / 11.2 SRU 5.5 - macOS Mac OS X 10.9 (Mavericks) / 10.10 (Yosemite) + Linux Oracle Enterprise Linux 6.4 / 7.6 + Solaris Solaris 11.3 SRU 20 + macOS Mac OS X 10.13 (High Sierra) Windows Windows Server 2012 R2 -The double version numbers for Linux, Solaris and macOS is due to the hybrid -model used at Oracle, where header files and external libraries from an older -version are used when building on a more modern version of the OS. +The double version numbers for Linux and Solaris are due to the hybrid model +used at Oracle, where header files and external libraries from an older version +are used when building on a more modern version of the OS. The Build Group has a wiki page with [Supported Build Platforms]( https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms). From @@ -323,10 +323,10 @@ issues. Operating system Toolchain version ------------------ ------------------------------------------------------- - Linux gcc 7.3.0 - macOS Apple Xcode 9.4 (using clang 9.1.0) - Solaris Oracle Solaris Studio 12.4 (with compiler version 5.13) - Windows Microsoft Visual Studio 2017 update 15.5.5 + Linux gcc 8.2.0 + macOS Apple Xcode 10.1 (using clang 10.0.0) + Solaris Oracle Solaris Studio 12.6 (with compiler version 5.15) + Windows Microsoft Visual Studio 2017 update 15.9.6 ### gcc diff --git a/doc/testing.html b/doc/testing.html index f4c45aa63f0..4523b02c9f0 100644 --- a/doc/testing.html +++ b/doc/testing.html @@ -41,6 +41,7 @@
  • Notes for Specific Tests
    • @@ -191,8 +192,12 @@ TEST FAILURE

    Notes for Specific Tests

    Docker Tests

    Docker tests with default parameters may fail on systems with glibc versions not compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86). For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:

    -
    $ make test TEST="jtreg:test/hotspot/jtreg/runtime/containers/docker"
    +
    $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker"

    To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using JAVA_OPTIONS.

    -
    $ make test TEST="jtreg:test/hotspot/jtreg/runtime/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
    +
    $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
    +

    Non-US locale

    +

    If your locale is non-US, some tests are likely to fail. To work around this you can set the locale to US. On Unix platforms simply setting LANG="en_US" in the environment before running tests should work. On Windows, setting JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US" helps for most, but not all test cases. For example:

    +
    $ export LANG="en_US" && make test TEST=...
+$ make test JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US" TEST=...
    diff --git a/doc/testing.md b/doc/testing.md index 6f0a23df4b5..56308b29761 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -381,12 +381,23 @@ Docker tests with default parameters may fail on systems with glibc versions not compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86). For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86: - $ make test TEST="jtreg:test/hotspot/jtreg/runtime/containers/docker" + $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using `JAVA_OPTIONS`. - $ make test TEST="jtreg:test/hotspot/jtreg/runtime/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest" + $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest" + +### Non-US locale + +If your locale is non-US, some tests are likely to fail. To work around this you can +set the locale to US. On Unix platforms simply setting `LANG="en_US"` in the +environment before running tests should work. On Windows, setting +`JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for most, but not all test cases. +For example: + + $ export LANG="en_US" && make test TEST=... + $ make test JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US" TEST=... --- # Override some definitions in the global css file that are not optimal for diff --git a/make/Coverage.gmk b/make/Coverage.gmk index 03416fed77d..b59935b45e4 100644 --- a/make/Coverage.gmk +++ b/make/Coverage.gmk @@ -49,6 +49,7 @@ $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release -exclude 'java.lang.Object' \ -exclude 'jdk.internal.org.objectweb.**' \ -exclude jdk.test.Main -exclude '**\$Proxy*' \ + $(JCOV_FILTERS) \ $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR) $(MV) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR) $(JCOV_IMAGE_DIR) $(RMDIR) $(JCOV_TEMP) diff --git a/make/RunTests.gmk b/make/RunTests.gmk index d9409e546d5..8c486cda4ea 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -1194,10 +1194,18 @@ ifeq ($(TEST_OPTS_JCOV), true) $(call LogWarn, Stopping JCov Grabber...) $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 + JCOV_REPORT_TITLE := JDK code coverage report
    + ifneq ($(JCOV_FILTERS), ) + JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)
    + endif + JCOV_REPORT_TITLE += Tests: $(TEST) + jcov-gen-report: jcov-stop-grabber $(call LogWarn, Generating JCov report ...) $(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \ `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \ + $(JCOV_FILTERS) \ + -mainReportTitle "$(JCOV_REPORT_TITLE)" \ -o $(JCOV_REPORT) $(JCOV_RESULT_FILE) TARGETS += jcov-do-start-grabber jcov-start-grabber jcov-stop-grabber \ diff --git a/make/autoconf/flags-other.m4 b/make/autoconf/flags-other.m4 index 8263b3142a4..7280b500b96 100644 --- a/make/autoconf/flags-other.m4 +++ b/make/autoconf/flags-other.m4 @@ -81,21 +81,21 @@ AC_DEFUN([FLAGS_SETUP_RCFLAGS], RC_FLAGS="$RC_FLAGS \ -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \ -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \ - -D\"JDK_COMPONENT=\$(JDK_RC_NAME) binary\" \ + -D\"JDK_FILEDESC=\$(JDK_RC_NAME) binary\" \ -D\"JDK_VER=\$(VERSION_NUMBER)\" \ -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ -D\"JDK_NAME=\$(JDK_RC_NAME) \$(VERSION_FEATURE)\" \ -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" JVM_RCFLAGS="$JVM_RCFLAGS \ - -D\"HS_BUILD_ID=\$(VERSION_STRING)\" \ + -D\"HS_VERSION_STRING=\$(VERSION_STRING)\" \ -D\"HS_COMPANY=\$(COMPANY_NAME)\" \ - -D\"JDK_DOTVER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \ + -D\"HS_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \ + -D\"HS_INTERNAL_NAME=jvm\" \ -D\"HS_COPYRIGHT=Copyright $COPYRIGHT_YEAR\" \ - -D\"HS_NAME=\$(PRODUCT_NAME) \$(VERSION_SHORT)\" \ - -D\"JDK_VER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\" \ -D\"HS_FNAME=jvm.dll\" \ - -D\"HS_INTERNAL_NAME=jvm\"" + -D\"HS_NAME=\$(PRODUCT_NAME) \$(VERSION_SHORT)\" \ + -D\"HS_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" fi AC_SUBST(RC_FLAGS) AC_SUBST(JVM_RCFLAGS) diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index ec410c86cc0..5d276a88c21 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -404,9 +404,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE], [jcov library location])]) AC_ARG_WITH(jcov-input-jdk, [AS_HELP_STRING([--with-jcov-input-jdk], [jdk image to instrument])]) + AC_ARG_WITH(jcov-filters, [AS_HELP_STRING([--with-jcov-filters], + [filters to limit code for jcov instrumentation and report generation])]) JCOV_HOME= JCOV_INPUT_JDK= JCOV_ENABLED= + JCOV_FILTERS= if test "x$with_jcov" = "x" ; then JCOV_ENABLED="false" else @@ -425,10 +428,14 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE], fi BASIC_FIXUP_PATH(JCOV_INPUT_JDK) fi + if test "x$with_jcov_filters" != "x" ; then + JCOV_FILTERS="$with_jcov_filters" + fi fi AC_SUBST(JCOV_ENABLED) AC_SUBST(JCOV_HOME) AC_SUBST(JCOV_INPUT_JDK) + AC_SUBST(JCOV_FILTERS) ]) ############################################################################### diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4 index f1ba26699b2..1fcb38c01cc 100644 --- a/make/autoconf/jdk-version.m4 +++ b/make/autoconf/jdk-version.m4 @@ -66,7 +66,33 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS], AC_SUBST(PRODUCT_SUFFIX) AC_SUBST(JDK_RC_PLATFORM_NAME) AC_SUBST(HOTSPOT_VM_DISTRO) + + # Set the MACOSX Bundle Name base + AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base], + [Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names. + @<:@not specified@:>@])]) + if test "x$with_macosx_bundle_name_base" = xyes; then + AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value]) + elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then + AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base]) + elif test "x$with_macosx_bundle_name_base" != x; then + # Set MACOSX_BUNDLE_NAME_BASE to the configured value. + MACOSX_BUNDLE_NAME_BASE="$with_macosx_bundle_name_base" + fi AC_SUBST(MACOSX_BUNDLE_NAME_BASE) + + # Set the MACOSX Bundle ID base + AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base], + [Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs. + @<:@not specified@:>@])]) + if test "x$with_macosx_bundle_id_base" = xyes; then + AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value]) + elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then + AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base]) + elif test "x$with_macosx_bundle_id_base" != x; then + # Set MACOSX_BUNDLE_ID_BASE to the configured value. + MACOSX_BUNDLE_ID_BASE="$with_macosx_bundle_id_base" + fi AC_SUBST(MACOSX_BUNDLE_ID_BASE) # Set the JDK RC name diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 644e89ef2f2..5f16f08b208 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 @@ -130,6 +130,11 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lthread" fi + # perfstat lib + if test "x$OPENJDK_TARGET_OS" = xaix; then + BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat" + fi + if test "x$OPENJDK_TARGET_OS" = xsolaris; then BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lsocket -lsched -ldoor -ldemangle -lnsl \ -lrt -lkstat" diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in index f9fd16067f4..4616c913d43 100644 --- a/make/autoconf/spec.gmk.in +++ b/make/autoconf/spec.gmk.in @@ -389,6 +389,7 @@ GCOV_ENABLED=@GCOV_ENABLED@ JCOV_ENABLED=@JCOV_ENABLED@ JCOV_HOME=@JCOV_HOME@ JCOV_INPUT_JDK=@JCOV_INPUT_JDK@ +JCOV_FILTERS=@JCOV_FILTERS@ # AddressSanitizer export ASAN_ENABLED:=@ASAN_ENABLED@ diff --git a/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java index dc54e0f652d..001d9e2a275 100644 --- a/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java +++ b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java @@ -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 @@ -67,13 +67,24 @@ public class HelloClasslist { .forEach(System.out::println); // Common concatenation patterns - String const_I = "string" + args.length; - String const_S = "string" + String.valueOf(args.length); - String S_const = String.valueOf(args.length) + "string"; - String S_S = String.valueOf(args.length) + String.valueOf(args.length); - String const_J = "string" + System.currentTimeMillis(); - String I_const = args.length + "string"; - String J_const = System.currentTimeMillis() + "string"; + String SS = String.valueOf(args.length) + String.valueOf(args.length); + String CS = "string" + String.valueOf(args.length); + String SC = String.valueOf(args.length) + "string"; + String SCS = String.valueOf(args.length) + "string" + String.valueOf(args.length); + String CSS = "string" + String.valueOf(args.length) + String.valueOf(args.length); + String CSCS = "string" + String.valueOf(args.length) + "string" + String.valueOf(args.length); + String SCSC = String.valueOf(args.length) + "string" + String.valueOf(args.length) + "string"; + String CSCSC = "string" + String.valueOf(args.length) + "string" + String.valueOf(args.length) + "string"; + String SCSCS = String.valueOf(args.length) + "string" + String.valueOf(args.length) + "string" + String.valueOf(args.length); + String CI = "string" + args.length; + String IC = args.length + "string"; + String CIC = "string" + args.length + "string"; + String CICI = "string" + args.length + "string" + args.length; + String CJ = "string" + System.currentTimeMillis(); + String JC = System.currentTimeMillis() + "string"; + String CJC = "string" + System.currentTimeMillis() + "string"; + String CJCJ = "string" + System.currentTimeMillis() + "string" + System.currentTimeMillis(); + String CJCJC = "string" + System.currentTimeMillis() + "string" + System.currentTimeMillis() + "string"; String newDate = DateTimeFormatter.ISO_LOCAL_DATE_TIME.format( LocalDateTime.now(ZoneId.of("GMT"))); diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk index 7dce7a1ebc3..e26e423df8a 100644 --- a/make/launcher/Launcher-java.base.gmk +++ b/make/launcher/Launcher-java.base.gmk @@ -39,7 +39,6 @@ JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons # overwritten. $(eval $(call SetupBuildLauncher, java, \ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ - LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \ EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \ diff --git a/make/launcher/Launcher-jdk.accessibility.gmk b/make/launcher/Launcher-jdk.accessibility.gmk index fbf3d9493ae..6364a7d3d8d 100644 --- a/make/launcher/Launcher-jdk.accessibility.gmk +++ b/make/launcher/Launcher-jdk.accessibility.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ ifeq ($(call isTargetOs, windows), true) DISABLED_WARNINGS_microsoft := 4267 4996, \ LDFLAGS := $(LDFLAGS_JDKEXE), \ LIBS := advapi32.lib version.lib user32.lib, \ - VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.RC, \ + VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.rc, \ MANIFEST := $(JABSWITCH_SRC)/jabswitch.manifest, \ MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \ )) diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk index 719c24a8c23..c90b9792a2c 100644 --- a/make/launcher/LauncherCommon.gmk +++ b/make/launcher/LauncherCommon.gmk @@ -73,8 +73,7 @@ JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest # compile time defines exceeding Visual Studio 2013 limitations. # CFLAGS Additional CFLAGS # CFLAGS_windows Additional CFLAGS_windows -# LDFLAGS_solaris Additional LDFLAGS_solaris -# RC_FLAGS Additional RC_FLAGS +# EXTRA_RC_FLAGS Additional EXTRA_RC_FLAGS # MACOSX_SIGNED On macosx, sign this binary # OPTIMIZATION Override default optimization level (LOW) # OUTPUT_DIR Override default output directory @@ -139,7 +138,7 @@ define SetupBuildLauncherBody NAME := $1, \ EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \ OPTIMIZATION := $$($1_OPTIMIZATION), \ - CFLAGS := $$(CFLAGS_JDKEXE) $$($1_CFLAGS) \ + CFLAGS := $$(CFLAGS_JDKEXE) \ $(LAUNCHER_CFLAGS) \ $(VERSION_CFLAGS) \ -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \ diff --git a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp index 86a74782278..81ca3b7dc82 100644 --- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp @@ -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. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -418,7 +418,7 @@ class SlowSignatureHandler }; -IRT_ENTRY(address, +JRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* from, @@ -435,4 +435,4 @@ IRT_ENTRY(address, // return result handler return Interpreter::result_handler(m->result_type()); -IRT_END +JRT_END diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp index 1a2607e611a..14f9b8b5f16 100644 --- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp @@ -67,7 +67,11 @@ public: return false; } + // The CPU implementer codes can be found in + // ARM Architecture Reference Manual ARMv8, for ARMv8-A architecture profile + // https://developer.arm.com/docs/ddi0487/latest enum Family { + CPU_AMPERE = 0xC0, CPU_ARM = 'A', CPU_BROADCOM = 'B', CPU_CAVIUM = 'C', diff --git a/src/hotspot/cpu/arm/interpreterRT_arm.cpp b/src/hotspot/cpu/arm/interpreterRT_arm.cpp index 0d38d93ad2b..f43d1cb0dfe 100644 --- a/src/hotspot/cpu/arm/interpreterRT_arm.cpp +++ b/src/hotspot/cpu/arm/interpreterRT_arm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -369,9 +369,9 @@ class SlowSignatureHandler: public NativeSignatureIterator { } }; -IRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* from, intptr_t* to)) +JRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* from, intptr_t* to)) methodHandle m(thread, (Method*)method); assert(m->is_native(), "sanity check"); SlowSignatureHandler(m, (address)from, to).iterate(UCONST64(-1)); return Interpreter::result_handler(m->result_type()); -IRT_END +JRT_END diff --git a/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp b/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp index c82a3513fbd..76c0b46ac42 100644 --- a/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp +++ b/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp @@ -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. * Copyright (c) 2012, 2013 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -148,15 +148,15 @@ void SignatureHandlerLibrary::pd_set_handler(address handler) { // Access function to get the signature. -IRT_ENTRY(address, InterpreterRuntime::get_signature(JavaThread* thread, Method* method)) +JRT_ENTRY(address, InterpreterRuntime::get_signature(JavaThread* thread, Method* method)) methodHandle m(thread, method); assert(m->is_native(), "sanity check"); Symbol *s = m->signature(); return (address) s->base(); -IRT_END +JRT_END -IRT_ENTRY(address, InterpreterRuntime::get_result_handler(JavaThread* thread, Method* method)) +JRT_ENTRY(address, InterpreterRuntime::get_result_handler(JavaThread* thread, Method* method)) methodHandle m(thread, method); assert(m->is_native(), "sanity check"); return AbstractInterpreter::result_handler(m->result_type()); -IRT_END +JRT_END diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp index 186e029a3e3..447c93f3eae 100644 --- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp +++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp @@ -38,6 +38,9 @@ #include "vm_version_ppc.hpp" #include +#if defined(_AIX) +#include +#endif #if defined(LINUX) && defined(VM_LITTLE_ENDIAN) #include @@ -382,6 +385,58 @@ void VM_Version::initialize() { } void VM_Version::print_platform_virtualization_info(outputStream* st) { +#if defined(_AIX) + // more info about perfstat API see + // https://www.ibm.com/support/knowledgecenter/en/ssw_aix_72/com.ibm.aix.prftools/idprftools_perfstat_glob_partition.htm + int rc = 0; + perfstat_partition_total_t pinfo; + memset(&pinfo, 0, sizeof(perfstat_partition_total_t)); + rc = perfstat_partition_total(NULL, &pinfo, sizeof(perfstat_partition_total_t), 1); + if (rc != 1) { + return; + } else { + st->print_cr("Virtualization type : PowerVM"); + } + // CPU information + perfstat_cpu_total_t cpuinfo; + memset(&cpuinfo, 0, sizeof(perfstat_cpu_total_t)); + rc = perfstat_cpu_total(NULL, &cpuinfo, sizeof(perfstat_cpu_total_t), 1); + if (rc != 1) { + return; + } + + st->print_cr("Processor description : %s", cpuinfo.description); + st->print_cr("Processor speed : %llu Hz", cpuinfo.processorHZ); + + st->print_cr("LPAR partition name : %s", pinfo.name); + st->print_cr("LPAR partition number : %u", pinfo.lpar_id); + st->print_cr("LPAR partition type : %s", pinfo.type.b.shared_enabled ? "shared" : "dedicated"); + st->print_cr("LPAR mode : %s", pinfo.type.b.donate_enabled ? "donating" : pinfo.type.b.capped ? "capped" : "uncapped"); + st->print_cr("LPAR partition group ID : %u", pinfo.group_id); + st->print_cr("LPAR shared pool ID : %u", pinfo.pool_id); + + st->print_cr("AMS (active memory sharing) : %s", pinfo.type.b.ams_capable ? "capable" : "not capable"); + st->print_cr("AMS (active memory sharing) : %s", pinfo.type.b.ams_enabled ? "on" : "off"); + st->print_cr("AME (active memory expansion) : %s", pinfo.type.b.ame_enabled ? "on" : "off"); + + if (pinfo.type.b.ame_enabled) { + st->print_cr("AME true memory in bytes : %llu", pinfo.true_memory); + st->print_cr("AME expanded memory in bytes : %llu", pinfo.expanded_memory); + } + + st->print_cr("SMT : %s", pinfo.type.b.smt_capable ? "capable" : "not capable"); + st->print_cr("SMT : %s", pinfo.type.b.smt_enabled ? "on" : "off"); + int ocpus = pinfo.online_cpus > 0 ? pinfo.online_cpus : 1; + st->print_cr("LPAR threads : %d", cpuinfo.ncpus/ocpus); + st->print_cr("LPAR online virtual cpus : %d", pinfo.online_cpus); + st->print_cr("LPAR logical cpus : %d", cpuinfo.ncpus); + st->print_cr("LPAR maximum virtual cpus : %u", pinfo.max_cpus); + st->print_cr("LPAR minimum virtual cpus : %u", pinfo.min_cpus); + st->print_cr("LPAR entitled capacity : %4.2f", (double) (pinfo.entitled_proc_capacity/100.0)); + st->print_cr("LPAR online memory : %llu MB", pinfo.online_memory); + st->print_cr("LPAR maximum memory : %llu MB", pinfo.max_memory); + st->print_cr("LPAR minimum memory : %llu MB", pinfo.min_memory); +#else const char* info_file = "/proc/ppc64/lparcfg"; const char* kw[] = { "system_type=", // qemu indicates PowerKVM "partition_entitled_capacity=", // entitled processor capacity percentage @@ -400,6 +455,7 @@ void VM_Version::print_platform_virtualization_info(outputStream* st) { if (!print_matching_lines_from_file(info_file, st, kw)) { st->print_cr(" <%s Not Available>", info_file); } +#endif } bool VM_Version::use_biased_locking() { diff --git a/src/hotspot/cpu/s390/interpreterRT_s390.cpp b/src/hotspot/cpu/s390/interpreterRT_s390.cpp index 9f97c3abe25..bcb6b9b0f5c 100644 --- a/src/hotspot/cpu/s390/interpreterRT_s390.cpp +++ b/src/hotspot/cpu/s390/interpreterRT_s390.cpp @@ -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. * Copyright (c) 2016 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -151,15 +151,15 @@ void InterpreterRuntime::SignatureHandlerGenerator::generate(uint64_t fingerprin void SignatureHandlerLibrary::pd_set_handler(address handler) {} -IRT_ENTRY(address, InterpreterRuntime::get_signature(JavaThread* thread, Method* method)) +JRT_ENTRY(address, InterpreterRuntime::get_signature(JavaThread* thread, Method* method)) methodHandle m(thread, method); assert(m->is_native(), "sanity check"); Symbol *s = m->signature(); return (address) s->base(); -IRT_END +JRT_END -IRT_ENTRY(address, InterpreterRuntime::get_result_handler(JavaThread* thread, Method* method)) +JRT_ENTRY(address, InterpreterRuntime::get_result_handler(JavaThread* thread, Method* method)) methodHandle m(thread, method); assert(m->is_native(), "sanity check"); return AbstractInterpreter::result_handler(m->result_type()); -IRT_END +JRT_END diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp index 575c537d73d..fc97aba8fdd 100644 --- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp +++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp @@ -4355,12 +4355,9 @@ void MacroAssembler::load_mirror(Register mirror, Register method) { // Emitter does not KILL cnt and base arguments, since they need to be copied to // work registers anyway. // Actually, only r0, r1, and r5 are killed. -unsigned int MacroAssembler::Clear_Array(Register cnt_arg, Register base_pointer_arg, Register src_addr, Register src_len) { - // Src_addr is evenReg. - // Src_len is odd_Reg. +unsigned int MacroAssembler::Clear_Array(Register cnt_arg, Register base_pointer_arg, Register odd_tmp_reg) { int block_start = offset(); - Register tmp_reg = src_len; // Holds target instr addr for EX. Register dst_len = Z_R1; // Holds dst len for MVCLE. Register dst_addr = Z_R0; // Holds dst addr for MVCLE. @@ -4369,7 +4366,7 @@ unsigned int MacroAssembler::Clear_Array(Register cnt_arg, Register base_pointer BLOCK_COMMENT("Clear_Array {"); // Check for zero len and convert to long. - z_ltgfr(src_len, cnt_arg); // Remember casted value for doSTG case. + z_ltgfr(odd_tmp_reg, cnt_arg); z_bre(done); // Nothing to do if len == 0. // Prefetch data to be cleared. @@ -4378,16 +4375,17 @@ unsigned int MacroAssembler::Clear_Array(Register cnt_arg, Register base_pointer z_pfd(0x02, 256, Z_R0, base_pointer_arg); } - z_sllg(dst_len, src_len, 3); // #bytes to clear. - z_cghi(src_len, 32); // Check for len <= 256 bytes (<=32 DW). - z_brnh(doXC); // If so, use executed XC to clear. + z_sllg(dst_len, odd_tmp_reg, 3); // #bytes to clear. + z_cghi(odd_tmp_reg, 32); // Check for len <= 256 bytes (<=32 DW). + z_brnh(doXC); // If so, use executed XC to clear. // MVCLE: initialize long arrays (general case). bind(doMVCLE); z_lgr(dst_addr, base_pointer_arg); - clear_reg(src_len, true, false); // Src len of MVCLE is zero. - - MacroAssembler::move_long_ext(dst_addr, src_addr, 0); + // Pass 0 as source length to MVCLE: destination will be filled with padding byte 0. + // The even register of the register pair is not killed. + clear_reg(odd_tmp_reg, true, false); + MacroAssembler::move_long_ext(dst_addr, as_Register(odd_tmp_reg->encoding()-1), 0); z_bru(done); // XC: initialize short arrays. @@ -4396,12 +4394,12 @@ unsigned int MacroAssembler::Clear_Array(Register cnt_arg, Register base_pointer z_xc(0,0,base_pointer_arg,0,base_pointer_arg); bind(doXC); - add2reg(dst_len, -1); // Get #bytes-1 for EXECUTE. + add2reg(dst_len, -1); // Get #bytes-1 for EXECUTE. if (VM_Version::has_ExecuteExtensions()) { - z_exrl(dst_len, XC_template); // Execute XC with var. len. + z_exrl(dst_len, XC_template); // Execute XC with var. len. } else { - z_larl(tmp_reg, XC_template); - z_ex(dst_len,0,Z_R0,tmp_reg); // Execute XC with var. len. + z_larl(odd_tmp_reg, XC_template); + z_ex(dst_len,0,Z_R0,odd_tmp_reg); // Execute XC with var. len. } // z_bru(done); // fallthru @@ -4463,7 +4461,7 @@ unsigned int MacroAssembler::Clear_Array_Const(long cnt, Register base) { // Compiler ensures base is doubleword aligned and cnt is #doublewords. // Emitter does not KILL cnt and base arguments, since they need to be copied to // work registers anyway. -// Actually, only r0, r1, r4, and r5 (which are work registers) are killed. +// Actually, only r0, r1, (which are work registers) and odd_tmp_reg are killed. // // For very large arrays, exploit MVCLE H/W support. // MVCLE instruction automatically exploits H/W-optimized page mover. @@ -4471,9 +4469,7 @@ unsigned int MacroAssembler::Clear_Array_Const(long cnt, Register base) { // - All full pages are cleared with the page mover H/W assist. // - Remaining bytes are again cleared by a series of XC to self. // -unsigned int MacroAssembler::Clear_Array_Const_Big(long cnt, Register base_pointer_arg, Register src_addr, Register src_len) { - // Src_addr is evenReg. - // Src_len is odd_Reg. +unsigned int MacroAssembler::Clear_Array_Const_Big(long cnt, Register base_pointer_arg, Register odd_tmp_reg) { int block_start = offset(); Register dst_len = Z_R1; // Holds dst len for MVCLE. @@ -4486,11 +4482,10 @@ unsigned int MacroAssembler::Clear_Array_Const_Big(long cnt, Register base_point // Prepare other args to MVCLE. z_lgr(dst_addr, base_pointer_arg); - // Indicate unused result. - (void) clear_reg(src_len, true, false); // Src len of MVCLE is zero. - - // Clear. - MacroAssembler::move_long_ext(dst_addr, src_addr, 0); + // Pass 0 as source length to MVCLE: destination will be filled with padding byte 0. + // The even register of the register pair is not killed. + (void) clear_reg(odd_tmp_reg, true, false); // Src len of MVCLE is zero. + MacroAssembler::move_long_ext(dst_addr, as_Register(odd_tmp_reg->encoding() - 1), 0); BLOCK_COMMENT("} Clear_Array_Const_Big"); int block_end = offset(); diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.hpp index eb683b36e3b..cefc48d7d4f 100644 --- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp @@ -828,9 +828,9 @@ class MacroAssembler: public Assembler { //-------------------------- //--- Operations on arrays. //-------------------------- - unsigned int Clear_Array(Register cnt_arg, Register base_pointer_arg, Register src_addr, Register src_len); + unsigned int Clear_Array(Register cnt_arg, Register base_pointer_arg, Register odd_tmp_reg); unsigned int Clear_Array_Const(long cnt, Register base); - unsigned int Clear_Array_Const_Big(long cnt, Register base_pointer_arg, Register src_addr, Register src_len); + unsigned int Clear_Array_Const_Big(long cnt, Register base_pointer_arg, Register odd_tmp_reg); unsigned int CopyRawMemory_AlignedDisjoint(Register src_reg, Register dst_reg, Register cnt_reg, Register tmp1_reg, Register tmp2_reg); diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad index 89cceced371..475e4af7265 100644 --- a/src/hotspot/cpu/s390/s390.ad +++ b/src/hotspot/cpu/s390/s390.ad @@ -474,6 +474,19 @@ reg_class z_long_reg( /*Z_R15_H,Z_R15*/ // SP ); +// z_long_reg without even registers +reg_class z_long_odd_reg( +/*Z_R0_H,Z_R0*/ // R0 +/*Z_R1_H,Z_R1*/ + Z_R3_H,Z_R3, + Z_R5_H,Z_R5, + Z_R7_H,Z_R7, + Z_R9_H,Z_R9, + Z_R11_H,Z_R11, + Z_R13_H,Z_R13 +/*Z_R14_H,Z_R14,*/ // return_pc +/*Z_R15_H,Z_R15*/ // SP +); // Special Class for Condition Code Flags Register @@ -3378,6 +3391,7 @@ operand iRegL() %{ match(RegL); match(revenRegL); match(roddRegL); + match(allRoddRegL); match(rarg1RegL); match(rarg5RegL); format %{ %} @@ -3400,6 +3414,14 @@ operand roddRegL() %{ interface(REG_INTER); %} +// available odd registers for iRegL +operand allRoddRegL() %{ + constraint(ALLOC_IN_RC(z_long_odd_reg)); + match(iRegL); + format %{ %} + interface(REG_INTER); +%} + operand rarg1RegL() %{ constraint(ALLOC_IN_RC(z_rarg1_long_reg)); match(iRegL); @@ -9899,23 +9921,23 @@ instruct inlineCallClearArrayConst(SSlenDW cnt, iRegP_N2P base, Universe dummy, ins_pipe(pipe_class_dummy); %} -instruct inlineCallClearArrayConstBig(immL cnt, iRegP_N2P base, Universe dummy, revenRegL srcA, roddRegL srcL, flagsReg cr) %{ +instruct inlineCallClearArrayConstBig(immL cnt, iRegP_N2P base, Universe dummy, allRoddRegL tmpL, flagsReg cr) %{ match(Set dummy (ClearArray cnt base)); - effect(TEMP srcA, TEMP srcL, KILL cr); // R0, R1 are killed, too. + effect(TEMP tmpL, KILL cr); // R0, R1 are killed, too. ins_cost(200); // TODO: s390 port size(VARIABLE_SIZE); // Variable in size due to optimized constant loader. format %{ "ClearArrayConstBig $cnt,$base" %} - ins_encode %{ __ Clear_Array_Const_Big($cnt$$constant, $base$$Register, $srcA$$Register, $srcL$$Register); %} + ins_encode %{ __ Clear_Array_Const_Big($cnt$$constant, $base$$Register, $tmpL$$Register); %} ins_pipe(pipe_class_dummy); %} -instruct inlineCallClearArray(iRegL cnt, iRegP_N2P base, Universe dummy, revenRegL srcA, roddRegL srcL, flagsReg cr) %{ +instruct inlineCallClearArray(iRegL cnt, iRegP_N2P base, Universe dummy, allRoddRegL tmpL, flagsReg cr) %{ match(Set dummy (ClearArray cnt base)); - effect(TEMP srcA, TEMP srcL, KILL cr); // R0, R1 are killed, too. + effect(TEMP tmpL, KILL cr); // R0, R1 are killed, too. ins_cost(300); // TODO: s390 port size(FIXED_SIZE); // z/Architecture: emitted code depends on PreferLAoverADD being on/off. format %{ "ClearArrayVar $cnt,$base" %} - ins_encode %{ __ Clear_Array($cnt$$Register, $base$$Register, $srcA$$Register, $srcL$$Register); %} + ins_encode %{ __ Clear_Array($cnt$$Register, $base$$Register, $tmpL$$Register); %} ins_pipe(pipe_class_dummy); %} diff --git a/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp b/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp index ad69b4aec33..91b51b94324 100644 --- a/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp +++ b/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -191,7 +191,7 @@ class SlowSignatureHandler: public NativeSignatureIterator { }; -IRT_ENTRY(address, InterpreterRuntime::slow_signature_handler( +JRT_ENTRY(address, InterpreterRuntime::slow_signature_handler( JavaThread* thread, Method* method, intptr_t* from, @@ -204,4 +204,4 @@ IRT_ENTRY(address, InterpreterRuntime::slow_signature_handler( SlowSignatureHandler(m, (address)from, m->is_static() ? to+2 : to+1, to).iterate((uint64_t)CONST64(-1)); // return result handler return Interpreter::result_handler(m->result_type()); -IRT_END +JRT_END diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp index fea8615d3f7..9920147e68e 100644 --- a/src/hotspot/cpu/x86/assembler_x86.cpp +++ b/src/hotspot/cpu/x86/assembler_x86.cpp @@ -3099,7 +3099,7 @@ void Assembler::nop(int i) { } return; } - if (UseAddressNop && VM_Version::is_amd()) { + if (UseAddressNop && VM_Version::is_amd_family()) { // // Using multi-bytes nops "0x0F 0x1F [address]" for AMD. // 1: 0x90 diff --git a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp index 73a02c1005f..a6421918e09 100644 --- a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp +++ b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -147,11 +147,11 @@ class SlowSignatureHandler: public NativeSignatureIterator { } }; -IRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* from, intptr_t* to)) +JRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* from, intptr_t* to)) methodHandle m(thread, (Method*)method); assert(m->is_native(), "sanity check"); // handle arguments SlowSignatureHandler(m, (address)from, to + 1).iterate((uint64_t)CONST64(-1)); // return result handler return Interpreter::result_handler(m->result_type()); -IRT_END +JRT_END diff --git a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp index 5eab4b43125..202a6a927ba 100644 --- a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp +++ b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp @@ -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 @@ -496,7 +496,7 @@ class SlowSignatureHandler #endif -IRT_ENTRY(address, +JRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* from, @@ -509,4 +509,4 @@ IRT_ENTRY(address, // return result handler return Interpreter::result_handler(m->result_type()); -IRT_END +JRT_END diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp index 3fb310e7cd7..0fe161bab91 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp @@ -2968,9 +2968,8 @@ class StubGenerator: public StubCodeGenerator { __ enter(); __ subptr(rsp, 8 * wordSize); - if (multi_block) { - __ push(limit); - } + handleSOERegisters(true /*saving*/); + __ movptr(buf, buf_param); __ movptr(state, state_param); if (multi_block) { @@ -2981,9 +2980,7 @@ class StubGenerator: public StubCodeGenerator { __ fast_sha1(abcd, e0, e1, msg0, msg1, msg2, msg3, shuf_mask, buf, state, ofs, limit, rsp, multi_block); - if (multi_block) { - __ pop(limit); - } + handleSOERegisters(false /*restoring*/); __ addptr(rsp, 8 * wordSize); __ leave(); __ ret(0); diff --git a/src/hotspot/cpu/x86/vm_version_ext_x86.cpp b/src/hotspot/cpu/x86/vm_version_ext_x86.cpp index 3cc775d7ec1..8042a8f1c69 100644 --- a/src/hotspot/cpu/x86/vm_version_ext_x86.cpp +++ b/src/hotspot/cpu/x86/vm_version_ext_x86.cpp @@ -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 @@ -43,10 +43,10 @@ typedef enum { CPU_FAMILY_PENTIUM_4 = 0xF } FamilyFlag; - typedef enum { - RDTSCP_FLAG = 0x08000000, // bit 27 - INTEL64_FLAG = 0x20000000 // bit 29 - } _featureExtendedEdxFlag; +typedef enum { + RDTSCP_FLAG = 0x08000000, // bit 27 + INTEL64_FLAG = 0x20000000 // bit 29 +} _featureExtendedEdxFlag; #define CPUID_STANDARD_FN 0x0 #define CPUID_STANDARD_FN_1 0x1 @@ -340,6 +340,10 @@ bool VM_Version_Ext::supports_tscinv_ext(void) { return !is_amd_Barcelona(); } + if (is_hygon()) { + return true; + } + return false; } @@ -399,13 +403,20 @@ int VM_Version_Ext::number_of_sockets(void) { const char* VM_Version_Ext::cpu_family_description(void) { int cpu_family_id = extended_cpu_family(); if (is_amd()) { - return _family_id_amd[cpu_family_id]; + if (cpu_family_id < ExtendedFamilyIdLength_AMD) { + return _family_id_amd[cpu_family_id]; + } } if (is_intel()) { if (cpu_family_id == CPU_FAMILY_PENTIUMPRO) { return cpu_model_description(); } - return _family_id_intel[cpu_family_id]; + if (cpu_family_id < ExtendedFamilyIdLength_INTEL) { + return _family_id_intel[cpu_family_id]; + } + } + if (is_hygon()) { + return "Dhyana"; } return "Unknown x86"; } @@ -423,6 +434,9 @@ int VM_Version_Ext::cpu_type_description(char* const buf, size_t buf_len) { } else if (is_amd()) { cpu_type = "AMD"; x64 = cpu_is_em64t() ? " AMD64" : ""; + } else if (is_hygon()) { + cpu_type = "Hygon"; + x64 = cpu_is_em64t() ? " AMD64" : ""; } else { cpu_type = "Unknown x86"; x64 = cpu_is_em64t() ? " x86_64" : ""; @@ -694,7 +708,7 @@ jlong VM_Version_Ext::maximum_qualified_cpu_frequency(void) { return _max_qualified_cpu_frequency; } -const char* const VM_Version_Ext::_family_id_intel[] = { +const char* const VM_Version_Ext::_family_id_intel[ExtendedFamilyIdLength_INTEL] = { "8086/8088", "", "286", @@ -713,7 +727,7 @@ const char* const VM_Version_Ext::_family_id_intel[] = { "Pentium 4" }; -const char* const VM_Version_Ext::_family_id_amd[] = { +const char* const VM_Version_Ext::_family_id_amd[ExtendedFamilyIdLength_AMD] = { "", "", "", @@ -731,6 +745,13 @@ const char* const VM_Version_Ext::_family_id_amd[] = { "", "Opteron/Athlon64", "Opteron QC/Phenom" // Barcelona et.al. + "", + "", + "", + "", + "", + "", + "Zen" }; // Partially from Intel 64 and IA-32 Architecture Software Developer's Manual, // September 2013, Vol 3C Table 35-1 diff --git a/src/hotspot/cpu/x86/vm_version_ext_x86.hpp b/src/hotspot/cpu/x86/vm_version_ext_x86.hpp index 02c9c338f4e..c63d54cc90f 100644 --- a/src/hotspot/cpu/x86/vm_version_ext_x86.hpp +++ b/src/hotspot/cpu/x86/vm_version_ext_x86.hpp @@ -29,14 +29,20 @@ #include "vm_version_x86.hpp" class VM_Version_Ext : public VM_Version { + + enum { + ExtendedFamilyIdLength_INTEL = 16, + ExtendedFamilyIdLength_AMD = 24 + }; + private: static const size_t VENDOR_LENGTH; static const size_t CPU_EBS_MAX_LENGTH; static const size_t CPU_TYPE_DESC_BUF_SIZE; static const size_t CPU_DETAILED_DESC_BUF_SIZE; - static const char* const _family_id_intel[]; - static const char* const _family_id_amd[]; + static const char* const _family_id_intel[ExtendedFamilyIdLength_INTEL]; + static const char* const _family_id_amd[ExtendedFamilyIdLength_AMD]; static const char* const _brand_id[]; static const char* const _model_id_pentium_pro[]; diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp index 5b89d852d60..b6a71f4bd63 100644 --- a/src/hotspot/cpu/x86/vm_version_x86.cpp +++ b/src/hotspot/cpu/x86/vm_version_x86.cpp @@ -680,7 +680,7 @@ void VM_Version::get_processor_features() { _features &= ~CPU_HT; } - if( is_intel() ) { // Intel cpus specific settings + if (is_intel()) { // Intel cpus specific settings if (is_knights_family()) { _features &= ~CPU_VZEROUPPER; } @@ -781,7 +781,7 @@ void VM_Version::get_processor_features() { FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false); } } else { - if(supports_sse4_1()) { + if (supports_sse4_1()) { if (FLAG_IS_DEFAULT(UseAESCTRIntrinsics)) { FLAG_SET_DEFAULT(UseAESCTRIntrinsics, true); } @@ -1001,7 +1001,7 @@ void VM_Version::get_processor_features() { } else if (UseAVX == 1 || UseAVX == 2) { // 32 bytes vectors (in YMM) are only supported with AVX+ max_vector_size = 32; - } else if (UseAVX > 2 ) { + } else if (UseAVX > 2) { // 64 bytes vectors (in ZMM) are only supported with AVX 3 max_vector_size = 64; } @@ -1165,38 +1165,38 @@ void VM_Version::get_processor_features() { } } - if( is_amd() ) { // AMD cpus specific settings - if( supports_sse2() && FLAG_IS_DEFAULT(UseAddressNop) ) { + if (is_amd_family()) { // AMD cpus specific settings + if (supports_sse2() && FLAG_IS_DEFAULT(UseAddressNop)) { // Use it on new AMD cpus starting from Opteron. UseAddressNop = true; } - if( supports_sse2() && FLAG_IS_DEFAULT(UseNewLongLShift) ) { + if (supports_sse2() && FLAG_IS_DEFAULT(UseNewLongLShift)) { // Use it on new AMD cpus starting from Opteron. UseNewLongLShift = true; } - if( FLAG_IS_DEFAULT(UseXmmLoadAndClearUpper) ) { + if (FLAG_IS_DEFAULT(UseXmmLoadAndClearUpper)) { if (supports_sse4a()) { UseXmmLoadAndClearUpper = true; // use movsd only on '10h' Opteron } else { UseXmmLoadAndClearUpper = false; } } - if( FLAG_IS_DEFAULT(UseXmmRegToRegMoveAll) ) { - if( supports_sse4a() ) { + if (FLAG_IS_DEFAULT(UseXmmRegToRegMoveAll)) { + if (supports_sse4a()) { UseXmmRegToRegMoveAll = true; // use movaps, movapd only on '10h' } else { UseXmmRegToRegMoveAll = false; } } - if( FLAG_IS_DEFAULT(UseXmmI2F) ) { - if( supports_sse4a() ) { + if (FLAG_IS_DEFAULT(UseXmmI2F)) { + if (supports_sse4a()) { UseXmmI2F = true; } else { UseXmmI2F = false; } } - if( FLAG_IS_DEFAULT(UseXmmI2D) ) { - if( supports_sse4a() ) { + if (FLAG_IS_DEFAULT(UseXmmI2D)) { + if (supports_sse4a()) { UseXmmI2D = true; } else { UseXmmI2D = false; @@ -1214,7 +1214,7 @@ void VM_Version::get_processor_features() { } // some defaults for AMD family 15h - if ( cpu_family() == 0x15 ) { + if (cpu_family() == 0x15) { // On family 15h processors default is no sw prefetch if (FLAG_IS_DEFAULT(AllocatePrefetchStyle)) { FLAG_SET_DEFAULT(AllocatePrefetchStyle, 0); @@ -1239,8 +1239,8 @@ void VM_Version::get_processor_features() { } #endif // COMPILER2 - // Some defaults for AMD family 17h - if ( cpu_family() == 0x17 ) { + // Some defaults for AMD family 17h || Hygon family 18h + if (cpu_family() == 0x17 || cpu_family() == 0x18) { // On family 17h processors use XMM and UnalignedLoadStores for Array Copy if (supports_sse2() && FLAG_IS_DEFAULT(UseXMMForArrayCopy)) { FLAG_SET_DEFAULT(UseXMMForArrayCopy, true); @@ -1256,29 +1256,29 @@ void VM_Version::get_processor_features() { } } - if( is_intel() ) { // Intel cpus specific settings - if( FLAG_IS_DEFAULT(UseStoreImmI16) ) { + if (is_intel()) { // Intel cpus specific settings + if (FLAG_IS_DEFAULT(UseStoreImmI16)) { UseStoreImmI16 = false; // don't use it on Intel cpus } - if( cpu_family() == 6 || cpu_family() == 15 ) { - if( FLAG_IS_DEFAULT(UseAddressNop) ) { + if (cpu_family() == 6 || cpu_family() == 15) { + if (FLAG_IS_DEFAULT(UseAddressNop)) { // Use it on all Intel cpus starting from PentiumPro UseAddressNop = true; } } - if( FLAG_IS_DEFAULT(UseXmmLoadAndClearUpper) ) { + if (FLAG_IS_DEFAULT(UseXmmLoadAndClearUpper)) { UseXmmLoadAndClearUpper = true; // use movsd on all Intel cpus } - if( FLAG_IS_DEFAULT(UseXmmRegToRegMoveAll) ) { - if( supports_sse3() ) { + if (FLAG_IS_DEFAULT(UseXmmRegToRegMoveAll)) { + if (supports_sse3()) { UseXmmRegToRegMoveAll = true; // use movaps, movapd on new Intel cpus } else { UseXmmRegToRegMoveAll = false; } } - if( cpu_family() == 6 && supports_sse3() ) { // New Intel cpus + if (cpu_family() == 6 && supports_sse3()) { // New Intel cpus #ifdef COMPILER2 - if( FLAG_IS_DEFAULT(MaxLoopPad) ) { + if (FLAG_IS_DEFAULT(MaxLoopPad)) { // For new Intel cpus do the next optimization: // don't align the beginning of a loop if there are enough instructions // left (NumberOfLoopInstrToAlign defined in c2_globals.hpp) @@ -1324,7 +1324,7 @@ void VM_Version::get_processor_features() { FLAG_SET_DEFAULT(UseIncDec, false); } } - if(FLAG_IS_DEFAULT(AllocatePrefetchInstr) && supports_3dnow_prefetch()) { + if (FLAG_IS_DEFAULT(AllocatePrefetchInstr) && supports_3dnow_prefetch()) { FLAG_SET_DEFAULT(AllocatePrefetchInstr, 3); } } diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp index 0253d775333..aadfaeedafc 100644 --- a/src/hotspot/cpu/x86/vm_version_x86.hpp +++ b/src/hotspot/cpu/x86/vm_version_x86.hpp @@ -495,13 +495,13 @@ protected: result |= CPU_CX8; if (_cpuid_info.std_cpuid1_edx.bits.cmov != 0) result |= CPU_CMOV; - if (_cpuid_info.std_cpuid1_edx.bits.fxsr != 0 || (is_amd() && + if (_cpuid_info.std_cpuid1_edx.bits.fxsr != 0 || (is_amd_family() && _cpuid_info.ext_cpuid1_edx.bits.fxsr != 0)) result |= CPU_FXSR; // HT flag is set for multi-core processors also. if (threads_per_core() > 1) result |= CPU_HT; - if (_cpuid_info.std_cpuid1_edx.bits.mmx != 0 || (is_amd() && + if (_cpuid_info.std_cpuid1_edx.bits.mmx != 0 || (is_amd_family() && _cpuid_info.ext_cpuid1_edx.bits.mmx != 0)) result |= CPU_MMX; if (_cpuid_info.std_cpuid1_edx.bits.sse != 0) @@ -553,7 +553,7 @@ protected: result |= CPU_VNNI; } } - if(_cpuid_info.sef_cpuid7_ebx.bits.bmi1 != 0) + if (_cpuid_info.sef_cpuid7_ebx.bits.bmi1 != 0) result |= CPU_BMI1; if (_cpuid_info.std_cpuid1_edx.bits.tsc != 0) result |= CPU_TSC; @@ -567,17 +567,17 @@ protected: result |= CPU_CLMUL; if (_cpuid_info.sef_cpuid7_ebx.bits.rtm != 0) result |= CPU_RTM; - if(_cpuid_info.sef_cpuid7_ebx.bits.adx != 0) + if (_cpuid_info.sef_cpuid7_ebx.bits.adx != 0) result |= CPU_ADX; - if(_cpuid_info.sef_cpuid7_ebx.bits.bmi2 != 0) + if (_cpuid_info.sef_cpuid7_ebx.bits.bmi2 != 0) result |= CPU_BMI2; if (_cpuid_info.sef_cpuid7_ebx.bits.sha != 0) result |= CPU_SHA; if (_cpuid_info.std_cpuid1_ecx.bits.fma != 0) result |= CPU_FMA; - // AMD features. - if (is_amd()) { + // AMD|Hygon features. + if (is_amd_family()) { if ((_cpuid_info.ext_cpuid1_edx.bits.tdnow != 0) || (_cpuid_info.ext_cpuid1_ecx.bits.prefetchw != 0)) result |= CPU_3DNOW_PREFETCH; @@ -587,8 +587,8 @@ protected: result |= CPU_SSE4A; } // Intel features. - if(is_intel()) { - if(_cpuid_info.ext_cpuid1_ecx.bits.lzcnt_intel != 0) + if (is_intel()) { + if (_cpuid_info.ext_cpuid1_ecx.bits.lzcnt_intel != 0) result |= CPU_LZCNT; // for Intel, ecx.bits.misalignsse bit (bit 8) indicates support for prefetchw if (_cpuid_info.ext_cpuid1_ecx.bits.misalignsse != 0) { @@ -714,6 +714,8 @@ public: static int cpu_family() { return _cpu;} static bool is_P6() { return cpu_family() >= 6; } static bool is_amd() { assert_is_initialized(); return _cpuid_info.std_vendor_name_0 == 0x68747541; } // 'htuA' + static bool is_hygon() { assert_is_initialized(); return _cpuid_info.std_vendor_name_0 == 0x6F677948; } // 'ogyH' + static bool is_amd_family() { return is_amd() || is_hygon(); } static bool is_intel() { assert_is_initialized(); return _cpuid_info.std_vendor_name_0 == 0x756e6547; } // 'uneG' static bool is_zx() { assert_is_initialized(); return (_cpuid_info.std_vendor_name_0 == 0x746e6543) || (_cpuid_info.std_vendor_name_0 == 0x68532020); } // 'tneC'||'hS ' static bool is_atom_family() { return ((cpu_family() == 0x06) && ((extended_cpu_model() == 0x36) || (extended_cpu_model() == 0x37) || (extended_cpu_model() == 0x4D))); } //Silvermont and Centerton @@ -737,7 +739,7 @@ public: if (!supports_topology || result == 0) { result = (_cpuid_info.dcp_cpuid4_eax.bits.cores_per_cpu + 1); } - } else if (is_amd()) { + } else if (is_amd_family()) { result = (_cpuid_info.ext_cpuid8_ecx.bits.cores_per_cpu + 1); } else if (is_zx()) { bool supports_topology = supports_processor_topology(); @@ -773,7 +775,7 @@ public: intx result = 0; if (is_intel()) { result = (_cpuid_info.dcp_cpuid4_ebx.bits.L1_line_size + 1); - } else if (is_amd()) { + } else if (is_amd_family()) { result = _cpuid_info.ext_cpuid5_ecx.bits.L1_line_size; } else if (is_zx()) { result = (_cpuid_info.dcp_cpuid4_ebx.bits.L1_line_size + 1); @@ -860,7 +862,7 @@ public: // AMD features static bool supports_3dnow_prefetch() { return (_features & CPU_3DNOW_PREFETCH) != 0; } - static bool supports_mmx_ext() { return is_amd() && _cpuid_info.ext_cpuid1_edx.bits.mmx_amd != 0; } + static bool supports_mmx_ext() { return is_amd_family() && _cpuid_info.ext_cpuid1_edx.bits.mmx_amd != 0; } static bool supports_lzcnt() { return (_features & CPU_LZCNT) != 0; } static bool supports_sse4a() { return (_features & CPU_SSE4A) != 0; } @@ -873,8 +875,8 @@ public: } static bool supports_tscinv() { return supports_tscinv_bit() && - ( (is_amd() && !is_amd_Barcelona()) || - is_intel_tsc_synched_at_init() ); + ((is_amd_family() && !is_amd_Barcelona()) || + is_intel_tsc_synched_at_init()); } // Intel Core and newer cpus have fast IDIV instruction (excluding Atom). @@ -899,7 +901,7 @@ public: // Core - 256 / prefetchnta // It will be used only when AllocatePrefetchStyle > 0 - if (is_amd()) { // AMD + if (is_amd_family()) { // AMD | Hygon if (supports_sse2()) { return 256; // Opteron } else { diff --git a/src/hotspot/cpu/zero/cppInterpreter_zero.cpp b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp index 0b89d92f13c..49fa45444f8 100644 --- a/src/hotspot/cpu/zero/cppInterpreter_zero.cpp +++ b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp @@ -699,11 +699,11 @@ intptr_t* CppInterpreter::calculate_unwind_sp(ZeroStack* stack, return stack->sp() + argument_slots; } -IRT_ENTRY(void, CppInterpreter::throw_exception(JavaThread* thread, +JRT_ENTRY(void, CppInterpreter::throw_exception(JavaThread* thread, Symbol* name, char* message)) THROW_MSG(name, message); -IRT_END +JRT_END InterpreterFrame *InterpreterFrame::build(Method* const method, TRAPS) { JavaThread *thread = (JavaThread *) THREAD; diff --git a/src/hotspot/cpu/zero/interpreterRT_zero.cpp b/src/hotspot/cpu/zero/interpreterRT_zero.cpp index 8eec1ba9c71..946cfa0161c 100644 --- a/src/hotspot/cpu/zero/interpreterRT_zero.cpp +++ b/src/hotspot/cpu/zero/interpreterRT_zero.cpp @@ -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. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -141,7 +141,7 @@ void InterpreterRuntime::SignatureHandler::finalize() { assert(status == FFI_OK, "should be"); } -IRT_ENTRY(address, +JRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* unused1, @@ -162,7 +162,7 @@ IRT_ENTRY(address, handler->finalize(); return (address) handler; -IRT_END +JRT_END void SignatureHandlerLibrary::pd_set_handler(address handlerAddr) { InterpreterRuntime::SignatureHandler *handler = diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp index a55b9caa7e6..4ae426a73a2 100644 --- a/src/hotspot/os/aix/os_aix.cpp +++ b/src/hotspot/os/aix/os_aix.cpp @@ -1405,13 +1405,7 @@ void os::print_os_info(outputStream* st) { st->print_cr("type: %s", (wi.app_wpar ? "application" : "system")); } - // print partition info - libperfstat::partitioninfo_t pi; - if (libperfstat::get_partitioninfo(&pi)) { - st->print_cr("partition info"); - st->print_cr(" name: %s", pi.name); - } - + VM_Version::print_platform_virtualization_info(st); } void os::print_memory_info(outputStream* st) { diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp index 8a0498b63b5..5563fcbc3ca 100644 --- a/src/hotspot/os/linux/osContainer_linux.cpp +++ b/src/hotspot/os/linux/osContainer_linux.cpp @@ -122,7 +122,25 @@ class CgroupSubsystem: CHeapObj { char *subsystem_path() { return _path; } }; -CgroupSubsystem* memory = NULL; +class CgroupMemorySubsystem: CgroupSubsystem { + friend class OSContainer; + + private: + /* Some container runtimes set limits via cgroup + * hierarchy. If set to true consider also memory.stat + * file if everything else seems unlimited */ + bool _uses_mem_hierarchy; + + public: + CgroupMemorySubsystem(char *root, char *mountpoint) : CgroupSubsystem::CgroupSubsystem(root, mountpoint) { + _uses_mem_hierarchy = false; + } + + bool is_hierarchical() { return _uses_mem_hierarchy; } + void set_hierarchical(bool value) { _uses_mem_hierarchy = value; } +}; + +CgroupMemorySubsystem* memory = NULL; CgroupSubsystem* cpuset = NULL; CgroupSubsystem* cpu = NULL; CgroupSubsystem* cpuacct = NULL; @@ -131,21 +149,24 @@ typedef char * cptr; PRAGMA_DIAG_PUSH PRAGMA_FORMAT_NONLITERAL_IGNORED -template int subsystem_file_contents(CgroupSubsystem* c, +template int subsystem_file_line_contents(CgroupSubsystem* c, const char *filename, + const char *matchline, const char *scan_fmt, T returnval) { FILE *fp = NULL; char *p; char file[MAXPATHLEN+1]; char buf[MAXPATHLEN+1]; + char discard[MAXPATHLEN+1]; + bool found_match = false; if (c == NULL) { - log_debug(os, container)("subsystem_file_contents: CgroupSubsytem* is NULL"); + log_debug(os, container)("subsystem_file_line_contents: CgroupSubsytem* is NULL"); return OSCONTAINER_ERROR; } if (c->subsystem_path() == NULL) { - log_debug(os, container)("subsystem_file_contents: subsystem path is NULL"); + log_debug(os, container)("subsystem_file_line_contents: subsystem path is NULL"); return OSCONTAINER_ERROR; } @@ -160,16 +181,32 @@ template int subsystem_file_contents(CgroupSubsystem* c, log_trace(os, container)("Path to %s is %s", filename, file); fp = fopen(file, "r"); if (fp != NULL) { - p = fgets(buf, MAXPATHLEN, fp); - if (p != NULL) { - int matched = sscanf(p, scan_fmt, returnval); - if (matched == 1) { + int err = 0; + while ((p = fgets(buf, MAXPATHLEN, fp)) != NULL) { + found_match = false; + if (matchline == NULL) { + // single-line file case + int matched = sscanf(p, scan_fmt, returnval); + found_match = (matched == 1); + } else { + // multi-line file case + if (strstr(p, matchline) != NULL) { + // discard matchline string prefix + int matched = sscanf(p, scan_fmt, discard, returnval); + found_match = (matched == 2); + } else { + continue; // substring not found + } + } + if (found_match) { fclose(fp); return 0; } else { + err = 1; log_debug(os, container)("Type %s not found in file %s", scan_fmt, file); } - } else { + } + if (err == 0) { log_debug(os, container)("Empty file %s", file); } } else { @@ -186,10 +223,11 @@ PRAGMA_DIAG_POP return_type variable; \ { \ int err; \ - err = subsystem_file_contents(subsystem, \ - filename, \ - scan_fmt, \ - &variable); \ + err = subsystem_file_line_contents(subsystem, \ + filename, \ + NULL, \ + scan_fmt, \ + &variable); \ if (err != 0) \ return (return_type) OSCONTAINER_ERROR; \ \ @@ -201,16 +239,33 @@ PRAGMA_DIAG_POP char variable[bufsize]; \ { \ int err; \ - err = subsystem_file_contents(subsystem, \ - filename, \ - scan_fmt, \ - variable); \ + err = subsystem_file_line_contents(subsystem, \ + filename, \ + NULL, \ + scan_fmt, \ + variable); \ if (err != 0) \ return (return_type) NULL; \ \ log_trace(os, container)(logstring, variable); \ } +#define GET_CONTAINER_INFO_LINE(return_type, subsystem, filename, \ + matchline, logstring, scan_fmt, variable) \ + return_type variable; \ +{ \ + int err; \ + err = subsystem_file_line_contents(subsystem, \ + filename, \ + matchline, \ + scan_fmt, \ + &variable); \ + if (err != 0) \ + return (return_type) OSCONTAINER_ERROR; \ + \ + log_trace(os, container)(logstring, variable); \ +} + /* init * * Initialize the container support and determine if @@ -266,7 +321,7 @@ void OSContainer::init() { } while ((token = strsep(&cptr, ",")) != NULL) { if (strcmp(token, "memory") == 0) { - memory = new CgroupSubsystem(tmproot, tmpmount); + memory = new CgroupMemorySubsystem(tmproot, tmpmount); } else if (strcmp(token, "cpuset") == 0) { cpuset = new CgroupSubsystem(tmproot, tmpmount); } else if (strcmp(token, "cpu") == 0) { @@ -344,6 +399,10 @@ void OSContainer::init() { while ((token = strsep(&controllers, ",")) != NULL) { if (strcmp(token, "memory") == 0) { memory->set_subsystem_path(base); + jlong hierarchy = uses_mem_hierarchy(); + if (hierarchy > 0) { + memory->set_hierarchical(true); + } } else if (strcmp(token, "cpuset") == 0) { cpuset->set_subsystem_path(base); } else if (strcmp(token, "cpu") == 0) { @@ -360,6 +419,7 @@ void OSContainer::init() { // command line arguments have been processed. if ((mem_limit = memory_limit_in_bytes()) > 0) { os::Linux::set_physical_memory(mem_limit); + log_info(os, container)("Memory Limit is: " JLONG_FORMAT, mem_limit); } _is_containerized = true; @@ -374,6 +434,21 @@ const char * OSContainer::container_type() { } } +/* uses_mem_hierarchy + * + * Return whether or not hierarchical cgroup accounting is being + * done. + * + * return: + * A number > 0 if true, or + * OSCONTAINER_ERROR for not supported + */ +jlong OSContainer::uses_mem_hierarchy() { + GET_CONTAINER_INFO(jlong, memory, "/memory.use_hierarchy", + "Use Hierarchy is: " JLONG_FORMAT, JLONG_FORMAT, use_hierarchy); + return use_hierarchy; +} + /* memory_limit_in_bytes * @@ -389,7 +464,18 @@ jlong OSContainer::memory_limit_in_bytes() { "Memory Limit is: " JULONG_FORMAT, JULONG_FORMAT, memlimit); if (memlimit >= _unlimited_memory) { - log_trace(os, container)("Memory Limit is: Unlimited"); + log_trace(os, container)("Non-Hierarchical Memory Limit is: Unlimited"); + if (memory->is_hierarchical()) { + const char* matchline = "hierarchical_memory_limit"; + char* format = "%s " JULONG_FORMAT; + GET_CONTAINER_INFO_LINE(julong, memory, "/memory.stat", matchline, + "Hierarchical Memory Limit is: " JULONG_FORMAT, format, hier_memlimit) + if (hier_memlimit >= _unlimited_memory) { + log_trace(os, container)("Hierarchical Memory Limit is: Unlimited"); + } else { + return (jlong)hier_memlimit; + } + } return (jlong)-1; } else { @@ -401,7 +487,18 @@ jlong OSContainer::memory_and_swap_limit_in_bytes() { GET_CONTAINER_INFO(julong, memory, "/memory.memsw.limit_in_bytes", "Memory and Swap Limit is: " JULONG_FORMAT, JULONG_FORMAT, memswlimit); if (memswlimit >= _unlimited_memory) { - log_trace(os, container)("Memory and Swap Limit is: Unlimited"); + log_trace(os, container)("Non-Hierarchical Memory and Swap Limit is: Unlimited"); + if (memory->is_hierarchical()) { + const char* matchline = "hierarchical_memsw_limit"; + char* format = "%s " JULONG_FORMAT; + GET_CONTAINER_INFO_LINE(julong, memory, "/memory.stat", matchline, + "Hierarchical Memory and Swap Limit is : " JULONG_FORMAT, format, hier_memlimit) + if (hier_memlimit >= _unlimited_memory) { + log_trace(os, container)("Hierarchical Memory and Swap Limit is: Unlimited"); + } else { + return (jlong)hier_memlimit; + } + } return (jlong)-1; } else { return (jlong)memswlimit; diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp index cdb29c88451..9418c8517ee 100644 --- a/src/hotspot/os/linux/osContainer_linux.hpp +++ b/src/hotspot/os/linux/osContainer_linux.hpp @@ -42,6 +42,7 @@ class OSContainer: AllStatic { static inline bool is_containerized(); static const char * container_type(); + static jlong uses_mem_hierarchy(); static jlong memory_limit_in_bytes(); static jlong memory_and_swap_limit_in_bytes(); static jlong memory_soft_limit_in_bytes(); diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp index fcacd1e65ba..56560bf61e6 100644 --- a/src/hotspot/os/windows/os_windows.cpp +++ b/src/hotspot/os/windows/os_windows.cpp @@ -5000,17 +5000,13 @@ char* os::pd_remap_memory(int fd, const char* file_name, size_t file_offset, char *addr, size_t bytes, bool read_only, bool allow_exec) { // This OS does not allow existing memory maps to be remapped so we - // have to unmap the memory before we remap it. - if (!os::unmap_memory(addr, bytes)) { - return NULL; - } + // would have to unmap the memory before we remap it. - // There is a very small theoretical window between the unmap_memory() - // call above and the map_memory() call below where a thread in native - // code may be able to access an address that is no longer mapped. - - return os::map_memory(fd, file_name, file_offset, addr, bytes, - read_only, allow_exec); + // Because there is a small window between unmapping memory and mapping + // it in again with different protections, CDS archives are mapped RW + // on windows, so this function isn't called. + ShouldNotReachHere(); + return NULL; } diff --git a/src/hotspot/os/windows/version.rc b/src/hotspot/os/windows/version.rc index 9f4ae512a1a..b219d3c24f7 100644 --- a/src/hotspot/os/windows/version.rc +++ b/src/hotspot/os/windows/version.rc @@ -1,5 +1,5 @@ // -// Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -36,8 +36,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // VS_VERSION_INFO VERSIONINFO - FILEVERSION JDK_VER - PRODUCTVERSION JDK_VER + FILEVERSION HS_FVER + PRODUCTVERSION HS_FVER FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -54,15 +54,15 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", XSTR(HS_COMPANY) "\0" - VALUE "FileDescription", XSTR(HS_FILEDESC) "\0" - VALUE "FileVersion", XSTR(JDK_DOTVER) "\0" - VALUE "Full Version", XSTR(HS_BUILD_ID) "\0" - VALUE "InternalName", XSTR(HS_INTERNAL_NAME) "\0" - VALUE "LegalCopyright", XSTR(HS_COPYRIGHT) "\0" - VALUE "OriginalFilename", XSTR(HS_FNAME) "\0" - VALUE "ProductName", XSTR(HS_NAME) "\0" - VALUE "ProductVersion", XSTR(JDK_DOTVER) "\0" + VALUE "CompanyName", XSTR(HS_COMPANY) "\0" + VALUE "FileDescription", XSTR(HS_FILEDESC) "\0" + VALUE "FileVersion", XSTR(HS_VER) "\0" + VALUE "Full Version", XSTR(HS_VERSION_STRING) "\0" + VALUE "InternalName", XSTR(HS_INTERNAL_NAME) "\0" + VALUE "LegalCopyright", XSTR(HS_COPYRIGHT) "\0" + VALUE "OriginalFilename", XSTR(HS_FNAME) "\0" + VALUE "ProductName", XSTR(HS_NAME) "\0" + VALUE "ProductVersion", XSTR(HS_VER) "\0" END END BLOCK "VarFileInfo" diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp index d4a32b561d8..d75c5aa2b95 100644 --- a/src/hotspot/share/adlc/formssel.cpp +++ b/src/hotspot/share/adlc/formssel.cpp @@ -774,10 +774,16 @@ bool InstructForm::captures_bottom_type(FormDict &globals) const { !strcmp(_matrule->_rChild->_opType,"CheckCastPP") || !strcmp(_matrule->_rChild->_opType,"GetAndSetP") || !strcmp(_matrule->_rChild->_opType,"GetAndSetN") || - !strcmp(_matrule->_rChild->_opType,"CompareAndExchangeP") || - !strcmp(_matrule->_rChild->_opType,"CompareAndExchangeN") || +#if INCLUDE_ZGC + !strcmp(_matrule->_rChild->_opType,"LoadBarrierSlowReg") || + !strcmp(_matrule->_rChild->_opType,"LoadBarrierWeakSlowReg") || +#endif +#if INCLUDE_SHENANDOAHGC !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeP") || - !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeN"))) return true; + !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeN") || +#endif + !strcmp(_matrule->_rChild->_opType,"CompareAndExchangeP") || + !strcmp(_matrule->_rChild->_opType,"CompareAndExchangeN"))) return true; else if ( is_ideal_load() == Form::idealP ) return true; else if ( is_ideal_store() != Form::none ) return true; diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp index 95278447dfc..61c5bece917 100644 --- a/src/hotspot/share/classfile/classFileParser.cpp +++ b/src/hotspot/share/classfile/classFileParser.cpp @@ -5975,9 +5975,9 @@ void ClassFileParser::parse_stream(const ClassFileStream* const stream, _minor_version = stream->get_u2_fast(); _major_version = stream->get_u2_fast(); - if (DumpSharedSpaces && _major_version < JAVA_1_5_VERSION) { + if (DumpSharedSpaces && _major_version < JAVA_6_VERSION) { ResourceMark rm; - warning("Pre JDK 1.5 class not supported by CDS: %u.%u %s", + warning("Pre JDK 6 class not supported by CDS: %u.%u %s", _major_version, _minor_version, _class_name->as_C_string()); Exceptions::fthrow( THREAD_AND_LOCATION, diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index 7d843b6d98a..2df0c49d901 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -1714,20 +1714,13 @@ oop java_lang_Thread::inherited_access_control_context(oop java_thread) { jlong java_lang_Thread::stackSize(oop java_thread) { - if (_stackSize_offset > 0) { - return java_thread->long_field(_stackSize_offset); - } else { - return 0; - } + return java_thread->long_field(_stackSize_offset); } // Write the thread status value to threadStatus field in java.lang.Thread java class. void java_lang_Thread::set_thread_status(oop java_thread, java_lang_Thread::ThreadStatus status) { - // The threadStatus is only present starting in 1.5 - if (_thread_status_offset > 0) { - java_thread->int_field_put(_thread_status_offset, status); - } + java_thread->int_field_put(_thread_status_offset, status); } // Read thread status value from threadStatus field in java.lang.Thread java class. @@ -1737,62 +1730,31 @@ java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thre assert(Threads_lock->owned_by_self() || Thread::current()->is_VM_thread() || JavaThread::current()->thread_state() == _thread_in_vm, "Java Thread is not running in vm"); - // The threadStatus is only present starting in 1.5 - if (_thread_status_offset > 0) { - return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); - } else { - // All we can easily figure out is if it is alive, but that is - // enough info for a valid unknown status. - // These aren't restricted to valid set ThreadStatus values, so - // use JVMTI values and cast. - JavaThread* thr = java_lang_Thread::thread(java_thread); - if (thr == NULL) { - // the thread hasn't run yet or is in the process of exiting - return NEW; - } - return (java_lang_Thread::ThreadStatus)JVMTI_THREAD_STATE_ALIVE; - } + return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); } jlong java_lang_Thread::thread_id(oop java_thread) { - // The thread ID field is only present starting in 1.5 - if (_tid_offset > 0) { - return java_thread->long_field(_tid_offset); - } else { - return 0; - } + return java_thread->long_field(_tid_offset); } oop java_lang_Thread::park_blocker(oop java_thread) { - assert(JDK_Version::current().supports_thread_park_blocker() && - _park_blocker_offset != 0, "Must support parkBlocker field"); + assert(JDK_Version::current().supports_thread_park_blocker(), + "Must support parkBlocker field"); - if (_park_blocker_offset > 0) { - return java_thread->obj_field(_park_blocker_offset); - } - - return NULL; + return java_thread->obj_field(_park_blocker_offset); } jlong java_lang_Thread::park_event(oop java_thread) { - if (_park_event_offset > 0) { - return java_thread->long_field(_park_event_offset); - } - return 0; + return java_thread->long_field(_park_event_offset); } bool java_lang_Thread::set_park_event(oop java_thread, jlong ptr) { - if (_park_event_offset > 0) { - java_thread->long_field_put(_park_event_offset, ptr); - return true; - } - return false; + java_thread->long_field_put(_park_event_offset, ptr); + return true; } - const char* java_lang_Thread::thread_status_name(oop java_thread) { - assert(_thread_status_offset != 0, "Must have thread status"); ThreadStatus status = (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); switch (status) { case NEW : return "NEW"; @@ -3635,23 +3597,48 @@ void java_lang_invoke_ResolvedMethodName::set_vmtarget(oop resolved_method, Meth resolved_method->address_field_put(_vmtarget_offset, (address)m); } +void java_lang_invoke_ResolvedMethodName::set_vmholder(oop resolved_method, oop holder) { + assert(is_instance(resolved_method), "wrong type"); + resolved_method->obj_field_put(_vmholder_offset, holder); +} + oop java_lang_invoke_ResolvedMethodName::find_resolved_method(const methodHandle& m, TRAPS) { + const Method* method = m(); + // lookup ResolvedMethod oop in the table, or create a new one and intern it - oop resolved_method = ResolvedMethodTable::find_method(m()); - if (resolved_method == NULL) { - InstanceKlass* k = SystemDictionary::ResolvedMethodName_klass(); - if (!k->is_initialized()) { - k->initialize(CHECK_NULL); - } - oop new_resolved_method = k->allocate_instance(CHECK_NULL); - new_resolved_method->address_field_put(_vmtarget_offset, (address)m()); - // Add a reference to the loader (actually mirror because unsafe anonymous classes will not have - // distinct loaders) to ensure the metadata is kept alive. - // This mirror may be different than the one in clazz field. - new_resolved_method->obj_field_put(_vmholder_offset, m->method_holder()->java_mirror()); - resolved_method = ResolvedMethodTable::add_method(m, Handle(THREAD, new_resolved_method)); + oop resolved_method = ResolvedMethodTable::find_method(method); + if (resolved_method != NULL) { + return resolved_method; } - return resolved_method; + + InstanceKlass* k = SystemDictionary::ResolvedMethodName_klass(); + if (!k->is_initialized()) { + k->initialize(CHECK_NULL); + } + + oop new_resolved_method = k->allocate_instance(CHECK_NULL); + + NoSafepointVerifier nsv; + + if (method->is_old()) { + method = (method->is_deleted()) ? Universe::throw_no_such_method_error() : + method->get_new_method(); + } + + InstanceKlass* holder = method->method_holder(); + + set_vmtarget(new_resolved_method, const_cast(method)); + // Add a reference to the loader (actually mirror because unsafe anonymous classes will not have + // distinct loaders) to ensure the metadata is kept alive. + // This mirror may be different than the one in clazz field. + set_vmholder(new_resolved_method, holder->java_mirror()); + + // Set flag in class to indicate this InstanceKlass has entries in the table + // to avoid walking table during redefinition if none of the redefined classes + // have any membernames in the table. + holder->set_has_resolved_methods(); + + return ResolvedMethodTable::add_method(method, Handle(THREAD, new_resolved_method)); } oop java_lang_invoke_LambdaForm::vmentry(oop lform) { diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp index 9d2a06f95e7..f25b46932a6 100644 --- a/src/hotspot/share/classfile/javaClasses.hpp +++ b/src/hotspot/share/classfile/javaClasses.hpp @@ -1063,6 +1063,8 @@ class java_lang_invoke_ResolvedMethodName : AllStatic { static Method* vmtarget(oop resolved_method); static void set_vmtarget(oop resolved_method, Method* method); + static void set_vmholder(oop resolved_method, oop holder); + // find or create resolved member name static oop find_resolved_method(const methodHandle& m, TRAPS); diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index caa76719769..d8e51c2566a 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -68,7 +68,6 @@ #include "oops/symbol.hpp" #include "oops/typeArrayKlass.hpp" #include "prims/jvmtiExport.hpp" -#include "prims/resolvedMethodTable.hpp" #include "prims/methodHandles.hpp" #include "runtime/arguments.hpp" #include "runtime/biasedLocking.hpp" @@ -1836,8 +1835,6 @@ bool SystemDictionary::do_unloading(GCTimer* gc_timer) { } GCTraceTime(Debug, gc, phases) t("Trigger cleanups", gc_timer); - // Trigger cleaning the ResolvedMethodTable even if no unloading occurred. - ResolvedMethodTable::trigger_cleanup(); if (unloading_occurred) { SymbolTable::trigger_cleanup(); diff --git a/src/hotspot/share/gc/shared/weakProcessor.cpp b/src/hotspot/share/gc/shared/weakProcessor.cpp index 97cd65b1d71..0cca1b6556c 100644 --- a/src/hotspot/share/gc/shared/weakProcessor.cpp +++ b/src/hotspot/share/gc/shared/weakProcessor.cpp @@ -31,22 +31,33 @@ #include "gc/shared/weakProcessorPhaseTimes.hpp" #include "memory/allocation.inline.hpp" #include "memory/iterator.hpp" +#include "prims/resolvedMethodTable.hpp" #include "runtime/globals.hpp" #include "utilities/macros.hpp" +template +class OopsDoAndReportCounts { +public: + void operator()(BoolObjectClosure* is_alive, OopClosure* keep_alive, WeakProcessorPhase phase) { + Container::reset_dead_counter(); + + CountingSkippedIsAliveClosure cl(is_alive, keep_alive); + WeakProcessorPhases::oop_storage(phase)->oops_do(&cl); + + Container::inc_dead_counter(cl.num_dead() + cl.num_skipped()); + Container::finish_dead_counter(); + } +}; + void WeakProcessor::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* keep_alive) { FOR_EACH_WEAK_PROCESSOR_PHASE(phase) { if (WeakProcessorPhases::is_serial(phase)) { WeakProcessorPhases::processor(phase)(is_alive, keep_alive); } else { if (WeakProcessorPhases::is_stringtable(phase)) { - StringTable::reset_dead_counter(); - - CountingSkippedIsAliveClosure cl(is_alive, keep_alive); - WeakProcessorPhases::oop_storage(phase)->oops_do(&cl); - - StringTable::inc_dead_counter(cl.num_dead() + cl.num_skipped()); - StringTable::finish_dead_counter(); + OopsDoAndReportCounts()(is_alive, keep_alive, phase); + } else if (WeakProcessorPhases::is_resolved_method_table(phase)){ + OopsDoAndReportCounts()(is_alive, keep_alive, phase); } else { WeakProcessorPhases::oop_storage(phase)->weak_oops_do(is_alive, keep_alive); } @@ -104,6 +115,7 @@ void WeakProcessor::Task::initialize() { new (states++) StorageState(storage, _nworkers); } StringTable::reset_dead_counter(); + ResolvedMethodTable::reset_dead_counter(); } WeakProcessor::Task::Task(uint nworkers) : @@ -134,6 +146,7 @@ WeakProcessor::Task::~Task() { FREE_C_HEAP_ARRAY(StorageState, _storage_states); } StringTable::finish_dead_counter(); + ResolvedMethodTable::finish_dead_counter(); } void WeakProcessor::GangTask::work(uint worker_id) { diff --git a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp index 57766424662..834cafa683f 100644 --- a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp +++ b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp @@ -32,6 +32,7 @@ #include "gc/shared/weakProcessorPhases.hpp" #include "gc/shared/weakProcessorPhaseTimes.hpp" #include "gc/shared/workgroup.hpp" +#include "prims/resolvedMethodTable.hpp" #include "utilities/debug.hpp" class BoolObjectClosure; @@ -115,6 +116,9 @@ void WeakProcessor::Task::work(uint worker_id, if (WeakProcessorPhases::is_stringtable(phase)) { StringTable::inc_dead_counter(cl.num_dead() + cl.num_skipped()); } + if (WeakProcessorPhases::is_resolved_method_table(phase)) { + ResolvedMethodTable::inc_dead_counter(cl.num_dead() + cl.num_skipped()); + } } } diff --git a/src/hotspot/share/gc/shared/weakProcessorPhases.cpp b/src/hotspot/share/gc/shared/weakProcessorPhases.cpp index cb9ee0be7ee..8c2b859321a 100644 --- a/src/hotspot/share/gc/shared/weakProcessorPhases.cpp +++ b/src/hotspot/share/gc/shared/weakProcessorPhases.cpp @@ -26,6 +26,7 @@ #include "classfile/stringTable.hpp" #include "classfile/systemDictionary.hpp" #include "gc/shared/weakProcessorPhases.hpp" +#include "prims/resolvedMethodTable.hpp" #include "runtime/jniHandles.hpp" #include "utilities/debug.hpp" #include "utilities/macros.hpp" @@ -80,6 +81,7 @@ const char* WeakProcessorPhases::description(Phase phase) { JFR_ONLY(case jfr: return "JFR weak processing";) case jni: return "JNI weak processing"; case stringtable: return "StringTable weak processing"; + case resolved_method_table: return "ResolvedMethodTable weak processing"; case vm: return "VM weak processing"; default: ShouldNotReachHere(); @@ -101,6 +103,7 @@ OopStorage* WeakProcessorPhases::oop_storage(Phase phase) { switch (phase) { case jni: return JNIHandles::weak_global_handles(); case stringtable: return StringTable::weak_storage(); + case resolved_method_table: return ResolvedMethodTable::weak_storage(); case vm: return SystemDictionary::vm_weak_oop_storage(); default: ShouldNotReachHere(); @@ -111,3 +114,7 @@ OopStorage* WeakProcessorPhases::oop_storage(Phase phase) { bool WeakProcessorPhases::is_stringtable(Phase phase) { return phase == stringtable; } + +bool WeakProcessorPhases::is_resolved_method_table(Phase phase) { + return phase == resolved_method_table; +} diff --git a/src/hotspot/share/gc/shared/weakProcessorPhases.hpp b/src/hotspot/share/gc/shared/weakProcessorPhases.hpp index 3cde1239fc4..2e3708da19c 100644 --- a/src/hotspot/share/gc/shared/weakProcessorPhases.hpp +++ b/src/hotspot/share/gc/shared/weakProcessorPhases.hpp @@ -45,6 +45,7 @@ public: // OopStorage phases. jni, stringtable, + resolved_method_table, vm }; @@ -68,6 +69,7 @@ public: static OopStorage* oop_storage(Phase phase); // Precondition: is_oop_storage(phase) static bool is_stringtable(Phase phase); + static bool is_resolved_method_table(Phase phase); }; typedef WeakProcessorPhases::Phase WeakProcessorPhase; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp new file mode 100644 index 00000000000..549618b1fe3 --- /dev/null +++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2019, Red Hat, Inc. All rights reserved. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ +#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_HPP +#define SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_HPP + +#include "memory/iterator.hpp" + +class ShenandoahHeap; +class ShenandoahMarkingContext; +class Thread; + +class ShenandoahForwardedIsAliveClosure: public BoolObjectClosure { +private: + ShenandoahMarkingContext* const _mark_context; +public: + inline ShenandoahForwardedIsAliveClosure(); + inline bool do_object_b(oop obj); +}; + +class ShenandoahIsAliveClosure: public BoolObjectClosure { +private: + ShenandoahMarkingContext* const _mark_context; +public: + inline ShenandoahIsAliveClosure(); + inline bool do_object_b(oop obj); +}; + +class ShenandoahIsAliveSelector : public StackObj { +private: + ShenandoahIsAliveClosure _alive_cl; + ShenandoahForwardedIsAliveClosure _fwd_alive_cl; +public: + inline BoolObjectClosure* is_alive_closure(); +}; + +class ShenandoahUpdateRefsClosure: public OopClosure { +private: + ShenandoahHeap* _heap; +public: + inline ShenandoahUpdateRefsClosure(); + 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; + Thread* _thread; +public: + inline ShenandoahEvacuateUpdateRootsClosure(); + inline void do_oop(oop* p); + inline void do_oop(narrowOop* p); + +private: + template + inline void do_oop_work(T* p); +}; + +#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp new file mode 100644 index 00000000000..2b5337ece85 --- /dev/null +++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2019, Red Hat, Inc. All rights reserved. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ +#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_INLINE_HPP +#define SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_INLINE_HPP + +#include "gc/shenandoah/shenandoahAsserts.hpp" +#include "gc/shenandoah/shenandoahClosures.hpp" +#include "gc/shenandoah/shenandoahHeap.inline.hpp" +#include "oops/compressedOops.inline.hpp" +#include "runtime/thread.hpp" + +ShenandoahForwardedIsAliveClosure::ShenandoahForwardedIsAliveClosure() : + _mark_context(ShenandoahHeap::heap()->marking_context()) { +} + +bool ShenandoahForwardedIsAliveClosure::do_object_b(oop obj) { + if (CompressedOops::is_null(obj)) { + return false; + } + obj = ShenandoahBarrierSet::resolve_forwarded_not_null(obj); + shenandoah_assert_not_forwarded_if(NULL, obj, + (ShenandoahHeap::heap()->is_concurrent_mark_in_progress() || + ShenandoahHeap::heap()->is_concurrent_traversal_in_progress())); + return _mark_context->is_marked(obj); +} + +ShenandoahIsAliveClosure::ShenandoahIsAliveClosure() : + _mark_context(ShenandoahHeap::heap()->marking_context()) { +} + +bool ShenandoahIsAliveClosure::do_object_b(oop obj) { + if (CompressedOops::is_null(obj)) { + return false; + } + shenandoah_assert_not_forwarded(NULL, obj); + return _mark_context->is_marked(obj); +} + +BoolObjectClosure* ShenandoahIsAliveSelector::is_alive_closure() { + return ShenandoahHeap::heap()->has_forwarded_objects() ? + reinterpret_cast(&_fwd_alive_cl) : + reinterpret_cast(&_alive_cl); +} + +ShenandoahUpdateRefsClosure::ShenandoahUpdateRefsClosure() : + _heap(ShenandoahHeap::heap()) { +} + +template +void ShenandoahUpdateRefsClosure::do_oop_work(T* p) { + T o = RawAccess<>::oop_load(p); + if (!CompressedOops::is_null(o)) { + oop obj = CompressedOops::decode_not_null(o); + _heap->update_with_forwarded_not_null(p, obj); + } +} + +void ShenandoahUpdateRefsClosure::do_oop(oop* p) { do_oop_work(p); } +void ShenandoahUpdateRefsClosure::do_oop(narrowOop* p) { do_oop_work(p); } + +ShenandoahEvacuateUpdateRootsClosure::ShenandoahEvacuateUpdateRootsClosure() : + _heap(ShenandoahHeap::heap()), _thread(Thread::current()) { +} + +template +void ShenandoahEvacuateUpdateRootsClosure::do_oop_work(T* p) { + assert(_heap->is_evacuation_in_progress(), "Only do this when evacuation is in progress"); + + T o = RawAccess<>::oop_load(p); + if (! CompressedOops::is_null(o)) { + oop obj = CompressedOops::decode_not_null(o); + if (_heap->in_collection_set(obj)) { + shenandoah_assert_marked(p, obj); + oop resolved = ShenandoahBarrierSet::resolve_forwarded_not_null(obj); + if (oopDesc::equals_raw(resolved, obj)) { + resolved = _heap->evacuate_object(obj, _thread); + } + RawAccess::oop_store(p, resolved); + } + } +} +void ShenandoahEvacuateUpdateRootsClosure::do_oop(oop* p) { + do_oop_work(p); +} + +void ShenandoahEvacuateUpdateRootsClosure::do_oop(narrowOop* p) { + do_oop_work(p); +} + +#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCLOSURES_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp index 3ecbd9741b1..cabb6752eee 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp @@ -33,6 +33,7 @@ #include "gc/shared/referenceProcessorPhaseTimes.hpp" #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp" +#include "gc/shenandoah/shenandoahClosures.inline.hpp" #include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp" #include "gc/shenandoah/shenandoahMarkCompact.hpp" #include "gc/shenandoah/shenandoahHeap.inline.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp index eb61f3877e3..6673b58f2e3 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp @@ -33,6 +33,7 @@ #include "gc/shenandoah/shenandoahAllocTracker.hpp" #include "gc/shenandoah/shenandoahBarrierSet.hpp" #include "gc/shenandoah/shenandoahBrooksPointer.hpp" +#include "gc/shenandoah/shenandoahClosures.inline.hpp" #include "gc/shenandoah/shenandoahCollectionSet.hpp" #include "gc/shenandoah/shenandoahCollectorPolicy.hpp" #include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp" @@ -70,8 +71,6 @@ #include "runtime/vmThread.hpp" #include "services/mallocTracker.hpp" -ShenandoahUpdateRefsClosure::ShenandoahUpdateRefsClosure() : _heap(ShenandoahHeap::heap()) {} - #ifdef ASSERT template void ShenandoahAssertToSpaceClosure::do_oop_work(T* p) { @@ -459,8 +458,8 @@ ShenandoahHeap::ShenandoahHeap(ShenandoahCollectorPolicy* policy) : _max_workers = MAX2(_max_workers, 1U); _workers = new ShenandoahWorkGang("Shenandoah GC Threads", _max_workers, - /* are_GC_task_threads */true, - /* are_ConcurrentGC_threads */false); + /* are_GC_task_threads */ true, + /* are_ConcurrentGC_threads */ true); if (_workers == NULL) { vm_exit_during_initialization("Failed necessary allocation."); } else { @@ -470,7 +469,8 @@ ShenandoahHeap::ShenandoahHeap(ShenandoahCollectorPolicy* policy) : if (ShenandoahParallelSafepointThreads > 1) { _safepoint_workers = new ShenandoahWorkGang("Safepoint Cleanup Thread", ShenandoahParallelSafepointThreads, - false, false); + /* are_GC_task_threads */ false, + /* are_ConcurrentGC_threads */ false); _safepoint_workers->initialize_workers(); } } @@ -939,43 +939,6 @@ size_t ShenandoahHeap::min_dummy_object_size() const { return CollectedHeap::min_dummy_object_size() + ShenandoahBrooksPointer::word_size(); } -class ShenandoahEvacuateUpdateRootsClosure: public BasicOopIterateClosure { -private: - ShenandoahHeap* _heap; - Thread* _thread; -public: - ShenandoahEvacuateUpdateRootsClosure() : - _heap(ShenandoahHeap::heap()), _thread(Thread::current()) { - } - -private: - template - void do_oop_work(T* p) { - assert(_heap->is_evacuation_in_progress(), "Only do this when evacuation is in progress"); - - T o = RawAccess<>::oop_load(p); - if (! CompressedOops::is_null(o)) { - oop obj = CompressedOops::decode_not_null(o); - if (_heap->in_collection_set(obj)) { - shenandoah_assert_marked(p, obj); - oop resolved = ShenandoahBarrierSet::resolve_forwarded_not_null(obj); - if (oopDesc::equals_raw(resolved, obj)) { - resolved = _heap->evacuate_object(obj, _thread); - } - RawAccess::oop_store(p, resolved); - } - } - } - -public: - void do_oop(oop* p) { - do_oop_work(p); - } - void do_oop(narrowOop* p) { - do_oop_work(p); - } -}; - class ShenandoahConcurrentEvacuateRegionObjectClosure : public ObjectClosure { private: ShenandoahHeap* const _heap; @@ -1883,31 +1846,6 @@ HeapWord* ShenandoahHeap::tlab_post_allocation_setup(HeapWord* obj) { return result; } -ShenandoahForwardedIsAliveClosure::ShenandoahForwardedIsAliveClosure() : - _mark_context(ShenandoahHeap::heap()->marking_context()) { -} - -ShenandoahIsAliveClosure::ShenandoahIsAliveClosure() : - _mark_context(ShenandoahHeap::heap()->marking_context()) { -} - -bool ShenandoahForwardedIsAliveClosure::do_object_b(oop obj) { - if (CompressedOops::is_null(obj)) { - return false; - } - obj = ShenandoahBarrierSet::resolve_forwarded_not_null(obj); - shenandoah_assert_not_forwarded_if(NULL, obj, ShenandoahHeap::heap()->is_concurrent_mark_in_progress() || ShenandoahHeap::heap()->is_concurrent_traversal_in_progress()); - return _mark_context->is_marked(obj); -} - -bool ShenandoahIsAliveClosure::do_object_b(oop obj) { - if (CompressedOops::is_null(obj)) { - return false; - } - shenandoah_assert_not_forwarded(NULL, obj); - return _mark_context->is_marked(obj); -} - void ShenandoahHeap::ref_processing_init() { assert(_max_workers > 0, "Sanity"); @@ -2878,8 +2816,3 @@ size_t ShenandoahHeap::obj_size(oop obj) const { ptrdiff_t ShenandoahHeap::cell_header_size() const { return ShenandoahBrooksPointer::byte_size(); } - -BoolObjectClosure* ShenandoahIsAliveSelector::is_alive_closure() { - return ShenandoahHeap::heap()->has_forwarded_objects() ? reinterpret_cast(&_fwd_alive_cl) - : reinterpret_cast(&_alive_cl); -} diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp index f11ac8dbf80..7ced8dcf21a 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp @@ -91,19 +91,6 @@ public: virtual bool is_thread_safe() { return false; } }; -class ShenandoahUpdateRefsClosure: public OopClosure { -private: - ShenandoahHeap* _heap; - - template - inline void do_oop_work(T* p); - -public: - ShenandoahUpdateRefsClosure(); - inline void do_oop(oop* p); - inline void do_oop(narrowOop* p); -}; - #ifdef ASSERT class ShenandoahAssertToSpaceClosure : public OopClosure { private: @@ -115,34 +102,6 @@ public: }; #endif -class ShenandoahAlwaysTrueClosure : public BoolObjectClosure { -public: - bool do_object_b(oop p) { return true; } -}; - -class ShenandoahForwardedIsAliveClosure: public BoolObjectClosure { -private: - ShenandoahMarkingContext* const _mark_context; -public: - ShenandoahForwardedIsAliveClosure(); - bool do_object_b(oop obj); -}; - -class ShenandoahIsAliveClosure: public BoolObjectClosure { -private: - ShenandoahMarkingContext* const _mark_context; -public: - ShenandoahIsAliveClosure(); - bool do_object_b(oop obj); -}; - -class ShenandoahIsAliveSelector : public StackObj { -private: - ShenandoahIsAliveClosure _alive_cl; - ShenandoahForwardedIsAliveClosure _fwd_alive_cl; -public: - BoolObjectClosure* is_alive_closure(); -}; // Shenandoah GC is low-pause concurrent GC that uses Brooks forwarding pointers // to encode forwarding data. See BrooksPointer for details on forwarding data encoding. diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp index fe5396393ad..91382a1ef08 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp @@ -46,17 +46,6 @@ #include "utilities/copy.hpp" #include "utilities/globalDefinitions.hpp" -template -void ShenandoahUpdateRefsClosure::do_oop_work(T* p) { - T o = RawAccess<>::oop_load(p); - if (!CompressedOops::is_null(o)) { - oop obj = CompressedOops::decode_not_null(o); - _heap->update_with_forwarded_not_null(p, obj); - } -} - -void ShenandoahUpdateRefsClosure::do_oop(oop* p) { do_oop_work(p); } -void ShenandoahUpdateRefsClosure::do_oop(narrowOop* p) { do_oop_work(p); } inline ShenandoahHeapRegion* ShenandoahRegionIterator::next() { size_t new_index = Atomic::add((size_t) 1, &_index); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp index a64c0668da4..6b7d34ec057 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp @@ -51,6 +51,7 @@ class outputStream; f(scan_jfr_weak_roots, " S: JFR Weak Roots") \ f(scan_jni_weak_roots, " S: JNI Weak Roots") \ f(scan_stringtable_roots, " S: String Table Roots") \ + f(scan_resolved_method_table_roots, " S: Resolved Table Roots") \ f(scan_vm_weak_roots, " S: VM Weak Roots") \ f(scan_synchronizer_roots, " S: Synchronizer Roots") \ f(scan_management_roots, " S: Management Roots") \ @@ -76,6 +77,7 @@ class outputStream; f(update_jfr_weak_roots, " U: JFR Weak Roots") \ f(update_jni_weak_roots, " U: JNI Weak Roots") \ f(update_stringtable_roots, " U: String Table Roots") \ + f(update_resolved_method_table_roots, " U: Resolved Table Roots") \ f(update_vm_weak_roots, " U: VM Weak Roots") \ f(update_synchronizer_roots, " U: Synchronizer Roots") \ f(update_management_roots, " U: Management Roots") \ @@ -109,6 +111,7 @@ class outputStream; f(evac_jfr_weak_roots, " E: JFR Weak Roots") \ f(evac_jni_weak_roots, " E: JNI Weak Roots") \ f(evac_stringtable_roots, " E: String Table Roots") \ + f(evac_resolved_method_table_roots, " E: Resolved Table Roots") \ f(evac_vm_weak_roots, " E: VM Weak Roots") \ f(evac_synchronizer_roots, " E: Synchronizer Roots") \ f(evac_management_roots, " E: Management Roots") \ @@ -139,6 +142,7 @@ class outputStream; f(final_update_jfr_weak_roots, " UR: JFR Weak Roots") \ f(final_update_jni_weak_roots, " UR: JNI Weak Roots") \ f(final_update_stringtable_roots, " UR: String Table Roots") \ + f(final_update_resolved_method_table_roots, " UR: Resolved Table Roots") \ f(final_update_vm_weak_roots, " UR: VM Weak Roots") \ f(final_update_refs_synchronizer_roots, " UR: Synchronizer Roots") \ f(final_update_refs_management_roots, " UR: Management Roots") \ @@ -164,6 +168,7 @@ class outputStream; f(degen_gc_update_jfr_weak_roots, " DU: JFR Weak Roots") \ f(degen_gc_update_jni_weak_roots, " DU: JNI Weak Roots") \ f(degen_gc_update_stringtable_roots, " DU: String Table Roots") \ + f(degen_gc_update_resolved_method_table_roots, " DU: Resolved Table Roots") \ f(degen_gc_update_vm_weak_roots, " DU: VM Weak Roots") \ f(degen_gc_update_synchronizer_roots, " DU: Synchronizer Roots") \ f(degen_gc_update_management_roots, " DU: Management Roots") \ @@ -190,6 +195,7 @@ class outputStream; f(init_traversal_gc_jfr_weak_roots, " TI: JFR Weak Roots") \ f(init_traversal_gc_jni_weak_roots, " TI: JNI Weak Roots") \ f(init_traversal_gc_stringtable_roots, " TI: String Table Roots") \ + f(init_traversal_gc_resolved_method_table_roots, " TI: Resolved Table Roots") \ f(init_traversal_gc_vm_weak_roots, " TI: VM Weak Roots") \ f(init_traversal_gc_synchronizer_roots, " TI: Synchronizer Roots") \ f(init_traversal_gc_management_roots, " TI: Management Roots") \ @@ -213,6 +219,7 @@ class outputStream; f(final_traversal_gc_jfr_weak_roots, " TF: JFR Weak Roots") \ f(final_traversal_gc_jni_weak_roots, " TF: JNI Weak Roots") \ f(final_traversal_gc_stringtable_roots, " TF: String Table Roots") \ + f(final_traversal_gc_resolved_method_table_roots, " TF: Resolved Table Roots") \ f(final_traversal_gc_vm_weak_roots, " TF: VM Weak Roots") \ f(final_traversal_gc_synchronizer_roots, " TF: Synchronizer Roots") \ f(final_traversal_gc_management_roots, " TF: Management Roots") \ @@ -225,24 +232,25 @@ class outputStream; f(final_traversal_gc_termination, " TF: Termination") \ \ /* Per-thread timer block, should have "roots" counters in consistent order */ \ - f(final_traversal_update_roots, " Update Roots") \ - f(final_traversal_update_thread_roots, " TU: Thread Roots") \ - f(final_traversal_update_code_roots, " TU: Code Cache Roots") \ - f(final_traversal_update_universe_roots, " TU: Universe Roots") \ - f(final_traversal_update_jni_roots, " TU: JNI Roots") \ - f(final_traversal_update_jvmti_weak_roots, " TU: JVMTI Weak Roots") \ - f(final_traversal_update_jfr_weak_roots, " TU: JFR Weak Roots") \ - f(final_traversal_update_jni_weak_roots, " TU: JNI Weak Roots") \ - f(final_traversal_update_stringtable_roots, " TU: String Table Roots") \ - f(final_traversal_update_vm_weak_roots, " TU: VM Weak Roots") \ - f(final_traversal_update_synchronizer_roots, " TU: Synchronizer Roots") \ - f(final_traversal_update_management_roots, " TU: Management Roots") \ - f(final_traversal_update_system_dict_roots, " TU: System Dict Roots") \ - f(final_traversal_update_cldg_roots, " TU: CLDG Roots") \ - f(final_traversal_update_jvmti_roots, " TU: JVMTI Roots") \ - f(final_traversal_update_string_dedup_table_roots, " TU: Dedup Table Roots") \ - f(final_traversal_update_string_dedup_queue_roots, " TU: Dedup Queue Roots") \ - f(final_traversal_update_finish_queues, " TU: Finish Queues") \ + f(final_traversal_update_roots, " Update Roots") \ + f(final_traversal_update_thread_roots, " TU: Thread Roots") \ + f(final_traversal_update_code_roots, " TU: Code Cache Roots") \ + f(final_traversal_update_universe_roots, " TU: Universe Roots") \ + f(final_traversal_update_jni_roots, " TU: JNI Roots") \ + f(final_traversal_update_jvmti_weak_roots, " TU: JVMTI Weak Roots") \ + f(final_traversal_update_jfr_weak_roots, " TU: JFR Weak Roots") \ + f(final_traversal_update_jni_weak_roots, " TU: JNI Weak Roots") \ + f(final_traversal_update_stringtable_roots, " TU: String Table Roots") \ + f(final_traversal_update_resolved_method_table_roots, " TU: Resolved Table Roots") \ + f(final_traversal_update_vm_weak_roots, " TU: VM Weak Roots") \ + f(final_traversal_update_synchronizer_roots, " TU: Synchronizer Roots") \ + f(final_traversal_update_management_roots, " TU: Management Roots") \ + f(final_traversal_update_system_dict_roots, " TU: System Dict Roots") \ + f(final_traversal_update_cldg_roots, " TU: CLDG Roots") \ + f(final_traversal_update_jvmti_roots, " TU: JVMTI Roots") \ + f(final_traversal_update_string_dedup_table_roots, " TU: Dedup Table Roots") \ + f(final_traversal_update_string_dedup_queue_roots, " TU: Dedup Queue Roots") \ + f(final_traversal_update_finish_queues, " TU: Finish Queues") \ \ f(traversal_gc_cleanup, " Cleanup") \ \ @@ -261,6 +269,7 @@ class outputStream; f(full_gc_jfr_weak_roots, " F: JFR Weak Roots") \ f(full_gc_jni_weak_roots, " F: JNI Weak Roots") \ f(full_gc_stringtable_roots, " F: String Table Roots") \ + f(full_gc_resolved_method_table_roots, " F: Resolved Table Roots") \ f(full_gc_vm_weak_roots, " F: VM Weak Roots") \ f(full_gc_synchronizer_roots, " F: Synchronizer Roots") \ f(full_gc_management_roots, " F: Management Roots") \ @@ -311,23 +320,24 @@ class outputStream; // end #define SHENANDOAH_GC_PAR_PHASE_DO(f) \ - f(ThreadRoots, "Thread Roots (ms):") \ - f(CodeCacheRoots, "CodeCache Roots (ms):") \ - f(UniverseRoots, "Universe Roots (ms):") \ - f(JNIRoots, "JNI Handles Roots (ms):") \ - f(JVMTIWeakRoots, "JVMTI Weak Roots (ms):") \ - f(JFRWeakRoots, "JFR Weak Roots (ms):") \ - f(JNIWeakRoots, "JNI Weak Roots (ms):") \ - f(StringTableRoots, "StringTable Roots(ms):") \ - f(VMWeakRoots, "VM Weak Roots(ms)") \ - f(ObjectSynchronizerRoots, "ObjectSynchronizer Roots (ms):") \ - f(ManagementRoots, "Management Roots (ms):") \ - f(SystemDictionaryRoots, "SystemDictionary Roots (ms):") \ - f(CLDGRoots, "CLDG Roots (ms):") \ - f(JVMTIRoots, "JVMTI Roots (ms):") \ - f(StringDedupTableRoots, "String Dedup Table Roots (ms):") \ - f(StringDedupQueueRoots, "String Dedup Queue Roots (ms):") \ - f(FinishQueues, "Finish Queues (ms):") \ + f(ThreadRoots, "Thread Roots (ms):") \ + f(CodeCacheRoots, "CodeCache Roots (ms):") \ + f(UniverseRoots, "Universe Roots (ms):") \ + f(JNIRoots, "JNI Handles Roots (ms):") \ + f(JVMTIWeakRoots, "JVMTI Weak Roots (ms):") \ + f(JFRWeakRoots, "JFR Weak Roots (ms):") \ + f(JNIWeakRoots, "JNI Weak Roots (ms):") \ + f(StringTableRoots, "StringTable Roots(ms):") \ + f(ResolvedMethodTableRoots, "Resolved Table Roots(ms):") \ + f(VMWeakRoots, "VM Weak Roots(ms)") \ + f(ObjectSynchronizerRoots, "ObjectSynchronizer Roots (ms):") \ + f(ManagementRoots, "Management Roots (ms):") \ + f(SystemDictionaryRoots, "SystemDictionary Roots (ms):") \ + f(CLDGRoots, "CLDG Roots (ms):") \ + f(JVMTIRoots, "JVMTI Roots (ms):") \ + f(StringDedupTableRoots, "String Dedup Table Roots (ms):") \ + f(StringDedupQueueRoots, "String Dedup Queue Roots (ms):") \ + f(FinishQueues, "Finish Queues (ms):") \ // end class ShenandoahPhaseTimings : public CHeapObj { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp index 8b333ee6532..ba4c75be660 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp @@ -27,6 +27,7 @@ #include "classfile/stringTable.hpp" #include "classfile/systemDictionary.hpp" #include "code/codeCache.hpp" +#include "gc/shenandoah/shenandoahClosures.inline.hpp" #include "gc/shenandoah/shenandoahRootProcessor.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahPhaseTimings.hpp" @@ -48,14 +49,15 @@ struct PhaseMap { static const struct PhaseMap phase_mapping[] = { #if INCLUDE_JVMTI - {WeakProcessorPhases::jvmti, ShenandoahPhaseTimings::JVMTIWeakRoots}, + {WeakProcessorPhases::jvmti, ShenandoahPhaseTimings::JVMTIWeakRoots}, #endif #if INCLUDE_JFR - {WeakProcessorPhases::jfr, ShenandoahPhaseTimings::JFRWeakRoots}, + {WeakProcessorPhases::jfr, ShenandoahPhaseTimings::JFRWeakRoots}, #endif - {WeakProcessorPhases::jni, ShenandoahPhaseTimings::JNIWeakRoots}, - {WeakProcessorPhases::stringtable, ShenandoahPhaseTimings::StringTableRoots}, - {WeakProcessorPhases::vm, ShenandoahPhaseTimings::VMWeakRoots} + {WeakProcessorPhases::jni, ShenandoahPhaseTimings::JNIWeakRoots}, + {WeakProcessorPhases::stringtable, ShenandoahPhaseTimings::StringTableRoots}, + {WeakProcessorPhases::resolved_method_table, ShenandoahPhaseTimings::ResolvedMethodTableRoots}, + {WeakProcessorPhases::vm, ShenandoahPhaseTimings::VMWeakRoots} }; STATIC_ASSERT(sizeof(phase_mapping) / sizeof(PhaseMap) == WeakProcessorPhases::phase_count); @@ -64,7 +66,6 @@ ShenandoahRootProcessor::ShenandoahRootProcessor(ShenandoahHeap* heap, uint n_wo ShenandoahPhaseTimings::Phase phase) : _process_strong_tasks(new SubTasksDone(SHENANDOAH_RP_PS_NumElements)), _srs(n_workers), - _par_state_string(StringTable::weak_storage()), _phase(phase), _coderoots_all_iterator(ShenandoahCodeRoots::iterator()), _weak_processor_timings(n_workers), @@ -242,10 +243,7 @@ ShenandoahRootEvacuator::ShenandoahRootEvacuator(ShenandoahHeap* heap, uint n_wo _evacuation_tasks(new SubTasksDone(SHENANDOAH_EVAC_NumElements)), _srs(n_workers), _phase(phase), - _coderoots_cset_iterator(ShenandoahCodeRoots::cset_iterator()), - _par_state_string(StringTable::weak_storage()) - -{ + _coderoots_cset_iterator(ShenandoahCodeRoots::cset_iterator()) { heap->phase_timings()->record_workers_start(_phase); if (ShenandoahStringDedup::is_enabled()) { StringDedup::gc_prologue(false); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp index 2821e950575..4443e4cccda 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp @@ -56,7 +56,6 @@ enum Shenandoah_process_roots_tasks { class ShenandoahRootProcessor : public StackObj { SubTasksDone* _process_strong_tasks; StrongRootsScope _srs; - OopStorage::ParState _par_state_string; ShenandoahPhaseTimings::Phase _phase; ParallelCLDRootIterator _cld_iterator; ShenandoahAllCodeRootsIterator _coderoots_all_iterator; @@ -120,7 +119,6 @@ class ShenandoahRootEvacuator : public StackObj { StrongRootsScope _srs; ShenandoahPhaseTimings::Phase _phase; ShenandoahCsetCodeRootsIterator _coderoots_cset_iterator; - OopStorage::ParState _par_state_string; enum Shenandoah_evacuate_roots_tasks { SHENANDOAH_EVAC_Universe_oops_do, diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp index a9f6a2b7970..ecce39bce93 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp @@ -92,7 +92,7 @@ void ShenandoahStringDedup::parallel_oops_do(BoolObjectClosure* is_alive, OopClo void ShenandoahStringDedup::oops_do_slow(OopClosure* cl) { assert(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint"); assert(is_enabled(), "String deduplication not enabled"); - ShenandoahAlwaysTrueClosure always_true; + AlwaysTrueClosure always_true; StringDedupUnlinkOrOopsDoClosure sd_cl(&always_true, cl); StringDedupQueue::unlink_or_oops_do(&sd_cl); StringDedupTable::unlink_or_oops_do(&sd_cl, 0); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp b/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp index 4095578b399..e30c5f3453c 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp @@ -76,8 +76,11 @@ ShenandoahTerminationTracker::ShenandoahTerminationTracker(ShenandoahPhaseTiming phase == ShenandoahPhaseTimings::full_gc_weakrefs_termination, "Only these phases"); - assert(Thread::current()->is_VM_thread() || Thread::current()->is_ConcurrentGC_thread(), - "Called from wrong thread"); + assert(!Thread::current()->is_Worker_thread() && + (Thread::current()->is_VM_thread() || + Thread::current()->is_ConcurrentGC_thread()), + "Called from wrong thread"); + _current_termination_phase = phase; ShenandoahHeap::heap()->phase_timings()->termination_times()->reset(); } diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp index 067c078d034..5ccdcb2e499 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp @@ -30,6 +30,7 @@ #include "gc/shared/workgroup.hpp" #include "gc/shared/weakProcessor.inline.hpp" #include "gc/shenandoah/shenandoahBarrierSet.hpp" +#include "gc/shenandoah/shenandoahClosures.inline.hpp" #include "gc/shenandoah/shenandoahCodeRoots.hpp" #include "gc/shenandoah/shenandoahCollectionSet.hpp" #include "gc/shenandoah/shenandoahCollectorPolicy.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp index 2018a594925..19f663a6511 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp @@ -100,9 +100,10 @@ ShenandoahGCPauseMark::~ShenandoahGCPauseMark() { ShenandoahGCPhase::ShenandoahGCPhase(const ShenandoahPhaseTimings::Phase phase) : _heap(ShenandoahHeap::heap()), _phase(phase) { - assert(Thread::current()->is_VM_thread() || - Thread::current()->is_ConcurrentGC_thread(), - "Must be set by these threads"); + assert(!Thread::current()->is_Worker_thread() && + (Thread::current()->is_VM_thread() || + Thread::current()->is_ConcurrentGC_thread()), + "Must be set by these threads"); _parent_phase = _current_phase; _current_phase = phase; diff --git a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp index f90bc0504e9..102e657f60f 100644 --- a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp +++ b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp @@ -55,11 +55,7 @@ bool ZBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) { // Heal oops and disarm ZNMethodOopClosure cl; - nm->oops_do(&cl); - nm->fix_oop_relocations(); - - OrderAccess::release(); - + ZNMethod::nmethod_oops_do(nm, &cl); disarm(nm); return true; diff --git a/src/hotspot/share/gc/z/zRootsIterator.cpp b/src/hotspot/share/gc/z/zRootsIterator.cpp index fd638d27e8f..11a5982d930 100644 --- a/src/hotspot/share/gc/z/zRootsIterator.cpp +++ b/src/hotspot/share/gc/z/zRootsIterator.cpp @@ -41,6 +41,7 @@ #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "prims/jvmtiExport.hpp" +#include "prims/resolvedMethodTable.hpp" #include "runtime/atomic.hpp" #include "runtime/jniHandles.hpp" #include "runtime/thread.hpp" @@ -80,6 +81,7 @@ static const ZStatSubPhase ZSubPhaseConcurrentWeakRoots("Concurrent Weak Roots") static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsVMWeakHandles("Concurrent Weak Roots VMWeakHandles"); static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsJNIWeakHandles("Concurrent Weak Roots JNIWeakHandles"); static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsStringTable("Concurrent Weak Roots StringTable"); +static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsResolvedMethodTable("Concurrent Weak Roots ResolvedMethodTable"); template ZSerialOopsDo::ZSerialOopsDo(T* iter) : @@ -341,14 +343,18 @@ ZConcurrentWeakRootsIterator::ZConcurrentWeakRootsIterator() : _vm_weak_handles_iter(SystemDictionary::vm_weak_oop_storage()), _jni_weak_handles_iter(JNIHandles::weak_global_handles()), _string_table_iter(StringTable::weak_storage()), + _resolved_method_table_iter(ResolvedMethodTable::weak_storage()), _vm_weak_handles(this), _jni_weak_handles(this), - _string_table(this) { + _string_table(this), + _resolved_method_table(this) { StringTable::reset_dead_counter(); + ResolvedMethodTable::reset_dead_counter(); } ZConcurrentWeakRootsIterator::~ZConcurrentWeakRootsIterator() { StringTable::finish_dead_counter(); + ResolvedMethodTable::finish_dead_counter(); } void ZConcurrentWeakRootsIterator::do_vm_weak_handles(ZRootsIteratorClosure* cl) { @@ -361,18 +367,19 @@ void ZConcurrentWeakRootsIterator::do_jni_weak_handles(ZRootsIteratorClosure* cl _jni_weak_handles_iter.oops_do(cl); } -class ZStringTableDeadCounterClosure : public ZRootsIteratorClosure { +template +class ZDeadCounterClosure : public ZRootsIteratorClosure { private: ZRootsIteratorClosure* const _cl; size_t _ndead; public: - ZStringTableDeadCounterClosure(ZRootsIteratorClosure* cl) : + ZDeadCounterClosure(ZRootsIteratorClosure* cl) : _cl(cl), _ndead(0) {} - ~ZStringTableDeadCounterClosure() { - StringTable::inc_dead_counter(_ndead); + ~ZDeadCounterClosure() { + Container::inc_dead_counter(_ndead); } virtual void do_oop(oop* p) { @@ -389,15 +396,22 @@ public: void ZConcurrentWeakRootsIterator::do_string_table(ZRootsIteratorClosure* cl) { ZStatTimer timer(ZSubPhaseConcurrentWeakRootsStringTable); - ZStringTableDeadCounterClosure counter_cl(cl); + ZDeadCounterClosure counter_cl(cl); _string_table_iter.oops_do(&counter_cl); } +void ZConcurrentWeakRootsIterator::do_resolved_method_table(ZRootsIteratorClosure* cl) { + ZStatTimer timer(ZSubPhaseConcurrentWeakRootsResolvedMethodTable); + ZDeadCounterClosure counter_cl(cl); + _resolved_method_table_iter.oops_do(&counter_cl); +} + void ZConcurrentWeakRootsIterator::oops_do(ZRootsIteratorClosure* cl) { ZStatTimer timer(ZSubPhaseConcurrentWeakRoots); _vm_weak_handles.oops_do(cl); _jni_weak_handles.oops_do(cl); _string_table.oops_do(cl); + _resolved_method_table.oops_do(cl); } ZThreadRootsIterator::ZThreadRootsIterator() : diff --git a/src/hotspot/share/gc/z/zRootsIterator.hpp b/src/hotspot/share/gc/z/zRootsIterator.hpp index d5146397747..099fb086952 100644 --- a/src/hotspot/share/gc/z/zRootsIterator.hpp +++ b/src/hotspot/share/gc/z/zRootsIterator.hpp @@ -149,14 +149,17 @@ private: ZOopStorageIterator _vm_weak_handles_iter; ZOopStorageIterator _jni_weak_handles_iter; ZOopStorageIterator _string_table_iter; + ZOopStorageIterator _resolved_method_table_iter; void do_vm_weak_handles(ZRootsIteratorClosure* cl); void do_jni_weak_handles(ZRootsIteratorClosure* cl); void do_string_table(ZRootsIteratorClosure* cl); + void do_resolved_method_table(ZRootsIteratorClosure* cl); - ZParallelOopsDo _vm_weak_handles; - ZParallelOopsDo _jni_weak_handles; - ZParallelOopsDo _string_table; + ZParallelOopsDo _vm_weak_handles; + ZParallelOopsDo _jni_weak_handles; + ZParallelOopsDo _string_table; + ZParallelOopsDo _resolved_method_table; public: ZConcurrentWeakRootsIterator(); diff --git a/src/hotspot/share/gc/z/zUnload.cpp b/src/hotspot/share/gc/z/zUnload.cpp index 006c04e1b84..ffb300e18e3 100644 --- a/src/hotspot/share/gc/z/zUnload.cpp +++ b/src/hotspot/share/gc/z/zUnload.cpp @@ -71,7 +71,7 @@ public: ZReentrantLock* const lock = ZNMethod::lock_for_nmethod(nm); ZLocker locker(lock); ZIsUnloadingOopClosure cl; - nm->oops_do(&cl, true /* allow_zombie */); + ZNMethod::nmethod_oops_do(nm, &cl); return cl.is_unloading(); } }; diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp index d1cf73d529f..c183a5f7360 100644 --- a/src/hotspot/share/interpreter/interpreterRuntime.cpp +++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp @@ -156,7 +156,7 @@ void InterpreterRuntime::set_bcp_and_mdp(address bcp, JavaThread *thread) { // Constants -IRT_ENTRY(void, InterpreterRuntime::ldc(JavaThread* thread, bool wide)) +JRT_ENTRY(void, InterpreterRuntime::ldc(JavaThread* thread, bool wide)) // access constant pool LastFrameAccessor last_frame(thread); ConstantPool* pool = last_frame.method()->constants(); @@ -167,9 +167,9 @@ IRT_ENTRY(void, InterpreterRuntime::ldc(JavaThread* thread, bool wide)) Klass* klass = pool->klass_at(index, CHECK); oop java_class = klass->java_mirror(); thread->set_vm_result(java_class); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::resolve_ldc(JavaThread* thread, Bytecodes::Code bytecode)) { +JRT_ENTRY(void, InterpreterRuntime::resolve_ldc(JavaThread* thread, Bytecodes::Code bytecode)) { assert(bytecode == Bytecodes::_ldc || bytecode == Bytecodes::_ldc_w || bytecode == Bytecodes::_ldc2_w || @@ -219,13 +219,13 @@ IRT_ENTRY(void, InterpreterRuntime::resolve_ldc(JavaThread* thread, Bytecodes::C thread->set_vm_result_2((Metadata*)flags); } } -IRT_END +JRT_END //------------------------------------------------------------------------------------------------------------------------ // Allocation -IRT_ENTRY(void, InterpreterRuntime::_new(JavaThread* thread, ConstantPool* pool, int index)) +JRT_ENTRY(void, InterpreterRuntime::_new(JavaThread* thread, ConstantPool* pool, int index)) Klass* k = pool->klass_at(index, CHECK); InstanceKlass* klass = InstanceKlass::cast(k); @@ -251,23 +251,23 @@ IRT_ENTRY(void, InterpreterRuntime::_new(JavaThread* thread, ConstantPool* pool, // because the _breakpoint bytecode would be lost. oop obj = klass->allocate_instance(CHECK); thread->set_vm_result(obj); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::newarray(JavaThread* thread, BasicType type, jint size)) +JRT_ENTRY(void, InterpreterRuntime::newarray(JavaThread* thread, BasicType type, jint size)) oop obj = oopFactory::new_typeArray(type, size, CHECK); thread->set_vm_result(obj); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::anewarray(JavaThread* thread, ConstantPool* pool, int index, jint size)) +JRT_ENTRY(void, InterpreterRuntime::anewarray(JavaThread* thread, ConstantPool* pool, int index, jint size)) Klass* klass = pool->klass_at(index, CHECK); objArrayOop obj = oopFactory::new_objArray(klass, size, CHECK); thread->set_vm_result(obj); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::multianewarray(JavaThread* thread, jint* first_size_address)) +JRT_ENTRY(void, InterpreterRuntime::multianewarray(JavaThread* thread, jint* first_size_address)) // We may want to pass in more arguments - could make this slightly faster LastFrameAccessor last_frame(thread); ConstantPool* constants = last_frame.method()->constants(); @@ -292,18 +292,18 @@ IRT_ENTRY(void, InterpreterRuntime::multianewarray(JavaThread* thread, jint* fir } oop obj = ArrayKlass::cast(klass)->multi_allocate(nof_dims, dims, CHECK); thread->set_vm_result(obj); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::register_finalizer(JavaThread* thread, oopDesc* obj)) +JRT_ENTRY(void, InterpreterRuntime::register_finalizer(JavaThread* thread, oopDesc* obj)) assert(oopDesc::is_oop(obj), "must be a valid oop"); assert(obj->klass()->has_finalizer(), "shouldn't be here otherwise"); InstanceKlass::register_finalizer(instanceOop(obj), CHECK); -IRT_END +JRT_END // Quicken instance-of and check-cast bytecodes -IRT_ENTRY(void, InterpreterRuntime::quicken_io_cc(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::quicken_io_cc(JavaThread* thread)) // Force resolving; quicken the bytecode LastFrameAccessor last_frame(thread); int which = last_frame.get_index_u2(Bytecodes::_checkcast); @@ -314,7 +314,7 @@ IRT_ENTRY(void, InterpreterRuntime::quicken_io_cc(JavaThread* thread)) // assert( cpool->tag_at(which).is_unresolved_klass(), "should only come here to quicken bytecodes" ); Klass* klass = cpool->klass_at(which, CHECK); thread->set_vm_result_2(klass); -IRT_END +JRT_END //------------------------------------------------------------------------------------------------------------------------ @@ -354,10 +354,10 @@ void InterpreterRuntime::note_trap(JavaThread* thread, int reason, TRAPS) { #ifdef CC_INTERP // As legacy note_trap, but we have more arguments. -IRT_ENTRY(void, InterpreterRuntime::note_trap(JavaThread* thread, int reason, Method *method, int trap_bci)) +JRT_ENTRY(void, InterpreterRuntime::note_trap(JavaThread* thread, int reason, Method *method, int trap_bci)) methodHandle trap_method(method); note_trap_inner(thread, reason, trap_method, trap_bci, THREAD); -IRT_END +JRT_END // Class Deoptimization is not visible in BytecodeInterpreter, so we need a wrapper // for each exception. @@ -394,16 +394,16 @@ static Handle get_preinitialized_exception(Klass* k, TRAPS) { // space left we use the pre-allocated & pre-initialized StackOverflowError // klass to create an stack overflow error instance. We do not call its // constructor for the same reason (it is empty, anyway). -IRT_ENTRY(void, InterpreterRuntime::throw_StackOverflowError(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::throw_StackOverflowError(JavaThread* thread)) Handle exception = get_preinitialized_exception( SystemDictionary::StackOverflowError_klass(), CHECK); // Increment counter for hs_err file reporting Atomic::inc(&Exceptions::_stack_overflow_errors); THROW_HANDLE(exception); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_delayed_StackOverflowError(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::throw_delayed_StackOverflowError(JavaThread* thread)) Handle exception = get_preinitialized_exception( SystemDictionary::StackOverflowError_klass(), CHECK); @@ -412,9 +412,9 @@ IRT_ENTRY(void, InterpreterRuntime::throw_delayed_StackOverflowError(JavaThread* // Increment counter for hs_err file reporting Atomic::inc(&Exceptions::_stack_overflow_errors); THROW_HANDLE(exception); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::create_exception(JavaThread* thread, char* name, char* message)) +JRT_ENTRY(void, InterpreterRuntime::create_exception(JavaThread* thread, char* name, char* message)) // lookup exception klass TempNewSymbol s = SymbolTable::new_symbol(name, CHECK); if (ProfileTraps) { @@ -427,10 +427,10 @@ IRT_ENTRY(void, InterpreterRuntime::create_exception(JavaThread* thread, char* n // create exception Handle exception = Exceptions::new_exception(thread, s, message); thread->set_vm_result(exception()); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::create_klass_exception(JavaThread* thread, char* name, oopDesc* obj)) +JRT_ENTRY(void, InterpreterRuntime::create_klass_exception(JavaThread* thread, char* name, oopDesc* obj)) // Produce the error message first because note_trap can safepoint ResourceMark rm(thread); const char* klass_name = obj->klass()->external_name(); @@ -442,9 +442,9 @@ IRT_ENTRY(void, InterpreterRuntime::create_klass_exception(JavaThread* thread, c // create exception, with klass name as detail message Handle exception = Exceptions::new_exception(thread, s, klass_name); thread->set_vm_result(exception()); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_ArrayIndexOutOfBoundsException(JavaThread* thread, arrayOopDesc* a, jint index)) +JRT_ENTRY(void, InterpreterRuntime::throw_ArrayIndexOutOfBoundsException(JavaThread* thread, arrayOopDesc* a, jint index)) // Produce the error message first because note_trap can safepoint ResourceMark rm(thread); stringStream ss; @@ -455,9 +455,9 @@ IRT_ENTRY(void, InterpreterRuntime::throw_ArrayIndexOutOfBoundsException(JavaThr } THROW_MSG(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), ss.as_string()); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_ClassCastException( +JRT_ENTRY(void, InterpreterRuntime::throw_ClassCastException( JavaThread* thread, oopDesc* obj)) // Produce the error message first because note_trap can safepoint @@ -471,7 +471,7 @@ IRT_ENTRY(void, InterpreterRuntime::throw_ClassCastException( // create exception THROW_MSG(vmSymbols::java_lang_ClassCastException(), message); -IRT_END +JRT_END // exception_handler_for_exception(...) returns the continuation address, // the exception oop (via TLS) and sets the bci/bcp for the continuation. @@ -481,7 +481,7 @@ IRT_END // bci where the exception happened. If the exception was propagated back // from a call, the expression stack contains the values for the bci at the // invoke w/o arguments (i.e., as if one were inside the call). -IRT_ENTRY(address, InterpreterRuntime::exception_handler_for_exception(JavaThread* thread, oopDesc* exception)) +JRT_ENTRY(address, InterpreterRuntime::exception_handler_for_exception(JavaThread* thread, oopDesc* exception)) LastFrameAccessor last_frame(thread); Handle h_exception(thread, exception); @@ -622,18 +622,18 @@ IRT_ENTRY(address, InterpreterRuntime::exception_handler_for_exception(JavaThrea thread->set_vm_result(h_exception()); return continuation; -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_pending_exception(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::throw_pending_exception(JavaThread* thread)) assert(thread->has_pending_exception(), "must only ne called if there's an exception pending"); // nothing to do - eventually we should remove this code entirely (see comments @ call sites) -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_AbstractMethodError(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::throw_AbstractMethodError(JavaThread* thread)) THROW(vmSymbols::java_lang_AbstractMethodError()); -IRT_END +JRT_END // This method is called from the "abstract_entry" of the interpreter. // At that point, the arguments have already been removed from the stack @@ -641,28 +641,28 @@ IRT_END // on some platforms the receiver still resides in a register...). Thus, // we have no choice but print an error message not containing the receiver // type. -IRT_ENTRY(void, InterpreterRuntime::throw_AbstractMethodErrorWithMethod(JavaThread* thread, +JRT_ENTRY(void, InterpreterRuntime::throw_AbstractMethodErrorWithMethod(JavaThread* thread, Method* missingMethod)) ResourceMark rm(thread); assert(missingMethod != NULL, "sanity"); methodHandle m(thread, missingMethod); LinkResolver::throw_abstract_method_error(m, THREAD); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_AbstractMethodErrorVerbose(JavaThread* thread, +JRT_ENTRY(void, InterpreterRuntime::throw_AbstractMethodErrorVerbose(JavaThread* thread, Klass* recvKlass, Method* missingMethod)) ResourceMark rm(thread); methodHandle mh = methodHandle(thread, missingMethod); LinkResolver::throw_abstract_method_error(mh, recvKlass, THREAD); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_IncompatibleClassChangeError(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::throw_IncompatibleClassChangeError(JavaThread* thread)) THROW(vmSymbols::java_lang_IncompatibleClassChangeError()); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_IncompatibleClassChangeErrorVerbose(JavaThread* thread, +JRT_ENTRY(void, InterpreterRuntime::throw_IncompatibleClassChangeErrorVerbose(JavaThread* thread, Klass* recvKlass, Klass* interfaceKlass)) ResourceMark rm(thread); @@ -673,7 +673,7 @@ IRT_ENTRY(void, InterpreterRuntime::throw_IncompatibleClassChangeErrorVerbose(Ja recvKlass ? recvKlass->external_name() : "NULL", interfaceKlass ? interfaceKlass->external_name() : "NULL"); THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf); -IRT_END +JRT_END //------------------------------------------------------------------------------------------------------------------------ // Fields @@ -760,7 +760,7 @@ void InterpreterRuntime::resolve_get_put(JavaThread* thread, Bytecodes::Code byt //%note synchronization_3 //%note monitor_1 -IRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorenter(JavaThread* thread, BasicObjectLock* elem)) +JRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorenter(JavaThread* thread, BasicObjectLock* elem)) #ifdef ASSERT thread->last_frame().interpreter_frame_verify_monitor(elem); #endif @@ -781,11 +781,11 @@ IRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorenter(JavaThread* thread, Ba #ifdef ASSERT thread->last_frame().interpreter_frame_verify_monitor(elem); #endif -IRT_END +JRT_END //%note monitor_1 -IRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorexit(JavaThread* thread, BasicObjectLock* elem)) +JRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorexit(JavaThread* thread, BasicObjectLock* elem)) #ifdef ASSERT thread->last_frame().interpreter_frame_verify_monitor(elem); #endif @@ -802,15 +802,15 @@ IRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorexit(JavaThread* thread, Bas #ifdef ASSERT thread->last_frame().interpreter_frame_verify_monitor(elem); #endif -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::throw_illegal_monitor_state_exception(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::throw_illegal_monitor_state_exception(JavaThread* thread)) THROW(vmSymbols::java_lang_IllegalMonitorStateException()); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::new_illegal_monitor_state_exception(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::new_illegal_monitor_state_exception(JavaThread* thread)) // Returns an illegal exception to install into the current thread. The // pending_exception flag is cleared so normal exception handling does not // trigger. Any current installed exception will be overwritten. This @@ -826,23 +826,23 @@ IRT_ENTRY(void, InterpreterRuntime::new_illegal_monitor_state_exception(JavaThre CATCH); } thread->set_vm_result(exception()); -IRT_END +JRT_END //------------------------------------------------------------------------------------------------------------------------ // Invokes -IRT_ENTRY(Bytecodes::Code, InterpreterRuntime::get_original_bytecode_at(JavaThread* thread, Method* method, address bcp)) +JRT_ENTRY(Bytecodes::Code, InterpreterRuntime::get_original_bytecode_at(JavaThread* thread, Method* method, address bcp)) return method->orig_bytecode_at(method->bci_from(bcp)); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::set_original_bytecode_at(JavaThread* thread, Method* method, address bcp, Bytecodes::Code new_code)) +JRT_ENTRY(void, InterpreterRuntime::set_original_bytecode_at(JavaThread* thread, Method* method, address bcp, Bytecodes::Code new_code)) method->set_orig_bytecode_at(method->bci_from(bcp), new_code); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::_breakpoint(JavaThread* thread, Method* method, address bcp)) +JRT_ENTRY(void, InterpreterRuntime::_breakpoint(JavaThread* thread, Method* method, address bcp)) JvmtiExport::post_raw_breakpoint(thread, method, bcp); -IRT_END +JRT_END void InterpreterRuntime::resolve_invoke(JavaThread* thread, Bytecodes::Code bytecode) { Thread* THREAD = thread; @@ -998,7 +998,7 @@ void InterpreterRuntime::resolve_invokedynamic(JavaThread* thread) { // This function is the interface to the assembly code. It returns the resolved // cpCache entry. This doesn't safepoint, but the helper routines safepoint. // This function will check for redefinition! -IRT_ENTRY(void, InterpreterRuntime::resolve_from_cache(JavaThread* thread, Bytecodes::Code bytecode)) { +JRT_ENTRY(void, InterpreterRuntime::resolve_from_cache(JavaThread* thread, Bytecodes::Code bytecode)) { switch (bytecode) { case Bytecodes::_getstatic: case Bytecodes::_putstatic: @@ -1023,7 +1023,7 @@ IRT_ENTRY(void, InterpreterRuntime::resolve_from_cache(JavaThread* thread, Bytec break; } } -IRT_END +JRT_END //------------------------------------------------------------------------------------------------------------------------ // Miscellaneous @@ -1069,7 +1069,7 @@ nmethod* InterpreterRuntime::frequency_counter_overflow(JavaThread* thread, addr return nm; } -IRT_ENTRY(nmethod*, +JRT_ENTRY(nmethod*, InterpreterRuntime::frequency_counter_overflow_inner(JavaThread* thread, address branch_bcp)) // use UnlockFlagSaver to clear and restore the _do_not_unlock_if_synchronized // flag, in case this method triggers classloading which will call into Java. @@ -1113,17 +1113,17 @@ IRT_ENTRY(nmethod*, } } return osr_nm; -IRT_END +JRT_END -IRT_LEAF(jint, InterpreterRuntime::bcp_to_di(Method* method, address cur_bcp)) +JRT_LEAF(jint, InterpreterRuntime::bcp_to_di(Method* method, address cur_bcp)) assert(ProfileInterpreter, "must be profiling interpreter"); int bci = method->bci_from(cur_bcp); MethodData* mdo = method->method_data(); if (mdo == NULL) return 0; return mdo->bci_to_di(bci); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::profile_method(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::profile_method(JavaThread* thread)) // use UnlockFlagSaver to clear and restore the _do_not_unlock_if_synchronized // flag, in case this method triggers classloading which will call into Java. UnlockFlagSaver fs(thread); @@ -1138,11 +1138,11 @@ IRT_ENTRY(void, InterpreterRuntime::profile_method(JavaThread* thread)) CLEAR_PENDING_EXCEPTION; // and fall through... } -IRT_END +JRT_END #ifdef ASSERT -IRT_LEAF(void, InterpreterRuntime::verify_mdp(Method* method, address bcp, address mdp)) +JRT_LEAF(void, InterpreterRuntime::verify_mdp(Method* method, address bcp, address mdp)) assert(ProfileInterpreter, "must be profiling interpreter"); MethodData* mdo = method->method_data(); @@ -1169,10 +1169,10 @@ IRT_LEAF(void, InterpreterRuntime::verify_mdp(Method* method, address bcp, addre method->print_codes(); } assert(mdp == mdp2, "wrong mdp"); -IRT_END +JRT_END #endif // ASSERT -IRT_ENTRY(void, InterpreterRuntime::update_mdp_for_ret(JavaThread* thread, int return_bci)) +JRT_ENTRY(void, InterpreterRuntime::update_mdp_for_ret(JavaThread* thread, int return_bci)) assert(ProfileInterpreter, "must be profiling interpreter"); ResourceMark rm(thread); HandleMark hm(thread); @@ -1191,24 +1191,24 @@ IRT_ENTRY(void, InterpreterRuntime::update_mdp_for_ret(JavaThread* thread, int r RetData* rdata = data->as_RetData(); address new_mdp = rdata->fixup_ret(return_bci, h_mdo); last_frame.set_mdp(new_mdp); -IRT_END +JRT_END -IRT_ENTRY(MethodCounters*, InterpreterRuntime::build_method_counters(JavaThread* thread, Method* m)) +JRT_ENTRY(MethodCounters*, InterpreterRuntime::build_method_counters(JavaThread* thread, Method* m)) MethodCounters* mcs = Method::build_method_counters(m, thread); if (HAS_PENDING_EXCEPTION) { assert((PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())), "we expect only an OOM error here"); CLEAR_PENDING_EXCEPTION; } return mcs; -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::at_safepoint(JavaThread* thread)) +JRT_ENTRY(void, InterpreterRuntime::at_safepoint(JavaThread* thread)) // We used to need an explict preserve_arguments here for invoke bytecodes. However, // stack traversal automatically takes care of preserving arguments for invoke, so // this is no longer needed. - // IRT_END does an implicit safepoint check, hence we are guaranteed to block + // JRT_END does an implicit safepoint check, hence we are guaranteed to block // if this is called during a safepoint if (JvmtiExport::should_post_single_step()) { @@ -1218,9 +1218,9 @@ IRT_ENTRY(void, InterpreterRuntime::at_safepoint(JavaThread* thread)) LastFrameAccessor last_frame(thread); JvmtiExport::at_single_stepping_point(thread, last_frame.method(), last_frame.bcp()); } -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::post_field_access(JavaThread *thread, oopDesc* obj, +JRT_ENTRY(void, InterpreterRuntime::post_field_access(JavaThread *thread, oopDesc* obj, ConstantPoolCacheEntry *cp_entry)) // check the access_flags for the field in the klass @@ -1241,9 +1241,9 @@ ConstantPoolCacheEntry *cp_entry)) jfieldID fid = jfieldIDWorkaround::to_jfieldID(cp_entry_f1, cp_entry->f2_as_index(), is_static); LastFrameAccessor last_frame(thread); JvmtiExport::post_field_access(thread, last_frame.method(), last_frame.bcp(), cp_entry_f1, h_obj, fid); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread *thread, +JRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread *thread, oopDesc* obj, ConstantPoolCacheEntry *cp_entry, jvalue *value)) Klass* k = cp_entry->f1_as_klass(); @@ -1298,24 +1298,24 @@ IRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread *thread, LastFrameAccessor last_frame(thread); JvmtiExport::post_raw_field_modification(thread, last_frame.method(), last_frame.bcp(), ik, h_obj, fid, sig_type, &fvalue); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::post_method_entry(JavaThread *thread)) +JRT_ENTRY(void, InterpreterRuntime::post_method_entry(JavaThread *thread)) LastFrameAccessor last_frame(thread); JvmtiExport::post_method_entry(thread, last_frame.method(), last_frame.get_frame()); -IRT_END +JRT_END -IRT_ENTRY(void, InterpreterRuntime::post_method_exit(JavaThread *thread)) +JRT_ENTRY(void, InterpreterRuntime::post_method_exit(JavaThread *thread)) LastFrameAccessor last_frame(thread); JvmtiExport::post_method_exit(thread, last_frame.method(), last_frame.get_frame()); -IRT_END +JRT_END -IRT_LEAF(int, InterpreterRuntime::interpreter_contains(address pc)) +JRT_LEAF(int, InterpreterRuntime::interpreter_contains(address pc)) { return (Interpreter::contains(pc) ? 1 : 0); } -IRT_END +JRT_END // Implementation of SignatureHandlerLibrary @@ -1508,7 +1508,7 @@ GrowableArray
    * SignatureHandlerLibrary::_handlers = NULL; address SignatureHandlerLibrary::_buffer = NULL; -IRT_ENTRY(void, InterpreterRuntime::prepare_native_call(JavaThread* thread, Method* method)) +JRT_ENTRY(void, InterpreterRuntime::prepare_native_call(JavaThread* thread, Method* method)) methodHandle m(thread, method); assert(m->is_native(), "sanity check"); // lookup native function entry point if it doesn't exist @@ -1522,10 +1522,10 @@ IRT_ENTRY(void, InterpreterRuntime::prepare_native_call(JavaThread* thread, Meth // before trying to fetch the native entry point and klass mirror. // We must set the signature handler last, so that multiple processors // preparing the same method will be sure to see non-null entry & mirror. -IRT_END +JRT_END #if defined(IA32) || defined(AMD64) || defined(ARM) -IRT_LEAF(void, InterpreterRuntime::popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address)) +JRT_LEAF(void, InterpreterRuntime::popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address)) if (src_address == dest_address) { return; } @@ -1541,7 +1541,7 @@ IRT_LEAF(void, InterpreterRuntime::popframe_move_outgoing_args(JavaThread* threa int size_of_arguments = (asc.size() + (invoke.has_receiver() ? 1 : 0)); // receiver Copy::conjoint_jbytes(src_address, dest_address, size_of_arguments * Interpreter::stackElementSize); -IRT_END +JRT_END #endif #if INCLUDE_JVMTI @@ -1551,7 +1551,7 @@ IRT_END // The member_name argument is a saved reference (in local#0) to the member_name. // For backward compatibility with some JDK versions (7, 8) it can also be a direct method handle. // FIXME: remove DMH case after j.l.i.InvokerBytecodeGenerator code shape is updated. -IRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* thread, address member_name, +JRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* thread, address member_name, Method* method, address bcp)) Bytecodes::Code code = Bytecodes::code_at(method, bcp); if (code != Bytecodes::_invokestatic) { @@ -1572,19 +1572,19 @@ IRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* thread, } else { thread->set_vm_result(NULL); } -IRT_END +JRT_END #endif // INCLUDE_JVMTI #ifndef PRODUCT -// This must be a IRT_LEAF function because the interpreter must save registers on x86 to +// This must be a JRT_LEAF function because the interpreter must save registers on x86 to // call this, which changes rsp and makes the interpreter's expression stack not walkable. // The generated code still uses call_VM because that will set up the frame pointer for // bcp and method. -IRT_LEAF(intptr_t, InterpreterRuntime::trace_bytecode(JavaThread* thread, intptr_t preserve_this_value, intptr_t tos, intptr_t tos2)) +JRT_LEAF(intptr_t, InterpreterRuntime::trace_bytecode(JavaThread* thread, intptr_t preserve_this_value, intptr_t tos, intptr_t tos2)) LastFrameAccessor last_frame(thread); assert(last_frame.is_interpreted_frame(), "must be an interpreted frame"); methodHandle mh(thread, last_frame.method()); BytecodeTracer::trace(mh, last_frame.bcp(), tos, tos2); return preserve_this_value; -IRT_END +JRT_END #endif // !PRODUCT diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp index 2d0bd583d0e..bd363a31cec 100644 --- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp +++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp @@ -359,7 +359,7 @@ bool JfrThreadSampleClosure::do_sample_thread(JavaThread* thread, JfrStackFrame* } bool ret = false; - thread->set_trace_flag(); + thread->set_trace_flag(); // Provides StoreLoad, needed to keep read of thread state from floating up. if (JAVA_SAMPLE == type) { if (thread_state_in_java(thread)) { ret = sample_thread_in_java(thread, frames, max_frames); diff --git a/src/hotspot/share/memory/filemap.cpp b/src/hotspot/share/memory/filemap.cpp index cdfa57d4e32..43f5b431b3e 100644 --- a/src/hotspot/share/memory/filemap.cpp +++ b/src/hotspot/share/memory/filemap.cpp @@ -806,13 +806,14 @@ bool FileMapInfo::remap_shared_readonly_as_readwrite() { addr, size, false /* !read_only */, si->_allow_exec); close(); + // These have to be errors because the shared region is now unmapped. if (base == NULL) { - fail_continue("Unable to remap shared readonly space (errno=%d).", errno); - return false; + log_error(cds)("Unable to remap shared readonly space (errno=%d).", errno); + vm_exit(1); } if (base != addr) { - fail_continue("Unable to remap shared readonly space at required address."); - return false; + log_error(cds)("Unable to remap shared readonly space (errno=%d).", errno); + vm_exit(1); } si->_read_only = false; return true; @@ -849,10 +850,17 @@ char* FileMapInfo::map_region(int i, char** top_ret) { size_t size = align_up(used, alignment); char *requested_addr = region_addr(i); - // If a tool agent is in use (debugging enabled), we must map the address space RW - if (JvmtiExport::can_modify_any_class() || JvmtiExport::can_walk_any_space()) { +#ifdef _WINDOWS + // Windows cannot remap read-only shared memory to read-write when required for + // RedefineClasses, which is also used by JFR. Always map windows regions as RW. + si->_read_only = false; +#else + // If a tool agent is in use (debugging enabled), or JFR, we must map the address space RW + if (JvmtiExport::can_modify_any_class() || JvmtiExport::can_walk_any_space() || + Arguments::has_jfr_option()) { si->_read_only = false; } +#endif // _WINDOWS // map the contents of the CDS archive in this memory char *base = os::map_memory(_fd, _full_path, si->_file_offset, @@ -868,7 +876,6 @@ char* FileMapInfo::map_region(int i, char** top_ret) { MemTracker::record_virtual_memory_type((address)base, mtClassShared); #endif - if (!verify_region_checksum(i)) { return NULL; } diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp index b63cde242b3..f2c2ed2583d 100644 --- a/src/hotspot/share/memory/universe.cpp +++ b/src/hotspot/share/memory/universe.cpp @@ -1151,6 +1151,8 @@ void Universe::initialize_verify_flags() { verify_flags |= Verify_JNIHandles; } else if (strcmp(token, "codecache_oops") == 0) { verify_flags |= Verify_CodeCacheOops; + } else if (strcmp(token, "resolved_method_table") == 0) { + verify_flags |= Verify_ResolvedMethodTable; } else { vm_exit_during_initialization(err_msg("VerifySubSet: \'%s\' memory sub-system is unknown, please correct it", token)); } @@ -1230,6 +1232,10 @@ void Universe::verify(VerifyOption option, const char* prefix) { log_debug(gc, verify)("CodeCache Oops"); CodeCache::verify_oops(); } + if (should_verify_subset(Verify_ResolvedMethodTable)) { + log_debug(gc, verify)("ResolvedMethodTable Oops"); + ResolvedMethodTable::verify(); + } _verify_in_progress = false; } diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp index 90a79ac0846..7ba5d47d304 100644 --- a/src/hotspot/share/memory/universe.hpp +++ b/src/hotspot/share/memory/universe.hpp @@ -478,6 +478,7 @@ class Universe: AllStatic { Verify_MetaspaceUtils = 128, Verify_JNIHandles = 256, Verify_CodeCacheOops = 512, + Verify_ResolvedMethodTable = 1024, Verify_All = -1 }; static void initialize_verify_flags(); diff --git a/src/hotspot/share/oops/weakHandle.cpp b/src/hotspot/share/oops/weakHandle.cpp index fec0e8c77c2..b50d55dafdd 100644 --- a/src/hotspot/share/oops/weakHandle.cpp +++ b/src/hotspot/share/oops/weakHandle.cpp @@ -29,6 +29,7 @@ #include "oops/access.inline.hpp" #include "oops/oop.hpp" #include "oops/weakHandle.inline.hpp" +#include "prims/resolvedMethodTable.hpp" #include "utilities/debug.hpp" #include "utilities/ostream.hpp" @@ -40,6 +41,10 @@ template <> OopStorage* WeakHandle::get_storage() { return StringTable::weak_storage(); } +template <> OopStorage* WeakHandle::get_storage() { + return ResolvedMethodTable::weak_storage(); +} + template WeakHandle WeakHandle::create(Handle obj) { assert(obj() != NULL, "no need to create weak null oop"); @@ -74,4 +79,4 @@ void WeakHandle::print_on(outputStream* st) const { // Provide instantiation. template class WeakHandle; template class WeakHandle; - +template class WeakHandle; diff --git a/src/hotspot/share/oops/weakHandle.hpp b/src/hotspot/share/oops/weakHandle.hpp index d34f6c4f91e..26df942b379 100644 --- a/src/hotspot/share/oops/weakHandle.hpp +++ b/src/hotspot/share/oops/weakHandle.hpp @@ -39,7 +39,7 @@ class OopStorage; // This is the vm version of jweak but has different GC lifetimes and policies, // depending on the type. -enum WeakHandleType { vm_class_loader_data, vm_string_table_data }; +enum WeakHandleType { vm_class_loader_data, vm_string_table_data, vm_resolved_method_table_data }; template class WeakHandle { @@ -64,6 +64,4 @@ class WeakHandle { void print_on(outputStream* st) const; }; -typedef WeakHandle ClassLoaderWeakHandle; - #endif // SHARE_OOPS_WEAKHANDLE_HPP diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp index abe6a3b0eff..b5f0cac96f9 100644 --- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp +++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp @@ -787,6 +787,12 @@ static jvmtiError check_nest_attributes(InstanceKlass* the_class, return JVMTI_ERROR_NONE; } +static bool can_add_or_delete(Method* m) { + // Compatibility mode + return (AllowRedefinitionToAddDeleteMethods && + (m->is_private() && (m->is_static() || m->is_final()))); +} + jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions( InstanceKlass* the_class, InstanceKlass* scratch_class) { @@ -992,12 +998,7 @@ jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions( break; case added: // method added, see if it is OK - new_flags = (jushort) k_new_method->access_flags().get_flags(); - if ((new_flags & JVM_ACC_PRIVATE) == 0 - // hack: private should be treated as final, but alas - || (new_flags & (JVM_ACC_FINAL|JVM_ACC_STATIC)) == 0 - ) { - // new methods must be private + if (!can_add_or_delete(k_new_method)) { return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_ADDED; } { @@ -1026,12 +1027,7 @@ jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions( break; case deleted: // method deleted, see if it is OK - old_flags = (jushort) k_old_method->access_flags().get_flags(); - if ((old_flags & JVM_ACC_PRIVATE) == 0 - // hack: private should be treated as final, but alas - || (old_flags & (JVM_ACC_FINAL|JVM_ACC_STATIC)) == 0 - ) { - // deleted methods must be private + if (!can_add_or_delete(k_old_method)) { return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_DELETED; } log_trace(redefine, class, normalize) diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp index 38fbcbf2548..aea2c93e81d 100644 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp @@ -24,223 +24,395 @@ #include "precompiled.hpp" #include "classfile/javaClasses.hpp" +#include "gc/shared/oopStorage.inline.hpp" #include "logging/log.hpp" #include "memory/allocation.hpp" #include "memory/resourceArea.hpp" #include "oops/access.inline.hpp" #include "oops/oop.inline.hpp" #include "oops/method.hpp" -#include "oops/symbol.hpp" #include "oops/weakHandle.inline.hpp" #include "prims/resolvedMethodTable.hpp" #include "runtime/handles.inline.hpp" +#include "runtime/interfaceSupport.inline.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/safepointVerifiers.hpp" -#include "utilities/hashtable.inline.hpp" +#include "runtime/timerTrace.hpp" +#include "utilities/concurrentHashTable.inline.hpp" +#include "utilities/concurrentHashTableTasks.inline.hpp" #include "utilities/macros.hpp" +// 2^24 is max size +static const size_t END_SIZE = 24; +// If a chain gets to 32 something might be wrong +static const size_t GROW_HINT = 32; -oop ResolvedMethodEntry::object() { - return literal().resolve(); -} +static const size_t ResolvedMethodTableSizeLog = 10; -oop ResolvedMethodEntry::object_no_keepalive() { - // The AS_NO_KEEPALIVE peeks at the oop without keeping it alive. - // This is dangerous in general but is okay if the loaded oop does - // not leak out past a thread transition where a safepoint can happen. - // A subsequent oop_load without AS_NO_KEEPALIVE (the object() accessor) - // keeps the oop alive before doing so. - return literal().peek(); -} - -ResolvedMethodTable::ResolvedMethodTable() - : Hashtable(_table_size, sizeof(ResolvedMethodEntry)) { } - -oop ResolvedMethodTable::lookup(int index, unsigned int hash, Method* method) { - assert_locked_or_safepoint(ResolvedMethodTable_lock); - for (ResolvedMethodEntry* p = bucket(index); p != NULL; p = p->next()) { - if (p->hash() == hash) { - - // Peek the object to check if it is the right target. - oop target = p->object_no_keepalive(); - - // The method is in the table as a target already - if (target != NULL && java_lang_invoke_ResolvedMethodName::vmtarget(target) == method) { - ResourceMark rm; - log_debug(membername, table) ("ResolvedMethod entry found for %s index %d", - method->name_and_sig_as_C_string(), index); - // The object() accessor makes sure the target object is kept alive before - // leaking out. - return p->object(); - } - } - } - return NULL; -} - -unsigned int ResolvedMethodTable::compute_hash(Method* method) { +unsigned int method_hash(const Method* method) { unsigned int name_hash = method->name()->identity_hash(); unsigned int signature_hash = method->signature()->identity_hash(); return name_hash ^ signature_hash; } - -oop ResolvedMethodTable::lookup(Method* method) { - unsigned int hash = compute_hash(method); - int index = hash_to_index(hash); - return lookup(index, hash, method); -} - -oop ResolvedMethodTable::basic_add(Method* method, Handle rmethod_name) { - assert_locked_or_safepoint(ResolvedMethodTable_lock); - - unsigned int hash = compute_hash(method); - int index = hash_to_index(hash); - - // One was added while aquiring the lock - oop entry = lookup(index, hash, method); - if (entry != NULL) { - return entry; +class ResolvedMethodTableConfig : public ResolvedMethodTableHash::BaseConfig { + private: + public: + static uintx get_hash(WeakHandle const& value, + bool* is_dead) { + EXCEPTION_MARK; + oop val_oop = value.peek(); + if (val_oop == NULL) { + *is_dead = true; + return 0; + } + *is_dead = false; + Method* method = java_lang_invoke_ResolvedMethodName::vmtarget(val_oop); + return method_hash(method); + } + + // We use default allocation/deallocation but counted + static void* allocate_node(size_t size, WeakHandle const& value) { + ResolvedMethodTable::item_added(); + return ResolvedMethodTableHash::BaseConfig::allocate_node(size, value); + } + static void free_node(void* memory, WeakHandle const& value) { + value.release(); + ResolvedMethodTableHash::BaseConfig::free_node(memory, value); + ResolvedMethodTable::item_removed(); + } +}; + +ResolvedMethodTableHash* ResolvedMethodTable::_local_table = NULL; +size_t ResolvedMethodTable::_current_size = (size_t)1 << ResolvedMethodTableSizeLog; + +OopStorage* ResolvedMethodTable::_weak_handles = NULL; + +volatile bool ResolvedMethodTable::_has_work = false; +volatile size_t ResolvedMethodTable::_items_count = 0; +volatile size_t ResolvedMethodTable::_uncleaned_items_count = 0; + +void ResolvedMethodTable::create_table() { + _local_table = new ResolvedMethodTableHash(ResolvedMethodTableSizeLog, END_SIZE, GROW_HINT); + _weak_handles = new OopStorage("ResolvedMethodTable weak", + ResolvedMethodTableWeakAlloc_lock, + ResolvedMethodTableWeakActive_lock); + log_trace(membername, table)("Start size: " SIZE_FORMAT " (" SIZE_FORMAT ")", + _current_size, ResolvedMethodTableSizeLog); +} + +size_t ResolvedMethodTable::table_size() { + return (size_t)1 << _local_table->get_size_log2(Thread::current()); +} + +class ResolvedMethodTableLookup : StackObj { + private: + Thread* _thread; + uintx _hash; + const Method* _method; + Handle _found; + + public: + ResolvedMethodTableLookup(Thread* thread, uintx hash, const Method* key) + : _thread(thread), _hash(hash), _method(key) { + } + uintx get_hash() const { + return _hash; + } + bool equals(WeakHandle* value, bool* is_dead) { + oop val_oop = value->peek(); + if (val_oop == NULL) { + // dead oop, mark this hash dead for cleaning + *is_dead = true; + return false; + } + bool equals = _method == java_lang_invoke_ResolvedMethodName::vmtarget(val_oop); + if (!equals) { + return false; + } + // Need to resolve weak handle and Handleize through possible safepoint. + _found = Handle(_thread, value->resolve()); + return true; + } +}; + + +class ResolvedMethodGet : public StackObj { + Thread* _thread; + const Method* _method; + Handle _return; +public: + ResolvedMethodGet(Thread* thread, const Method* method) : _thread(thread), _method(method) {} + void operator()(WeakHandle* val) { + oop result = val->resolve(); + assert(result != NULL, "Result should be reachable"); + _return = Handle(_thread, result); + log_get(); + } + oop get_res_oop() { + return _return(); + } + void log_get() { + LogTarget(Trace, membername, table) log; + if (log.is_enabled()) { + ResourceMark rm; + log.print("ResolvedMethod entry found for %s", + _method->name_and_sig_as_C_string()); + } + } +}; + +oop ResolvedMethodTable::find_method(const Method* method) { + Thread* thread = Thread::current(); + + ResolvedMethodTableLookup lookup(thread, method_hash(method), method); + ResolvedMethodGet rmg(thread, method); + _local_table->get(thread, lookup, rmg); + + return rmg.get_res_oop(); +} + +static void log_insert(const Method* method) { + LogTarget(Debug, membername, table) log; + if (log.is_enabled()) { + ResourceMark rm; + log_debug(membername, table) ("ResolvedMethod entry added for %s", + method->name_and_sig_as_C_string()); + } +} + +oop ResolvedMethodTable::add_method(const Method* method, Handle rmethod_name) { + Thread* thread = Thread::current(); + + ResolvedMethodTableLookup lookup(thread, method_hash(method), method); + ResolvedMethodGet rmg(thread, method); + + while (true) { + if (_local_table->get(thread, lookup, rmg)) { + return rmg.get_res_oop(); + } + WeakHandle wh = WeakHandle::create(rmethod_name); + // The hash table takes ownership of the WeakHandle, even if it's not inserted. + if (_local_table->insert(thread, lookup, wh)) { + log_insert(method); + return wh.resolve(); + } } - ClassLoaderWeakHandle w = ClassLoaderWeakHandle::create(rmethod_name); - ResolvedMethodEntry* p = (ResolvedMethodEntry*) Hashtable::new_entry(hash, w); - Hashtable::add_entry(index, p); - ResourceMark rm; - log_debug(membername, table) ("ResolvedMethod entry added for %s index %d", - method->name_and_sig_as_C_string(), index); return rmethod_name(); } -ResolvedMethodTable* ResolvedMethodTable::_the_table = NULL; - -oop ResolvedMethodTable::find_method(Method* method) { - MutexLocker ml(ResolvedMethodTable_lock); - oop entry = _the_table->lookup(method); - return entry; +void ResolvedMethodTable::item_added() { + Atomic::inc(&_items_count); } -oop ResolvedMethodTable::add_method(const methodHandle& m, Handle resolved_method_name) { - MutexLocker ml(ResolvedMethodTable_lock); - DEBUG_ONLY(NoSafepointVerifier nsv); +void ResolvedMethodTable::item_removed() { + Atomic::dec(&_items_count); + log_trace(membername, table) ("ResolvedMethod entry removed"); +} - Method* method = m(); - // Check if method has been redefined while taking out ResolvedMethodTable_lock, if so - // use new method in the ResolvedMethodName. The old method won't be deallocated - // yet because it's passed in as a Handle. - if (method->is_old()) { - method = (method->is_deleted()) ? Universe::throw_no_such_method_error() : - method->get_new_method(); - java_lang_invoke_ResolvedMethodName::set_vmtarget(resolved_method_name(), method); +bool ResolvedMethodTable::has_work() { + return _has_work; +} + +OopStorage* ResolvedMethodTable::weak_storage() { + return _weak_handles; +} + +double ResolvedMethodTable::get_load_factor() { + return (double)_items_count/_current_size; +} + +double ResolvedMethodTable::get_dead_factor() { + return (double)_uncleaned_items_count/_current_size; +} + +static const double PREF_AVG_LIST_LEN = 2.0; +// If we have as many dead items as 50% of the number of bucket +static const double CLEAN_DEAD_HIGH_WATER_MARK = 0.5; + +void ResolvedMethodTable::check_concurrent_work() { + if (_has_work) { + return; } - // Set flag in class to indicate this InstanceKlass has entries in the table - // to avoid walking table during redefinition if none of the redefined classes - // have any membernames in the table. - method->method_holder()->set_has_resolved_methods(); - - return _the_table->basic_add(method, resolved_method_name); + double load_factor = get_load_factor(); + double dead_factor = get_dead_factor(); + // We should clean/resize if we have more dead than alive, + // more items than preferred load factor or + // more dead items than water mark. + if ((dead_factor > load_factor) || + (load_factor > PREF_AVG_LIST_LEN) || + (dead_factor > CLEAN_DEAD_HIGH_WATER_MARK)) { + log_debug(membername, table)("Concurrent work triggered, live factor: %g dead factor: %g", + load_factor, dead_factor); + trigger_concurrent_work(); + } } -// Removing entries -int ResolvedMethodTable::_total_oops_removed = 0; - -// There are no dead entries at start -bool ResolvedMethodTable::_dead_entries = false; - -void ResolvedMethodTable::trigger_cleanup() { +void ResolvedMethodTable::trigger_concurrent_work() { MutexLockerEx ml(Service_lock, Mutex::_no_safepoint_check_flag); - _dead_entries = true; + _has_work = true; Service_lock->notify_all(); } -// Serially invoke removed unused oops from the table. -// This is done by the ServiceThread after being notified on class unloading -void ResolvedMethodTable::unlink() { - MutexLocker ml(ResolvedMethodTable_lock); - int _oops_removed = 0; - int _oops_counted = 0; - for (int i = 0; i < _the_table->table_size(); ++i) { - ResolvedMethodEntry** p = _the_table->bucket_addr(i); - ResolvedMethodEntry* entry = _the_table->bucket(i); - while (entry != NULL) { - _oops_counted++; - oop l = entry->object_no_keepalive(); - if (l != NULL) { - p = entry->next_addr(); - } else { - // Entry has been removed. - _oops_removed++; - if (log_is_enabled(Debug, membername, table)) { - log_debug(membername, table) ("ResolvedMethod entry removed for index %d", i); - } - entry->literal().release(); - *p = entry->next(); - _the_table->free_entry(entry); - } - // get next entry - entry = (ResolvedMethodEntry*)HashtableEntry::make_ptr(*p); - } +void ResolvedMethodTable::do_concurrent_work(JavaThread* jt) { + _has_work = false; + double load_factor = get_load_factor(); + log_debug(membername, table)("Concurrent work, live factor: %g", load_factor); + // We prefer growing, since that also removes dead items + if (load_factor > PREF_AVG_LIST_LEN && !_local_table->is_max_size_reached()) { + grow(jt); + } else { + clean_dead_entries(jt); } - log_debug(membername, table) ("ResolvedMethod entries counted %d removed %d", - _oops_counted, _oops_removed); - _total_oops_removed += _oops_removed; - _dead_entries = false; } -#ifndef PRODUCT -void ResolvedMethodTable::print() { - MutexLocker ml(ResolvedMethodTable_lock); - for (int i = 0; i < table_size(); ++i) { - ResolvedMethodEntry* entry = bucket(i); - while (entry != NULL) { - tty->print("%d : ", i); - oop rmethod_name = entry->object_no_keepalive(); - if (rmethod_name != NULL) { - rmethod_name->print(); - Method* m = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(rmethod_name); - m->print(); +void ResolvedMethodTable::grow(JavaThread* jt) { + ResolvedMethodTableHash::GrowTask gt(_local_table); + if (!gt.prepare(jt)) { + return; + } + log_trace(membername, table)("Started to grow"); + { + TraceTime timer("Grow", TRACETIME_LOG(Debug, membername, table, perf)); + while (gt.do_task(jt)) { + gt.pause(jt); + { + ThreadBlockInVM tbivm(jt); } - entry = entry->next(); + gt.cont(jt); } } + gt.done(jt); + _current_size = table_size(); + log_info(membername, table)("Grown to size:" SIZE_FORMAT, _current_size); +} + +struct ResolvedMethodTableDoDelete : StackObj { + void operator()(WeakHandle* val) { + /* do nothing */ + } +}; + +struct ResolvedMethodTableDeleteCheck : StackObj { + long _count; + long _item; + ResolvedMethodTableDeleteCheck() : _count(0), _item(0) {} + bool operator()(WeakHandle* val) { + ++_item; + oop tmp = val->peek(); + if (tmp == NULL) { + ++_count; + return true; + } else { + return false; + } + } +}; + +void ResolvedMethodTable::clean_dead_entries(JavaThread* jt) { + ResolvedMethodTableHash::BulkDeleteTask bdt(_local_table); + if (!bdt.prepare(jt)) { + return; + } + ResolvedMethodTableDeleteCheck stdc; + ResolvedMethodTableDoDelete stdd; + { + TraceTime timer("Clean", TRACETIME_LOG(Debug, membername, table, perf)); + while(bdt.do_task(jt, stdc, stdd)) { + bdt.pause(jt); + { + ThreadBlockInVM tbivm(jt); + } + bdt.cont(jt); + } + bdt.done(jt); + } + log_info(membername, table)("Cleaned %ld of %ld", stdc._count, stdc._item); +} +void ResolvedMethodTable::reset_dead_counter() { + _uncleaned_items_count = 0; +} + +void ResolvedMethodTable::inc_dead_counter(size_t ndead) { + size_t total = Atomic::add(ndead, &_uncleaned_items_count); + log_trace(membername, table)( + "Uncleaned items:" SIZE_FORMAT " added: " SIZE_FORMAT " total:" SIZE_FORMAT, + _uncleaned_items_count, ndead, total); +} + +// After the parallel walk this method must be called to trigger +// cleaning. Note it might trigger a resize instead. +void ResolvedMethodTable::finish_dead_counter() { + check_concurrent_work(); } -#endif // PRODUCT #if INCLUDE_JVMTI +class AdjustMethodEntries : public StackObj { + bool* _trace_name_printed; +public: + AdjustMethodEntries(bool* trace_name_printed) : _trace_name_printed(trace_name_printed) {}; + bool operator()(WeakHandle* entry) { + oop mem_name = entry->peek(); + if (mem_name == NULL) { + // Removed + return true; + } + + Method* old_method = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(mem_name); + + if (old_method->is_old()) { + + Method* new_method = (old_method->is_deleted()) ? + Universe::throw_no_such_method_error() : + old_method->get_new_method(); + java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, new_method); + + ResourceMark rm; + if (!(*_trace_name_printed)) { + log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name()); + *_trace_name_printed = true; + } + log_debug(redefine, class, update, constantpool) + ("ResolvedMethod method update: %s(%s)", + new_method->name()->as_C_string(), new_method->signature()->as_C_string()); + } + + return true; + } +}; + // It is called at safepoint only for RedefineClasses void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) { assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint"); // For each entry in RMT, change to new method - for (int i = 0; i < _the_table->table_size(); ++i) { - for (ResolvedMethodEntry* entry = _the_table->bucket(i); - entry != NULL; - entry = entry->next()) { - - oop mem_name = entry->object_no_keepalive(); - // except ones removed - if (mem_name == NULL) { - continue; - } - Method* old_method = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(mem_name); - - if (old_method->is_old()) { - - Method* new_method = (old_method->is_deleted()) ? - Universe::throw_no_such_method_error() : - old_method->get_new_method(); - java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, new_method); - - ResourceMark rm; - if (!(*trace_name_printed)) { - log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name()); - *trace_name_printed = true; - } - log_debug(redefine, class, update, constantpool) - ("ResolvedMethod method update: %s(%s)", - new_method->name()->as_C_string(), new_method->signature()->as_C_string()); - } - } - } + AdjustMethodEntries adjust(trace_name_printed); + _local_table->do_safepoint_scan(adjust); } #endif // INCLUDE_JVMTI + +// Verification +class VerifyResolvedMethod : StackObj { + public: + bool operator()(WeakHandle* val) { + oop obj = val->peek(); + if (obj != NULL) { + Method* method = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(obj); + guarantee(method->is_method(), "Must be"); + guarantee(!method->is_old(), "Must be"); + } + return true; + }; +}; + +size_t ResolvedMethodTable::items_count() { + return _items_count; +} + +void ResolvedMethodTable::verify() { + VerifyResolvedMethod vcs; + if (!_local_table->try_scan(Thread::current(), vcs)) { + log_info(membername, table)("verify unavailable at this moment"); + } +} diff --git a/src/hotspot/share/prims/resolvedMethodTable.hpp b/src/hotspot/share/prims/resolvedMethodTable.hpp index 85c7ac5add0..f7bf176ad66 100644 --- a/src/hotspot/share/prims/resolvedMethodTable.hpp +++ b/src/hotspot/share/prims/resolvedMethodTable.hpp @@ -25,89 +25,78 @@ #ifndef SHARE_PRIMS_RESOLVEDMETHODTABLE_HPP #define SHARE_PRIMS_RESOLVEDMETHODTABLE_HPP +#include "gc/shared/oopStorage.hpp" +#include "gc/shared/oopStorageParState.hpp" +#include "memory/allocation.hpp" #include "oops/symbol.hpp" #include "oops/weakHandle.hpp" +#include "utilities/concurrentHashTable.hpp" #include "utilities/hashtable.hpp" -// Hashtable to record Method* used in ResolvedMethods, via. ResolvedMethod oops. -// This is needed for redefinition to replace Method* with redefined versions. +class ResolvedMethodTable; +class ResolvedMethodTableConfig; +typedef ConcurrentHashTable, ResolvedMethodTableConfig, mtClass> ResolvedMethodTableHash; -// Entry in a ResolvedMethodTable, mapping a ClassLoaderWeakHandle for a single oop of -// java_lang_invoke_ResolvedMethodName which holds JVM Method* in vmtarget. +class ResolvedMethodTable : public AllStatic { + static ResolvedMethodTableHash* _local_table; + static size_t _current_size; -class ResolvedMethodEntry : public HashtableEntry { - public: - ResolvedMethodEntry* next() const { - return (ResolvedMethodEntry*)HashtableEntry::next(); - } + static OopStorage* _weak_handles; - ResolvedMethodEntry** next_addr() { - return (ResolvedMethodEntry**)HashtableEntry::next_addr(); - } + static volatile bool _has_work; - oop object(); - oop object_no_keepalive(); - - void print_on(outputStream* st) const; -}; - -class ResolvedMethodTable : public Hashtable { - enum Constants { - _table_size = 1007 - }; - - static int _total_oops_removed; - - static bool _dead_entries; - - static ResolvedMethodTable* _the_table; -private: - ResolvedMethodEntry* bucket(int i) { - return (ResolvedMethodEntry*) Hashtable::bucket(i); - } - - ResolvedMethodEntry** bucket_addr(int i) { - return (ResolvedMethodEntry**) Hashtable::bucket_addr(i); - } - - unsigned int compute_hash(Method* method); - - // need not be locked; no state change - oop lookup(int index, unsigned int hash, Method* method); - oop lookup(Method* method); - - // must be done under ResolvedMethodTable_lock - oop basic_add(Method* method, Handle rmethod_name); + static volatile size_t _items_count; + static volatile size_t _uncleaned_items_count; public: - ResolvedMethodTable(); + // Initialization + static void create_table(); - static void create_table() { - assert(_the_table == NULL, "One symbol table allowed."); - _the_table = new ResolvedMethodTable(); - } + static size_t table_size(); - // Called from java_lang_invoke_ResolvedMethodName - static oop find_method(Method* method); - static oop add_method(const methodHandle& method, Handle rmethod_name); + // Lookup and inserts + static oop find_method(const Method* method); + static oop add_method(const Method* method, Handle rmethod_name); - static bool has_work() { return _dead_entries; } - static void trigger_cleanup(); + // Callbacks + static void item_added(); + static void item_removed(); - static int removed_entries_count() { return _total_oops_removed; }; + // Cleaning + static bool has_work(); -#if INCLUDE_JVMTI - // It is called at safepoint only for RedefineClasses - static void adjust_method_entries(bool * trace_name_printed); -#endif // INCLUDE_JVMTI + // GC Support - Backing storage for the oop*s + static OopStorage* weak_storage(); - // Cleanup cleared entries - static void unlink(); + // Cleaning and table management -#ifndef PRODUCT - void print(); -#endif - void verify(); + static double get_load_factor(); + static double get_dead_factor(); + + static void check_concurrent_work(); + static void trigger_concurrent_work(); + static void do_concurrent_work(JavaThread* jt); + + static void grow(JavaThread* jt); + static void clean_dead_entries(JavaThread* jt); + + // GC Notification + + // Must be called before a parallel walk where objects might die. + static void reset_dead_counter(); + // After the parallel walk this method must be called to trigger + // cleaning. Note it might trigger a resize instead. + static void finish_dead_counter(); + // If GC uses ParState directly it should add the number of cleared + // entries to this method. + static void inc_dead_counter(size_t ndead); + + // JVMTI Support - It is called at safepoint only for RedefineClasses + JVMTI_ONLY(static void adjust_method_entries(bool * trace_name_printed);) + + // Debugging + static size_t items_count(); + static void verify(); }; #endif // SHARE_PRIMS_RESOLVEDMETHODTABLE_HPP diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp index 98d18b77f43..53c86598aac 100644 --- a/src/hotspot/share/prims/whitebox.cpp +++ b/src/hotspot/share/prims/whitebox.cpp @@ -2092,8 +2092,8 @@ WB_ENTRY(void, WB_DisableElfSectionCache(JNIEnv* env)) #endif WB_END -WB_ENTRY(jint, WB_ResolvedMethodRemovedCount(JNIEnv* env, jobject o)) - return (jint) ResolvedMethodTable::removed_entries_count(); +WB_ENTRY(jlong, WB_ResolvedMethodItemsCount(JNIEnv* env, jobject o)) + return (jlong) ResolvedMethodTable::items_count(); WB_END WB_ENTRY(jint, WB_ProtectionDomainRemovedCount(JNIEnv* env, jobject o)) @@ -2337,7 +2337,7 @@ static JNINativeMethod methods[] = { {CC"isContainerized", CC"()Z", (void*)&WB_IsContainerized }, {CC"printOsInfo", CC"()V", (void*)&WB_PrintOsInfo }, {CC"disableElfSectionCache", CC"()V", (void*)&WB_DisableElfSectionCache }, - {CC"resolvedMethodRemovedCount", CC"()I", (void*)&WB_ResolvedMethodRemovedCount }, + {CC"resolvedMethodItemsCount", CC"()J", (void*)&WB_ResolvedMethodItemsCount }, {CC"protectionDomainRemovedCount", CC"()I", (void*)&WB_ProtectionDomainRemovedCount }, {CC"aotLibrariesCount", CC"()I", (void*)&WB_AotLibrariesCount }, }; diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index 18d9f7663fb..854c5908bad 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -271,17 +271,25 @@ static bool match_option(const JavaVMOption* option, const char** names, const c } #if INCLUDE_JFR +static bool _has_jfr_option = false; // is using JFR + // return true on failure static bool match_jfr_option(const JavaVMOption** option) { assert((*option)->optionString != NULL, "invariant"); char* tail = NULL; if (match_option(*option, "-XX:StartFlightRecording", (const char**)&tail)) { + _has_jfr_option = true; return Jfr::on_start_flight_recording_option(option, tail); } else if (match_option(*option, "-XX:FlightRecorderOptions", (const char**)&tail)) { + _has_jfr_option = true; return Jfr::on_flight_recorder_option(option, tail); } return false; } + +bool Arguments::has_jfr_option() { + return _has_jfr_option; +} #endif static void logOption(const char* opt) { @@ -532,6 +540,7 @@ static SpecialFlag const special_jvm_flags[] = { { "FailOverToOldVerifier", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::undefined() }, { "AllowJNIEnvProxy", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) }, { "ThreadLocalHandshakes", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) }, + { "AllowRedefinitionToAddDeleteMethods", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() }, // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in: { "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp index e8e10d32ea9..25c87aac329 100644 --- a/src/hotspot/share/runtime/arguments.hpp +++ b/src/hotspot/share/runtime/arguments.hpp @@ -649,6 +649,8 @@ class Arguments : AllStatic { static bool check_unsupported_cds_runtime_properties() NOT_CDS_RETURN0; static bool atojulong(const char *s, julong* result); + + static bool has_jfr_option() NOT_JFR_RETURN_(false); }; // Disable options not supported in this release, with a warning if they diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index 44cd98dca5a..1a98bcfd886 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -978,6 +978,10 @@ define_pd_global(uint64_t,MaxRAM, 1ULL*G); product(bool, VerifyMergedCPBytecodes, true, \ "Verify bytecodes after RedefineClasses constant pool merging") \ \ + product(bool, AllowRedefinitionToAddDeleteMethods, false, \ + "Allow redefinition to add and delete private static or " \ + "final methods for compatibility with old releases") \ + \ develop(bool, TraceBytecodes, false, \ "Trace bytecode execution") \ \ diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp index 014c95268f5..054fd30d2ef 100644 --- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp +++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp @@ -422,30 +422,6 @@ class RuntimeHistogramElement : public HistogramElement { /* begin of body */ -// Definitions for IRT (Interpreter Runtime) -// (thread is an argument passed in to all these routines) - -#define IRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ - VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - -#define IRT_LEAF(result_type, header) \ - result_type header { \ - VM_LEAF_BASE(result_type, header) \ - debug_only(NoSafepointVerifier __nspv(true);) - - -#define IRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ - VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - -#define IRT_END } - #define JRT_ENTRY(result_type, header) \ result_type header { \ ThreadInVMfromJava __tiv(thread); \ diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp index a53681e1111..d79994a1fe5 100644 --- a/src/hotspot/share/runtime/mutexLocker.cpp +++ b/src/hotspot/share/runtime/mutexLocker.cpp @@ -54,7 +54,8 @@ Mutex* StringTableWeakActive_lock = NULL; Mutex* JNIHandleBlockFreeList_lock = NULL; Mutex* VMWeakAlloc_lock = NULL; Mutex* VMWeakActive_lock = NULL; -Mutex* ResolvedMethodTable_lock = NULL; +Mutex* ResolvedMethodTableWeakAlloc_lock = NULL; +Mutex* ResolvedMethodTableWeakActive_lock = NULL; Mutex* JmethodIdCreation_lock = NULL; Mutex* JfieldIdCreation_lock = NULL; Monitor* JNICritical_lock = NULL; @@ -212,6 +213,9 @@ void mutex_init() { def(StringTableWeakAlloc_lock , PaddedMutex , vmweak, true, Monitor::_safepoint_check_never); def(StringTableWeakActive_lock , PaddedMutex , vmweak-1, true, Monitor::_safepoint_check_never); + def(ResolvedMethodTableWeakAlloc_lock , PaddedMutex , vmweak, true, Monitor::_safepoint_check_never); + def(ResolvedMethodTableWeakActive_lock , PaddedMutex , vmweak-1, true, Monitor::_safepoint_check_never); + if (UseConcMarkSweepGC || UseG1GC) { def(FullGCCount_lock , PaddedMonitor, leaf, true, Monitor::_safepoint_check_never); // in support of ExplicitGCInvokesConcurrent } @@ -298,7 +302,6 @@ void mutex_init() { def(Heap_lock , PaddedMonitor, nonleaf+1, false, Monitor::_safepoint_check_sometimes); def(JfieldIdCreation_lock , PaddedMutex , nonleaf+1, true, Monitor::_safepoint_check_always); // jfieldID, Used in VM_Operation - def(ResolvedMethodTable_lock , PaddedMutex , nonleaf+1, false, Monitor::_safepoint_check_always); // Used to protect ResolvedMethodTable def(CompiledIC_lock , PaddedMutex , nonleaf+2, false, Monitor::_safepoint_check_never); // locks VtableStubs_lock, InlineCacheBuffer_lock def(CompileTaskAlloc_lock , PaddedMutex , nonleaf+2, true, Monitor::_safepoint_check_always); diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp index f85ad674223..83a9e961962 100644 --- a/src/hotspot/share/runtime/mutexLocker.hpp +++ b/src/hotspot/share/runtime/mutexLocker.hpp @@ -48,7 +48,8 @@ extern Mutex* StringTableWeakActive_lock; // STringTable weak storage act extern Mutex* JNIHandleBlockFreeList_lock; // a lock on the JNI handle block free list extern Mutex* VMWeakAlloc_lock; // VM Weak Handles storage allocate list lock extern Mutex* VMWeakActive_lock; // VM Weak Handles storage active list lock -extern Mutex* ResolvedMethodTable_lock; // a lock on the ResolvedMethodTable updates +extern Mutex* ResolvedMethodTableWeakAlloc_lock; // ResolvedMethodTable weak storage allocate list +extern Mutex* ResolvedMethodTableWeakActive_lock; // ResolvedMethodTable weak storage active list extern Mutex* JmethodIdCreation_lock; // a lock on creating JNI method identifiers extern Mutex* JfieldIdCreation_lock; // a lock on creating JNI static field identifiers extern Monitor* JNICritical_lock; // a lock used while entering and exiting JNI critical regions, allows GC to sometimes get in diff --git a/src/hotspot/share/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp index ec126289ad6..82f0859019a 100644 --- a/src/hotspot/share/runtime/serviceThread.cpp +++ b/src/hotspot/share/runtime/serviceThread.cpp @@ -190,7 +190,7 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) { } if (resolved_method_table_work) { - ResolvedMethodTable::unlink(); + ResolvedMethodTable::do_concurrent_work(jt); } if (protection_domain_table_work) { diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp index 2758a86916a..989c5e9b260 100644 --- a/src/hotspot/share/runtime/sharedRuntime.cpp +++ b/src/hotspot/share/runtime/sharedRuntime.cpp @@ -1918,7 +1918,7 @@ bool SharedRuntime::should_fixup_call_destination(address destination, address e // where we went int -> i2c -> c2i and so the caller could in fact be // interpreted. If the caller is compiled we attempt to patch the caller // so he no longer calls into the interpreter. -IRT_LEAF(void, SharedRuntime::fixup_callers_callsite(Method* method, address caller_pc)) +JRT_LEAF(void, SharedRuntime::fixup_callers_callsite(Method* method, address caller_pc)) Method* moop(method); address entry_point = moop->from_compiled_entry_no_trampoline(); @@ -1987,7 +1987,7 @@ IRT_LEAF(void, SharedRuntime::fixup_callers_callsite(Method* method, address cal } } } -IRT_END +JRT_END // same as JVM_Arraycopy, but called directly from compiled code diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp index 1eb11c03e52..b6d36f72688 100644 --- a/src/hotspot/share/runtime/thread.hpp +++ b/src/hotspot/share/runtime/thread.hpp @@ -1415,7 +1415,7 @@ class JavaThread: public Thread { // Whenever a thread transitions from native to vm/java it must suspend // if external|deopt suspend is present. bool is_suspend_after_native() const { - return (_suspend_flags & (_external_suspend | _deopt_suspend)) != 0; + return (_suspend_flags & (_external_suspend | _deopt_suspend JFR_ONLY(| _trace_flag))) != 0; } // external suspend request is completed diff --git a/src/hotspot/share/runtime/threadSMR.cpp b/src/hotspot/share/runtime/threadSMR.cpp index 391eb0fa13f..95ce2933842 100644 --- a/src/hotspot/share/runtime/threadSMR.cpp +++ b/src/hotspot/share/runtime/threadSMR.cpp @@ -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 @@ -590,12 +590,9 @@ ThreadsList *ThreadsList::add_thread(ThreadsList *list, JavaThread *java_thread) } void ThreadsList::dec_nested_handle_cnt() { - // The decrement needs to be MO_ACQ_REL. At the moment, the Atomic::dec - // backend on PPC does not yet conform to these requirements. Therefore - // the decrement is simulated with an Atomic::sub(1, &addr). - // Without this MO_ACQ_REL Atomic::dec simulation, the nested SMR mechanism - // is not generally safe to use. - Atomic::sub(1, &_nested_handle_cnt); + // The decrement only needs to be MO_ACQ_REL since the reference + // counter is volatile (and the hazard ptr is already NULL). + Atomic::dec(&_nested_handle_cnt); } int ThreadsList::find_index_of_JavaThread(JavaThread *target) { @@ -626,19 +623,9 @@ JavaThread* ThreadsList::find_JavaThread_from_java_tid(jlong java_tid) const { } void ThreadsList::inc_nested_handle_cnt() { - // The increment needs to be MO_SEQ_CST. At the moment, the Atomic::inc - // backend on PPC does not yet conform to these requirements. Therefore - // the increment is simulated with a load phi; cas phi + 1; loop. - // Without this MO_SEQ_CST Atomic::inc simulation, the nested SMR mechanism - // is not generally safe to use. - intx sample = OrderAccess::load_acquire(&_nested_handle_cnt); - for (;;) { - if (Atomic::cmpxchg(sample + 1, &_nested_handle_cnt, sample) == sample) { - return; - } else { - sample = OrderAccess::load_acquire(&_nested_handle_cnt); - } - } + // The increment needs to be MO_SEQ_CST so that the reference counter + // update is seen before the subsequent hazard ptr update. + Atomic::inc(&_nested_handle_cnt); } bool ThreadsList::includes(const JavaThread * const p) const { diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp index 983117935a7..c0696ea5291 100644 --- a/src/hotspot/share/utilities/macros.hpp +++ b/src/hotspot/share/utilities/macros.hpp @@ -279,8 +279,10 @@ #if INCLUDE_JFR #define JFR_ONLY(code) code +#define NOT_JFR_RETURN_(code) /* next token must be ; */ #else #define JFR_ONLY(code) +#define NOT_JFR_RETURN_(code) { return code; } #endif #ifndef INCLUDE_JVMCI diff --git a/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java b/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java index 56533ed50aa..cd1bd22481e 100644 --- a/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java +++ b/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java @@ -25,15 +25,16 @@ package jdk.internal.platform.cgroupv1; -import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.stream.Stream; +import jdk.internal.platform.cgroupv1.SubSystem.MemorySubSystem; + public class Metrics implements jdk.internal.platform.Metrics { - private SubSystem memory; + private MemorySubSystem memory; private SubSystem cpu; private SubSystem cpuacct; private SubSystem cpuset; @@ -133,7 +134,7 @@ public class Metrics implements jdk.internal.platform.Metrics { for (String subsystemName: subsystemNames) { switch (subsystemName) { case "memory": - metric.setMemorySubSystem(new SubSystem(mountentry[3], mountentry[4])); + metric.setMemorySubSystem(new MemorySubSystem(mountentry[3], mountentry[4])); break; case "cpuset": metric.setCpuSetSubSystem(new SubSystem(mountentry[3], mountentry[4])); @@ -195,6 +196,11 @@ public class Metrics implements jdk.internal.platform.Metrics { if (subsystem != null) { subsystem.setPath(base); + if (subsystem instanceof MemorySubSystem) { + MemorySubSystem memorySubSystem = (MemorySubSystem)subsystem; + boolean isHierarchial = getHierarchical(memorySubSystem); + memorySubSystem.setHierarchical(isHierarchial); + } metric.setActiveSubSystems(); } if (subsystem2 != null) { @@ -203,6 +209,11 @@ public class Metrics implements jdk.internal.platform.Metrics { } + private static boolean getHierarchical(MemorySubSystem subsystem) { + long hierarchical = SubSystem.getLongValue(subsystem, "memory.use_hierarchy"); + return hierarchical > 0; + } + private void setActiveSubSystems() { activeSubSystems = true; } @@ -211,7 +222,7 @@ public class Metrics implements jdk.internal.platform.Metrics { return activeSubSystems; } - private void setMemorySubSystem(SubSystem memory) { + private void setMemorySubSystem(MemorySubSystem memory) { this.memory = memory; } @@ -366,9 +377,29 @@ public class Metrics implements jdk.internal.platform.Metrics { public long getMemoryLimit() { long retval = SubSystem.getLongValue(memory, "memory.limit_in_bytes"); + if (retval > unlimited_minimum) { + if (memory.isHierarchical()) { + // memory.limit_in_bytes returned unlimited, attempt + // hierarchical memory limit + String match = "hierarchical_memory_limit"; + retval = SubSystem.getLongValueMatchingLine(memory, + "memory.stat", + match, + Metrics::convertHierachicalLimitLine); + } + } return retval > unlimited_minimum ? -1L : retval; } + public static long convertHierachicalLimitLine(String line) { + String[] tokens = line.split("\\s"); + if (tokens.length == 2) { + String strVal = tokens[1]; + return SubSystem.convertStringToLong(strVal); + } + return unlimited_minimum + 1; // unlimited + } + public long getMemoryMaxUsage() { return SubSystem.getLongValue(memory, "memory.max_usage_in_bytes"); } @@ -417,6 +448,17 @@ public class Metrics implements jdk.internal.platform.Metrics { public long getMemoryAndSwapLimit() { long retval = SubSystem.getLongValue(memory, "memory.memsw.limit_in_bytes"); + if (retval > unlimited_minimum) { + if (memory.isHierarchical()) { + // memory.memsw.limit_in_bytes returned unlimited, attempt + // hierarchical memory limit + String match = "hierarchical_memsw_limit"; + retval = SubSystem.getLongValueMatchingLine(memory, + "memory.stat", + match, + Metrics::convertHierachicalLimitLine); + } + } return retval > unlimited_minimum ? -1L : retval; } diff --git a/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java b/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java index 6cdca87459c..503a80f82ed 100644 --- a/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java +++ b/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java @@ -29,10 +29,11 @@ import java.io.BufferedReader; import java.io.IOException; import java.math.BigInteger; import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.List; import java.util.Optional; +import java.util.function.Function; import java.util.stream.Stream; public class SubSystem { @@ -99,10 +100,32 @@ public class SubSystem { } + public static long getLongValueMatchingLine(SubSystem subsystem, + String param, + String match, + Function conversion) { + long retval = Metrics.unlimited_minimum + 1; // default unlimited + try { + List lines = Files.readAllLines(Paths.get(subsystem.path(), param)); + for (String line: lines) { + if (line.contains(match)) { + retval = conversion.apply(line); + break; + } + } + } catch (IOException e) { + // Ignore. Default is unlimited. + } + return retval; + } + public static long getLongValue(SubSystem subsystem, String parm) { String strval = getStringValue(subsystem, parm); - long retval = 0; + return convertStringToLong(strval); + } + public static long convertStringToLong(String strval) { + long retval = 0; if (strval == null) return 0L; try { @@ -215,4 +238,22 @@ public class SubSystem { return ints; } + + public static class MemorySubSystem extends SubSystem { + + private boolean hierarchical; + + public MemorySubSystem(String root, String mountPoint) { + super(root, mountPoint); + } + + boolean isHierarchical() { + return hierarchical; + } + + void setHierarchical(boolean hierarchical) { + this.hierarchical = hierarchical; + } + + } } diff --git a/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java b/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java index a9c99453217..64a94d7d0e7 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java @@ -263,13 +263,13 @@ public final class RSACipher extends CipherSpi { throw new InvalidKeyException("Unknown mode: " + opmode); } RSAKey rsaKey = RSAKeyFactory.toRSAKey(key); - if (key instanceof RSAPublicKey) { + if (rsaKey instanceof RSAPublicKey) { mode = encrypt ? MODE_ENCRYPT : MODE_VERIFY; - publicKey = (RSAPublicKey)key; + publicKey = (RSAPublicKey)rsaKey; privateKey = null; } else { // must be RSAPrivateKey per check in toRSAKey mode = encrypt ? MODE_SIGN : MODE_DECRYPT; - privateKey = (RSAPrivateKey)key; + privateKey = (RSAPrivateKey)rsaKey; publicKey = null; } int n = RSACore.getByteLength(rsaKey.getModulus()); diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java index 6b267775374..31292ae122c 100644 --- a/src/java.base/share/classes/java/lang/Class.java +++ b/src/java.base/share/classes/java/lang/Class.java @@ -277,8 +277,7 @@ public final class Class implements java.io.Serializable, .collect(Collectors.joining(",", "<", ">"))); } - for (int i = 0; i < arrayDepth; i++) - sb.append("[]"); + if (arrayDepth > 0) sb.append("[]".repeat(arrayDepth)); return sb.toString(); } @@ -1589,12 +1588,7 @@ public final class Class implements java.io.Serializable, dimensions++; cl = cl.getComponentType(); } while (cl.isArray()); - StringBuilder sb = new StringBuilder(); - sb.append(cl.getName()); - for (int i = 0; i < dimensions; i++) { - sb.append("[]"); - } - return sb.toString(); + return cl.getName() + "[]".repeat(dimensions); } catch (Throwable e) { /*FALLTHRU*/ } } return getName(); @@ -3418,15 +3412,12 @@ public final class Class implements java.io.Serializable, * Helper method to get the method name from arguments. */ private String methodToString(String name, Class[] argTypes) { - StringBuilder sb = new StringBuilder(); - sb.append(getName() + "." + name + "("); - if (argTypes != null) { - sb.append(Arrays.stream(argTypes) - .map(c -> (c == null) ? "null" : c.getName()) - .collect(Collectors.joining(","))); - } - sb.append(")"); - return sb.toString(); + return getName() + '.' + name + + ((argTypes == null || argTypes.length == 0) ? + "()" : + Arrays.stream(argTypes) + .map(c -> c == null ? "null" : c.getName()) + .collect(Collectors.joining(",", "(", ")"))); } /** use serialVersionUID from JDK 1.1 for interoperability */ diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java index 2c0b4295985..79af2ea7e7f 100644 --- a/src/java.base/share/classes/java/lang/String.java +++ b/src/java.base/share/classes/java/lang/String.java @@ -1965,20 +1965,7 @@ public final class String if (str.isEmpty()) { return this; } - if (coder() == str.coder()) { - byte[] val = this.value; - byte[] oval = str.value; - int len = val.length + oval.length; - byte[] buf = Arrays.copyOf(val, len); - System.arraycopy(oval, 0, buf, val.length, oval.length); - return new String(buf, coder); - } - int len = length(); - int olen = str.length(); - byte[] buf = StringUTF16.newBytesFor(len + olen); - getBytes(buf, 0, UTF16); - str.getBytes(buf, len, UTF16); - return new String(buf, UTF16); + return StringConcatHelper.simpleConcat(this, str); } /** diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java index 242d54af4ce..469e17cd428 100644 --- a/src/java.base/share/classes/java/lang/StringConcatHelper.java +++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java @@ -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,6 +25,9 @@ package java.lang; +import jdk.internal.misc.Unsafe; +import jdk.internal.vm.annotation.ForceInline; + /** * Helper for string concatenation. These methods are mostly looked up with private lookups * from {@link java.lang.invoke.StringConcatFactory}, and used in {@link java.lang.invoke.MethodHandle} @@ -38,8 +41,10 @@ final class StringConcatHelper { /** * Check for overflow, throw exception on overflow. - * @param lengthCoder String length and coder - * @return lengthCoder + * + * @param lengthCoder String length with coder packed into higher bits + * the upper word. + * @return the given parameter value, if valid */ private static long checkOverflow(long lengthCoder) { if ((int)lengthCoder >= 0) { @@ -50,76 +55,83 @@ final class StringConcatHelper { /** * Mix value length and coder into current length and coder. - * @param current current length - * @param value value to mix in - * @return new length and coder + * @param lengthCoder String length with coder packed into higher bits + * the upper word. + * @param value value to mix in + * @return new length and coder */ - static long mix(long current, boolean value) { - return checkOverflow(current + (value ? 4 : 5)); + static long mix(long lengthCoder, boolean value) { + return checkOverflow(lengthCoder + (value ? 4 : 5)); } /** * Mix value length and coder into current length and coder. - * @param current current length - * @param value value to mix in - * @return new length and coder + * @param lengthCoder String length with coder packed into higher bits + * the upper word. + * @param value value to mix in + * @return new length and coder */ - static long mix(long current, byte value) { - return mix(current, (int)value); + static long mix(long lengthCoder, byte value) { + return mix(lengthCoder, (int)value); } /** * Mix value length and coder into current length and coder. - * @param current current length - * @param value value to mix in - * @return new length and coder + * @param lengthCoder String length with coder packed into higher bits + * the upper word. + * @param value value to mix in + * @return new length and coder */ - static long mix(long current, char value) { - return checkOverflow(current + 1) | (StringLatin1.canEncode(value) ? 0 : UTF16); + static long mix(long lengthCoder, char value) { + return checkOverflow(lengthCoder + 1) | (StringLatin1.canEncode(value) ? 0 : UTF16); } /** * Mix value length and coder into current length and coder. - * @param current current length - * @param value value to mix in - * @return new length and coder + * @param lengthCoder String length with coder packed into higher bits + * the upper word. + * @param value value to mix in + * @return new length and coder */ - static long mix(long current, short value) { - return mix(current, (int)value); + static long mix(long lengthCoder, short value) { + return mix(lengthCoder, (int)value); } /** * Mix value length and coder into current length and coder. - * @param current current length - * @param value value to mix in - * @return new length and coder + * @param lengthCoder String length with coder packed into higher bits + * the upper word. + * @param value value to mix in + * @return new length and coder */ - static long mix(long current, int value) { - return checkOverflow(current + Integer.stringSize(value)); + static long mix(long lengthCoder, int value) { + return checkOverflow(lengthCoder + Integer.stringSize(value)); } /** * Mix value length and coder into current length and coder. - * @param current current length - * @param value value to mix in - * @return new length and coder + * @param lengthCoder String length with coder packed into higher bits + * the upper word. + * @param value value to mix in + * @return new length and coder */ - static long mix(long current, long value) { - return checkOverflow(current + Long.stringSize(value)); + static long mix(long lengthCoder, long value) { + return checkOverflow(lengthCoder + Long.stringSize(value)); } /** * Mix value length and coder into current length and coder. - * @param current current length - * @param value value to mix in - * @return new length and coder + * @param lengthCoder String length with coder packed into higher bits + * the upper word. + * @param value value to mix in + * @return new length and coder */ - static long mix(long current, String value) { - current += value.length(); + static long mix(long lengthCoder, String value) { + lengthCoder += value.length(); if (value.coder() == String.UTF16) { - current |= UTF16; + lengthCoder |= UTF16; } - return checkOverflow(current); + return checkOverflow(lengthCoder); } /** @@ -285,10 +297,62 @@ final class StringConcatHelper { } } + /** + * Perform a simple concatenation between two objects. Added for startup + * performance, but also demonstrates the code that would be emitted by + * {@code java.lang.invoke.StringConcatFactory$MethodHandleInlineCopyStrategy} + * for two Object arguments. + * + * @param first first argument + * @param second second argument + * @return String resulting string + */ + @ForceInline + static String simpleConcat(Object first, Object second) { + String s1 = stringOf(first); + String s2 = stringOf(second); + // start "mixing" in length and coder or arguments, order is not + // important + long indexCoder = mix(initialCoder(), s2); + indexCoder = mix(indexCoder, s1); + byte[] buf = newArray(indexCoder); + // prepend each argument in reverse order, since we prepending + // from the end of the byte array + indexCoder = prepend(indexCoder, buf, s2); + indexCoder = prepend(indexCoder, buf, s1); + return newString(buf, indexCoder); + } + + /** + * We need some additional conversion for Objects in general, because + * {@code String.valueOf(Object)} may return null. String conversion rules + * in Java state we need to produce "null" String in this case, so we + * provide a customized version that deals with this problematic corner case. + */ + static String stringOf(Object value) { + String s; + return (value == null || (s = value.toString()) == null) ? "null" : s; + } + private static final long LATIN1 = (long)String.LATIN1 << 32; private static final long UTF16 = (long)String.UTF16 << 32; + private static final Unsafe UNSAFE = Unsafe.getUnsafe(); + + /** + * Allocates an uninitialized byte array based on the length and coder information + * in indexCoder + * @param indexCoder + * @return the newly allocated byte array + */ + @ForceInline + static byte[] newArray(long indexCoder) { + byte coder = (byte)(indexCoder >> 32); + int index = (int)indexCoder; + return (byte[]) UNSAFE.allocateUninitializedArray(byte.class, index << coder); + } + /** * Provides the initial coder for the String. * @return initial coder, adjusted into the upper half diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java index 56abaf873f8..f8e39fe0afb 100644 --- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java +++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java @@ -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 @@ -26,6 +26,7 @@ package java.lang.invoke; import jdk.internal.misc.Unsafe; +import jdk.internal.misc.VM; import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.Label; import jdk.internal.org.objectweb.asm.MethodVisitor; @@ -191,6 +192,8 @@ public final class StringConcatFactory { */ private static final ProxyClassesDumper DUMPER; + private static final Class STRING_HELPER; + static { // In case we need to double-back onto the StringConcatFactory during this // static initialization, make sure we have the reasonable defaults to complete @@ -202,15 +205,20 @@ public final class StringConcatFactory { // DEBUG = false; // implied // DUMPER = null; // implied - Properties props = GetPropertyAction.privilegedGetProperties(); + try { + STRING_HELPER = Class.forName("java.lang.StringConcatHelper"); + } catch (Throwable e) { + throw new AssertionError(e); + } + final String strategy = - props.getProperty("java.lang.invoke.stringConcat"); + VM.getSavedProperty("java.lang.invoke.stringConcat"); CACHE_ENABLE = Boolean.parseBoolean( - props.getProperty("java.lang.invoke.stringConcat.cache")); + VM.getSavedProperty("java.lang.invoke.stringConcat.cache")); DEBUG = Boolean.parseBoolean( - props.getProperty("java.lang.invoke.stringConcat.debug")); + VM.getSavedProperty("java.lang.invoke.stringConcat.debug")); final String dumpPath = - props.getProperty("java.lang.invoke.stringConcat.dumpClasses"); + VM.getSavedProperty("java.lang.invoke.stringConcat.dumpClasses"); STRATEGY = (strategy == null) ? DEFAULT_STRATEGY : Strategy.valueOf(strategy); CACHE = CACHE_ENABLE ? new ConcurrentHashMap<>() : null; @@ -1519,6 +1527,33 @@ public final class StringConcatFactory { static MethodHandle generate(MethodType mt, Recipe recipe) throws Throwable { + // Fast-path two-argument Object + Object concatenations + if (recipe.getElements().size() == 2) { + // Two object arguments + if (mt.parameterCount() == 2 && + !mt.parameterType(0).isPrimitive() && + !mt.parameterType(1).isPrimitive()) { + return SIMPLE; + } + // One element is a constant + if (mt.parameterCount() == 1 && !mt.parameterType(0).isPrimitive()) { + MethodHandle mh = SIMPLE; + // Insert constant element + + // First recipe element is a constant + if (recipe.getElements().get(0).getTag() == TAG_CONST && + recipe.getElements().get(1).getTag() != TAG_CONST) { + return MethodHandles.insertArguments(mh, 0, + recipe.getElements().get(0).getValue()); + } else if (recipe.getElements().get(1).getTag() == TAG_CONST && + recipe.getElements().get(0).getTag() != TAG_CONST) { + return MethodHandles.insertArguments(mh, 1, + recipe.getElements().get(1).getValue()); + } + // else... fall-through to slow-path + } + } + // Create filters and obtain filtered parameter types. Filters would be used in the beginning // to convert the incoming arguments into the arguments we can process (e.g. Objects -> Strings). // The filtered argument type list is used all over in the combinators below. @@ -1626,13 +1661,6 @@ public final class StringConcatFactory { return mh; } - @ForceInline - private static byte[] newArray(long indexCoder) { - byte coder = (byte)(indexCoder >> 32); - int index = (int)indexCoder; - return (byte[]) UNSAFE.allocateUninitializedArray(byte.class, index << coder); - } - private static MethodHandle prepender(Class cl) { return PREPENDERS.computeIfAbsent(cl, PREPEND); } @@ -1659,16 +1687,15 @@ public final class StringConcatFactory { } }; + private static final MethodHandle SIMPLE; private static final MethodHandle NEW_STRING; private static final MethodHandle NEW_ARRAY; private static final ConcurrentMap, MethodHandle> PREPENDERS; private static final ConcurrentMap, MethodHandle> MIXERS; private static final long INITIAL_CODER; - static final Class STRING_HELPER; static { try { - STRING_HELPER = Class.forName("java.lang.StringConcatHelper"); MethodHandle initCoder = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "initialCoder", long.class); INITIAL_CODER = (long) initCoder.invoke(); } catch (Throwable e) { @@ -1678,8 +1705,9 @@ public final class StringConcatFactory { PREPENDERS = new ConcurrentHashMap<>(); MIXERS = new ConcurrentHashMap<>(); + SIMPLE = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "simpleConcat", String.class, Object.class, Object.class); NEW_STRING = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "newString", String.class, byte[].class, long.class); - NEW_ARRAY = lookupStatic(Lookup.IMPL_LOOKUP, MethodHandleInlineCopyStrategy.class, "newArray", byte[].class, long.class); + NEW_ARRAY = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "newArray", byte[].class, long.class); } } @@ -1692,22 +1720,8 @@ public final class StringConcatFactory { // no instantiation } - private static class ObjectStringifier { - - // We need some additional conversion for Objects in general, because String.valueOf(Object) - // may return null. String conversion rules in Java state we need to produce "null" String - // in this case, so we provide a customized version that deals with this problematic corner case. - private static String valueOf(Object value) { - String s; - return (value == null || (s = value.toString()) == null) ? "null" : s; - } - - // Could have used MethodHandles.lookup() instead of Lookup.IMPL_LOOKUP, if not for the fact - // java.lang.invoke Lookups are explicitly forbidden to be retrieved using that API. - private static final MethodHandle INSTANCE = - lookupStatic(Lookup.IMPL_LOOKUP, ObjectStringifier.class, "valueOf", String.class, Object.class); - - } + private static final MethodHandle OBJECT_INSTANCE = + lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "stringOf", String.class, Object.class); private static class FloatStringifiers { private static final MethodHandle FLOAT_INSTANCE = @@ -1751,7 +1765,7 @@ public final class StringConcatFactory { */ static MethodHandle forMost(Class t) { if (!t.isPrimitive()) { - return ObjectStringifier.INSTANCE; + return OBJECT_INSTANCE; } else if (t == float.class) { return FloatStringifiers.FLOAT_INSTANCE; } else if (t == double.class) { diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java index 626400da27d..4c44a5e1808 100644 --- a/src/java.base/share/classes/java/math/BigDecimal.java +++ b/src/java.base/share/classes/java/math/BigDecimal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -3414,9 +3414,32 @@ public class BigDecimal extends Number implements Comparable { */ @Override public long longValue(){ - return (intCompact != INFLATED && scale == 0) ? - intCompact: - toBigInteger().longValue(); + if (intCompact != INFLATED && scale == 0) { + return intCompact; + } else { + // Fastpath zero and small values + if (this.signum() == 0 || fractionOnly() || + // Fastpath very large-scale values that will result + // in a truncated value of zero. If the scale is -64 + // or less, there are at least 64 powers of 10 in the + // value of the numerical result. Since 10 = 2*5, in + // that case there would also be 64 powers of 2 in the + // result, meaning all 64 bits of a long will be zero. + scale <= -64) { + return 0; + } else { + return toBigInteger().longValue(); + } + } + } + + /** + * Return true if a nonzero BigDecimal has an absolute value less + * than one; i.e. only has fraction digits. + */ + private boolean fractionOnly() { + assert this.signum() != 0; + return (this.precision() - this.scale) <= 0; } /** @@ -3434,15 +3457,20 @@ public class BigDecimal extends Number implements Comparable { public long longValueExact() { if (intCompact != INFLATED && scale == 0) return intCompact; + + // Fastpath zero + if (this.signum() == 0) + return 0; + + // Fastpath numbers less than 1.0 (the latter can be very slow + // to round if very small) + if (fractionOnly()) + throw new ArithmeticException("Rounding necessary"); + // If more than 19 digits in integer part it cannot possibly fit if ((precision() - scale) > 19) // [OK for negative scale too] throw new java.lang.ArithmeticException("Overflow"); - // Fastpath zero and < 1.0 numbers (the latter can be very slow - // to round if very small) - if (this.signum() == 0) - return 0; - if ((this.precision() - this.scale) <= 0) - throw new ArithmeticException("Rounding necessary"); + // round to an integer, with Exception if decimal part non-0 BigDecimal num = this.setScale(0, ROUND_UNNECESSARY); if (num.precision() >= 19) // need to check carefully @@ -3486,7 +3514,7 @@ public class BigDecimal extends Number implements Comparable { public int intValue() { return (intCompact != INFLATED && scale == 0) ? (int)intCompact : - toBigInteger().intValue(); + (int)longValue(); } /** diff --git a/src/java.base/share/classes/java/nio/channels/FileChannel.java b/src/java.base/share/classes/java/nio/channels/FileChannel.java index 055cbfc7dad..dd2a6686fc6 100644 --- a/src/java.base/share/classes/java/nio/channels/FileChannel.java +++ b/src/java.base/share/classes/java/nio/channels/FileChannel.java @@ -791,7 +791,7 @@ public abstract class FileChannel // -- Memory-mapped buffers -- /** - * A typesafe enumeration for file-mapping modes. + * A file-mapping mode. * * @since 1.4 * @@ -819,6 +819,12 @@ public abstract class FileChannel private final String name; + /** + * Constructs an instance of this class. This constructor may be used + * by code in java.base to create file mapping modes beyond the file + * mapping modes defined here. + * @param name the name of the map mode + */ private MapMode(String name) { this.name = name; } @@ -837,8 +843,8 @@ public abstract class FileChannel /** * Maps a region of this channel's file directly into memory. * - *

    A region of a file may be mapped into memory in one of three modes: - *

    + *

    The {@code mode} parameter specifies how the region of the file is + * mapped and may be one of the following modes: * *

      * @@ -859,6 +865,8 @@ public abstract class FileChannel * *
    * + *

    An implementation may support additional map modes. + * *

    For a read-only mapping, this channel must have been opened for * reading; for a read/write or private mapping, this channel must have * been opened for both reading and writing. @@ -892,7 +900,8 @@ public abstract class FileChannel * MapMode#READ_WRITE READ_WRITE}, or {@link MapMode#PRIVATE * PRIVATE} defined in the {@link MapMode} class, according to * whether the file is to be mapped read-only, read/write, or - * privately (copy-on-write), respectively + * privately (copy-on-write), respectively, or an implementation + * specific map mode * * @param position * The position within the file at which the mapped region @@ -905,25 +914,29 @@ public abstract class FileChannel * @return The mapped byte buffer * * @throws NonReadableChannelException - * If the {@code mode} is {@link MapMode#READ_ONLY READ_ONLY} but - * this channel was not opened for reading + * If the {@code mode} is {@link MapMode#READ_ONLY READ_ONLY} or + * an implementation specific map mode requiring read access + * but this channel was not opened for reading * * @throws NonWritableChannelException - * If the {@code mode} is {@link MapMode#READ_WRITE READ_WRITE} or - * {@link MapMode#PRIVATE PRIVATE} but this channel was not opened - * for both reading and writing + * If the {@code mode} is {@link MapMode#READ_WRITE READ_WRITE}. + * {@link MapMode#PRIVATE PRIVATE} or an implementation specific + * map mode requiring write access but this channel was not + * opened for both reading and writing * * @throws IllegalArgumentException * If the preconditions on the parameters do not hold * + * @throws UnsupportedOperationException + * If an unsupported map mode is specified + * * @throws IOException * If some other I/O error occurs * * @see java.nio.channels.FileChannel.MapMode * @see java.nio.MappedByteBuffer */ - public abstract MappedByteBuffer map(MapMode mode, - long position, long size) + public abstract MappedByteBuffer map(MapMode mode, long position, long size) throws IOException; diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java index 226e4ebf010..7a522885e12 100644 --- a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java +++ b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java @@ -154,6 +154,8 @@ public final class JapaneseEra * The singleton instance for the 'Reiwa' era (2019-05-01 - ) * which has the value 3. The end date of this era is not specified, unless * the Japanese Government defines it. + * + * @since 13 */ public static final JapaneseEra REIWA = new JapaneseEra(3, LocalDate.of(2019, 5, 1)); diff --git a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java index 85f5c834712..777cab24ea8 100644 --- a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java +++ b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java @@ -940,14 +940,15 @@ public class FileChannelImpl if (size > Integer.MAX_VALUE) throw new IllegalArgumentException("Size exceeds Integer.MAX_VALUE"); - int imode = -1; + int imode; if (mode == MapMode.READ_ONLY) imode = MAP_RO; else if (mode == MapMode.READ_WRITE) imode = MAP_RW; else if (mode == MapMode.PRIVATE) imode = MAP_PV; - assert (imode >= 0); + else + throw new UnsupportedOperationException(); if ((mode != MapMode.READ_ONLY) && !writable) throw new NonWritableChannelException(); if (!readable) diff --git a/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java b/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java index eedf00480aa..c9c69864867 100644 --- a/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java +++ b/src/java.base/share/classes/sun/nio/cs/StreamDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, 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 @@ -28,10 +28,20 @@ package sun.nio.cs; -import java.io.*; -import java.nio.*; -import java.nio.channels.*; -import java.nio.charset.*; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.io.Reader; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.channels.FileChannel; +import java.nio.channels.ReadableByteChannel; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.CoderResult; +import java.nio.charset.CodingErrorAction; +import java.nio.charset.IllegalCharsetNameException; public class StreamDecoder extends Reader { @@ -190,8 +200,11 @@ public class StreamDecoder extends Reader synchronized (lock) { if (closed) return; - implClose(); - closed = true; + try { + implClose(); + } finally { + closed = true; + } } } diff --git a/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java b/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java index ccf3c63dbd0..a84ca81f2b0 100644 --- a/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java +++ b/src/java.base/share/classes/sun/nio/cs/StreamEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, 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,15 +23,21 @@ * questions. */ -/* - */ - package sun.nio.cs; -import java.io.*; -import java.nio.*; -import java.nio.channels.*; -import java.nio.charset.*; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.io.Writer; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.channels.WritableByteChannel; +import java.nio.charset.Charset; +import java.nio.charset.CharsetEncoder; +import java.nio.charset.CoderResult; +import java.nio.charset.CodingErrorAction; +import java.nio.charset.IllegalCharsetNameException; public class StreamEncoder extends Writer { @@ -158,8 +164,11 @@ public class StreamEncoder extends Writer synchronized (lock) { if (closed) return; - implClose(); - closed = true; + try { + implClose(); + } finally { + closed = true; + } } } @@ -337,8 +346,13 @@ public class StreamEncoder extends Writer writeBytes(); if (ch != null) ch.close(); - else - out.close(); + else { + try { + out.flush(); + } finally { + out.close(); + } + } } catch (IOException x) { encoder.reset(); throw x; diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java index 3d322e05d1f..0d92cc13d04 100644 --- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java +++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java @@ -980,7 +980,7 @@ public final class SSLSocketImpl } try { - shutdownInput(false); + SSLSocketImpl.this.close(); } catch (IOException ioe) { // ignore the exception if (SSLLogger.isOn && SSLLogger.isOn("ssl")) { @@ -1146,7 +1146,7 @@ public final class SSLSocketImpl } try { - shutdownOutput(); + SSLSocketImpl.this.close(); } catch (IOException ioe) { // ignore the exception if (SSLLogger.isOn && SSLLogger.isOn("ssl")) { diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c index c1bc2e005d7..4e1abf8d205 100644 --- a/src/java.base/share/native/libjli/java.c +++ b/src/java.base/share/native/libjli/java.c @@ -204,11 +204,14 @@ static jboolean IsWildCardEnabled(); */ static jlong threadStackSize = 0; /* stack size of the new thread */ static jlong maxHeapSize = 0; /* max heap size */ -static jlong initialHeapSize = 0; /* inital heap size */ +static jlong initialHeapSize = 0; /* initial heap size */ /* - * A minimum -Xss stack size suitable for all platforms. - */ + * A minimum initial-thread stack size suitable for most platforms. + * This is the minimum amount of stack needed to load the JVM such + * that it can reject a too small -Xss value. If this is too small + * JVM initialization would cause a StackOverflowError. + */ #ifndef STACK_SIZE_MINIMUM #define STACK_SIZE_MINIMUM (64 * KB) #endif @@ -934,16 +937,18 @@ AddOption(char *str, void *info) options[numOptions].optionString = str; options[numOptions++].extraInfo = info; + /* + * -Xss is used both by the JVM and here to establish the stack size of the thread + * created to launch the JVM. In the latter case we need to ensure we don't go + * below the minimum stack size allowed. If -Xss is zero that tells the JVM to use + * 'default' sizes (either from JVM or system configuration, e.g. 'ulimit -s' on linux), + * and is not itself a small stack size that will be rejected. So we ignore -Xss0 here. + */ if (JLI_StrCCmp(str, "-Xss") == 0) { jlong tmp; if (parse_size(str + 4, &tmp)) { threadStackSize = tmp; - /* - * Make sure the thread stack size is big enough that we won't get a stack - * overflow before the JVM startup code can check to make sure the stack - * is big enough. - */ - if (threadStackSize < (jlong)STACK_SIZE_MINIMUM) { + if (threadStackSize > 0 && threadStackSize < (jlong)STACK_SIZE_MINIMUM) { threadStackSize = STACK_SIZE_MINIMUM; } } @@ -2322,38 +2327,38 @@ ContinueInNewThread(InvocationFunctions* ifn, jlong threadStackSize, int argc, char **argv, int mode, char *what, int ret) { - - /* - * If user doesn't specify stack size, check if VM has a preference. - * Note that HotSpot no longer supports JNI_VERSION_1_1 but it will - * return its default stack size through the init args structure. - */ if (threadStackSize == 0) { - struct JDK1_1InitArgs args1_1; - memset((void*)&args1_1, 0, sizeof(args1_1)); - args1_1.version = JNI_VERSION_1_1; - ifn->GetDefaultJavaVMInitArgs(&args1_1); /* ignore return value */ - if (args1_1.javaStackSize > 0) { - threadStackSize = args1_1.javaStackSize; - } + /* + * If the user hasn't specified a non-zero stack size ask the JVM for its default. + * A returned 0 means 'use the system default' for a platform, e.g., Windows. + * Note that HotSpot no longer supports JNI_VERSION_1_1 but it will + * return its default stack size through the init args structure. + */ + struct JDK1_1InitArgs args1_1; + memset((void*)&args1_1, 0, sizeof(args1_1)); + args1_1.version = JNI_VERSION_1_1; + ifn->GetDefaultJavaVMInitArgs(&args1_1); /* ignore return value */ + if (args1_1.javaStackSize > 0) { + threadStackSize = args1_1.javaStackSize; + } } { /* Create a new thread to create JVM and invoke main method */ - JavaMainArgs args; - int rslt; + JavaMainArgs args; + int rslt; - args.argc = argc; - args.argv = argv; - args.mode = mode; - args.what = what; - args.ifn = *ifn; + args.argc = argc; + args.argv = argv; + args.mode = mode; + args.what = what; + args.ifn = *ifn; - rslt = CallJavaMainInNewThread(threadStackSize, (void*)&args); - /* If the caller has deemed there is an error we - * simply return that, otherwise we return the value of - * the callee - */ - return (ret != 0) ? ret : rslt; + rslt = CallJavaMainInNewThread(threadStackSize, (void*)&args); + /* If the caller has deemed there is an error we + * simply return that, otherwise we return the value of + * the callee + */ + return (ret != 0) ? ret : rslt; } } diff --git a/src/java.base/windows/native/common/version.rc b/src/java.base/windows/native/common/version.rc index dd937aee7c2..179c220830e 100644 --- a/src/java.base/windows/native/common/version.rc +++ b/src/java.base/windows/native/common/version.rc @@ -1,5 +1,5 @@ // -// Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -55,15 +55,15 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" - VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" - VALUE "FileVersion", XSTR(JDK_VER) "\0" + VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" + VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0" + VALUE "FileVersion", XSTR(JDK_VER) "\0" VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" - VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" - VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" - VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" - VALUE "ProductName", XSTR(JDK_NAME) "\0" - VALUE "ProductVersion", XSTR(JDK_VER) "\0" + VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" + VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" + VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" + VALUE "ProductName", XSTR(JDK_NAME) "\0" + VALUE "ProductVersion", XSTR(JDK_VER) "\0" END END BLOCK "VarFileInfo" diff --git a/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java b/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java index 5ade776487a..87beca3bfb3 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java +++ b/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, 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 @@ -131,4 +131,18 @@ public interface ProcessingEnvironment { * effect */ Locale getLocale(); + + /** + * Returns {@code true} if preview features are enabled + * and {@code false} otherwise. + * @return whether or not preview features are enabled + * + * @implSpec The default implementation of this method returns + * {@code false}. + * + * @since 13 + */ + default boolean isPreviewEnabled() { + return false; + } } diff --git a/src/java.desktop/windows/native/libawt/windows/awt.rc b/src/java.desktop/windows/native/libawt/windows/awt.rc index 44f0322ff75..466595178df 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt.rc +++ b/src/java.desktop/windows/native/libawt/windows/awt.rc @@ -1,5 +1,5 @@ // -// Copyright (c) 1997, 2015, 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 @@ -65,15 +65,15 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" - VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" - VALUE "FileVersion", XSTR(JDK_VER) "\0" + VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" + VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0" + VALUE "FileVersion", XSTR(JDK_VER) "\0" VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" - VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" - VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" - VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" - VALUE "ProductName", XSTR(JDK_NAME) "\0" - VALUE "ProductVersion", XSTR(JDK_VER) "\0" + VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" + VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" + VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" + VALUE "ProductName", XSTR(JDK_NAME) "\0" + VALUE "ProductVersion", XSTR(JDK_VER) "\0" END END BLOCK "VarFileInfo" diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java index ad452918d14..5d657ec291e 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java @@ -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 @@ -103,7 +103,8 @@ class Http1Request { HttpClient client = http1Exchange.client(); // Filter overridable headers from userHeaders - userHeaders = HttpHeaders.of(userHeaders.map(), Utils.CONTEXT_RESTRICTED(client)); + userHeaders = HttpHeaders.of(userHeaders.map(), + connection.contextRestricted(request, client)); final HttpHeaders uh = userHeaders; diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java index d5edc1bf41c..ecd7950bc72 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java @@ -285,6 +285,16 @@ abstract class HttpConnection implements Closeable { } } + BiPredicate contextRestricted(HttpRequestImpl request, HttpClient client) { + if (!isTunnel() && request.isConnect()) { + // establishing a proxy tunnel + assert request.proxy() == null; + return Utils.PROXY_TUNNEL_RESTRICTED(client); + } else { + return Utils.CONTEXT_RESTRICTED(client); + } + } + // Composes a new immutable HttpHeaders that combines the // user and system header but only keeps those headers that // start with "proxy-" diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java index 611ee36e7bc..415572bd500 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java @@ -178,7 +178,12 @@ public final class Utils { ! (k.equalsIgnoreCase("Authorization") && k.equalsIgnoreCase("Proxy-Authorization")); } + private static final BiPredicate HOST_RESTRICTED = (k,v) -> !"host".equalsIgnoreCase(k); + public static final BiPredicate PROXY_TUNNEL_RESTRICTED(HttpClient client) { + return CONTEXT_RESTRICTED(client).and(HOST_RESTRICTED); + } + private static final Predicate IS_HOST = "host"::equalsIgnoreCase; private static final Predicate IS_PROXY_HEADER = (k) -> k != null && k.length() > 6 && "proxy-".equalsIgnoreCase(k.substring(0,6)); private static final Predicate NO_PROXY_HEADER = @@ -250,7 +255,8 @@ public final class Utils { public static final BiPredicate PROXY_TUNNEL_FILTER = (s,v) -> isAllowedForProxy(s, v, PROXY_AUTH_TUNNEL_DISABLED_SCHEMES, - IS_PROXY_HEADER); + // Allows Proxy-* and Host headers when establishing the tunnel. + IS_PROXY_HEADER.or(IS_HOST)); public static final BiPredicate PROXY_FILTER = (s,v) -> isAllowedForProxy(s, v, PROXY_AUTH_DISABLED_SCHEMES, ALL_HEADERS); diff --git a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java index 842d4771959..6807a328b1d 100644 --- a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java +++ b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java @@ -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 @@ -58,8 +58,24 @@ public final class RegistryImpl_Skel public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall call, int opnum, long hash) throws java.lang.Exception { - if (hash != interfaceHash) - throw new java.rmi.server.SkeletonMismatchException("interface hash mismatch"); + if (opnum < 0) { + if (hash == 7583982177005850366L) { + opnum = 0; + } else if (hash == 2571371476350237748L) { + opnum = 1; + } else if (hash == -7538657168040752697L) { + opnum = 2; + } else if (hash == -8381844669958460146L) { + opnum = 3; + } else if (hash == 7305022919901907578L) { + opnum = 4; + } else { + throw new java.rmi.UnmarshalException("invalid method hash"); + } + } else { + if (hash != interfaceHash) + throw new java.rmi.server.SkeletonMismatchException("interface hash mismatch"); + } sun.rmi.registry.RegistryImpl server = (sun.rmi.registry.RegistryImpl) obj; switch (opnum) { diff --git a/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java b/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java index 9dbaed70c59..06980f17c08 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java +++ b/src/java.rmi/share/classes/sun/rmi/server/UnicastServerRef.java @@ -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 @@ -40,6 +40,7 @@ import java.rmi.ServerError; import java.rmi.ServerException; import java.rmi.UnmarshalException; import java.rmi.server.ExportException; +import java.rmi.server.Operation; import java.rmi.server.RemoteCall; import java.rmi.server.RemoteRef; import java.rmi.server.RemoteStub; @@ -292,15 +293,14 @@ public class UnicastServerRef extends UnicastRef throw new UnmarshalException("error unmarshalling call header", readEx); } - if (num >= 0) { - if (skel != null) { + if (skel != null) { + // If there is a skeleton, use it oldDispatch(obj, call, num); return; - } else { - throw new UnmarshalException( - "skeleton class not found but required " + - "for client version"); - } + + } else if (num >= 0){ + throw new UnmarshalException( + "skeleton class not found but required for client version"); } try { op = in.readLong(); @@ -428,8 +428,8 @@ public class UnicastServerRef extends UnicastRef /** * Handle server-side dispatch using the RMI 1.1 stub/skeleton - * protocol, given a non-negative operation number that has - * already been read from the call stream. + * protocol, given a non-negative operation number or negative method hash + * that has already been read from the call stream. * Exceptions are handled by the caller to be sent to the remote client. * * @param obj the target remote object for the call @@ -461,7 +461,8 @@ public class UnicastServerRef extends UnicastRef } // if calls are being logged, write out object id and operation - logCall(obj, skel.getOperations()[op]); + Operation[] operations = skel.getOperations(); + logCall(obj, op >= 0 && op < operations.length ? operations[op] : "op: " + op); unmarshalCustomCallData(in); // dispatch to skeleton for remote object skel.dispatch(obj, call, op, hash); diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java index 5f41cafb844..38c32f1c489 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,6 +22,7 @@ package com.sun.org.apache.xerces.internal.impl ; import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader; import com.sun.org.apache.xerces.internal.impl.io.UCSReader; +import com.sun.org.apache.xerces.internal.impl.io.UTF16Reader; import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader; import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter; import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager; @@ -89,7 +90,7 @@ import org.xml.sax.InputSource; * @author K.Venugopal SUN Microsystems * @author Neeraj Bajaj SUN Microsystems * @author Sunitha Reddy SUN Microsystems - * @LastModified: Nov 2018 + * @LastModified: Apr 2019 */ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { @@ -412,9 +413,6 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { /** Augmentations for entities. */ private final Augmentations fEntityAugs = new AugmentationsImpl(); - /** Pool of character buffers. */ - private CharacterBufferPool fBufferPool = new CharacterBufferPool(fBufferSize, DEFAULT_INTERNAL_BUFFER_SIZE); - /** indicate whether Catalog should be used for resolving external resources */ private boolean fUseCatalog = true; CatalogFeatures fCatalogFeatures; @@ -694,7 +692,8 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { } // wrap this stream in RewindableInputStream - stream = new RewindableInputStream(stream); + RewindableInputStream rewindableStream = new RewindableInputStream(stream); + stream = rewindableStream; // perform auto-detect of encoding if necessary if (encoding == null) { @@ -702,27 +701,30 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { final byte[] b4 = new byte[4]; int count = 0; for (; count<4; count++ ) { - b4[count] = (byte)stream.read(); + b4[count] = (byte)rewindableStream.readAndBuffer(); } if (count == 4) { - Object [] encodingDesc = getEncodingName(b4, count); - encoding = (String)(encodingDesc[0]); - isBigEndian = (Boolean)(encodingDesc[1]); - + final EncodingInfo info = getEncodingInfo(b4, count); + encoding = info.autoDetectedEncoding; + final String readerEncoding = info.readerEncoding; + isBigEndian = info.isBigEndian; stream.reset(); - // Special case UTF-8 files with BOM created by Microsoft - // tools. It's more efficient to consume the BOM than make - // the reader perform extra checks. -Ac - if (count > 2 && encoding.equals("UTF-8")) { - int b0 = b4[0] & 0xFF; - int b1 = b4[1] & 0xFF; - int b2 = b4[2] & 0xFF; - if (b0 == 0xEF && b1 == 0xBB && b2 == 0xBF) { - // ignore first three bytes... + if (info.hasBOM) { + // Special case UTF-8 files with BOM created by Microsoft + // tools. It's more efficient to consume the BOM than make + // the reader perform extra checks. -Ac + if (EncodingInfo.STR_UTF8.equals(readerEncoding)) { + // UTF-8 BOM: 0xEF 0xBB 0xBF stream.skip(3); } + // It's also more efficient to consume the UTF-16 BOM. + else if (EncodingInfo.STR_UTF16.equals(readerEncoding)) { + // UTF-16 BE BOM: 0xFE 0xFF + // UTF-16 LE BOM: 0xFF 0xFE + stream.skip(2); + } } - reader = createReader(stream, encoding, isBigEndian); + reader = createReader(stream, readerEncoding, isBigEndian); } else { reader = createReader(stream, encoding, isBigEndian); } @@ -733,11 +735,11 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { encoding = encoding.toUpperCase(Locale.ENGLISH); // If encoding is UTF-8, consume BOM if one is present. - if (encoding.equals("UTF-8")) { + if (EncodingInfo.STR_UTF8.equals(encoding)) { final int[] b3 = new int[3]; int count = 0; for (; count < 3; ++count) { - b3[count] = stream.read(); + b3[count] = rewindableStream.readAndBuffer(); if (b3[count] == -1) break; } @@ -750,56 +752,51 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { stream.reset(); } } - // If encoding is UTF-16, we still need to read the first four bytes - // in order to discover the byte order. - else if (encoding.equals("UTF-16")) { + // If encoding is UTF-16, we still need to read the first + // four bytes, in order to discover the byte order. + else if (EncodingInfo.STR_UTF16.equals(encoding)) { final int[] b4 = new int[4]; int count = 0; for (; count < 4; ++count) { - b4[count] = stream.read(); + b4[count] = rewindableStream.readAndBuffer(); if (b4[count] == -1) break; } stream.reset(); - - String utf16Encoding = "UTF-16"; if (count >= 2) { final int b0 = b4[0]; final int b1 = b4[1]; if (b0 == 0xFE && b1 == 0xFF) { // UTF-16, big-endian - utf16Encoding = "UTF-16BE"; isBigEndian = Boolean.TRUE; + stream.skip(2); } else if (b0 == 0xFF && b1 == 0xFE) { // UTF-16, little-endian - utf16Encoding = "UTF-16LE"; isBigEndian = Boolean.FALSE; + stream.skip(2); } else if (count == 4) { final int b2 = b4[2]; final int b3 = b4[3]; if (b0 == 0x00 && b1 == 0x3C && b2 == 0x00 && b3 == 0x3F) { // UTF-16, big-endian, no BOM - utf16Encoding = "UTF-16BE"; isBigEndian = Boolean.TRUE; } if (b0 == 0x3C && b1 == 0x00 && b2 == 0x3F && b3 == 0x00) { // UTF-16, little-endian, no BOM - utf16Encoding = "UTF-16LE"; isBigEndian = Boolean.FALSE; } } } - reader = createReader(stream, utf16Encoding, isBigEndian); } // If encoding is UCS-4, we still need to read the first four bytes // in order to discover the byte order. - else if (encoding.equals("ISO-10646-UCS-4")) { + else if (EncodingInfo.STR_UCS4.equals(encoding)) { final int[] b4 = new int[4]; int count = 0; for (; count < 4; ++count) { - b4[count] = stream.read(); + b4[count] = rewindableStream.readAndBuffer(); if (b4[count] == -1) break; } @@ -819,11 +816,11 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { } // If encoding is UCS-2, we still need to read the first four bytes // in order to discover the byte order. - else if (encoding.equals("ISO-10646-UCS-2")) { + else if (EncodingInfo.STR_UCS2.equals(encoding)) { final int[] b4 = new int[4]; int count = 0; for (; count < 4; ++count) { - b4[count] = stream.read(); + b4[count] = rewindableStream.readAndBuffer(); if (b4[count] == -1) break; } @@ -1798,7 +1795,6 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { bufferSize.intValue() > DEFAULT_XMLDECL_BUFFER_SIZE) { fBufferSize = bufferSize.intValue(); fEntityScanner.setBufferSize(fBufferSize); - fBufferPool.setExternalBufferSize(fBufferSize); } } if (suffixLength == Constants.SECURITY_MANAGER_PROPERTY.length() && @@ -2425,14 +2421,12 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { * * @param b4 The first four bytes of the input. * @param count The number of bytes actually read. - * @return a 2-element array: the first element, an IANA-encoding string, - * the second element a Boolean which is true iff the document is big endian, false - * if it's little-endian, and null if the distinction isn't relevant. + * @return an instance of EncodingInfo which represents the auto-detected encoding. */ - protected Object[] getEncodingName(byte[] b4, int count) { + protected EncodingInfo getEncodingInfo(byte[] b4, int count) { if (count < 2) { - return defaultEncoding; + return EncodingInfo.UTF_8; } // UTF-16, with BOM @@ -2440,69 +2434,70 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { int b1 = b4[1] & 0xFF; if (b0 == 0xFE && b1 == 0xFF) { // UTF-16, big-endian - return new Object [] {"UTF-16BE", true}; + return EncodingInfo.UTF_16_BIG_ENDIAN_WITH_BOM; } if (b0 == 0xFF && b1 == 0xFE) { // UTF-16, little-endian - return new Object [] {"UTF-16LE", false}; + return EncodingInfo.UTF_16_LITTLE_ENDIAN_WITH_BOM; } // default to UTF-8 if we don't have enough bytes to make a // good determination of the encoding if (count < 3) { - return defaultEncoding; + return EncodingInfo.UTF_8; } // UTF-8 with a BOM int b2 = b4[2] & 0xFF; if (b0 == 0xEF && b1 == 0xBB && b2 == 0xBF) { - return defaultEncoding; + return EncodingInfo.UTF_8_WITH_BOM; } // default to UTF-8 if we don't have enough bytes to make a // good determination of the encoding if (count < 4) { - return defaultEncoding; + return EncodingInfo.UTF_8; } // other encodings int b3 = b4[3] & 0xFF; if (b0 == 0x00 && b1 == 0x00 && b2 == 0x00 && b3 == 0x3C) { // UCS-4, big endian (1234) - return new Object [] {"ISO-10646-UCS-4", true}; + return EncodingInfo.UCS_4_BIG_ENDIAN; } if (b0 == 0x3C && b1 == 0x00 && b2 == 0x00 && b3 == 0x00) { // UCS-4, little endian (4321) - return new Object [] {"ISO-10646-UCS-4", false}; + return EncodingInfo.UCS_4_LITTLE_ENDIAN; } if (b0 == 0x00 && b1 == 0x00 && b2 == 0x3C && b3 == 0x00) { // UCS-4, unusual octet order (2143) // REVISIT: What should this be? - return new Object [] {"ISO-10646-UCS-4", null}; + return EncodingInfo.UCS_4_UNUSUAL_BYTE_ORDER; } if (b0 == 0x00 && b1 == 0x3C && b2 == 0x00 && b3 == 0x00) { // UCS-4, unusual octect order (3412) // REVISIT: What should this be? - return new Object [] {"ISO-10646-UCS-4", null}; + return EncodingInfo.UCS_4_UNUSUAL_BYTE_ORDER; } if (b0 == 0x00 && b1 == 0x3C && b2 == 0x00 && b3 == 0x3F) { // UTF-16, big-endian, no BOM // (or could turn out to be UCS-2... // REVISIT: What should this be? - return new Object [] {"UTF-16BE", true}; + return EncodingInfo.UTF_16_BIG_ENDIAN; } if (b0 == 0x3C && b1 == 0x00 && b2 == 0x3F && b3 == 0x00) { // UTF-16, little-endian, no BOM // (or could turn out to be UCS-2... - return new Object [] {"UTF-16LE", false}; + return EncodingInfo.UTF_16_LITTLE_ENDIAN; } if (b0 == 0x4C && b1 == 0x6F && b2 == 0xA7 && b3 == 0x94) { // EBCDIC // a la xerces1, return CP037 instead of EBCDIC here - return new Object [] {"CP037", null}; + return EncodingInfo.EBCDIC; } - return defaultEncoding; + // default encoding + return EncodingInfo.UTF_8; } // getEncodingName(byte[],int):Object[] @@ -2517,95 +2512,95 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { * encoding name may be a Java encoding name; * otherwise, it is an ianaEncoding name. * @param isBigEndian For encodings (like uCS-4), whose names cannot - * specify a byte order, this tells whether the order is bigEndian. null menas - * unknown or not relevant. + * specify a byte order, this tells whether the order + * is bigEndian. null if unknown or irrelevant. * * @return Returns a reader. */ protected Reader createReader(InputStream inputStream, String encoding, Boolean isBigEndian) - throws IOException { + throws IOException { - // normalize encoding name - if (encoding == null) { - encoding = "UTF-8"; - } - - // try to use an optimized reader - String ENCODING = encoding.toUpperCase(Locale.ENGLISH); - if (ENCODING.equals("UTF-8")) { - if (DEBUG_ENCODINGS) { - System.out.println("$$$ creating UTF8Reader"); - } - return new UTF8Reader(inputStream, fBufferSize, fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN), fErrorReporter.getLocale() ); - } - if (ENCODING.equals("US-ASCII")) { - if (DEBUG_ENCODINGS) { - System.out.println("$$$ creating ASCIIReader"); - } - return new ASCIIReader(inputStream, fBufferSize, fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN), fErrorReporter.getLocale()); - } - if(ENCODING.equals("ISO-10646-UCS-4")) { - if(isBigEndian != null) { - boolean isBE = isBigEndian.booleanValue(); - if(isBE) { - return new UCSReader(inputStream, UCSReader.UCS4BE); - } else { - return new UCSReader(inputStream, UCSReader.UCS4LE); + String enc = (encoding != null) ? encoding : EncodingInfo.STR_UTF8; + enc = enc.toUpperCase(Locale.ENGLISH); + MessageFormatter f = fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN); + Locale l = fErrorReporter.getLocale(); + switch (enc) { + case EncodingInfo.STR_UTF8: + return new UTF8Reader(inputStream, fBufferSize, f, l); + case EncodingInfo.STR_UTF16: + if (isBigEndian != null) { + return new UTF16Reader(inputStream, fBufferSize, isBigEndian, f, l); } - } else { - fErrorReporter.reportError(this.getEntityScanner(),XMLMessageFormatter.XML_DOMAIN, - "EncodingByteOrderUnsupported", - new Object[] { encoding }, - XMLErrorReporter.SEVERITY_FATAL_ERROR); - } - } - if(ENCODING.equals("ISO-10646-UCS-2")) { - if(isBigEndian != null) { // sould never happen with this encoding... - boolean isBE = isBigEndian.booleanValue(); - if(isBE) { - return new UCSReader(inputStream, UCSReader.UCS2BE); + break; + case EncodingInfo.STR_UTF16BE: + return new UTF16Reader(inputStream, fBufferSize, true, f, l); + case EncodingInfo.STR_UTF16LE: + return new UTF16Reader(inputStream, fBufferSize, false, f, l); + case EncodingInfo.STR_UCS4: + if(isBigEndian != null) { + if(isBigEndian) { + return new UCSReader(inputStream, UCSReader.UCS4BE); + } else { + return new UCSReader(inputStream, UCSReader.UCS4LE); + } } else { - return new UCSReader(inputStream, UCSReader.UCS2LE); + fErrorReporter.reportError(this.getEntityScanner(), + XMLMessageFormatter.XML_DOMAIN, + "EncodingByteOrderUnsupported", + new Object[] { encoding }, + XMLErrorReporter.SEVERITY_FATAL_ERROR); } - } else { - fErrorReporter.reportError(this.getEntityScanner(),XMLMessageFormatter.XML_DOMAIN, - "EncodingByteOrderUnsupported", - new Object[] { encoding }, - XMLErrorReporter.SEVERITY_FATAL_ERROR); - } + break; + case EncodingInfo.STR_UCS2: + if(isBigEndian != null) { + if(isBigEndian) { + return new UCSReader(inputStream, UCSReader.UCS2BE); + } else { + return new UCSReader(inputStream, UCSReader.UCS2LE); + } + } else { + fErrorReporter.reportError(this.getEntityScanner(), + XMLMessageFormatter.XML_DOMAIN, + "EncodingByteOrderUnsupported", + new Object[] { encoding }, + XMLErrorReporter.SEVERITY_FATAL_ERROR); + } + break; } // check for valid name boolean validIANA = XMLChar.isValidIANAEncoding(encoding); boolean validJava = XMLChar.isValidJavaEncoding(encoding); if (!validIANA || (fAllowJavaEncodings && !validJava)) { - fErrorReporter.reportError(this.getEntityScanner(),XMLMessageFormatter.XML_DOMAIN, + fErrorReporter.reportError(this.getEntityScanner(), + XMLMessageFormatter.XML_DOMAIN, "EncodingDeclInvalid", new Object[] { encoding }, XMLErrorReporter.SEVERITY_FATAL_ERROR); - // NOTE: AndyH suggested that, on failure, we use ISO Latin 1 - // because every byte is a valid ISO Latin 1 character. - // It may not translate correctly but if we failed on - // the encoding anyway, then we're expecting the content - // of the document to be bad. This will just prevent an - // invalid UTF-8 sequence to be detected. This is only - // important when continue-after-fatal-error is turned - // on. -Ac + // NOTE: AndyH suggested that, on failure, we use ISO Latin 1 + // because every byte is a valid ISO Latin 1 character. + // It may not translate correctly but if we failed on + // the encoding anyway, then we're expecting the content + // of the document to be bad. This will just prevent an + // invalid UTF-8 sequence to be detected. This is only + // important when continue-after-fatal-error is turned + // on. -Ac encoding = "ISO-8859-1"; } // try to use a Java reader - String javaEncoding = EncodingMap.getIANA2JavaMapping(ENCODING); + String javaEncoding = EncodingMap.getIANA2JavaMapping(enc); if (javaEncoding == null) { - if(fAllowJavaEncodings) { + if (fAllowJavaEncodings) { javaEncoding = encoding; } else { - fErrorReporter.reportError(this.getEntityScanner(),XMLMessageFormatter.XML_DOMAIN, + fErrorReporter.reportError(this.getEntityScanner(), + XMLMessageFormatter.XML_DOMAIN, "EncodingDeclInvalid", new Object[] { encoding }, XMLErrorReporter.SEVERITY_FATAL_ERROR); - // see comment above. - javaEncoding = "ISO8859_1"; + // see comment above. + javaEncoding = "ISO8859_1"; } } if (DEBUG_ENCODINGS) { @@ -2898,108 +2893,78 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { } // print() /** - * Buffer used in entity manager to reuse character arrays instead - * of creating new ones every time. + * Information about auto-detectable encodings. * * @xerces.internal * - * @author Ankit Pasricha, IBM + * @author Michael Glavassevich, IBM */ - private static class CharacterBuffer { + private static class EncodingInfo { + public static final String STR_UTF8 = "UTF-8"; + public static final String STR_UTF16 = "UTF-16"; + public static final String STR_UTF16BE = "UTF-16BE"; + public static final String STR_UTF16LE = "UTF-16LE"; + public static final String STR_UCS4 = "ISO-10646-UCS-4"; + public static final String STR_UCS2 = "ISO-10646-UCS-2"; + public static final String STR_CP037 = "CP037"; - /** character buffer */ - private char[] ch; + /** UTF-8 **/ + public static final EncodingInfo UTF_8 = + new EncodingInfo(STR_UTF8, null, false); - /** whether the buffer is for an external or internal scanned entity */ - private boolean isExternal; + /** UTF-8, with BOM **/ + public static final EncodingInfo UTF_8_WITH_BOM = + new EncodingInfo(STR_UTF8, null, true); - public CharacterBuffer(boolean isExternal, int size) { - this.isExternal = isExternal; - ch = new char[size]; - } - } + /** UTF-16, big-endian **/ + public static final EncodingInfo UTF_16_BIG_ENDIAN = + new EncodingInfo(STR_UTF16BE, STR_UTF16, Boolean.TRUE, false); + /** UTF-16, big-endian with BOM **/ + public static final EncodingInfo UTF_16_BIG_ENDIAN_WITH_BOM = + new EncodingInfo(STR_UTF16BE, STR_UTF16, Boolean.TRUE, true); - /** - * Stores a number of character buffers and provides it to the entity - * manager to use when an entity is seen. - * - * @xerces.internal - * - * @author Ankit Pasricha, IBM - */ - private static class CharacterBufferPool { + /** UTF-16, little-endian **/ + public static final EncodingInfo UTF_16_LITTLE_ENDIAN = + new EncodingInfo(STR_UTF16LE, STR_UTF16, Boolean.FALSE, false); - private static final int DEFAULT_POOL_SIZE = 3; + /** UTF-16, little-endian with BOM **/ + public static final EncodingInfo UTF_16_LITTLE_ENDIAN_WITH_BOM = + new EncodingInfo(STR_UTF16LE, STR_UTF16, Boolean.FALSE, true); - private CharacterBuffer[] fInternalBufferPool; - private CharacterBuffer[] fExternalBufferPool; + /** UCS-4, big-endian **/ + public static final EncodingInfo UCS_4_BIG_ENDIAN = + new EncodingInfo(STR_UCS4, Boolean.TRUE, false); - private int fExternalBufferSize; - private int fInternalBufferSize; - private int poolSize; + /** UCS-4, little-endian **/ + public static final EncodingInfo UCS_4_LITTLE_ENDIAN = + new EncodingInfo(STR_UCS4, Boolean.FALSE, false); - private int fInternalTop; - private int fExternalTop; + /** UCS-4, unusual byte-order (2143) or (3412) **/ + public static final EncodingInfo UCS_4_UNUSUAL_BYTE_ORDER = + new EncodingInfo(STR_UCS4, null, false); - public CharacterBufferPool(int externalBufferSize, int internalBufferSize) { - this(DEFAULT_POOL_SIZE, externalBufferSize, internalBufferSize); - } + /** EBCDIC **/ + public static final EncodingInfo EBCDIC = new EncodingInfo(STR_CP037, null, false); - public CharacterBufferPool(int poolSize, int externalBufferSize, int internalBufferSize) { - fExternalBufferSize = externalBufferSize; - fInternalBufferSize = internalBufferSize; - this.poolSize = poolSize; - init(); - } + public final String autoDetectedEncoding; + public final String readerEncoding; + public final Boolean isBigEndian; + public final boolean hasBOM; - /** Initializes buffer pool. **/ - private void init() { - fInternalBufferPool = new CharacterBuffer[poolSize]; - fExternalBufferPool = new CharacterBuffer[poolSize]; - fInternalTop = -1; - fExternalTop = -1; - } + private EncodingInfo(String autoDetectedEncoding, Boolean isBigEndian, boolean hasBOM) { + this(autoDetectedEncoding, autoDetectedEncoding, isBigEndian, hasBOM); + } // (String,Boolean,boolean) - /** Retrieves buffer from pool. **/ - public CharacterBuffer getBuffer(boolean external) { - if (external) { - if (fExternalTop > -1) { - return fExternalBufferPool[fExternalTop--]; - } - else { - return new CharacterBuffer(true, fExternalBufferSize); - } - } - else { - if (fInternalTop > -1) { - return fInternalBufferPool[fInternalTop--]; - } - else { - return new CharacterBuffer(false, fInternalBufferSize); - } - } - } + private EncodingInfo(String autoDetectedEncoding, String readerEncoding, + Boolean isBigEndian, boolean hasBOM) { + this.autoDetectedEncoding = autoDetectedEncoding; + this.readerEncoding = readerEncoding; + this.isBigEndian = isBigEndian; + this.hasBOM = hasBOM; + } // (String,String,Boolean,boolean) - /** Returns buffer to pool. **/ - public void returnToPool(CharacterBuffer buffer) { - if (buffer.isExternal) { - if (fExternalTop < fExternalBufferPool.length - 1) { - fExternalBufferPool[++fExternalTop] = buffer; - } - } - else if (fInternalTop < fInternalBufferPool.length - 1) { - fInternalBufferPool[++fInternalTop] = buffer; - } - } - - /** Sets the size of external buffers and dumps the old pool. **/ - public void setExternalBufferSize(int bufferSize) { - fExternalBufferSize = bufferSize; - fExternalBufferPool = new CharacterBuffer[poolSize]; - fExternalTop = -1; - } - } + } // class EncodingInfo /** * This class wraps the byte inputstreams we're presented with. @@ -3052,20 +3017,13 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { fOffset = fStartOffset; } - public int read() throws IOException { - int b = 0; - if (fOffset < fLength) { - return fData[fOffset++] & 0xff; - } - if (fOffset == fEndOffset) { - return -1; - } + public int readAndBuffer() throws IOException { if (fOffset == fData.length) { byte[] newData = new byte[fOffset << 1]; System.arraycopy(fData, 0, newData, 0, fOffset); fData = newData; } - b = fInputStream.read(); + final int b = fInputStream.read(); if (b == -1) { fEndOffset = fOffset; return -1; @@ -3075,18 +3033,27 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { return b & 0xff; } + public int read() throws IOException { + if (fOffset < fLength) { + return fData[fOffset++] & 0xff; + } + if (fOffset == fEndOffset) { + return -1; + } + if (fCurrentEntity.mayReadChunks) { + return fInputStream.read(); + } + return readAndBuffer(); + } + public int read(byte[] b, int off, int len) throws IOException { - int bytesLeft = fLength - fOffset; + final int bytesLeft = fLength - fOffset; if (bytesLeft == 0) { if (fOffset == fEndOffset) { return -1; } - /** - * //System.out.println("fCurrentEntitty = " + fCurrentEntity ); - * //System.out.println("fInputStream = " + fInputStream ); - * // better get some more for the voracious reader... */ - + // read a block of data as requested if(fCurrentEntity.mayReadChunks || !fCurrentEntity.xmlDeclChunkRead) { if (!fCurrentEntity.xmlDeclChunkRead) @@ -3096,15 +3063,13 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { } return fInputStream.read(b, off, len); } - - int returnedVal = read(); - if(returnedVal == -1) { - fEndOffset = fOffset; - return -1; + int returnedVal = readAndBuffer(); + if (returnedVal == -1) { + fEndOffset = fOffset; + return -1; } b[off] = (byte)returnedVal; return 1; - } if (len < bytesLeft) { if (len <= 0) { @@ -3120,8 +3085,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { return len; } - public long skip(long n) - throws IOException { + public long skip(long n) throws IOException { int bytesLeft; if (n <= 0) { return 0; @@ -3142,7 +3106,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { return bytesLeft; } n -= bytesLeft; - /* + /* * In a manner of speaking, when this class isn't permitting more * than one byte at a time to be read, it is "blocking". The * available() method should indicate how much can be read without @@ -3154,13 +3118,13 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { } public int available() throws IOException { - int bytesLeft = fLength - fOffset; + final int bytesLeft = fLength - fOffset; if (bytesLeft == 0) { if (fOffset == fEndOffset) { return -1; } return fCurrentEntity.mayReadChunks ? fInputStream.available() - : 0; + : 0; } return bytesLeft; } @@ -3171,7 +3135,6 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { public void reset() { fOffset = fMark; - //test(); } public boolean markSupported() { diff --git a/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC b/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.rc similarity index 81% rename from src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC rename to src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.rc index 4369746ef58..9659f859740 100644 --- a/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC +++ b/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.rc @@ -138,16 +138,16 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "Java Access Bridge\0" - VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" - VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" - VALUE "FileVersion", XSTR(JDK_VER) "\0" - VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" - VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" - VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" - VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" - VALUE "ProductName", XSTR(JDK_NAME) "\0" - VALUE "ProductVersion", XSTR(JDK_VER) "\0" + VALUE "Comments", "Java Access Bridge" "\0" + VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" + VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0" + VALUE "FileVersion", XSTR(JDK_VER) "\0" + VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" + VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" + VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" + VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" + VALUE "ProductName", XSTR(JDK_NAME) "\0" + VALUE "ProductVersion", XSTR(JDK_VER) "\0" END END BLOCK "VarFileInfo" diff --git a/src/jdk.accessibility/windows/native/common/resource.h b/src/jdk.accessibility/windows/native/common/resource.h index f419f9be09a..a0231097eb5 100644 --- a/src/jdk.accessibility/windows/native/common/resource.h +++ b/src/jdk.accessibility/windows/native/common/resource.h @@ -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 @@ -25,7 +25,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by AccessBridgeStatusWindow.RC +// Used by AccessBridgeStatusWindow.rc // //#define IDB_BITMAP1 102 diff --git a/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc b/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc index d2acc17a40f..24dfeb20083 100644 --- a/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc +++ b/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspectorWindow.rc @@ -199,15 +199,15 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" - VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" - VALUE "FileVersion", XSTR(JDK_VER) "\0" + VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" + VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0" + VALUE "FileVersion", XSTR(JDK_VER) "\0" VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" - VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" - VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" - VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" - VALUE "ProductName", XSTR(JDK_NAME) "\0" - VALUE "ProductVersion", XSTR(JDK_VER) "\0" + VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" + VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" + VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" + VALUE "ProductName", XSTR(JDK_NAME) "\0" + VALUE "ProductVersion", XSTR(JDK_VER) "\0" END END BLOCK "VarFileInfo" diff --git a/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc b/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc index 7e4f62e416c..5d52708f368 100644 --- a/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc +++ b/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalkerWindow.rc @@ -164,15 +164,15 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" - VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" - VALUE "FileVersion", XSTR(JDK_VER) "\0" + VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" + VALUE "FileDescription", XSTR(JDK_FILEDESC) "\0" + VALUE "FileVersion", XSTR(JDK_VER) "\0" VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" - VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" - VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" - VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" - VALUE "ProductName", XSTR(JDK_NAME) "\0" - VALUE "ProductVersion", XSTR(JDK_VER) "\0" + VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" + VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" + VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" + VALUE "ProductName", XSTR(JDK_NAME) "\0" + VALUE "ProductVersion", XSTR(JDK_VER) "\0" END END BLOCK "VarFileInfo" diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java b/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java index 8f1c99806c6..04b4870536d 100644 --- a/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java +++ b/src/jdk.compiler/share/classes/com/sun/source/util/JavacTask.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, 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 @@ -29,6 +29,7 @@ import java.io.IOException; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; +import javax.lang.model.element.VariableElement; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; @@ -136,6 +137,27 @@ public abstract class JavacTask implements CompilationTask { */ public abstract void removeTaskListener(TaskListener taskListener); + /** + * Sets the specified {@link ParameterNameProvider}. It may be used when + * {@link VariableElement#getSimpleName()} is called for a method parameter + * for which an authoritative name is not found. The given + * {@code ParameterNameProvider} may infer a user-friendly name + * for the method parameter. + * + * Setting a new {@code ParameterNameProvider} will clear any previously set + * {@code ParameterNameProvider}, which won't be queried any more. + * + * When no {@code ParameterNameProvider} is set, or when it returns null from + * {@link ParameterNameProvider#getParameterName(javax.lang.model.element.VariableElement)}, + * an automatically synthesized name is returned from {@code VariableElement.getSimpleName()}. + * + * @implSpec The default implementation of this method does nothing. + * + * @param provider the provider. + * @since 13 + */ + public void setParameterNameProvider(ParameterNameProvider provider) {} + /** * Returns a type mirror of the tree node determined by the specified path. * This method has been superceded by methods on diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/ParameterNameProvider.java b/src/jdk.compiler/share/classes/com/sun/source/util/ParameterNameProvider.java new file mode 100644 index 00000000000..c23d382cf4b --- /dev/null +++ b/src/jdk.compiler/share/classes/com/sun/source/util/ParameterNameProvider.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. 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 com.sun.source.util; + +import javax.lang.model.element.VariableElement; + +/** + * A provider for parameter names when the parameter names are not determined from + * a reliable source, like a classfile. + * + * @since 13 + */ +public interface ParameterNameProvider { + + /** + * Infer a parameter name for the given parameter. The implementations of this method + * should infer parameter names in such a way that the parameter names are distinct + * for any given owning method. + * + * If the implementation of this method returns null, an automatically synthesized name is used. + * + * @param parameter the parameter for which the name should be inferred. + * @return a user-friendly name for the parameter, or null if unknown + */ + public CharSequence getParameterName(VariableElement parameter); + +} diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java index 094f002e343..0861412f291 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/BasicJavacTask.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,9 +43,11 @@ import javax.tools.JavaFileObject; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.Tree; import com.sun.source.util.JavacTask; +import com.sun.source.util.ParameterNameProvider; import com.sun.source.util.Plugin; import com.sun.source.util.TaskListener; import com.sun.tools.doclint.DocLint; +import com.sun.tools.javac.code.MissingInfoHandler; import com.sun.tools.javac.main.JavaCompiler; import com.sun.tools.javac.model.JavacElements; import com.sun.tools.javac.model.JavacTypes; @@ -123,6 +125,11 @@ public class BasicJavacTask extends JavacTask { mtl.remove(taskListener); } + @Override + public void setParameterNameProvider(ParameterNameProvider handler) { + MissingInfoHandler.instance(context).setDelegate(handler); + } + public Collection getTaskListeners() { MultiTaskListener mtl = MultiTaskListener.instance(context); return mtl.getTaskListeners(); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java index 1a6c5919907..79f69a674bd 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2016, 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 @@ -319,6 +319,11 @@ public class Flags { */ public static final long BODY_ONLY_FINALIZE = 1L<<17; //blocks only + /** + * Flag to indicate the given ParamSymbol has a user-friendly name filled. + */ + public static final long NAME_FILLED = 1L<<58; //ParamSymbols only + /** Modifier masks. */ public static final int @@ -435,7 +440,8 @@ public class Flags { DEPRECATED_REMOVAL(Flags.DEPRECATED_REMOVAL), HAS_RESOURCE(Flags.HAS_RESOURCE), POTENTIALLY_AMBIGUOUS(Flags.POTENTIALLY_AMBIGUOUS), - ANONCONSTR_BASED(Flags.ANONCONSTR_BASED); + ANONCONSTR_BASED(Flags.ANONCONSTR_BASED), + NAME_FILLED(Flags.NAME_FILLED); Flag(long flag) { this.value = flag; diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/MissingInfoHandler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/MissingInfoHandler.java new file mode 100644 index 00000000000..088df917df7 --- /dev/null +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/MissingInfoHandler.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. 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 com.sun.tools.javac.code; + +import com.sun.source.util.ParameterNameProvider; +import com.sun.tools.javac.code.Symbol.ParamSymbol; +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Name; +import com.sun.tools.javac.util.Names; + +/** + * A Context class, that can return additional useful information for Symbols, currently + * parameter names. It does so by calling user-supplied {@link ParameterNameProvider}. + * + *

    This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice. + */ +public class MissingInfoHandler { + protected static final Context.Key missingInfoHandlerWrapperKey = new Context.Key<>(); + + public static MissingInfoHandler instance(Context context) { + MissingInfoHandler instance = context.get(missingInfoHandlerWrapperKey); + if (instance == null) + instance = new MissingInfoHandler(context); + return instance; + } + + private final Names names; + private ParameterNameProvider parameterNameProvider; + + protected MissingInfoHandler(Context context) { + context.put(missingInfoHandlerWrapperKey, this); + names = Names.instance(context); + } + + public Name getParameterName(ParamSymbol parameter) { + if (parameterNameProvider != null) { + CharSequence name = parameterNameProvider.getParameterName(parameter); + if (name != null) { + return names.fromString(name.toString()); + } + } + + return null; + } + + public void setDelegate(ParameterNameProvider delegate) { + this.parameterNameProvider = delegate; + } +} diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java index 942c6823396..3c541e7ad17 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java @@ -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 @@ -55,6 +55,7 @@ import com.sun.tools.javac.comp.Attr; import com.sun.tools.javac.comp.AttrContext; import com.sun.tools.javac.comp.Env; import com.sun.tools.javac.jvm.*; +import com.sun.tools.javac.jvm.PoolConstant; import com.sun.tools.javac.tree.JCTree.JCFieldAccess; import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import com.sun.tools.javac.tree.JCTree.Tag; @@ -65,9 +66,12 @@ import com.sun.tools.javac.util.Name; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.*; import static com.sun.tools.javac.code.Kinds.Kind.*; +import com.sun.tools.javac.code.MissingInfoHandler; import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE; import com.sun.tools.javac.code.Scope.WriteableScope; +import com.sun.tools.javac.code.Symbol; import static com.sun.tools.javac.code.Symbol.OperatorSymbol.AccessCode.FIRSTASGOP; +import com.sun.tools.javac.code.Type; import static com.sun.tools.javac.code.TypeTag.CLASS; import static com.sun.tools.javac.code.TypeTag.FORALL; import static com.sun.tools.javac.code.TypeTag.TYPEVAR; @@ -76,6 +80,7 @@ import static com.sun.tools.javac.jvm.ByteCodes.ishll; import static com.sun.tools.javac.jvm.ByteCodes.lushrl; import static com.sun.tools.javac.jvm.ByteCodes.lxor; import static com.sun.tools.javac.jvm.ByteCodes.string_add; +import com.sun.tools.javac.util.Name; /** Root class for Java symbols. It contains subclasses * for specific sorts of symbols, such as variables, methods and operators, @@ -87,7 +92,7 @@ import static com.sun.tools.javac.jvm.ByteCodes.string_add; * This code and its internal interfaces are subject to change or * deletion without notice. */ -public abstract class Symbol extends AnnoConstruct implements Element { +public abstract class Symbol extends AnnoConstruct implements PoolConstant, Element { /** The kind of this symbol. * @see Kinds @@ -282,6 +287,11 @@ public abstract class Symbol extends AnnoConstruct implements Element { this.name = name; } + @Override + public int poolTag() { + throw new AssertionError("Invalid pool entry"); + } + /** Clone this symbol with new owner. * Legal only for fields and methods. */ @@ -967,6 +977,11 @@ public abstract class Symbol extends AnnoConstruct implements Element { this.type = new ModuleType(this); } + @Override + public int poolTag() { + return ClassFile.CONSTANT_Module; + } + @Override @DefinedBy(Api.LANGUAGE_MODEL) public Name getSimpleName() { return Convert.shortName(name); @@ -1133,6 +1148,11 @@ public abstract class Symbol extends AnnoConstruct implements Element { return members_field; } + @Override + public int poolTag() { + return ClassFile.CONSTANT_Package; + } + public long flags() { complete(); return flags_field; @@ -1189,6 +1209,16 @@ public abstract class Symbol extends AnnoConstruct implements Element { } + public static class RootPackageSymbol extends PackageSymbol { + public final MissingInfoHandler missingInfoHandler; + + public RootPackageSymbol(Name name, Symbol owner, MissingInfoHandler missingInfoHandler) { + super(name, owner); + this.missingInfoHandler = missingInfoHandler; + } + + } + /** A class for class symbols */ public static class ClassSymbol extends TypeSymbol implements TypeElement { @@ -1223,10 +1253,6 @@ public abstract class Symbol extends AnnoConstruct implements Element { */ public List trans_local; - /** the constant pool of the class - */ - public Pool pool; - /** the annotation metadata attached to this class */ private AnnotationTypeMetadata annotationTypeMetadata; @@ -1237,7 +1263,6 @@ public abstract class Symbol extends AnnoConstruct implements Element { this.flatname = formFlatName(name, owner); this.sourcefile = null; this.classfile = null; - this.pool = null; this.annotationTypeMetadata = AnnotationTypeMetadata.notAnAnnotationType(); } @@ -1529,6 +1554,11 @@ public abstract class Symbol extends AnnoConstruct implements Element { super(VAR, flags, name, type, owner); } + @Override + public int poolTag() { + return ClassFile.CONSTANT_Fieldref; + } + /** Clone this symbol with new owner. */ public VarSymbol clone(Symbol newOwner) { @@ -1537,6 +1567,11 @@ public abstract class Symbol extends AnnoConstruct implements Element { public Symbol baseSymbol() { return VarSymbol.this; } + + @Override + public Object poolKey(Types types) { + return new Pair<>(newOwner, baseSymbol()); + } }; v.pos = pos; v.adr = adr; @@ -1634,6 +1669,32 @@ public abstract class Symbol extends AnnoConstruct implements Element { } } + public static class ParamSymbol extends VarSymbol { + public ParamSymbol(long flags, Name name, Type type, Symbol owner) { + super(flags, name, type, owner); + } + + @Override + public Name getSimpleName() { + if ((flags_field & NAME_FILLED) == 0) { + flags_field |= NAME_FILLED; + Symbol rootPack = this; + while (rootPack != null && !(rootPack instanceof RootPackageSymbol)) { + rootPack = rootPack.owner; + } + if (rootPack != null) { + Name inferredName = + ((RootPackageSymbol) rootPack).missingInfoHandler.getParameterName(this); + if (inferredName != null) { + this.name = inferredName; + } + } + } + return super.getSimpleName(); + } + + } + /** A class for method symbols. */ public static class MethodSymbol extends Symbol implements ExecutableElement { @@ -1671,6 +1732,11 @@ public abstract class Symbol extends AnnoConstruct implements Element { public Symbol baseSymbol() { return MethodSymbol.this; } + + @Override + public Object poolKey(Types types) { + return new Pair<>(newOwner, baseSymbol()); + } }; m.code = code; return m; @@ -1700,10 +1766,25 @@ public abstract class Symbol extends AnnoConstruct implements Element { } } + @Override + public int poolTag() { + return owner.isInterface() ? + ClassFile.CONSTANT_InterfaceMethodref : ClassFile.CONSTANT_Methodref; + } + public boolean isDynamic() { return false; } + public boolean isHandle() { + return false; + } + + + public MethodHandleSymbol asHandle() { + return new MethodHandleSymbol(this); + } + /** find a symbol that this (proxy method) symbol implements. * @param c The class whose members are searched for * implementations @@ -1987,16 +2068,14 @@ public abstract class Symbol extends AnnoConstruct implements Element { /** A class for invokedynamic method calls. */ - public static class DynamicMethodSymbol extends MethodSymbol { + public static class DynamicMethodSymbol extends MethodSymbol implements Dynamic { - public Object[] staticArgs; - public Symbol bsm; - public int bsmKind; + public LoadableConstant[] staticArgs; + public MethodHandleSymbol bsm; - public DynamicMethodSymbol(Name name, Symbol owner, int bsmKind, MethodSymbol bsm, Type type, Object[] staticArgs) { + public DynamicMethodSymbol(Name name, Symbol owner, MethodHandleSymbol bsm, Type type, LoadableConstant[] staticArgs) { super(0, name, type, owner); this.bsm = bsm; - this.bsmKind = bsmKind; this.staticArgs = staticArgs; } @@ -2004,6 +2083,83 @@ public abstract class Symbol extends AnnoConstruct implements Element { public boolean isDynamic() { return true; } + + @Override + public LoadableConstant[] staticArgs() { + return staticArgs; + } + + @Override + public MethodHandleSymbol bootstrapMethod() { + return bsm; + } + + @Override + public int poolTag() { + return ClassFile.CONSTANT_InvokeDynamic; + } + + @Override + public Type dynamicType() { + return type; + } + } + + /** A class for method handles. + */ + public static class MethodHandleSymbol extends MethodSymbol implements LoadableConstant { + + private Symbol refSym; + + public MethodHandleSymbol(Symbol msym) { + super(msym.flags_field, msym.name, msym.type, msym.owner); + this.refSym = msym; + } + + /** + * Returns the kind associated with this method handle. + */ + public int referenceKind() { + if (refSym.isConstructor()) { + return ClassFile.REF_newInvokeSpecial; + } else { + if (refSym.isStatic()) { + return ClassFile.REF_invokeStatic; + } else if ((refSym.flags() & PRIVATE) != 0) { + return ClassFile.REF_invokeSpecial; + } else if (refSym.enclClass().isInterface()) { + return ClassFile.REF_invokeInterface; + } else { + return ClassFile.REF_invokeVirtual; + } + } + } + + @Override + public int poolTag() { + return ClassFile.CONSTANT_MethodHandle; + } + + @Override + public Object poolKey(Types types) { + return new Pair<>(baseSymbol(), referenceKind()); + } + + @Override + public MethodHandleSymbol asHandle() { + return this; + } + + @Override + public Symbol baseSymbol() { + return refSym; + } + + + @Override + public boolean isHandle() { + return true; + } } /** A class for predefined operators. diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java index f35795ecede..fd8147a8a99 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java @@ -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 @@ -42,6 +42,7 @@ import com.sun.tools.javac.code.Symbol.CompletionFailure; import com.sun.tools.javac.code.Symbol.MethodSymbol; import com.sun.tools.javac.code.Symbol.ModuleSymbol; import com.sun.tools.javac.code.Symbol.PackageSymbol; +import com.sun.tools.javac.code.Symbol.RootPackageSymbol; import com.sun.tools.javac.code.Symbol.TypeSymbol; import com.sun.tools.javac.code.Symbol.VarSymbol; import com.sun.tools.javac.code.Type.BottomType; @@ -382,7 +383,9 @@ public class Symtab { messages = JavacMessages.instance(context); - rootPackage = new PackageSymbol(names.empty, null); + MissingInfoHandler missingInfoHandler = MissingInfoHandler.instance(context); + + rootPackage = new RootPackageSymbol(names.empty, null, missingInfoHandler); // create the basic builtin symbols unnamedModule = new ModuleSymbol(names.empty, null) { diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java index 655f067d686..e92118120c4 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java @@ -36,7 +36,10 @@ import javax.lang.model.type.*; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.TypeMetadata.Entry; import com.sun.tools.javac.code.Types.TypeMapping; +import com.sun.tools.javac.code.Types.UniqueType; import com.sun.tools.javac.comp.Infer.IncorporationAction; +import com.sun.tools.javac.jvm.ClassFile; +import com.sun.tools.javac.jvm.PoolConstant; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.DefinedBy.Api; @@ -73,7 +76,7 @@ import static com.sun.tools.javac.code.TypeTag.*; * * @see TypeTag */ -public abstract class Type extends AnnoConstruct implements TypeMirror { +public abstract class Type extends AnnoConstruct implements TypeMirror, PoolConstant { /** * Type metadata, Should be {@code null} for the default value. @@ -125,6 +128,16 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { */ public TypeSymbol tsym; + @Override + public int poolTag() { + throw new AssertionError("Invalid pool entry"); + } + + @Override + public Object poolKey(Types types) { + return new UniqueType(this, types); + } + /** * Checks if the current type tag is equal to the given tag. * @return true if tag is equal to the current type tag. @@ -930,7 +943,7 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { } } - public static class ClassType extends Type implements DeclaredType, + public static class ClassType extends Type implements DeclaredType, LoadableConstant, javax.lang.model.type.ErrorType { /** The enclosing type of this type. If this is the type of an inner @@ -975,6 +988,10 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { this.interfaces_field = null; } + public int poolTag() { + return ClassFile.CONSTANT_Class; + } + @Override public ClassType cloneWithMetadata(TypeMetadata md) { return new ClassType(outer_field, typarams_field, tsym, md) { @@ -1277,7 +1294,7 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { } public static class ArrayType extends Type - implements javax.lang.model.type.ArrayType { + implements LoadableConstant, javax.lang.model.type.ArrayType { public Type elemtype; @@ -1297,6 +1314,10 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { this(that.elemtype, that.tsym, that.getMetadata()); } + public int poolTag() { + return ClassFile.CONSTANT_Class; + } + @Override public ArrayType cloneWithMetadata(TypeMetadata md) { return new ArrayType(elemtype, tsym, md) { @@ -1412,7 +1433,7 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { } } - public static class MethodType extends Type implements ExecutableType { + public static class MethodType extends Type implements ExecutableType, LoadableConstant { public List argtypes; public Type restype; @@ -1479,6 +1500,11 @@ public abstract class Type extends AnnoConstruct implements TypeMirror { restype != null && restype.isErroneous(); } + @Override + public int poolTag() { + return ClassFile.CONSTANT_MethodType; + } + public boolean contains(Type elem) { return elem.equalsIgnoreMetadata(this) || contains(argtypes, elem) || restype.contains(elem) || contains(thrown, elem); } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java index 50c174e2dd3..0fa5e1b13af 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java @@ -48,6 +48,8 @@ import com.sun.tools.javac.comp.AttrContext; import com.sun.tools.javac.comp.Check; import com.sun.tools.javac.comp.Enter; import com.sun.tools.javac.comp.Env; +import com.sun.tools.javac.comp.LambdaToMethod; +import com.sun.tools.javac.jvm.ClassFile; import com.sun.tools.javac.util.*; import static com.sun.tools.javac.code.BoundKind.*; @@ -5181,6 +5183,29 @@ public class Types { } } } + + public Type constantType(LoadableConstant c) { + switch (c.poolTag()) { + case ClassFile.CONSTANT_Class: + return syms.classType; + case ClassFile.CONSTANT_String: + return syms.stringType; + case ClassFile.CONSTANT_Integer: + return syms.intType; + case ClassFile.CONSTANT_Float: + return syms.floatType; + case ClassFile.CONSTANT_Long: + return syms.longType; + case ClassFile.CONSTANT_Double: + return syms.doubleType; + case ClassFile.CONSTANT_MethodHandle: + return syms.methodHandleType; + case ClassFile.CONSTANT_MethodType: + return syms.methodTypeType; + default: + throw new AssertionError("Not a loadable constant: " + c.poolTag()); + } + } // public void newRound() { diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java index 9ebb204bd83..6bc0036f181 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java @@ -25,7 +25,9 @@ package com.sun.tools.javac.comp; +import com.sun.tools.javac.code.Symbol.MethodHandleSymbol; import com.sun.tools.javac.code.Types.SignatureGenerator.InvalidSignatureException; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant; import com.sun.tools.javac.resources.CompilerProperties.Errors; import com.sun.tools.javac.resources.CompilerProperties.Fragments; import com.sun.tools.javac.tree.*; @@ -59,7 +61,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -70,13 +71,10 @@ import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.Kind.*; import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.tree.JCTree.Tag.*; -import static com.sun.tools.javac.jvm.Pool.DynamicMethod; import javax.lang.model.element.ElementKind; import javax.lang.model.type.TypeKind; -import com.sun.tools.javac.code.Type.IntersectionClassType; -import com.sun.tools.javac.code.Types.FunctionDescriptorLookupError; import com.sun.tools.javac.main.Option; /** @@ -214,7 +212,7 @@ public class LambdaToMethod extends TreeTranslator { private Map dedupedLambdas; - private Map dynMethSyms = new HashMap<>(); + private Map dynMethSyms = new HashMap<>(); /** * list of deserialization cases @@ -439,11 +437,8 @@ public class LambdaToMethod extends TreeTranslator { //then, determine the arguments to the indy call List indy_args = translate(syntheticInits.toList(), localContext.prev); - //build a sam instance using an indy call to the meta-factory - int refKind = referenceKind(sym); - //convert to an invokedynamic call - result = makeMetafactoryIndyCall(context, refKind, sym, indy_args); + result = makeMetafactoryIndyCall(context, sym.asHandle(), indy_args); } // where @@ -488,7 +483,7 @@ public class LambdaToMethod extends TreeTranslator { //first determine the method symbol to be used to generate the sam instance //this is either the method reference symbol, or the bridged reference symbol - Symbol refSym = tree.sym; + MethodSymbol refSym = (MethodSymbol)tree.sym; //the qualifying expression is treated as a special captured arg JCExpression init; @@ -522,7 +517,7 @@ public class LambdaToMethod extends TreeTranslator { //build a sam instance using an indy call to the meta-factory - result = makeMetafactoryIndyCall(localContext, localContext.referenceKind(), refSym, indy_args); + result = makeMetafactoryIndyCall(localContext, refSym.asHandle(), indy_args); } /** @@ -765,8 +760,8 @@ public class LambdaToMethod extends TreeTranslator { rs.resolveConstructor(null, attrEnv, ctype, TreeInfo.types(args), List.nil())); } - private void addDeserializationCase(int implMethodKind, Symbol refSym, Type targetType, MethodSymbol samSym, - DiagnosticPosition pos, List staticArgs, MethodType indyType) { + private void addDeserializationCase(MethodHandleSymbol refSym, Type targetType, MethodSymbol samSym, + DiagnosticPosition pos, List staticArgs, MethodType indyType) { String functionalInterfaceClass = classSig(targetType); String functionalInterfaceMethodName = samSym.getSimpleName().toString(); String functionalInterfaceMethodSignature = typeSig(types.erasure(samSym.type)); @@ -774,7 +769,8 @@ public class LambdaToMethod extends TreeTranslator { String implMethodName = refSym.getQualifiedName().toString(); String implMethodSignature = typeSig(types.erasure(refSym.type)); - JCExpression kindTest = eqTest(syms.intType, deserGetter("getImplMethodKind", syms.intType), make.Literal(implMethodKind)); + JCExpression kindTest = eqTest(syms.intType, deserGetter("getImplMethodKind", syms.intType), + make.Literal(refSym.referenceKind())); ListBuffer serArgs = new ListBuffer<>(); int i = 0; for (Type t : indyType.getParameterTypes()) { @@ -1106,13 +1102,13 @@ public class LambdaToMethod extends TreeTranslator { * Generate an indy method call to the meta factory */ private JCExpression makeMetafactoryIndyCall(TranslationContext context, - int refKind, Symbol refSym, List indy_args) { + MethodHandleSymbol refSym, List indy_args) { JCFunctionalExpression tree = context.tree; //determine the static bsm args MethodSymbol samSym = (MethodSymbol) types.findDescriptorSymbol(tree.target.tsym); - List staticArgs = List.of( + List staticArgs = List.of( typeToMethodType(samSym.type), - new Pool.MethodHandle(refKind, refSym, types), + ((MethodSymbol)refSym).asHandle(), typeToMethodType(tree.getDescriptorType(types))); //computed indy arg types @@ -1131,7 +1127,7 @@ public class LambdaToMethod extends TreeTranslator { names.altMetafactory : names.metafactory; if (context.needsAltMetafactory()) { - ListBuffer markers = new ListBuffer<>(); + ListBuffer markers = new ListBuffer<>(); List targets = tree.target.isIntersection() ? types.directSupertypes(tree.target) : List.nil(); @@ -1140,7 +1136,7 @@ public class LambdaToMethod extends TreeTranslator { if (t.tsym != syms.serializableType.tsym && t.tsym != tree.type.tsym && t.tsym != syms.objectType.tsym) { - markers.append(t.tsym); + markers.append(t); } } int flags = context.isSerializable() ? FLAG_SERIALIZABLE : 0; @@ -1152,17 +1148,17 @@ public class LambdaToMethod extends TreeTranslator { if (hasBridges) { flags |= FLAG_BRIDGES; } - staticArgs = staticArgs.append(flags); + staticArgs = staticArgs.append(LoadableConstant.Int(flags)); if (hasMarkers) { - staticArgs = staticArgs.append(markers.length()); - staticArgs = staticArgs.appendList(markers.toList()); + staticArgs = staticArgs.append(LoadableConstant.Int(markers.length())); + staticArgs = staticArgs.appendList(List.convert(LoadableConstant.class, markers.toList())); } if (hasBridges) { - staticArgs = staticArgs.append(context.bridges.length() - 1); + staticArgs = staticArgs.append(LoadableConstant.Int(context.bridges.length() - 1)); for (Symbol s : context.bridges) { Type s_erasure = s.erasure(types); if (!types.isSameType(s_erasure, samSym.erasure(types))) { - staticArgs = staticArgs.append(s.erasure(types)); + staticArgs = staticArgs.append(((MethodType)s.erasure(types))); } } } @@ -1170,7 +1166,7 @@ public class LambdaToMethod extends TreeTranslator { int prevPos = make.pos; try { make.at(kInfo.clazz); - addDeserializationCase(refKind, refSym, tree.type, samSym, + addDeserializationCase(refSym, tree.type, samSym, tree, staticArgs, indyType); } finally { make.at(prevPos); @@ -1186,14 +1182,14 @@ public class LambdaToMethod extends TreeTranslator { * arguments types */ private JCExpression makeIndyCall(DiagnosticPosition pos, Type site, Name bsmName, - List staticArgs, MethodType indyType, List indyArgs, - Name methName) { + List staticArgs, MethodType indyType, List indyArgs, + Name methName) { int prevPos = make.pos; try { make.at(pos); List bsm_staticArgs = List.of(syms.methodHandleLookupType, - syms.stringType, - syms.methodTypeType).appendList(bsmStaticArgToTypes(staticArgs)); + syms.stringType, + syms.methodTypeType).appendList(staticArgs.map(types::constantType)); Symbol bsm = rs.resolveInternalMethod(pos, attrEnv, site, bsmName, bsm_staticArgs, List.nil()); @@ -1201,15 +1197,12 @@ public class LambdaToMethod extends TreeTranslator { DynamicMethodSymbol dynSym = new DynamicMethodSymbol(methName, syms.noSymbol, - bsm.isStatic() ? - ClassFile.REF_invokeStatic : - ClassFile.REF_invokeVirtual, - (MethodSymbol)bsm, + ((MethodSymbol)bsm).asHandle(), indyType, - staticArgs.toArray()); + staticArgs.toArray(new LoadableConstant[staticArgs.length()])); JCFieldAccess qualifier = make.Select(make.QualIdent(site.tsym), bsmName); DynamicMethodSymbol existing = kInfo.dynMethSyms.putIfAbsent( - new DynamicMethod(dynSym, types), dynSym); + dynSym.poolKey(types), dynSym); qualifier.sym = existing != null ? existing : dynSym; qualifier.type = indyType.getReturnType(); @@ -1220,57 +1213,6 @@ public class LambdaToMethod extends TreeTranslator { make.at(prevPos); } } - //where - private List bsmStaticArgToTypes(List args) { - ListBuffer argtypes = new ListBuffer<>(); - for (Object arg : args) { - argtypes.append(bsmStaticArgToType(arg)); - } - return argtypes.toList(); - } - - private Type bsmStaticArgToType(Object arg) { - Assert.checkNonNull(arg); - if (arg instanceof ClassSymbol) { - return syms.classType; - } else if (arg instanceof Integer) { - return syms.intType; - } else if (arg instanceof Long) { - return syms.longType; - } else if (arg instanceof Float) { - return syms.floatType; - } else if (arg instanceof Double) { - return syms.doubleType; - } else if (arg instanceof String) { - return syms.stringType; - } else if (arg instanceof Pool.MethodHandle) { - return syms.methodHandleType; - } else if (arg instanceof MethodType) { - return syms.methodTypeType; - } else { - Assert.error("bad static arg " + arg.getClass()); - return null; - } - } - - /** - * Get the opcode associated with this method reference - */ - private int referenceKind(Symbol refSym) { - if (refSym.isConstructor()) { - return ClassFile.REF_newInvokeSpecial; - } else { - if (refSym.isStatic()) { - return ClassFile.REF_invokeStatic; - } else if ((refSym.flags() & PRIVATE) != 0) { - return ClassFile.REF_invokeSpecial; - } else if (refSym.enclClass().isInterface()) { - return ClassFile.REF_invokeInterface; - } else { - return ClassFile.REF_invokeVirtual; - } - } - } // /** @@ -2312,13 +2254,6 @@ public class LambdaToMethod extends TreeTranslator { this.isSuper = tree.hasKind(ReferenceKind.SUPER); } - /** - * Get the opcode associated with this method reference - */ - int referenceKind() { - return LambdaToMethod.this.referenceKind(tree.sym); - } - boolean needsVarArgsConversion() { return tree.varargsElement != null; } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java index 14c66db3f98..04df0ddf1a3 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java @@ -93,7 +93,6 @@ public class Lower extends TreeTranslator { private final Attr attr; private TreeMaker make; private DiagnosticPosition make_pos; - private final ClassWriter writer; private final ConstFold cfolder; private final Target target; private final Source source; @@ -116,7 +115,6 @@ public class Lower extends TreeTranslator { chk = Check.instance(context); attr = Attr.instance(context); make = TreeMaker.instance(context); - writer = ClassWriter.instance(context); cfolder = ConstFold.instance(context); target = Target.instance(context); source = Source.instance(context); @@ -475,7 +473,7 @@ public class Lower extends TreeTranslator { .fromString(target.syntheticNameChar() + "SwitchMap" + target.syntheticNameChar() + - writer.xClassName(forEnum.type).toString() + names.fromUtf(ClassWriter.externalize(forEnum.type.tsym.flatName())).toString() .replace('/', '.') .replace('.', target.syntheticNameChar())); ClassSymbol outerCacheClass = outerCacheClass(); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java index 4897902d3de..3dac06c5948 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java @@ -25,9 +25,6 @@ package com.sun.tools.javac.jvm; -import com.sun.tools.javac.code.Type; -import com.sun.tools.javac.code.Types; -import com.sun.tools.javac.code.Types.UniqueType; import com.sun.tools.javac.util.Name; @@ -189,38 +186,4 @@ public class ClassFile { public static byte[] externalize(Name name) { return externalize(name.getByteArray(), name.getByteOffset(), name.getByteLength()); } - -/************************************************************************ - * Name-and-type - ***********************************************************************/ - - /** A class for the name-and-type signature of a method or field. - */ - public static class NameAndType { - Name name; - UniqueType uniqueType; - Types types; - - NameAndType(Name name, Type type, Types types) { - this.name = name; - this.uniqueType = new UniqueType(type, types); - this.types = types; - } - - void setType(Type type) { - this.uniqueType = new UniqueType(type, types); - } - - @Override - public boolean equals(Object other) { - return (other instanceof NameAndType && - name == ((NameAndType) other).name && - uniqueType.equals(((NameAndType) other).uniqueType)); - } - - @Override - public int hashCode() { - return name.hashCode() * uniqueType.hashCode(); - } - } } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java index 068fa89cbda..c3596178d7b 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java @@ -36,6 +36,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.function.IntFunction; import javax.lang.model.element.Modifier; import javax.lang.model.element.NestingKind; @@ -55,8 +56,8 @@ import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.comp.Annotate.AnnotationTypeMetadata; import com.sun.tools.javac.file.BaseFileManager; import com.sun.tools.javac.file.PathFileObject; -import com.sun.tools.javac.jvm.ClassFile.NameAndType; import com.sun.tools.javac.jvm.ClassFile.Version; +import com.sun.tools.javac.jvm.PoolConstant.NameAndType; import com.sun.tools.javac.main.Option; import com.sun.tools.javac.resources.CompilerProperties.Fragments; import com.sun.tools.javac.resources.CompilerProperties.Warnings; @@ -100,11 +101,6 @@ public class ClassReader { */ boolean verbose; - /** Switch: read constant pool and code sections. This switch is initially - * set to false but can be turned on from outside. - */ - public boolean readAllOfClassFile = false; - /** Switch: allow modules. */ boolean allowModules; @@ -170,20 +166,15 @@ public class ClassReader { /** The buffer containing the currently read class file. */ - byte[] buf = new byte[INITIAL_BUFFER_SIZE]; + ByteBuffer buf = new ByteBuffer(INITIAL_BUFFER_SIZE); /** The current input pointer. */ protected int bp; - /** The objects of the constant pool. + /** The pool reader. */ - Object[] poolObj; - - /** For every constant pool entry, an index into buf where the - * defining section of the entry is found. - */ - int[] poolIdx; + PoolReader poolReader; /** The major version number of the class file being read. */ int majorVersion; @@ -323,294 +314,29 @@ public class ClassReader { /** Read a character. */ char nextChar() { - return (char)(((buf[bp++] & 0xFF) << 8) + (buf[bp++] & 0xFF)); + char res = buf.getChar(bp); + bp += 2; + return res; } /** Read a byte. */ int nextByte() { - return buf[bp++] & 0xFF; + return buf.getByte(bp++) & 0xFF; } /** Read an integer. */ int nextInt() { - return - ((buf[bp++] & 0xFF) << 24) + - ((buf[bp++] & 0xFF) << 16) + - ((buf[bp++] & 0xFF) << 8) + - (buf[bp++] & 0xFF); - } - - /** Extract a character at position bp from buf. - */ - char getChar(int bp) { - return - (char)(((buf[bp] & 0xFF) << 8) + (buf[bp+1] & 0xFF)); - } - - /** Extract an integer at position bp from buf. - */ - int getInt(int bp) { - return - ((buf[bp] & 0xFF) << 24) + - ((buf[bp+1] & 0xFF) << 16) + - ((buf[bp+2] & 0xFF) << 8) + - (buf[bp+3] & 0xFF); - } - - - /** Extract a long integer at position bp from buf. - */ - long getLong(int bp) { - DataInputStream bufin = - new DataInputStream(new ByteArrayInputStream(buf, bp, 8)); - try { - return bufin.readLong(); - } catch (IOException e) { - throw new AssertionError(e); - } - } - - /** Extract a float at position bp from buf. - */ - float getFloat(int bp) { - DataInputStream bufin = - new DataInputStream(new ByteArrayInputStream(buf, bp, 4)); - try { - return bufin.readFloat(); - } catch (IOException e) { - throw new AssertionError(e); - } - } - - /** Extract a double at position bp from buf. - */ - double getDouble(int bp) { - DataInputStream bufin = - new DataInputStream(new ByteArrayInputStream(buf, bp, 8)); - try { - return bufin.readDouble(); - } catch (IOException e) { - throw new AssertionError(e); - } + int res = buf.getInt(bp); + bp += 4; + return res; } /************************************************************************ * Constant Pool Access ***********************************************************************/ - /** Index all constant pool entries, writing their start addresses into - * poolIdx. - */ - void indexPool() { - poolIdx = new int[nextChar()]; - poolObj = new Object[poolIdx.length]; - int i = 1; - while (i < poolIdx.length) { - poolIdx[i++] = bp; - byte tag = buf[bp++]; - switch (tag) { - case CONSTANT_Utf8: case CONSTANT_Unicode: { - int len = nextChar(); - bp = bp + len; - break; - } - case CONSTANT_Class: - case CONSTANT_String: - case CONSTANT_MethodType: - case CONSTANT_Module: - case CONSTANT_Package: - bp = bp + 2; - break; - case CONSTANT_MethodHandle: - bp = bp + 3; - break; - case CONSTANT_Fieldref: - case CONSTANT_Methodref: - case CONSTANT_InterfaceMethodref: - case CONSTANT_NameandType: - case CONSTANT_Integer: - case CONSTANT_Float: - case CONSTANT_Dynamic: - case CONSTANT_InvokeDynamic: - bp = bp + 4; - break; - case CONSTANT_Long: - case CONSTANT_Double: - bp = bp + 8; - i++; - break; - default: - throw badClassFile("bad.const.pool.tag.at", - Byte.toString(tag), - Integer.toString(bp -1)); - } - } - } - - /** Read constant pool entry at start address i, use pool as a cache. - */ - Object readPool(int i) { - Object result = poolObj[i]; - if (result != null) return result; - - int index = poolIdx[i]; - if (index == 0) return null; - - byte tag = buf[index]; - switch (tag) { - case CONSTANT_Utf8: - poolObj[i] = names.fromUtf(buf, index + 3, getChar(index + 1)); - break; - case CONSTANT_Unicode: - throw badClassFile("unicode.str.not.supported"); - case CONSTANT_Class: - poolObj[i] = readClassOrType(getChar(index + 1)); - break; - case CONSTANT_String: - // FIXME: (footprint) do not use toString here - poolObj[i] = readName(getChar(index + 1)).toString(); - break; - case CONSTANT_Fieldref: { - ClassSymbol owner = readClassSymbol(getChar(index + 1)); - NameAndType nt = readNameAndType(getChar(index + 3)); - poolObj[i] = new VarSymbol(0, nt.name, nt.uniqueType.type, owner); - break; - } - case CONSTANT_Methodref: - case CONSTANT_InterfaceMethodref: { - ClassSymbol owner = readClassSymbol(getChar(index + 1)); - NameAndType nt = readNameAndType(getChar(index + 3)); - poolObj[i] = new MethodSymbol(0, nt.name, nt.uniqueType.type, owner); - break; - } - case CONSTANT_NameandType: - poolObj[i] = new NameAndType( - readName(getChar(index + 1)), - readType(getChar(index + 3)), types); - break; - case CONSTANT_Integer: - poolObj[i] = getInt(index + 1); - break; - case CONSTANT_Float: - poolObj[i] = Float.valueOf(getFloat(index + 1)); - break; - case CONSTANT_Long: - poolObj[i] = Long.valueOf(getLong(index + 1)); - break; - case CONSTANT_Double: - poolObj[i] = Double.valueOf(getDouble(index + 1)); - break; - case CONSTANT_MethodHandle: - skipBytes(4); - break; - case CONSTANT_MethodType: - skipBytes(3); - break; - case CONSTANT_Dynamic: - case CONSTANT_InvokeDynamic: - skipBytes(5); - break; - case CONSTANT_Module: - case CONSTANT_Package: - // this is temporary for now: treat as a simple reference to the underlying Utf8. - poolObj[i] = readName(getChar(index + 1)); - break; - default: - throw badClassFile("bad.const.pool.tag", Byte.toString(tag)); - } - return poolObj[i]; - } - - /** Read signature and convert to type. - */ - Type readType(int i) { - int index = poolIdx[i]; - return sigToType(buf, index + 3, getChar(index + 1)); - } - - /** If name is an array type or class signature, return the - * corresponding type; otherwise return a ClassSymbol with given name. - */ - Object readClassOrType(int i) { - int index = poolIdx[i]; - int len = getChar(index + 1); - int start = index + 3; - Assert.check(buf[start] == '[' || buf[start + len - 1] != ';'); - // by the above assertion, the following test can be - // simplified to (buf[start] == '[') - return (buf[start] == '[' || buf[start + len - 1] == ';') - ? (Object)sigToType(buf, start, len) - : (Object)enterClass(names.fromUtf(internalize(buf, start, - len))); - } - - /** Read signature and convert to type parameters. - */ - List readTypeParams(int i) { - int index = poolIdx[i]; - return sigToTypeParams(buf, index + 3, getChar(index + 1)); - } - - /** Read class entry. - */ - ClassSymbol readClassSymbol(int i) { - Object obj = readPool(i); - if (obj != null && !(obj instanceof ClassSymbol)) - throw badClassFile("bad.const.pool.entry", - currentClassFile.toString(), - "CONSTANT_Class_info", i); - return (ClassSymbol)obj; - } - - Name readClassName(int i) { - int index = poolIdx[i]; - if (index == 0) return null; - byte tag = buf[index]; - if (tag != CONSTANT_Class) { - throw badClassFile("bad.const.pool.entry", - currentClassFile.toString(), - "CONSTANT_Class_info", i); - } - int nameIndex = poolIdx[getChar(index + 1)]; - int len = getChar(nameIndex + 1); - int start = nameIndex + 3; - if (buf[start] == '[' || buf[start + len - 1] == ';') - throw badClassFile("wrong class name"); //TODO: proper diagnostics - return names.fromUtf(internalize(buf, start, len)); - } - - /** Read name. - */ - Name readName(int i) { - Object obj = readPool(i); - if (obj != null && !(obj instanceof Name)) - throw badClassFile("bad.const.pool.entry", - currentClassFile.toString(), - "CONSTANT_Utf8_info or CONSTANT_String_info", i); - return (Name)obj; - } - - /** Read name and type. - */ - NameAndType readNameAndType(int i) { - Object obj = readPool(i); - if (obj != null && !(obj instanceof NameAndType)) - throw badClassFile("bad.const.pool.entry", - currentClassFile.toString(), - "CONSTANT_NameAndType_info", i); - return (NameAndType)obj; - } - - /** Read the name of a module. - * The name is stored in a CONSTANT_Module entry, in - * JVMS 4.2 binary form (using ".", not "/") - */ - Name readModuleName(int i) { - return readName(i); - } - /** Read module_flags. */ Set readModuleFlags(int flags) { @@ -762,7 +488,7 @@ public class ClassReader { List argtypes = sigToTypes(')'); Type restype = sigToType(); List thrown = List.nil(); - while (signature[sigp] == '^') { + while (sigp < siglimit && signature[sigp] == '^') { sigp++; thrown = thrown.prepend(sigToType()); } @@ -855,7 +581,7 @@ public class ClassReader { }; switch (signature[sigp++]) { case ';': - if (sigp < signature.length && signature[sigp] == '.') { + if (sigp < siglimit && signature[sigp] == '.') { // support old-style GJC signatures // The signature produced was // Lfoo/Outer;.Lfoo/Outer$Inner; @@ -1049,7 +775,7 @@ public class ClassReader { new AttributeReader(names.Code, V45_3, MEMBER_ATTRIBUTE) { protected void read(Symbol sym, int attrLen) { - if (readAllOfClassFile || saveParameterNames) + if (saveParameterNames) ((MethodSymbol)sym).code = readCode(sym); else bp = bp + attrLen; @@ -1058,7 +784,7 @@ public class ClassReader { new AttributeReader(names.ConstantValue, V45_3, MEMBER_ATTRIBUTE) { protected void read(Symbol sym, int attrLen) { - Object v = readPool(nextChar()); + Object v = poolReader.getConstant(nextChar()); // Ignore ConstantValue attribute if field not final. if ((sym.flags() & FINAL) == 0) { return; @@ -1115,7 +841,7 @@ public class ClassReader { int nexceptions = nextChar(); List thrown = List.nil(); for (int j = 0; j < nexceptions; j++) - thrown = thrown.prepend(readClassSymbol(nextChar()).type); + thrown = thrown.prepend(poolReader.getClass(nextChar()).type); if (sym.type.getThrownTypes().isEmpty()) sym.type.asMethodType().thrown = thrown.reverse(); } @@ -1173,7 +899,7 @@ public class ClassReader { new AttributeReader(names.SourceFile, V45_3, CLASS_ATTRIBUTE) { protected void read(Symbol sym, int attrLen) { ClassSymbol c = (ClassSymbol) sym; - Name n = readName(nextChar()); + Name n = poolReader.getName(nextChar()); c.sourcefile = new SourceFileObject(n); // If the class is a toplevel class, originating from a Java source file, // but the class name does not match the file name, then it is @@ -1211,7 +937,8 @@ public class ClassReader { try { ClassType ct1 = (ClassType)c.type; Assert.check(c == currentOwner); - ct1.typarams_field = readTypeParams(nextChar()); + ct1.typarams_field = poolReader.getName(nextChar()) + .map(ClassReader.this::sigToTypeParams); ct1.supertype_field = sigToType(); ListBuffer is = new ListBuffer<>(); while (sigp != siglimit) is.append(sigToType()); @@ -1221,7 +948,7 @@ public class ClassReader { } } else { List thrown = sym.type.getThrownTypes(); - sym.type = readType(nextChar()); + sym.type = poolReader.getType(nextChar()); //- System.err.println(" # " + sym.type); if (sym.kind == MTH && sym.type.getThrownTypes().isEmpty()) sym.type.asMethodType().thrown = thrown; @@ -1342,19 +1069,19 @@ public class ClassReader { ModuleSymbol msym = (ModuleSymbol) sym.owner; ListBuffer directives = new ListBuffer<>(); - Name moduleName = readModuleName(nextChar()); + Name moduleName = poolReader.peekModuleName(nextChar(), names::fromUtf); if (currentModule.name != moduleName) { throw badClassFile("module.name.mismatch", moduleName, currentModule.name); } Set moduleFlags = readModuleFlags(nextChar()); msym.flags.addAll(moduleFlags); - msym.version = readName(nextChar()); + msym.version = optPoolEntry(nextChar(), poolReader::getName, null); ListBuffer requires = new ListBuffer<>(); int nrequires = nextChar(); for (int i = 0; i < nrequires; i++) { - ModuleSymbol rsym = syms.enterModule(readModuleName(nextChar())); + ModuleSymbol rsym = poolReader.getModule(nextChar()); Set flags = readRequiresFlags(nextChar()); if (rsym == syms.java_base && majorVersion >= V54.major) { if (flags.contains(RequiresFlag.TRANSITIVE)) { @@ -1373,8 +1100,7 @@ public class ClassReader { ListBuffer exports = new ListBuffer<>(); int nexports = nextChar(); for (int i = 0; i < nexports; i++) { - Name n = readName(nextChar()); - PackageSymbol p = syms.enterPackage(currentModule, names.fromUtf(internalize(n))); + PackageSymbol p = poolReader.getPackage(nextChar()); Set flags = readExportsFlags(nextChar()); int nto = nextChar(); List to; @@ -1383,7 +1109,7 @@ public class ClassReader { } else { ListBuffer lb = new ListBuffer<>(); for (int t = 0; t < nto; t++) - lb.append(syms.enterModule(readModuleName(nextChar()))); + lb.append(poolReader.getModule(nextChar())); to = lb.toList(); } exports.add(new ExportsDirective(p, to, flags)); @@ -1396,8 +1122,7 @@ public class ClassReader { throw badClassFile("module.non.zero.opens", currentModule.name); } for (int i = 0; i < nopens; i++) { - Name n = readName(nextChar()); - PackageSymbol p = syms.enterPackage(currentModule, names.fromUtf(internalize(n))); + PackageSymbol p = poolReader.getPackage(nextChar()); Set flags = readOpensFlags(nextChar()); int nto = nextChar(); List to; @@ -1406,7 +1131,7 @@ public class ClassReader { } else { ListBuffer lb = new ListBuffer<>(); for (int t = 0; t < nto; t++) - lb.append(syms.enterModule(readModuleName(nextChar()))); + lb.append(poolReader.getModule(nextChar())); to = lb.toList(); } opens.add(new OpensDirective(p, to, flags)); @@ -1419,7 +1144,7 @@ public class ClassReader { ListBuffer uses = new ListBuffer<>(); int nuses = nextChar(); for (int i = 0; i < nuses; i++) { - Name srvc = readClassName(nextChar()); + Name srvc = poolReader.peekClassName(nextChar(), this::classNameMapper); uses.add(new InterimUsesDirective(srvc)); } interimUses = uses.toList(); @@ -1427,17 +1152,21 @@ public class ClassReader { ListBuffer provides = new ListBuffer<>(); int nprovides = nextChar(); for (int p = 0; p < nprovides; p++) { - Name srvc = readClassName(nextChar()); + Name srvc = poolReader.peekClassName(nextChar(), this::classNameMapper); int nimpls = nextChar(); ListBuffer impls = new ListBuffer<>(); for (int i = 0; i < nimpls; i++) { - impls.append(readClassName(nextChar())); + impls.append(poolReader.peekClassName(nextChar(), this::classNameMapper)); provides.add(new InterimProvidesDirective(srvc, impls.toList())); } } interimProvides = provides.toList(); } } + + private Name classNameMapper(byte[] arr, int offset, int length) { + return names.fromUtf(ClassFile.internalize(arr, offset, length)); + } }, new AttributeReader(names.ModuleResolution, V53, CLASS_ATTRIBUTE) { @@ -1464,8 +1193,8 @@ public class ClassReader { // the scope specified by the attribute sym.owner.members().remove(sym); ClassSymbol self = (ClassSymbol)sym; - ClassSymbol c = readClassSymbol(nextChar()); - NameAndType nt = readNameAndType(nextChar()); + ClassSymbol c = poolReader.getClass(nextChar()); + NameAndType nt = optPoolEntry(nextChar(), poolReader::getNameAndType, null); if (c.members_field == null || c.kind != TYP) throw badClassFile("bad.enclosing.class", self, c); @@ -1502,6 +1231,10 @@ public class ClassReader { // See java.lang.Class private Name simpleBinaryName(Name self, Name enclosing) { + if (!self.startsWith(enclosing)) { + throw badClassFile("bad.enclosing.method", self); + } + String simpleBinaryName = self.toString().substring(enclosing.toString().length()); if (simpleBinaryName.length() < 1 || simpleBinaryName.charAt(0) != '$') throw badClassFile("bad.enclosing.method", self); @@ -1516,7 +1249,7 @@ public class ClassReader { if (nt == null) return null; - MethodType type = nt.uniqueType.type.asMethodType(); + MethodType type = nt.type.asMethodType(); for (Symbol sym : scope.getSymbolsByName(nt.name)) { if (sym.kind == MTH && isSameBinaryType(sym.type.asMethodType(), type)) @@ -1529,15 +1262,15 @@ public class ClassReader { if ((flags & INTERFACE) != 0) // no enclosing instance return null; - if (nt.uniqueType.type.getParameterTypes().isEmpty()) + if (nt.type.getParameterTypes().isEmpty()) // no parameters return null; // A constructor of an inner class. // Remove the first argument (the enclosing instance) - nt.setType(new MethodType(nt.uniqueType.type.getParameterTypes().tail, - nt.uniqueType.type.getReturnType(), - nt.uniqueType.type.getThrownTypes(), + nt = new NameAndType(nt.name, new MethodType(nt.type.getParameterTypes().tail, + nt.type.getReturnType(), + nt.type.getThrownTypes(), syms.methodClass)); // Try searching again return findMethod(nt, scope, flags); @@ -1574,7 +1307,7 @@ public class ClassReader { void readAttrs(Symbol sym, AttributeKind kind) { char ac = nextChar(); for (int i = 0; i < ac; i++) { - Name attrName = readName(nextChar()); + Name attrName = poolReader.getName(nextChar()); int attrLen = nextInt(); AttributeReader r = attributeReaders.get(attrName); if (r != null && r.accepts(kind)) @@ -1677,7 +1410,7 @@ public class ClassReader { /** Read parameter annotations. */ void readParameterAnnotations(Symbol meth) { - int numParameters = buf[bp++] & 0xFF; + int numParameters = buf.getByte(bp++) & 0xFF; if (parameterAnnotations == null) { parameterAnnotations = new ParameterAnnotations[numParameters]; } else if (parameterAnnotations.length != numParameters) { @@ -1721,39 +1454,30 @@ public class ClassReader { Type readTypeOrClassSymbol(int i) { // support preliminary jsr175-format class files - if (buf[poolIdx[i]] == CONSTANT_Class) - return readClassSymbol(i).type; - return readTypeToProxy(i); - } - Type readEnumType(int i) { - // support preliminary jsr175-format class files - int index = poolIdx[i]; - int length = getChar(index + 1); - if (buf[index + length + 2] != ';') - return enterClass(readName(i)).type; + if (poolReader.hasTag(i, CONSTANT_Class)) + return poolReader.getClass(i).type; return readTypeToProxy(i); } Type readTypeToProxy(int i) { if (currentModule.module_info == currentOwner) { - int index = poolIdx[i]; - return new ProxyType(Arrays.copyOfRange(buf, index + 3, index + 3 + getChar(index + 1))); + return new ProxyType(i); } else { - return readType(i); + return poolReader.getType(i); } } CompoundAnnotationProxy readCompoundAnnotation() { Type t; if (currentModule.module_info == currentOwner) { - int index = poolIdx[nextChar()]; - t = new ProxyType(Arrays.copyOfRange(buf, index + 3, index + 3 + getChar(index + 1))); + int cpIndex = nextChar(); + t = new ProxyType(cpIndex); } else { t = readTypeOrClassSymbol(nextChar()); } int numFields = nextChar(); ListBuffer> pairs = new ListBuffer<>(); for (int i=0; i(name, value)); } @@ -1966,29 +1690,40 @@ public class ClassReader { } + /** + * Helper function to read an optional pool entry (with given function); this is used while parsing + * InnerClasses and EnclosingMethod attributes, as well as when parsing supertype descriptor, + * as per JVMS. + */ + Z optPoolEntry(int index, IntFunction poolFunc, Z defaultValue) { + return (index == 0) ? + defaultValue : + poolFunc.apply(index); + } + Attribute readAttributeValue() { - char c = (char) buf[bp++]; + char c = (char) buf.getByte(bp++); switch (c) { case 'B': - return new Attribute.Constant(syms.byteType, readPool(nextChar())); + return new Attribute.Constant(syms.byteType, poolReader.getConstant(nextChar())); case 'C': - return new Attribute.Constant(syms.charType, readPool(nextChar())); + return new Attribute.Constant(syms.charType, poolReader.getConstant(nextChar())); case 'D': - return new Attribute.Constant(syms.doubleType, readPool(nextChar())); + return new Attribute.Constant(syms.doubleType, poolReader.getConstant(nextChar())); case 'F': - return new Attribute.Constant(syms.floatType, readPool(nextChar())); + return new Attribute.Constant(syms.floatType, poolReader.getConstant(nextChar())); case 'I': - return new Attribute.Constant(syms.intType, readPool(nextChar())); + return new Attribute.Constant(syms.intType, poolReader.getConstant(nextChar())); case 'J': - return new Attribute.Constant(syms.longType, readPool(nextChar())); + return new Attribute.Constant(syms.longType, poolReader.getConstant(nextChar())); case 'S': - return new Attribute.Constant(syms.shortType, readPool(nextChar())); + return new Attribute.Constant(syms.shortType, poolReader.getConstant(nextChar())); case 'Z': - return new Attribute.Constant(syms.booleanType, readPool(nextChar())); + return new Attribute.Constant(syms.booleanType, poolReader.getConstant(nextChar())); case 's': - return new Attribute.Constant(syms.stringType, readPool(nextChar()).toString()); + return new Attribute.Constant(syms.stringType, poolReader.getName(nextChar()).toString()); case 'e': - return new EnumAttributeProxy(readEnumType(nextChar()), readName(nextChar())); + return new EnumAttributeProxy(readTypeToProxy(nextChar()), poolReader.getName(nextChar())); case 'c': return new ClassAttributeProxy(readTypeOrClassSymbol(nextChar())); case '[': { @@ -2397,8 +2132,8 @@ public class ClassReader { */ VarSymbol readField() { long flags = adjustFieldFlags(nextChar()); - Name name = readName(nextChar()); - Type type = readType(nextChar()); + Name name = poolReader.getName(nextChar()); + Type type = poolReader.getType(nextChar()); VarSymbol v = new VarSymbol(flags, name, type, currentOwner); readMemberAttrs(v); return v; @@ -2408,8 +2143,8 @@ public class ClassReader { */ MethodSymbol readMethod() { long flags = adjustMethodFlags(nextChar()); - Name name = readName(nextChar()); - Type type = readType(nextChar()); + Name name = poolReader.getName(nextChar()); + Type type = poolReader.getType(nextChar()); if (currentOwner.isInterface() && (flags & ABSTRACT) == 0 && !name.equals(names.clinit)) { if (majorVersion > Version.V52.major || @@ -2553,14 +2288,12 @@ public class ClassReader { firstParam += skip; } } - List paramNames = List.nil(); + Set paramNames = new HashSet<>(); ListBuffer params = new ListBuffer<>(); int nameIndex = firstParam; int annotationIndex = 0; for (Type t: sym.type.getParameterTypes()) { - Name name = parameterName(nameIndex, paramNames); - paramNames = paramNames.prepend(name); - VarSymbol param = new VarSymbol(PARAMETER, name, t, sym); + VarSymbol param = parameter(nameIndex, t, sym, paramNames); params.append(param); if (parameterAnnotations != null) { ParameterAnnotations annotations = parameterAnnotations[annotationIndex]; @@ -2585,18 +2318,24 @@ public class ClassReader { // Returns the name for the parameter at position 'index', either using // names read from the MethodParameters, or by synthesizing a name that // is not on the 'exclude' list. - private Name parameterName(int index, List exclude) { + private VarSymbol parameter(int index, Type t, MethodSymbol owner, Set exclude) { + long flags = PARAMETER; + Name argName; if (parameterNameIndices != null && index < parameterNameIndices.length && parameterNameIndices[index] != 0) { - return readName(parameterNameIndices[index]); - } - String prefix = "arg"; - while (true) { - Name argName = names.fromString(prefix + exclude.size()); - if (!exclude.contains(argName)) - return argName; - prefix += "$"; + argName = optPoolEntry(parameterNameIndices[index], poolReader::getName, names.empty); + flags |= NAME_FILLED; + } else { + String prefix = "arg"; + while (true) { + argName = names.fromString(prefix + exclude.size()); + if (!exclude.contains(argName)) + break; + prefix += "$"; + } } + exclude.add(argName); + return new ParamSymbol(flags, argName, t, owner); } /** @@ -2673,7 +2412,7 @@ public class ClassReader { if (c.owner.kind == PCK || c.owner.kind == ERR) c.flags_field = flags; // read own class name and check that it matches currentModule = c.packge().modle; - ClassSymbol self = readClassSymbol(nextChar()); + ClassSymbol self = poolReader.getClass(nextChar()); if (c != self) { throw badClassFile("class.file.wrong.class", self.flatname); @@ -2702,11 +2441,6 @@ public class ClassReader { for (int i = 0; i < methodCount; i++) skipMember(); readClassAttrs(c); - if (readAllOfClassFile) { - for (int i = 1; i < poolObj.length; i++) readPool(i); - c.pool = new Pool(poolObj.length, poolObj, types); - } - // reset and read rest of classinfo bp = startbp; int n = nextChar(); @@ -2714,13 +2448,12 @@ public class ClassReader { throw badClassFile("module.info.invalid.super.class"); } if (ct.supertype_field == null) - ct.supertype_field = (n == 0) - ? Type.noType - : readClassSymbol(n).erasure(types); + ct.supertype_field = + optPoolEntry(n, idx -> poolReader.getClass(idx).erasure(types), Type.noType); n = nextChar(); List is = List.nil(); for (int i = 0; i < n; i++) { - Type _inter = readClassSymbol(nextChar()).erasure(types); + Type _inter = poolReader.getClass(nextChar()).erasure(types); is = is.prepend(_inter); } if (ct.interfaces_field == null) @@ -2741,8 +2474,10 @@ public class ClassReader { int n = nextChar(); for (int i = 0; i < n; i++) { nextChar(); // skip inner class symbol - ClassSymbol outer = readClassSymbol(nextChar()); - Name name = readName(nextChar()); + int outerIdx = nextChar(); + int nameIdx = nextChar(); + ClassSymbol outer = optPoolEntry(outerIdx, poolReader::getClass, null); + Name name = optPoolEntry(nameIdx, poolReader::getName, names.empty); if (name == null) name = names.empty; long flags = adjustClassFlags(nextChar()); if (outer != null) { // we have a member class @@ -2796,7 +2531,8 @@ public class ClassReader { } } - indexPool(); + poolReader = new PoolReader(this, names, syms); + bp = poolReader.readPool(buf, bp); if (signatureBuffer.length < bp) { int ns = Integer.highestOneBit(bp) << 1; signatureBuffer = new byte[ns]; @@ -2813,7 +2549,8 @@ public class ClassReader { repeatable = null; try { bp = 0; - buf = readInputStream(buf, c.classfile.openInputStream()); + buf.reset(); + buf.appendStream(c.classfile.openInputStream()); readClassBuffer(c); if (!missingTypeVariables.isEmpty() && !foundTypeVariables.isEmpty()) { List missing = missingTypeVariables; @@ -2867,43 +2604,6 @@ public class ClassReader { filling = false; } } - // where - private static byte[] readInputStream(byte[] buf, InputStream s) throws IOException { - try { - buf = ensureCapacity(buf, s.available()); - int r = s.read(buf); - int bp = 0; - while (r != -1) { - bp += r; - buf = ensureCapacity(buf, bp); - r = s.read(buf, bp, buf.length - bp); - } - return buf; - } finally { - try { - s.close(); - } catch (IOException e) { - /* Ignore any errors, as this stream may have already - * thrown a related exception which is the one that - * should be reported. - */ - } - } - } - /* - * ensureCapacity will increase the buffer as needed, taking note that - * the new buffer will always be greater than the needed and never - * exactly equal to the needed size or bp. If equal then the read (above) - * will infinitely loop as buf.length - bp == 0. - */ - private static byte[] ensureCapacity(byte[] buf, int needed) { - if (buf.length <= needed) { - byte[] old = buf; - buf = new byte[Integer.highestOneBit(needed) << 1]; - System.arraycopy(old, 0, buf, 0, old.length); - } - return buf; - } /** We can only read a single class file at a time; this * flag keeps track of when we are currently reading a class @@ -3090,11 +2790,11 @@ public class ClassReader { private class ProxyType extends Type { - private final byte[] content; + private final Name name; - public ProxyType(byte[] content) { + public ProxyType(int index) { super(syms.noSymbol, TypeMetadata.EMPTY); - this.content = content; + this.name = poolReader.getName(index); } @Override @@ -3108,7 +2808,7 @@ public class ClassReader { } public Type resolve() { - return sigToType(content, 0, content.length); + return name.map(ClassReader.this::sigToType); } @Override @DefinedBy(Api.LANGUAGE_MODEL) diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java index b73c2f83559..5f956e1df6f 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java @@ -29,9 +29,7 @@ import java.io.*; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import java.util.HashSet; import java.util.LinkedHashSet; -import java.util.stream.Collectors; import javax.tools.JavaFileManager; import javax.tools.FileObject; @@ -44,13 +42,10 @@ import com.sun.tools.javac.code.Directive.*; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.code.Types.SignatureGenerator.InvalidSignatureException; -import com.sun.tools.javac.code.Types.UniqueType; import com.sun.tools.javac.comp.Check; import com.sun.tools.javac.file.PathFileObject; -import com.sun.tools.javac.jvm.Pool.DynamicMethod; -import com.sun.tools.javac.jvm.Pool.Method; -import com.sun.tools.javac.jvm.Pool.MethodHandle; -import com.sun.tools.javac.jvm.Pool.Variable; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant; +import com.sun.tools.javac.jvm.PoolConstant.Dynamic.BsmKey; import com.sun.tools.javac.resources.CompilerProperties.Errors; import com.sun.tools.javac.resources.CompilerProperties.Fragments; import com.sun.tools.javac.util.*; @@ -121,7 +116,7 @@ public class ClassWriter extends ClassFile { * Sizes are increased when buffers get full. */ static final int DATA_BUF_SIZE = 0x0fff0; - static final int POOL_BUF_SIZE = 0x1fff0; + static final int CLASS_BUF_SIZE = 0x1fff0; /** An output buffer for member info. */ @@ -129,25 +124,11 @@ public class ClassWriter extends ClassFile { /** An output buffer for the constant pool. */ - ByteBuffer poolbuf = new ByteBuffer(POOL_BUF_SIZE); + ByteBuffer poolbuf = new ByteBuffer(CLASS_BUF_SIZE); - /** The constant pool. + /** The constant pool writer. */ - Pool pool; - - /** The inner classes to be written, as a set. - */ - Set innerClasses; - - /** The inner classes to be written, as a queue where - * enclosing classes come first. - */ - ListBuffer innerClassesQueue; - - /** The bootstrap methods to be written in the corresponding class attribute - * (one for each invokedynamic) - */ - Map bootstrapMethods; + final PoolWriter poolWriter; /** The log to use for verbose output. */ @@ -159,9 +140,6 @@ public class ClassWriter extends ClassFile { /** Access to files. */ private final JavaFileManager fileManager; - /** Sole signature generator */ - private final CWSignatureGenerator signatureGen; - /** The tags and constants used in compressed stackmap. */ static final int SAME_FRAME_SIZE = 64; static final int SAME_LOCALS_1_STACK_ITEM_EXTENDED = 247; @@ -191,7 +169,7 @@ public class ClassWriter extends ClassFile { types = Types.instance(context); check = Check.instance(context); fileManager = context.get(JavaFileManager.class); - signatureGen = new CWSignatureGenerator(types); + poolWriter = Gen.instance(context).poolWriter; verbose = options.isSet(VERBOSE); genCrt = options.isSet(XJCOV); @@ -272,108 +250,17 @@ public class ClassWriter extends ClassFile { buf.elems[adr+3] = (byte)((x ) & 0xFF); } - /** - * Signature Generation - */ - private class CWSignatureGenerator extends Types.SignatureGenerator { - - /** - * An output buffer for type signatures. - */ - ByteBuffer sigbuf = new ByteBuffer(); - - CWSignatureGenerator(Types types) { - super(types); - } - - /** - * Assemble signature of given type in string buffer. - * Check for uninitialized types before calling the general case. - */ - @Override - public void assembleSig(Type type) { - switch (type.getTag()) { - case UNINITIALIZED_THIS: - case UNINITIALIZED_OBJECT: - // we don't yet have a spec for uninitialized types in the - // local variable table - assembleSig(types.erasure(((UninitializedType)type).qtype)); - break; - default: - super.assembleSig(type); - } - } - - @Override - protected void append(char ch) { - sigbuf.appendByte(ch); - } - - @Override - protected void append(byte[] ba) { - sigbuf.appendBytes(ba); - } - - @Override - protected void append(Name name) { - sigbuf.appendName(name); - } - - @Override - protected void classReference(ClassSymbol c) { - enterInner(c); - } - - private void reset() { - sigbuf.reset(); - } - - private Name toName() { - return sigbuf.toName(names); - } - - private boolean isEmpty() { - return sigbuf.length == 0; - } - } - - /** - * Return signature of given type - */ - Name typeSig(Type type) { - Assert.check(signatureGen.isEmpty()); - //- System.out.println(" ? " + type); - signatureGen.assembleSig(type); - Name n = signatureGen.toName(); - signatureGen.reset(); - //- System.out.println(" " + n); - return n; - } - - /** Given a type t, return the extended class name of its erasure in - * external representation. - */ - public Name xClassName(Type t) { - if (t.hasTag(CLASS)) { - return names.fromUtf(externalize(t.tsym.flatName())); - } else if (t.hasTag(ARRAY)) { - return typeSig(types.erasure(t)); - } else { - throw new AssertionError("xClassName expects class or array type, got " + t); - } - } - /****************************************************************** * Writing the Constant Pool ******************************************************************/ /** Thrown when the constant pool is over full. */ - public static class PoolOverflow extends Exception { + public static class PoolOverflow extends RuntimeException { private static final long serialVersionUID = 0; public PoolOverflow() {} } - public static class StringOverflow extends Exception { + public static class StringOverflow extends RuntimeException { private static final long serialVersionUID = 0; public final String value; public StringOverflow(String s) { @@ -381,137 +268,6 @@ public class ClassWriter extends ClassFile { } } - /** Write constant pool to pool buffer. - * Note: during writing, constant pool - * might grow since some parts of constants still need to be entered. - */ - void writePool(Pool pool) throws PoolOverflow, StringOverflow { - int poolCountIdx = poolbuf.length; - poolbuf.appendChar(0); - int i = 1; - while (i < pool.pp) { - Object value = pool.pool[i]; - Assert.checkNonNull(value); - if (value instanceof Method || value instanceof Variable) - value = ((DelegatedSymbol)value).getUnderlyingSymbol(); - - if (value instanceof MethodSymbol) { - MethodSymbol m = (MethodSymbol)value; - if (!m.isDynamic()) { - poolbuf.appendByte((m.owner.flags() & INTERFACE) != 0 - ? CONSTANT_InterfaceMethodref - : CONSTANT_Methodref); - poolbuf.appendChar(pool.put(m.owner)); - poolbuf.appendChar(pool.put(nameType(m))); - } else { - //invokedynamic - DynamicMethodSymbol dynSym = (DynamicMethodSymbol)m; - MethodHandle handle = new MethodHandle(dynSym.bsmKind, dynSym.bsm, types); - DynamicMethod.BootstrapMethodsKey key = new DynamicMethod.BootstrapMethodsKey(dynSym, types); - - // Figure out the index for existing BSM; create a new BSM if no key - DynamicMethod.BootstrapMethodsValue val = bootstrapMethods.get(key); - if (val == null) { - int index = bootstrapMethods.size(); - val = new DynamicMethod.BootstrapMethodsValue(handle, index); - bootstrapMethods.put(key, val); - } - - //init cp entries - pool.put(names.BootstrapMethods); - pool.put(handle); - for (Object staticArg : dynSym.staticArgs) { - pool.put(staticArg); - } - poolbuf.appendByte(CONSTANT_InvokeDynamic); - poolbuf.appendChar(val.index); - poolbuf.appendChar(pool.put(nameType(dynSym))); - } - } else if (value instanceof VarSymbol) { - VarSymbol v = (VarSymbol)value; - poolbuf.appendByte(CONSTANT_Fieldref); - poolbuf.appendChar(pool.put(v.owner)); - poolbuf.appendChar(pool.put(nameType(v))); - } else if (value instanceof Name) { - poolbuf.appendByte(CONSTANT_Utf8); - byte[] bs = ((Name)value).toUtf(); - poolbuf.appendChar(bs.length); - poolbuf.appendBytes(bs, 0, bs.length); - if (bs.length > Pool.MAX_STRING_LENGTH) - throw new StringOverflow(value.toString()); - } else if (value instanceof ClassSymbol) { - ClassSymbol c = (ClassSymbol)value; - if (c.owner.kind == TYP) pool.put(c.owner); - poolbuf.appendByte(CONSTANT_Class); - if (c.type.hasTag(ARRAY)) { - poolbuf.appendChar(pool.put(typeSig(c.type))); - } else { - poolbuf.appendChar(pool.put(names.fromUtf(externalize(c.flatname)))); - enterInner(c); - } - } else if (value instanceof NameAndType) { - NameAndType nt = (NameAndType)value; - poolbuf.appendByte(CONSTANT_NameandType); - poolbuf.appendChar(pool.put(nt.name)); - poolbuf.appendChar(pool.put(typeSig(nt.uniqueType.type))); - } else if (value instanceof Integer) { - poolbuf.appendByte(CONSTANT_Integer); - poolbuf.appendInt(((Integer)value).intValue()); - } else if (value instanceof Long) { - poolbuf.appendByte(CONSTANT_Long); - poolbuf.appendLong(((Long)value).longValue()); - i++; - } else if (value instanceof Float) { - poolbuf.appendByte(CONSTANT_Float); - poolbuf.appendFloat(((Float)value).floatValue()); - } else if (value instanceof Double) { - poolbuf.appendByte(CONSTANT_Double); - poolbuf.appendDouble(((Double)value).doubleValue()); - i++; - } else if (value instanceof String) { - poolbuf.appendByte(CONSTANT_String); - poolbuf.appendChar(pool.put(names.fromString((String)value))); - } else if (value instanceof UniqueType) { - Type type = ((UniqueType)value).type; - if (type.hasTag(METHOD)) { - poolbuf.appendByte(CONSTANT_MethodType); - poolbuf.appendChar(pool.put(typeSig((MethodType)type))); - } else { - Assert.check(type.hasTag(ARRAY)); - poolbuf.appendByte(CONSTANT_Class); - poolbuf.appendChar(pool.put(xClassName(type))); - } - } else if (value instanceof MethodHandle) { - MethodHandle ref = (MethodHandle)value; - poolbuf.appendByte(CONSTANT_MethodHandle); - poolbuf.appendByte(ref.refKind); - poolbuf.appendChar(pool.put(ref.refSym)); - } else if (value instanceof ModuleSymbol) { - ModuleSymbol m = (ModuleSymbol)value; - poolbuf.appendByte(CONSTANT_Module); - poolbuf.appendChar(pool.put(m.name)); - } else if (value instanceof PackageSymbol) { - PackageSymbol m = (PackageSymbol)value; - poolbuf.appendByte(CONSTANT_Package); - poolbuf.appendChar(pool.put(names.fromUtf(externalize(m.fullname)))); - } else { - Assert.error("writePool " + value); - } - i++; - } - if (pool.pp > Pool.MAX_ENTRIES) - throw new PoolOverflow(); - putChar(poolbuf, poolCountIdx, pool.pp); - } - - /** Given a symbol, return its name-and-type. - */ - NameAndType nameType(Symbol sym) { - return new NameAndType(sym.name, sym.externalType(types), types); - // the NameAndType is generated from a symbol reference, and the - // adjustment of adding an additional this$n parameter needs to be made. - } - /****************************************************************** * Writing Attributes ******************************************************************/ @@ -520,7 +276,8 @@ public class ClassWriter extends ClassFile { * position past attribute length index. */ int writeAttr(Name attrName) { - databuf.appendChar(pool.put(attrName)); + int index = poolWriter.putName(attrName); + databuf.appendChar(index); databuf.appendInt(0); return databuf.length; } @@ -567,8 +324,8 @@ public class ClassWriter extends ClassFile { || c.owner.kind != MTH) // or member init ? null : (MethodSymbol)c.owner; - databuf.appendChar(pool.put(enclClass)); - databuf.appendChar(enclMethod == null ? 0 : pool.put(nameType(c.owner))); + databuf.appendChar(poolWriter.putClass(enclClass)); + databuf.appendChar(enclMethod == null ? 0 : poolWriter.putNameAndType(c.owner)); endAttr(alenIdx); return 1; } @@ -594,11 +351,11 @@ public class ClassWriter extends ClassFile { if ((flags & (SYNTHETIC | BRIDGE)) != SYNTHETIC && (flags & ANONCONSTR) == 0 && (!types.isSameType(sym.type, sym.erasure(types)) || - signatureGen.hasTypeVar(sym.type.getThrownTypes()))) { + poolWriter.signatureGen.hasTypeVar(sym.type.getThrownTypes()))) { // note that a local class with captured variables // will get a signature attribute int alenIdx = writeAttr(names.Signature); - databuf.appendChar(pool.put(typeSig(sym.type))); + databuf.appendChar(poolWriter.putSignature(sym)); endAttr(alenIdx); acount++; } @@ -621,7 +378,7 @@ public class ClassWriter extends ClassFile { final int flags = ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) | ((int) m.flags() & SYNTHETIC); - databuf.appendChar(pool.put(s.name)); + databuf.appendChar(poolWriter.putName(s.name)); databuf.appendChar(flags); } // Now write the real parameters @@ -629,7 +386,7 @@ public class ClassWriter extends ClassFile { final int flags = ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) | ((int) m.flags() & SYNTHETIC); - databuf.appendChar(pool.put(s.name)); + databuf.appendChar(poolWriter.putName(s.name)); databuf.appendChar(flags); } // Now write the captured locals @@ -637,7 +394,7 @@ public class ClassWriter extends ClassFile { final int flags = ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) | ((int) m.flags() & SYNTHETIC); - databuf.appendChar(pool.put(s.name)); + databuf.appendChar(poolWriter.putName(s.name)); databuf.appendChar(flags); } endAttr(attrIndex); @@ -803,50 +560,51 @@ public class ClassWriter extends ClassFile { */ class AttributeWriter implements Attribute.Visitor { public void visitConstant(Attribute.Constant _value) { - Object value = _value.value; - switch (_value.type.getTag()) { - case BYTE: - databuf.appendByte('B'); - break; - case CHAR: - databuf.appendByte('C'); - break; - case SHORT: - databuf.appendByte('S'); - break; - case INT: - databuf.appendByte('I'); - break; - case LONG: - databuf.appendByte('J'); - break; - case FLOAT: - databuf.appendByte('F'); - break; - case DOUBLE: - databuf.appendByte('D'); - break; - case BOOLEAN: - databuf.appendByte('Z'); - break; - case CLASS: - Assert.check(value instanceof String); + if (_value.type.getTag() == CLASS) { + Assert.check(_value.value instanceof String); + String s = (String)_value.value; databuf.appendByte('s'); - value = names.fromString(value.toString()); // CONSTANT_Utf8 - break; - default: - throw new AssertionError(_value.type); + databuf.appendChar(poolWriter.putName(names.fromString(s))); + } else { + switch (_value.type.getTag()) { + case BYTE: + databuf.appendByte('B'); + break; + case CHAR: + databuf.appendByte('C'); + break; + case SHORT: + databuf.appendByte('S'); + break; + case INT: + databuf.appendByte('I'); + break; + case LONG: + databuf.appendByte('J'); + break; + case FLOAT: + databuf.appendByte('F'); + break; + case DOUBLE: + databuf.appendByte('D'); + break; + case BOOLEAN: + databuf.appendByte('Z'); + break; + default: + throw new AssertionError(_value.type); + } + databuf.appendChar(poolWriter.putConstant(_value.value)); } - databuf.appendChar(pool.put(value)); } public void visitEnum(Attribute.Enum e) { databuf.appendByte('e'); - databuf.appendChar(pool.put(typeSig(e.value.type))); - databuf.appendChar(pool.put(e.value.name)); + databuf.appendChar(poolWriter.putDescriptor(e.value.type)); + databuf.appendChar(poolWriter.putName(e.value.name)); } public void visitClass(Attribute.Class clazz) { databuf.appendByte('c'); - databuf.appendChar(pool.put(typeSig(types.erasure(clazz.classType)))); + databuf.appendChar(poolWriter.putDescriptor(clazz.classType)); } public void visitCompound(Attribute.Compound compound) { databuf.appendByte('@'); @@ -867,10 +625,10 @@ public class ClassWriter extends ClassFile { /** Write a compound attribute excluding the '@' marker. */ void writeCompoundAttribute(Attribute.Compound c) { - databuf.appendChar(pool.put(typeSig(c.type))); + databuf.appendChar(poolWriter.putDescriptor(c.type)); databuf.appendChar(c.values.length()); for (Pair p : c.values) { - databuf.appendChar(pool.put(p.fst.name)); + databuf.appendChar(poolWriter.putName(p.fst.name)); p.snd.accept(awriter); } } @@ -974,9 +732,9 @@ public class ClassWriter extends ClassFile { int alenIdx = writeAttr(names.Module); - databuf.appendChar(pool.put(m)); + databuf.appendChar(poolWriter.putModule(m)); databuf.appendChar(ModuleFlags.value(m.flags)); // module_flags - databuf.appendChar(m.version != null ? pool.put(m.version) : 0); + databuf.appendChar(m.version != null ? poolWriter.putName(m.version) : 0); ListBuffer requires = new ListBuffer<>(); for (RequiresDirective r: m.requires) { @@ -985,22 +743,22 @@ public class ClassWriter extends ClassFile { } databuf.appendChar(requires.size()); for (RequiresDirective r: requires) { - databuf.appendChar(pool.put(r.module)); + databuf.appendChar(poolWriter.putModule(r.module)); databuf.appendChar(RequiresFlag.value(r.flags)); - databuf.appendChar(r.module.version != null ? pool.put(r.module.version) : 0); + databuf.appendChar(r.module.version != null ? poolWriter.putName(r.module.version) : 0); } List exports = m.exports; databuf.appendChar(exports.size()); for (ExportsDirective e: exports) { - databuf.appendChar(pool.put(e.packge)); + databuf.appendChar(poolWriter.putPackage(e.packge)); databuf.appendChar(ExportsFlag.value(e.flags)); if (e.modules == null) { databuf.appendChar(0); } else { databuf.appendChar(e.modules.size()); for (ModuleSymbol msym: e.modules) { - databuf.appendChar(pool.put(msym)); + databuf.appendChar(poolWriter.putModule(msym)); } } } @@ -1008,14 +766,14 @@ public class ClassWriter extends ClassFile { List opens = m.opens; databuf.appendChar(opens.size()); for (OpensDirective o: opens) { - databuf.appendChar(pool.put(o.packge)); + databuf.appendChar(poolWriter.putPackage(o.packge)); databuf.appendChar(OpensFlag.value(o.flags)); if (o.modules == null) { databuf.appendChar(0); } else { databuf.appendChar(o.modules.size()); for (ModuleSymbol msym: o.modules) { - databuf.appendChar(pool.put(msym)); + databuf.appendChar(poolWriter.putModule(msym)); } } } @@ -1023,7 +781,7 @@ public class ClassWriter extends ClassFile { List uses = m.uses; databuf.appendChar(uses.size()); for (UsesDirective s: uses) { - databuf.appendChar(pool.put(s.service)); + databuf.appendChar(poolWriter.putClass(s.service)); } // temporary fix to merge repeated provides clause for same service; @@ -1035,9 +793,9 @@ public class ClassWriter extends ClassFile { } databuf.appendChar(mergedProvides.size()); mergedProvides.forEach((srvc, impls) -> { - databuf.appendChar(pool.put(srvc)); + databuf.appendChar(poolWriter.putClass(srvc)); databuf.appendChar(impls.size()); - impls.forEach(impl -> databuf.appendChar(pool.put(impl))); + impls.forEach(impl -> databuf.appendChar(poolWriter.putClass(impl))); }); endAttr(alenIdx); @@ -1048,46 +806,12 @@ public class ClassWriter extends ClassFile { * Writing Objects **********************************************************************/ - /** Enter an inner class into the `innerClasses' set/queue. - */ - void enterInner(ClassSymbol c) { - if (c.type.isCompound()) { - throw new AssertionError("Unexpected intersection type: " + c.type); - } - try { - c.complete(); - } catch (CompletionFailure ex) { - System.err.println("error: " + c + ": " + ex.getMessage()); - throw ex; - } - if (!c.type.hasTag(CLASS)) return; // arrays - if (pool != null && // pool might be null if called from xClassName - c.owner.enclClass() != null && - (innerClasses == null || !innerClasses.contains(c))) { -// log.errWriter.println("enter inner " + c);//DEBUG - enterInner(c.owner.enclClass()); - pool.put(c); - if (c.name != names.empty) - pool.put(c.name); - if (innerClasses == null) { - innerClasses = new HashSet<>(); - innerClassesQueue = new ListBuffer<>(); - pool.put(names.InnerClasses); - } - innerClasses.add(c); - innerClassesQueue.append(c); - } - } - /** Write "inner classes" attribute. */ void writeInnerClasses() { int alenIdx = writeAttr(names.InnerClasses); - databuf.appendChar(innerClassesQueue.length()); - for (List l = innerClassesQueue.toList(); - l.nonEmpty(); - l = l.tail) { - ClassSymbol inner = l.head; + databuf.appendChar(poolWriter.innerClasses.size()); + for (ClassSymbol inner : poolWriter.innerClasses) { inner.markAbstractIfNeeded(types); char flags = (char) adjustFlags(inner.flags_field); if ((flags & INTERFACE) != 0) flags |= ABSTRACT; // Interfaces are always ABSTRACT @@ -1097,11 +821,11 @@ public class ClassWriter extends ClassFile { pw.println("INNERCLASS " + inner.name); pw.println("---" + flagNames(flags)); } - databuf.appendChar(pool.get(inner)); + databuf.appendChar(poolWriter.putClass(inner)); databuf.appendChar( - inner.owner.kind == TYP && !inner.name.isEmpty() ? pool.get(inner.owner) : 0); + inner.owner.kind == TYP && !inner.name.isEmpty() ? poolWriter.putClass((ClassSymbol)inner.owner) : 0); databuf.appendChar( - !inner.name.isEmpty() ? pool.get(inner.name) : 0); + !inner.name.isEmpty() ? poolWriter.putName(inner.name) : 0); databuf.appendChar(flags); } endAttr(alenIdx); @@ -1111,14 +835,14 @@ public class ClassWriter extends ClassFile { * Write NestMembers attribute (if needed) */ int writeNestMembersIfNeeded(ClassSymbol csym) { - ListBuffer nested = new ListBuffer<>(); + ListBuffer nested = new ListBuffer<>(); listNested(csym, nested); - Set nestedUnique = new LinkedHashSet<>(nested); + Set nestedUnique = new LinkedHashSet<>(nested); if (csym.owner.kind == PCK && !nestedUnique.isEmpty()) { int alenIdx = writeAttr(names.NestMembers); databuf.appendChar(nestedUnique.size()); - for (Symbol s : nestedUnique) { - databuf.appendChar(pool.put(s)); + for (ClassSymbol s : nestedUnique) { + databuf.appendChar(poolWriter.putClass(s)); } endAttr(alenIdx); return 1; @@ -1132,14 +856,14 @@ public class ClassWriter extends ClassFile { int writeNestHostIfNeeded(ClassSymbol csym) { if (csym.owner.kind != PCK) { int alenIdx = writeAttr(names.NestHost); - databuf.appendChar(pool.put(csym.outermostClass())); + databuf.appendChar(poolWriter.putClass(csym.outermostClass())); endAttr(alenIdx); return 1; } return 0; } - private void listNested(Symbol sym, ListBuffer seen) { + private void listNested(Symbol sym, ListBuffer seen) { if (sym.kind != TYP) return; ClassSymbol csym = (ClassSymbol)sym; if (csym.owner.kind != PCK) { @@ -1161,17 +885,16 @@ public class ClassWriter extends ClassFile { */ void writeBootstrapMethods() { int alenIdx = writeAttr(names.BootstrapMethods); - databuf.appendChar(bootstrapMethods.size()); - for (Map.Entry entry : bootstrapMethods.entrySet()) { - DynamicMethod.BootstrapMethodsKey bsmKey = entry.getKey(); + databuf.appendChar(poolWriter.bootstrapMethods.size()); + for (BsmKey bsmKey : poolWriter.bootstrapMethods.keySet()) { //write BSM handle - databuf.appendChar(pool.get(entry.getValue().mh)); - Object[] uniqueArgs = bsmKey.getUniqueArgs(); + databuf.appendChar(poolWriter.putConstant(bsmKey.bsm)); + LoadableConstant[] uniqueArgs = bsmKey.staticArgs; //write static args length databuf.appendChar(uniqueArgs.length); //write static args array - for (Object o : uniqueArgs) { - databuf.appendChar(pool.get(o)); + for (LoadableConstant arg : uniqueArgs) { + databuf.appendChar(poolWriter.putConstant(arg)); } } endAttr(alenIdx); @@ -1187,13 +910,13 @@ public class ClassWriter extends ClassFile { pw.println("FIELD " + v.name); pw.println("---" + flagNames(v.flags())); } - databuf.appendChar(pool.put(v.name)); - databuf.appendChar(pool.put(typeSig(v.erasure(types)))); + databuf.appendChar(poolWriter.putName(v.name)); + databuf.appendChar(poolWriter.putDescriptor(v)); int acountIdx = beginAttrs(); int acount = 0; if (v.getConstValue() != null) { int alenIdx = writeAttr(names.ConstantValue); - databuf.appendChar(pool.put(v.getConstValue())); + databuf.appendChar(poolWriter.putConstant(v.getConstValue())); endAttr(alenIdx); acount++; } @@ -1211,8 +934,8 @@ public class ClassWriter extends ClassFile { pw.println("METHOD " + m.name); pw.println("---" + flagNames(m.flags())); } - databuf.appendChar(pool.put(m.name)); - databuf.appendChar(pool.put(typeSig(m.externalType(types)))); + databuf.appendChar(poolWriter.putName(m.name)); + databuf.appendChar(poolWriter.putDescriptor(m)); int acountIdx = beginAttrs(); int acount = 0; if (m.code != null) { @@ -1227,7 +950,7 @@ public class ClassWriter extends ClassFile { int alenIdx = writeAttr(names.Exceptions); databuf.appendChar(thrown.length()); for (List l = thrown; l.nonEmpty(); l = l.tail) - databuf.appendChar(pool.put(l.head.tsym)); + databuf.appendChar(poolWriter.putClass(l.head)); endAttr(alenIdx); acount++; } @@ -1303,9 +1026,8 @@ public class ClassWriter extends ClassFile { && (r.start_pc + r.length) <= code.cp); databuf.appendChar(r.length); VarSymbol sym = var.sym; - databuf.appendChar(pool.put(sym.name)); - Type vartype = sym.erasure(types); - databuf.appendChar(pool.put(typeSig(vartype))); + databuf.appendChar(poolWriter.putName(sym.name)); + databuf.appendChar(poolWriter.putDescriptor(sym)); databuf.appendChar(var.reg); if (needsLocalVariableTypeEntry(var.sym.type)) { nGenericVars++; @@ -1329,8 +1051,8 @@ public class ClassWriter extends ClassFile { // write variable info databuf.appendChar(r.start_pc); databuf.appendChar(r.length); - databuf.appendChar(pool.put(sym.name)); - databuf.appendChar(pool.put(typeSig(sym.type))); + databuf.appendChar(poolWriter.putName(sym.name)); + databuf.appendChar(poolWriter.putSignature(sym)); databuf.appendChar(var.reg); count++; } @@ -1457,14 +1179,10 @@ public class ClassWriter extends ClassFile { break; case CLASS: case ARRAY: - if (debugstackmap) System.out.print("object(" + t + ")"); - databuf.appendByte(7); - databuf.appendChar(pool.put(t)); - break; case TYPEVAR: if (debugstackmap) System.out.print("object(" + types.erasure(t).tsym + ")"); databuf.appendByte(7); - databuf.appendChar(pool.put(types.erasure(t).tsym)); + databuf.appendChar(poolWriter.putClass(types.erasure(t))); break; case UNINITIALIZED_THIS: if (debugstackmap) System.out.print("uninit_this"); @@ -1763,11 +1481,6 @@ public class ClassWriter extends ClassFile { Assert.check((c.flags() & COMPOUND) == 0); databuf.reset(); poolbuf.reset(); - signatureGen.reset(); - pool = c.pool; - innerClasses = null; - innerClassesQueue = null; - bootstrapMethods = new LinkedHashMap<>(); Type supertype = types.supertype(c.type); List interfaces = types.interfaces(c.type); @@ -1793,14 +1506,14 @@ public class ClassWriter extends ClassFile { if (c.owner.kind == MDL) { PackageSymbol unnamed = ((ModuleSymbol) c.owner).unnamedPackage; - databuf.appendChar(pool.put(new ClassSymbol(0, names.module_info, unnamed))); + databuf.appendChar(poolWriter.putClass(new ClassSymbol(0, names.module_info, unnamed))); } else { - databuf.appendChar(pool.put(c)); + databuf.appendChar(poolWriter.putClass(c)); } - databuf.appendChar(supertype.hasTag(CLASS) ? pool.put(supertype.tsym) : 0); + databuf.appendChar(supertype.hasTag(CLASS) ? poolWriter.putClass((ClassSymbol)supertype.tsym) : 0); databuf.appendChar(interfaces.length()); for (List l = interfaces; l.nonEmpty(); l = l.tail) - databuf.appendChar(pool.put(l.head.tsym)); + databuf.appendChar(poolWriter.putClass((ClassSymbol)l.head.tsym)); int fieldsCount = 0; int methodsCount = 0; for (Symbol sym : c.members().getSymbols(NON_RECURSIVE)) { @@ -1808,14 +1521,14 @@ public class ClassWriter extends ClassFile { case VAR: fieldsCount++; break; case MTH: if ((sym.flags() & HYPOTHETICAL) == 0) methodsCount++; break; - case TYP: enterInner((ClassSymbol)sym); break; + case TYP: poolWriter.enterInner((ClassSymbol)sym); break; default : Assert.error(); } } if (c.trans_local != null) { for (ClassSymbol local : c.trans_local) { - enterInner(local); + poolWriter.enterInner(local); } } @@ -1833,12 +1546,7 @@ public class ClassWriter extends ClassFile { sigReq = l.head.allparams().length() != 0; if (sigReq) { int alenIdx = writeAttr(names.Signature); - if (typarams.length() != 0) signatureGen.assembleParamsSig(typarams); - signatureGen.assembleSig(supertype); - for (List l = interfaces; l.nonEmpty(); l = l.tail) - signatureGen.assembleSig(l.head); - databuf.appendChar(pool.put(signatureGen.toName())); - signatureGen.reset(); + databuf.appendChar(poolWriter.putSignature(c)); endAttr(alenIdx); acount++; } @@ -1848,9 +1556,8 @@ public class ClassWriter extends ClassFile { // WHM 6/29/1999: Strip file path prefix. We do it here at // the last possible moment because the sourcefile may be used // elsewhere in error diagnostics. Fixes 4241573. - //databuf.appendChar(c.pool.put(c.sourcefile)); String simpleName = PathFileObject.getSimpleName(c.sourcefile); - databuf.appendChar(c.pool.put(names.fromString(simpleName))); + databuf.appendChar(poolWriter.putName(names.fromString(simpleName))); endAttr(alenIdx); acount++; } @@ -1858,12 +1565,12 @@ public class ClassWriter extends ClassFile { if (genCrt) { // Append SourceID attribute int alenIdx = writeAttr(names.SourceID); - databuf.appendChar(c.pool.put(names.fromString(Long.toString(getLastModified(c.sourcefile))))); + databuf.appendChar(poolWriter.putName(names.fromString(Long.toString(getLastModified(c.sourcefile))))); endAttr(alenIdx); acount++; // Append CompilationID attribute alenIdx = writeAttr(names.CompilationID); - databuf.appendChar(c.pool.put(names.fromString(Long.toString(System.currentTimeMillis())))); + databuf.appendChar(poolWriter.putName(names.fromString(Long.toString(System.currentTimeMillis())))); endAttr(alenIdx); acount++; } @@ -1893,24 +1600,24 @@ public class ClassWriter extends ClassFile { } } - writePool(c.pool); - - if (innerClasses != null) { - writeInnerClasses(); + if (!poolWriter.bootstrapMethods.isEmpty()) { + writeBootstrapMethods(); acount++; } - if (!bootstrapMethods.isEmpty()) { - writeBootstrapMethods(); + if (!poolWriter.innerClasses.isEmpty()) { + writeInnerClasses(); acount++; } endAttrs(acountIdx, acount); - poolbuf.appendBytes(databuf.elems, 0, databuf.length); out.write(poolbuf.elems, 0, poolbuf.length); - pool = c.pool = null; // to conserve space + poolWriter.writePool(out); + poolWriter.reset(); // to save space + + out.write(databuf.elems, 0, databuf.length); } /**Allows subclasses to write additional class attributes diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java index 3af4d4a1f8b..42a56e69d96 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java @@ -27,15 +27,27 @@ package com.sun.tools.javac.jvm; import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.Symbol.*; -import com.sun.tools.javac.code.Types.UniqueType; import com.sun.tools.javac.resources.CompilerProperties.Errors; -import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; +import java.util.function.ToIntBiFunction; +import java.util.function.ToIntFunction; + import static com.sun.tools.javac.code.TypeTag.BOT; import static com.sun.tools.javac.code.TypeTag.INT; import static com.sun.tools.javac.jvm.ByteCodes.*; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Class; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Double; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Fieldref; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Float; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Integer; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_InterfaceMethodref; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Long; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_MethodHandle; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_MethodType; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Methodref; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_String; import static com.sun.tools.javac.jvm.UninitializedType.*; import static com.sun.tools.javac.jvm.ClassWriter.StackMapTableFrame; @@ -72,6 +84,7 @@ public class Code { final Types types; final Symtab syms; + final PoolWriter poolWriter; /*---------- classfile fields: --------------- */ @@ -177,10 +190,6 @@ public class Code { */ Position.LineMap lineMap; - /** The constant pool of the current class. - */ - final Pool pool; - final MethodSymbol meth; private int letExprStackPos = 0; @@ -197,7 +206,7 @@ public class Code { CRTable crt, Symtab syms, Types types, - Pool pool) { + PoolWriter poolWriter) { this.meth = meth; this.fatcode = fatcode; this.lineMap = lineMap; @@ -206,6 +215,7 @@ public class Code { this.crt = crt; this.syms = syms; this.types = types; + this.poolWriter = poolWriter; this.debugCode = debugCode; this.stackMap = stackMap; switch (stackMap) { @@ -218,7 +228,6 @@ public class Code { } state = new State(); lvar = new LocalVar[20]; - this.pool = pool; } @@ -389,12 +398,13 @@ public class Code { /** Emit a ldc (or ldc_w) instruction, taking into account operand size */ - public void emitLdc(int od) { + public void emitLdc(LoadableConstant constant) { + int od = poolWriter.putConstant(constant); if (od <= 255) { - emitop1(ldc1, od); + emitop1(ldc1, od, constant); } else { - emitop2(ldc2, od); + emitop2(ldc2, od, constant); } } @@ -431,11 +441,11 @@ public class Code { /** Emit an invokeinterface instruction. */ - public void emitInvokeinterface(int meth, Type mtype) { + public void emitInvokeinterface(Symbol member, Type mtype) { int argsize = width(mtype.getParameterTypes()); emitop(invokeinterface); if (!alive) return; - emit2(meth); + emit2(poolWriter.putMember(member)); emit1(argsize + 1); emit1(0); state.pop(argsize + 1); @@ -444,14 +454,13 @@ public class Code { /** Emit an invokespecial instruction. */ - public void emitInvokespecial(int meth, Type mtype) { + public void emitInvokespecial(Symbol member, Type mtype) { int argsize = width(mtype.getParameterTypes()); emitop(invokespecial); if (!alive) return; - emit2(meth); - Symbol sym = (Symbol)pool.pool[meth]; + emit2(poolWriter.putMember(member)); state.pop(argsize); - if (sym.isConstructor()) + if (member.isConstructor()) state.markInitialized((UninitializedType)state.peek()); state.pop(1); state.push(mtype.getReturnType()); @@ -459,33 +468,33 @@ public class Code { /** Emit an invokestatic instruction. */ - public void emitInvokestatic(int meth, Type mtype) { + public void emitInvokestatic(Symbol member, Type mtype) { int argsize = width(mtype.getParameterTypes()); emitop(invokestatic); if (!alive) return; - emit2(meth); + emit2(poolWriter.putMember(member)); state.pop(argsize); state.push(mtype.getReturnType()); } /** Emit an invokevirtual instruction. */ - public void emitInvokevirtual(int meth, Type mtype) { + public void emitInvokevirtual(Symbol member, Type mtype) { int argsize = width(mtype.getParameterTypes()); emitop(invokevirtual); if (!alive) return; - emit2(meth); + emit2(poolWriter.putMember(member)); state.pop(argsize + 1); state.push(mtype.getReturnType()); } /** Emit an invokedynamic instruction. */ - public void emitInvokedynamic(int desc, Type mtype) { + public void emitInvokedynamic(DynamicMethodSymbol dynMember, Type mtype) { int argsize = width(mtype.getParameterTypes()); emitop(invokedynamic); if (!alive) return; - emit2(desc); + emit2(poolWriter.putDynamic(dynMember)); emit2(0); state.pop(argsize); state.push(mtype.getReturnType()); @@ -896,6 +905,10 @@ public class Code { /** Emit an opcode with a one-byte operand field. */ public void emitop1(int op, int od) { + emitop1(op, od, null); + } + + public void emitop1(int op, int od, PoolConstant data) { emitop(op); if (!alive) return; emit1(od); @@ -904,7 +917,7 @@ public class Code { state.push(syms.intType); break; case ldc1: - state.push(typeForPool(pool.pool[od])); + state.push(types.constantType((LoadableConstant)data)); break; default: throw new AssertionError(mnem(op)); @@ -912,25 +925,6 @@ public class Code { postop(); } - /** The type of a constant pool entry. */ - private Type typeForPool(Object o) { - if (o instanceof Integer) return syms.intType; - if (o instanceof Float) return syms.floatType; - if (o instanceof String) return syms.stringType; - if (o instanceof Long) return syms.longType; - if (o instanceof Double) return syms.doubleType; - if (o instanceof ClassSymbol) return syms.classType; - if (o instanceof Pool.MethodHandle) return syms.methodHandleType; - if (o instanceof UniqueType) return typeForPool(((UniqueType)o).type); - if (o instanceof Type) { - Type ty = (Type) o; - - if (ty instanceof Type.ArrayType) return syms.classType; - if (ty instanceof Type.MethodType) return syms.methodTypeType; - } - throw new AssertionError("Invalid type of constant pool entry: " + o.getClass()); - } - /** Emit an opcode with a one-byte operand field; * widen if field does not fit in a byte. */ @@ -1003,29 +997,31 @@ public class Code { /** Emit an opcode with a two-byte operand field. */ + public

    void emitop2(int op, P constant, ToIntBiFunction poolFunc) { + int od = poolFunc.applyAsInt(poolWriter, constant); + emitop2(op, od, constant); + } + public void emitop2(int op, int od) { + emitop2(op, od, null); + } + + public void emitop2(int op, int od, PoolConstant data) { emitop(op); if (!alive) return; emit2(od); switch (op) { case getstatic: - state.push(((Symbol)(pool.pool[od])).erasure(types)); + state.push(((Symbol)data).erasure(types)); break; case putstatic: - state.pop(((Symbol)(pool.pool[od])).erasure(types)); + state.pop(((Symbol)data).erasure(types)); break; - case new_: - Symbol sym; - if (pool.pool[od] instanceof UniqueType) { - // Required by change in Gen.makeRef to allow - // annotated types. - // TODO: is this needed anywhere else? - sym = ((UniqueType)(pool.pool[od])).type.tsym; - } else { - sym = (Symbol)(pool.pool[od]); - } - state.push(uninitializedObject(sym.erasure(types), cp-3)); + case new_: { + Type t = (Type)data; + state.push(uninitializedObject(t.tsym.erasure(types), cp-3)); break; + } case sipush: state.push(syms.intType); break; @@ -1053,30 +1049,27 @@ public class Code { markDead(); break; case putfield: - state.pop(((Symbol)(pool.pool[od])).erasure(types)); + state.pop(((Symbol)data).erasure(types)); state.pop(1); // object ref break; case getfield: state.pop(1); // object ref - state.push(((Symbol)(pool.pool[od])).erasure(types)); + state.push(((Symbol)data).erasure(types)); break; case checkcast: { state.pop(1); // object ref - Object o = pool.pool[od]; - Type t = (o instanceof Symbol) - ? ((Symbol)o).erasure(types) - : types.erasure((((UniqueType)o).type)); + Type t = types.erasure((Type)data); state.push(t); break; } case ldc2w: - state.push(typeForPool(pool.pool[od])); + state.push(types.constantType((LoadableConstant)data)); break; case instanceof_: state.pop(1); state.push(syms.intType); break; case ldc2: - state.push(typeForPool(pool.pool[od])); + state.push(types.constantType((LoadableConstant)data)); break; case jsr: break; diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java index 401182aadb8..e79e2a10103 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java @@ -25,6 +25,7 @@ package com.sun.tools.javac.jvm; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant; import com.sun.tools.javac.tree.TreeInfo.PosKind; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; @@ -88,9 +89,9 @@ public class Gen extends JCTree.Visitor { return instance; } - /** Constant pool, reset by genClass. + /** Constant pool writer, set by genClass. */ - private final Pool pool; + final PoolWriter poolWriter; protected Gen(Context context) { context.put(genKey, this); @@ -121,7 +122,7 @@ public class Gen extends JCTree.Visitor { genCrt = options.isSet(XJCOV); debugCode = options.isSet("debug.code"); disableVirtualizedPrivateInvoke = options.isSet("disableVirtualizedPrivateInvoke"); - pool = new Pool(types); + poolWriter = new PoolWriter(types, names); // ignore cldc because we cannot have both stackmap formats this.stackMap = StackMapFormat.JSR202; @@ -252,17 +253,17 @@ public class Gen extends JCTree.Visitor { * @param type The type for which a reference is inserted. */ int makeRef(DiagnosticPosition pos, Type type) { - checkDimension(pos, type); - if (type.isAnnotated()) { - return pool.put((Object)type); - } else { - return pool.put(type.hasTag(CLASS) ? (Object)type.tsym : (Object)type); - } + return poolWriter.putClass(checkDimension(pos, type)); } /** Check if the given type is an array with too many dimensions. */ - private void checkDimension(DiagnosticPosition pos, Type t) { + private Type checkDimension(DiagnosticPosition pos, Type t) { + checkDimensionInternal(pos, t); + return t; + } + + private void checkDimensionInternal(DiagnosticPosition pos, Type t) { switch (t.getTag()) { case METHOD: checkDimension(pos, t.getReturnType()); @@ -516,7 +517,7 @@ public class Gen extends JCTree.Visitor { if (nerrs != 0 || // only complain about a long string once constValue == null || !(constValue instanceof String) || - ((String)constValue).length() < Pool.MAX_STRING_LENGTH) + ((String)constValue).length() < PoolWriter.MAX_STRING_LENGTH) return; log.error(pos, Errors.LimitString); nerrs++; @@ -806,7 +807,7 @@ public class Gen extends JCTree.Visitor { @Override public void visitIdent(JCIdent tree) { if (tree.sym.owner instanceof ClassSymbol) { - pool.put(tree.sym.owner); + poolWriter.putClass((ClassSymbol)tree.sym.owner); } } @@ -1007,8 +1008,8 @@ public class Gen extends JCTree.Visitor { : null, syms, types, - pool); - items = new Items(pool, code, syms, types); + poolWriter); + items = new Items(poolWriter, code, syms, types); if (code.debugCode) { System.err.println(meth + " for body " + tree); } @@ -1886,7 +1887,7 @@ public class Gen extends JCTree.Visitor { Assert.check(tree.encl == null && tree.def == null); setTypeAnnotationPositions(tree.pos); - code.emitop2(new_, makeRef(tree.pos(), tree.type)); + code.emitop2(new_, checkDimension(tree.pos(), tree.type), PoolWriter::putClass); code.emitop0(dup); // Generate code for all arguments, where the expected types are @@ -2162,7 +2163,7 @@ public class Gen extends JCTree.Visitor { if (!tree.clazz.type.isPrimitive() && !types.isSameType(tree.expr.type, tree.clazz.type) && types.asSuper(tree.expr.type, tree.clazz.type.tsym) == null) { - code.emitop2(checkcast, makeRef(tree.pos(), tree.clazz.type)); + code.emitop2(checkcast, checkDimension(tree.pos(), tree.clazz.type), PoolWriter::putClass); } } @@ -2221,7 +2222,7 @@ public class Gen extends JCTree.Visitor { Symbol sym = tree.sym; if (tree.name == names._class) { - code.emitLdc(makeRef(tree.pos(), tree.selected.type)); + code.emitLdc((LoadableConstant)checkDimension(tree.pos(), tree.selected.type)); result = items.makeStackItem(pt); return; } @@ -2305,7 +2306,7 @@ public class Gen extends JCTree.Visitor { code.endScopes(limit); } - private void generateReferencesToPrunedTree(ClassSymbol classSymbol, Pool pool) { + private void generateReferencesToPrunedTree(ClassSymbol classSymbol) { List prunedInfo = lower.prunedTree.get(classSymbol); if (prunedInfo != null) { for (JCTree prunedTree: prunedInfo) { @@ -2331,12 +2332,10 @@ public class Gen extends JCTree.Visitor { ClassSymbol c = cdef.sym; this.toplevel = env.toplevel; this.endPosTable = toplevel.endPositions; - c.pool = pool; - pool.reset(); /* method normalizeDefs() can add references to external classes into the constant pool */ cdef.defs = normalizeDefs(cdef.defs, c); - generateReferencesToPrunedTree(c, pool); + generateReferencesToPrunedTree(c); Env localEnv = new Env<>(cdef, new GenContext()); localEnv.toplevel = env.toplevel; localEnv.enclClass = cdef; @@ -2344,7 +2343,7 @@ public class Gen extends JCTree.Visitor { for (List l = cdef.defs; l.nonEmpty(); l = l.tail) { genDef(l.head, localEnv); } - if (pool.numEntries() > Pool.MAX_ENTRIES) { + if (poolWriter.size() > PoolWriter.MAX_ENTRIES) { log.error(cdef.pos(), Errors.LimitPool); nerrs++; } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java index 3e1d7c68eb6..19a3d9be40a 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java @@ -29,6 +29,8 @@ import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Type.*; import com.sun.tools.javac.jvm.Code.*; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant.BasicConstant; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.util.Assert; @@ -50,9 +52,9 @@ import static com.sun.tools.javac.jvm.ByteCodes.*; */ public class Items { - /** The current constant pool. + /** The current constant pool writer. */ - Pool pool; + PoolWriter poolWriter; /** The current code buffer. */ @@ -72,9 +74,9 @@ public class Items { private final Item superItem; private final Item[] stackItem = new Item[TypeCodeCount]; - public Items(Pool pool, Code code, Symtab syms, Types types) { + public Items(PoolWriter poolWriter, Code code, Symtab syms, Types types) { this.code = code; - this.pool = pool; + this.poolWriter = poolWriter; this.types = types; voidItem = new Item(VOIDcode) { public String toString() { return "void"; } @@ -444,18 +446,18 @@ public class Items { } Item load() { - code.emitop2(getstatic, pool.put(member)); + code.emitop2(getstatic, member, PoolWriter::putMember); return stackItem[typecode]; } void store() { - code.emitop2(putstatic, pool.put(member)); + code.emitop2(putstatic, member, PoolWriter::putMember); } Item invoke() { MethodType mtype = (MethodType)member.erasure(types); int rescode = Code.typecode(mtype.restype); - code.emitInvokestatic(pool.put(member), mtype); + code.emitInvokestatic(member, mtype); return stackItem[rescode]; } @@ -484,7 +486,7 @@ public class Items { // assert target.hasNativeInvokeDynamic(); MethodType mtype = (MethodType)member.erasure(types); int rescode = Code.typecode(mtype.restype); - code.emitInvokedynamic(pool.put(member), mtype); + code.emitInvokedynamic((DynamicMethodSymbol)member, mtype); return stackItem[rescode]; } @@ -512,23 +514,23 @@ public class Items { } Item load() { - code.emitop2(getfield, pool.put(member)); + code.emitop2(getfield, member, PoolWriter::putMember); return stackItem[typecode]; } void store() { - code.emitop2(putfield, pool.put(member)); + code.emitop2(putfield, member, PoolWriter::putMember); } Item invoke() { MethodType mtype = (MethodType)member.externalType(types); int rescode = Code.typecode(mtype.restype); if ((member.owner.flags() & Flags.INTERFACE) != 0 && !nonvirtual) { - code.emitInvokeinterface(pool.put(member), mtype); + code.emitInvokeinterface(member, mtype); } else if (nonvirtual) { - code.emitInvokespecial(pool.put(member), mtype); + code.emitInvokespecial(member, mtype); } else { - code.emitInvokevirtual(pool.put(member), mtype); + code.emitInvokevirtual(member, mtype); } return stackItem[rescode]; } @@ -560,26 +562,50 @@ public class Items { /** The literal's value. */ - Object value; + final LoadableConstant value; ImmediateItem(Type type, Object value) { super(Code.typecode(type)); - this.value = value; + switch (typecode) { + case BYTEcode: + case SHORTcode: + case CHARcode: + case INTcode: + this.value = LoadableConstant.Int((int)value); + break; + case LONGcode: + this.value = LoadableConstant.Long((long)value); + break; + case FLOATcode: + this.value = LoadableConstant.Float((float)value); + break; + case DOUBLEcode: + this.value = LoadableConstant.Double((double)value); + break; + case OBJECTcode: + this.value = LoadableConstant.String((String)value); + break; + default: + throw new UnsupportedOperationException("unsupported tag: " + typecode); + } } private void ldc() { - int idx = pool.put(value); if (typecode == LONGcode || typecode == DOUBLEcode) { - code.emitop2(ldc2w, idx); + code.emitop2(ldc2w, value, PoolWriter::putConstant); } else { - code.emitLdc(idx); + code.emitLdc(value); } } + private Number numericValue() { + return (Number)((BasicConstant)value).data; + } + Item load() { switch (typecode) { case INTcode: case BYTEcode: case SHORTcode: case CHARcode: - int ival = ((Number)value).intValue(); + int ival = numericValue().intValue(); if (-1 <= ival && ival <= 5) code.emitop0(iconst_0 + ival); else if (Byte.MIN_VALUE <= ival && ival <= Byte.MAX_VALUE) @@ -590,14 +616,14 @@ public class Items { ldc(); break; case LONGcode: - long lval = ((Number)value).longValue(); + long lval = numericValue().longValue(); if (lval == 0 || lval == 1) code.emitop0(lconst_0 + (int)lval); else ldc(); break; case FLOATcode: - float fval = ((Number)value).floatValue(); + float fval = numericValue().floatValue(); if (isPosZero(fval) || fval == 1.0 || fval == 2.0) code.emitop0(fconst_0 + (int)fval); else { @@ -605,7 +631,7 @@ public class Items { } break; case DOUBLEcode: - double dval = ((Number)value).doubleValue(); + double dval = numericValue().doubleValue(); if (isPosZero(dval) || dval == 1.0) code.emitop0(dconst_0 + (int)dval); else @@ -632,7 +658,7 @@ public class Items { } CondItem mkCond() { - int ival = ((Number)value).intValue(); + int ival = numericValue().intValue(); return makeCondItem(ival != 0 ? goto_ : dontgoto); } @@ -647,31 +673,31 @@ public class Items { else return new ImmediateItem( syms.intType, - ((Number)value).intValue()); + numericValue().intValue()); case LONGcode: return new ImmediateItem( syms.longType, - ((Number)value).longValue()); + numericValue().longValue()); case FLOATcode: return new ImmediateItem( syms.floatType, - ((Number)value).floatValue()); + numericValue().floatValue()); case DOUBLEcode: return new ImmediateItem( syms.doubleType, - ((Number)value).doubleValue()); + numericValue().doubleValue()); case BYTEcode: return new ImmediateItem( syms.byteType, - (int)(byte)((Number)value).intValue()); + (int)(byte)numericValue().intValue()); case CHARcode: return new ImmediateItem( syms.charType, - (int)(char)((Number)value).intValue()); + (int)(char)numericValue().intValue()); case SHORTcode: return new ImmediateItem( syms.shortType, - (int)(short)((Number)value).intValue()); + (int)(short)numericValue().intValue()); default: return super.coerce(targetcode); } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java index 36da2b3c4a0..67441834cf7 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java @@ -24,6 +24,9 @@ */ package com.sun.tools.javac.jvm; +import com.sun.tools.javac.util.ByteBuffer; +import com.sun.tools.javac.util.Name.NameMapper; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; @@ -55,16 +58,15 @@ public class ModuleNameReader { /** The buffer containing the currently read class file. */ - private byte[] buf = new byte[INITIAL_BUFFER_SIZE]; + private ByteBuffer buf = new ByteBuffer(INITIAL_BUFFER_SIZE); /** The current input pointer. */ private int bp; - /** For every constant pool entry, an index into buf where the - * defining section of the entry is found. + /** The constant pool reader. */ - private int[] poolIdx; + private PoolReader reader; public ModuleNameReader() { } @@ -83,7 +85,8 @@ public class ModuleNameReader { public String readModuleName(InputStream in) throws IOException, BadClassFile { bp = 0; - buf = readInputStream(buf, in); + buf.reset(); + buf.appendStream(in); int magic = nextInt(); if (magic != JAVA_MAGIC) @@ -94,7 +97,8 @@ public class ModuleNameReader { if (majorVersion < 53) throw new BadClassFile("bad major version number for module: " + majorVersion); - indexPool(); + reader = new PoolReader(buf); + bp = reader.readPool(buf, bp); int access_flags = nextChar(); if (access_flags != 0x8000) @@ -110,8 +114,8 @@ public class ModuleNameReader { for (int i = 0; i < attributes_count; i++) { int attr_name = nextChar(); int attr_length = nextInt(); - if (getUtf8Value(attr_name, false).equals("Module") && attr_length > 2) { - return getModuleName(nextChar()); + if (reader.peekName(attr_name, utf8Mapper(false)).equals("Module") && attr_length > 2) { + return reader.peekModuleName(nextChar(), utf8Mapper(true)); } else { // skip over unknown attributes bp += attr_length; @@ -125,132 +129,26 @@ public class ModuleNameReader { throw new BadClassFile("invalid " + name + " for module: " + count); } - /** Extract a character at position bp from buf. - */ - char getChar(int bp) { - return - (char)(((buf[bp] & 0xFF) << 8) + (buf[bp+1] & 0xFF)); - } - /** Read a character. */ char nextChar() { - return (char)(((buf[bp++] & 0xFF) << 8) + (buf[bp++] & 0xFF)); + char res = buf.getChar(bp); + bp += 2; + return res; } /** Read an integer. */ int nextInt() { - return - ((buf[bp++] & 0xFF) << 24) + - ((buf[bp++] & 0xFF) << 16) + - ((buf[bp++] & 0xFF) << 8) + - (buf[bp++] & 0xFF); + int res = buf.getInt(bp); + bp += 4; + return res; } - /** Index all constant pool entries, writing their start addresses into - * poolIdx. - */ - void indexPool() throws BadClassFile { - poolIdx = new int[nextChar()]; - int i = 1; - while (i < poolIdx.length) { - poolIdx[i++] = bp; - byte tag = buf[bp++]; - switch (tag) { - case CONSTANT_Utf8: case CONSTANT_Unicode: { - int len = nextChar(); - bp = bp + len; - break; - } - case CONSTANT_Class: - case CONSTANT_String: - case CONSTANT_MethodType: - case CONSTANT_Module: - case CONSTANT_Package: - bp = bp + 2; - break; - case CONSTANT_MethodHandle: - bp = bp + 3; - break; - case CONSTANT_Fieldref: - case CONSTANT_Methodref: - case CONSTANT_InterfaceMethodref: - case CONSTANT_NameandType: - case CONSTANT_Integer: - case CONSTANT_Float: - case CONSTANT_InvokeDynamic: - bp = bp + 4; - break; - case CONSTANT_Long: - case CONSTANT_Double: - bp = bp + 8; - i++; - break; - default: - throw new BadClassFile("malformed constant pool"); - } - } + NameMapper utf8Mapper(boolean internalize) { + return internalize ? + (buf, offset, len) -> new String(ClassFile.internalize(buf, offset, len)) : + String::new; } - String getUtf8Value(int index, boolean internalize) throws BadClassFile { - int utf8Index = poolIdx[index]; - if (buf[utf8Index] == CONSTANT_Utf8) { - int len = getChar(utf8Index + 1); - int start = utf8Index + 3; - if (internalize) { - return new String(ClassFile.internalize(buf, start, len)); - } else { - return new String(buf, start, len); - } - } - throw new BadClassFile("bad name at index " + index); - } - - String getModuleName(int index) throws BadClassFile { - int infoIndex = poolIdx[index]; - if (buf[infoIndex] == CONSTANT_Module) { - return getUtf8Value(getChar(infoIndex + 1), true); - } else { - throw new BadClassFile("bad module name at index " + index); - } - } - - private static byte[] readInputStream(byte[] buf, InputStream s) throws IOException { - try { - buf = ensureCapacity(buf, s.available()); - int r = s.read(buf); - int bp = 0; - while (r != -1) { - bp += r; - buf = ensureCapacity(buf, bp); - r = s.read(buf, bp, buf.length - bp); - } - return buf; - } finally { - try { - s.close(); - } catch (IOException e) { - /* Ignore any errors, as this stream may have already - * thrown a related exception which is the one that - * should be reported. - */ - } - } - } - - /* - * ensureCapacity will increase the buffer as needed, taking note that - * the new buffer will always be greater than the needed and never - * exactly equal to the needed size or bp. If equal then the read (above) - * will infinitely loop as buf.length - bp == 0. - */ - private static byte[] ensureCapacity(byte[] buf, int needed) { - if (buf.length <= needed) { - byte[] old = buf; - buf = new byte[Integer.highestOneBit(needed) << 1]; - System.arraycopy(old, 0, buf, 0, old.length); - } - return buf; - } } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java deleted file mode 100644 index 1611b6946e6..00000000000 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java +++ /dev/null @@ -1,372 +0,0 @@ -/* - * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. 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 com.sun.tools.javac.jvm; - -import com.sun.tools.javac.code.Symbol; -import com.sun.tools.javac.code.Symbol.*; -import com.sun.tools.javac.code.TypeTag; -import com.sun.tools.javac.code.Type; -import com.sun.tools.javac.code.Types; -import com.sun.tools.javac.code.Types.UniqueType; - -import com.sun.tools.javac.util.ArrayUtils; -import com.sun.tools.javac.util.Assert; -import com.sun.tools.javac.util.Filter; -import com.sun.tools.javac.util.Name; - -import java.util.*; - -import com.sun.tools.javac.util.DefinedBy; -import com.sun.tools.javac.util.DefinedBy.Api; - -import static com.sun.tools.javac.code.Kinds.*; -import static com.sun.tools.javac.code.Kinds.Kind.*; - -/** An internal structure that corresponds to the constant pool of a classfile. - * - *

    This is NOT part of any supported API. - * If you write code that depends on this, you do so at your own risk. - * This code and its internal interfaces are subject to change or - * deletion without notice. - */ -public class Pool { - - public static final int MAX_ENTRIES = 0xFFFF; - public static final int MAX_STRING_LENGTH = 0xFFFF; - - /** Index of next constant to be entered. - */ - int pp; - - /** The initial pool buffer. - */ - Object[] pool; - - /** A hashtable containing all constants in the pool. - */ - Map indices; - - Types types; - - /** Construct a pool with given number of elements and element array. - */ - public Pool(int pp, Object[] pool, Types types) { - this.pp = pp; - this.pool = pool; - this.types = types; - this.indices = new HashMap<>(pool.length); - for (int i = 1; i < pp; i++) { - if (pool[i] != null) indices.put(pool[i], i); - } - } - - /** Construct an empty pool. - */ - public Pool(Types types) { - this(1, new Object[64], types); - } - - /** Return the number of entries in the constant pool. - */ - public int numEntries() { - return pp; - } - - /** Remove everything from this pool. - */ - public void reset() { - pp = 1; - indices.clear(); - } - - /** Place an object in the pool, unless it is already there. - * If object is a symbol also enter its owner unless the owner is a - * package. Return the object's index in the pool. - */ - public int put(Object value) { - value = makePoolValue(value); - Assert.check(!(value instanceof Type.TypeVar)); - Assert.check(!(value instanceof Types.UniqueType && - ((UniqueType) value).type instanceof Type.TypeVar)); - Integer index = indices.get(value); - if (index == null) { - index = pp; - indices.put(value, index); - pool = ArrayUtils.ensureCapacity(pool, pp); - pool[pp++] = value; - if (value instanceof Long || value instanceof Double) { - pool = ArrayUtils.ensureCapacity(pool, pp); - pool[pp++] = null; - } - } - return index.intValue(); - } - - Object makePoolValue(Object o) { - if (o instanceof DynamicMethodSymbol) { - return new DynamicMethod((DynamicMethodSymbol)o, types); - } else if (o instanceof MethodSymbol) { - return new Method((MethodSymbol)o, types); - } else if (o instanceof VarSymbol) { - return new Variable((VarSymbol)o, types); - } else if (o instanceof Type) { - Type t = (Type)o; - // ClassRefs can come from ClassSymbols or from Types. - // Return the symbol for these types to avoid duplicates - // in the constant pool - if (t.hasTag(TypeTag.CLASS)) - return t.tsym; - else - return new UniqueType(t, types); - } else { - return o; - } - } - - /** Return the given object's index in the pool, - * or -1 if object is not in there. - */ - public int get(Object o) { - Integer n = indices.get(o); - return n == null ? -1 : n.intValue(); - } - - static class Method extends DelegatedSymbol { - UniqueType uniqueType; - Method(MethodSymbol m, Types types) { - super(m); - this.uniqueType = new UniqueType(m.type, types); - } - @DefinedBy(Api.LANGUAGE_MODEL) - public boolean equals(Object any) { - if (!(any instanceof Method)) return false; - MethodSymbol o = ((Method)any).other; - MethodSymbol m = this.other; - return - o.name == m.name && - o.owner == m.owner && - ((Method)any).uniqueType.equals(uniqueType); - } - @DefinedBy(Api.LANGUAGE_MODEL) - public int hashCode() { - MethodSymbol m = this.other; - return - m.name.hashCode() * 33 + - m.owner.hashCode() * 9 + - uniqueType.hashCode(); - } - } - - public static class DynamicMethod extends Method { - public Object[] uniqueStaticArgs; - - public DynamicMethod(DynamicMethodSymbol m, Types types) { - super(m, types); - uniqueStaticArgs = getUniqueTypeArray(m.staticArgs, types); - } - - @Override @DefinedBy(Api.LANGUAGE_MODEL) - public boolean equals(Object any) { - return equalsImpl(any, true); - } - - protected boolean equalsImpl(Object any, boolean includeDynamicArgs) { - if (includeDynamicArgs && !super.equals(any)) return false; - if (!(any instanceof DynamicMethod)) return false; - DynamicMethodSymbol dm1 = (DynamicMethodSymbol)other; - DynamicMethodSymbol dm2 = (DynamicMethodSymbol)((DynamicMethod)any).other; - return dm1.bsm == dm2.bsm && - dm1.bsmKind == dm2.bsmKind && - Arrays.equals(uniqueStaticArgs, - ((DynamicMethod)any).uniqueStaticArgs); - } - - @Override @DefinedBy(Api.LANGUAGE_MODEL) - public int hashCode() { - return hashCodeImpl(true); - } - - protected int hashCodeImpl(boolean includeDynamicArgs) { - int hash = includeDynamicArgs ? super.hashCode() : 0; - DynamicMethodSymbol dm = (DynamicMethodSymbol)other; - hash += dm.bsmKind * 7 + - dm.bsm.hashCode() * 11; - for (int i = 0; i < dm.staticArgs.length; i++) { - hash += (uniqueStaticArgs[i].hashCode() * 23); - } - return hash; - } - - private Object[] getUniqueTypeArray(Object[] objects, Types types) { - Object[] result = new Object[objects.length]; - for (int i = 0; i < objects.length; i++) { - if (objects[i] instanceof Type) { - result[i] = new UniqueType((Type)objects[i], types); - } else { - result[i] = objects[i]; - } - } - return result; - } - - static class BootstrapMethodsKey extends DynamicMethod { - BootstrapMethodsKey(DynamicMethodSymbol m, Types types) { - super(m, types); - } - - @Override @DefinedBy(Api.LANGUAGE_MODEL) - public boolean equals(Object any) { - return equalsImpl(any, false); - } - - @Override @DefinedBy(Api.LANGUAGE_MODEL) - public int hashCode() { - return hashCodeImpl(false); - } - - Object[] getUniqueArgs() { - return uniqueStaticArgs; - } - } - - static class BootstrapMethodsValue { - final MethodHandle mh; - final int index; - - public BootstrapMethodsValue(MethodHandle mh, int index) { - this.mh = mh; - this.index = index; - } - } - } - - static class Variable extends DelegatedSymbol { - UniqueType uniqueType; - Variable(VarSymbol v, Types types) { - super(v); - this.uniqueType = new UniqueType(v.type, types); - } - @DefinedBy(Api.LANGUAGE_MODEL) - public boolean equals(Object any) { - if (!(any instanceof Variable)) return false; - VarSymbol o = ((Variable)any).other; - VarSymbol v = other; - return - o.name == v.name && - o.owner == v.owner && - ((Variable)any).uniqueType.equals(uniqueType); - } - @DefinedBy(Api.LANGUAGE_MODEL) - public int hashCode() { - VarSymbol v = other; - return - v.name.hashCode() * 33 + - v.owner.hashCode() * 9 + - uniqueType.hashCode(); - } - } - - public static class MethodHandle { - - /** Reference kind - see ClassFile */ - int refKind; - - /** Reference symbol */ - Symbol refSym; - - UniqueType uniqueType; - - public MethodHandle(int refKind, Symbol refSym, Types types) { - this.refKind = refKind; - this.refSym = refSym; - this.uniqueType = new UniqueType(this.refSym.type, types); - checkConsistent(); - } - public boolean equals(Object other) { - if (!(other instanceof MethodHandle)) return false; - MethodHandle mr = (MethodHandle) other; - if (mr.refKind != refKind) return false; - Symbol o = mr.refSym; - return - o.name == refSym.name && - o.owner == refSym.owner && - ((MethodHandle)other).uniqueType.equals(uniqueType); - } - public int hashCode() { - return - refKind * 65 + - refSym.name.hashCode() * 33 + - refSym.owner.hashCode() * 9 + - uniqueType.hashCode(); - } - - /** - * Check consistency of reference kind and symbol (see JVMS 4.4.8) - */ - @SuppressWarnings("fallthrough") - private void checkConsistent() { - boolean staticOk = false; - Kind expectedKind = null; - Filter nameFilter = nonInitFilter; - boolean interfaceOwner = false; - switch (refKind) { - case ClassFile.REF_getStatic: - case ClassFile.REF_putStatic: - staticOk = true; - case ClassFile.REF_getField: - case ClassFile.REF_putField: - expectedKind = VAR; - break; - case ClassFile.REF_newInvokeSpecial: - nameFilter = initFilter; - expectedKind = MTH; - break; - case ClassFile.REF_invokeInterface: - interfaceOwner = true; - expectedKind = MTH; - break; - case ClassFile.REF_invokeStatic: - interfaceOwner = true; - staticOk = true; - case ClassFile.REF_invokeVirtual: - expectedKind = MTH; - break; - case ClassFile.REF_invokeSpecial: - interfaceOwner = true; - expectedKind = MTH; - break; - } - Assert.check(!refSym.isStatic() || staticOk); - Assert.check(refSym.kind == expectedKind); - Assert.check(nameFilter.accepts(refSym.name)); - Assert.check(!refSym.owner.isInterface() || interfaceOwner); - } - //where - Filter nonInitFilter = n -> (n != n.table.names.init && n != n.table.names.clinit); - - Filter initFilter = n -> n == n.table.names.init; - } -} diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolConstant.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolConstant.java new file mode 100644 index 00000000000..0fc2cb76a87 --- /dev/null +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolConstant.java @@ -0,0 +1,224 @@ +/* + * 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 com.sun.tools.javac.jvm; + +import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.Types; +import com.sun.tools.javac.code.Types.UniqueType; +import com.sun.tools.javac.util.List; +import com.sun.tools.javac.util.Name; +import com.sun.tools.javac.util.Pair; + +import java.util.Objects; +import java.util.stream.Stream; + +/** + * This interface models all javac entities that can be used to represent constant pool entries. + * A pool constant entity must (i) be associated with a constant pool entry tag and have a function + * which generates a key for the desired pool entry (so as to avoid duplicate entries when writing the + * constant pool). + */ +public interface PoolConstant { + + /** + * The constant pool entry key. + */ + default Object poolKey(Types types) { return this; } + + /** + * The constant pool entry tag. + */ + int poolTag(); + + /** + * The root of pool constants that can be loaded (e.g. with {@code ldc}, or appear as static + * arguments to a bootstrap method. + */ + interface LoadableConstant extends PoolConstant { + + /** + * Create a pool constant describing a given {@code int} value. + */ + static LoadableConstant Int(int i) { + return new BasicConstant(ClassFile.CONSTANT_Integer, i); + } + + /** + * Create a pool constant describing a given {@code float} value. + */ + static LoadableConstant Float(float f) { + return new BasicConstant(ClassFile.CONSTANT_Float, f); + } + + /** + * Create a pool constant describing a given {@code long} value. + */ + static LoadableConstant Long(long l) { + return new BasicConstant(ClassFile.CONSTANT_Long, l); + } + + /** + * Create a pool constant describing a given {@code double} value. + */ + static LoadableConstant Double(double d) { + return new BasicConstant(ClassFile.CONSTANT_Double, d); + } + + /** + * Create a pool constant describing a given {@code String} value. + */ + static LoadableConstant String(String s) { + return new BasicConstant(ClassFile.CONSTANT_String, s); + } + + /** + * This class models a pool constant of given basic type, one of {@code int}, {@code float}, + * {@code long}, {@code double} or {@code String}. + */ + class BasicConstant implements LoadableConstant { + int tag; + Object data; + + private BasicConstant(int tag, Object data) { + this.tag = tag; + this.data = data; + } + + @Override + public int poolTag() { + return tag; + } + + @Override + public Object poolKey(Types types) { + return data; + } + } + } + + /** + * This interface models a dynamic pool constant (either of kind {@code InvokeDynamic} or + * {@code ConstantDynamic}). In addition to the functionalities provided by the base interface, + * a dynamic pool constant must expose its dynamic type, bootstrap method and static argument list. + * Finally, a dynamic constant must have a way to compute a bootstrap method key - that is, + * a unique key for the bootstrap method entry it refers to, to avoid duplicates when writing + * the {@code BootstrapMethods} attribute. + */ + interface Dynamic extends PoolConstant { + + /** + * The dynamic constant's dynamic type. + */ + PoolConstant dynamicType(); + + /** + * The dynamic constant's static argument list. + */ + LoadableConstant[] staticArgs(); + + /** + * The dynamic constant's bootstrap method. + */ + LoadableConstant bootstrapMethod(); + + default BsmKey bsmKey(Types types) { + return new BsmKey(types, bootstrapMethod(), staticArgs()); + } + + @Override + default Object poolKey(Types types) { + return new Pair<>(bsmKey(types), dynamicType().poolKey(types)); + } + + /** + * A class modelling a bootstrap method key. + */ + class BsmKey { + /** + * The key's bootstrap method constant. + */ + public final LoadableConstant bsm; + + /** + * The key's static argument list. + */ + public final LoadableConstant[] staticArgs; + + private final Object bsmKey; + private final List staticArgKeys; + + private BsmKey(Types types, LoadableConstant bsm, LoadableConstant[] staticArgs) { + this.bsm = bsm; + this.bsmKey = bsm.poolKey(types); + this.staticArgs = staticArgs; + this.staticArgKeys = Stream.of(staticArgs) + .map(p -> p.poolKey(types)) + .collect(List.collector()); + } + + @Override + public int hashCode() { + return bsmKey.hashCode() + + staticArgKeys.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof BsmKey) { + BsmKey other = (BsmKey)obj; + return Objects.equals(bsmKey, other.bsmKey) && + Objects.equals(staticArgKeys, other.staticArgKeys); + } else { + return false; + } + } + } + } + + /** + * A pool constant implememntation describing a name and type pool entry. + */ + final class NameAndType implements PoolConstant { + + final Name name; + final Type type; + + NameAndType(Name name, Type type) { + this.name = name; + this.type = type; + } + + @Override + public int poolTag() { + return ClassFile.CONSTANT_NameandType; + } + + @Override + public Object poolKey(Types types) { + return new Pair<>(name, new UniqueType(type, types)); + } + } +} diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolReader.java new file mode 100644 index 00000000000..0a1e37ee7be --- /dev/null +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolReader.java @@ -0,0 +1,329 @@ +/* + * 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 com.sun.tools.javac.jvm; + +import com.sun.tools.javac.code.Symbol.ClassSymbol; +import com.sun.tools.javac.code.Symbol.ModuleSymbol; +import com.sun.tools.javac.code.Symbol.PackageSymbol; +import com.sun.tools.javac.code.Symtab; +import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.jvm.PoolConstant.NameAndType; +import com.sun.tools.javac.util.ByteBuffer; +import com.sun.tools.javac.util.Name; +import com.sun.tools.javac.util.Name.NameMapper; +import com.sun.tools.javac.util.Names; + +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Class; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Double; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Dynamic; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Fieldref; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Float; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Integer; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_InterfaceMethodref; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_InvokeDynamic; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Long; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_MethodHandle; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Methodref; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_MethodType; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Module; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_NameandType; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Package; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_String; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Utf8; +import static com.sun.tools.javac.jvm.ClassFile.internalize; + +/** + * Pool interface towards {@code ClassReader}. Exposes methods to decode and read javac entities + * from the constant pool. + * + *

    This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice. + */ +public class PoolReader { + + private final ClassReader reader; + private final ByteBuffer buf; + private final Names names; + private final Symtab syms; + + private ImmutablePoolHelper pool; + + PoolReader(ByteBuffer buf) { + this(null, buf, null, null); + } + + PoolReader(ClassReader reader, Names names, Symtab syms) { + this(reader, reader.buf, names, syms); + } + + PoolReader(ClassReader reader, ByteBuffer buf, Names names, Symtab syms) { + this.reader = reader; + this.buf = buf; + this.names = names; + this.syms = syms; + } + + /** + * Get a class symbol from the pool at given index. + */ + ClassSymbol getClass(int index) { + return pool.readIfNeeded(index); + } + + /** + * Get class name without resolving + */ + Z peekClassName(int index, NameMapper mapper) { + return peekName(buf.getChar(pool.offset(index)), mapper); + } + + /** + * Get package name without resolving + */ + Z peekPackageName(int index, NameMapper mapper) { + return peekName(buf.getChar(pool.offset(index)), mapper); + } + + /** + * Get module name without resolving + */ + Z peekModuleName(int index, NameMapper mapper) { + return peekName(buf.getChar(pool.offset(index)), mapper); + } + + /** + * Get a module symbol from the pool at given index. + */ + ModuleSymbol getModule(int index) { + return pool.readIfNeeded(index); + } + + /** + * Get a module symbol from the pool at given index. + */ + PackageSymbol getPackage(int index) { + return pool.readIfNeeded(index); + } + + /** + * Peek a name from the pool at given index without resolving. + */ + Z peekName(int index, Name.NameMapper mapper) { + return getUtf8(index, mapper); + } + + /** + * Get a name from the pool at given index. + */ + Name getName(int index) { + return pool.readIfNeeded(index); + } + + /** + * Get a type from the pool at given index. + */ + Type getType(int index) { + return getName(index).map(reader::sigToType); + } + + /** + * Get a name and type pair from the pool at given index. + */ + NameAndType getNameAndType(int index) { + return pool.readIfNeeded(index); + } + + /** + * Get a class symbol from the pool at given index. + */ + Object getConstant(int index) { + return pool.readIfNeeded(index); + } + + boolean hasTag(int index, int tag) { + return pool.tag(index) == tag; + } + + private Z getUtf8(int index, NameMapper mapper) { + int tag = pool.tag(index); + if (tag == CONSTANT_Utf8) { + int offset = pool.offset(index); + int len = pool.poolbuf.getChar(offset); + return mapper.map(pool.poolbuf.elems, offset + 2, len); + } else { + throw new AssertionError("Unexpected constant tag: " + tag); + } + } + + private Object resolve(ByteBuffer poolbuf, int tag, int offset) { + switch (tag) { + case CONSTANT_Utf8: { + int len = poolbuf.getChar(offset); + return names.fromUtf(poolbuf.elems, offset + 2, len); + } + case CONSTANT_Class: { + int index = poolbuf.getChar(offset); + Name name = names.fromUtf(getName(index).map(ClassFile::internalize)); + return syms.enterClass(reader.currentModule, name); + } + case CONSTANT_NameandType: { + Name name = getName(poolbuf.getChar(offset)); + Type type = getType(poolbuf.getChar(offset + 2)); + return new NameAndType(name, type); + } + case CONSTANT_Integer: + return poolbuf.getInt(offset); + case CONSTANT_Float: + return poolbuf.getFloat(offset); + case CONSTANT_Long: + return poolbuf.getLong(offset); + case CONSTANT_Double: + return poolbuf.getDouble(offset); + case CONSTANT_String: + return getName(poolbuf.getChar(offset)).toString(); + case CONSTANT_Package: { + Name name = getName(poolbuf.getChar(offset)); + return syms.enterPackage(reader.currentModule, names.fromUtf(internalize(name))); + } + case CONSTANT_Module: { + Name name = getName(poolbuf.getChar(offset)); + return syms.enterModule(name); + } + default: + throw new AssertionError("Unexpected constant tag: " + tag); + } + } + + /** + * Parse all constant pool entries, and keep track of their offsets. For performance and laziness + * reasons, it would be unwise to eagerly turn all pool entries into corresponding javac + * entities. First, not all entries are actually going to be read/used by javac; secondly, + * there are cases where creating a symbol too early might result in issues (hence methods like + * {@link PoolReader#peekClassName(int, NameMapper)}. + */ + int readPool(ByteBuffer poolbuf, int offset) { + int poolSize = poolbuf.getChar(offset); + int index = 1; + offset += 2; + int[] offsets = new int[poolSize]; + while (index < poolSize) { + byte tag = poolbuf.getByte(offset++); + offsets[index] = offset; + switch (tag) { + case CONSTANT_Utf8: { + int len = poolbuf.getChar(offset); + offset += 2 + len; + break; + } + case CONSTANT_Class: + case CONSTANT_String: + case CONSTANT_Module: + case CONSTANT_Package: + case CONSTANT_MethodType: + offset += 2; + break; + case CONSTANT_MethodHandle: + offset += 3; + break; + case CONSTANT_Fieldref: + case CONSTANT_Methodref: + case CONSTANT_InterfaceMethodref: + case CONSTANT_NameandType: + case CONSTANT_Integer: + case CONSTANT_Float: + case CONSTANT_Dynamic: + case CONSTANT_InvokeDynamic: + offset += 4; + break; + case CONSTANT_Long: + case CONSTANT_Double: + offset += 8; + break; + default: + throw reader.badClassFile("bad.const.pool.tag.at", + Byte.toString(tag), + Integer.toString(offset - 1)); + } + index += sizeof(tag); + } + pool = new ImmutablePoolHelper(poolbuf, offsets); + return offset; + } + + private int sizeof(int tag) { + switch (tag) { + case ClassFile.CONSTANT_Double: case ClassFile.CONSTANT_Long: + return 2; + default: + return 1; + } + } + + class ImmutablePoolHelper { + + final Object[] values; + final int[] offsets; + final ByteBuffer poolbuf; + + public ImmutablePoolHelper(ByteBuffer poolbuf, int[] offsets) { + this.offsets = offsets; + this.values = new Object[offsets.length]; + this.poolbuf = poolbuf; + } + + private int checkIndex(int index) { + if (index <= 0 || index >= offsets.length) { + //pool index is outside valid range. + throw reader.badClassFile("bad.const.pool.index", reader.currentClassFile, + index, offsets.length); + } else { + return index; + } + } + + int offset(int index) { + return offsets[checkIndex(index)]; + } + + @SuppressWarnings("unchecked") +

    P readIfNeeded(int index) { + Object v = values[checkIndex(index)]; + if (v != null) { + return (P)v; + } else { + P p = (P)resolve(poolbuf, tag(index), offset(index)); + values[index] = p; + return p; + } + } + + int tag(int index) { + return poolbuf.elems[offset(index) - 1]; + } + } +} diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolWriter.java new file mode 100644 index 00000000000..e9d9499dc86 --- /dev/null +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolWriter.java @@ -0,0 +1,506 @@ +/* + * 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 com.sun.tools.javac.jvm; + +import com.sun.tools.javac.code.Kinds.Kind; +import com.sun.tools.javac.code.Symbol; +import com.sun.tools.javac.code.Symbol.ClassSymbol; +import com.sun.tools.javac.code.Symbol.DynamicMethodSymbol; +import com.sun.tools.javac.code.Symbol.MethodHandleSymbol; +import com.sun.tools.javac.code.Symbol.ModuleSymbol; +import com.sun.tools.javac.code.Symbol.PackageSymbol; +import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.Types; +import com.sun.tools.javac.jvm.ClassWriter.PoolOverflow; +import com.sun.tools.javac.jvm.ClassWriter.StringOverflow; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant.BasicConstant; +import com.sun.tools.javac.jvm.PoolConstant.Dynamic; +import com.sun.tools.javac.jvm.PoolConstant.Dynamic.BsmKey; +import com.sun.tools.javac.jvm.PoolConstant.NameAndType; +import com.sun.tools.javac.util.ByteBuffer; +import com.sun.tools.javac.util.List; +import com.sun.tools.javac.util.Name; +import com.sun.tools.javac.util.Names; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayDeque; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; + +import static com.sun.tools.javac.code.Kinds.Kind.TYP; +import static com.sun.tools.javac.code.TypeTag.ARRAY; +import static com.sun.tools.javac.code.TypeTag.CLASS; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_Class; +import static com.sun.tools.javac.jvm.ClassFile.CONSTANT_MethodType; +import static com.sun.tools.javac.jvm.ClassFile.externalize; + +/** + * Pool interface towards {@code ClassWriter}. Exposes methods to encode and write javac entities + * into the constant pool. + * + *

    This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice. + */ +public class PoolWriter { + + /** Max number of constant pool entries. */ + public static final int MAX_ENTRIES = 0xFFFF; + + /** Max number of char in a string constant. */ + public static final int MAX_STRING_LENGTH = 0xFFFF; + + private static final int POOL_BUF_SIZE = 0x7fff; + + private final Types types; + + private final Names names; + + /** Pool helper **/ + final WriteablePoolHelper pool; + + /** Sole signature generator */ + final SharedSignatureGenerator signatureGen; + + /** The inner classes to be written, as an ordered set (enclosing first). */ + LinkedHashSet innerClasses = new LinkedHashSet<>(); + + /** The list of entries in the BootstrapMethods attribute. */ + Map bootstrapMethods = new LinkedHashMap<>(); + + public PoolWriter(Types types, Names names) { + this.types = types; + this.names = names; + this.signatureGen = new SharedSignatureGenerator(types); + this.pool = new WriteablePoolHelper(); + } + + /** + * Puts a class symbol into the pool and return its index. + */ + int putClass(ClassSymbol csym) { + return putClass(csym.type); + } + + /** + * Puts a type into the pool and return its index. The type could be either a class, a type variable + * or an array type. + */ + int putClass(Type t) { + return pool.writeIfNeeded(types.erasure(t)); + } + + /** + * Puts a member reference into the constant pool. Valid members are either field or method symbols. + */ + int putMember(Symbol s) { + return pool.writeIfNeeded(s); + } + + /** + * Puts a dynamic reference into the constant pool and return its index. + */ + int putDynamic(DynamicMethodSymbol d) { + return pool.writeIfNeeded(d); + } + + /** + * Puts a field or method descriptor into the constant pool and return its index. + */ + int putDescriptor(Type t) { + return putName(typeSig(types.erasure(t))); + } + + /** + * Puts a field or method descriptor into the constant pool and return its index. + */ + int putDescriptor(Symbol s) { + return putDescriptor(descriptorType(s)); + } + + /** + * Puts a signature (see {@code Signature} attribute in JVMS 4.4) into the constant pool and + * return its index. + */ + int putSignature(Symbol s) { + if (s.kind == TYP) { + return putName(classSig(s.type)); + } else { + return putName(typeSig(s.type)); + } + } + + /** + * Puts a constant value into the pool and return its index. Supported values are int, float, long, + * double and String. + */ + int putConstant(Object o) { + if (o instanceof Integer) { + return putConstant(LoadableConstant.Int((int)o)); + } else if (o instanceof Float) { + return putConstant(LoadableConstant.Float((float)o)); + } else if (o instanceof Long) { + return putConstant(LoadableConstant.Long((long)o)); + } else if (o instanceof Double) { + return putConstant(LoadableConstant.Double((double)o)); + } else if (o instanceof String) { + return putConstant(LoadableConstant.String((String)o)); + } else { + throw new AssertionError("unexpected constant: " + o); + } + } + + /** + * Puts a constant into the pool and return its index. + */ + int putConstant(LoadableConstant c) { + switch (c.poolTag()) { + case CONSTANT_Class: + return putClass((Type)c); + case CONSTANT_MethodType: + return pool.writeIfNeeded(types.erasure((Type)c)); + default: + return pool.writeIfNeeded(c); + } + } + + int putName(Name name) { + return pool.writeIfNeeded(name); + } + + /** + * Puts a name and type pair into the pool and returns its index. + */ + int putNameAndType(Symbol s) { + return pool.writeIfNeeded(new NameAndType(s.name, descriptorType(s))); + } + + /** + * Puts a package entry into the pool and returns its index. + */ + int putPackage(PackageSymbol pkg) { + return pool.writeIfNeeded(pkg); + } + + /** + * Puts a module entry into the pool and returns its index. + */ + int putModule(ModuleSymbol mod) { + return pool.writeIfNeeded(mod); + } + + /** + * Enter an inner class into the `innerClasses' set. + */ + void enterInner(ClassSymbol c) { + if (c.type.isCompound()) { + throw new AssertionError("Unexpected intersection type: " + c.type); + } + c.complete(); + if (c.owner.enclClass() != null && !innerClasses.contains(c)) { + enterInner(c.owner.enclClass()); + innerClasses.add(c); + } + } + + /** + * Create a new Utf8 entry representing a descriptor for given (member) symbol. + */ + private Type descriptorType(Symbol s) { + return s.kind == Kind.MTH ? s.externalType(types) : s.erasure(types); + } + + private int makeBoostrapEntry(Dynamic dynamic) { + BsmKey bsmKey = dynamic.bsmKey(types); + + // Figure out the index for existing BSM; create a new BSM if no key + Integer index = bootstrapMethods.get(bsmKey); + if (index == null) { + index = bootstrapMethods.size(); + bootstrapMethods.put(bsmKey, index); + } + + return index; + } + + /** + * Write pool contents into given byte buffer. + */ + void writePool(OutputStream out) throws IOException, PoolOverflow { + if (pool.overflowString != null) { + throw new StringOverflow(pool.overflowString); + } + int size = size(); + if (size > MAX_ENTRIES) { + throw new PoolOverflow(); + } + out.write(size >> 8); + out.write(size); + out.write(pool.poolbuf.elems, 0, pool.poolbuf.length); + } + + /** + * Signature Generation + */ + class SharedSignatureGenerator extends Types.SignatureGenerator { + + /** + * An output buffer for type signatures. + */ + ByteBuffer sigbuf = new ByteBuffer(); + + SharedSignatureGenerator(Types types) { + super(types); + } + + /** + * Assemble signature of given type in string buffer. + * Check for uninitialized types before calling the general case. + */ + @Override + public void assembleSig(Type type) { + switch (type.getTag()) { + case UNINITIALIZED_THIS: + case UNINITIALIZED_OBJECT: + // we don't yet have a spec for uninitialized types in the + // local variable table + assembleSig(types.erasure(((UninitializedType)type).qtype)); + break; + default: + super.assembleSig(type); + } + } + + @Override + protected void append(char ch) { + sigbuf.appendByte(ch); + } + + @Override + protected void append(byte[] ba) { + sigbuf.appendBytes(ba); + } + + @Override + protected void append(Name name) { + sigbuf.appendName(name); + } + + @Override + protected void classReference(ClassSymbol c) { + enterInner(c); + } + + protected void reset() { + sigbuf.reset(); + } + + protected Name toName() { + return sigbuf.toName(names); + } + } + + class WriteablePoolHelper { + + /** Pool entries. */ + private final Map keysToPos = new HashMap<>(64); + + final ByteBuffer poolbuf = new ByteBuffer(POOL_BUF_SIZE); + + int currentIndex = 1; + + ArrayDeque todo = new ArrayDeque<>(); + + String overflowString = null; + + private

    int writeIfNeeded(P p) { + Object key = p.poolKey(types); + Integer index = keysToPos.get(key); + if (index == null) { + keysToPos.put(key, index = currentIndex++); + boolean first = todo.isEmpty(); + todo.addLast(p); + if (first) { + while (!todo.isEmpty()) { + writeConstant(todo.peekFirst()); + todo.removeFirst(); + } + } + } + return index; + } + + void writeConstant(PoolConstant c) { + int tag = c.poolTag(); + switch (tag) { + case ClassFile.CONSTANT_Class: { + Type ct = (Type)c; + Name name = ct.hasTag(ARRAY) ? + typeSig(ct) : + names.fromUtf(externalize(ct.tsym.flatName())); + poolbuf.appendByte(tag); + poolbuf.appendChar(putName(name)); + if (ct.hasTag(CLASS)) { + enterInner((ClassSymbol)ct.tsym); + } + break; + } + case ClassFile.CONSTANT_Utf8: { + Name name = (Name)c; + poolbuf.appendByte(tag); + byte[] bs = name.toUtf(); + poolbuf.appendChar(bs.length); + poolbuf.appendBytes(bs, 0, bs.length); + if (overflowString == null && bs.length > MAX_STRING_LENGTH) { + //report error only once + overflowString = new String(bs); + } + break; + } + case ClassFile.CONSTANT_InterfaceMethodref: + case ClassFile.CONSTANT_Methodref: + case ClassFile.CONSTANT_Fieldref: { + Symbol sym = (Symbol)c; + poolbuf.appendByte(tag); + poolbuf.appendChar(putClass((ClassSymbol)sym.owner)); + poolbuf.appendChar(putNameAndType(sym)); + break; + } + case ClassFile.CONSTANT_Package: { + PackageSymbol pkg = (PackageSymbol)c; + Name pkgName = names.fromUtf(externalize(pkg.flatName())); + poolbuf.appendByte(tag); + poolbuf.appendChar(putName(pkgName)); + break; + } + case ClassFile.CONSTANT_Module: { + ModuleSymbol mod = (ModuleSymbol)c; + int modName = putName(mod.name); + poolbuf.appendByte(mod.poolTag()); + poolbuf.appendChar(modName); + break; + } + case ClassFile.CONSTANT_Integer: + poolbuf.appendByte(tag); + poolbuf.appendInt((int)((BasicConstant)c).data); + break; + case ClassFile.CONSTANT_Float: + poolbuf.appendByte(tag); + poolbuf.appendFloat((float)((BasicConstant)c).data); + break; + case ClassFile.CONSTANT_Long: + currentIndex++; + poolbuf.appendByte(tag); + poolbuf.appendLong((long)((BasicConstant)c).data); + break; + case ClassFile.CONSTANT_Double: + currentIndex++; + poolbuf.appendByte(tag); + poolbuf.appendDouble((double)((BasicConstant)c).data); + break; + case ClassFile.CONSTANT_MethodHandle: { + MethodHandleSymbol h = (MethodHandleSymbol)c; + poolbuf.appendByte(tag); + poolbuf.appendByte(h.referenceKind()); + poolbuf.appendChar(putMember(h.baseSymbol())); + break; + } + case ClassFile.CONSTANT_MethodType: { + Type.MethodType mt = (Type.MethodType)c; + poolbuf.appendByte(tag); + poolbuf.appendChar(putDescriptor(mt.baseType())); + break; + } + case ClassFile.CONSTANT_String: { + Name utf = names.fromString((String)((BasicConstant)c).data); + poolbuf.appendByte(tag); + poolbuf.appendChar(putName(utf)); + break; + } + case ClassFile.CONSTANT_NameandType: { + NameAndType nt = (NameAndType)c; + poolbuf.appendByte(tag); + poolbuf.appendChar(putName(nt.name)); + poolbuf.appendChar(putDescriptor(nt.type)); + break; + } + case ClassFile.CONSTANT_InvokeDynamic: { + DynamicMethodSymbol d = (DynamicMethodSymbol)c; + poolbuf.appendByte(tag); + poolbuf.appendChar(makeBoostrapEntry(d)); + poolbuf.appendChar(putNameAndType(d)); + break; + } + default: + throw new AssertionError("Unexpected constant tag: " + tag); + } + } + + void reset() { + keysToPos.clear(); + currentIndex = 1; + todo.clear(); + overflowString = null; + poolbuf.reset(); + } + } + + int size() { + return pool.currentIndex; + } + + /** + * Return signature of given type + */ + private Name typeSig(Type type) { + signatureGen.reset(); + signatureGen.assembleSig(type); + return signatureGen.toName(); + } + + private Name classSig(Type t) { + signatureGen.reset(); + List typarams = t.getTypeArguments(); + if (typarams.nonEmpty()) { + signatureGen.assembleParamsSig(typarams); + } + signatureGen.assembleSig(types.supertype(t)); + for (Type i : types.interfaces(t)) + signatureGen.assembleSig(i); + return signatureGen.toName(); + } + + void reset() { + innerClasses.clear(); + bootstrapMethods.clear(); + pool.reset(); + } +} diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java index 4ade741a590..f11054d7302 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java @@ -26,7 +26,9 @@ package com.sun.tools.javac.jvm; import com.sun.tools.javac.code.*; +import com.sun.tools.javac.code.Symbol.MethodSymbol; import com.sun.tools.javac.comp.Resolve; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.TreeInfo; import com.sun.tools.javac.tree.TreeMaker; @@ -222,7 +224,7 @@ public abstract class StringConcat { private JCDiagnostic.DiagnosticPosition newStringBuilder(JCTree tree) { JCDiagnostic.DiagnosticPosition pos = tree.pos(); - gen.getCode().emitop2(new_, gen.makeRef(pos, syms.stringBuilderType)); + gen.getCode().emitop2(new_, gen.makeRef(pos, syms.stringBuilderType), syms.stringBuilderType); gen.getCode().emitop0(dup); gen.callMethod(pos, syms.stringBuilderType, names.init, List.nil(), false); return pos; @@ -378,10 +380,9 @@ public abstract class StringConcat { Symbol.DynamicMethodSymbol dynSym = new Symbol.DynamicMethodSymbol(names.makeConcat, syms.noSymbol, - ClassFile.REF_invokeStatic, - (Symbol.MethodSymbol)bsm, + ((MethodSymbol)bsm).asHandle(), indyType, - List.nil().toArray()); + List.nil().toArray(new LoadableConstant[0])); Items.Item item = gen.getItems().makeDynamicItem(dynSym); item.invoke(); @@ -416,7 +417,7 @@ public abstract class StringConcat { StringBuilder recipe = new StringBuilder(t.size()); ListBuffer dynamicArgs = new ListBuffer<>(); - ListBuffer staticArgs = new ListBuffer<>(); + ListBuffer staticArgs = new ListBuffer<>(); for (JCTree arg : t) { Object constVal = arg.type.constValue(); @@ -431,7 +432,7 @@ public abstract class StringConcat { String a = arg.type.stringValue(); if (a.indexOf(TAG_CONST) != -1 || a.indexOf(TAG_ARG) != -1) { recipe.append(TAG_CONST); - staticArgs.add(a); + staticArgs.add(LoadableConstant.String(a)); } else { recipe.append(a); } @@ -463,7 +464,7 @@ public abstract class StringConcat { } /** Produce the actual invokedynamic call to StringConcatFactory */ - private void doCall(Type type, JCDiagnostic.DiagnosticPosition pos, String recipe, List staticArgs, List dynamicArgTypes) { + private void doCall(Type type, JCDiagnostic.DiagnosticPosition pos, String recipe, List staticArgs, List dynamicArgTypes) { Type.MethodType indyType = new Type.MethodType(dynamicArgTypes, type, List.nil(), @@ -474,8 +475,8 @@ public abstract class StringConcat { make.at(pos); ListBuffer constTypes = new ListBuffer<>(); - ListBuffer constants = new ListBuffer<>(); - for (Object t : staticArgs) { + ListBuffer constants = new ListBuffer<>(); + for (LoadableConstant t : staticArgs) { constants.add(t); constTypes.add(syms.stringType); } @@ -495,10 +496,10 @@ public abstract class StringConcat { Symbol.DynamicMethodSymbol dynSym = new Symbol.DynamicMethodSymbol(names.makeConcatWithConstants, syms.noSymbol, - ClassFile.REF_invokeStatic, - (Symbol.MethodSymbol)bsm, + ((MethodSymbol)bsm).asHandle(), indyType, - List.of(recipe).appendList(constants).toArray()); + List.of(LoadableConstant.String(recipe)) + .appendList(constants).toArray(new LoadableConstant[constants.size()])); Items.Item item = gen.getItems().makeDynamicItem(dynSym); item.invoke(); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java index 09a57b02f51..1b31ed29fc4 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -188,6 +188,11 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea private final Context context; + /** + * Support for preview language features. + */ + private final Preview preview; + /** Get the JavacProcessingEnvironment instance for this context. */ public static JavacProcessingEnvironment instance(Context context) { JavacProcessingEnvironment instance = context.get(JavacProcessingEnvironment.class); @@ -236,6 +241,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea enter = Enter.instance(context); initialCompleter = ClassFinder.instance(context).getCompleter(); chk = Check.instance(context); + preview = Preview.instance(context); initProcessorLoader(); } @@ -1675,6 +1681,11 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea return messages.getCurrentLocale(); } + @DefinedBy(Api.ANNOTATION_PROCESSING) + public boolean isPreviewEnabled() { + return preview.isEnabled(); + } + public Set getSpecifiedPackages() { return specifiedPackages; } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties index 2b4b3fef200..5a9bb3a1c05 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties @@ -2164,6 +2164,11 @@ compiler.misc.bad.const.pool.entry=\ bad constant pool entry in {0}\n\ expected {1} at index {2} +# 0: file name, 1: number (constant pool index), 2: number (constant pool size) +compiler.misc.bad.const.pool.index=\ + bad constant pool index in {0}\n\ + index {1} is not within pool size {2}. + # 0: file name, 1: message segment compiler.misc.bad.class.file.header=\ bad class file: {0}\n\ diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java index 65a8c369076..842a42ea096 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ByteBuffer.java @@ -147,6 +147,90 @@ public class ByteBuffer { appendBytes(name.getByteArray(), name.getByteOffset(), name.getByteLength()); } + /** Append the content of a given input stream. + */ + public void appendStream(InputStream is) throws IOException { + try { + int start = length; + int initialSize = is.available(); + elems = ArrayUtils.ensureCapacity(elems, length + initialSize); + int r = is.read(elems, start, initialSize); + int bp = start; + while (r != -1) { + bp += r; + elems = ArrayUtils.ensureCapacity(elems, bp); + r = is.read(elems, bp, elems.length - bp); + } + } finally { + try { + is.close(); + } catch (IOException e) { + /* Ignore any errors, as this stream may have already + * thrown a related exception which is the one that + * should be reported. + */ + } + } + } + + /** Extract an integer at position bp from elems. + */ + public int getInt(int bp) { + return + ((elems[bp] & 0xFF) << 24) + + ((elems[bp+1] & 0xFF) << 16) + + ((elems[bp+2] & 0xFF) << 8) + + (elems[bp+3] & 0xFF); + } + + + /** Extract a long integer at position bp from elems. + */ + public long getLong(int bp) { + DataInputStream elemsin = + new DataInputStream(new ByteArrayInputStream(elems, bp, 8)); + try { + return elemsin.readLong(); + } catch (IOException e) { + throw new AssertionError(e); + } + } + + /** Extract a float at position bp from elems. + */ + public float getFloat(int bp) { + DataInputStream elemsin = + new DataInputStream(new ByteArrayInputStream(elems, bp, 4)); + try { + return elemsin.readFloat(); + } catch (IOException e) { + throw new AssertionError(e); + } + } + + /** Extract a double at position bp from elems. + */ + public double getDouble(int bp) { + DataInputStream elemsin = + new DataInputStream(new ByteArrayInputStream(elems, bp, 8)); + try { + return elemsin.readDouble(); + } catch (IOException e) { + throw new AssertionError(e); + } + } + + /** Extract a character at position bp from elems. + */ + public char getChar(int bp) { + return + (char)(((elems[bp] & 0xFF) << 8) + (elems[bp+1] & 0xFF)); + } + + public byte getByte(int bp) { + return elems[bp]; + } + /** Reset to zero length. */ public void reset() { diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java index b1321f8c542..0ff4ea3204f 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Name.java @@ -25,6 +25,8 @@ package com.sun.tools.javac.util; +import com.sun.tools.javac.jvm.ClassFile; +import com.sun.tools.javac.jvm.PoolConstant; import com.sun.tools.javac.util.DefinedBy.Api; /** An abstraction for internal compiler strings. They are stored in @@ -36,7 +38,7 @@ import com.sun.tools.javac.util.DefinedBy.Api; * This code and its internal interfaces are subject to change or * deletion without notice. */ -public abstract class Name implements javax.lang.model.element.Name { +public abstract class Name implements javax.lang.model.element.Name, PoolConstant { public final Table table; @@ -52,6 +54,11 @@ public abstract class Name implements javax.lang.model.element.Name { return toString().equals(cs.toString()); } + @Override + public int poolTag() { + return ClassFile.CONSTANT_Utf8; + } + /** * {@inheritDoc} */ @@ -188,6 +195,14 @@ public abstract class Name implements javax.lang.model.element.Name { */ public abstract int getByteOffset(); + public interface NameMapper { + X map(byte[] bytes, int offset, int len); + } + + public X map(NameMapper mapper) { + return mapper.map(getByteArray(), getByteOffset(), getByteLength()); + } + /** An abstraction for the hash table used to create unique Name instances. */ public static abstract class Table { diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java index 57f93a1e505..8e2df4a789e 100644 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java @@ -1137,20 +1137,79 @@ final class NativeKeyHolder { private static long nativeKeyWrapperKeyID = 0; private static CK_MECHANISM nativeKeyWrapperMechanism = null; + private static long nativeKeyWrapperRefCount = 0; + private static Session nativeKeyWrapperSession = null; private final P11Key p11Key; private final byte[] nativeKeyInfo; + private boolean wrapperKeyUsed; // destroyed and recreated when refCount toggles to 1 private long keyID; - private boolean isTokenObject; - // phantom reference notification clean up for session keys private SessionKeyRef ref; private int refCount; + private static void createNativeKeyWrapper(Token token) + throws PKCS11Exception { + assert(nativeKeyWrapperKeyID == 0); + assert(nativeKeyWrapperRefCount == 0); + assert(nativeKeyWrapperSession == null); + // Create a global wrapping/unwrapping key + CK_ATTRIBUTE[] wrappingAttributes = token.getAttributes(O_GENERATE, + CKO_SECRET_KEY, CKK_AES, new CK_ATTRIBUTE[] { + new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY), + new CK_ATTRIBUTE(CKA_VALUE_LEN, 256 >> 3)}); + Session s = null; + try { + s = token.getObjSession(); + nativeKeyWrapperKeyID = token.p11.C_GenerateKey( + s.id(), new CK_MECHANISM(CKM_AES_KEY_GEN), + wrappingAttributes); + nativeKeyWrapperSession = s; + nativeKeyWrapperSession.addObject(); + byte[] iv = new byte[16]; + JCAUtil.getSecureRandom().nextBytes(iv); + nativeKeyWrapperMechanism = new CK_MECHANISM(CKM_AES_CBC_PAD, iv); + } catch (PKCS11Exception e) { + // best effort + } finally { + token.releaseSession(s); + } + } + + private static void deleteNativeKeyWrapper() { + Token token = nativeKeyWrapperSession.token; + if (token.isValid()) { + Session s = null; + try { + s = token.getOpSession(); + token.p11.C_DestroyObject(s.id(), nativeKeyWrapperKeyID); + nativeKeyWrapperSession.removeObject(); + } catch (PKCS11Exception e) { + // best effort + } finally { + token.releaseSession(s); + } + } + nativeKeyWrapperKeyID = 0; + nativeKeyWrapperMechanism = null; + nativeKeyWrapperSession = null; + } + + static void decWrapperKeyRef() { + synchronized(NativeKeyHolder.class) { + assert(nativeKeyWrapperKeyID != 0); + assert(nativeKeyWrapperRefCount > 0); + nativeKeyWrapperRefCount--; + if (nativeKeyWrapperRefCount == 0) { + deleteNativeKeyWrapper(); + } + } + } + NativeKeyHolder(P11Key p11Key, long keyID, Session keySession, boolean extractKeyInfo, boolean isTokenObject) { this.p11Key = p11Key; @@ -1160,35 +1219,23 @@ final class NativeKeyHolder { if (isTokenObject) { this.ref = null; } else { - this.ref = new SessionKeyRef(p11Key, keyID, keySession); - // Try extracting key info, if any error, disable it Token token = p11Key.token; if (extractKeyInfo) { try { - if (p11Key.sensitive && nativeKeyWrapperKeyID == 0) { + if (p11Key.sensitive) { + // p11Key native key information has to be wrapped synchronized(NativeKeyHolder.class) { - // Create a global wrapping/unwrapping key - CK_ATTRIBUTE[] wrappingAttributes = token.getAttributes - (O_GENERATE, CKO_SECRET_KEY, CKK_AES, new CK_ATTRIBUTE[] { - new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY), - new CK_ATTRIBUTE(CKA_VALUE_LEN, 256 >> 3), - }); - Session wrappingSession = null; - try { - wrappingSession = token.getObjSession(); - nativeKeyWrapperKeyID = token.p11.C_GenerateKey - (wrappingSession.id(), - new CK_MECHANISM(CKM_AES_KEY_GEN), - wrappingAttributes); - byte[] iv = new byte[16]; - JCAUtil.getSecureRandom().nextBytes(iv); - nativeKeyWrapperMechanism = new CK_MECHANISM - (CKM_AES_CBC_PAD, iv); - } catch (PKCS11Exception e) { - // best effort - } finally { - token.releaseSession(wrappingSession); + if (nativeKeyWrapperKeyID == 0) { + createNativeKeyWrapper(token); + } + // If a wrapper-key was successfully created or + // already exists, increment its reference + // counter to keep it alive while native key + // information is being held. + if (nativeKeyWrapperKeyID != 0) { + nativeKeyWrapperRefCount++; + wrapperKeyUsed = true; } } } @@ -1196,7 +1243,8 @@ final class NativeKeyHolder { try { opSession = token.getOpSession(); ki = p11Key.token.p11.getNativeKeyInfo(opSession.id(), - keyID, nativeKeyWrapperKeyID, nativeKeyWrapperMechanism); + keyID, nativeKeyWrapperKeyID, + nativeKeyWrapperMechanism); } catch (PKCS11Exception e) { // best effort } finally { @@ -1206,6 +1254,8 @@ final class NativeKeyHolder { // best effort } } + this.ref = new SessionKeyRef(p11Key, keyID, wrapperKeyUsed, + keySession); } this.nativeKeyInfo = ((ki == null || ki.length == 0)? null : ki); } @@ -1222,18 +1272,15 @@ final class NativeKeyHolder { throw new RuntimeException( "Error: null keyID with non-zero refCount " + cnt); } - if (this.ref != null) { - throw new RuntimeException( - "Error: null keyID with non-null session ref"); - } Token token = p11Key.token; // Create keyID using nativeKeyInfo Session session = null; try { session = token.getObjSession(); this.keyID = token.p11.createNativeKey(session.id(), - nativeKeyInfo, nativeKeyWrapperKeyID, nativeKeyWrapperMechanism); - this.ref = new SessionKeyRef(p11Key, this.keyID, session); + nativeKeyInfo, nativeKeyWrapperKeyID, + nativeKeyWrapperMechanism); + this.ref.registerNativeKey(this.keyID, session); } catch (PKCS11Exception e) { this.refCount--; throw new ProviderException("Error recreating native key", e); @@ -1263,12 +1310,9 @@ final class NativeKeyHolder { throw new RuntimeException("ERROR: null keyID can't be destroyed"); } - if (this.ref == null) { - throw new RuntimeException("ERROR: null session ref can't be disposed"); - } // destroy this.keyID = 0; - this.ref = this.ref.dispose(); + this.ref.removeNativeKey(); } else { if (cnt < 0) { // should never happen as we start count at 1 and pair get/release calls @@ -1285,12 +1329,11 @@ final class NativeKeyHolder { * otherwise the key maybe cleared before other objects which * still use these keys during finalization such as SSLSocket. */ -final class SessionKeyRef extends PhantomReference - implements Comparable { +final class SessionKeyRef extends PhantomReference { private static ReferenceQueue refQueue = new ReferenceQueue(); - private static Set refList = - Collections.synchronizedSortedSet(new TreeSet()); + private static Set refSet = + Collections.synchronizedSet(new HashSet()); static ReferenceQueue referenceQueue() { return refQueue; @@ -1307,47 +1350,69 @@ final class SessionKeyRef extends PhantomReference } // handle to the native key and the session it is generated under - private final long keyID; - private final Session session; + private long keyID; + private Session session; + private boolean wrapperKeyUsed; - SessionKeyRef(P11Key p11Key, long keyID, Session session) { + SessionKeyRef(P11Key p11Key, long keyID, boolean wrapperKeyUsed, + Session session) { super(p11Key, refQueue); if (session == null) { throw new ProviderException("key must be associated with a session"); } - this.keyID = keyID; - this.session = session; - this.session.addObject(); + registerNativeKey(keyID, session); + this.wrapperKeyUsed = wrapperKeyUsed; - refList.add(this); + refSet.add(this); drainRefQueueBounded(); } - SessionKeyRef dispose() { - Token token = session.token; - // If the token is still valid, try to remove the key object - if (token.isValid()) { - Session s = null; - try { - s = token.getOpSession(); - token.p11.C_DestroyObject(s.id(), keyID); - } catch (PKCS11Exception e) { - // best effort - } finally { - token.releaseSession(s); - } - } - refList.remove(this); - this.clear(); - session.removeObject(); - return null; + void registerNativeKey(long newKeyID, Session newSession) { + assert(newKeyID != 0); + assert(newSession != null); + updateNativeKey(newKeyID, newSession); } - public int compareTo(SessionKeyRef other) { - if (this.keyID == other.keyID) { - return 0; + void removeNativeKey() { + assert(session != null); + updateNativeKey(0, null); + } + + private void updateNativeKey(long newKeyID, Session newSession) { + if (newKeyID == 0) { + assert(newSession == null); + Token token = session.token; + // If the token is still valid, try to remove the key object + if (token.isValid()) { + Session s = null; + try { + s = token.getOpSession(); + token.p11.C_DestroyObject(s.id(), this.keyID); + } catch (PKCS11Exception e) { + // best effort + } finally { + token.releaseSession(s); + } + } + session.removeObject(); } else { - return (this.keyID < other.keyID) ? -1 : 1; + newSession.addObject(); } + keyID = newKeyID; + session = newSession; + } + + // Called when the GC disposes a p11Key + void dispose() { + if (wrapperKeyUsed) { + // Wrapper-key no longer needed for + // p11Key native key information + NativeKeyHolder.decWrapperKeyRef(); + } + if (keyID != 0) { + removeNativeKey(); + } + refSet.remove(this); + this.clear(); } } diff --git a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c index d41b8176005..5a4fa0022e0 100644 --- a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c +++ b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c @@ -308,7 +308,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_getNativeKeyInfo *(CK_BBOOL*)(((CK_ATTRIBUTE_PTR)(((CK_ATTRIBUTE_PTR)nativeKeyInfoArrayRawCkAttributes) +sensitiveAttributePosition))->pValue) == CK_TRUE) { // Key is sensitive. Need to extract it wrapped. - if (jWrappingKeyHandle != -1) { + if (jWrappingKeyHandle != 0) { jMechanismToCKMechanism(env, jWrappingMech, &ckMechanism); rv = (*ckpFunctions->C_WrapKey)(ckSessionHandle, &ckMechanism, @@ -351,6 +351,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_getNativeKeyInfo goto cleanup; } } else { + ckAssertReturnValueOK(env, CKR_KEY_HANDLE_INVALID); goto cleanup; } returnValue = nativeKeyInfoWrappedKeyArray; diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java b/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java index e2577a12aaf..4e2adb51e22 100644 --- a/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java +++ b/src/jdk.dynalink/share/classes/jdk/dynalink/NamespaceOperation.java @@ -89,7 +89,7 @@ import java.util.Objects; * .withNamespace(StandardNamespace.PROPERTY) * .named("color"); * - *

    Operations on multiple namespaces

    + *

    Operations on multiple namespaces

    * If multiple namespaces are specified, the namespaces are treated as * alternatives to each other in order of preference. The semantics of * such operation is "first applicable". diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java deleted file mode 100644 index 1c45486365a..00000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package jdk.javadoc.internal.doclets.formats.html; - -import java.util.Collection; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; - -import javax.lang.model.element.ModuleElement; -import javax.lang.model.element.PackageElement; - -import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle; -import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag; -import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree; -import jdk.javadoc.internal.doclets.formats.html.markup.Navigation; -import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode; -import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml; -import jdk.javadoc.internal.doclets.toolkit.Content; -import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException; -import jdk.javadoc.internal.doclets.toolkit.util.DocPath; - -/** - * Abstract class to generate the module overview files. - * - *

    This is NOT part of any supported API. - * If you write code that depends on this, you do so at your own risk. - * This code and its internal interfaces are subject to change or - * deletion without notice. - * - * @author Bhavesh Patel - */ -public abstract class AbstractModuleIndexWriter extends HtmlDocletWriter { - - /** - * Modules to be documented. - */ - protected SortedMap> modules; - - protected Navigation navBar; - - /** - * Constructor. Also initializes the modules variable. - * - * @param configuration The current configuration - * @param filename Name of the module index file to be generated. - */ - public AbstractModuleIndexWriter(HtmlConfiguration configuration, - DocPath filename) { - super(configuration, filename); - modules = configuration.modulePackages; - this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.OVERVIEW, path); - } - - /** - * Adds the navigation bar header to the documentation tree. - * - * @param header the document tree to which the navigation bar header will be added - */ - protected abstract void addNavigationBarHeader(Content header); - - /** - * Adds the navigation bar footer to the documentation tree. - * - * @param footer the document tree to which the navigation bar footer will be added - */ - protected abstract void addNavigationBarFooter(Content footer); - - /** - * Adds the overview header to the documentation tree. - * - * @param main the document tree to which the overview header will be added - */ - protected abstract void addOverviewHeader(Content main); - - /** - * Adds the modules list to the documentation tree. - * - * @param main the document tree to which the modules list will be added - */ - protected abstract void addModulesList(Content main); - - /** - * Adds the module packages list to the documentation tree. - * - * @param modules the set of modules - * @param text caption for the table - * @param tableSummary summary for the table - * @param main the document tree to which the modules list will be added - * @param mdle the module being documented - */ - protected abstract void addModulePackagesList(Map> modules, String text, - String tableSummary, Content main, ModuleElement mdle); - - /** - * Generate and prints the contents in the module index file. - * - * @param title the title of the window - * @param description the content for the description META tag - * @throws DocFileIOException if there is a problem building the module index file - */ - protected void buildModuleIndexFile(String title, String description) - throws DocFileIOException { - String windowOverview = resources.getText(title); - Content body = getBody(getWindowTitle(windowOverview)); - Content header = HtmlTree.HEADER(); - addNavigationBarHeader(header); - Content main = HtmlTree.MAIN(); - addOverviewHeader(main); - addIndex(header, main); - addOverview(main); - Content footer = HtmlTree.FOOTER(); - addNavigationBarFooter(footer); - body.add(header); - body.add(main); - body.add(footer); - printHtmlDocument( - configuration.metakeywords.getOverviewMetaKeywords(title, configuration.doctitle), - description, - body); - } - - /** - * Generate and prints the contents in the module packages index file. - * - * @param title the title of the window. - * @param description the content for the description META tag - * @param mdle the name of the module being documented - * @throws DocFileIOException if there is an exception building the module packages index file - */ - protected void buildModulePackagesIndexFile(String title, String description, - ModuleElement mdle) throws DocFileIOException { - String windowOverview = resources.getText(title); - Content body = getBody(getWindowTitle(windowOverview)); - Content header = HtmlTree.HEADER(); - addNavigationBarHeader(header); - Content main = HtmlTree.MAIN(); - addOverviewHeader(main); - addModulePackagesIndex(header, main, mdle); - addOverview(main); - Content footer = HtmlTree.FOOTER(); - addNavigationBarFooter(footer); - body.add(header); - body.add(main); - body.add(footer); - printHtmlDocument( - configuration.metakeywords.getOverviewMetaKeywords(title, configuration.doctitle), - description, - body); - } - - /** - * Default to no overview, override to add overview. - * - * @param main the document tree to which the overview will be added - */ - protected void addOverview(Content main) { } - - /** - * Adds the module index to the documentation tree. - * - * @param header the document tree to which the navigational links will be added - * @param main the document tree to which the modules list will be added - */ - protected void addIndex(Content header, Content main) { - addIndexContents(configuration.modules, "doclet.Module_Summary", - resources.getText("doclet.Member_Table_Summary", - resources.getText("doclet.Module_Summary"), - resources.getText("doclet.modules")), header, main); - } - - /** - * Adds the module packages index to the documentation tree. - * - * @param header the document tree to which the navigational links will be added - * @param main the document tree to which the module packages list will be added - * @param mdle the module being documented - */ - protected void addModulePackagesIndex(Content header, Content main, ModuleElement mdle) { - addModulePackagesIndexContents("doclet.Module_Summary", - resources.getText("doclet.Member_Table_Summary", - resources.getText("doclet.Module_Summary"), - resources.getText("doclet.modules")), header, main, mdle); - } - - /** - * Adds module index contents. Call appropriate methods from - * the sub-classes. Adds it to the body HtmlTree - * - * @param modules the modules to be documented - * @param text string which will be used as the heading - * @param tableSummary summary for the table - * @param header the document tree to which the navigational links will be added - * @param main the document tree to which the modules list will be added - */ - protected void addIndexContents(Collection modules, String text, - String tableSummary, Content header, Content main) { - addModulesList(main); - } - - /** - * Adds module packages index contents. Call appropriate methods from - * the sub-classes. Adds it to the body HtmlTree - * - * @param text string which will be used as the heading - * @param tableSummary summary for the table - * @param header the document tree to which the navigational links will be added - * @param main the document tree to which the module packages list will be added - * @param mdle the module being documented - */ - protected void addModulePackagesIndexContents(String text, - String tableSummary, Content header, Content main, ModuleElement mdle) { - addModulePackagesList(modules, text, tableSummary, main, mdle); - } - - /** - * Adds the doctitle to the documentation tree, if it is specified on the command line. - * - * @param body the document tree to which the title will be added - */ - protected void addConfigurationTitle(Content body) { - if (configuration.doctitle.length() > 0) { - Content title = new RawHtml(configuration.doctitle); - Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, - HtmlStyle.title, title); - Content div = HtmlTree.DIV(HtmlStyle.header, heading); - body.add(div); - } - } -} diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java similarity index 52% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java index 58b64aa45d5..1928dff31f7 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -25,10 +25,6 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.util.*; - -import javax.lang.model.element.PackageElement; - import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree; @@ -40,75 +36,93 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException; import jdk.javadoc.internal.doclets.toolkit.util.DocPath; /** - * Abstract class to generate the overview files. This will be sub-classed to - * generate overview-summary.html. + * Abstract class to generate the overview files. * *

    This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice. * - * @author Atul M Dambalkar - * @author Bhavesh Patel (Modified) */ -public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter { - - /** - * A Set of Packages to be documented. - */ - protected SortedSet packages; +public abstract class AbstractOverviewIndexWriter extends HtmlDocletWriter { protected Navigation navBar; /** - * Constructor. Also initializes the packages variable. + * Constructs the AbstractOverviewIndexWriter. * * @param configuration The current configuration - * @param filename Name of the package index file to be generated. + * @param filename Name of the module index file to be generated. */ - public AbstractPackageIndexWriter(HtmlConfiguration configuration, + public AbstractOverviewIndexWriter(HtmlConfiguration configuration, DocPath filename) { super(configuration, filename); - packages = configuration.packages; this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.OVERVIEW, path); } /** - * Adds the navigation bar header to the documentation tree. + * Adds the top text (from the -top option), the upper + * navigation bar, and then the title (from the"-title" + * option), at the top of page. * - * @param header the document tree to which the navigation bar header will be added + * @param header the documentation tree to which the navigation bar header will be added */ - protected abstract void addNavigationBarHeader(Content header); + protected void addNavigationBarHeader(Content header) { + addTop(header); + navBar.setUserHeader(getUserHeaderFooter(true)); + header.add(navBar.getContent(true)); + } /** - * Adds the navigation bar footer to the documentation tree. + * Adds the lower navigation bar and the bottom text + * (from the -bottom option) at the bottom of page. * - * @param body the document tree to which the navigation bar footer will be added + * @param footer the documentation tree to which the navigation bar footer will be added */ - protected abstract void addNavigationBarFooter(Content body); + protected void addNavigationBarFooter(Content footer) { + navBar.setUserFooter(getUserHeaderFooter(false)); + footer.add(navBar.getContent(false)); + addBottom(footer); + } /** - * Adds the overview header to the documentation tree. + * Adds the overview summary comment for this documentation. Add one line + * summary at the top of the page and generate a link to the description, + * which is added at the end of this page. * - * @param footer the document tree to which the overview header will be added + * @param main the documentation tree to which the overview header will be added */ - protected abstract void addOverviewHeader(Content footer); + protected void addOverviewHeader(Content main) { + addConfigurationTitle(main); + if (!utils.getFullBody(configuration.overviewElement).isEmpty()) { + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.setStyle(HtmlStyle.contentContainer); + addOverviewComment(div); + main.add(div); + } + } /** - * Adds the packages list to the documentation tree. + * Adds the overview comment as provided in the file specified by the + * "-overview" option on the command line. * - * @param main the document tree to which the packages list will be added + * @param htmltree the documentation tree to which the overview comment will + * be added */ - protected abstract void addPackagesList(Content main); + protected void addOverviewComment(Content htmltree) { + if (!utils.getFullBody(configuration.overviewElement).isEmpty()) { + addInlineComment(configuration.overviewElement, htmltree); + } + } /** - * Generate and prints the contents in the package index file. + * Generate and prints the contents in the index file. * * @param title the title of the window * @param description the content for the description META tag * @throws DocFileIOException if there is a problem building the package index file */ - protected void buildPackageIndexFile(String title, String description) + protected void buildOverviewIndexFile(String title, String description) throws DocFileIOException { String windowOverview = resources.getText(title); Content body = getBody(getWindowTitle(windowOverview)); @@ -116,8 +130,7 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter { addNavigationBarHeader(header); Content main = HtmlTree.MAIN(); addOverviewHeader(main); - addIndex(header, main); - addOverview(main); + addIndex(main); Content footer = HtmlTree.FOOTER(); addNavigationBarFooter(footer); body.add(header); @@ -129,43 +142,11 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter { } /** - * Default to no overview, override to add overview. + * Adds the index to the documentation tree. * - * @param main the document tree to which the overview will be added + * @param main the document tree to which the packages/modules list will be added */ - protected void addOverview(Content main) { } - - /** - * Adds the package index to the documentation tree. - * - * @param header the document tree to which the navigation links will be added - * @param main the document tree to which the packages list will be added - */ - protected void addIndex(Content header, Content main) { - addIndexContents(header, main); - } - - /** - * Adds package index contents. Call appropriate methods from - * the sub-classes. Adds it to the body HtmlTree - * - * @param header the document tree to which navigation links will be added - * @param main the document tree to which the packages list will be added - */ - protected void addIndexContents(Content header, Content main) { - if (!packages.isEmpty()) { - HtmlTree htmlTree = HtmlTree.NAV(); - htmlTree.setStyle(HtmlStyle.indexNav); - HtmlTree ul = new HtmlTree(HtmlTag.UL); - addAllClassesLink(ul); - if (configuration.showModules && configuration.modules.size() > 1) { - addAllModulesLink(ul); - } - htmlTree.add(ul); - header.add(htmlTree); - addPackagesList(main); - } - } + protected abstract void addIndex(Content main); /** * Adds the doctitle to the documentation tree, if it is specified on the command line. @@ -181,20 +162,4 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter { body.add(div); } } - - /** - * Do nothing. This will be overridden. - * - * @param div the document tree to which the all classes link will be added - */ - protected void addAllClassesLink(Content div) { - } - - /** - * Do nothing. This will be overridden. - * - * @param div the document tree to which the all modules link will be added - */ - protected void addAllModulesLink(Content div) { - } } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java index 3609e668fdb..5ff2754dc22 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java @@ -53,15 +53,22 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocPaths; * * @author Bhavesh Patel */ -public class ModuleIndexWriter extends AbstractModuleIndexWriter { +public class ModuleIndexWriter extends AbstractOverviewIndexWriter { + + /** + * Modules to be documented. + */ + protected SortedSet modules; /** * Construct the ModuleIndexWriter. + * * @param configuration the configuration object * @param filename the name of the generated file */ public ModuleIndexWriter(HtmlConfiguration configuration, DocPath filename) { super(configuration, filename); + modules = configuration.modules; } /** @@ -73,46 +80,23 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter { public static void generate(HtmlConfiguration configuration) throws DocFileIOException { DocPath filename = DocPaths.INDEX; ModuleIndexWriter mdlgen = new ModuleIndexWriter(configuration, filename); - mdlgen.buildModuleIndexFile("doclet.Window_Overview_Summary", "module index"); + mdlgen.buildOverviewIndexFile("doclet.Window_Overview_Summary", "module index"); } /** - * Add the module index. + * Adds the list of modules. * - * @param header the documentation tree to which the navigational links will be added * @param main the documentation tree to which the modules list will be added */ @Override - protected void addIndex(Content header, Content main) { - addIndexContents(header, main); - } - - /** - * Adds module index contents. - * - * @param header the document tree to which the navigational links will be added - * @param main the document tree to which the modules list will be added - */ - protected void addIndexContents(Content header, Content main) { - addModulesList(main); - } - - /** - * Add the list of modules. - * - * @param main the content tree to which the module list will be added - */ - @Override - protected void addModulesList(Content main) { + protected void addIndex(Content main) { Map> groupModuleMap - = configuration.group.groupModules(configuration.modules); + = configuration.group.groupModules(modules); if (!groupModuleMap.keySet().isEmpty()) { - String tableSummary = resources.getText("doclet.Member_Table_Summary", - resources.getText("doclet.Module_Summary"), resources.getText("doclet.modules")); - TableHeader header = new TableHeader(contents.moduleLabel, contents.descriptionLabel); + TableHeader tableHeader = new TableHeader(contents.moduleLabel, contents.descriptionLabel); Table table = new Table(HtmlStyle.overviewSummary) - .setHeader(header) + .setHeader(tableHeader) .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast) .setDefaultTab(resources.getText("doclet.All_Modules")) .setTabScript(i -> "show(" + i + ");") @@ -126,7 +110,7 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter { } } - for (ModuleElement mdle : configuration.modules) { + for (ModuleElement mdle : modules) { if (!mdle.isUnnamed()) { if (!(configuration.nodeprecated && utils.isDeprecated(mdle))) { Content moduleLinkContent = getModuleLink(mdle, new StringContent(mdle.getQualifiedName().toString())); @@ -145,67 +129,4 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter { } } } - - /** - * Adds the overview summary comment for this documentation. Add one line - * summary at the top of the page and generate a link to the description, - * which is added at the end of this page. - * - * @param main the documentation tree to which the overview header will be added - */ - @Override - protected void addOverviewHeader(Content main) { - addConfigurationTitle(main); - if (!utils.getFullBody(configuration.overviewElement).isEmpty()) { - HtmlTree div = new HtmlTree(HtmlTag.DIV); - div.setStyle(HtmlStyle.contentContainer); - addOverviewComment(div); - main.add(div); - } - } - - /** - * Adds the overview comment as provided in the file specified by the - * "-overview" option on the command line. - * - * @param htmltree the documentation tree to which the overview comment will - * be added - */ - protected void addOverviewComment(Content htmltree) { - if (!utils.getFullBody(configuration.overviewElement).isEmpty()) { - addInlineComment(configuration.overviewElement, htmltree); - } - } - - /** - * Adds the top text (from the -top option), the upper - * navigation bar, and then the title (from the"-title" - * option), at the top of page. - * - * @param header the documentation tree to which the navigation bar header will be added - */ - @Override - protected void addNavigationBarHeader(Content header) { - addTop(header); - navBar.setUserHeader(getUserHeaderFooter(true)); - header.add(navBar.getContent(true)); - } - - /** - * Adds the lower navigation bar and the bottom text - * (from the -bottom option) at the bottom of page. - * - * @param footer the documentation tree to which the navigation bar footer will be added - */ - @Override - protected void addNavigationBarFooter(Content footer) { - navBar.setUserFooter(getUserHeaderFooter(false)); - footer.add(navBar.getContent(false)); - addBottom(footer); - } - - @Override - protected void addModulePackagesList(Map> modules, String text, - String tableSummary, Content main, ModuleElement mdle) { - } } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java index bf6be603af7..1505fed7727 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java @@ -52,7 +52,12 @@ import jdk.javadoc.internal.doclets.toolkit.util.Group; * @author Atul M Dambalkar * @author Bhavesh Patel (Modified) */ -public class PackageIndexWriter extends AbstractPackageIndexWriter { +public class PackageIndexWriter extends AbstractOverviewIndexWriter { + + /** + * A Set of Packages to be documented. + */ + protected SortedSet packages; /** * Construct the PackageIndexWriter. Also constructs the grouping @@ -65,6 +70,7 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter { */ public PackageIndexWriter(HtmlConfiguration configuration, DocPath filename) { super(configuration, filename); + packages = configuration.packages; } /** @@ -76,26 +82,16 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter { public static void generate(HtmlConfiguration configuration) throws DocFileIOException { DocPath filename = DocPaths.INDEX; PackageIndexWriter packgen = new PackageIndexWriter(configuration, filename); - packgen.buildPackageIndexFile("doclet.Window_Overview_Summary", "package index"); + packgen.buildOverviewIndexFile("doclet.Window_Overview_Summary", "package index"); } /** - * Depending upon the grouping information and their titles, add - * separate table indices for each package group. + * Adds the packages list to the documentation tree. * - * @param header the documentation tree to which the navigational links will be added * @param main the documentation tree to which the packages list will be added */ @Override - protected void addIndex(Content header, Content main) { - addIndexContents(header, main); - } - - /** - * {@inheritDoc} - */ - @Override - protected void addPackagesList(Content main) { + protected void addIndex(Content main) { Map> groupPackageMap = configuration.group.groupPackages(packages); @@ -134,62 +130,4 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter { } } } - - /** - * Adds the overview summary comment for this documentation. Add one line - * summary at the top of the page and generate a link to the description, - * which is added at the end of this page. - * - * @param main the documentation tree to which the overview header will be added - */ - @Override - protected void addOverviewHeader(Content main) { - addConfigurationTitle(main); - if (!utils.getFullBody(configuration.overviewElement).isEmpty()) { - HtmlTree div = new HtmlTree(HtmlTag.DIV); - div.setStyle(HtmlStyle.contentContainer); - addOverviewComment(div); - main.add(div); - } - } - - /** - * Adds the overview comment as provided in the file specified by the - * "-overview" option on the command line. - * - * @param htmltree the documentation tree to which the overview comment will - * be added - */ - protected void addOverviewComment(Content htmltree) { - if (!utils.getFullBody(configuration.overviewElement).isEmpty()) { - addInlineComment(configuration.overviewElement, htmltree); - } - } - - /** - * Adds the top text (from the -top option), the upper - * navigation bar, and then the title (from the"-title" - * option), at the top of page. - * - * @param header the documentation tree to which the navigation bar header will be added - */ - @Override - protected void addNavigationBarHeader(Content header) { - addTop(header); - navBar.setUserHeader(getUserHeaderFooter(true)); - header.add(navBar.getContent(true)); - } - - /** - * Adds the lower navigation bar and the bottom text - * (from the -bottom option) at the bottom of page. - * - * @param footer the documentation tree to which the navigation bar footer will be added - */ - @Override - protected void addNavigationBarFooter(Content footer) { - navBar.setUserFooter(getUserHeaderFooter(false)); - footer.add(navBar.getContent(false)); - addBottom(footer); - } } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/external/jquery/jquery.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/external/jquery/jquery.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_65_dadada_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_65_dadada_1x400.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_65_dadada_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_65_dadada_1x400.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_75_dadada_1x400.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_222222_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_222222_256x240.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_222222_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_222222_256x240.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_2e83ff_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_2e83ff_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_2e83ff_256x240.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_454545_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_454545_256x240.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_454545_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_454545_256x240.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_888888_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_888888_256x240.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_888888_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_888888_256x240.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_cd0a0a_256x240.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_cd0a0a_256x240.png rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/images/ui-icons_cd0a0a_256x240.png diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.3.1.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.3.1.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.3.1.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.3.1.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-migrate-3.0.1.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-migrate-3.0.1.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-migrate-3.0.1.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-migrate-3.0.1.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.css similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.css diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.min.css similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.min.css diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.min.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.min.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.structure.css similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.structure.css diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.min.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.structure.min.css similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.min.css rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-ui.structure.min.css diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.min.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.min.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.min.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.min.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.min.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.min.js similarity index 100% rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.min.js diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties index 7ca85179615..4815c2d127a 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties @@ -98,7 +98,6 @@ doclet.Concealed_Packages_Summary=Concealed doclet.From=From doclet.Uses_Summary=Uses doclet.Provides_Summary=Provides -doclet.Module_Summary=Module Summary doclet.Interface_Summary=Interface Summary doclet.Annotation_Types_Summary=Annotation Types Summary doclet.Enum_Summary=Enum Summary diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java index 80253af0fcc..ca99ff18b86 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java @@ -100,7 +100,7 @@ public class DocPaths { public static final DocPath JAVASCRIPT = DocPath.create("script.js"); /** The name of the directory for the jQuery. */ - public static final DocPath JQUERY_FILES = DocPath.create("jquery"); + public static final DocPath JQUERY_FILES = DocPath.create("script-dir"); /** The name of the default jQuery stylesheet file. */ public static final DocPath JQUERY_STYLESHEET_FILE = DocPath.create("jquery-ui.css"); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java index 54798ddb2d3..043fbcf754f 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java @@ -374,7 +374,7 @@ public class Start extends ToolOption.Helper { // locale, doclet and maybe taglet, needs to be determined first try { - docletClass = preprocess(fileManager, options); + doclet = preprocess(fileManager, options); } catch (ToolException te) { if (!te.result.isOK()) { if (te.message != null) { @@ -393,24 +393,6 @@ public class Start extends ToolOption.Helper { dumpStack(t == null ? oe : t); return oe.result; } - if (jdk.javadoc.doclet.Doclet.class.isAssignableFrom(docletClass)) { - // no need to dispatch to old, safe to init now - initMessager(); - messager.setLocale(locale); - try { - Object o = docletClass.getConstructor().newInstance(); - doclet = (Doclet) o; - } catch (ReflectiveOperationException exc) { - if (apiMode) { - throw new ClientCodeException(exc); - } - error("main.could_not_instantiate_class", docletClass.getName()); - return ERROR; - } - } else { - error("main.not_a_doclet", docletClass.getName()); - return ERROR; - } Result result = OK; try { @@ -649,7 +631,7 @@ public class Start extends ToolOption.Helper { return idx; } - private Class preprocess(JavaFileManager jfm, + private Doclet preprocess(JavaFileManager jfm, List argv) throws ToolException, OptionException { // doclet specifying arguments String userDocletPath = null; @@ -706,71 +688,77 @@ public class Start extends ToolOption.Helper { } } - // Step 2: a doclet is provided, nothing more to do. - if (docletClass != null) { - return docletClass; - } // Step 3: doclet name specified ? if so find a ClassLoader, // and load it. - if (userDocletName != null) { - ClassLoader cl = classLoader; - if (cl == null) { - if (!fileManager.hasLocation(DOCLET_PATH)) { - List paths = new ArrayList<>(); - if (userDocletPath != null) { - for (String pathname : userDocletPath.split(File.pathSeparator)) { - paths.add(new File(pathname)); - } - } - try { - ((StandardJavaFileManager)fileManager).setLocation(DOCLET_PATH, paths); - } catch (IOException ioe) { - if (apiMode) { - throw new IllegalArgumentException("Could not set location for " + - userDocletPath, ioe); - } - String text = messager.getText("main.doclet_could_not_set_location", - userDocletPath); - throw new ToolException(CMDERR, text, ioe); - } - } - cl = fileManager.getClassLoader(DOCLET_PATH); + if(docletClass == null) { + if (userDocletName != null) { + ClassLoader cl = classLoader; if (cl == null) { - // despite doclet specified on cmdline no classloader found! - if (apiMode) { - throw new IllegalArgumentException("Could not obtain classloader to load " - + userDocletPath); + if (!fileManager.hasLocation(DOCLET_PATH)) { + List paths = new ArrayList<>(); + if (userDocletPath != null) { + for (String pathname : userDocletPath.split(File.pathSeparator)) { + paths.add(new File(pathname)); + } + } + try { + ((StandardJavaFileManager)fileManager).setLocation(DOCLET_PATH, paths); + } catch (IOException ioe) { + if (apiMode) { + throw new IllegalArgumentException("Could not set location for " + + userDocletPath, ioe); + } + String text = messager.getText("main.doclet_could_not_set_location", + userDocletPath); + throw new ToolException(CMDERR, text, ioe); + } + } + cl = fileManager.getClassLoader(DOCLET_PATH); + if (cl == null) { + // despite doclet specified on cmdline no classloader found! + if (apiMode) { + throw new IllegalArgumentException("Could not obtain classloader to load " + + + userDocletPath); + } + String text = messager.getText("main.doclet_no_classloader_found", + userDocletName); + throw new ToolException(CMDERR, text); } - String text = messager.getText("main.doclet_no_classloader_found", - userDocletName); - throw new ToolException(CMDERR, text); } + docletClass = loadDocletClass(userDocletName, cl); + } else if (docletName != null){ + docletClass = loadDocletClass(docletName, getClass().getClassLoader()); + } else { + docletClass = StdDoclet; } + } + + if (jdk.javadoc.doclet.Doclet.class.isAssignableFrom(docletClass)) { + // no need to dispatch to old, safe to init now + initMessager(); + messager.setLocale(locale); try { - return cl.loadClass(userDocletName); - } catch (ClassNotFoundException cnfe) { + Object o = docletClass.getConstructor().newInstance(); + doclet = (Doclet) o; + } catch (ReflectiveOperationException exc) { if (apiMode) { - throw new IllegalArgumentException("Cannot find doclet class " + userDocletName, - cnfe); + throw new ClientCodeException(exc); } - String text = messager.getText("main.doclet_class_not_found", userDocletName); - throw new ToolException(CMDERR, text, cnfe); + String text = messager.getText("main.could_not_instantiate_class", docletClass.getName()); + throw new ToolException(ERROR, text); } + } else { + String text = messager.getText("main.not_a_doclet", docletClass.getName()); + throw new ToolException(ERROR, text); } - - // Step 4: we have a doclet, try loading it - if (docletName != null) { - return loadDocletClass(docletName); - } - - // finally - return StdDoclet; + return doclet; } - private Class loadDocletClass(String docletName) throws ToolException { + private Class loadDocletClass(String docletName, ClassLoader classLoader) throws ToolException { try { - return Class.forName(docletName, true, getClass().getClassLoader()); + return classLoader == null ? Class.forName(docletName) : classLoader.loadClass(docletName); } catch (ClassNotFoundException cnfe) { if (apiMode) { throw new IllegalArgumentException("Cannot find doclet class " + docletName); diff --git a/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java b/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java index c9c2f15778f..68d038fc556 100644 --- a/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java +++ b/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ package sun.tools.jcmd; import java.io.InputStream; +import java.io.InputStreamReader; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.List; @@ -121,15 +122,16 @@ public class JCmd { if (line.trim().equals("stop")) { break; } - try (InputStream in = hvm.executeJCmd(line);) { + try (InputStream in = hvm.executeJCmd(line); + InputStreamReader isr = new InputStreamReader(in, "UTF-8")) { // read to EOF and just print output - byte b[] = new byte[256]; + char c[] = new char[256]; int n; boolean messagePrinted = false; do { - n = in.read(b); + n = isr.read(c); if (n > 0) { - String s = new String(b, 0, n, "UTF-8"); + String s = new String(c, 0, n); System.out.print(s); messagePrinted = true; } diff --git a/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java b/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java index 6824a855a48..10eb8b9d38a 100644 --- a/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java +++ b/src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -122,6 +122,13 @@ class BinaryClass extends ClassDefinition implements Constants { sun.tools.javac.Main.getText( "javac.err.version.too.old", String.valueOf(version))); + } else if ((version >= JAVA_MIN_PREVIEW_MAJOR_VERSION) + && (minor_version == JAVA_PREVIEW_MINOR_VERSION)) { + // reject all class files that have preview features enabled + throw new ClassFormatError( + sun.tools.javac.Main.getText( + "javac.err.version.preview", + version+"."+minor_version)); } else if ((version > JAVA_MAX_SUPPORTED_VERSION) || (version == JAVA_MAX_SUPPORTED_VERSION && minor_version > JAVA_MAX_SUPPORTED_MINOR_VERSION)) { diff --git a/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java b/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java index f6856ba708a..1161ef967dd 100644 --- a/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java +++ b/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -69,6 +69,8 @@ public interface RuntimeConstants { int JAVA_MIN_SUPPORTED_VERSION = 45; int JAVA_MAX_SUPPORTED_VERSION = 57; int JAVA_MAX_SUPPORTED_MINOR_VERSION = 0; + int JAVA_MIN_PREVIEW_MAJOR_VERSION = 55; // preview intro'd in JDK 11 + int JAVA_PREVIEW_MINOR_VERSION = 0xffff; /* Generate class file version for 1.1 by default */ int JAVA_DEFAULT_VERSION = 45; diff --git a/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties b/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties index 5b754bb5d74..910361de49a 100644 --- a/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties +++ b/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2011, 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 @@ -579,6 +579,9 @@ javac.err.version.too.old=\ javac.err.version.too.recent=\ The major.minor version ''{0}'' is too recent for this tool \ to understand. +javac.err.version.preview=\ + The major.minor version ''{0}'' indicates the class was compiled with \ + preview features enabled, which this tool does not support. # benv.parsed_in=[parsed {0} in {1} ms] benv.loaded_in=[loaded {0} in {1} ms] diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java index 7ca72d590f1..1b701d59f6a 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java @@ -39,11 +39,11 @@ package jdk.nashorn.internal.runtime.linker; * to nashorn module. *

    * - *

    Comment from BytecodeName class reproduced here:

    + *

    Comment from BytecodeName class reproduced here:

    * * Includes universal mangling rules for the JVM. * - *

    Avoiding Dangerous Characters

    + *

    Avoiding Dangerous Characters

    * *

    * The JVM defines a very small set of characters which are illegal @@ -74,7 +74,7 @@ package jdk.nashorn.internal.runtime.linker; * but traditional in the proposed role. * *

    - *

    Replacement Characters

    + *

    Replacement Characters

    * * *

    @@ -159,7 +159,7 @@ package jdk.nashorn.internal.runtime.linker; * to check for dangerous characters. * *

    - *

    Nice Properties

    + *

    Nice Properties

    * *

    * If a bytecode name does not contain any escape sequence, @@ -222,7 +222,7 @@ package jdk.nashorn.internal.runtime.linker; * * * - *

    Suggestions for Human Readable Presentations

    + *

    Suggestions for Human Readable Presentations

    * * *

    diff --git a/src/jdk.scripting.nashorn/share/classes/module-info.java b/src/jdk.scripting.nashorn/share/classes/module-info.java index 478c0418299..6b9b1365daf 100644 --- a/src/jdk.scripting.nashorn/share/classes/module-info.java +++ b/src/jdk.scripting.nashorn/share/classes/module-info.java @@ -30,7 +30,7 @@ * Nashorn is a runtime environment for programs written in ECMAScript 5.1. *

    * - *

    Usage

    + *

    Usage

    * * The recommended way to use Nashorn is through the * JSR-223 @@ -45,7 +45,7 @@ ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn" * * and then use it just as you would any other JSR-223 script engine. See * {@link jdk.nashorn.api.scripting} package for details. - *

    Compatibility

    + *

    Compatibility

    * Nashorn is 100% compliant with the *     ECMA-262 Standard, Edition 5.1. @@ -55,7 +55,7 @@ ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn" * specification (often referred to as "invokedynamic"), as well as * the already mentioned JSR-223. * - *

    Interoperability with the Java platform

    + *

    Interoperability with the Java platform

    * * In addition to being a 100% ECMAScript 5.1 runtime, Nashorn provides features * for interoperability of the ECMAScript programs with the Java platform. @@ -68,7 +68,7 @@ ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn" * their properties. In most cases, though, you can't add arbitrary properties * to them, nor can you remove existing properties. * - *

    Java collection handling

    + *

    Java collection handling

    * * Native Java arrays and {@link java.util.List}s support indexed access to * their elements through the property accessors, and {@link java.util.Map}s @@ -79,7 +79,7 @@ ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn" * operator gives precedence to map elements. Native Java arrays expose * the {@code length} property. * - *

    ECMAScript primitive types

    + *

    ECMAScript primitive types

    * * ECMAScript primitive types for number, string, and boolean are represented * with {@link java.lang.Number}, {@link java.lang.CharSequence}, and @@ -89,7 +89,7 @@ ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn" * cause other subclasses of {@code Number} and internal implementations of * {@code CharSequence} to be used. * - *

    Type conversions

    + *

    Type conversions

    * * When a method on a Java object is invoked, the arguments are converted to * the formal parameter types of the Java method using all allowed ECMAScript @@ -106,7 +106,7 @@ ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn" * {@code java.lang.Double}), then Nashorn will of course ensure * the required type is passed. * - *

    SAM types

    + *

    SAM types

    * * As a special extension when invoking Java methods, ECMAScript function * objects can be passed in place of an argument whose Java type is so-called @@ -122,14 +122,14 @@ ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn" * the same name. This is done to be consistent with the fact that * ECMAScript does not have the concept of overloaded methods. * - *

    The {@code Java} object

    + *

    The {@code Java} object

    * * Nashorn exposes a non-standard global object named {@code Java} that is * the primary API entry point into Java platform-specific functionality. * You can use it to create instances of Java classes, convert from Java arrays * to native arrays and back, and so on. * - *

    Other non-standard built-in objects

    + *

    Other non-standard built-in objects

    * * In addition to {@code Java}, Nashorn also exposes some other * non-standard built-in objects: diff --git a/test/hotspot/jtreg/ProblemList-graal.txt b/test/hotspot/jtreg/ProblemList-graal.txt index 1454c48a015..71c515ce0a8 100644 --- a/test/hotspot/jtreg/ProblemList-graal.txt +++ b/test/hotspot/jtreg/ProblemList-graal.txt @@ -38,8 +38,6 @@ compiler/compilercontrol/jcmd/AddLogTest.java 8181753 generi compiler/compilercontrol/mixed/RandomValidCommandsTest.java 8181753 generic-all compiler/compilercontrol/mixed/RandomCommandsTest.java 8181753 generic-all -compiler/graalunit/JttThreadsTest.java 8208066 generic-all - compiler/jvmci/SecurityRestrictionsTest.java 8181837 generic-all compiler/unsafe/UnsafeGetConstantField.java 8181833 generic-all @@ -220,6 +218,9 @@ vmTestbase/nsk/jdb/clear/clear003/clear003.java 82 compiler/jsr292/InvokerSignatureMismatch.java 8221577 generic-all +compiler/arguments/TestScavengeRootsInCode.java 8207267 generic-all +compiler/loopopts/TestOverunrolling.java 8207267 generic-all + # Graal unit tests org.graalvm.compiler.core.test.CheckGraalInvariants 8205081 org.graalvm.compiler.core.test.OptionsVerifierTest 8205081 diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 7e6b7c9a9f8..bd7ea5b95ba 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -79,7 +79,7 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8193639 solaris-all # :hotspot_runtime runtime/SharedArchiveFile/SASymbolTableTest.java 8193639 solaris-all -runtime/containers/docker/TestCPUSets.java 8220672 generic-all +containers/docker/TestCPUSets.java 8220672 generic-all runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64 ############################################################################# diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups index 893b49e902a..df6d93919c5 100644 --- a/test/hotspot/jtreg/TEST.groups +++ b/test/hotspot/jtreg/TEST.groups @@ -43,6 +43,7 @@ hotspot_gc = \ gc \ -gc/nvdimm +# By design this group should include ALL tests under runtime sub-directory hotspot_runtime = \ runtime @@ -65,6 +66,9 @@ hotspot_misc = \ hotspot_native_sanity = \ native_sanity +hotspot_containers = \ + containers + tier1_common = \ sanity/BasicVMTest.java \ gtest/GTestWrapper.java @@ -296,7 +300,6 @@ tier1_runtime = \ -runtime/Thread/CancellableThreadTest.java \ -runtime/Thread/TestThreadDumpMonitorContention.java \ -runtime/Unsafe/RangeCheck.java \ - -runtime/containers/ \ sanity/ \ testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java \ -:tier1_runtime_appcds_exclude \ @@ -365,7 +368,6 @@ hotspot_tier2_runtime = \ -runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java \ -runtime/CompressedOops/UseCompressedOops.java \ -runtime/Thread/TestThreadDumpMonitorContention.java \ - -runtime/containers/ \ -:tier1_runtime \ -:tier1_serviceability \ -:hotspot_tier2_runtime_platform_agnostic \ @@ -379,7 +381,6 @@ hotspot_tier2_runtime_platform_agnostic = \ hotspot_tier3_runtime = \ runtime/ \ serviceability/ \ - -runtime/containers/ \ -:tier1_runtime \ -:tier1_serviceability \ -:hotspot_tier2_runtime_platform_agnostic \ diff --git a/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java b/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java index 1257a98add0..3c94060271e 100644 --- a/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java +++ b/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -241,7 +241,8 @@ public class GraalUnitTestLauncher { javaFlags.add("-ea"); // Make sure exception message is never null javaFlags.add("-XX:-OmitStackTraceInFastThrow"); - + // set timeout factor based on jtreg harness settings + javaFlags.add("-Dgraaltest.timeout.factor=" + System.getProperty("test.timeout.factor", "1.0")); // generate class path ArrayList graalJars = new ArrayList(Arrays.asList(GRAAL_EXTRA_JARS)); @@ -269,8 +270,7 @@ public class GraalUnitTestLauncher { // Some tests rely on MX_SUBPROCESS_COMMAND_FILE env variable which contains // name of the file with java executable and java args used to launch the current process. Path cmdFile = Files.createTempFile(Path.of(""), "mx_subprocess_", ".cmd"); - Files.writeString(cmdFile, JDKToolFinder.getJDKTool("java") + System.lineSeparator()); - Files.write(cmdFile, javaFlags, StandardOpenOption.APPEND); + Files.write(cmdFile, javaPB.command()); javaPB.environment().put("MX_SUBPROCESS_COMMAND_FILE", cmdFile.toAbsolutePath().toString()); System.out.println("INFO: run command: " + String.join(" ", javaPB.command())); diff --git a/test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java b/test/hotspot/jtreg/containers/cgroup/PlainRead.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java rename to test/hotspot/jtreg/containers/cgroup/PlainRead.java diff --git a/test/hotspot/jtreg/runtime/containers/docker/AttemptOOM.java b/test/hotspot/jtreg/containers/docker/AttemptOOM.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/AttemptOOM.java rename to test/hotspot/jtreg/containers/docker/AttemptOOM.java diff --git a/test/hotspot/jtreg/runtime/containers/docker/CheckContainerized.java b/test/hotspot/jtreg/containers/docker/CheckContainerized.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/CheckContainerized.java rename to test/hotspot/jtreg/containers/docker/CheckContainerized.java diff --git a/test/hotspot/jtreg/runtime/containers/docker/DockerBasicTest.java b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/DockerBasicTest.java rename to test/hotspot/jtreg/containers/docker/DockerBasicTest.java diff --git a/test/hotspot/jtreg/runtime/containers/docker/HelloDocker.java b/test/hotspot/jtreg/containers/docker/HelloDocker.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/HelloDocker.java rename to test/hotspot/jtreg/containers/docker/HelloDocker.java diff --git a/test/hotspot/jtreg/containers/docker/JfrNetwork.java b/test/hotspot/jtreg/containers/docker/JfrNetwork.java new file mode 100644 index 00000000000..c1cbbb208f3 --- /dev/null +++ b/test/hotspot/jtreg/containers/docker/JfrNetwork.java @@ -0,0 +1,163 @@ +/* + * 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. + */ +import java.io.InputStream; +import java.io.OutputStream; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.SocketAddress; +import java.nio.file.Paths; +import java.util.List; +import jdk.jfr.Recording; +import jdk.jfr.consumer.RecordedEvent; +import jdk.jfr.consumer.RecordingFile; +import jdk.test.lib.process.OutputAnalyzer; + + +// This class is intended to run inside a container +public class JfrNetwork { + // use a unique hostname for container + public static final String HOST_NAME = "container-unique-8221711"; + public static final String JFR_REPORTED_CONTAINER_HOSTNAME_TAG = "jfr_reported_container_hostname="; + + public static void main(String[] args) throws Exception { + String event = args[0]; + try (ServerSocket ss = new ServerSocket()) { + testNetworkInfo(ss, event); + } + } + + private static void assertTrue(boolean expr, String msg) { + if (!expr) { + throw new RuntimeException(msg); + } + } + + private static void testNetworkInfo(ServerSocket ss, String event) throws Exception { + ServerSocketListener server = new ServerSocketListener(ss); + server.start(); + SocketWriter writer = new SocketWriter(ss.getLocalSocketAddress()); + + // setup and start the recording + String recordingPath = event + ".jfr"; + log("========= Recording event: " + event); + Recording r = new Recording(); + r.enable(event); + r.setDestination(Paths.get("/", "tmp", recordingPath)); + r.start(); + + // start the socker writer thread, write some data into the socket + writer.start(); + + // wait for writer thread to terminate, then for server thread, then stop recording + writer.joinAndThrow(); + server.joinAndThrow(); + r.stop(); + + // analyze the recording + List events = RecordingFile.readAllEvents(r.getDestination()); + events.forEach(e -> log ("event = " + e)); + assertTrue(!events.isEmpty(), "No recorded network events"); + RecordedEvent e = events.get(0); + log(JFR_REPORTED_CONTAINER_HOSTNAME_TAG + e.getString("host")); + verifyIpAddress(e.getString("address")); + } + + private static void verifyIpAddress(String eventIp) throws Exception { + ProcessBuilder pb = new ProcessBuilder("hostname", "--ip-address"); + OutputAnalyzer out = new OutputAnalyzer(pb.start()); + out.shouldHaveExitValue(0); + log("hostname --ip-address returned: " + out.getOutput()); + out.shouldContain(eventIp); + } + + private static void log(String msg) { + System.out.println(msg); + } + + + private static class ServerSocketListener extends Thread { + Exception exception; + ServerSocket ss; + + ServerSocketListener(ServerSocket socket) throws Exception { + ss = socket; + ss.setReuseAddress(true); + ss.bind(null); + log("ServerSocker Local Address: " + ss.getLocalSocketAddress()); + } + + public void joinAndThrow() throws Exception { + join(); + if (exception != null) { + throw exception; + } + } + + public void run() { + try { + try (Socket s = ss.accept(); InputStream is = s.getInputStream()) { + System.out.println("ServerSocketListener: accepted socket connection: s = " + s); + is.read(); + is.read(); + is.read(); + } + } catch (Exception e) { + exception = e; + } + } + } + + + private static class SocketWriter extends Thread { + Exception exception; + private SocketAddress ssAddr; + + public SocketWriter(SocketAddress sa) { + this.ssAddr = sa; + System.out.println("SocketWriter(): sa = " + sa); + } + + public void joinAndThrow() throws Exception { + join(); + if (exception != null) { + throw exception; + } + } + + public void run() { + try (Socket s = new Socket()) { + s.connect(ssAddr); + try (OutputStream os = s.getOutputStream()) { + os.write('A'); + os.write('B'); + os.write('C'); + } + } catch (Exception e) { + exception = e; + } + } + } + +} diff --git a/test/hotspot/jtreg/containers/docker/JfrReporter.java b/test/hotspot/jtreg/containers/docker/JfrReporter.java new file mode 100644 index 00000000000..0c3537f1073 --- /dev/null +++ b/test/hotspot/jtreg/containers/docker/JfrReporter.java @@ -0,0 +1,51 @@ +/* + * 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. + */ +import java.nio.file.Path; +import java.nio.file.Paths; +import jdk.jfr.Recording; +import jdk.jfr.ValueDescriptor; +import jdk.jfr.consumer.RecordedEvent; +import jdk.jfr.consumer.RecordingFile; + +// This class is intended to run inside a container +public class JfrReporter { + public static void main(String[] args) throws Exception { + String eventName = args[0]; + try(Recording r = new Recording()) { + r.enable(eventName); + r.start(); + r.stop(); + Path p = Paths.get("/", "tmp", eventName + ".jfr"); + r.dump(p); + for (RecordedEvent e : RecordingFile.readAllEvents(p)) { + System.out.println("===== EventType: " + e.getEventType().getName()); + for (ValueDescriptor v : e.getEventType().getFields()) { + System.out.println(v.getName() + " = " + e.getValue(v.getName())); + } + } + } + } +} + \ No newline at end of file diff --git a/test/hotspot/jtreg/runtime/containers/docker/PrintContainerInfo.java b/test/hotspot/jtreg/containers/docker/PrintContainerInfo.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/PrintContainerInfo.java rename to test/hotspot/jtreg/containers/docker/PrintContainerInfo.java diff --git a/test/hotspot/jtreg/runtime/containers/docker/TEST.properties b/test/hotspot/jtreg/containers/docker/TEST.properties similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/TEST.properties rename to test/hotspot/jtreg/containers/docker/TEST.properties diff --git a/test/hotspot/jtreg/runtime/containers/docker/TestCPUAwareness.java b/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/TestCPUAwareness.java rename to test/hotspot/jtreg/containers/docker/TestCPUAwareness.java diff --git a/test/hotspot/jtreg/runtime/containers/docker/TestCPUSets.java b/test/hotspot/jtreg/containers/docker/TestCPUSets.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/TestCPUSets.java rename to test/hotspot/jtreg/containers/docker/TestCPUSets.java diff --git a/test/hotspot/jtreg/runtime/containers/docker/TestJFREvents.java b/test/hotspot/jtreg/containers/docker/TestJFREvents.java similarity index 75% rename from test/hotspot/jtreg/runtime/containers/docker/TestJFREvents.java rename to test/hotspot/jtreg/containers/docker/TestJFREvents.java index 73e6ac178fa..888ef6ff07a 100644 --- a/test/hotspot/jtreg/runtime/containers/docker/TestJFREvents.java +++ b/test/hotspot/jtreg/containers/docker/TestJFREvents.java @@ -39,6 +39,8 @@ import jdk.test.lib.containers.docker.Common; import jdk.test.lib.containers.docker.DockerRunOptions; import jdk.test.lib.containers.docker.DockerTestUtils; +import jdk.test.lib.Asserts; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; @@ -68,6 +70,7 @@ public class TestJFREvents { testProcessInfo(); + testEnvironmentVariables(); } finally { DockerTestUtils.removeDockerImage(imageName); } @@ -79,14 +82,12 @@ public class TestJFREvents { DockerTestUtils.dockerRunJava( commonDockerOpts() .addDockerOpts("--cpus=" + valueToSet) - .addClassOptions(JfrReporter.TESTCASE_CPU)) - .shouldHaveExitValue(0) - .shouldContain(JfrReporter.TEST_REPORTED_CORES); - + .addClassOptions("jdk.CPUInformation")) + .shouldHaveExitValue(0); // The following assertion is currently disabled due to JFR reporting incorrect values. // JFR reports values for the host system as opposed to values for the container. // @ignore 8219999 - // .shouldContain(JfrReporter.TEST_REPORTED_CORES + "=" + expectedValue); + // .shouldContain("cores = " + expectedValue"); } @@ -95,9 +96,9 @@ public class TestJFREvents { DockerTestUtils.dockerRunJava( commonDockerOpts() .addDockerOpts("--memory=" + valueToSet) - .addClassOptions(JfrReporter.TESTCASE_MEMORY)) + .addClassOptions("jdk.PhysicalMemory")) .shouldHaveExitValue(0) - .shouldContain(JfrReporter.TEST_REPORTED_MEMORY + "=" + expectedValue); + .shouldContain("totalSize = " + expectedValue); } @@ -105,10 +106,9 @@ public class TestJFREvents { Common.logNewTestCase("ProcessInfo"); DockerTestUtils.dockerRunJava( commonDockerOpts() - .addClassOptions(JfrReporter.TESTCASE_PROCESS)) + .addClassOptions("jdk.SystemProcess")) .shouldHaveExitValue(0) - .shouldContain(JfrReporter.TEST_REPORTED_PID + "=1"); - + .shouldContain("pid = 1"); } @@ -117,4 +117,28 @@ public class TestJFREvents { .addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/") .addJavaOpts("-cp", "/test-classes/"); } + + + // JTReg always defines the environment variable JAVA_MAIN_CLASS_. + // This variable fits well for use in this test, since it is rather unique. + private static String getTestEnvironmentVariable() throws Exception { + for (String key : System.getenv().keySet()) { + if (key.startsWith("JAVA_MAIN_CLASS")) { + return key; + } + } + throw new RuntimeException("JAVA_MAIN_CLASS_* is not defined"); + } + + + private static void testEnvironmentVariables() throws Exception { + Common.logNewTestCase("EnvironmentVariables"); + + DockerTestUtils.dockerRunJava( + commonDockerOpts() + .addClassOptions("jdk.InitialEnvironmentVariable")) + .shouldHaveExitValue(0) + .shouldContain("key = JAVA_HOME") + .shouldNotContain(getTestEnvironmentVariable()); + } } diff --git a/test/hotspot/jtreg/containers/docker/TestJFRNetworkEvents.java b/test/hotspot/jtreg/containers/docker/TestJFRNetworkEvents.java new file mode 100644 index 00000000000..2f9f6305a00 --- /dev/null +++ b/test/hotspot/jtreg/containers/docker/TestJFRNetworkEvents.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * @test + * @summary Test JFR network related events inside a container; make sure + * the reported host ip and host name are correctly reported within + * the container. + * @requires docker.support + * @library /test/lib + * @modules java.base/jdk.internal.misc + * java.management + * jdk.jartool/sun.tools.jar + * @build JfrNetwork + * @run driver TestJFRNetworkEvents + */ +import jdk.test.lib.containers.docker.Common; +import jdk.test.lib.containers.docker.DockerRunOptions; +import jdk.test.lib.containers.docker.DockerTestUtils; +import jdk.test.lib.Utils; + + +public class TestJFRNetworkEvents { + private static final String imageName = Common.imageName("jfr-network"); + private static final int availableCPUs = Runtime.getRuntime().availableProcessors(); + + public static void main(String[] args) throws Exception { + System.out.println("Test Environment: detected availableCPUs = " + availableCPUs); + if (!DockerTestUtils.canTestDocker()) { + return; + } + + DockerTestUtils.buildJdkDockerImage(imageName, "Dockerfile-BasicTest", "jdk-docker"); + + try { + runTest("jdk.SocketWrite"); + } finally { + DockerTestUtils.removeDockerImage(imageName); + } + } + + private static void runTest(String event) throws Exception { + DockerRunOptions opts = new DockerRunOptions(imageName, "/jdk/bin/java", "JfrNetwork") + .addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/") + .addJavaOpts("-cp", "/test-classes/") + .addDockerOpts("--hostname", JfrNetwork.HOST_NAME) + .addClassOptions(event); + DockerTestUtils.dockerRunJava(opts) + .shouldHaveExitValue(0) + .shouldContain(JfrNetwork.JFR_REPORTED_CONTAINER_HOSTNAME_TAG + JfrNetwork.HOST_NAME); + } +} diff --git a/test/hotspot/jtreg/runtime/containers/docker/TestMemoryAwareness.java b/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/TestMemoryAwareness.java rename to test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java diff --git a/test/hotspot/jtreg/runtime/containers/docker/TestMisc.java b/test/hotspot/jtreg/containers/docker/TestMisc.java similarity index 100% rename from test/hotspot/jtreg/runtime/containers/docker/TestMisc.java rename to test/hotspot/jtreg/containers/docker/TestMisc.java diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ExplicitArithmeticCheck.java b/test/hotspot/jtreg/runtime/ErrorHandling/ExplicitArithmeticCheck.java deleted file mode 100644 index 839d8379f40..00000000000 --- a/test/hotspot/jtreg/runtime/ErrorHandling/ExplicitArithmeticCheck.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 4221448 - * @summary Use explicit check for integer arithmetic exception on win32. - */ - -public class ExplicitArithmeticCheck { - public static void main(String argv[]) throws Exception { - for (int i = 0; i < 64; i++) { - boolean result = false; - int n; - try { - n = 0 / 0; - } catch (ArithmeticException e) { - result = true; - } - if (result == false) { - throw new Error("Failed to throw correct exception!"); - } - result = false; - try { - n = 0 % 0; - } catch (ArithmeticException e) { - result = true; - } - if (result == false) { - throw new Error("Failed to throw correct exception!"); - } - try { - n = 0x80000000 / -1; - } catch (Throwable t) { - throw new Error("Failed to throw correct exception!"); - } - if (n != 0x80000000) { - throw new Error("Incorrect integer arithmetic ! "); - } - try { - n = 0x80000000 % -1; - } catch (Throwable t) { - throw new Error("Failed to throw correct exception!"); - } - if (n != 0) { - throw new Error("Incorrect integer arithmetic!"); - } - } - } -} diff --git a/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java b/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java index 8ce703244e0..199cd171e43 100644 --- a/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java +++ b/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java @@ -25,21 +25,35 @@ * @test * @bug 8174749 8213307 * @summary MemberNameTable should reuse entries - * @requires vm.gc == "null" - * @library /test/lib + * @library /test/lib /runtime/testlibrary + * @modules java.base/jdk.internal.misc + * @modules java.compiler * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MemberNameLeak */ +import java.io.*; +import java.nio.file.*; import java.lang.invoke.*; +import java.lang.reflect.*; +import java.text.*; +import java.util.*; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.Utils; import sun.hotspot.WhiteBox; import sun.hotspot.code.Compiler; import sun.hotspot.gc.GC; public class MemberNameLeak { + private static String className = "MemberNameLeakTestClass"; + private static String methodPrefix = "method"; + // The size of the ResolvedMethodTable is 1024. 2000 entries + // is enough to trigger a grow/cleaning of the table after a GC. + private static int methodCount = 2000; + public static ArrayList keepAlive; + static class Leak { public void callMe() { } @@ -47,64 +61,120 @@ public class MemberNameLeak { public static void main(String[] args) throws Throwable { Leak leak = new Leak(); WhiteBox wb = WhiteBox.getWhiteBox(); - int removedCountOrig = wb.resolvedMethodRemovedCount(); - int removedCount; - for (int i = 0; i < 10; i++) { - MethodHandles.Lookup lookup = MethodHandles.lookup(); - MethodType mt = MethodType.fromMethodDescriptorString("()V", Leak.class.getClassLoader()); + keepAlive = new ArrayList<>(methodCount); + + ClassWithManyMethodsClassLoader classLoader = new ClassWithManyMethodsClassLoader(); + Class clazz = classLoader.create(className, methodPrefix, methodCount); + + long before = wb.resolvedMethodItemsCount(); + + Object o = clazz.newInstance(); + MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(clazz, MethodHandles.lookup()); + + for (int i = 0; i < methodCount; i++) { + MethodType mt = MethodType.fromMethodDescriptorString("()V", classLoader); + String methodName = methodPrefix + i; // findSpecial leaks some native mem - MethodHandle mh = lookup.findSpecial(Leak.class, "callMe", mt, Leak.class); - mh.invokeExact(leak); + // Add entry to ResolvedMethodTable. + MethodHandle mh0 = lookup.findSpecial(clazz, methodName, mt, clazz); + // Find entry in ResolvedMethodTable. + MethodHandle mh1 = lookup.findSpecial(clazz, methodName, mt, clazz); + + mh1.invoke(o); + + keepAlive.add(mh1); } + long after = wb.resolvedMethodItemsCount(); + + System.out.println("wb.resolvedMethodItemsCount() after setup: " + after); + + if (after == before) { + throw new RuntimeException("Too few resolved methods"); + } + + keepAlive = null; + // Wait until ServiceThread cleans ResolvedMethod table int cnt = 0; while (true) { if (cnt++ % 30 == 0) { System.gc(); // make mh unused } - removedCount = wb.resolvedMethodRemovedCount(); - if (removedCountOrig != removedCount) { + + if (after != wb.resolvedMethodItemsCount()) { + // Entries have been removed. break; } + Thread.sleep(100); } } } - public static void test(String gc, boolean doConcurrent) throws Throwable { + private static Path createGcLogPath(String prefix) throws IOException { + Path gcLog = Utils.createTempFile(prefix, "log"); + Files.delete(gcLog); + return gcLog; + } + + private static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + public static void test(GC gc, boolean doConcurrent) throws Throwable { + Path gcLogPath = createGcLogPath("gc." + gc + "." + doConcurrent); + System.err.println("test(" + gc + ", " + doConcurrent + ")" + " " + dateFormat.format(new Date())); // Run this Leak class with logging ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( - "-Xlog:membername+table=trace", + "-Xlog:membername+table=trace,gc+verify=debug,gc:" + gcLogPath + ":time,utctime,uptime,pid,level,tags", "-XX:+UnlockExperimentalVMOptions", "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", "-Xbootclasspath/a:.", + "-XX:+VerifyBeforeGC", + "-XX:+VerifyAfterGC", doConcurrent ? "-XX:+ExplicitGCInvokesConcurrent" : "-XX:-ExplicitGCInvokesConcurrent", "-XX:+ClassUnloading", "-XX:+ClassUnloadingWithConcurrentMark", - gc, Leak.class.getName()); + "-XX:+Use" + gc + "GC", + Leak.class.getName()); + + // Check process OutputAnalyzer output = new OutputAnalyzer(pb.start()); - output.shouldContain("ResolvedMethod entry added for MemberNameLeak$Leak.callMe()V"); - output.shouldContain("ResolvedMethod entry found for MemberNameLeak$Leak.callMe()V"); - output.shouldContain("ResolvedMethod entry removed"); + output.outputTo(System.out); + output.errorTo(System.err); output.shouldHaveExitValue(0); + + // Check gc log file + OutputAnalyzer gcLogOutput = new OutputAnalyzer(gcLogPath); + + // Hardcoded names for classes generated by GeneratedClassLoader + String descriptor = className + "." + methodPrefix + "0()V"; + gcLogOutput.shouldContain("ResolvedMethod entry added for " + descriptor); + gcLogOutput.shouldContain("ResolvedMethod entry found for " + descriptor); + gcLogOutput.shouldContain("ResolvedMethod entry removed"); + + System.err.println("test(" + gc + ", " + doConcurrent + ")" + " done " + dateFormat.format(new Date())); + } + + private static boolean supportsSTW(GC gc) { + return !(gc == GC.Epsilon); + } + + private static boolean supportsConcurrent(GC gc) { + return !(gc == GC.Epsilon || gc == GC.Serial || gc == GC.Parallel); + } + + private static void test(GC gc) throws Throwable { + if (supportsSTW(gc)) { + test(gc, false); + } + if (supportsConcurrent(gc)) { + test(gc, true); + } } public static void main(java.lang.String[] unused) throws Throwable { - test("-XX:+UseG1GC", false); - test("-XX:+UseG1GC", true); - - test("-XX:+UseParallelGC", false); - test("-XX:+UseSerialGC", false); - if (!Compiler.isGraalEnabled()) { // Graal does not support CMS - test("-XX:+UseConcMarkSweepGC", false); - test("-XX:+UseConcMarkSweepGC", true); - if (GC.Shenandoah.isSupported()) { - test("-XX:+UseShenandoahGC", true); - test("-XX:+UseShenandoahGC", false); - } - } + test(GC.selected()); } } diff --git a/test/hotspot/jtreg/runtime/Thread/MonitorCacheMaybeExpand_DeadLock.java b/test/hotspot/jtreg/runtime/Thread/MonitorCacheMaybeExpand_DeadLock.java deleted file mode 100644 index c037dd037e5..00000000000 --- a/test/hotspot/jtreg/runtime/Thread/MonitorCacheMaybeExpand_DeadLock.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 4087516 - * @summary Incorrect locking leads to deadlock in monitorCacheMaybeExpand. - * @author Anand Palaniswamy - * @build MonitorCacheMaybeExpand_DeadLock - * @run main/othervm MonitorCacheMaybeExpand_DeadLock - */ - -/** - * Background on the bug: - * - * The thread local monitor cache had a locking bug (till - * 1.2beta1) where two threads trying to expand the monitor cache - * at the same time would cause deadlock. The code paths that the - * two threads must be executing for this to happen is described - * in the bug report. - * - * Caveat and red-flag: - * - * Since deadlocks are very timing dependent, there is a good - * chance this test case will not catch the bug most of the time - * -- on your machine and setting, it is _possible_ that the two - * threads might not try a monitorCacheExpand at the same - * time. But in practice, on Solaris native threads, this program - * deadlocks the VM in about 2 seconds pretty consistently, - * whether MP or not. - * - * The rationale for running this test despite this rather large - * caveat is that at worst, it can do no harm. - * - * The idea: - * - * Is to create two monitor hungry threads. - * - * Originally Tom Rodriguez and I suspected that this weird state - * of two threads trying to expand monitor cache can happen only - * if: - * - * Thread 1: Is in the middle of a monitorCacheMaybeExpand. - * Thread 2: Runs GC and tries to freeClasses(). This causes - * sysFree() to be invoked, which in turn needs a - * mutex_lock -- and oops, we end up deadlocking - * with 1 on green_threads. - * - * Which is why this test tries to cause class GC at regular - * intervals. - * - * Turns out that the GC is not required. Two instances of the - * monitor hungry threads deadlock the VM pretty quick. :-) Infact - * the static initializer in the forName'd classes running - * alongside one of the hungry threads is sufficient to - * deadlock. Still keep the GC stuff just-in-case (and also - * because I wrote it :-). - * - */ -public class MonitorCacheMaybeExpand_DeadLock { - - /** - * A monitor-hungry thread. - */ - static class LotsaMonitors extends Thread { - - /** How many recursions? Could cause Java stack overflow. */ - static final int MAX_DEPTH = 800; - - /** What is our depth? */ - int depth = 0; - - /** Thread ID */ - int tid; - - /** So output will have thread number. */ - public LotsaMonitors(int tid, int depth) { - super("LotsaMonitors #" + new Integer(tid).toString()); - this.tid = tid; - this.depth = depth; - } - - /** Start a recursion that grabs monitors. */ - public void run() { - System.out.println(">>>Starting " + this.toString() + " ..."); - Thread.currentThread().yield(); - this.recurse(); - System.out.println("<< 0) { - new LotsaMonitors(tid, depth-1).recurse(); - } - } - } - - /** - * The test. - */ - public static void main(String[] args) { - /* Start the two of these crazy threads. */ - new LotsaMonitors(1, LotsaMonitors.MAX_DEPTH).start(); - new LotsaMonitors(2, LotsaMonitors.MAX_DEPTH).start(); - - /* And sit there and GC for good measure. */ - for (int i = 0; i < MAX_GC_ITERATIONS; i++) { - new LotsaMonitors(i+3, LotsaMonitors.MAX_DEPTH).start(); - System.out.println(">>>Loading 10 classes and gc'ing ..."); - Class[] classes = new Class[10]; - fillClasses(classes); - classes = null; - System.gc(); - Thread.currentThread().yield(); - System.out.println("<<", "()V", null, null); diff --git a/test/hotspot/jtreg/runtime/containers/docker/JfrReporter.java b/test/hotspot/jtreg/runtime/containers/docker/JfrReporter.java deleted file mode 100644 index 983fb50ba0a..00000000000 --- a/test/hotspot/jtreg/runtime/containers/docker/JfrReporter.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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. - */ - -import java.nio.file.Paths; -import jdk.jfr.Recording; -import jdk.jfr.consumer.RecordedEvent; -import jdk.jfr.consumer.RecordingFile; - - -// This class is intended to run inside a container -public class JfrReporter { - public static final String TEST_REPORTED_CORES="TEST_REPORTED_CORES"; - public static final String TEST_REPORTED_MEMORY="TEST_REPORTED_MEMORY"; - public static final String TEST_REPORTED_PID="TEST_REPORTED_PID"; - public static final String TESTCASE_CPU="cpu"; - public static final String TESTCASE_MEMORY="memory"; - public static final String TESTCASE_PROCESS="process"; - - public static void main(String[] args) throws Exception { - String testCase = args[0]; - System.out.println("Testcase: " + testCase); - switch (testCase) { - case TESTCASE_CPU: - RecordedEvent event = testEvent("jdk.CPUInformation", "cpu.jfr"); - System.out.println(TEST_REPORTED_CORES + "=" + event.getInt("cores")); - break; - case TESTCASE_MEMORY: - event = testEvent("jdk.PhysicalMemory", "memory.jfr"); - System.out.println(TEST_REPORTED_MEMORY + "=" + event.getLong("totalSize")); - break; - case TESTCASE_PROCESS: - event = testEvent("jdk.SystemProcess", "process.jfr"); - System.out.println(TEST_REPORTED_PID + "=" + event.getString("pid")); - break; - default: - throw new IllegalArgumentException("Invalid test case"); - } - } - - private static RecordedEvent testEvent(String event, String recordingPath) throws Exception { - System.out.println("========= Testing event: " + event); - Recording r = new Recording(); - r.enable(event); - r.setDestination(Paths.get("tmp", recordingPath)); - r.start(); - r.stop(); - - RecordedEvent recordedEvent = RecordingFile.readAllEvents(r.getDestination()).get(0); - System.out.println("RecordedEvent: " + recordedEvent); - return recordedEvent; - } -} diff --git a/test/hotspot/jtreg/runtime/interpreter/WideStrictInline.java b/test/hotspot/jtreg/runtime/interpreter/WideStrictInline.java deleted file mode 100644 index c6fc9947380..00000000000 --- a/test/hotspot/jtreg/runtime/interpreter/WideStrictInline.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 4169183 - * @summary Check for correct inlining by the interpreter (widefp and strictfp). - * The default is widefp. A strictfp method was getting inlined - * into a widefp method. - */ - -import java.io.PrintStream; - -public class WideStrictInline { - static PrintStream out; - static float halfUlp; - - static { - halfUlp = 1; - for ( int i = 127 - 24; i > 0; i-- ) - halfUlp *= 2; - } - - public static void main(String argv[]) throws Exception { - out = System.err; - pr(-1,"halfUlp",halfUlp); - WideStrictInline obj = new WideStrictInline(); - for( int i=0; i<48; i++ ) - obj.instanceMethod( i ); - } - - private static void pr(int i, String desc, float r) { - out.print(" i=("+i+") "+desc+" ; == "+r); - out.println(" , 0x"+Integer.toHexString(Float.floatToIntBits(r))); - } - - private static strictfp float WideStrictInline(float par) { - return par; - } - - public static strictfp float strictValue(int i) { - float r; - switch (i%4) { - case 0: r = -Float.MAX_VALUE; break; - case 1: r = Float.MAX_VALUE; break; - case 2: r = Float.MIN_VALUE; break; - default : r = 1L << 24; - } - return r; - } - - void instanceMethod (int i) throws Exception { - float r; - switch (i%4) { - case 0: - if (!Float.isInfinite( WideStrictInline(strictValue(i)*2) + - Float.MAX_VALUE )) - { - pr(i, - "WideStrictInline(-Float.MAX_VALUE * 2) " + - "!= Float.NEGATIVE_INFINITY" - ,WideStrictInline(strictValue(i)*2) + Float.MAX_VALUE); - } - r = WideStrictInline(strictValue(i)*2) + Float.MAX_VALUE; - if ( !Float.isInfinite( r ) ) { - pr(i,"r != Float.NEGATIVE_INFINITY",r); - throw new RuntimeException(); - } - break; - case 1: - if (!Float.isInfinite(WideStrictInline(strictValue(i)+halfUlp) - - Float.MAX_VALUE )) { - pr(i,"WideStrictInline(Float.MAX_VALUE+halfUlp) " + - "!= Float.POSITIVE_INFINITY" - ,WideStrictInline(strictValue(i)+halfUlp) - Float.MAX_VALUE); - } - r = WideStrictInline(strictValue(i)+halfUlp) - Float.MAX_VALUE; - if ( !Float.isInfinite( r ) ) { - pr(i,"r != Float.POSITIVE_INFINITY",r); - throw new RuntimeException(); - } - break; - case 2: - if (WideStrictInline(strictValue(i)/2) != 0) { - pr(i,"WideStrictInline(Float.MIN_VALUE/2) != 0", - WideStrictInline(strictValue(i)/2)); - } - r = WideStrictInline(strictValue(i)/2); - if ( r != 0 ) { - pr(i,"r != 0",r); - throw new RuntimeException(); - } - break; - default: - if (WideStrictInline(strictValue(i)-0.5f) - strictValue(i) != 0) { - pr(i,"WideStrictInline(2^24-0.5) != 2^24", - WideStrictInline(strictValue(i)-0.5f)); - } - r = WideStrictInline(strictValue(i)-0.5f); - if ( r - strictValue(i) != 0 ) { - pr(i,"r != 2^24",r); - throw new RuntimeException(); - } - } - } - -} diff --git a/test/hotspot/jtreg/runtime/testlibrary/ClassWithManyMethodsClassLoader.java b/test/hotspot/jtreg/runtime/testlibrary/ClassWithManyMethodsClassLoader.java new file mode 100644 index 00000000000..91be60a15a1 --- /dev/null +++ b/test/hotspot/jtreg/runtime/testlibrary/ClassWithManyMethodsClassLoader.java @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.DataInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import javax.tools.JavaCompiler; +import javax.tools.ToolProvider; + +/** + * A factory that generates a class with many methods. + */ +public class ClassWithManyMethodsClassLoader extends ClassLoader { + /** + * Used to enable/disable keeping the class files and java sources for + * the generated classes. + */ + private static boolean deleteFiles = Boolean.parseBoolean( + System.getProperty("ClassWithManyMethodsClassLoader.deleteFiles", "true")); + + private JavaCompiler javac; + + public ClassWithManyMethodsClassLoader() { + javac = ToolProvider.getSystemJavaCompiler(); + } + + private String generateSource(String className, String methodPrefix, int methodCount) { + StringBuilder sb = new StringBuilder(); + sb.append("public class ") + .append(className) + .append("{\n"); + + for (int i = 0; i < methodCount; i++) { + sb.append("public void ") + .append(methodPrefix) + .append(i) + .append("() {}\n"); + } + + sb.append("\n}"); + + return sb.toString(); + } + + private byte[] generateClassBytes(String className, String methodPrefix, int methodCount) throws IOException { + String src = generateSource(className, methodPrefix, methodCount); + File file = new File(className + ".java"); + try (PrintWriter pw = new PrintWriter(new FileWriter(file))) { + pw.append(src); + pw.flush(); + } + ByteArrayOutputStream err = new ByteArrayOutputStream(); + int exitcode = javac.run(null, null, err, file.getCanonicalPath()); + if (exitcode != 0) { + // Print Error + System.err.print(err); + if (err.toString().contains("java.lang.OutOfMemoryError: Java heap space")) { + throw new OutOfMemoryError("javac failed with resources exhausted"); + } else { + throw new RuntimeException("javac failure when compiling: " + + file.getCanonicalPath()); + } + } else { + if (deleteFiles) { + file.delete(); + } + } + + File classFile = new File(className + ".class"); + byte[] bytes; + try (DataInputStream dis = new DataInputStream(new FileInputStream(classFile))) { + bytes = new byte[dis.available()]; + dis.readFully(bytes); + } + if (deleteFiles) { + classFile.delete(); + } + + return bytes; + } + + public Class create(String className, String methodPrefix, int methodCount) throws IOException { + byte[] bytes = generateClassBytes(className, methodPrefix, methodCount); + return defineClass(className, bytes, 0, bytes.length); + } +} diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineAddLambdaExpression.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineAddLambdaExpression.java index 482a0c7ed1c..368f106d39f 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineAddLambdaExpression.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineAddLambdaExpression.java @@ -31,7 +31,7 @@ * java.instrument * jdk.jartool/sun.tools.jar * @run main RedefineClassHelper - * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineAddLambdaExpression + * @run main/othervm -javaagent:redefineagent.jar -XX:+AllowRedefinitionToAddDeleteMethods -Xlog:redefine+class*=trace RedefineAddLambdaExpression */ interface MathOperation { diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineDeleteJmethod.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineDeleteJmethod.java index b787d95a555..908ee54ead1 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineDeleteJmethod.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineDeleteJmethod.java @@ -31,7 +31,7 @@ * java.instrument * jdk.jartool/sun.tools.jar * @run main RedefineClassHelper - * @run main/native/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineDeleteJmethod + * @run main/native/othervm -javaagent:redefineagent.jar -XX:+AllowRedefinitionToAddDeleteMethods -Xlog:redefine+class*=trace RedefineDeleteJmethod */ class B { diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSubtractLambdaExpression.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSubtractLambdaExpression.java index 1adaa156f44..cb10ddc8e97 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSubtractLambdaExpression.java +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineSubtractLambdaExpression.java @@ -31,7 +31,7 @@ * java.instrument * jdk.jartool/sun.tools.jar * @run main RedefineClassHelper - * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineSubtractLambdaExpression + * @run main/othervm -javaagent:redefineagent.jar -XX:+AllowRedefinitionToAddDeleteMethods -Xlog:redefine+class*=trace RedefineSubtractLambdaExpression */ interface MathOperation { diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestAddDeleteMethods.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestAddDeleteMethods.java new file mode 100644 index 00000000000..83f9d9c7464 --- /dev/null +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/TestAddDeleteMethods.java @@ -0,0 +1,138 @@ +/* + * 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 8192936 + * @summary RI does not follow the JVMTI RedefineClasses spec; need to disallow adding and deleting methods + * @library /test/lib + * @modules java.base/jdk.internal.misc + * @modules java.compiler + * java.instrument + * jdk.jartool/sun.tools.jar + * @run main RedefineClassHelper + * @run main/othervm -javaagent:redefineagent.jar TestAddDeleteMethods + */ + +import static jdk.test.lib.Asserts.assertEquals; + +// package access top-level class to avoid problem with RedefineClassHelper +// and nested types. +class A { + private static void foo() { System.out.println("OLD foo called"); } + private final void finalFoo() { System.out.println("OLD finalFoo called"); } + public void publicFoo() { foo(); finalFoo(); } +} + +public class TestAddDeleteMethods { + static A a; + + public static String newA = + "class A {" + + "private static void foo() { System.out.println(\"NEW foo called\"); }" + + "private final void finalFoo() { System.out.println(\"NEW finalFoo called\"); }" + + "public void publicFoo() { foo(); finalFoo(); }" + + "}"; + + public static String newAddBar = + "class A {" + + "private void bar() { System.out.println(\"NEW bar called\"); }" + + "private static void foo() { System.out.println(\"NEW foo called\"); }" + + "private final void finalFoo() { System.out.println(\"NEW finalFoo called\"); }" + + "public void publicFoo() { foo(); bar(); finalFoo(); }" + + "}"; + + public static String newAddFinalBar = + "class A {" + + "private final void bar() { System.out.println(\"NEW bar called\"); }" + + "private static void foo() { System.out.println(\"NEW foo called\"); }" + + "private final void finalFoo() { System.out.println(\"NEW finalFoo called\"); }" + + "public void publicFoo() { foo(); bar(); finalFoo(); }" + + "}"; + + public static String newAddPublicBar = + "class A {" + + "public void bar() { System.out.println(\"NEW public bar called\"); }" + + "private static void foo() { System.out.println(\"NEW foo called\"); }" + + "private final void finalFoo() { System.out.println(\"NEW finalFoo called\"); }" + + "public void publicFoo() { foo(); bar(); finalFoo(); }" + + "}"; + + public static String newDeleteFoo = + "class A {" + + "private final void finalFoo() { System.out.println(\"NEW finalFoo called\"); }" + + "public void publicFoo() { finalFoo(); }" + + "}"; + + public static String newDeleteFinalFoo = + "class A {" + + "private static void foo() { System.out.println(\"NEW foo called\"); }" + + "public void publicFoo() { foo(); }" + + "}"; + + public static String newDeletePublicFoo = + "class A {" + + "private static void foo() { System.out.println(\"NEW foo called\"); }" + + "private final void finalFoo() { System.out.println(\"NEW finalFoo called\"); }" + + "}"; + + static private final String ExpMsgPrefix = "attempted to "; + static private final String ExpMsgPostfix = " a method"; + + public static void test(String newBytes, String expSuffix) throws Exception { + String expectedMessage = ExpMsgPrefix + expSuffix + ExpMsgPostfix; + + try { + RedefineClassHelper.redefineClass(A.class, newBytes); + a.publicFoo(); + throw new RuntimeException("Failed, expected UOE"); + } catch (UnsupportedOperationException uoe) { + String message = uoe.getMessage(); + System.out.println("Got expected UOE " + message); + if (!message.endsWith(expectedMessage)) { + throw new RuntimeException("Expected UOE error message to end with: " + expectedMessage); + } + } + } + + static { + a = new A(); + } + + public static void main(String[] args) throws Exception { + + a.publicFoo(); + + // Should pass because this only changes bytes of methods. + RedefineClassHelper.redefineClass(A.class, newA); + a.publicFoo(); + + // Add private static bar + test(newAddBar, "add"); + test(newAddFinalBar, "add"); + test(newAddPublicBar, "add"); + test(newDeleteFoo, "delete"); + test(newDeleteFinalFoo, "delete"); + test(newDeletePublicFoo, "delete"); + } +} diff --git a/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java b/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java index 2d15fda1b0e..92e960bff3b 100644 --- a/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java +++ b/test/jaxp/javax/xml/jaxp/unittest/parsers/BaseParsingTest.java @@ -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 @@ -22,19 +22,22 @@ */ package parsers; +import java.io.ByteArrayInputStream; import java.io.StringReader; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; +import static org.testng.Assert.assertEquals; import org.testng.annotations.DataProvider; import org.testng.annotations.Listeners; import org.testng.annotations.Test; +import org.w3c.dom.Document; import org.xml.sax.InputSource; /** * @test - * @bug 8169450 + * @bug 8169450 8222415 * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest * @run testng/othervm -DrunSecMngr=true parsers.BaseParsingTest * @run testng/othervm parsers.BaseParsingTest @@ -143,7 +146,7 @@ public class BaseParsingTest { * @bug 8169450 * This particular issue does not appear in DOM parsing since the spaces are * normalized during version detection. This test case then serves as a guard - * against such an issue from occuring in the version detection. + * against such an issue from occurring in the version detection. * * @param xml the test xml * @throws Exception if the parser fails to parse the xml @@ -151,8 +154,24 @@ public class BaseParsingTest { @Test(dataProvider = "xmlDeclarations") public void testWithDOM(String xml) throws Exception { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - dbf.setValidating(true); DocumentBuilder db = dbf.newDocumentBuilder(); db.parse(new InputSource(new StringReader(xml))); } + + /** + * @bug 8222415 + * Verifies that the parser is configured properly for UTF-16BE or LE. + * @throws Exception + */ + @Test + public void testEncoding() throws Exception { + ByteArrayInputStream bis = new ByteArrayInputStream( + " ".getBytes("UnicodeLittle")); + InputSource is = new InputSource(bis); + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + DocumentBuilder db = dbf.newDocumentBuilder(); + + Document doc = db.parse(is); + assertEquals("UTF-16LE", doc.getInputEncoding()); + } } diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index f4eac5832fe..a950f6c0290 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -723,7 +723,6 @@ sun/security/pkcs11/tls/TestLeadingZeroesP11.java 8204203 windows- sun/security/pkcs11/tls/TestMasterSecret.java 8204203 windows-all sun/security/pkcs11/tls/TestPRF.java 8204203 windows-all sun/security/pkcs11/tls/TestPremaster.java 8204203 windows-all -sun/security/pkcs11/tls/tls12/TestTLS12.java 8221271 windows-all sun/security/tools/keytool/NssTest.java 8204203 windows-all ############################################################################ diff --git a/test/jdk/com/sun/jdi/RedefineAddPrivateMethod.java b/test/jdk/com/sun/jdi/RedefineAddPrivateMethod.java index da3d54767ef..4d25ae23677 100644 --- a/test/jdk/com/sun/jdi/RedefineAddPrivateMethod.java +++ b/test/jdk/com/sun/jdi/RedefineAddPrivateMethod.java @@ -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 @@ -46,8 +46,12 @@ class RedefineAddPrivateMethodTarg { } public class RedefineAddPrivateMethod extends JdbTest { + static private final String ALLOW_ADD_DELETE_OPTION = "-XX:+AllowRedefinitionToAddDeleteMethods"; + public static void main(String argv[]) { - new RedefineAddPrivateMethod().run(); + RedefineAddPrivateMethod test = new RedefineAddPrivateMethod(); + test.launchOptions.addVMOptions(ALLOW_ADD_DELETE_OPTION); + test.run(); } private RedefineAddPrivateMethod() { diff --git a/test/jdk/com/sun/jdi/lib/jdb/Debuggee.java b/test/jdk/com/sun/jdi/lib/jdb/Debuggee.java index c37fedb4f7f..876d1fcf0a8 100644 --- a/test/jdk/com/sun/jdi/lib/jdb/Debuggee.java +++ b/test/jdk/com/sun/jdi/lib/jdb/Debuggee.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -65,6 +65,7 @@ public class Debuggee implements Closeable { public static class Launcher { private final String mainClass; private final List options = new LinkedList<>(); + private String vmOptions = null; private String transport = "dt_socket"; private String address = null; private boolean suspended = true; @@ -81,6 +82,10 @@ public class Debuggee implements Closeable { this.options.addAll(options); return this; } + public Launcher addVMOptions(String vmOptions) { + this.vmOptions = vmOptions; + return this; + } // default is "dt_socket" public Launcher setTransport(String value) { transport = value; @@ -104,6 +109,9 @@ public class Debuggee implements Closeable { public ProcessBuilder prepare() { List debuggeeArgs = new LinkedList<>(); + if (vmOptions != null) { + debuggeeArgs.add(vmOptions); + } debuggeeArgs.add("-agentlib:jdwp=transport=" + transport + (address == null ? "" : ",address=" + address) + ",server=y,suspend=" + (suspended ? "y" : "n")); diff --git a/test/jdk/com/sun/jdi/lib/jdb/JdbTest.java b/test/jdk/com/sun/jdi/lib/jdb/JdbTest.java index 5c13a17fe4a..f286e126aed 100644 --- a/test/jdk/com/sun/jdi/lib/jdb/JdbTest.java +++ b/test/jdk/com/sun/jdi/lib/jdb/JdbTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,7 @@ public abstract class JdbTest { public final String debuggeeClass; public final List debuggeeOptions = new LinkedList<>(); public String sourceFilename; + public String vmOptions = null; public LaunchOptions(String debuggeeClass) { this.debuggeeClass = debuggeeClass; @@ -56,6 +57,10 @@ public abstract class JdbTest { sourceFilename = name; return this; } + public LaunchOptions addVMOptions(String vmOptions) { + this.vmOptions = vmOptions; + return this; + } } public JdbTest(LaunchOptions launchOptions) { @@ -72,7 +77,7 @@ public abstract class JdbTest { protected Jdb jdb; protected Debuggee debuggee; - private final LaunchOptions launchOptions; + protected LaunchOptions launchOptions; // returns the whole jdb output as a string public String getJdbOutput() { @@ -108,6 +113,7 @@ public abstract class JdbTest { // launch debuggee debuggee = Debuggee.launcher(launchOptions.debuggeeClass) .addOptions(launchOptions.debuggeeOptions) + .addVMOptions(launchOptions.vmOptions) .launch(); // launch jdb diff --git a/test/jdk/java/lang/instrument/RedefineAddDeleteMethod/DeleteMethodHandle/MethodHandleDeletedMethod.java b/test/jdk/java/lang/instrument/RedefineAddDeleteMethod/DeleteMethodHandle/MethodHandleDeletedMethod.java index d9ea0779c19..f21b09d8f40 100644 --- a/test/jdk/java/lang/instrument/RedefineAddDeleteMethod/DeleteMethodHandle/MethodHandleDeletedMethod.java +++ b/test/jdk/java/lang/instrument/RedefineAddDeleteMethod/DeleteMethodHandle/MethodHandleDeletedMethod.java @@ -33,7 +33,7 @@ * @compile ../../NamedBuffer.java * @compile redef/Xost.java * @run main RedefineClassHelper - * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+update*=debug,membername+table=debug MethodHandleDeletedMethod + * @run main/othervm -XX:+AllowRedefinitionToAddDeleteMethods -javaagent:redefineagent.jar -Xlog:redefine+class+update*=debug,membername+table=debug MethodHandleDeletedMethod */ import java.io.File; diff --git a/test/jdk/java/lang/instrument/RedefineMethodAddInvoke.sh b/test/jdk/java/lang/instrument/RedefineMethodAddInvoke.sh index a24c417b3eb..b5864fbc26b 100644 --- a/test/jdk/java/lang/instrument/RedefineMethodAddInvoke.sh +++ b/test/jdk/java/lang/instrument/RedefineMethodAddInvoke.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -71,6 +71,7 @@ mv RedefineMethodAddInvokeTarget.java RedefineMethodAddInvokeTarget_2.java mv RedefineMethodAddInvokeTarget.class RedefineMethodAddInvokeTarget_2.class "${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodAddInvokeAgent.jar \ + -XX:+AllowRedefinitionToAddDeleteMethods \ -classpath "${TESTCLASSES}" RedefineMethodAddInvokeApp > output.log 2>&1 cat output.log diff --git a/test/jdk/java/lang/instrument/RedefineMethodDelInvoke.sh b/test/jdk/java/lang/instrument/RedefineMethodDelInvoke.sh index 7ed7829a9bc..9924af3d2a8 100644 --- a/test/jdk/java/lang/instrument/RedefineMethodDelInvoke.sh +++ b/test/jdk/java/lang/instrument/RedefineMethodDelInvoke.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2015, 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 @@ -72,6 +72,7 @@ mv RedefineMethodDelInvokeTarget.java RedefineMethodDelInvokeTarget_2.java mv RedefineMethodDelInvokeTarget.class RedefineMethodDelInvokeTarget_2.class "${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodDelInvokeAgent.jar \ + -XX:+AllowRedefinitionToAddDeleteMethods \ -classpath "${TESTCLASSES}" RedefineMethodDelInvokeApp > output.log 2>&1 result=$? diff --git a/test/jdk/java/lang/instrument/RedefineMethodInBacktrace.sh b/test/jdk/java/lang/instrument/RedefineMethodInBacktrace.sh index 8d8cbc87bed..d7cb2aa1c03 100644 --- a/test/jdk/java/lang/instrument/RedefineMethodInBacktrace.sh +++ b/test/jdk/java/lang/instrument/RedefineMethodInBacktrace.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2013, 2016, 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 @@ -69,6 +69,7 @@ cp "${TESTSRC}"/RedefineMethodInBacktraceTargetB_2.java \ "${JAVAC}" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . RedefineMethodInBacktraceTargetB.java "${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodInBacktraceAgent.jar \ + -XX:+AllowRedefinitionToAddDeleteMethods \ -classpath "${TESTCLASSES}" RedefineMethodInBacktraceApp > output.log 2>&1 RUN_RESULT=$? diff --git a/test/jdk/java/math/BigDecimal/IntValueExactTests.java b/test/jdk/java/math/BigDecimal/IntValueExactTests.java new file mode 100644 index 00000000000..f0ce1886b61 --- /dev/null +++ b/test/jdk/java/math/BigDecimal/IntValueExactTests.java @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8211936 + * @summary Tests of BigDecimal.intValueExact + */ +import java.math.*; +import java.util.List; +import java.util.Map; +import static java.util.Map.entry; + +public class IntValueExactTests { + public static void main(String... args) { + int failures = 0; + + failures += intValueExactSuccessful(); + failures += intValueExactExceptional(); + + if (failures > 0) { + throw new RuntimeException("Incurred " + failures + + " failures while testing intValueExact."); + } + } + + private static int simpleIntValueExact(BigDecimal bd) { + return bd.toBigIntegerExact().intValue(); + } + + private static int intValueExactSuccessful() { + int failures = 0; + + // Strings used to create BigDecimal instances on which invoking + // intValueExact() will succeed. + Map successCases = + Map.ofEntries(entry(new BigDecimal("2147483647"), Integer.MAX_VALUE), // 2^31 -1 + entry(new BigDecimal("2147483647.0"), Integer.MAX_VALUE), + entry(new BigDecimal("2147483647.00"), Integer.MAX_VALUE), + + entry(new BigDecimal("-2147483648"), Integer.MIN_VALUE), // -2^31 + entry(new BigDecimal("-2147483648.0"), Integer.MIN_VALUE), + entry(new BigDecimal("-2147483648.00"),Integer.MIN_VALUE), + + entry(new BigDecimal("1e0"), 1), + entry(new BigDecimal(BigInteger.ONE, -9), 1_000_000_000), + + entry(new BigDecimal("0e13"), 0), // Fast path zero + entry(new BigDecimal("0e32"), 0), + entry(new BigDecimal("0e512"), 0), + + entry(new BigDecimal("10.000000000000000000000000000000000"), 10)); + + for (var testCase : successCases.entrySet()) { + BigDecimal bd = testCase.getKey(); + int expected = testCase.getValue(); + try { + int intValueExact = bd.intValueExact(); + if (expected != intValueExact || + intValueExact != simpleIntValueExact(bd)) { + failures++; + System.err.println("Unexpected intValueExact result " + intValueExact + + " on " + bd); + } + } catch (Exception e) { + failures++; + System.err.println("Error on " + bd + "\tException message:" + e.getMessage()); + } + } + return failures; + } + + private static int intValueExactExceptional() { + int failures = 0; + List exceptionalCases = + List.of(new BigDecimal("2147483648"), // Integer.MAX_VALUE + 1 + new BigDecimal("2147483648.0"), + new BigDecimal("2147483648.00"), + new BigDecimal("-2147483649"), // Integer.MIN_VALUE - 1 + new BigDecimal("-2147483649.1"), + new BigDecimal("-2147483649.01"), + + new BigDecimal("9999999999999999999999999999999"), + new BigDecimal("10000000000000000000000000000000"), + + new BigDecimal("0.99"), + new BigDecimal("0.999999999999999999999")); + + for (BigDecimal bd : exceptionalCases) { + try { + int intValueExact = bd.intValueExact(); + failures++; + System.err.println("Unexpected non-exceptional intValueExact on " + bd); + } catch (ArithmeticException e) { + // Success; + } + } + return failures; + } +} diff --git a/test/jdk/java/math/BigDecimal/IntegralValueTests.java b/test/jdk/java/math/BigDecimal/IntegralValueTests.java new file mode 100644 index 00000000000..c51574ea543 --- /dev/null +++ b/test/jdk/java/math/BigDecimal/IntegralValueTests.java @@ -0,0 +1,241 @@ +/* + * 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 8211936 + * @summary Tests of BigDecimal.intValue() and BigDecimal.longValue() + */ +import java.math.BigDecimal; +import java.util.Map; + +public class IntegralValueTests { + public static void main(String... args) { + int failures = + integralValuesTest(INT_VALUES, true) + + integralValuesTest(LONG_VALUES, false); + if (failures != 0) { + throw new RuntimeException + ("Incurred " + failures + " failures for {int,long}Value()."); + } + } + + private static final Map INT_VALUES = + Map.ofEntries( + + // 2**31 - 1 + Map.entry(new BigDecimal("2147483647"), Integer.MAX_VALUE), + Map.entry(new BigDecimal("2147483647.0"), Integer.MAX_VALUE), + Map.entry(new BigDecimal("2147483647.00"), Integer.MAX_VALUE), + + Map.entry(new BigDecimal("-2147483647"), -Integer.MAX_VALUE), + Map.entry(new BigDecimal("-2147483647.0"), -Integer.MAX_VALUE), + + // -2**31 + Map.entry(new BigDecimal("-2147483648"), Integer.MIN_VALUE), + Map.entry(new BigDecimal("-2147483648.1"), Integer.MIN_VALUE), + Map.entry(new BigDecimal("-2147483648.01"), Integer.MIN_VALUE), + + // -2**31 + 1 truncation to 2**31 - 1 + Map.entry(new BigDecimal("-2147483649"), Integer.MAX_VALUE), + + // 2**64 - 1 truncation to 1 + Map.entry(new BigDecimal("4294967295"), -1), + + // 2**64 truncation to 0 + Map.entry(new BigDecimal("4294967296"), 0), + + // Fast path truncation to 0 + Map.entry(new BigDecimal("1e32"), 0), + + // Slow path truncation to -2**31 + Map.entry(new BigDecimal("1e31"), Integer.MIN_VALUE), + + // Slow path + Map.entry(new BigDecimal("1e0"), 1), + + // Fast path round to 0 + Map.entry(new BigDecimal("9e-1"), 0), + + // Some random values + Map.entry(new BigDecimal("900e-1"), 90), // Increasing negative exponents + Map.entry(new BigDecimal("900e-2"), 9), + Map.entry(new BigDecimal("900e-3"), 0), + + // Fast path round to 0 + Map.entry(new BigDecimal("123456789e-9"), 0), + + // Slow path round to 1 + Map.entry(new BigDecimal("123456789e-8"), 1), + + // Increasing positive exponents + Map.entry(new BigDecimal("10000001e1"), 100000010), + Map.entry(new BigDecimal("10000001e10"), -1315576832), + Map.entry(new BigDecimal("10000001e100"), 0), + Map.entry(new BigDecimal("10000001e1000"), 0), + Map.entry(new BigDecimal("10000001e10000"), 0), + Map.entry(new BigDecimal("10000001e100000"), 0), + Map.entry(new BigDecimal("10000001e1000000"), 0), + Map.entry(new BigDecimal("10000001e10000000"), 0), + Map.entry(new BigDecimal("10000001e100000000"), 0), + Map.entry(new BigDecimal("10000001e1000000000"), 0), + + // Increasing negative exponents + Map.entry(new BigDecimal("10000001e-1"), 1000000), + Map.entry(new BigDecimal("10000001e-10"), 0), + Map.entry(new BigDecimal("10000001e-100"), 0), + Map.entry(new BigDecimal("10000001e-1000"), 0), + Map.entry(new BigDecimal("10000001e-10000"), 0), + Map.entry(new BigDecimal("10000001e-100000"), 0), + Map.entry(new BigDecimal("10000001e-1000000"), 0), + Map.entry(new BigDecimal("10000001e-10000000"), 0), + Map.entry(new BigDecimal("10000001e-100000000"), 0), + Map.entry(new BigDecimal("10000001e-1000000000"), 0), + + // Currency calculation to 4 places + Map.entry(new BigDecimal("12345.0001"), 12345), + Map.entry(new BigDecimal("12345.9999"), 12345), + Map.entry(new BigDecimal("-12345.0001"), -12345), + Map.entry(new BigDecimal("-12345.9999"), -12345)); + + private static final Map LONG_VALUES = + Map.ofEntries( + // 2**63 - 1 + Map.entry(new BigDecimal("9223372036854775807"), Long.MAX_VALUE), + Map.entry(new BigDecimal("9223372036854775807.0"), Long.MAX_VALUE), + Map.entry(new BigDecimal("9223372036854775807.00"), Long.MAX_VALUE), + + // 2**63 truncation to -2**63 + Map.entry(new BigDecimal("-9223372036854775808"), Long.MIN_VALUE), + Map.entry(new BigDecimal("-9223372036854775808.1"), Long.MIN_VALUE), + Map.entry(new BigDecimal("-9223372036854775808.01"), Long.MIN_VALUE), + + // -2**63 + 1 truncation to 2**63 - 1 + Map.entry(new BigDecimal("-9223372036854775809"), 9223372036854775807L), + + // 2**64 - 1 truncation to -1 + Map.entry(new BigDecimal("18446744073709551615"), -1L), + + // 2**64 truncation to 0 + Map.entry(new BigDecimal("18446744073709551616"), 0L), + + // Slow path truncation to -2**63 + Map.entry(new BigDecimal("1e63"), -9223372036854775808L), + Map.entry(new BigDecimal("-1e63"), -9223372036854775808L), + // Fast path with larger magnitude scale + Map.entry(new BigDecimal("1e64"), 0L), + Map.entry(new BigDecimal("-1e64"), 0L), + Map.entry(new BigDecimal("1e65"), 0L), + Map.entry(new BigDecimal("-1e65"), 0L), + + // Slow path + Map.entry(new BigDecimal("1e0"), 1L), + + // Fast path round to 0 + Map.entry(new BigDecimal("9e-1"), 0L), + + // Some random values + Map.entry(new BigDecimal("900e-1"), 90L), // Increasing negative exponents + Map.entry(new BigDecimal("900e-2"), 9L), + Map.entry(new BigDecimal("900e-3"), 0L), + + // Fast path round to 0 + Map.entry(new BigDecimal("123456789e-9"), 0L), + + // Slow path round to 1 + Map.entry(new BigDecimal("123456789e-8"), 1L), + + // Increasing positive exponents + Map.entry(new BigDecimal("10000001e1"), 100000010L), + Map.entry(new BigDecimal("10000001e10"), 100000010000000000L), + Map.entry(new BigDecimal("10000001e100"), 0L), + Map.entry(new BigDecimal("10000001e1000"), 0L), + Map.entry(new BigDecimal("10000001e10000"), 0L), + Map.entry(new BigDecimal("10000001e100000"), 0L), + Map.entry(new BigDecimal("10000001e1000000"), 0L), + Map.entry(new BigDecimal("10000001e10000000"), 0L), + Map.entry(new BigDecimal("10000001e100000000"), 0L), + Map.entry(new BigDecimal("10000001e1000000000"), 0L), + + // Increasing negative exponents + Map.entry(new BigDecimal("10000001e-1"), 1000000L), + Map.entry(new BigDecimal("10000001e-10"), 0L), + Map.entry(new BigDecimal("10000001e-100"), 0L), + Map.entry(new BigDecimal("10000001e-1000"), 0L), + Map.entry(new BigDecimal("10000001e-10000"), 0L), + Map.entry(new BigDecimal("10000001e-100000"), 0L), + Map.entry(new BigDecimal("10000001e-1000000"), 0L), + Map.entry(new BigDecimal("10000001e-10000000"), 0L), + Map.entry(new BigDecimal("10000001e-100000000"), 0L), + Map.entry(new BigDecimal("10000001e-1000000000"), 0L), + + // Currency calculation to 4 places + Map.entry(new BigDecimal("12345.0001"), 12345L), + Map.entry(new BigDecimal("12345.9999"), 12345L), + Map.entry(new BigDecimal("-12345.0001"), -12345L), + Map.entry(new BigDecimal("-12345.9999"), -12345L)); + + private static int integralValuesTest(Map v, boolean isInt) { + System.err.format("Testing %s%n", isInt ? "Integer" : "Long"); + int failures = 0; + for (var testCase : v.entrySet()) { + BigDecimal bd = testCase.getKey(); + Number expected = testCase.getValue(); + try { + if (isInt) { + int intValue = bd.intValue(); + if (intValue != (int)expected) { + failures += reportError(bd, expected, intValue, isInt); + } + } else { + long longValue = bd.longValue(); + if (longValue != (long)expected) { + failures += reportError(bd, expected, longValue, isInt); + } + } + } catch (Exception e) { + failures++; + System.err.format("Unexpected exception %s for %s%n", + e, bd.toString()); + } + } + return failures; + } + + private static int reportError(BigDecimal bd, Number expected, long longValue, boolean isInt) { + System.err.format("For %s, scale=%d, expected %d, actual %d, simple %d%n", + bd.toString(), bd.scale(), + (isInt ? (Integer) expected : (Long) expected ), + longValue, + (isInt ? simpleIntValue(bd): simpleLongValue(bd) )); + return 1; + } + + private static long simpleLongValue(BigDecimal bd) { + return bd.toBigInteger().longValue(); + } + + private static int simpleIntValue(BigDecimal bd) { + return bd.toBigInteger().intValue(); + } +} diff --git a/test/jdk/java/math/BigDecimal/LongValueExactTests.java b/test/jdk/java/math/BigDecimal/LongValueExactTests.java index f04a3453892..7a6ad0b580c 100644 --- a/test/jdk/java/math/BigDecimal/LongValueExactTests.java +++ b/test/jdk/java/math/BigDecimal/LongValueExactTests.java @@ -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 @@ -23,65 +23,98 @@ /** * @test - * @bug 6806261 + * @bug 6806261 8211936 * @summary Tests of BigDecimal.longValueExact */ import java.math.*; +import java.util.List; +import java.util.Map; +import static java.util.Map.entry; public class LongValueExactTests { - - private static int longValueExactTests() { + public static void main(String... args) { int failures = 0; - String[] testStrings = { - "9223372036854775807", - "9223372036854775807.0", - "9223372036854775807.00", - "-9223372036854775808", - "-9223372036854775808.0", - "-9223372036854775808.00", - }; - - for (String longValue : testStrings) { - try { - BigDecimal bd = new BigDecimal(longValue); - long longValueExact = bd.longValueExact(); - } catch (Exception e) { - failures++; - } - } - - // The following Strings are supposed to make longValueExact throw - // ArithmeticException. - String[] testStrings2 = { - "9223372036854775808", - "9223372036854775808.0", - "9223372036854775808.00", - "-9223372036854775809", - "-9223372036854775808.1", - "-9223372036854775808.01", - }; - - for (String bigValue : testStrings2) { - try { - BigDecimal bd = new BigDecimal(bigValue); - long longValueExact = bd.longValueExact(); - failures++; - } catch (ArithmeticException e) { - // Success; - } - } - return failures; - } - - public static void main(String argv[]) { - int failures = 0; - - failures += longValueExactTests(); + failures += longValueExactSuccessful(); + failures += longValueExactExceptional(); if (failures > 0) { throw new RuntimeException("Incurred " + failures + " failures while testing longValueExact."); } } + + private static long simpleLongValueExact(BigDecimal bd) { + return bd.toBigIntegerExact().longValue(); + } + + private static int longValueExactSuccessful() { + int failures = 0; + + // Strings used to create BigDecimal instances on which invoking + // longValueExact() will succeed. + Map successCases = + Map.ofEntries(entry(new BigDecimal("9223372036854775807"), Long.MAX_VALUE), // 2^63 -1 + entry(new BigDecimal("9223372036854775807.0"), Long.MAX_VALUE), + entry(new BigDecimal("9223372036854775807.00"), Long.MAX_VALUE), + + entry(new BigDecimal("-9223372036854775808"), Long.MIN_VALUE), // -2^63 + entry(new BigDecimal("-9223372036854775808.0"), Long.MIN_VALUE), + entry(new BigDecimal("-9223372036854775808.00"),Long.MIN_VALUE), + + entry(new BigDecimal("1e0"), 1L), + entry(new BigDecimal(BigInteger.ONE, -18), 1_000_000_000_000_000_000L), + + entry(new BigDecimal("0e13"), 0L), // Fast path zero + entry(new BigDecimal("0e64"), 0L), + entry(new BigDecimal("0e1024"), 0L), + + entry(new BigDecimal("10.000000000000000000000000000000000"), 10L)); + + for (var testCase : successCases.entrySet()) { + BigDecimal bd = testCase.getKey(); + long expected = testCase.getValue(); + try { + long longValueExact = bd.longValueExact(); + if (expected != longValueExact || + longValueExact != simpleLongValueExact(bd)) { + failures++; + System.err.println("Unexpected longValueExact result " + longValueExact + + " on " + bd); + } + } catch (Exception e) { + failures++; + System.err.println("Error on " + bd + "\tException message:" + e.getMessage()); + } + } + return failures; + } + + private static int longValueExactExceptional() { + int failures = 0; + List exceptionalCases = + List.of(new BigDecimal("9223372036854775808"), // Long.MAX_VALUE + 1 + new BigDecimal("9223372036854775808.0"), + new BigDecimal("9223372036854775808.00"), + new BigDecimal("-9223372036854775809"), // Long.MIN_VALUE - 1 + new BigDecimal("-9223372036854775808.1"), + new BigDecimal("-9223372036854775808.01"), + + new BigDecimal("9999999999999999999"), + new BigDecimal("10000000000000000000"), + + new BigDecimal("0.99"), + new BigDecimal("0.999999999999999999999")); + + for (BigDecimal bd : exceptionalCases) { + try { + long longValueExact = bd.longValueExact(); + failures++; + System.err.println("Unexpected non-exceptional longValueExact on " + bd); + } catch (ArithmeticException e) { + // Success; + } + } + return failures; + } } diff --git a/test/jdk/java/net/httpclient/DigestEchoServer.java b/test/jdk/java/net/httpclient/DigestEchoServer.java index c1dfc6b8be9..ed24799f6de 100644 --- a/test/jdk/java/net/httpclient/DigestEchoServer.java +++ b/test/jdk/java/net/httpclient/DigestEchoServer.java @@ -80,6 +80,8 @@ public abstract class DigestEchoServer implements HttpServerAdapters { Boolean.parseBoolean(System.getProperty("test.debug", "false")); public static final boolean NO_LINGER = Boolean.parseBoolean(System.getProperty("test.nolinger", "false")); + public static final boolean TUNNEL_REQUIRES_HOST = + Boolean.parseBoolean(System.getProperty("test.requiresHost", "false")); public enum HttpAuthType { SERVER, PROXY, SERVER307, PROXY305 /* add PROXY_AND_SERVER and SERVER_PROXY_NONE */ @@ -1522,6 +1524,36 @@ public abstract class DigestEchoServer implements HttpServerAdapters { } } + boolean badRequest(StringBuilder response, String hostport, List hosts) { + String message = null; + if (hosts.isEmpty()) { + message = "No host header provided\r\n"; + } else if (hosts.size() > 1) { + message = "Multiple host headers provided\r\n"; + for (String h : hosts) { + message = message + "host: " + h + "\r\n"; + } + } else { + String h = hosts.get(0); + if (!hostport.equalsIgnoreCase(h) + && !hostport.equalsIgnoreCase(h + ":80") + && !hostport.equalsIgnoreCase(h + ":443")) { + message = "Bad host provided: [" + h + + "] doesnot match [" + hostport + "]\r\n"; + } + } + if (message != null) { + int length = message.getBytes(StandardCharsets.UTF_8).length; + response.append("HTTP/1.1 400 BadRequest\r\n") + .append("Content-Length: " + length) + .append("\r\n\r\n") + .append(message); + return true; + } + + return false; + } + boolean authorize(StringBuilder response, String requestLine, String headers) { if (authorization != null) { return authorization.authorize(response, requestLine, headers); @@ -1635,6 +1667,7 @@ public abstract class DigestEchoServer implements HttpServerAdapters { assert connect.equalsIgnoreCase("connect"); String hostport = tokenizer.nextToken(); InetSocketAddress targetAddress; + List hosts = new ArrayList<>(); try { URI uri = new URI("https", hostport, "/", null, null); int port = uri.getPort(); @@ -1659,9 +1692,30 @@ public abstract class DigestEchoServer implements HttpServerAdapters { System.out.println(now() + "Tunnel: Reading header: " + (line = readLine(ccis))); headers.append(line).append("\r\n"); + int index = line.indexOf(':'); + if (index >= 0) { + String key = line.substring(0, index).trim(); + if (key.equalsIgnoreCase("host")) { + hosts.add(line.substring(index+1).trim()); + } + } + } + StringBuilder response = new StringBuilder(); + if (TUNNEL_REQUIRES_HOST) { + if (badRequest(response, hostport, hosts)) { + System.out.println(now() + "Tunnel: Sending " + response); + // send the 400 response + pw.print(response.toString()); + pw.flush(); + toClose.close(); + continue; + } else { + assert hosts.size() == 1; + System.out.println(now() + + "Tunnel: Host header verified " + hosts); + } } - StringBuilder response = new StringBuilder(); final boolean authorize = authorize(response, requestLine, headers.toString()); if (!authorize) { System.out.println(now() + "Tunnel: Sending " diff --git a/test/jdk/java/net/httpclient/HttpsTunnelTest.java b/test/jdk/java/net/httpclient/HttpsTunnelTest.java index 14f509d4f4e..60db57d47a4 100644 --- a/test/jdk/java/net/httpclient/HttpsTunnelTest.java +++ b/test/jdk/java/net/httpclient/HttpsTunnelTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,8 +47,9 @@ import static java.lang.System.out; * proxy P is downgraded to HTTP/1.1, then a new h2 request * going to a different host through the same proxy will not * be preemptively downgraded. That, is the stack should attempt - * a new h2 connection to the new host. - * @bug 8196967 + * a new h2 connection to the new host. It also verifies that + * the stack sends the appropriate "host" header to the proxy. + * @bug 8196967 8222527 * @library /test/lib http2/server * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DigestEchoServer HttpsTunnelTest * @modules java.net.http/jdk.internal.net.http.common @@ -58,7 +59,14 @@ import static java.lang.System.out; * java.base/sun.net.www.http * java.base/sun.net.www * java.base/sun.net - * @run main/othervm -Djdk.internal.httpclient.debug=true HttpsTunnelTest + * @run main/othervm -Dtest.requiresHost=true + * -Djdk.httpclient.HttpClient.log=headers + * -Djdk.internal.httpclient.debug=true HttpsTunnelTest + * @run main/othervm -Dtest.requiresHost=true + * -Djdk.httpclient.allowRestrictedHeaders=host + * -Djdk.httpclient.HttpClient.log=headers + * -Djdk.internal.httpclient.debug=true HttpsTunnelTest + * */ public class HttpsTunnelTest implements HttpServerAdapters { @@ -116,6 +124,18 @@ public class HttpsTunnelTest implements HttpServerAdapters { try { URI uri1 = new URI("https://" + http1Server.serverAuthority() + "/foo/https1"); URI uri2 = new URI("https://" + http2Server.serverAuthority() + "/foo/https2"); + + boolean provideCustomHost = "host".equalsIgnoreCase( + System.getProperty("jdk.httpclient.allowRestrictedHeaders","")); + + String customHttp1Host = null, customHttp2Host = null; + if (provideCustomHost) { + customHttp1Host = makeCustomHostString(http1Server, uri1); + out.println("HTTP/1.1: <" + uri1 + "> [custom host: " + customHttp1Host + "]"); + customHttp2Host = makeCustomHostString(http2Server, uri2); + out.println("HTTP/2: <" + uri2 + "> [custom host: " + customHttp2Host + "]"); + } + ProxySelector ps = ProxySelector.of(proxy.getProxyAddress()); //HttpClient.Builder.NO_PROXY; HttpsTunnelTest test = new HttpsTunnelTest(); @@ -126,11 +146,12 @@ public class HttpsTunnelTest implements HttpServerAdapters { assert lines.size() == data.length; String body = lines.stream().collect(Collectors.joining("\r\n")); HttpRequest.BodyPublisher reqBody = HttpRequest.BodyPublishers.ofString(body); - HttpRequest req1 = HttpRequest + HttpRequest.Builder req1Builder = HttpRequest .newBuilder(uri1) .version(Version.HTTP_2) - .POST(reqBody) - .build(); + .POST(reqBody); + if (provideCustomHost) req1Builder.header("host", customHttp1Host); + HttpRequest req1 = req1Builder.build(); out.println("\nPosting to HTTP/1.1 server at: " + req1); HttpResponse> response = client.send(req1, BodyHandlers.ofLines()); out.println("Checking response..."); @@ -145,12 +166,14 @@ public class HttpsTunnelTest implements HttpServerAdapters { if (!lines.equals(respLines)) { throw new RuntimeException("Unexpected response 1: " + respLines); } + HttpRequest.BodyPublisher reqBody2 = HttpRequest.BodyPublishers.ofString(body); - HttpRequest req2 = HttpRequest + HttpRequest.Builder req2Builder = HttpRequest .newBuilder(uri2) .version(Version.HTTP_2) - .POST(reqBody2) - .build(); + .POST(reqBody2); + if (provideCustomHost) req2Builder.header("host", customHttp2Host); + HttpRequest req2 = req2Builder.build(); out.println("\nPosting to HTTP/2 server at: " + req2); response = client.send(req2, BodyHandlers.ofLines()); out.println("Checking response..."); @@ -176,4 +199,26 @@ public class HttpsTunnelTest implements HttpServerAdapters { } } + /** + * Builds a custom host string that is different to what is in the URI + * authority, that is textually different than what the stack would + * send. For CONNECT we should ignore any custom host settings. + * The tunnelling proxy will fail with badRequest 400 if it receives + * the custom host instead of the expected URI authority string. + * @param server The target server. + * @param uri The URI to the target server + * @return a host value for the custom host header. + */ + static final String makeCustomHostString(HttpTestServer server, URI uri) { + String customHttpHost; + if (server.serverAuthority().contains("localhost")) { + customHttpHost = InetAddress.getLoopbackAddress().getHostAddress(); + } else { + customHttpHost = InetAddress.getLoopbackAddress().getHostName(); + } + if (customHttpHost.contains(":")) customHttpHost = "[" + customHttpHost + "]"; + if (uri.getPort() != -1) customHttpHost = customHttpHost + ":" + uri.getPort(); + return customHttpHost; + } + } diff --git a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java index 1ce4cc0b468..e9bb6f8d98f 100644 --- a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java +++ b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /** * @test - * @bug 8087112 + * @bug 8087112 8222527 * @summary this test verifies that a client may provides authorization * headers directly when connecting with a server over SSL, and * it verifies that the client honor the jdk.http.auth.*.disabledSchemes @@ -45,10 +45,12 @@ * @run main/othervm/timeout=300 * -Djdk.http.auth.proxying.disabledSchemes=Basic * -Djdk.http.auth.tunneling.disabledSchemes=Basic + * -Dtest.requiresHost=true * ProxyAuthDisabledSchemesSSL SSL PROXY * @run main/othervm/timeout=300 * -Djdk.http.auth.proxying.disabledSchemes=Digest * -Djdk.http.auth.tunneling.disabledSchemes=Digest + * -Dtest.requiresHost=true * ProxyAuthDisabledSchemesSSL SSL PROXY */ diff --git a/test/jdk/java/nio/channels/Channels/Basic.java b/test/jdk/java/nio/channels/Channels/Basic.java index e7d5244adaa..bfbbbe73723 100644 --- a/test/jdk/java/nio/channels/Channels/Basic.java +++ b/test/jdk/java/nio/channels/Channels/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2017, 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 @@ -22,7 +22,7 @@ */ /* @test - * @bug 4417152 4481572 6248930 6725399 6884800 + * @bug 4417152 4481572 6248930 6725399 6884800 8220477 * @summary Test Channels basic functionality */ @@ -31,7 +31,6 @@ import java.nio.*; import java.nio.charset.*; import java.nio.channels.*; - public class Basic { static String message; @@ -204,6 +203,8 @@ public class Basic { writeOut(blah, ITERATIONS); testNewReader(blah); + testNewWriterClose(); + testNewReaderClose(); } finally { blah.delete(); } @@ -399,6 +400,98 @@ public class Basic { r.close(); fis.close(); } + + private static void testNewWriterClose() throws Exception { + Writer writer = null; + try { + WritableByteChannel channel = new WritableByteChannel() { + @Override + public int write(ByteBuffer src) throws IOException { + return 0; + } + + @Override + public boolean isOpen() { + return true; + } + + @Override + public void close() throws IOException { + throw new IOException(); + } + }; + writer = Channels.newWriter(channel, + StandardCharsets.UTF_8.newEncoder(), -1); + writer.close(); + } catch (IOException ioe) { + Exception theException = null; + try { + writer.write(1); + writer.flush(); + } catch (Exception e) { + theException = e; + } finally { + if (theException == null) { + throw new RuntimeException("IOException not thrown"); + } else if (!(theException instanceof IOException)) { + throw new RuntimeException("Exception not an IOException: " + + theException); + } else { + String message = theException.getMessage(); + if (!message.equals("Stream closed")) { + throw new RuntimeException("Unexpected message " + + message); + } + } + } + } + } + + private static void testNewReaderClose() throws Exception { + Reader reader = null; + try { + ReadableByteChannel channel = new ReadableByteChannel() { + @Override + public int read(ByteBuffer dst) throws IOException { + dst.put((byte)7); + return 1; + } + + @Override + public boolean isOpen() { + return true; + } + + @Override + public void close() throws IOException { + throw new IOException(); + } + }; + reader = Channels.newReader(channel, + StandardCharsets.UTF_8.newDecoder(), -1); + reader.close(); + } catch (IOException ioe) { + Exception theException = null; + try { + reader.read(); + } catch (Exception e) { + theException = e; + } finally { + if (theException == null) { + throw new RuntimeException("IOException not thrown"); + } else if (!(theException instanceof IOException)) { + throw new RuntimeException("Exception not an IOException: " + + theException); + } else { + String message = theException.getMessage(); + if (!message.equals("Stream closed")) { + throw new RuntimeException("Unexpected message " + + message); + } + } + } + } + } } class ExtendedFileInputStream extends java.io.FileInputStream { diff --git a/test/jdk/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java index f742b3832bb..d1de975c490 100644 --- a/test/jdk/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java +++ b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java @@ -61,6 +61,14 @@ public class UnixSocketFile { return; } + // Verify that 'nc' accepts '-U' for Unix domain sockets. + // Skip the test if it is not. + Process procHelp = Runtime.getRuntime().exec(CMD_BASE + " -h"); + if (procHelp.waitFor() != 0) { + System.err.println("Netcat does not accept required options; skipping test."); + return; + } + // Create a new sub-directory of the nominal test directory in which // 'nc' will create the socket file. String testSubDir = System.getProperty("test.dir", ".") diff --git a/test/jdk/java/rmi/registry/nonLocalRegistry/NonLocalSkeletonTest.java b/test/jdk/java/rmi/registry/nonLocalRegistry/NonLocalSkeletonTest.java new file mode 100644 index 00000000000..679ae3b0b3b --- /dev/null +++ b/test/jdk/java/rmi/registry/nonLocalRegistry/NonLocalSkeletonTest.java @@ -0,0 +1,171 @@ +/* + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import sun.rmi.server.UnicastRef; +import sun.rmi.transport.LiveRef; +import sun.rmi.transport.tcp.TCPEndpoint; + +import java.lang.reflect.InvocationHandler; + +import java.lang.reflect.Proxy; +import java.net.InetAddress; +import java.rmi.AccessException; +import java.rmi.RemoteException; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; +import java.rmi.server.ObjID; +import java.rmi.server.RemoteObjectInvocationHandler; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Set; + + +/* @test + * @bug 8218453 + * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry:+open java.rmi/sun.rmi.server:+open + * java.rmi/sun.rmi.transport:+open java.rmi/sun.rmi.transport.tcp:+open + * @summary Verify that Registry rejects non-local access for bind, unbind, rebind. + * The test is manual because the (non-local) host running rmiregistry must be supplied as a property. + * @run main/othervm -Dregistry.host=localhost NonLocalSkeletonTest + */ + +/* + * @test + * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry:+open java.rmi/sun.rmi.server:+open + * java.rmi/sun.rmi.transport:+open java.rmi/sun.rmi.transport.tcp:+open + * @summary Verify that Registry rejects non-local access for bind, unbind, rebind. + * The test is manual because the (non-local) host running rmiregistry must be supplied as a property. + * @run main/othervm/manual -Dregistry.host=rmi-registry-host NonLocalSkeletonTest + */ + +/** + * Verify that access checks for Registry.bind(), .rebind(), and .unbind() + * are prevented on remote access to the registry. + * + * This test is a manual test and uses a standard rmiregistry running + * on a *different* host. + * The test verifies that the access check is performed *before* the object to be + * bound or rebound is deserialized. + * + * Login or ssh to the different host and invoke {@code $JDK_HOME/bin/rmiregistry}. + * It will not show any output. + * + * On the first host modify the @run command above to replace "rmi-registry-host" + * with the hostname or IP address of the different host and run the test with jtreg. + */ +public class NonLocalSkeletonTest { + + public static void main(String[] args) throws Exception { + String host = System.getProperty("registry.host"); + if (host == null || host.isEmpty()) { + throw new RuntimeException("supply a remote host with -Dregistry.host=hostname"); + } + + // Check if running the test on a local system; it only applies to remote + String myHostName = InetAddress.getLocalHost().getHostName(); + Set myAddrs = Set.of(InetAddress.getAllByName(myHostName)); + Set hostAddrs = Set.of(InetAddress.getAllByName(host)); + boolean isLocal = (hostAddrs.stream().anyMatch(i -> myAddrs.contains(i)) + || hostAddrs.stream().anyMatch(h -> h.isLoopbackAddress())); + + int port; + if (isLocal) { + // Create a local Registry to use for the test + port = TestLibrary.getUnusedRandomPort(); + Registry registry = LocateRegistry.createRegistry(port); + System.out.printf("local registry port: %s%n", registry); + } else { + // Use regular rmi registry for non-local test + port = Registry.REGISTRY_PORT; + } + + try { + + Registry r = nonStaticRegistryProxy(host, port); + + System.out.printf("RegistryRef: %s%n", r); + + r.rebind("anyRef", r); + if (!isLocal) { + throw new RuntimeException("non-local bind should have failed to host: " + host); + } else { + System.out.printf("local rebind succeeded%n"); + } + } catch (RemoteException rex) { + if (!isLocal) { + assertIsAccessException(rex); + } else { + throw rex; + } + } + } + + /* Returns a non-static proxy for the registry. + * Follows the form of sun.rmi.server.Util.createProxy. + * @param implClass the RegistryImpl + * @param clientRef the registry reference + **/ + static Registry nonStaticRegistryProxy(String host, int port) { + final ClassLoader loader = Registry.class.getClassLoader(); + final Class[] interfaces = new Class[]{Registry.class}; + + LiveRef liveRef = new LiveRef(new ObjID(ObjID.REGISTRY_ID), + new TCPEndpoint(host, port, null, null), + false); + + final InvocationHandler handler = new RemoteObjectInvocationHandler(new UnicastRef(liveRef)); + + PrivilegedAction action = () -> (Registry) Proxy.newProxyInstance(loader, + interfaces, handler); + return AccessController.doPrivileged(action); + } + + /** + * Check the exception chain for the expected AccessException and message. + * @param ex the exception from the remote invocation. + */ + private static void assertIsAccessException(Throwable ex) { + Throwable t = ex; + while (!(t instanceof AccessException) && t.getCause() != null) { + t = t.getCause(); + } + if (t instanceof AccessException) { + String msg = t.getMessage(); + int asIndex = msg.indexOf("Registry"); + int rrIndex = msg.indexOf("Registry.Registry"); // Obsolete error text + int disallowIndex = msg.indexOf("disallowed"); + int nonLocalHostIndex = msg.indexOf("non-local host"); + if (asIndex < 0 || + rrIndex != -1 || + disallowIndex < 0 || + nonLocalHostIndex < 0 ) { + throw new RuntimeException("exception message is malformed", t); + } + System.out.printf("Found expected AccessException: %s%n%n", t); + } else { + throw new RuntimeException("AccessException did not occur when expected", ex); + } + } +} diff --git a/test/jdk/javax/net/ssl/SSLSocket/InputStreamClosure.java b/test/jdk/javax/net/ssl/SSLSocket/InputStreamClosure.java new file mode 100644 index 00000000000..4644a479e12 --- /dev/null +++ b/test/jdk/javax/net/ssl/SSLSocket/InputStreamClosure.java @@ -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. + */ + +// +// Please run in othervm mode. SunJSSE does not support dynamic system +// properties, no way to re-use system properties in samevm/agentvm mode. +// + +/* + * @test + * @bug 8216326 + * @modules jdk.crypto.ec + * @library /javax/net/ssl/templates + * @summary SSLSocket stream close() does not close the associated socket + * @run main/othervm InputStreamClosure + */ +import java.io.InputStream; +import java.io.OutputStream; +import javax.net.ssl.SSLSocket; + +public class InputStreamClosure extends SSLSocketTemplate { + + // Run the test case. + public static void main(String[] args) throws Exception { + (new InputStreamClosure()).run(); + } + + @Override + protected void runServerApplication(SSLSocket socket) throws Exception { + // here comes the test logic + InputStream sslIS = socket.getInputStream(); + OutputStream sslOS = socket.getOutputStream(); + + sslIS.read(); + sslOS.write(85); + sslOS.flush(); + } + + /* + * Define the client side application of the test for the specified socket. + * This method is used if the returned value of + * isCustomizedClientConnection() is false. + * + * @param socket may be null is no client socket is generated. + * + * @see #isCustomizedClientConnection() + */ + protected void runClientApplication(SSLSocket socket) throws Exception { + InputStream sslIS = socket.getInputStream(); + OutputStream sslOS = socket.getOutputStream(); + + sslOS.write(280); + sslOS.flush(); + sslIS.read(); + + sslIS.close(); + if (!socket.isClosed()) { + throw new Exception("Closing the SSLSocket InputStream does " + + "not close the associated socket"); + } + } +} diff --git a/test/jdk/javax/net/ssl/SSLSocket/OutputStreamClosure.java b/test/jdk/javax/net/ssl/SSLSocket/OutputStreamClosure.java new file mode 100644 index 00000000000..83b0aceaf38 --- /dev/null +++ b/test/jdk/javax/net/ssl/SSLSocket/OutputStreamClosure.java @@ -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. + */ + +// +// Please run in othervm mode. SunJSSE does not support dynamic system +// properties, no way to re-use system properties in samevm/agentvm mode. +// + +/* + * @test + * @bug 8216326 + * @modules jdk.crypto.ec + * @library /javax/net/ssl/templates + * @summary SSLSocket stream close() does not close the associated socket + * @run main/othervm OutputStreamClosure + */ +import java.io.InputStream; +import java.io.OutputStream; +import javax.net.ssl.SSLSocket; + +public class OutputStreamClosure extends SSLSocketTemplate { + + // Run the test case. + public static void main(String[] args) throws Exception { + (new OutputStreamClosure()).run(); + } + + @Override + protected void runServerApplication(SSLSocket socket) throws Exception { + // here comes the test logic + InputStream sslIS = socket.getInputStream(); + OutputStream sslOS = socket.getOutputStream(); + + sslIS.read(); + sslOS.write(85); + sslOS.flush(); + } + + /* + * Define the client side application of the test for the specified socket. + * This method is used if the returned value of + * isCustomizedClientConnection() is false. + * + * @param socket may be null is no client socket is generated. + * + * @see #isCustomizedClientConnection() + */ + protected void runClientApplication(SSLSocket socket) throws Exception { + InputStream sslIS = socket.getInputStream(); + OutputStream sslOS = socket.getOutputStream(); + + sslOS.write(280); + sslOS.flush(); + sslIS.read(); + + sslOS.close(); + if (!socket.isClosed()) { + throw new Exception("Closing the SSLSocket OutputStream does " + + "not close the associated socket"); + } + } +} diff --git a/test/jdk/sun/security/pkcs11/tls/tls12/TestTLS12.java b/test/jdk/sun/security/pkcs11/tls/tls12/TestTLS12.java index 227c00fef5f..9f40c797c66 100644 --- a/test/jdk/sun/security/pkcs11/tls/tls12/TestTLS12.java +++ b/test/jdk/sun/security/pkcs11/tls/tls12/TestTLS12.java @@ -29,7 +29,7 @@ * java.base/sun.security.util * java.base/com.sun.crypto.provider * @library /test/lib ../.. - * @run main/othervm/timeout=120 TestTLS12 + * @run main/othervm/timeout=120 -Djdk.tls.useExtendedMasterSecret=false TestTLS12 */ import java.io.File; @@ -37,8 +37,8 @@ import java.io.FileInputStream; import java.io.InputStream; import java.nio.ByteBuffer; -import java.security.interfaces.RSAPrivateKey; -import java.security.interfaces.RSAPublicKey; +import java.security.PrivateKey; +import java.security.PublicKey; import java.security.KeyStore; import java.security.NoSuchAlgorithmException; import java.security.Provider; @@ -76,8 +76,8 @@ public final class TestTLS12 extends SecmodTest { private static KeyStore ks; private static KeyStore ts; private static char[] passphrase = "JAHshj131@@".toCharArray(); - private static RSAPrivateKey privateKey; - private static RSAPublicKey publicKey; + private static PrivateKey privateKey; + private static PublicKey publicKey; public static void main(String[] args) throws Exception { try { @@ -444,14 +444,11 @@ public final class TestTLS12 extends SecmodTest { ts = ks; KeyStore ksPlain = readTestKeyStore(); - privateKey = (RSAPrivateKey)ksPlain.getKey("rh_rsa_sha256", + privateKey = (PrivateKey)ksPlain.getKey("rh_rsa_sha256", passphrase); - publicKey = (RSAPublicKey)ksPlain.getCertificate( + publicKey = (PublicKey)ksPlain.getCertificate( "rh_rsa_sha256").getPublicKey(); - // Extended Master Secret is not currently supported in SunPKCS11 - // cryptographic provider - System.setProperty("jdk.tls.useExtendedMasterSecret", "false"); String disabledAlgorithms = Security.getProperty("jdk.tls.disabledAlgorithms"); if (disabledAlgorithms.length() > 0) { diff --git a/test/jdk/sun/security/tools/jarsigner/AlgOptions.java b/test/jdk/sun/security/tools/jarsigner/AlgOptions.java new file mode 100644 index 00000000000..887e720c1ff --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/AlgOptions.java @@ -0,0 +1,96 @@ +/* + * 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 + * 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 5094028 6219522 + * @summary test new jarsigner -sigalg and -digestalg options + * @author Sean Mullan + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +public class AlgOptions { + public static void main(String[] args) throws Exception { + + // copy jar file into writeable location + Files.copy(Path.of(System.getProperty("test.src"), "AlgOptions.jar"), + Path.of("AlgOptionsTmp.jar")); + + // test missing signature algorithm arg + sign("-sigalg").shouldNotHaveExitValue(0); + + // test missing digest algorithm arg + sign("-digestalg").shouldNotHaveExitValue(0); + + // test BOGUS signature algorithm + sign("-sigalg", "BOGUS").shouldNotHaveExitValue(0); + + // test BOGUS digest algorithm + sign("-digestalg", "BOGUS").shouldNotHaveExitValue(0); + + // test incompatible signature algorithm + sign("-sigalg", "SHA1withDSA").shouldNotHaveExitValue(0); + + // test compatible signature algorithm + sign("-sigalg", "SHA512withRSA").shouldHaveExitValue(0); + verify(); + + // test non-default digest algorithm + sign("-digestalg", "SHA-1").shouldHaveExitValue(0); + verify(); + + // test SHA-512 digest algorithm (creates long lines) + sign("-digestalg", "SHA-512", "-sigalg", "SHA512withRSA") + .shouldHaveExitValue(0); + verify(); + } + + static OutputAnalyzer sign(String... options) throws Exception { + List args = new ArrayList<>(); + args.add("-keystore"); + args.add(Path.of(System.getProperty("test.src"), "JarSigning.keystore") + .toString()); + args.add("-storepass"); + args.add("bbbbbb"); + for (String option : options) { + args.add(option); + } + args.add("AlgOptionsTmp.jar"); + args.add("c"); + return SecurityTools.jarsigner(args); + } + + static void verify() throws Exception { + SecurityTools.jarsigner( + "-verify", "AlgOptionsTmp.jar") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/AlgOptions.sh b/test/jdk/sun/security/tools/jarsigner/AlgOptions.sh deleted file mode 100644 index d6d0a1cbf01..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/AlgOptions.sh +++ /dev/null @@ -1,224 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 5094028 6219522 -# @summary test new jarsigner -sigalg and -digestalg options -# @author Sean Mullan -# -# @run shell AlgOptions.sh -# - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" - CP="${FS}bin${FS}cp -f" - ;; - CYGWIN* ) - NULL=/dev/null - PS=";" - FS="/" - CP="cp -f" - ;; - Windows_* ) - NULL=NUL - PS=";" - FS="\\" - CP="cp -f" - ;; - * ) - echo "Unrecognized operating system!" - exit 1; - ;; -esac - -# copy jar file into writeable location -${CP} ${TESTSRC}${FS}AlgOptions.jar ${TESTCLASSES}${FS}AlgOptionsTmp.jar - -failed=0 -# test missing signature algorithm arg -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -sigalg \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar c -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 1 failed" - failed=1 -else - echo "test 1 passed" -fi - -# test missing digest algorithm arg -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -digestalg \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar c -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 2 failed" - failed=1 -else - echo "test 2 passed" -fi - -# test BOGUS signature algorithm -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -sigalg BOGUS \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar c -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 3 failed" - failed=1 -else - echo "test 3 passed" -fi - -# test BOGUS digest algorithm -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -digestalg BOGUS \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar c -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 4 failed" - failed=1 -else - echo "test 4 passed" -fi - -# test incompatible signature algorithm -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -sigalg SHA1withDSA \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar c -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 5 failed" - failed=1 -else - echo "test 5 passed" -fi - -# test compatible signature algorithm -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -sigalg SHA512withRSA \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar c -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 6 passed" -else - echo "test 6 failed" - failed=1 -fi - -# verify it -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -verify ${TESTCLASSES}${FS}AlgOptionsTmp.jar -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 7 passed" -else - echo "test 7 failed" - failed=1 -fi - -# test non-default digest algorithm -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -digestalg SHA-256 \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar c -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 8 passed" -else - echo "test 8 failed" - failed=1 -fi - -# verify it -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -verify ${TESTCLASSES}${FS}AlgOptionsTmp.jar -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 9 passed" -else - echo "test 9 failed" - failed=1 -fi - -# test SHA-512 digest algorithm (creates long lines) -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -digestalg SHA-512 \ - -sigalg SHA512withRSA \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar c -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 10 passed" -else - echo "test 10 failed" - failed=1 -fi - -# verify it -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -verify ${TESTCLASSES}${FS}AlgOptionsTmp.jar -RESULT=$? -if [ $RESULT -eq 0 ]; then - echo "test 11 passed" -else - echo "test 11 failed" - failed=1 -fi - -if [ $failed -eq 1 ]; then - exit 1 -else - exit 0 -fi diff --git a/test/jdk/sun/security/tools/jarsigner/CertPolicy.java b/test/jdk/sun/security/tools/jarsigner/CertPolicy.java new file mode 100644 index 00000000000..34830124c5f --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/CertPolicy.java @@ -0,0 +1,88 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8036709 + * @summary Java 7 jarsigner displays warning about cert policy tree + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.util.JarUtils; + +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class CertPolicy { + static OutputAnalyzer keytool(String cmd) throws Exception { + return SecurityTools.keytool("-keypass changeit -storepass changeit " + + "-keystore ks -keyalg rsa " + cmd); + } + + static OutputAnalyzer jarsigner(String cmd) throws Exception { + return SecurityTools.jarsigner("-storepass changeit -keystore ks " + cmd); + } + + public static void main(String[] args) throws Exception { + + keytool("-genkeypair -alias ca -dname CN=CA -ext bc"); + keytool("-genkeypair -alias int -dname CN=Int"); + keytool("-genkeypair -alias ee -dname CN=EE"); + + // CertificatePolicies [[PolicyId: [1.2.3]], [PolicyId: [1.2.4]]] + // PolicyConstraints: [Require: 0; Inhibit: unspecified] + keytool("-certreq -alias int -file int.req"); + keytool("-gencert -rfc -alias ca " + + "-ext 2.5.29.32=300C300406022A03300406022A04 " + + "-ext 2.5.29.36=3003800100 " + + "-ext bc -infile int.req -outfile int.cert"); + keytool("-import -alias int -file int.cert"); + + // CertificatePolicies [[PolicyId: [1.2.3]]] + keytool("-certreq -alias ee -file ee.req"); + keytool("-gencert -rfc -alias int -ext 2.5.29.32=3006300406022A03 " + + "-infile ee.req -outfile ee.cert"); + keytool("-import -alias ee -file ee.cert"); + + Files.write(Path.of("cc"), List.of( + keytool("-export -alias ee -rfc").getOutput(), + keytool("-export -alias int -rfc").getOutput(), + keytool("-export -alias ca -rfc").getOutput())); + + keytool("-delete -alias int"); + + JarUtils.createJarFile(Path.of("a.jar"), Path.of("."), Path.of("cc")); + + // Make sure the certchain in the signed jar contains all 3 certs + jarsigner("-strict -certchain cc a.jar ee -debug") + .shouldHaveExitValue(0); + + jarsigner("-strict -verify a.jar -debug") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/CheckUsage.java b/test/jdk/sun/security/tools/jarsigner/CheckUsage.java new file mode 100644 index 00000000000..2206ec8d27b --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/CheckUsage.java @@ -0,0 +1,99 @@ +/* + * 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 + * 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 7004168 + * @summary jarsigner -verify checks for KeyUsage codesigning ext on all certs + * instead of just signing cert + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class CheckUsage { + + static OutputAnalyzer keytool(String cmd) throws Exception { + return SecurityTools.keytool("-keypass changeit -storepass changeit " + + "-keyalg rsa " + cmd); + } + + public static void main(String[] args) throws Exception { + Files.write(Path.of("x"), List.of("x")); + JarUtils.createJarFile(Path.of("a.jar"), Path.of("."), Path.of("x")); + + // ################### 3 Keystores ####################### + + // Keystore js.jks: including CA and Publisher + // CA contains a non-empty KeyUsage + keytool("-keystore js.jks -genkeypair -alias ca -dname CN=CA " + + "-ext KU=kCS -ext bc -validity 365"); + keytool("-keystore js.jks -genkeypair -alias pub -dname CN=Publisher"); + + // Publisher contains the correct KeyUsage + keytool("-keystore js.jks -certreq -alias pub -file pub.req"); + keytool("-keystore js.jks -gencert -alias ca -ext KU=dig -validity 365 " + + "-infile pub.req -outfile pub.cert"); + keytool("-keystore js.jks -importcert -alias pub -file pub.cert"); + + // Keystore trust.jks: including CA only + keytool("-keystore js.jks -exportcert -alias ca -file ca.cert"); + keytool("-keystore trust.jks -importcert -alias ca -noprompt -file ca.cert"); + + // Keystore unrelated.jks: unrelated + keytool("-keystore unrelated.jks -genkeypair -alias nothing " + + "-dname CN=Nothing -validity 365"); + + // ################### 4 Tests ####################### + + // Test 1: Sign should be OK + + SecurityTools.jarsigner("-keystore js.jks -storepass changeit a.jar pub") + .shouldHaveExitValue(0); + + // Test 2: Verify should be OK + + SecurityTools.jarsigner("-keystore trust.jks -storepass changeit " + + "-strict -verify a.jar") + .shouldHaveExitValue(0); + + // Test 3: When no keystore is specified, the error is only + // "chain invalid" + + SecurityTools.jarsigner("-strict -verify a.jar") + .shouldHaveExitValue(4); + + // Test 4: When unrelated keystore is specified, the error is + // "chain invalid" and "not alias in keystore" + + SecurityTools.jarsigner("-keystore unrelated.jks -storepass changeit " + + "-strict -verify a.jar") + .shouldHaveExitValue(36); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/Collator.java b/test/jdk/sun/security/tools/jarsigner/Collator.java new file mode 100644 index 00000000000..bd511f7fd28 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/Collator.java @@ -0,0 +1,60 @@ +/* + * 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 8021789 + * @summary jarsigner parses alias as command line option (depending on locale) + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class Collator { + public static void main(String[] args) throws Exception { + + Files.write(Path.of("collator"), List.of("12345")); + JarUtils.createJarFile( + Path.of("collator.jar"), Path.of("."), Path.of("collator")); + + SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keyalg rsa -keystore collator.jks -alias debug " + + "-dname CN=debug -genkey -validity 300") + .shouldHaveExitValue(0); + + // use "debug" as alias name + SecurityTools.jarsigner("-keystore collator.jks " + + "-storepass changeit collator.jar debug") + .shouldHaveExitValue(0); + + // use "" as alias name (although there will be a warning) + SecurityTools.jarsigner("-keystore", "collator.jks", + "-storepass", "changeit", "-verify", "collator.jar", "") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/ConciseJarsigner.java b/test/jdk/sun/security/tools/jarsigner/ConciseJarsigner.java new file mode 100644 index 00000000000..190c61faf9a --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/ConciseJarsigner.java @@ -0,0 +1,273 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6802846 8172529 + * @summary jarsigner needs enhanced cert validation(options) + * @library /test/lib + * @run main/timeout=240 ConciseJarsigner + */ + +import jdk.test.lib.Asserts; +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Calendar; +import java.util.List; + +public class ConciseJarsigner { + + static OutputAnalyzer kt(String cmd) throws Exception { + // Choose 1024-bit RSA to make sure it runs fine and fast. In + // fact, every keyalg/keysize combination is OK for this test. + return SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keystore ks -keyalg rsa -keysize 1024 " + cmd); + } + + static void gencert(String owner, String cmd) throws Exception { + kt("-certreq -alias " + owner + " -file tmp.req"); + kt("-gencert -infile tmp.req -outfile tmp.cert " + cmd); + kt("-import -alias " + owner + " -file tmp.cert"); + } + + static OutputAnalyzer js(String cmd) throws Exception { + return SecurityTools.jarsigner("-debug " + cmd); + } + + public static void main(String[] args) throws Exception { + + Files.write(Path.of("A1"), List.of("a1")); + Files.write(Path.of("A2"), List.of("a2")); + Files.write(Path.of("A3"), List.of("a3")); + Files.write(Path.of("A4"), List.of("a4")); + Files.write(Path.of("A5"), List.of("a5")); + Files.write(Path.of("A6"), List.of("a6")); + + String year = "" + Calendar.getInstance().get(Calendar.YEAR); + + // ========================================================== + // First part: output format + // ========================================================== + + kt("-genkeypair -alias a1 -dname CN=a1 -validity 366"); + kt("-genkeypair -alias a2 -dname CN=a2 -validity 366"); + + // a.jar includes 8 unsigned, 2 signed by a1 and a2, 2 signed by a3 + SecurityTools.jar("cvf a.jar A1 A2"); + js("-keystore ks -storepass changeit a.jar a1"); + SecurityTools.jar("uvf a.jar A3 A4"); + js("-keystore ks -storepass changeit a.jar a2"); + SecurityTools.jar("uvf a.jar A5 A6"); + + // Verify OK + js("-verify a.jar").shouldHaveExitValue(0); + + // 4(chainNotValidated)+16(hasUnsignedEntry) + js("-verify a.jar -strict").shouldHaveExitValue(20); + + // 16(hasUnsignedEntry) + js("-verify a.jar -strict -keystore ks -storepass changeit") + .shouldHaveExitValue(16); + + // 16(hasUnsignedEntry)+32(notSignedByAlias) + js("-verify a.jar a1 -strict -keystore ks -storepass changeit") + .shouldHaveExitValue(48); + + // 16(hasUnsignedEntry) + js("-verify a.jar a1 a2 -strict -keystore ks -storepass changeit") + .shouldHaveExitValue(16); + + // 12 entries all together + Asserts.assertTrue(js("-verify a.jar -verbose") + .asLines().stream() + .filter(s -> s.contains(year)) + .count() == 12); + + // 12 entries all listed + Asserts.assertTrue(js("-verify a.jar -verbose:grouped") + .asLines().stream() + .filter(s -> s.contains(year)) + .count() == 12); + + // 4 groups: MANIFST, unrelated, signed, unsigned + Asserts.assertTrue(js("-verify a.jar -verbose:summary") + .asLines().stream() + .filter(s -> s.contains(year)) + .count() == 4); + + // still 4 groups, but MANIFEST group has no other file + Asserts.assertTrue(js("-verify a.jar -verbose:summary") + .asLines().stream() + .filter(s -> s.contains("more)")) + .count() == 3); + + // 5 groups: MANIFEST, unrelated, signed by a1/a2, signed by a2, unsigned + Asserts.assertTrue(js("-verify a.jar -verbose:summary -certs") + .asLines().stream() + .filter(s -> s.contains(year)) + .count() == 5); + + // 2 for MANIFEST, 2*2 for A1/A2, 2 for A3/A4 + Asserts.assertTrue(js("-verify a.jar -verbose -certs") + .asLines().stream() + .filter(s -> s.contains("[certificate")) + .count() == 8); + + // a1,a2 for MANIFEST, a1,a2 for A1/A2, a2 for A3/A4 + Asserts.assertTrue(js("-verify a.jar -verbose:grouped -certs") + .asLines().stream() + .filter(s -> s.contains("[certificate")) + .count() == 5); + + // a1,a2 for MANIFEST, a1,a2 for A1/A2, a2 for A3/A4 + Asserts.assertTrue(js("-verify a.jar -verbose:summary -certs") + .asLines().stream() + .filter(s -> s.contains("[certificate")) + .count() == 5); + + // still 5 groups, but MANIFEST group has no other file + Asserts.assertTrue(js("-verify a.jar -verbose:summary -certs") + .asLines().stream() + .filter(s -> s.contains("more)")) + .count() == 4); + + // ========================================================== + // Second part: exit code 2, 4, 8. + // 16 and 32 already covered in the first part + // ========================================================== + + kt("-genkeypair -alias ca -dname CN=ca -ext bc -validity 365"); + kt("-genkeypair -alias expired -dname CN=expired"); + gencert("expired", "-alias ca -startdate -10m"); + kt("-genkeypair -alias notyetvalid -dname CN=notyetvalid"); + gencert("notyetvalid", "-alias ca -startdate +1m"); + kt("-genkeypair -alias badku -dname CN=badku"); + gencert("badku", "-alias ca -ext KU=cRLSign -validity 365"); + kt("-genkeypair -alias badeku -dname CN=badeku"); + gencert("badeku", "-alias ca -ext EKU=sa -validity 365"); + kt("-genkeypair -alias goodku -dname CN=goodku"); + gencert("goodku", "-alias ca -ext KU=dig -validity 365"); + kt("-genkeypair -alias goodeku -dname CN=goodeku"); + gencert("goodeku", "-alias ca -ext EKU=codesign -validity 365"); + + js("-strict -keystore ks -storepass changeit a.jar expired") + .shouldHaveExitValue(4); + + js("-strict -keystore ks -storepass changeit a.jar notyetvalid") + .shouldHaveExitValue(4); + + js("-strict -keystore ks -storepass changeit a.jar badku") + .shouldHaveExitValue(8); + + js("-strict -keystore ks -storepass changeit a.jar badeku") + .shouldHaveExitValue(8); + + js("-strict -keystore ks -storepass changeit a.jar goodku") + .shouldHaveExitValue(0); + + js("-strict -keystore ks -storepass changeit a.jar goodeku") + .shouldHaveExitValue(0); + + // badchain signed by ca1, but ca1 is removed later + kt("-genkeypair -alias badchain -dname CN=badchain -validity 365"); + kt("-genkeypair -alias ca1 -dname CN=ca1 -ext bc -validity 365"); + gencert("badchain", "-alias ca1 -validity 365"); + + // save ca1.cert for easy replay + kt("-exportcert -file ca1.cert -alias ca1"); + kt("-delete -alias ca1"); + + js("-strict -keystore ks -storepass changeit a.jar badchain") + .shouldHaveExitValue(4); + + js("-verify a.jar").shouldHaveExitValue(0); + + // ========================================================== + // Third part: -certchain test + // ========================================================== + + // altchain signed by ca2 + kt("-genkeypair -alias altchain -dname CN=altchain -validity 365"); + kt("-genkeypair -alias ca2 -dname CN=ca2 -ext bc -validity 365"); + kt("-certreq -alias altchain -file altchain.req"); + Files.write(Path.of("certchain"), List.of( + kt("-gencert -alias ca2 -validity 365 -rfc -infile altchain.req") + .getOutput(), + kt("-exportcert -alias ca2 -rfc").getOutput())); + + // Self-signed cert does not work + js("-strict -keystore ks -storepass changeit a.jar altchain") + .shouldHaveExitValue(4); + + // -certchain works + js("-strict -keystore ks -storepass changeit -certchain certchain " + + "a.jar altchain") + .shouldHaveExitValue(0); + + // if ca2 is removed, -certchain still work because altchain is a + // self-signed entry and it is trusted by jarsigner + // save ca2.cert for easy replay + kt("-exportcert -file ca2.cert -alias ca2"); + kt("-delete -alias ca2"); + js("-strict -keystore ks -storepass changeit " + + "-certchain certchain a.jar altchain") + .shouldHaveExitValue(0); + + // if cert is imported, -certchain won't work because this + // certificate entry is not trusted + kt("-importcert -file certchain -alias altchain -noprompt"); + js("-strict -keystore ks -storepass changeit " + + "-certchain certchain a.jar altchain") + .shouldHaveExitValue(4); + + js("-verify a.jar").shouldHaveExitValue(0); + + // ========================================================== + // 8172529 + // ========================================================== + + kt("-genkeypair -alias ee -dname CN=ee"); + kt("-genkeypair -alias caone -dname CN=caone"); + kt("-genkeypair -alias catwo -dname CN=catwo"); + + kt("-certreq -alias ee -file ee.req"); + kt("-certreq -alias catwo -file catwo.req"); + + // This certchain contains a cross-signed weak catwo.cert + Files.write(Path.of("ee2"), List.of( + kt("-gencert -alias catwo -rfc -infile ee.req").getOutput(), + kt("-gencert -alias caone -sigalg MD5withRSA -rfc " + + "-infile catwo.req").getOutput())); + + kt("-importcert -alias ee -file ee2"); + + SecurityTools.jar("cvf a.jar A1"); + js("-strict -keystore ks -storepass changeit a.jar ee") + .shouldHaveExitValue(0); + js("-strict -keystore ks -storepass changeit -verify a.jar") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/Crl.java b/test/jdk/sun/security/tools/jarsigner/Crl.java new file mode 100644 index 00000000000..0d272cb7514 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/Crl.java @@ -0,0 +1,61 @@ +/* + * 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 + * 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 6890876 6950931 + * @summary jarsigner can add CRL info into signed jar (updated) + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +public class Crl { + static OutputAnalyzer kt(String cmd) throws Exception { + return SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keystore ks -keyalg rsa " + cmd); + } + + public static void main(String[] args) throws Exception { + kt("-alias a -dname CN=a -keyalg rsa -genkey -validity 300"); + kt("-alias a -gencrl -id 1:1 -id 2:2 -file crl1") + .shouldHaveExitValue(0); + kt("-alias a -gencrl -id 3:3 -id 4:4 -file crl2") + .shouldHaveExitValue(0); + kt("-alias a -gencrl -id 5:1 -id 6:2 -file crl3") + .shouldHaveExitValue(0); + + // Test keytool -printcrl + + kt("-printcrl -file crl1").shouldHaveExitValue(0); + kt("-printcrl -file crl2").shouldHaveExitValue(0); + kt("-printcrl -file crl3").shouldHaveExitValue(0); + + // Test keytool -ext crl + + kt("-alias b -dname CN=c -keyalg rsa -genkey -validity 300 " + + "-ext crl=uri:http://www.example.com/crl") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/DefaultOptions.java b/test/jdk/sun/security/tools/jarsigner/DefaultOptions.java new file mode 100644 index 00000000000..d5313e197fc --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/DefaultOptions.java @@ -0,0 +1,87 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8049834 + * @summary Two security tools tests do not run with only JRE + * @library /test/lib + */ + +import jdk.test.lib.Asserts; +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import java.util.jar.JarFile; + +public class DefaultOptions { + + static OutputAnalyzer jarsigner(String cmd) throws Throwable { + ProcessBuilder pb = SecurityTools.getProcessBuilder( + "jarsigner", List.of(cmd.trim().split("\\s+"))); + pb.environment().put("PASS", "changeit"); + return ProcessTools.executeCommand(pb); + } + + static OutputAnalyzer keytool(String cmd) throws Throwable { + cmd = "-storepass:env PASS -keypass:env PASS -keystore ks " + cmd; + ProcessBuilder pb = SecurityTools.getProcessBuilder( + "keytool", List.of(cmd.trim().split("\\s+"))); + pb.environment().put("PASS", "changeit"); + return ProcessTools.executeCommand(pb); + } + + public static void main(String[] args) throws Throwable { + keytool("-genkeypair -dname CN=A -alias a -keyalg rsa") + .shouldHaveExitValue(0); + keytool("-genkeypair -dname CN=CA -alias ca -keyalg rsa") + .shouldHaveExitValue(0); + keytool("-alias a -certreq -file a.req"); + keytool("-alias ca -gencert -infile a.req -outfile a.cert"); + keytool("-alias a -import -file a.cert").shouldHaveExitValue(0); + + Files.write(Path.of("js.conf"), List.of( + "jarsigner.all = -keystore ${user.dir}/ks -storepass:env PASS " + + "-debug -strict", + "jarsigner.sign = -digestalg SHA1", + "jarsigner.verify = -verbose:summary")); + + JarUtils.createJarFile(Path.of("a.jar"), Path.of("."), + Path.of("ks"), Path.of("js.conf")); + + jarsigner("-conf js.conf a.jar a").shouldHaveExitValue(0); + jarsigner("-conf js.conf -verify a.jar").shouldHaveExitValue(0) + .shouldContain("and 1 more"); + + try (JarFile jf = new JarFile("a.jar")) { + Asserts.assertTrue(jf.getManifest().getAttributes("ks").keySet() + .stream() + .anyMatch(s -> s.toString().contains("SHA1-Digest"))); + } + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/DiffEnd.java b/test/jdk/sun/security/tools/jarsigner/DiffEnd.java new file mode 100644 index 00000000000..ed316b188d9 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/DiffEnd.java @@ -0,0 +1,90 @@ +/* + * 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 + * 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 6948909 + * @summary Jarsigner removes MANIFEST.MF info for badly packages jar's + * @library /test/lib + */ + +import jdk.test.lib.Asserts; +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +import java.io.FileOutputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.jar.Attributes; +import java.util.jar.JarFile; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +public class DiffEnd { + + static void check() throws Exception { + SecurityTools.jarsigner("-keystore " + + Path.of(System.getProperty("test.src"), "JarSigning.keystore") + .toString() + + " -storepass bbbbbb -digestalg SHA1" + + " -signedjar diffend.new.jar diffend.jar c"); + + try (JarFile jf = new JarFile("diffend.new.jar")) { + Asserts.assertTrue(jf.getManifest().getMainAttributes() + .containsKey(new Attributes.Name("Today"))); + } + } + + public static void main(String[] args) throws Exception { + + // A MANIFEST.MF using \n as newlines and no double newlines at the end + byte[] manifest = + ("Manifest-Version: 1.0\n" + + "Created-By: 1.7.0-internal (Sun Microsystems Inc.)\n" + + "Today: Monday\n").getBytes(StandardCharsets.UTF_8); + + // With the fake .RSA file, to trigger the if (wasSigned) block + try (FileOutputStream fos = new FileOutputStream("diffend.jar"); + ZipOutputStream zos = new ZipOutputStream(fos)) { + zos.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF")); + zos.write(manifest); + zos.putNextEntry(new ZipEntry("META-INF/x.RSA")); + zos.putNextEntry(new ZipEntry("1")); + zos.write(new byte[10]); + } + + check(); + + // Without the fake .RSA file, to trigger the else block + try (FileOutputStream fos = new FileOutputStream("diffend.jar"); + ZipOutputStream zos = new ZipOutputStream(fos)) { + zos.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF")); + zos.write(manifest); + zos.putNextEntry(new ZipEntry("1")); + zos.write(new byte[10]); + } + + check(); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/EC.java b/test/jdk/sun/security/tools/jarsigner/EC.java new file mode 100644 index 00000000000..749b173ed07 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/EC.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6870812 + * @summary enhance security tools to use ECC algorithm + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class EC { + static OutputAnalyzer kt(String cmd) throws Exception { + return SecurityTools.keytool("-storepass changeit " + + "-keypass changeit -keystore ks " + cmd); + } + + static void gencert(String owner, String cmd) throws Exception { + kt("-certreq -alias " + owner + " -file tmp.req") + .shouldHaveExitValue(0); + kt("-gencert -infile tmp.req -outfile tmp.cert " + cmd) + .shouldHaveExitValue(0); + kt("-import -alias " + owner + " -file tmp.cert") + .shouldHaveExitValue(0); + } + + static OutputAnalyzer js(String cmd) throws Exception { + return SecurityTools.jarsigner("-keystore ks -storepass changeit " + cmd); + } + + public static void main(String[] args) throws Exception { + Files.write(Path.of("A"), List.of("A")); + JarUtils.createJarFile(Path.of("a.jar"), Path.of("."), Path.of("A")); + + kt("-alias ca -dname CN=ca -keyalg ec -genkey -validity 300") + .shouldHaveExitValue(0); + kt("-alias a -dname CN=a -keyalg ec -genkey") + .shouldHaveExitValue(0); + gencert("a", "-alias ca -validity 300"); + + kt("-alias b -dname CN=b -keyalg ec -genkey") + .shouldHaveExitValue(0); + gencert("b", "-alias ca -validity 300"); + + // Ensure key length sufficient for intended hash (SHA512withECDSA) + kt("-alias c -dname CN=c -keyalg ec -genkey -keysize 521") + .shouldHaveExitValue(0); + gencert("c", "-alias ca -validity 300"); + + kt("-alias x -dname CN=x -keyalg ec -genkey -validity 300") + .shouldHaveExitValue(0); + gencert("x", "-alias ca -validity 300"); + + js("a.jar a -debug -strict").shouldHaveExitValue(0); + js("a.jar b -debug -strict -sigalg SHA1withECDSA").shouldHaveExitValue(0); + js("a.jar c -debug -strict -sigalg SHA512withECDSA").shouldHaveExitValue(0); + + js("-verify a.jar a -debug -strict").shouldHaveExitValue(0); + js("-verify a.jar b -debug -strict").shouldHaveExitValue(0); + js("-verify a.jar c -debug -strict").shouldHaveExitValue(0); + + // Not signed by x, should exit with non-zero + js("-verify a.jar x -debug -strict").shouldNotHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/EmptyManifest.java b/test/jdk/sun/security/tools/jarsigner/EmptyManifest.java new file mode 100644 index 00000000000..63e8539c31a --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/EmptyManifest.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6712755 + * @summary jarsigner fails to sign itextasian.jar since 1.5.0_b14, + * it works with 1.5.0_13 + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; + +import java.io.FileOutputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +public class EmptyManifest { + + public static void main(String[] args) throws Exception { + + try (FileOutputStream fos = new FileOutputStream("em.jar"); + ZipOutputStream zos = new ZipOutputStream(fos)) { + zos.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF")); + zos.write(new byte[]{'\r', '\n'}); + zos.putNextEntry(new ZipEntry("A")); + zos.write(new byte[10]); + zos.putNextEntry(new ZipEntry("B")); + zos.write(new byte[0]); + } + + SecurityTools.keytool("-keystore ks -storepass changeit " + + "-keypass changeit -alias a -dname CN=a -keyalg rsa " + + "-genkey -validity 300"); + + SecurityTools.jarsigner("-keystore ks -storepass changeit em.jar a") + .shouldHaveExitValue(0); + SecurityTools.jarsigner("-keystore ks -storepass changeit -verify " + + "-debug -strict em.jar") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/EntriesOrder.java b/test/jdk/sun/security/tools/jarsigner/EntriesOrder.java index 91eada85dd8..c5f046658fc 100644 --- a/test/jdk/sun/security/tools/jarsigner/EntriesOrder.java +++ b/test/jdk/sun/security/tools/jarsigner/EntriesOrder.java @@ -64,9 +64,9 @@ public class EntriesOrder { // directory ignored), we can get 2 signed ones (inf, a). // Prepares raw files - Files.write(Paths.get("a"), "a".getBytes()); + Files.write(Paths.get("a"), List.of("a")); Files.createDirectory(Paths.get("META-INF/")); - Files.write(Paths.get("META-INF/inf"), "inf".getBytes()); + Files.write(Paths.get("META-INF/inf"), List.of("inf")); // Pack, sign, and extract to get all files sun.tools.jar.Main m = diff --git a/test/jdk/sun/security/tools/jarsigner/JvIndex.java b/test/jdk/sun/security/tools/jarsigner/JvIndex.java new file mode 100644 index 00000000000..248c3081512 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/JvIndex.java @@ -0,0 +1,60 @@ +/* + * 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 8022761 + * @summary regression: SecurityException is NOT thrown while trying + * to pack a wrongly signed Indexed Jar file + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class JvIndex { + public static void main(String[] args) throws Exception { + + Files.write(Path.of("abcde"), List.of("12345")); + JarUtils.createJarFile(Path.of("jvindex.jar"), Path.of("."), + Path.of("abcde")); + SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keystore ks -keyalg rsa -alias a -dname CN=a " + + "-genkey -validity 300") + .shouldHaveExitValue(0); + SecurityTools.jarsigner("-keystore ks -storepass changeit jvindex.jar a") + .shouldHaveExitValue(0); + + SecurityTools.jar("i jvindex.jar"); + + // Make sure the $F line has "sm" (signed and in manifest) + SecurityTools.jarsigner("-keystore ks -storepass changeit -verify " + + "-verbose jvindex.jar") + .shouldHaveExitValue(0) + .shouldMatch("sm.*abcde"); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/NameClash.java b/test/jdk/sun/security/tools/jarsigner/NameClash.java new file mode 100644 index 00000000000..3d4264e7db6 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/NameClash.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6876328 + * @summary different names for the same digest algorithms breaks jarsigner + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class NameClash { + public static void main(String[] args) throws Exception { + String common = "-storepass changeit -keypass changeit -keystore ks "; + + SecurityTools.keytool(common + "-alias a -dname CN=a -keyalg rsa " + + "-genkey -validity 300"); + SecurityTools.keytool(common + "-alias b -dname CN=b -keyalg rsa " + + "-genkey -validity 300"); + + Files.write(Path.of("A"), List.of("A")); + JarUtils.createJarFile(Path.of("a.jar"), Path.of("."), Path.of("A")); + + SecurityTools.jarsigner(common + "a.jar a -digestalg SHA1") + .shouldHaveExitValue(0); + SecurityTools.jarsigner(common + "a.jar b -digestalg SHA-1") + .shouldHaveExitValue(0); + + SecurityTools.jarsigner(common + "-verify -debug -strict a.jar") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/NewSize7.java b/test/jdk/sun/security/tools/jarsigner/NewSize7.java new file mode 100644 index 00000000000..8dbf15f4a38 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/NewSize7.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6561126 + * @summary keytool should use larger default keysize for keypairs + * @library /test/lib + */ + +import jdk.test.lib.Asserts; +import jdk.test.lib.SecurityTools; +import jdk.test.lib.util.JarUtils; + +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.jar.JarFile; +import java.util.jar.Manifest; + +public class NewSize7 { + public static void main(String[] args) throws Exception { + String common = "-storepass changeit -keypass changeit -keystore ks "; + SecurityTools.keytool(common + + "-keyalg rsa -genkeypair -alias me -dname CN=Me"); + Files.write(Path.of("ns7.txt"), new byte[0]); + JarUtils.createJarFile(Path.of("ns7.jar"), Path.of("."), + Path.of("ns7.txt")); + SecurityTools.jarsigner(common + "ns7.jar me"); + + try (JarFile jf = new JarFile("ns7.jar")) { + try (InputStream is = jf.getInputStream( + jf.getEntry("META-INF/MANIFEST.MF"))) { + Asserts.assertTrue(new Manifest(is).getAttributes("ns7.txt") + .keySet().stream() + .anyMatch(s -> s.toString().contains("SHA-256"))); + } + try (InputStream is = jf.getInputStream( + jf.getEntry("META-INF/ME.SF"))) { + Asserts.assertTrue(new Manifest(is).getAttributes("ns7.txt") + .keySet().stream() + .anyMatch(s -> s.toString().contains("SHA-256"))); + } + } + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/OldSig.java b/test/jdk/sun/security/tools/jarsigner/OldSig.java new file mode 100644 index 00000000000..8b2e2289527 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/OldSig.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6543940 6868865 + * @summary Exception thrown when signing a jarfile in java 1.5 + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; + +public class OldSig { + public static void main(String[] args) throws Exception { + Path src = Path.of(System.getProperty("test.src")); + // copy jar file into writeable location + Files.copy(src.resolve("oldsig/A.jar"), Path.of("B.jar")); + Files.copy(src.resolve("oldsig/A.class"), Path.of("B.class")); + + JarUtils.updateJarFile(Path.of("B.jar"), Path.of("."), + Path.of("B.class")); + + SecurityTools.jarsigner("-keystore " + src.resolve("JarSigning.keystore") + + " -storepass bbbbbb -digestalg SHA1 B.jar c"); + SecurityTools.jarsigner("-verify B.jar"); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/OnlyManifest.java b/test/jdk/sun/security/tools/jarsigner/OnlyManifest.java new file mode 100644 index 00000000000..527a45067c3 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/OnlyManifest.java @@ -0,0 +1,69 @@ +/* + * 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 + * 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 7004035 + * @summary signed jar with only META-INF/* inside is not verifiable + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class OnlyManifest { + static OutputAnalyzer kt(String cmd) throws Exception { + return SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keystore ks -keyalg rsa " + cmd); + } + + static void gencert(String owner, String cmd) throws Exception { + kt("-certreq -alias " + owner + " -file tmp.req"); + kt("-gencert -infile tmp.req -outfile tmp.cert " + cmd); + kt("-import -alias " + owner + " -file tmp.cert"); + } + + public static void main(String[] args) throws Exception { + // Create an empty jar file with only MANIFEST.MF + Files.write(Path.of("manifest"), List.of("Key: Value")); + SecurityTools.jar("cvfm a.jar manifest"); + + kt("-alias ca -dname CN=ca -genkey -validity 300") + .shouldHaveExitValue(0); + kt("-alias a -dname CN=a -genkey -validity 300") + .shouldHaveExitValue(0); + gencert("a", "-alias ca -validity 300"); + + SecurityTools.jarsigner("-keystore ks -storepass changeit" + + " a.jar a -debug -strict") + .shouldHaveExitValue(0); + SecurityTools.jarsigner("-keystore ks -storepass changeit" + + " -verify a.jar a -debug -strict") + .shouldHaveExitValue(0) + .shouldNotContain("unsigned"); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/Options.java b/test/jdk/sun/security/tools/jarsigner/Options.java index bf736e47cfa..8d52d9f53f3 100644 --- a/test/jdk/sun/security/tools/jarsigner/Options.java +++ b/test/jdk/sun/security/tools/jarsigner/Options.java @@ -58,7 +58,7 @@ public class Options { public static void main(String[] args) throws Exception { // Prepares raw file - Files.write(Paths.get("a"), "a".getBytes()); + Files.write(Paths.get("a"), List.of("a")); // Pack JarUtils.createJar("a.jar", "a"); diff --git a/test/jdk/sun/security/tools/jarsigner/PassType.java b/test/jdk/sun/security/tools/jarsigner/PassType.java new file mode 100644 index 00000000000..179f9926928 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/PassType.java @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6868579 + * @summary RFE: jarsigner to support reading password from environment variable + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class PassType { + + static OutputAnalyzer jarsignerWithEnv(String cmd) throws Throwable { + ProcessBuilder pb = SecurityTools.getProcessBuilder( + "jarsigner", List.of(cmd.trim().split("\\s+"))); + pb.environment().put("PASSENV", "test12"); + return ProcessTools.executeCommand(pb); + } + + static OutputAnalyzer keytoolWithEnv(String cmd) throws Throwable { + ProcessBuilder pb = SecurityTools.getProcessBuilder( + "keytool", List.of(cmd.trim().split("\\s+"))); + pb.environment().put("PASSENV", "test12"); + return ProcessTools.executeCommand(pb); + } + + public static void main(String[] args) throws Throwable { + + SecurityTools.keytool("-keystore ks -validity 300 -keyalg rsa " + + "-alias a -dname CN=a -keyalg rsa -genkey " + + "-storepass test12 -keypass test12") + .shouldHaveExitValue(0); + keytoolWithEnv("-keystore ks -validity 300 -keyalg rsa " + + "-alias b -dname CN=b -keyalg rsa -genkey " + + "-storepass:env PASSENV -keypass:env PASSENV") + .shouldHaveExitValue(0); + Files.write(Path.of("passfile"), List.of("test12")); + SecurityTools.keytool("-keystore ks -validity 300 -keyalg rsa " + + "-alias c -dname CN=c -keyalg rsa -genkey " + + "-storepass:file passfile -keypass:file passfile") + .shouldHaveExitValue(0); + + Files.write(Path.of("A"), List.of("A")); + JarUtils.createJarFile(Path.of("a.jar"), Path.of("."), Path.of("A")); + + // Sign + SecurityTools.jarsigner("-keystore ks -storepass test12 a.jar a") + .shouldHaveExitValue(0); + jarsignerWithEnv("-keystore ks -storepass:env PASSENV a.jar b") + .shouldHaveExitValue(0); + SecurityTools.jarsigner("-keystore ks -storepass:file passfile a.jar c") + .shouldHaveExitValue(0); + + // Verify + SecurityTools.jarsigner("-keystore ks -storepass test12 " + + "-verify -debug -strict a.jar") + .shouldHaveExitValue(0); + jarsignerWithEnv("-keystore ks -storepass:env PASSENV " + + "-verify -debug -strict a.jar") + .shouldHaveExitValue(0); + SecurityTools.jarsigner("-keystore ks -storepass:file passfile " + + "-verify -debug -strict a.jar") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/PercentSign.java b/test/jdk/sun/security/tools/jarsigner/PercentSign.java new file mode 100644 index 00000000000..534328bd45c --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/PercentSign.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6522933 + * @summary jarsigner fails in a directory with a path containing a % sign + * @author Wang Weijun + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; + +import java.nio.file.Files; +import java.nio.file.Path; + +public class PercentSign { + public static void main(String[] args) throws Exception { + + // copy jar file into writeable location + Files.copy(Path.of(System.getProperty("test.src"), "AlgOptions.jar"), + Path.of("AlgOptionsTmp.jar")); + + SecurityTools.jarsigner("-keystore " + + Path.of(System.getProperty("test.src"), "a%b", "percent.keystore") + + " -storepass changeit AlgOptionsTmp.jar ok") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/PercentSign.sh b/test/jdk/sun/security/tools/jarsigner/PercentSign.sh deleted file mode 100644 index 323cda5c658..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/PercentSign.sh +++ /dev/null @@ -1,79 +0,0 @@ -# -# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 6522933 -# @summary jarsigner fails in a directory with a path contianing a % sign -# @author Wang Weijun -# -# @run shell PercentSign.sh -# - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" - CP="${FS}bin${FS}cp -f" - ;; - CYGWIN* ) - NULL=/dev/null - PS=";" - FS="/" - CP="cp -f" - ;; - Windows_* ) - NULL=NUL - PS=";" - FS="\\" - CP="cp -f" - ;; - * ) - echo "Unrecognized operating system!" - exit 1; - ;; -esac - -# copy jar file into writeable location -${CP} ${TESTSRC}${FS}AlgOptions.jar ${TESTCLASSES}${FS}AlgOptionsTmp.jar - -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}a%b${FS}percent.keystore \ - -storepass changeit \ - ${TESTCLASSES}${FS}AlgOptionsTmp.jar ok diff --git a/test/jdk/sun/security/tools/jarsigner/SameName.java b/test/jdk/sun/security/tools/jarsigner/SameName.java new file mode 100644 index 00000000000..52996e74be5 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/SameName.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6866479 + * @summary libzip.so caused JVM to crash when running jarsigner + * @library /test/lib + */ + +import jdk.test.lib.Platform; +import jdk.test.lib.SecurityTools; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +public class SameName { + public static void main(String[] args) throws Exception { + + String signedJar = Platform.isWindows() ? "EM.jar" : "em.jar"; + + Files.write(Path.of("A"), List.of("A")); + JarUtils.createJarFile(Path.of("em.jar"), Path.of("."), Path.of("A")); + + SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keystore ks -keyalg rsa -alias a -dname CN=a " + + "-keyalg rsa -genkey -validity 300") + .shouldHaveExitValue(0); + + SecurityTools.jarsigner("-keystore ks -storepass changeit " + + "-signedjar " + signedJar + " em.jar a") + .shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/WeakSize.java b/test/jdk/sun/security/tools/jarsigner/WeakSize.java new file mode 100644 index 00000000000..8f0f612d2f6 --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/WeakSize.java @@ -0,0 +1,69 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8044755 + * @summary Add a test for algorithm constraints check in jarsigner + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.util.JarUtils; + +import java.nio.file.Path; + +public class WeakSize { + + static OutputAnalyzer kt(String cmd) throws Exception { + // The sigalg used is MD2withRSA, which is obsolete. + return SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keystore ks -keyalg rsa -sigalg MD2withRSA " + cmd); + } + + static void gencert(String owner, String cmd) throws Exception { + kt("-certreq -alias " + owner + " -file tmp.req"); + kt("-gencert -infile tmp.req -outfile tmp.cert " + cmd); + kt("-import -alias " + owner + " -file tmp.cert"); + } + + public static void main(String[] args) throws Exception { + + kt("-genkeypair -alias ca -dname CN=CA -ext bc"); + kt("-genkeypair -alias signer -dname CN=Signer"); + gencert("signer", "-alias ca -ext ku=dS -rfc"); + + JarUtils.createJarFile(Path.of("a.jar"), Path.of("."), Path.of("ks")); + + // We always trust a TrustedCertificateEntry + SecurityTools.jarsigner("-keystore ks -storepass changeit " + + "-strict -debug a.jar ca") + .shouldNotContain("chain is invalid"); + + // An end-entity cert must follow algorithm constraints + SecurityTools.jarsigner("-keystore ks -storepass changeit " + + "-strict -debug a.jar signer") + .shouldContain("chain is invalid"); + } +} diff --git a/test/jdk/sun/security/tools/jarsigner/certpolicy.sh b/test/jdk/sun/security/tools/jarsigner/certpolicy.sh deleted file mode 100644 index 20cf92b1618..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/certpolicy.sh +++ /dev/null @@ -1,80 +0,0 @@ -# -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# 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 8036709 -# @summary Java 7 jarsigner displays warning about cert policy tree -# -# @run shell certpolicy.sh -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -KT="$TESTJAVA/bin/keytool $TESTTOOLVMOPTS \ - -keypass changeit -storepass changeit -keystore ks -keyalg rsa" -JS="$TESTJAVA/bin/jarsigner $TESTTOOLVMOPTS -storepass changeit -keystore ks" -JAR="$TESTJAVA/bin/jar $TESTTOOLVMOPTS" - -rm ks 2> /dev/null -$KT -genkeypair -alias ca -dname CN=CA -ext bc -$KT -genkeypair -alias int -dname CN=Int -$KT -genkeypair -alias ee -dname CN=EE - -# CertificatePolicies [[PolicyId: [1.2.3]], [PolicyId: [1.2.4]]] -# PolicyConstraints: [Require: 0; Inhibit: unspecified] -$KT -certreq -alias int | \ - $KT -gencert -rfc -alias ca \ - -ext 2.5.29.32="30 0C 30 04 06 02 2A 03 30 04 06 02 2A 04" \ - -ext "2.5.29.36=30 03 80 01 00" -ext bc | \ - $KT -import -alias int - -# CertificatePolicies [[PolicyId: [1.2.3]]] -$KT -certreq -alias ee | \ - $KT -gencert -rfc -alias int \ - -ext 2.5.29.32="30 06 30 04 06 02 2A 03" | \ - $KT -import -alias ee - -$KT -export -alias ee -rfc > cc -$KT -export -alias int -rfc >> cc -$KT -export -alias ca -rfc >> cc - -$KT -delete -alias int - -ERR='' -$JAR cvf a.jar cc - -# Make sure the certchain in the signed jar contains all 3 certs -$JS -strict -certchain cc a.jar ee -debug || ERR="sign" -$JS -strict -verify a.jar -debug || ERR="$ERR verify" - -if [ "$ERR" = "" ]; then - echo "Success" - exit 0 -else - echo "Failed: $ERR" - exit 1 -fi - diff --git a/test/jdk/sun/security/tools/jarsigner/checkusage.sh b/test/jdk/sun/security/tools/jarsigner/checkusage.sh deleted file mode 100644 index 9940c46bdab..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/checkusage.sh +++ /dev/null @@ -1,109 +0,0 @@ -# -# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# 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 7004168 -# @summary jarsigner -verify checks for KeyUsage codesigning ext on all certs -# instead of just signing cert -# -# @run shell checkusage.sh -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit -keyalg rsa" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS}" - -rm js.jks trust.jks unrelated.jks 2> /dev/null - -echo x > x -$JAR cvf a.jar x - -################### 3 Keystores ####################### - -# Keystore js.jks: including CA and Publisher -# CA contains a non-empty KeyUsage -$KT -keystore js.jks -genkeypair -alias ca -dname CN=CA -ext KU=kCS -ext bc -validity 365 -$KT -keystore js.jks -genkeypair -alias pub -dname CN=Publisher - -# Publisher contains the correct KeyUsage -$KT -keystore js.jks -certreq -alias pub | \ - $KT -keystore js.jks -gencert -alias ca -ext KU=dig -validity 365 | \ - $KT -keystore js.jks -importcert -alias pub - -# Keystore trust.jks: including CA only -$KT -keystore js.jks -exportcert -alias ca | \ - $KT -keystore trust.jks -importcert -alias ca -noprompt - -# Keystore unrelated.jks: unrelated -$KT -keystore unrelated.jks -genkeypair -alias nothing -dname CN=Nothing -validity 365 - - -################### 4 Tests ####################### - -# Test 1: Sign should be OK - -$JARSIGNER -keystore js.jks -storepass changeit a.jar pub -RESULT=$? -echo $RESULT -#[ $RESULT = 0 ] || exit 1 - -# Test 2: Verify should be OK - -$JARSIGNER -keystore trust.jks -strict -verify a.jar -RESULT=$? -echo $RESULT -#[ $RESULT = 0 ] || exit 2 - -# Test 3: When no keystore is specified, the error is only -# "chain invalid" - -$JARSIGNER -strict -verify a.jar -RESULT=$? -echo $RESULT -#[ $RESULT = 4 ] || exit 3 - -# Test 4: When unrelated keystore is specified, the error is -# "chain invalid" and "not alias in keystore" - -$JARSIGNER -keystore unrelated.jks -strict -verify a.jar -RESULT=$? -echo $RESULT -#[ $RESULT = 36 ] || exit 4 - -exit 0 diff --git a/test/jdk/sun/security/tools/jarsigner/collator.sh b/test/jdk/sun/security/tools/jarsigner/collator.sh deleted file mode 100644 index fb22c098419..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/collator.sh +++ /dev/null @@ -1,74 +0,0 @@ -# -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# @test -# @bug 8021789 -# @summary jarsigner parses alias as command line option (depending on locale) -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -F=collator -KS=collator.jks -JFILE=collator.jar - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit \ - -keyalg rsa -keystore $KS" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -keystore $KS -storepass changeit" - -rm $F $KS $JFILE 2> /dev/null - -echo 12345 > $F -$JAR cvf $JFILE $F - -ERR="" - -$KT -alias debug -dname CN=debug -genkey -validity 300 || ERR="$ERR 1" - -# use "debug" as alias name -$JARSIGNER $JFILE debug || ERR="$ERR 2" - -# use "" as alias name (although there will be a warning) -$JARSIGNER -verify $JFILE "" || ERR="$ERR 3" - -if [ "$ERR" = "" ]; then - exit 0 -else - echo "ERR is $ERR" - exit 1 -fi diff --git a/test/jdk/sun/security/tools/jarsigner/concise_jarsigner.sh b/test/jdk/sun/security/tools/jarsigner/concise_jarsigner.sh deleted file mode 100644 index b9ec9e83232..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/concise_jarsigner.sh +++ /dev/null @@ -1,247 +0,0 @@ -# -# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. -# 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 6802846 8172529 -# @summary jarsigner needs enhanced cert validation(options) -# -# @run shell/timeout=240 concise_jarsigner.sh -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -# Choose 1024-bit RSA to make sure it runs fine and fast on all platforms. In -# fact, every keyalg/keysize combination is OK for this test. - -TESTTOOLVMOPTS="$TESTTOOLVMOPTS -J-Duser.language=en -J-Duser.country=US" - -KS=js.ks -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit -keystore $KS -keyalg rsa -keysize 1024" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -debug" -JAVAC="$TESTJAVA${FS}bin${FS}javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS}" - -rm $KS - -echo class A1 {} > A1.java -echo class A2 {} > A2.java -echo class A3 {} > A3.java -echo class A4 {} > A4.java -echo class A5 {} > A5.java -echo class A6 {} > A6.java - -$JAVAC A1.java A2.java A3.java A4.java A5.java A6.java -YEAR=`date +%Y` - -# ========================================================== -# First part: output format -# ========================================================== - -$KT -genkeypair -alias a1 -dname CN=a1 -validity 366 -$KT -genkeypair -alias a2 -dname CN=a2 -validity 366 - -# a.jar includes 8 unsigned, 2 signed by a1 and a2, 2 signed by a3 -$JAR cvf a.jar A1.class A2.class -$JARSIGNER -keystore $KS -storepass changeit a.jar a1 -$JAR uvf a.jar A3.class A4.class -$JARSIGNER -keystore $KS -storepass changeit a.jar a2 -$JAR uvf a.jar A5.class A6.class - -# Verify OK -$JARSIGNER -verify a.jar -[ $? = 0 ] || exit $LINENO - -# 4(chainNotValidated)+16(hasUnsignedEntry) -$JARSIGNER -verify a.jar -strict -[ $? = 20 ] || exit $LINENO - -# 16(hasUnsignedEntry) -$JARSIGNER -verify a.jar -strict -keystore $KS -storepass changeit -[ $? = 16 ] || exit $LINENO - -# 16(hasUnsignedEntry)+32(notSignedByAlias) -$JARSIGNER -verify a.jar a1 -strict -keystore $KS -storepass changeit -[ $? = 48 ] || exit $LINENO - -# 16(hasUnsignedEntry) -$JARSIGNER -verify a.jar a1 a2 -strict -keystore $KS -storepass changeit -[ $? = 16 ] || exit $LINENO - -# 12 entries all together -LINES=`$JARSIGNER -verify a.jar -verbose | grep $YEAR | wc -l` -[ $LINES = 12 ] || exit $LINENO - -# 12 entries all listed -LINES=`$JARSIGNER -verify a.jar -verbose:grouped | grep $YEAR | wc -l` -[ $LINES = 12 ] || exit $LINENO - -# 4 groups: MANIFST, unrelated, signed, unsigned -LINES=`$JARSIGNER -verify a.jar -verbose:summary | grep $YEAR | wc -l` -[ $LINES = 4 ] || exit $LINENO - -# still 4 groups, but MANIFEST group has no other file -LINES=`$JARSIGNER -verify a.jar -verbose:summary | grep "more)" | wc -l` -[ $LINES = 3 ] || exit $LINENO - -# 5 groups: MANIFEST, unrelated, signed by a1/a2, signed by a2, unsigned -LINES=`$JARSIGNER -verify a.jar -verbose:summary -certs | grep $YEAR | wc -l` -[ $LINES = 5 ] || exit $LINENO - -# 2 for MANIFEST, 2*2 for A1/A2, 2 for A3/A4 -LINES=`$JARSIGNER -verify a.jar -verbose -certs | grep "\[certificate" | wc -l` -[ $LINES = 8 ] || exit $LINENO - -# a1,a2 for MANIFEST, a1,a2 for A1/A2, a2 for A3/A4 -LINES=`$JARSIGNER -verify a.jar -verbose:grouped -certs | grep "\[certificate" | wc -l` -[ $LINES = 5 ] || exit $LINENO - -# a1,a2 for MANIFEST, a1,a2 for A1/A2, a2 for A3/A4 -LINES=`$JARSIGNER -verify a.jar -verbose:summary -certs | grep "\[certificate" | wc -l` -[ $LINES = 5 ] || exit $LINENO - -# still 5 groups, but MANIFEST group has no other file -LINES=`$JARSIGNER -verify a.jar -verbose:summary -certs | grep "more)" | wc -l` -[ $LINES = 4 ] || exit $LINENO - -# ========================================================== -# Second part: exit code 2, 4, 8. -# 16 and 32 already covered in the first part -# ========================================================== - -$KT -genkeypair -alias ca -dname CN=ca -ext bc -validity 365 -$KT -genkeypair -alias expired -dname CN=expired -$KT -certreq -alias expired | $KT -gencert -alias ca -startdate -10m | $KT -import -alias expired -$KT -genkeypair -alias notyetvalid -dname CN=notyetvalid -$KT -certreq -alias notyetvalid | $KT -gencert -alias ca -startdate +1m | $KT -import -alias notyetvalid -$KT -genkeypair -alias badku -dname CN=badku -$KT -certreq -alias badku | $KT -gencert -alias ca -ext KU=cRLSign -validity 365 | $KT -import -alias badku -$KT -genkeypair -alias badeku -dname CN=badeku -$KT -certreq -alias badeku | $KT -gencert -alias ca -ext EKU=sa -validity 365 | $KT -import -alias badeku -$KT -genkeypair -alias goodku -dname CN=goodku -$KT -certreq -alias goodku | $KT -gencert -alias ca -ext KU=dig -validity 365 | $KT -import -alias goodku -$KT -genkeypair -alias goodeku -dname CN=goodeku -$KT -certreq -alias goodeku | $KT -gencert -alias ca -ext EKU=codesign -validity 365 | $KT -import -alias goodeku - -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar expired -[ $? = 4 ] || exit $LINENO - -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar notyetvalid -[ $? = 4 ] || exit $LINENO - -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar badku -[ $? = 8 ] || exit $LINENO - -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar badeku -[ $? = 8 ] || exit $LINENO - -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar goodku -[ $? = 0 ] || exit $LINENO - -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar goodeku -[ $? = 0 ] || exit $LINENO - -# badchain signed by ca1, but ca1 is removed later -$KT -genkeypair -alias badchain -dname CN=badchain -validity 365 -$KT -genkeypair -alias ca1 -dname CN=ca1 -ext bc -validity 365 -$KT -certreq -alias badchain | $KT -gencert -alias ca1 -validity 365 | \ - $KT -importcert -alias badchain -# save ca1.cert for easy replay -$KT -exportcert -file ca1.cert -alias ca1 -$KT -delete -alias ca1 - -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar badchain -[ $? = 4 ] || exit $LINENO - -$JARSIGNER -verify a.jar -[ $? = 0 ] || exit $LINENO - -# ========================================================== -# Third part: -certchain test -# ========================================================== - -# altchain signed by ca2 -$KT -genkeypair -alias altchain -dname CN=altchain -validity 365 -$KT -genkeypair -alias ca2 -dname CN=ca2 -ext bc -validity 365 -$KT -certreq -alias altchain | $KT -gencert -alias ca2 -validity 365 -rfc > certchain -$KT -exportcert -alias ca2 -rfc >> certchain - -# Self-signed cert does not work -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar altchain -[ $? = 4 ] || exit $LINENO - -# -certchain works -$JARSIGNER -strict -keystore $KS -storepass changeit -certchain certchain a.jar altchain -[ $? = 0 ] || exit $LINENO - -# if ca2 is removed, -certchain still work because altchain is a self-signed entry and -# it is trusted by jarsigner -# save ca2.cert for easy replay -$KT -exportcert -file ca2.cert -alias ca2 -$KT -delete -alias ca2 -$JARSIGNER -strict -keystore $KS -storepass changeit -certchain certchain a.jar altchain -[ $? = 0 ] || exit $LINENO - -# if cert is imported, -certchain won't work because this certificate entry is not trusted -$KT -importcert -file certchain -alias altchain -noprompt -$JARSIGNER -strict -keystore $KS -storepass changeit -certchain certchain a.jar altchain -[ $? = 4 ] || exit $LINENO - -$JARSIGNER -verify a.jar -[ $? = 0 ] || exit $LINENO - -# ========================================================== -# 8172529 -# ========================================================== - -$KT -genkeypair -alias ee -dname CN=ee -$KT -genkeypair -alias caone -dname CN=caone -$KT -genkeypair -alias catwo -dname CN=catwo - -$KT -certreq -alias ee | $KT -gencert -alias catwo -rfc > ee.cert -$KT -certreq -alias catwo | $KT -gencert -alias caone -sigalg MD5withRSA -rfc > catwo.cert - -# This certchain contains a cross-signed weak catwo.cert -cat ee.cert catwo.cert | $KT -importcert -alias ee - -$JAR cvf a.jar A1.class -$JARSIGNER -strict -keystore $KS -storepass changeit a.jar ee -[ $? = 0 ] || exit $LINENO -$JARSIGNER -strict -keystore $KS -storepass changeit -verify a.jar -[ $? = 0 ] || exit $LINENO - -echo OK -exit 0 diff --git a/test/jdk/sun/security/tools/jarsigner/crl.sh b/test/jdk/sun/security/tools/jarsigner/crl.sh deleted file mode 100644 index ab74d33054e..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/crl.sh +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright (c) 2010, 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 6890876 6950931 -# @summary jarsigner can add CRL info into signed jar (updated) -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables - -OS=`uname -s` -case "$OS" in - Windows* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KS=crl.jks - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit -keystore $KS -keyalg rsa" - -rm $KS 2> /dev/null - -# Test keytool -gencrl - -$KT -alias a -dname CN=a -keyalg rsa -genkey -validity 300 -$KT -alias a -gencrl -id 1:1 -id 2:2 -file crl1 || exit 1 -$KT -alias a -gencrl -id 3:3 -id 4:4 -file crl2 || exit 2 -$KT -alias a -gencrl -id 5:1 -id 6:2 -file crl3 || exit 4 - -# Test keytool -printcrl - -$KT -printcrl -file crl1 || exit 5 -$KT -printcrl -file crl2 || exit 6 -$KT -printcrl -file crl3 || exit 7 - - -# Test keytool -ext crl - -$KT -alias b -dname CN=c -keyalg rsa -genkey -validity 300 \ - -ext crl=uri:http://www.example.com/crl || exit 10 - -exit 0 diff --git a/test/jdk/sun/security/tools/jarsigner/default_options.sh b/test/jdk/sun/security/tools/jarsigner/default_options.sh deleted file mode 100644 index e848e1ce671..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/default_options.sh +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# 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 8049834 -# @summary Two security tools tests do not run with only JRE -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -PASS=changeit -export PASS - -TESTTOOLVMOPTS="$TESTTOOLVMOPTS -J-Duser.language=en -J-Duser.country=US" - -KS=ks -KEYTOOL="$TESTJAVA/bin/keytool ${TESTTOOLVMOPTS} -storepass:env PASS -keypass:env PASS -keystore $KS" -JAR="$TESTJAVA/bin/jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA/bin/jarsigner ${TESTTOOLVMOPTS}" - -rm $KS 2> /dev/null - -$KEYTOOL -genkeypair -dname CN=A -alias a -keyalg rsa || exit 1 -$KEYTOOL -genkeypair -dname CN=CA -alias ca -keyalg rsa || exit 2 -$KEYTOOL -alias a -certreq | - $KEYTOOL -alias ca -gencert | - $KEYTOOL -alias a -import || exit 3 - -cat < js.conf -jarsigner.all = -keystore \${user.dir}/$KS -storepass:env PASS -debug -strict -jarsigner.sign = -digestalg SHA1 -jarsigner.verify = -verbose:summary - -EOF - -$JAR cvf a.jar ks js.conf - -$JARSIGNER -conf js.conf a.jar a || exit 21 -$JARSIGNER -conf js.conf -verify a.jar > jarsigner.out || exit 22 -grep "and 1 more" jarsigner.out || exit 23 -$JAR xvf a.jar META-INF/MANIFEST.MF -grep "SHA1-Digest" META-INF/MANIFEST.MF || exit 24 - -echo Done -exit 0 diff --git a/test/jdk/sun/security/tools/jarsigner/diffend.sh b/test/jdk/sun/security/tools/jarsigner/diffend.sh deleted file mode 100644 index 994304a48ba..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/diffend.sh +++ /dev/null @@ -1,110 +0,0 @@ -# -# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 6948909 -# @summary Jarsigner removes MANIFEST.MF info for badly packages jar's -# - -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" - CP="${FS}bin${FS}cp -f" - ;; - CYGWIN* ) - NULL=/dev/null - PS=";" - FS="/" - CP="cp -f" - ;; - Windows_* ) - NULL=NUL - PS=";" - FS="\\" - CP="cp -f" - ;; - * ) - echo "Unrecognized operating system!" - exit 1; - ;; -esac - -echo 1 > 1 -mkdir META-INF - -# Create a fake .RSA file so that jarsigner believes it's signed - -touch META-INF/x.RSA - -# A MANIFEST.MF using \n as newlines and no double newlines at the end - -cat > META-INF/MANIFEST.MF < A -$JAR cvf $JFILE A - -$KT -alias ca -dname CN=ca -keyalg ec -genkey -validity 300 || exit 11 - -$KT -alias a -dname CN=a -keyalg ec -genkey || exit 11 -$KT -alias a -certreq | $KT -gencert -alias ca -validity 300 | $KT -import -alias a || exit 111 - -$KT -alias b -dname CN=b -keyalg ec -genkey || exit 12 -$KT -alias b -certreq | $KT -gencert -alias ca -validity 300 | $KT -import -alias b || exit 121 - -# Ensure that key length is sufficient for the intended hash (SHA512withECDSA) -$KT -alias c -dname CN=c -keyalg ec -genkey -keysize 521 || exit 13 -$KT -alias c -certreq | $KT -gencert -alias ca -validity 300 | $KT -import -alias c || exit 131 - -$KT -alias x -dname CN=x -keyalg ec -genkey -validity 300 || exit 14 -$KT -alias x -certreq | $KT -gencert -alias ca -validity 300 | $KT -import -alias x || exit 141 - -$JARSIGNER -keystore $KS -storepass changeit $JFILE a -debug -strict || exit 21 -$JARSIGNER -keystore $KS -storepass changeit $JFILE b -debug -strict -sigalg SHA1withECDSA || exit 22 -$JARSIGNER -keystore $KS -storepass changeit $JFILE c -debug -strict -sigalg SHA512withECDSA || exit 23 - -$JARSIGNER -keystore $KS -storepass changeit -verify $JFILE a -debug -strict || exit 31 -$JARSIGNER -keystore $KS -storepass changeit -verify $JFILE b -debug -strict || exit 32 -$JARSIGNER -keystore $KS -storepass changeit -verify $JFILE c -debug -strict || exit 33 - -# Not signed by x, should exit with non-zero -$JARSIGNER -keystore $KS -storepass changeit -verify $JFILE x -debug -strict && exit 34 - -exit 0 - diff --git a/test/jdk/sun/security/tools/jarsigner/emptymanifest.sh b/test/jdk/sun/security/tools/jarsigner/emptymanifest.sh deleted file mode 100644 index 866ad59572e..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/emptymanifest.sh +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. -# 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 6712755 -# @summary jarsigner fails to sign itextasian.jar since 1.5.0_b14, it works with 1.5.0_13 -# -# @run shell emptymanifest.sh -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KS=emptymanifest.ks -JFILE=em.jar - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit -keystore $KS" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JAVA="$TESTJAVA${FS}bin${FS}java ${TESTVMOPTS}" -JAVAC="$TESTJAVA${FS}bin${FS}javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -keystore $KS -storepass changeit" - -rm $KS $JFILE -echo A > A -echo B > B -mkdir META-INF -cat < CrLf.java -class CrLf { - public static void main(String[] args) throws Exception { - System.out.write(new byte[] {'\r', '\n'}); - } -} -EOF -$JAVAC CrLf.java -$JAVA CrLf > META-INF${FS}MANIFEST.MF -zip $JFILE META-INF${FS}MANIFEST.MF A B - -$KT -alias a -dname CN=a -keyalg rsa -genkey -validity 300 - -$JARSIGNER $JFILE a || exit 1 -$JARSIGNER -verify -debug -strict $JFILE || exit 2 - -exit 0 diff --git a/test/jdk/sun/security/tools/jarsigner/jvindex.sh b/test/jdk/sun/security/tools/jarsigner/jvindex.sh deleted file mode 100644 index e59550c5add..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/jvindex.sh +++ /dev/null @@ -1,74 +0,0 @@ -# -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# @test -# @bug 8022761 -# @summary regression: SecurityException is NOT thrown while trying to pack a wrongly signed Indexed Jar file -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -F=abcde -KS=jvindex.jks -JFILE=jvindex.jar - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit \ - -keystore $KS -keyalg rsa" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -keystore $KS -storepass changeit" - -rm $F $KS $JFILE 2> /dev/null - -echo 12345 > $F -$JAR cvf $JFILE $F - -ERR="" - -$KT -alias a -dname CN=a -genkey -validity 300 || ERR="$ERR 1" - -$JARSIGNER $JFILE a || ERR="$ERR 2" -$JAR i $JFILE - -# Make sure the $F line has "sm" (signed and in manifest) -$JARSIGNER -verify -verbose $JFILE | grep $F | grep sm || ERR="$ERR 3" - -if [ "$ERR" = "" ]; then - exit 0 -else - echo "ERR is $ERR" - exit 1 -fi diff --git a/test/jdk/sun/security/tools/jarsigner/nameclash.sh b/test/jdk/sun/security/tools/jarsigner/nameclash.sh deleted file mode 100644 index 80c9c8da933..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/nameclash.sh +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. -# 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 6876328 -# @summary different names for the same digest algorithms breaks jarsigner -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KS=nc.ks -JFILE=nc.jar - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit -keystore $KS" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -keystore $KS -storepass changeit" - -rm $KS $JFILE - -$KT -alias a -dname CN=a -keyalg rsa -genkey -validity 300 -$KT -alias b -dname CN=b -keyalg rsa -genkey -validity 300 - -echo A > A -$JAR cvf $JFILE A - -$JARSIGNER $JFILE a -digestalg SHA1 || exit 1 -$JARSIGNER $JFILE b -digestalg SHA-1 || exit 2 - -$JARSIGNER -verify -debug -strict $JFILE || exit 3 - -exit 0 diff --git a/test/jdk/sun/security/tools/jarsigner/newsize7.sh b/test/jdk/sun/security/tools/jarsigner/newsize7.sh deleted file mode 100644 index f64ad2361ce..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/newsize7.sh +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (c) 2009, 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 6561126 -# @summary keytool should use larger default keysize for keypairs -# -# @run shell newsize7.sh - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi - -if [ "${TESTJAVA}" = "" ] ; then - JAVA_CMD=`which java` - TESTJAVA=`dirname $JAVA_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KSFILE=ns7.jks - -KT="${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -keystore ns7.jks -storepass changeit -keypass changeit -keyalg rsa" -JAR="${TESTJAVA}${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JS="${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -keystore ns7.jks -storepass changeit" - -rm ns7.* - -$KT -genkeypair -alias me -dname CN=Me - -touch ns7.txt -$JAR cvf ns7.jar ns7.txt - -$JS ns7.jar me -$JAR xvf ns7.jar - -grep SHA-256 META-INF/MANIFEST.MF || exit 1 -grep SHA-256 META-INF/ME.SF || exit 2 - -#rm -rf META-INF - -exit 0 diff --git a/test/jdk/sun/security/tools/jarsigner/oldsig.sh b/test/jdk/sun/security/tools/jarsigner/oldsig.sh deleted file mode 100644 index daf8dfd27dd..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/oldsig.sh +++ /dev/null @@ -1,79 +0,0 @@ -# -# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 6543940 6868865 -# @summary Exception thrown when signing a jarfile in java 1.5 -# -# @run shell oldsig.sh - -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" - CP="${FS}bin${FS}cp -f" - ;; - CYGWIN* ) - NULL=/dev/null - PS=";" - FS="/" - CP="cp -f" - ;; - Windows_* ) - NULL=NUL - PS=";" - FS="\\" - CP="cp -f" - ;; - * ) - echo "Unrecognized operating system!" - exit 1; - ;; -esac - -# copy jar file into writeable location -${CP} ${TESTSRC}${FS}oldsig${FS}A.jar B.jar -${CP} ${TESTSRC}${FS}oldsig${FS}A.class B.class - -${TESTJAVA}${FS}bin${FS}jar ${TESTTOOLVMOPTS} uvf B.jar B.class -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} \ - -keystore ${TESTSRC}${FS}JarSigning.keystore \ - -storepass bbbbbb \ - -digestalg SHA1 \ - B.jar c -${TESTJAVA}${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -verify B.jar diff --git a/test/jdk/sun/security/tools/jarsigner/onlymanifest.sh b/test/jdk/sun/security/tools/jarsigner/onlymanifest.sh deleted file mode 100644 index 5bb3803538b..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/onlymanifest.sh +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright (c) 2010, 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 7004035 -# @summary signed jar with only META-INF/* inside is not verifiable -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KS=onlymanifest.jks -JFILE=onlymanifest.jar - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit \ - -keystore $KS -keyalg rsa" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS}" - -rm $KS $JFILE 2> /dev/null - -# Create an empty jar file with only MANIFEST.MF - -echo "Key: Value" > manifest -$JAR cvfm $JFILE manifest - -$KT -alias ca -dname CN=ca -genkey -validity 300 || exit 1 -$KT -alias a -dname CN=a -genkey -validity 300 || exit 2 -$KT -alias a -certreq | $KT -gencert -alias ca -validity 300 | $KT -import -alias a || exit 3 -$JARSIGNER -keystore $KS -storepass changeit $JFILE a -debug -strict || exit 4 -$JARSIGNER -keystore $KS -storepass changeit -verify $JFILE a -debug -strict \ - > onlymanifest.out || exit 5 - -grep unsigned onlymanifest.out && exit 6 - -exit 0 - diff --git a/test/jdk/sun/security/tools/jarsigner/passtype.sh b/test/jdk/sun/security/tools/jarsigner/passtype.sh deleted file mode 100644 index ff13f61644a..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/passtype.sh +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. -# 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 6868579 -# @summary RFE: jarsigner to support reading password from environment variable -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KS=pt.ks -JFILE=pt.jar - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -keystore $KS -validity 300 -keyalg rsa" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS}" - -rm $KS $JFILE - -$KT -alias a -dname CN=a -keyalg rsa -genkey \ - -storepass test12 -keypass test12 || exit 1 -PASSENV=test12 $KT -alias b -dname CN=b -keyalg rsa -genkey \ - -storepass:env PASSENV -keypass:env PASSENV || exit 2 -echo test12 > passfile -$KT -alias c -dname CN=c -keyalg rsa -genkey \ - -storepass:file passfile -keypass:file passfile || exit 3 - -echo A > A -$JAR cvf $JFILE A - -# Sign -$JARSIGNER -keystore $KS -storepass test12 $JFILE a || exit 4 -PASSENV=test12 $JARSIGNER -keystore $KS -storepass:env PASSENV $JFILE b || exit 5 -$JARSIGNER -keystore $KS -storepass:file passfile $JFILE b || exit 6 - -# Verify -$JARSIGNER -keystore $KS -storepass test12 -verify -debug -strict $JFILE || exit 7 -PASSENV=test12 $JARSIGNER -keystore $KS -storepass:env PASSENV -verify -debug -strict $JFILE || exit 8 -$JARSIGNER -keystore $KS -storepass:file passfile -verify -debug -strict $JFILE || exit 9 - -exit 0 - diff --git a/test/jdk/sun/security/tools/jarsigner/samename.sh b/test/jdk/sun/security/tools/jarsigner/samename.sh deleted file mode 100644 index 6bbe235b30b..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/samename.sh +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (c) 2009, 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 6866479 -# @summary libzip.so caused JVM to crash when running jarsigner -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* | CYGWIN* ) - SIGNEDJAR=EM.jar - FS="\\" - ;; - * ) - SIGNEDJAR=em.jar - FS="/" - ;; -esac - -KS=samename.jks -JFILE=em.jar - -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit -keystore $KS -keyalg rsa" -JAR="$TESTJAVA${FS}bin${FS}jar ${TESTTOOLVMOPTS}" -JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS}" - -rm $KS $JFILE $SIGNEDJAR -echo A > A -$JAR cvf $JFILE A - -$KT -alias a -dname CN=a -keyalg rsa -genkey -validity 300 - -$JARSIGNER -keystore $KS -storepass changeit -signedjar $SIGNEDJAR $JFILE a - diff --git a/test/jdk/sun/security/tools/jarsigner/weaksize.sh b/test/jdk/sun/security/tools/jarsigner/weaksize.sh deleted file mode 100644 index b612e385107..00000000000 --- a/test/jdk/sun/security/tools/jarsigner/weaksize.sh +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# @test -# @bug 8044755 -# @summary Add a test for algorithm constraints check in jarsigner -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -TESTTOOLVMOPTS="$TESTTOOLVMOPTS -J-Duser.language=en -J-Duser.country=US" - -# The sigalg used is MD2withRSA, which is obsolete. - -KT="$TESTJAVA/bin/keytool ${TESTTOOLVMOPTS} -keystore ks - -storepass changeit -keypass changeit - -keyalg rsa -sigalg MD2withRSA -debug" -JS="$TESTJAVA/bin/jarsigner ${TESTTOOLVMOPTS} -keystore ks - -storepass changeit -strict -debug" -JAR="$TESTJAVA/bin/jar ${TESTTOOLVMOPTS}" - -rm ks 2> /dev/null - -$KT -genkeypair -alias ca -dname CN=CA -ext bc -$KT -genkeypair -alias signer -dname CN=Signer - -$KT -certreq -alias signer | \ - $KT -gencert -alias ca -ext ku=dS -rfc | \ - $KT -importcert -alias signer - -$JAR cvf a.jar ks - -# We always trust a TrustedCertificateEntry -$JS a.jar ca | grep "chain is invalid" && exit 1 - -# An end-entity cert must follow algorithm constraints -$JS a.jar signer | grep "chain is invalid" || exit 2 - -exit 0 diff --git a/test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.java b/test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.java new file mode 100644 index 00000000000..2d354fa79d6 --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.java @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6178366 + * @library /test/lib + * @summary confirm that keytool correctly finds (and clones) a private key + * when the user is prompted for the key's password. + */ + +import jdk.test.lib.Asserts; +import jdk.test.lib.SecurityTools; + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.KeyStore; + +public class CloneKeyAskPassword { + public static void main(String[] args) throws Exception { + + // Different storepass and keypass + Files.copy(Path.of( + System.getProperty("test.src"), "CloneKeyAskPassword.jks"), + Path.of("CloneKeyAskPassword.jks")); + + // Clone with original keypass + SecurityTools.setResponse("test456", ""); + SecurityTools.keytool( + "-keyclone", + "-alias", "mykey", + "-dest", "myclone1", + "-keystore", "CloneKeyAskPassword.jks", + "-storepass", "test123").shouldHaveExitValue(0); + + // Clone with new keypass + SecurityTools.setResponse("test456", "test789", "test789"); + SecurityTools.keytool( + "-keyclone", + "-alias", "mykey", + "-dest", "myclone2", + "-keystore", "CloneKeyAskPassword.jks", + "-storepass", "test123").shouldHaveExitValue(0); + + KeyStore ks = KeyStore.getInstance( + new File("CloneKeyAskPassword.jks"), "test123".toCharArray()); + Asserts.assertNotNull(ks.getKey("myclone1", "test456".toCharArray())); + Asserts.assertNotNull(ks.getKey("myclone2", "test789".toCharArray())); + } +} diff --git a/test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.sh b/test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.sh deleted file mode 100644 index de0324bab5f..00000000000 --- a/test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.sh +++ /dev/null @@ -1,94 +0,0 @@ -# -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 6178366 -# @summary confirm that keytool correctly finds (and clones) a private key -# when the user is prompted for the key's password. -# -# @run shell CloneKeyAskPassword.sh - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi - -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi - -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS ) - PATHSEP=":" - FILESEP="/" - ;; - Linux ) - PATHSEP=":" - FILESEP="/" - ;; - Darwin ) - PATHSEP=":" - FILESEP="/" - ;; - AIX ) - PATHSEP=":" - FILESEP="/" - ;; - CYGWIN* ) - PATHSEP=";" - FILESEP="/" - ;; - Windows* ) - PATHSEP=";" - FILESEP="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -# get a writeable keystore -cp ${TESTSRC}${FILESEP}CloneKeyAskPassword.jks . -chmod 644 CloneKeyAskPassword.jks - -# run the test: attempt to clone the private key -${TESTJAVA}${FILESEP}bin${FILESEP}keytool ${TESTTOOLVMOPTS} \ - -keyclone \ - -alias mykey \ - -dest myclone \ - -keystore CloneKeyAskPassword.jks \ - -storepass test123 < cmd = new ArrayList<>(); + cmd.addAll(Arrays.asList( + "-storepass", "changeit", + "-keypass", "changeit", + "-keystore", KS, + "-keyalg", "rsa")); + cmd.addAll(Arrays.asList(s)); + return SecurityTools.keytool(cmd); + } +} diff --git a/test/jdk/sun/security/tools/keytool/FileInHelp.java b/test/jdk/sun/security/tools/keytool/FileInHelp.java new file mode 100644 index 00000000000..ce6c2503fea --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/FileInHelp.java @@ -0,0 +1,42 @@ +/* + * 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 + * 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 6922482 + * @summary keytool's help on -file always shows 'output file' + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; + +public class FileInHelp { + public static void main(String[] args) throws Exception { + SecurityTools.keytool("-printcertreq -help") + .shouldHaveExitValue(0) + .shouldContain("input file"); + SecurityTools.keytool("-exportcert -help") + .shouldHaveExitValue(0) + .shouldContain("output file"); + } +} diff --git a/test/jdk/sun/security/tools/keytool/ImportReadAll.java b/test/jdk/sun/security/tools/keytool/ImportReadAll.java new file mode 100644 index 00000000000..b93a4090981 --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/ImportReadAll.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6819272 + * @summary keytool -importcert should read the whole input + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +public class ImportReadAll { + public static void main(String[] args) throws Exception { + keytool("-genkeypair -alias a -dname CN=a").shouldHaveExitValue(0); + keytool("-genkeypair -alias ca -dname CN=ca").shouldHaveExitValue(0); + + keytool("-certreq -alias a -file a.req").shouldHaveExitValue(0); + keytool("-gencert -alias ca -infile a.req -outfile a.crt") + .shouldHaveExitValue(0); + keytool("-importcert -alias a -file a.crt").shouldHaveExitValue(0); + } + + static OutputAnalyzer keytool(String s) throws Exception { + return SecurityTools.keytool( + "-keystore importreadall.jks " + + "-storepass changeit -keypass changeit -keyalg rsa " + s); + } +} diff --git a/test/jdk/sun/security/tools/keytool/KeyAlg.java b/test/jdk/sun/security/tools/keytool/KeyAlg.java new file mode 100644 index 00000000000..f39ef4149b1 --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/KeyAlg.java @@ -0,0 +1,54 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8029659 + * @summary Keytool, print key algorithm of certificate or key entry + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +public class KeyAlg { + public static void main(String[] args) throws Exception { + keytool("-genkeypair -alias ca -dname CN=CA -keyalg EC") + .shouldHaveExitValue(0); + keytool("-genkeypair -alias user -dname CN=User -keyalg RSA -keysize 1024") + .shouldHaveExitValue(0); + keytool("-certreq -alias user -file user.req").shouldHaveExitValue(0); + keytool("-gencert -alias ca -rfc -sigalg SHA1withECDSA" + + " -infile user.req -outfile user.crt") + .shouldHaveExitValue(0); + keytool("-printcert -file user.crt") + .shouldHaveExitValue(0) + .shouldMatch("Signature algorithm name:.*SHA1withECDSA") + .shouldMatch("Subject Public Key Algorithm:.*1024.*RSA"); + } + + static OutputAnalyzer keytool(String s) throws Exception { + return SecurityTools.keytool( + "-keystore ks -storepass changeit -keypass changeit " + s); + } +} diff --git a/test/jdk/sun/security/tools/keytool/NewHelp.java b/test/jdk/sun/security/tools/keytool/NewHelp.java new file mode 100644 index 00000000000..9a3fbd1c348 --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/NewHelp.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6324292 + * @summary keytool -help is unhelpful + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; + +public class NewHelp { + public static void main(String[] args) throws Exception { + SecurityTools.keytool("-help") + .shouldHaveExitValue(0) + .shouldContain("Commands:"); + SecurityTools.keytool("-help -list") + .shouldHaveExitValue(0) + .shouldContain("Options:"); + } +} diff --git a/test/jdk/sun/security/tools/keytool/NoExtNPE.java b/test/jdk/sun/security/tools/keytool/NoExtNPE.java new file mode 100644 index 00000000000..81017a2817a --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/NoExtNPE.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6813402 + * @summary keytool cannot -printcert entries without extensions + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; + +import java.nio.file.Path; + +public class NoExtNPE { + public static void main(String[] args) throws Exception { + SecurityTools.keytool("-list -v -keystore " + + Path.of(System.getProperty("test.src"), "CloneKeyAskPassword.jks") + + " -storepass test123").shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/keytool/NoExtNPE.sh b/test/jdk/sun/security/tools/keytool/NoExtNPE.sh deleted file mode 100644 index 29e277e4512..00000000000 --- a/test/jdk/sun/security/tools/keytool/NoExtNPE.sh +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 6813402 -# @summary keytool cannot -printcert entries without extensions -# -# @run shell NoExtNPE.sh - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi - -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS ) - FILESEP="/" - ;; - Linux ) - FILESEP="/" - ;; - Darwin ) - FILESEP="/" - ;; - AIX ) - PATHSEP=":" - FILESEP="/" - ;; - CYGWIN* ) - FILESEP="/" - ;; - Windows* ) - FILESEP="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -${TESTJAVA}${FILESEP}bin${FILESEP}keytool ${TESTTOOLVMOPTS} \ - -list -v \ - -keystore ${TESTSRC}${FILESEP}CloneKeyAskPassword.jks \ - -storepass test123 - -exit $? diff --git a/test/jdk/sun/security/tools/keytool/Resource.java b/test/jdk/sun/security/tools/keytool/Resource.java new file mode 100644 index 00000000000..1601419683f --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/Resource.java @@ -0,0 +1,39 @@ +/* + * 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 + * 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 6239297 + * @summary keytool usage is broken after changing Resources.java + * @author Max Wang + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; + +public class Resource { + public static void main(String[] args) throws Exception { + SecurityTools.keytool() + .shouldNotContain("MissingResourceException"); + } +} diff --git a/test/jdk/sun/security/tools/keytool/SecretKeyKS.java b/test/jdk/sun/security/tools/keytool/SecretKeyKS.java new file mode 100644 index 00000000000..b946ba2eeba --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/SecretKeyKS.java @@ -0,0 +1,43 @@ +/* + * 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 + * 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 4694076 + * @summary KeyTool throws ArrayIndexOutOfBoundsException for listing + * SecretKey entries in non-verbose mode. + * @author Valerie Peng + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; + +import java.nio.file.Path; + +public class SecretKeyKS { + public static void main(String[] args) throws Exception { + SecurityTools.keytool("-list -keystore " + + Path.of(System.getProperty("test.src"), "SecretKeyKS.jks") + + " -storepass password").shouldHaveExitValue(0); + } +} diff --git a/test/jdk/sun/security/tools/keytool/SecretKeyKS.sh b/test/jdk/sun/security/tools/keytool/SecretKeyKS.sh deleted file mode 100644 index a4364e52fbc..00000000000 --- a/test/jdk/sun/security/tools/keytool/SecretKeyKS.sh +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 4694076 -# @summary KeyTool throws ArrayIndexOutOfBoundsException for listing -# SecretKey entries in non-verbose mode. -# @author Valerie Peng -# -# @run shell SecretKeyKS.sh -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" - ;; - CYGWIN* ) - NULL=/dev/null - PS=";" - FS="/" - ;; - Windows_* ) - NULL=NUL - PS=";" - FS="\\" - ;; - * ) - echo "Unrecognized operating system!" - exit 1; - ;; -esac - -# the test code - -${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -list -keystore ${TESTSRC}${FS}SecretKeyKS.jks -storepass password - -exit $? diff --git a/test/jdk/sun/security/tools/keytool/SecurityToolsTest.java b/test/jdk/sun/security/tools/keytool/SecurityToolsTest.java new file mode 100644 index 00000000000..02803ac729e --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/SecurityToolsTest.java @@ -0,0 +1,61 @@ +/* + * 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 8180573 + * @summary Enhance SecurityTools input line parsing + * @library /test/lib + */ + +import jdk.test.lib.Asserts; +import jdk.test.lib.SecurityTools; + +import java.util.List; + +public class SecurityToolsTest { + public static void main(String[] args) { + Asserts.assertEQ(SecurityTools.makeList("a b c"), + List.of("a", "b", "c")); + Asserts.assertEQ(SecurityTools.makeList(" a b c "), + List.of("a", "b", "c")); + Asserts.assertEQ(SecurityTools.makeList("a\tb\nc"), + List.of("a", "b", "c")); + Asserts.assertEQ(SecurityTools.makeList("a `b` c"), + List.of("a", "b", "c")); + Asserts.assertEQ(SecurityTools.makeList("`a` b c"), + List.of("a", "b", "c")); + Asserts.assertEQ(SecurityTools.makeList("a b `c`"), + List.of("a", "b", "c")); + Asserts.assertEQ(SecurityTools.makeList("`a b` b c"), + List.of("a b", "b", "c")); + Asserts.assertEQ(SecurityTools.makeList("`a b c`"), + List.of("a b c")); + Asserts.assertEQ(SecurityTools.makeList("a ` b ` c"), + List.of("a", " b ", "c")); + Asserts.assertEQ(SecurityTools.makeList("a`b c"), + List.of("a`b", "c")); + Asserts.assertEQ(SecurityTools.makeList("a `\"b\"` c"), + List.of("a", "\"b\"", "c")); + } +} diff --git a/test/jdk/sun/security/tools/keytool/SelfIssued.java b/test/jdk/sun/security/tools/keytool/SelfIssued.java new file mode 100644 index 00000000000..4332e5473f5 --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/SelfIssued.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 6825352 6937978 + * @summary support self-issued certificate in keytool and let -gencert generate the chain + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +public class SelfIssued { + public static void main(String[] args) throws Exception { + keytool("-alias ca -dname CN=CA -genkeypair"); + keytool("-alias ca1 -dname CN=CA1 -genkeypair"); + keytool("-alias ca2 -dname CN=CA2 -genkeypair"); + keytool("-alias e1 -dname CN=E1 -genkeypair"); + + // ca signs ca1, ca1 signs ca2, all self-issued + keytool("-alias ca1 -certreq -file ca1.req"); + keytool("-alias ca -gencert -ext san=dns:ca1 " + + "-infile ca1.req -outfile ca1.crt"); + keytool("-alias ca1 -importcert -file ca1.crt"); + + keytool("-alias ca2 -certreq -file ca2.req"); + keytool("-alias ca1 -gencert -ext san=dns:ca2 " + + "-infile ca2.req -outfile ca2.crt"); + keytool("-alias ca2 -importcert -file ca2.crt"); + + // Import e1 signed by ca2, should add ca2 and ca1, at least 3 certs in the chain + keytool("-alias e1 -certreq -file e1.req"); + keytool("-alias ca2 -gencert -infile e1.req -outfile e1.crt"); + + keytool("-alias ca1 -delete"); + keytool("-alias ca2 -delete"); + keytool("-alias e1 -importcert -file e1.crt"); + keytool("-alias e1 -list -v") + .shouldContain("[3]"); + } + + static OutputAnalyzer keytool(String s) throws Exception { + return SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keystore ks -keyalg rsa " + s); + } +} + diff --git a/test/jdk/sun/security/tools/keytool/Serial64.java b/test/jdk/sun/security/tools/keytool/Serial64.java index c60b7bb6133..47b42dda246 100644 --- a/test/jdk/sun/security/tools/keytool/Serial64.java +++ b/test/jdk/sun/security/tools/keytool/Serial64.java @@ -23,15 +23,13 @@ /* * @test - * @bug 8221257 + * @bug 8221257 8222275 * @summary Improve serial number generation mechanism for keytool -gencert * @library /test/lib * @key randomness */ -import jdk.test.lib.Asserts; import jdk.test.lib.SecurityTools; -import jdk.test.lib.process.OutputAnalyzer; import java.io.File; import java.io.FileInputStream; @@ -39,57 +37,59 @@ import java.math.BigInteger; import java.security.KeyStore; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.List; public class Serial64 { - static List numbers = new ArrayList<>(); - public static void main(String[] args) throws Exception { - // 10 Self-signed certs and issued certs - genkeypair("ca"); - genkeypair("user"); - for (int i = 0; i < 8; i++) { - gencert("ca", "user"); + boolean see64 = false; + + see64 |= see64(genkeypair("ca")); + see64 |= see64(genkeypair("user")); + + keytool("-certreq -alias user -file req"); + + for (int i = 3; i <= 30; i++) { + see64 |= see64(gencert()); + if (i >= 10 && see64) { + // As long as we have generated >=10 (non-negative) SNs and + // at least one is 64 bit it's good to go. + return; + } } - numbers.forEach(b -> System.out.println(b.toString(16))); - - // Must be positive, therefore never zero. - Asserts.assertTrue(numbers.stream() - .allMatch(b -> b.signum() == 1)); - - // At least one should be 64 bit. There is a chance of - // 2^-10 this would fail. - Asserts.assertTrue(numbers.stream() - .anyMatch(b -> b.bitLength() == 64)); + // None is 64 bit. There is a chance of 2^-30 we reach here. + // Or, maybe we do have a bug? + throw new RuntimeException("No 64-bit serial number"); } - static OutputAnalyzer keytool(String s) throws Exception { - return SecurityTools.keytool( - "-storepass changeit -keypass changeit " - + "-keystore ks -keyalg rsa " + s); + static boolean see64(BigInteger sn) { + System.out.println(sn.toString(16)); + + if (sn.signum() != 1) { + throw new RuntimeException("Must be positive"); + } + return sn.bitLength() == 64; } - static void genkeypair(String a) throws Exception { - keytool("-genkeypair -alias " + a + " -dname CN=" + a) + static void keytool(String s) throws Exception { + SecurityTools.keytool("-storepass changeit -keypass changeit " + + "-keystore ks -keyalg rsa " + s) .shouldHaveExitValue(0); - numbers.add(((X509Certificate)KeyStore.getInstance( + } + + static BigInteger genkeypair(String a) throws Exception { + keytool("-genkeypair -alias " + a + " -dname CN=" + a); + return ((X509Certificate)KeyStore.getInstance( new File("ks"), "changeit".toCharArray()) - .getCertificate(a)).getSerialNumber()); + .getCertificate(a)).getSerialNumber(); } - static void gencert(String signer, String owner) - throws Exception { - keytool("-certreq -alias " + owner + " -file req") - .shouldHaveExitValue(0); - keytool("-gencert -alias " + signer + " -infile req -outfile cert") - .shouldHaveExitValue(0); + static BigInteger gencert() throws Exception { + keytool("-gencert -alias ca -infile req -outfile cert"); try (FileInputStream fis = new FileInputStream("cert")) { - numbers.add(((X509Certificate)CertificateFactory.getInstance("X.509") - .generateCertificate(fis)).getSerialNumber()); + return ((X509Certificate)CertificateFactory.getInstance("X.509") + .generateCertificate(fis)).getSerialNumber(); } } } diff --git a/test/jdk/sun/security/tools/keytool/StandardAlgName.java b/test/jdk/sun/security/tools/keytool/StandardAlgName.java new file mode 100644 index 00000000000..a9f4e504e02 --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/StandardAlgName.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * 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 4909889 + * @summary KeyTool accepts any input that user make as long as we can make some + * sense out of it, but when comes to present the info the user, it + * promotes a standard look. + * @author Andrew Fan + * @library /test/lib + * @run main/timeout=240 StandardAlgName + */ + +import jdk.test.lib.SecurityTools; + +public class StandardAlgName { + public static void main(String[] args) throws Exception { + // CA + SecurityTools.keytool("-genkey", "-v", "-alias", "pkcs12testCA", + "-keyalg", "RsA", "-keysize", "2048", + "-sigalg", "ShA1wItHRSA", + "-dname", "cn=PKCS12 Test CA, ou = Security SQE, o = JavaSoft, c = US", + "-validity", "3650", + "-keypass", "storepass", "-keystore", "keystoreCA.jceks.data", + "-storepass", "storepass", "-storetype", "jceKS") + .shouldHaveExitValue(0) + .shouldNotContain("RsA") + .shouldNotContain("ShA1wItHRSA") + .shouldContain("RSA") + .shouldContain("SHA1withRSA"); + + // Lead + SecurityTools.keytool("-genkey", "-v", "-alias", "pkcs12testLead", + "-keyalg", "rSA", "-keysize", "1024", + "-sigalg", "mD5withRSA", + "-dname", "cn=PKCS12 Test Lead, ou=Security SQE, o=JavaSoft, c=US", + "-validity", "3650", + "-keypass", "storepass", "-keystore", "keystoreLead.jceks.data", + "-storepass", "storepass", "-storetype", "jCeks") + .shouldHaveExitValue(0) + .shouldNotContain("rSA") + .shouldNotContain("mD5withRSA") + .shouldContain("RSA") + .shouldContain("MD5withRSA"); + + // End User 1 + SecurityTools.keytool("-genkey", "-v", "-alias", "pkcs12testEndUser1", + "-keyalg", "RSa", "-keysize", "1024", + "-sigalg", "sHa1wIThRSA", + "-dname", "cn=PKCS12 Test End User 1, ou=Security SQE, o=JavaSoft, c=US", + "-validity", "3650", + "-keypass", "storepass", "-keystore", "keystoreEndUser1.jceks.data", + "-storepass", "storepass", "-storetype", "Jceks") + .shouldHaveExitValue(0) + .shouldNotContain("RSa") + .shouldNotContain("sHa1wIThRSA") + .shouldContain("RSA") + .shouldContain("SHA1withRSA"); + } +} diff --git a/test/jdk/sun/security/tools/keytool/StandardAlgName.sh b/test/jdk/sun/security/tools/keytool/StandardAlgName.sh deleted file mode 100644 index 3cc1b7d9a2b..00000000000 --- a/test/jdk/sun/security/tools/keytool/StandardAlgName.sh +++ /dev/null @@ -1,94 +0,0 @@ -# -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 1.1 04/11/12 -# @bug 4909889 -# @summary KeyTool accepts any input that user make as long as we can make some -# sense out of it, but when comes to present the info the user, it -# promotes a standard look. -# @author Andrew Fan -# -# @run shell/timeout=240 StandardAlgName.sh -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" - ;; - CYGWIN* ) - NULL=/dev/null - PS=";" - FS="/" - ;; - Windows_* ) - NULL=NUL - PS=";" - FS="\\" - ;; - * ) - echo "Unrecognized operating system!" - exit 1; - ;; -esac - -# the test code -#CA -${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -genkey -v -alias pkcs12testCA -keyalg "RsA" -keysize 2048 -sigalg "ShA1wItHRSA" -dname "cn=PKCS12 Test CA, ou=Security SQE, o=JavaSoft, c=US" -validity 3650 -keypass storepass -keystore keystoreCA.jceks.data -storepass storepass -storetype jceKS 2>&1 | egrep 'RsA|ShA1wItHRSA' - -RESULT=$? -if [ $RESULT -eq 0 ]; then - exit 1 -else - #Lead - ${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -genkey -v -alias pkcs12testLead -keyalg "rSA" -keysize 1024 -sigalg "mD5withRSA" -dname "cn=PKCS12 Test Lead, ou=Security SQE, o=JavaSoft, c=US" -validity 3650 -keypass storepass -keystore keystoreLead.jceks.data -storepass storepass -storetype jCeks 2>&1 | egrep 'rSA|mD5withRSA' - RESULT=$? - if [ $RESULT -eq 0 ]; then - exit 1 - else - #End User 1 - ${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -genkey -v -alias pkcs12testEndUser1 -keyalg "RSa" -keysize 1024 -sigalg "sHa1wIThRSA" -dname "cn=PKCS12 Test End User 1, ou=Security SQE, o=JavaSoft, c=US" -validity 3650 -keypass storepass -keystore keystoreEndUser1.jceks.data -storepass storepass -storetype Jceks 2>&1 | egrep 'RSa|sHa1wIThRSA' - RESULT=$? - if [ $RESULT -eq 0 ]; then - exit 1 - else - exit 0 - fi - fi -fi - diff --git a/test/jdk/sun/security/tools/keytool/StorePasswords.java b/test/jdk/sun/security/tools/keytool/StorePasswords.java index 573947f656e..b31fb92a7f9 100644 --- a/test/jdk/sun/security/tools/keytool/StorePasswords.java +++ b/test/jdk/sun/security/tools/keytool/StorePasswords.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 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,8 +25,12 @@ * @test * @bug 8008296 * @summary Store and retrieve user passwords using PKCS#12 keystore + * @library /test/lib */ +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + import java.io.*; import java.security.*; import java.util.*; @@ -79,6 +83,18 @@ public class StorePasswords { "recovered " + recoverCount + " user passwords"); new File(KEYSTORE).delete(); + + storeCount = storeByShell(); + recoverCount = recoverByShell(); + + if (recoverCount != storeCount || storeCount < 11) { + throw new Exception("Stored " + storeCount + " user passwords, " + + "recovered " + recoverCount + " user passwords"); + } + System.out.println("\nStored " + storeCount + " user passwords, " + + "recovered " + recoverCount + " user passwords"); + + new File(KEYSTORE).delete(); } private static int store() throws Exception { @@ -189,4 +205,35 @@ public class StorePasswords { return count; } + + private static int storeByShell() throws Exception { + int count = 0; + for (String algorithm : PBE_ALGORITHMS) { + System.out.println("Storing user password (protected by " + algorithm + " )"); + String importCmd = count < 5 ? "-importpassword" : "-importpass"; + String keyAlg = algorithm.equals("default PBE algorithm") + ? "" : (" -keyalg " + algorithm); + SecurityTools.setResponse("hello1"); + OutputAnalyzer oa = SecurityTools.keytool(importCmd + + " -storetype pkcs12 -keystore mykeystore.p12" + + " -storepass changeit -alias `this entry is protected by " + + algorithm + "`" + keyAlg); + if (oa.getExitValue() == 0) { + System.out.println("OK"); + count++; + } else { + System.out.println("ERROR"); + } + } + return count; + } + + private static int recoverByShell() throws Exception { + return (int)SecurityTools.keytool("-list -storetype pkcs12" + + " -keystore mykeystore.p12 -storepass changeit") + .shouldHaveExitValue(0) + .asLines().stream() + .filter(s -> s.contains("this entry is protected by")) + .count(); + } } diff --git a/test/jdk/sun/security/tools/keytool/StorePasswordsByShell.sh b/test/jdk/sun/security/tools/keytool/StorePasswordsByShell.sh deleted file mode 100644 index 37a1b6551fc..00000000000 --- a/test/jdk/sun/security/tools/keytool/StorePasswordsByShell.sh +++ /dev/null @@ -1,132 +0,0 @@ -# -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# @test -# @bug 8008296 -# @summary confirm that keytool correctly imports user passwords -# -# @run shell StorePasswordsByShell.sh - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi - -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi - -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | AIX) - PATHSEP=":" - FILESEP="/" - ;; - CYGWIN* ) - PATHSEP=";" - FILESEP="/" - ;; - Windows* ) - PATHSEP=";" - FILESEP="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -PBE_ALGORITHMS="\ - default-PBE-algorithm \ - PBEWithMD5AndDES \ - PBEWithSHA1AndDESede \ - PBEWithSHA1AndRC2_40 \ - PBEWithSHA1AndRC2_128 - PBEWithSHA1AndRC4_40 \ - PBEWithSHA1AndRC4_128 \ - PBEWithHmacSHA1AndAES_128 \ - PBEWithHmacSHA224AndAES_128 \ - PBEWithHmacSHA256AndAES_128 \ - PBEWithHmacSHA384AndAES_128 \ - PBEWithHmacSHA512AndAES_128 \ - PBEWithHmacSHA1AndAES_256 \ - PBEWithHmacSHA224AndAES_256 \ - PBEWithHmacSHA256AndAES_256 \ - PBEWithHmacSHA384AndAES_256 \ - PBEWithHmacSHA512AndAES_256" - -USER_PWD="hello1\n" -ALIAS_PREFIX="this entry is protected by " -COUNTER=0 - -# cleanup -rm mykeystore.p12 > /dev/null 2>&1 - -echo -for i in $PBE_ALGORITHMS; do - - if [ $i = "default-PBE-algorithm" ]; then - KEYALG="" - else - KEYALG="-keyalg ${i}" - fi - - if [ $COUNTER -lt 5 ]; then - IMPORTPASSWORD="-importpassword" - else - IMPORTPASSWORD="-importpass" - fi - - echo "Storing user password (protected by ${i})" - echo "${USER_PWD}" | \ - ${TESTJAVA}${FILESEP}bin${FILESEP}keytool ${TESTTOOLVMOPTS} ${IMPORTPASSWORD} \ - -storetype pkcs12 -keystore mykeystore.p12 -storepass changeit \ - -alias "${ALIAS_PREFIX}${i}" ${KEYALG} > /dev/null 2>&1 - if [ $? -ne 0 ]; then - echo Error - else - echo OK - COUNTER=`expr ${COUNTER} + 1` - fi -done -echo - -COUNTER2=`${TESTJAVA}${FILESEP}bin${FILESEP}keytool ${TESTTOOLVMOPTS} -list -storetype pkcs12 \ - -keystore mykeystore.p12 -storepass changeit | grep -c "${ALIAS_PREFIX}"` - -RESULT="stored ${COUNTER} user passwords, detected ${COUNTER2} user passwords" -if [ $COUNTER -ne $COUNTER2 -o $COUNTER -lt 11 ]; then - echo "ERROR: $RESULT" - exit 1 -else - echo "OK: $RESULT" - exit 0 -fi diff --git a/test/jdk/sun/security/tools/keytool/TryStore.java b/test/jdk/sun/security/tools/keytool/TryStore.java new file mode 100644 index 00000000000..408d73df02a --- /dev/null +++ b/test/jdk/sun/security/tools/keytool/TryStore.java @@ -0,0 +1,53 @@ +/* + * 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 7047200 + * @summary keytool can try save to a byte array before overwrite the file + * @library /test/lib + */ + +import jdk.test.lib.SecurityTools; +import jdk.test.lib.process.OutputAnalyzer; + +public class TryStore { + public static void main(String[] args) throws Exception { + keytool("-genkeypair -alias a -dname CN=A -storepass changeit -keypass changeit"); + keytool("-genkeypair -alias b -dname CN=B -storepass changeit -keypass changeit"); + + // We use -protected for JKS keystore. This is illegal so the command should + // fail. Then we can check if the keystore is damaged. + + keytool("-genkeypair -protected -alias b -delete -debug") + .shouldNotHaveExitValue(0); + + keytool("-list -storepass changeit") + .shouldHaveExitValue(0); + } + + static OutputAnalyzer keytool(String s) throws Exception { + return SecurityTools.keytool( + "-storetype jks -keystore trystore.jks -keyalg rsa " + s); + } +} diff --git a/test/jdk/sun/security/tools/keytool/default_options.sh b/test/jdk/sun/security/tools/keytool/default_options.sh deleted file mode 100644 index 650084df558..00000000000 --- a/test/jdk/sun/security/tools/keytool/default_options.sh +++ /dev/null @@ -1,99 +0,0 @@ -# -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# 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 8023197 -# @summary Pre-configured command line options for keytool and jarsigner -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -TESTTOOLVMOPTS="$TESTTOOLVMOPTS -J-Duser.language=en -J-Duser.country=US" - -KS=ks -KEYTOOL="$TESTJAVA/bin/keytool ${TESTTOOLVMOPTS}" - -rm $KS 2> /dev/null - -PASS=changeit -export PASS - -cat < kt.conf -# A Pre-configured options file -keytool.all = -storepass:env PASS -keypass:env PASS -keystore \${user.dir}/$KS -debug -keytool.genkey = -keyalg ec -ext bc -keytool.delete = -keystore nothing -EOF - -# kt.conf is read -$KEYTOOL -conf kt.conf -genkeypair -dname CN=A -alias a || exit 1 -$KEYTOOL -conf kt.conf -list -alias a -v > a_certinfo || exit 2 -grep "Signature algorithm name" a_certinfo | grep ECDSA || exit 3 -grep "BasicConstraints" a_certinfo || exit 4 - -# kt.conf is read, and dup multi-valued options processed as expected -$KEYTOOL -conf kt.conf -genkeypair -dname CN=B -alias b -ext ku=ds \ - || exit 11 -$KEYTOOL -conf kt.conf -list -alias b -v > b_certinfo || exit 12 -grep "BasicConstraints" b_certinfo || exit 14 -grep "DigitalSignature" b_certinfo || exit 15 - -# Single-valued option in command section override all -$KEYTOOL -conf kt.conf -delete -alias a && exit 16 - -# Single-valued option on command line overrides again -$KEYTOOL -conf kt.conf -delete -alias b -keystore $KS || exit 17 - -# Error cases - -# File does not exist -$KEYTOOL -conf no-such-file -help -list && exit 31 - -# Cannot have both standard name (-genkeypair) and legacy name (-genkey) -cat < bad.conf -keytool.all = -storepass:env PASS -keypass:env PASS -keystore ks -keytool.genkeypair = -keyalg rsa -keytool.genkey = -keyalg ec -EOF - -$KEYTOOL -conf bad.conf -genkeypair -alias me -dname "cn=me" && exit 32 - -# Unknown options are rejected by tool -cat < bad.conf -keytool.all=-unknown -EOF - -$KEYTOOL -conf bad.conf -help -list && exit 33 - -# System property must be present -cat < bad.conf -keytool.all = -keystore \${no.such.prop} -EOF - -$KEYTOOL -conf bad.conf -help -list && exit 34 - -echo Done -exit 0 diff --git a/test/jdk/sun/security/tools/keytool/emptysubject.sh b/test/jdk/sun/security/tools/keytool/emptysubject.sh deleted file mode 100644 index 5e0a74c80e0..00000000000 --- a/test/jdk/sun/security/tools/keytool/emptysubject.sh +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (c) 2009, 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 6847026 -# @summary keytool should be able to generate certreq and cert without subject name -# -# @run shell emptysubject.sh -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KS=emptysubject.jks -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit -keystore $KS -keyalg rsa" - -rm $KS - -$KT -alias ca -dname CN=CA -genkeypair -$KT -alias me -dname CN=Me -genkeypair - -# When -dname is recognized, SAN must be specfied, otherwise, -printcert fails. -$KT -alias me -certreq -dname "" | \ - $KT -alias ca -gencert | $KT -printcert && exit 1 -$KT -alias me -certreq | \ - $KT -alias ca -gencert -dname "" | $KT -printcert && exit 2 -$KT -alias me -certreq -dname "" | \ - $KT -alias ca -gencert -ext san:c=email:me@me.com | \ - $KT -printcert || exit 3 -$KT -alias me -certreq | \ - $KT -alias ca -gencert -dname "" -ext san:c=email:me@me.com | \ - $KT -printcert || exit 4 - -exit 0 - diff --git a/test/jdk/sun/security/tools/keytool/file-in-help.sh b/test/jdk/sun/security/tools/keytool/file-in-help.sh deleted file mode 100644 index cb9378ad500..00000000000 --- a/test/jdk/sun/security/tools/keytool/file-in-help.sh +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# 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 6922482 -# @summary keytool's help on -file always shows 'output file' -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -TESTTOOLVMOPTS="$TESTTOOLVMOPTS -J-Duser.language=en -J-Duser.country=US" - -$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -printcertreq -help 2> h1 || exit 1 -$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -exportcert -help 2> h2 || exit 2 - -grep "input file" h1 || exit 3 -grep "output file" h2 || exit 4 - -exit 0 - diff --git a/test/jdk/sun/security/tools/keytool/i18n.html b/test/jdk/sun/security/tools/keytool/i18n.html index 86d125a5e52..ba32be83879 100644 --- a/test/jdk/sun/security/tools/keytool/i18n.html +++ b/test/jdk/sun/security/tools/keytool/i18n.html @@ -1,11 +1,7 @@ - - - -This is a multi-stage test. Click on "done" when you have completed -reading these instructions. For each instruction, make sure the output +This is a multi-stage test. For each instruction, make sure the output from keytool is correct (you can read everything in english fine).
      @@ -115,7 +111,5 @@ PKCS#11 tests If all the output (english) is correct, then the test passed. Otherwise, the test failed. -Press "Pass" if ... press "Fail" otherwise. - diff --git a/test/jdk/sun/security/tools/keytool/i18n.java b/test/jdk/sun/security/tools/keytool/i18n.java index dc43ab97fd6..15895cb47aa 100644 --- a/test/jdk/sun/security/tools/keytool/i18n.java +++ b/test/jdk/sun/security/tools/keytool/i18n.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 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 @@ -21,8 +21,19 @@ * questions. */ -// This trivial file is only necessary to display instructions and "pass/fail" -// buttons for a manual test. -public class i18n extends java.applet.Applet -{ +/* + * @test + * @bug 4348369 8076069 + * @summary keytool not i18n compliant + * @author charlie lai + * @run main/manual i18n + */ + +import java.nio.file.Path; + +public class i18n{ + public static void main(String[] args) throws Exception { + System.out.println("see i18n.html"); + System.out.println(Path.of(System.getProperty("test.jdk"), "bin", "keytool")); + } } diff --git a/test/jdk/sun/security/tools/keytool/i18n.sh b/test/jdk/sun/security/tools/keytool/i18n.sh deleted file mode 100644 index 72fb336bafe..00000000000 --- a/test/jdk/sun/security/tools/keytool/i18n.sh +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# 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 4348369 8076069 -# @summary keytool not i18n compliant -# @author charlie lai -# @run shell/manual i18n.sh - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - AIX | Darwin | Linux | SunOS ) - NULL=/dev/null - PS=":" - FS="/" - ;; - CYGWIN* ) - NULL=/dev/null - PS=";" - FS="/" - ;; - Windows* ) - NULL=NUL - PS=";" - FS="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac -KEYTOOL=${TESTJAVA}${FS}bin${FS}keytool - -# the test code - -# see i18n.html - -exit $? diff --git a/test/jdk/sun/security/tools/keytool/importreadall.sh b/test/jdk/sun/security/tools/keytool/importreadall.sh deleted file mode 100644 index ba1ea141264..00000000000 --- a/test/jdk/sun/security/tools/keytool/importreadall.sh +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (c) 2009, 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 6819272 -# @summary keytool -importcert should read the whole input -# -# @run shell importreadall.sh - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi - -if [ "${TESTJAVA}" = "" ] ; then - JAVA_CMD=`which java` - TESTJAVA=`dirname $JAVA_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KEYTOOL="${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -keystore importreadall.jks -storepass changeit -keypass changeit -keyalg rsa" - -# In case the test is run twice in the same directory - -$KEYTOOL -delete -alias a -$KEYTOOL -delete -alias ca -$KEYTOOL -genkeypair -alias a -dname CN=a || exit 1 -$KEYTOOL -genkeypair -alias ca -dname CN=ca || exit 2 -$KEYTOOL -certreq -alias a | $KEYTOOL -gencert -alias ca | $KEYTOOL -importcert -alias a - -exit $? diff --git a/test/jdk/sun/security/tools/keytool/keyalg.sh b/test/jdk/sun/security/tools/keytool/keyalg.sh deleted file mode 100644 index f4a284c2e17..00000000000 --- a/test/jdk/sun/security/tools/keytool/keyalg.sh +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# 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 8029659 -# @summary Keytool, print key algorithm of certificate or key entry -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -TESTTOOLVMOPTS="$TESTTOOLVMOPTS -J-Duser.language=en -J-Duser.country=US" - -KS=ks -KEYTOOL="$TESTJAVA/bin/keytool ${TESTTOOLVMOPTS} -keystore ks -storepass changeit -keypass changeit" - -rm $KS 2> /dev/null - -$KEYTOOL -genkeypair -alias ca -dname CN=CA -keyalg EC || exit 1 -$KEYTOOL -genkeypair -alias user -dname CN=User -keyalg RSA -keysize 1024 || exit 2 -$KEYTOOL -certreq -alias user | - $KEYTOOL -gencert -alias ca -rfc -sigalg SHA1withECDSA | - $KEYTOOL -printcert > user.dump || exit 3 - -cat user.dump | grep "Signature algorithm name:" | grep SHA1withECDSA || exit 4 -cat user.dump | grep "Subject Public Key Algorithm:" | grep RSA | grep 1024 || exit 5 - diff --git a/test/jdk/sun/security/tools/keytool/newhelp.sh b/test/jdk/sun/security/tools/keytool/newhelp.sh deleted file mode 100644 index 0228658c936..00000000000 --- a/test/jdk/sun/security/tools/keytool/newhelp.sh +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. -# 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 6324292 -# @summary keytool -help is unhelpful -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -TESTTOOLVMOPTS="$TESTTOOLVMOPTS -J-Duser.language=en -J-Duser.country=US" - -$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -help 2> h1 || exit 1 -$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -help -list 2> h2 || exit 2 - -grep Commands: h1 || exit 3 -grep Options: h2 || exit 4 - -exit 0 - diff --git a/test/jdk/sun/security/tools/keytool/resource.sh b/test/jdk/sun/security/tools/keytool/resource.sh deleted file mode 100644 index 9f3bb30d5cb..00000000000 --- a/test/jdk/sun/security/tools/keytool/resource.sh +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# 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 6239297 -# @summary keytool usage is broken after changing Resources.java -# @author Max Wang -# -# @run shell resource.sh - -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS | Linux | Darwin | AIX ) - NULL=/dev/null - FS="/" - ;; - CYGWIN* ) - NULL=/dev/null - FS="/" - ;; - Windows_* ) - NULL=NUL - FS="\\" - ;; - * ) - echo "Unrecognized operating system!" - exit 1; - ;; -esac - -# the test code -${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} > temp_file_40875602475 2> ${NULL} -grep MissingResourceException temp_file_40875602475 - -if [ $? -eq 0 ]; then - exit 1 -fi - -exit 0 diff --git a/test/jdk/sun/security/tools/keytool/selfissued.sh b/test/jdk/sun/security/tools/keytool/selfissued.sh deleted file mode 100644 index 6b22c3dfdcd..00000000000 --- a/test/jdk/sun/security/tools/keytool/selfissued.sh +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. -# 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 6825352 6937978 -# @summary support self-issued certificate in keytool and let -gencert generate the chain -# -# @run shell selfissued.sh -# - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -KS=selfsigned.ks -KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit -keypass changeit -keystore $KS -keyalg rsa" - -rm $KS - -$KT -alias ca -dname CN=CA -genkeypair -$KT -alias ca1 -dname CN=CA1 -genkeypair -$KT -alias ca2 -dname CN=CA2 -genkeypair -$KT -alias e1 -dname CN=E1 -genkeypair - -# ca signs ca1, ca1 signs ca2, all self-issued -$KT -alias ca1 -certreq | $KT -alias ca -gencert -ext san=dns:ca1 \ - | $KT -alias ca1 -importcert -$KT -alias ca2 -certreq | $KT -alias ca1 -gencert -ext san=dns:ca2 \ - | $KT -alias ca2 -importcert - -# Import e1 signed by ca2, should add ca2 and ca1, at least 3 certs in the chain -$KT -alias e1 -certreq | $KT -alias ca2 -gencert > e1.cert -$KT -alias ca1 -delete -$KT -alias ca2 -delete -cat e1.cert | $KT -alias e1 -importcert -$KT -alias e1 -list -v | grep '\[3\]' || { echo Bad E1; exit 1; } - -echo Good - diff --git a/test/jdk/sun/security/tools/keytool/trystore.sh b/test/jdk/sun/security/tools/keytool/trystore.sh deleted file mode 100644 index d23ddf3b8b4..00000000000 --- a/test/jdk/sun/security/tools/keytool/trystore.sh +++ /dev/null @@ -1,65 +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 7047200 -# @summary keytool can try save to a byte array before overwrite the file - -if [ "${TESTJAVA}" = "" ] ; then - JAVAC_CMD=`which javac` - TESTJAVA=`dirname $JAVAC_CMD`/.. -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - Windows_* ) - FS="\\" - ;; - * ) - FS="/" - ;; -esac - -rm trystore.jks 2> /dev/null - -KEYTOOL="${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storetype jks -keystore trystore.jks -keyalg rsa" -$KEYTOOL -genkeypair -alias a -dname CN=A -storepass changeit -keypass changeit -$KEYTOOL -genkeypair -alias b -dname CN=B -storepass changeit -keypass changeit - -# We use -protected for JKS keystore. This is illegal so the command should -# fail. Then we can check if the keystore is damaged. - -$KEYTOOL -genkeypair -protected -alias b -delete -debug - -if [ $? = 0 ]; then - echo "What? -protected works for JKS?" - exit 1 -fi - -$KEYTOOL -list -storepass changeit - -if [ $? != 0 ]; then - echo "Keystore file damaged" - exit 2 -fi diff --git a/test/jdk/tools/launcher/Settings.java b/test/jdk/tools/launcher/Settings.java index 0a7398f9b5c..57a1b1b96e0 100644 --- a/test/jdk/tools/launcher/Settings.java +++ b/test/jdk/tools/launcher/Settings.java @@ -68,6 +68,7 @@ public class Settings extends TestHelper { private static final String PROP_SETTINGS = "Property settings:"; private static final String LOCALE_SETTINGS = "Locale settings:"; private static final String SYSTEM_SETTINGS = "Operating System Metrics:"; + private static final String STACKSIZE_SETTINGS = "Stack Size:"; static void containsAllOptions(TestResult tr) { checkContains(tr, VM_SETTINGS); @@ -82,10 +83,22 @@ public class Settings extends TestHelper { int stackSize = 256; // in kb if (getArch().equals("ppc64") || getArch().equals("ppc64le")) { stackSize = 800; + } else if (getArch().equals("aarch64")) { + /* + * The max value of minimum stack size allowed for aarch64 can be estimated as + * such: suppose the vm page size is 64KB and the test runs with a debug build, + * the initial _java_thread_min_stack_allowed defined in os_linux_aarch64.cpp is + * 72K, stack guard zones could take 192KB, and the shadow zone needs 128KB, + * after aligning up all parts to the page size, the final size would be 448KB. + * See details in JDK-8163363 + */ + stackSize = 448; } TestResult tr; tr = doExec(javaCmd, "-Xms64m", "-Xmx512m", "-Xss" + stackSize + "k", "-XshowSettings", "-jar", testJar.getAbsolutePath()); + // Check the stack size logs printed by -XshowSettings to verify -Xss meaningfully. + checkContains(tr, STACKSIZE_SETTINGS); containsAllOptions(tr); if (!tr.isOK()) { System.out.println(tr); @@ -93,6 +106,7 @@ public class Settings extends TestHelper { } tr = doExec(javaCmd, "-Xms65536k", "-Xmx712m", "-Xss" + (stackSize * 1024), "-XshowSettings", "-jar", testJar.getAbsolutePath()); + checkContains(tr, STACKSIZE_SETTINGS); containsAllOptions(tr); if (!tr.isOK()) { System.out.println(tr); diff --git a/test/jdk/tools/launcher/TooSmallStackSize.java b/test/jdk/tools/launcher/TooSmallStackSize.java index 21f1cef203c..3ff813d3ab7 100644 --- a/test/jdk/tools/launcher/TooSmallStackSize.java +++ b/test/jdk/tools/launcher/TooSmallStackSize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 6762191 + * @bug 6762191 8222334 * @summary Setting stack size to 16K causes segmentation fault * @compile TooSmallStackSize.java * @run main TooSmallStackSize @@ -171,5 +171,11 @@ public class TooSmallStackSize extends TestHelper { * asserts added for 8176768 are not triggered. */ checkMinStackAllowed("513k"); + + /* + * Try with 0k which indicates that the default thread stack size either from JVM or system + * will be used, this should always succeed. + */ + checkMinStackAllowed("0k"); } } diff --git a/test/langtools/jdk/javadoc/doclet/testOptions/help.html b/test/langtools/jdk/javadoc/doclet/testOptions/help.html index f049b602df1..1d1f0f9ac5b 100644 --- a/test/langtools/jdk/javadoc/doclet/testOptions/help.html +++ b/test/langtools/jdk/javadoc/doclet/testOptions/help.html @@ -7,15 +7,15 @@ - + - - + + - - + + \n", - "\n", - "", + "\n", + "\n", + "", "var pathtoroot = \"./\";\n" + "var useModuleDirectories = " + moduleDirectoriesVar + ";\n" + "loadScripts(document, 'script');", @@ -585,32 +585,32 @@ public class TestSearch extends JavadocTester { void checkJqueryAndImageFiles(boolean expectedOutput) { checkFiles(expectedOutput, "search.js", - "jquery/jquery-3.3.1.js", - "jquery/jquery-migrate-3.0.1.js", - "jquery/jquery-ui.js", - "jquery/jquery-ui.css", - "jquery/jquery-ui.min.js", - "jquery/jquery-ui.min.css", - "jquery/jquery-ui.structure.min.css", - "jquery/jquery-ui.structure.css", - "jquery/external/jquery/jquery.js", - "jquery/jszip/dist/jszip.js", - "jquery/jszip/dist/jszip.min.js", - "jquery/jszip-utils/dist/jszip-utils.js", - "jquery/jszip-utils/dist/jszip-utils.min.js", - "jquery/jszip-utils/dist/jszip-utils-ie.js", - "jquery/jszip-utils/dist/jszip-utils-ie.min.js", - "jquery/images/ui-bg_glass_65_dadada_1x400.png", - "jquery/images/ui-icons_454545_256x240.png", - "jquery/images/ui-bg_glass_95_fef1ec_1x400.png", - "jquery/images/ui-bg_glass_75_dadada_1x400.png", - "jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png", - "jquery/images/ui-icons_888888_256x240.png", - "jquery/images/ui-icons_2e83ff_256x240.png", - "jquery/images/ui-icons_cd0a0a_256x240.png", - "jquery/images/ui-bg_glass_55_fbf9ee_1x400.png", - "jquery/images/ui-icons_222222_256x240.png", - "jquery/images/ui-bg_glass_75_e6e6e6_1x400.png", + "script-dir/jquery-3.3.1.js", + "script-dir/jquery-migrate-3.0.1.js", + "script-dir/jquery-ui.js", + "script-dir/jquery-ui.css", + "script-dir/jquery-ui.min.js", + "script-dir/jquery-ui.min.css", + "script-dir/jquery-ui.structure.min.css", + "script-dir/jquery-ui.structure.css", + "script-dir/external/jquery/jquery.js", + "script-dir/jszip/dist/jszip.js", + "script-dir/jszip/dist/jszip.min.js", + "script-dir/jszip-utils/dist/jszip-utils.js", + "script-dir/jszip-utils/dist/jszip-utils.min.js", + "script-dir/jszip-utils/dist/jszip-utils-ie.js", + "script-dir/jszip-utils/dist/jszip-utils-ie.min.js", + "script-dir/images/ui-bg_glass_65_dadada_1x400.png", + "script-dir/images/ui-icons_454545_256x240.png", + "script-dir/images/ui-bg_glass_95_fef1ec_1x400.png", + "script-dir/images/ui-bg_glass_75_dadada_1x400.png", + "script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png", + "script-dir/images/ui-icons_888888_256x240.png", + "script-dir/images/ui-icons_2e83ff_256x240.png", + "script-dir/images/ui-icons_cd0a0a_256x240.png", + "script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png", + "script-dir/images/ui-icons_222222_256x240.png", + "script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png", "resources/x.png", "resources/glass.png"); } diff --git a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java index c24bbd1890b..369344bb536 100644 --- a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java +++ b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java @@ -197,32 +197,32 @@ class APITest { "help-doc.html", "index-all.html", "index.html", - "jquery/jquery-3.3.1.js", - "jquery/jquery-migrate-3.0.1.js", - "jquery/jquery-ui.js", - "jquery/jquery-ui.css", - "jquery/jquery-ui.min.js", - "jquery/jquery-ui.min.css", - "jquery/jquery-ui.structure.min.css", - "jquery/jquery-ui.structure.css", - "jquery/external/jquery/jquery.js", - "jquery/jszip/dist/jszip.js", - "jquery/jszip/dist/jszip.min.js", - "jquery/jszip-utils/dist/jszip-utils.js", - "jquery/jszip-utils/dist/jszip-utils.min.js", - "jquery/jszip-utils/dist/jszip-utils-ie.js", - "jquery/jszip-utils/dist/jszip-utils-ie.min.js", - "jquery/images/ui-bg_glass_65_dadada_1x400.png", - "jquery/images/ui-icons_454545_256x240.png", - "jquery/images/ui-bg_glass_95_fef1ec_1x400.png", - "jquery/images/ui-bg_glass_75_dadada_1x400.png", - "jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png", - "jquery/images/ui-icons_888888_256x240.png", - "jquery/images/ui-icons_2e83ff_256x240.png", - "jquery/images/ui-icons_cd0a0a_256x240.png", - "jquery/images/ui-bg_glass_55_fbf9ee_1x400.png", - "jquery/images/ui-icons_222222_256x240.png", - "jquery/images/ui-bg_glass_75_e6e6e6_1x400.png", + "script-dir/jquery-3.3.1.js", + "script-dir/jquery-migrate-3.0.1.js", + "script-dir/jquery-ui.js", + "script-dir/jquery-ui.css", + "script-dir/jquery-ui.min.js", + "script-dir/jquery-ui.min.css", + "script-dir/jquery-ui.structure.min.css", + "script-dir/jquery-ui.structure.css", + "script-dir/external/jquery/jquery.js", + "script-dir/jszip/dist/jszip.js", + "script-dir/jszip/dist/jszip.min.js", + "script-dir/jszip-utils/dist/jszip-utils.js", + "script-dir/jszip-utils/dist/jszip-utils.min.js", + "script-dir/jszip-utils/dist/jszip-utils-ie.js", + "script-dir/jszip-utils/dist/jszip-utils-ie.min.js", + "script-dir/images/ui-bg_glass_65_dadada_1x400.png", + "script-dir/images/ui-icons_454545_256x240.png", + "script-dir/images/ui-bg_glass_95_fef1ec_1x400.png", + "script-dir/images/ui-bg_glass_75_dadada_1x400.png", + "script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png", + "script-dir/images/ui-icons_888888_256x240.png", + "script-dir/images/ui-icons_2e83ff_256x240.png", + "script-dir/images/ui-icons_cd0a0a_256x240.png", + "script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png", + "script-dir/images/ui-icons_222222_256x240.png", + "script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png", "member-search-index.js", "member-search-index.zip", "overview-tree.html", @@ -242,7 +242,7 @@ class APITest { )); protected static Set noIndexFiles = standardExpectFiles.stream() - .filter(s -> !s.startsWith("jquery") && !s.startsWith("resources") && !s.endsWith("zip") + .filter(s -> !s.startsWith("script-dir") && !s.startsWith("resources") && !s.endsWith("zip") && !s.equals("index-all.html") && !s.equals("search.js") && !s.endsWith("-search-index.js") && !s.equals("allclasses-index.html") && !s.equals("allpackages-index.html")) .collect(Collectors.toSet()); diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java index 456225f643b..5705219aded 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java @@ -59,7 +59,7 @@ public class AnnotatedExtendsTest { .classes(classPath.toString()) .run() .getOutput(Task.OutputKind.DIRECT); - if (!javapOut.contains("0: #21(): CLASS_EXTENDS, type_index=65535")) + if (!javapOut.contains("0: #22(): CLASS_EXTENDS, type_index=65535")) throw new AssertionError("Expected output missing: " + javapOut); } } \ No newline at end of file diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java index 5d154a4fcd3..0ec1a790d72 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java @@ -74,14 +74,14 @@ public class BridgeShouldHaveNoInteriorAnnotationsTest // Expected output can't be directly encoded into NestedLambdasCastedTest !!! static class OutputExpectedOnceHolder { public String[] outputs = { - "0: #61(): CAST, offset=1, type_index=0, location=[TYPE_ARGUMENT(0)]", - "1: #61(): LOCAL_VARIABLE, {start_pc=5, length=2, index=1}, location=[TYPE_ARGUMENT(0)]", + "0: #120(): CAST, offset=1, type_index=0, location=[TYPE_ARGUMENT(0)]", + "1: #120(): LOCAL_VARIABLE, {start_pc=5, length=2, index=1}, location=[TYPE_ARGUMENT(0)]", }; } static class OutputExpectedTwiceHolder { public String[] outputs = { - "0: #61(): METHOD_RETURN, location=[TYPE_ARGUMENT(0)]", + "0: #120(): METHOD_RETURN, location=[TYPE_ARGUMENT(0)]", }; } diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java index bf25b739fb1..94f7a6cb2c2 100644 --- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java +++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java @@ -53,10 +53,10 @@ public class NestedLambdasCastedTest { "private static strictfp void lambda$main$2();", "private static strictfp void lambda$main$1();", "private static strictfp void lambda$main$0();", - "0: #62(#63=s#64): CAST, offset=5, type_index=0", - "0: #62(#63=s#69): CAST, offset=5, type_index=0", - "0: #62(#63=s#72): CAST, offset=5, type_index=0", - "0: #62(#63=s#75): CAST, offset=5, type_index=0" + "0: #111(#112=s#113): CAST, offset=5, type_index=0", + "0: #111(#112=s#119): CAST, offset=5, type_index=0", + "0: #111(#112=s#122): CAST, offset=5, type_index=0", + "0: #111(#112=s#125): CAST, offset=5, type_index=0" }; } diff --git a/test/langtools/tools/javac/api/lazy/LoadParameterNamesLazily.java b/test/langtools/tools/javac/api/lazy/LoadParameterNamesLazily.java new file mode 100644 index 00000000000..b8173fa249b --- /dev/null +++ b/test/langtools/tools/javac/api/lazy/LoadParameterNamesLazily.java @@ -0,0 +1,138 @@ +/* + * 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 8217047 + * @summary Verify the parameter names can be injected using ParameterNameProvider. + * @library /tools/lib + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * @build toolbox.JavacTask toolbox.TestRunner toolbox.ToolBox + * @run main LoadParameterNamesLazily + */ + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.lang.model.util.ElementFilter; + +import com.sun.source.util.*; + +import toolbox.JavacTask; +import toolbox.Task; +import toolbox.TestRunner; +import toolbox.ToolBox; + +public class LoadParameterNamesLazily extends TestRunner { + + public static void main(String... args) throws Exception { + LoadParameterNamesLazily t = new LoadParameterNamesLazily(); + t.runTests(); + } + + private static final String libClass = + "package lib;" + + "/**Lib javadoc.*/" + + "public class Lib {" + + " /**Lib method javadoc.*/" + + " public static void m(int param, int other) {}" + + "}"; + private final ToolBox tb = new ToolBox(); + + LoadParameterNamesLazily() throws IOException { + super(System.err); + } + + @Test + public void testLoadTreesLazily() throws IOException { + Path libSrc = Paths.get("lib-src"); + tb.writeJavaFiles(libSrc, libClass); + Path libClasses = Paths.get("lib-classes"); + Files.createDirectories(libClasses); + + new JavacTask(tb) + .outdir(libClasses) + .options() + .files(tb.findJavaFiles(libSrc)) + .run(Task.Expect.SUCCESS) + .writeAll(); + + Path src = Paths.get("src"); + tb.writeJavaFiles(src, + "class Use {" + + " lib.Lib lib;" + + "}"); + Path classes = Paths.get("classes"); + Files.createDirectories(classes); + + new JavacTask(tb) + .outdir(classes) + .options("-classpath", libClasses.toString()) + .files(tb.findJavaFiles(src)) + .callback(task -> { + task.setParameterNameProvider(parameter -> { + ExecutableElement method = (ExecutableElement) parameter.getEnclosingElement(); + TypeElement clazz = + (TypeElement) method.getEnclosingElement(); + if (clazz.getQualifiedName().contentEquals("lib.Lib")) { + if (method.getParameters().indexOf(parameter) == 0) { + return "testName"; + } else { + return null; + } + } + return null; + }); + task.addTaskListener(new TaskListener() { + @Override + public void finished(TaskEvent e) { + if (e.getKind() == TaskEvent.Kind.ANALYZE) { + TypeElement lib = task.getElements().getTypeElement("lib.Lib"); + lib.getClass(); //not null + ExecutableElement method = + ElementFilter.methodsIn(lib.getEnclosedElements()).get(0); + Name paramName0 = method.getParameters().get(0).getSimpleName(); + if (!paramName0.contentEquals("testName")) { + throw new IllegalStateException("Unexpected parameter name: " + + paramName0); + } + Name paramName1 = method.getParameters().get(1).getSimpleName(); + if (!paramName1.contentEquals("arg1")) { + throw new IllegalStateException("Unexpected parameter name: " + + paramName1); + } + } + } + }); + }) + .run(Task.Expect.SUCCESS) + .writeAll(); + } + +} diff --git a/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java b/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java index 7b624c1b3c1..97985834c67 100644 --- a/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java +++ b/test/langtools/tools/javac/classreader/8171132/BadConstantValue.java @@ -134,6 +134,8 @@ public class BadConstantValue { "class Lib { static final int A = %s; static final %s B = %s; }", value, type, (type.equals("boolean") ? "false" : "0"))); compile("-d", classesdir.getPath(), lib.getPath()); + // Lib.class may possibly not get a newer timestamp. Make sure .java file won't get used. + lib.delete(); File libClass = new File(classesdir, "Lib.class"); // Rewrite the class to only have field B of type "type" and with "value" (potentially // out of range). @@ -147,6 +149,8 @@ public class BadConstantValue { "class Lib { static final String A = \"hello\"; static final %s CONST = %s; }", type, type.equals("boolean") ? "false" : "0")); compile("-d", classesdir.getPath(), lib.getPath()); + // Lib.class may possibly not get a newer timestamp. Make sure .java file won't get used. + lib.delete(); File libClass = new File(classesdir, "Lib.class"); swapConstantValues(libClass); diff --git a/test/langtools/tools/javac/classreader/8215407/BrokenEnclosingClass.java b/test/langtools/tools/javac/classreader/8215407/BrokenEnclosingClass.java new file mode 100644 index 00000000000..fe04e11eb09 --- /dev/null +++ b/test/langtools/tools/javac/classreader/8215407/BrokenEnclosingClass.java @@ -0,0 +1,53 @@ +/* + * 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 8215407 + * @summary Verify broken EnclosingMethod attribute does not break ClassReader. + * @library /tools/javac/lib + * @modules java.compiler + * @build JavacTestingAbstractProcessor + * @compile BrokenEnclosingClass.java UnrelatedClass.jcod Enclosing$1.jcod + * @compile -processor BrokenEnclosingClass BrokenEnclosingClass.java + */ + +import java.util.Set; + +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.element.TypeElement; + +public class BrokenEnclosingClass extends JavacTestingAbstractProcessor { + + @Override + public boolean process(Set annotations, RoundEnvironment roundEnv) { + if (processingEnv.getElementUtils().getTypeElement("UnrelatedClass") == null) { + throw new AssertionError("Cannot find UnrelatedClass."); + } + if (processingEnv.getElementUtils().getTypeElement("Enclosing$1") != null) { + throw new AssertionError("Enclosing$1 was found."); + } + return false; + } + +} diff --git a/test/langtools/tools/javac/classreader/8215407/Enclosing$1.jcod b/test/langtools/tools/javac/classreader/8215407/Enclosing$1.jcod new file mode 100644 index 00000000000..fc58f7d6a06 --- /dev/null +++ b/test/langtools/tools/javac/classreader/8215407/Enclosing$1.jcod @@ -0,0 +1,91 @@ +class Enclosing$1 { + 0xCAFEBABE; + 0; // minor version + 52; // version + [] { // Constant Pool + ; // first element is empty + Field #3 #16; // #1 + Method #4 #17; // #2 + class #18; // #3 + class #20; // #4 + Utf8 "this$0"; // #5 + Utf8 "LUnrelatedClass;"; // #6 + Utf8 ""; // #7 + Utf8 "(LUnrelatedClass;)V"; // #8 + Utf8 "Code"; // #9 + Utf8 "LineNumberTable"; // #10 + Utf8 "SourceFile"; // #11 + Utf8 "Enclosing.java"; // #12 + Utf8 "EnclosingMethod"; // #13 + class #21; // #14 + NameAndType #22 #23; // #15 + NameAndType #5 #6; // #16 + NameAndType #7 #23; // #17 + Utf8 "Enclosing$1"; // #18 + Utf8 "InnerClasses"; // #19 + Utf8 "java/lang/Object"; // #20 + Utf8 "UnrelatedClass"; // #21 + Utf8 "t"; // #22 + Utf8 "()V"; // #23 + } // Constant Pool + + 0x0020; // access + #3;// this_cpx + #4;// super_cpx + + [] { // Interfaces + } // Interfaces + + [] { // fields + { // Member + 0x1010; // access + #5; // name_cpx + #6; // sig_cpx + [] { // Attributes + } // Attributes + } // Member + } // fields + + [] { // methods + { // Member + 0x0000; // access + #7; // name_cpx + #8; // sig_cpx + [] { // Attributes + Attr(#9) { // Code + 2; // max_stack + 2; // max_locals + Bytes[]{ + 0x2A2BB500012AB700; + 0x02B1; + } + [] { // Traps + } // end Traps + [] { // Attributes + Attr(#10) { // LineNumberTable + [] { // LineNumberTable + 0 3; + } + } // end LineNumberTable + } // Attributes + } // end Code + } // Attributes + } // Member + } // methods + + [] { // Attributes + Attr(#11) { // SourceFile + #12; + } // end SourceFile + ; + Attr(#13) { // EnclosingMethod + #14; #15; + } // end EnclosingMethod + ; + Attr(#19) { // InnerClasses + [] { // InnerClasses + #3 #0 #0 0; + } + } // end InnerClasses + } // Attributes +} // end class Enclosing$1 diff --git a/test/langtools/tools/javac/classreader/8215407/UnrelatedClass.jcod b/test/langtools/tools/javac/classreader/8215407/UnrelatedClass.jcod new file mode 100644 index 00000000000..e480dbadce8 --- /dev/null +++ b/test/langtools/tools/javac/classreader/8215407/UnrelatedClass.jcod @@ -0,0 +1,101 @@ +class UnrelatedClass { + 0xCAFEBABE; + 0; // minor version + 52; // version + [] { // Constant Pool + ; // first element is empty + Method #5 #14; // #1 + class #15; // #2 + Method #2 #16; // #3 + class #17; // #4 + class #18; // #5 + Utf8 "InnerClasses"; // #6 + Utf8 ""; // #7 + Utf8 "()V"; // #8 + Utf8 "Code"; // #9 + Utf8 "LineNumberTable"; // #10 + Utf8 "t"; // #11 + Utf8 "SourceFile"; // #12 + Utf8 "Enclosing.java"; // #13 + NameAndType #7 #8; // #14 + Utf8 "Enclosing$1"; // #15 + NameAndType #7 #19; // #16 + Utf8 "UnrelatedClass"; // #17 + Utf8 "java/lang/Object"; // #18 + Utf8 "(LUnrelatedClass;)V"; // #19 + } // Constant Pool + + 0x0021; // access + #4;// this_cpx + #5;// super_cpx + + [] { // Interfaces + } // Interfaces + + [] { // fields + } // fields + + [] { // methods + { // Member + 0x0001; // access + #7; // name_cpx + #8; // sig_cpx + [] { // Attributes + Attr(#9) { // Code + 1; // max_stack + 1; // max_locals + Bytes[]{ + 0x2AB70001B1; + } + [] { // Traps + } // end Traps + [] { // Attributes + Attr(#10) { // LineNumberTable + [] { // LineNumberTable + 0 1; + } + } // end LineNumberTable + } // Attributes + } // end Code + } // Attributes + } // Member + ; + { // Member + 0x0001; // access + #11; // name_cpx + #8; // sig_cpx + [] { // Attributes + Attr(#9) { // Code + 3; // max_stack + 1; // max_locals + Bytes[]{ + 0xBB0002592AB70003; + 0x57B1; + } + [] { // Traps + } // end Traps + [] { // Attributes + Attr(#10) { // LineNumberTable + [] { // LineNumberTable + 0 3; + 9 4; + } + } // end LineNumberTable + } // Attributes + } // end Code + } // Attributes + } // Member + } // methods + + [] { // Attributes + Attr(#12) { // SourceFile + #13; + } // end SourceFile + ; + Attr(#6) { // InnerClasses + [] { // InnerClasses + #2 #0 #0 0; + } + } // end InnerClasses + } // Attributes +} // end class UnrelatedClass diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt index 443a39531cc..f4aa0be528f 100644 --- a/test/langtools/tools/javac/diags/examples.not-yet.txt +++ b/test/langtools/tools/javac/diags/examples.not-yet.txt @@ -46,6 +46,7 @@ compiler.err.unsupported.cross.fp.lit # Scanner: host system d compiler.misc.bad.class.signature # bad class file compiler.misc.bad.const.pool.tag # bad class file compiler.misc.bad.const.pool.tag.at # bad class file +compiler.misc.bad.const.pool.index # bad class file compiler.misc.bad.constant.range # bad class file compiler.misc.bad.constant.value # bad class file compiler.misc.bad.enclosing.class # bad class file diff --git a/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java b/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java index 27501dad4aa..a3d71d52420 100644 --- a/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java +++ b/test/langtools/tools/javac/lambda/TestBootstrapMethodsCount.java @@ -61,6 +61,7 @@ import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.code.Symbol.MethodSymbol; import com.sun.tools.javac.code.Symtab; import com.sun.tools.javac.code.Types; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant; import com.sun.tools.javac.tree.JCTree.JCMethodInvocation; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; import com.sun.tools.javac.tree.JCTree.JCIdent; @@ -190,7 +191,7 @@ public class TestBootstrapMethodsCount { Symbol oldSym = ident.sym; if (!oldSym.isConstructor()) { ident.sym = new Symbol.DynamicMethodSymbol(oldSym.name, - oldSym.owner, REF_invokeStatic, bsm, oldSym.type, new Object[0]); + oldSym.owner, bsm.asHandle(), oldSym.type, new LoadableConstant[0]); } return null; } diff --git a/test/langtools/tools/javac/lambda/TestInvokeDynamic.java b/test/langtools/tools/javac/lambda/TestInvokeDynamic.java index 68390076595..d8943686ca2 100644 --- a/test/langtools/tools/javac/lambda/TestInvokeDynamic.java +++ b/test/langtools/tools/javac/lambda/TestInvokeDynamic.java @@ -60,26 +60,23 @@ import com.sun.tools.classfile.Instruction; import com.sun.tools.classfile.LineNumberTable_attribute; import com.sun.tools.classfile.Method; -import com.sun.tools.javac.api.JavacTaskImpl; import com.sun.tools.javac.code.Symbol; -import com.sun.tools.javac.code.Symbol.MethodSymbol; +import com.sun.tools.javac.code.Symbol.MethodHandleSymbol; import com.sun.tools.javac.code.Symtab; +import com.sun.tools.javac.code.Type.ClassType; +import com.sun.tools.javac.code.Type.MethodType; import com.sun.tools.javac.code.Types; -import com.sun.tools.javac.jvm.Pool; +import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant; import com.sun.tools.javac.tree.JCTree.JCMethodInvocation; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; import com.sun.tools.javac.tree.JCTree.JCIdent; -import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.Names; import combo.ComboParameter; -import combo.ComboTask; import combo.ComboTestHelper; import combo.ComboInstance; import combo.ComboTask.Result; -import static com.sun.tools.javac.jvm.ClassFile.*; - public class TestInvokeDynamic extends ComboInstance { enum StaticArgumentKind implements ComboParameter { @@ -168,21 +165,24 @@ public class TestInvokeDynamic extends ComboInstance { abstract boolean check(CPInfo cpInfo) throws Exception; - Object getValue(Symtab syms, Names names, Types types) { + LoadableConstant getValue(Symtab syms) { switch (this) { case STRING: + return LoadableConstant.String((String)value); case INTEGER: + return LoadableConstant.Int((Integer)value); case LONG: + return LoadableConstant.Long((Long)value); case FLOAT: + return LoadableConstant.Float((Float)value); case DOUBLE: - return value; + return LoadableConstant.Double((Double)value); case CLASS: - return syms.stringType.tsym; + return (ClassType)syms.stringType; case METHOD_HANDLE: - return new Pool.MethodHandle(REF_invokeVirtual, - syms.arrayCloneMethod, types); + return syms.arrayCloneMethod.asHandle(); case METHOD_TYPE: - return syms.arrayCloneMethod.type; + return ((MethodType)syms.arrayCloneMethod.type); default: throw new AssertionError(); } @@ -394,7 +394,7 @@ public class TestInvokeDynamic extends ComboInstance { class Indifier extends TreeScanner implements TaskListener { - MethodSymbol bsm; + MethodHandleSymbol bsm; Symtab syms; Names names; Types types; @@ -424,12 +424,12 @@ public class TestInvokeDynamic extends ComboInstance { JCIdent ident = (JCIdent)apply.meth; Symbol oldSym = ident.sym; if (!oldSym.isConstructor()) { - Object[] staticArgs = new Object[arity.arity]; + LoadableConstant[] staticArgs = new LoadableConstant[arity.arity]; for (int i = 0; i < arity.arity ; i++) { - staticArgs[i] = saks[i].getValue(syms, names, types); + staticArgs[i] = saks[i].getValue(syms); } ident.sym = new Symbol.DynamicMethodSymbol(oldSym.name, - oldSym.owner, REF_invokeStatic, bsm, oldSym.type, staticArgs); + oldSym.owner, bsm, oldSym.type, staticArgs); } return null; } @@ -438,7 +438,7 @@ public class TestInvokeDynamic extends ComboInstance { public Void visitMethod(MethodTree node, Void p) { super.visitMethod(node, p); if (node.getName().toString().equals("bsm")) { - bsm = ((JCMethodDecl)node).sym; + bsm = ((JCMethodDecl)node).sym.asHandle(); } return null; } diff --git a/test/langtools/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out b/test/langtools/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out index d5ce62bc1bc..ff725b7e3e4 100644 --- a/test/langtools/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out +++ b/test/langtools/tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.out @@ -1,2 +1,2 @@ -- compiler.err.cant.access: .module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.module.name.mismatch: mod/module-info, )) +- compiler.err.cant.access: .module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.bad.const.pool.index: module-info.class, 15, 10)) 1 error diff --git a/test/langtools/tools/javac/nestmates/CheckNestmateAttrs.java b/test/langtools/tools/javac/nestmates/CheckNestmateAttrs.java index 786ffe287f3..a56d294f9b4 100644 --- a/test/langtools/tools/javac/nestmates/CheckNestmateAttrs.java +++ b/test/langtools/tools/javac/nestmates/CheckNestmateAttrs.java @@ -90,8 +90,8 @@ public class CheckNestmateAttrs { "NestHost: class CheckNestmateAttrs", "0: aload_0", "1: getfield #1 // Field this$1:LCheckNestmateAttrs$Inner;", - "4: getfield #3 // Field CheckNestmateAttrs$Inner.this$0:LCheckNestmateAttrs;", - "7: invokevirtual #4 // Method CheckNestmateAttrs.test:()V", + "4: getfield #13 // Field CheckNestmateAttrs$Inner.this$0:LCheckNestmateAttrs;", + "7: invokevirtual #19 // Method CheckNestmateAttrs.test:()V", "10: return" }); diff --git a/test/langtools/tools/javac/processing/environment/TestPreviewEnabled.java b/test/langtools/tools/javac/processing/environment/TestPreviewEnabled.java new file mode 100644 index 00000000000..82aebbd8a52 --- /dev/null +++ b/test/langtools/tools/javac/processing/environment/TestPreviewEnabled.java @@ -0,0 +1,81 @@ +/* + * 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 + * 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 8222378 + * @summary Test that ProcessingEnvironment.isPreviewEnabled works properly + * @library /tools/javac/lib + * @modules java.compiler + * @build JavacTestingAbstractProcessor + * @compile TestPreviewEnabled.java + * @compile -processor TestPreviewEnabled -proc:only -source ${jdk.version} -AExpectedPreview=false TestSourceVersion.java + * @compile -processor TestPreviewEnabled -proc:only -source ${jdk.version} -AExpectedPreview=true --enable-preview TestSourceVersion.java + */ + +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.TypeElement; +import javax.annotation.processing.*; +import javax.lang.model.util.*; + +/** + * This processor checks that ProcessingEnvironment.isPreviewEnabled + * is consistent with the compiler options. + */ +@SupportedOptions("ExpectedPreview") +public class TestPreviewEnabled extends JavacTestingAbstractProcessor { + public boolean process(Set annotations, + RoundEnvironment roundEnvironment) { + if (!roundEnvironment.processingOver()) { + boolean expectedPreview = + Boolean.valueOf(processingEnv.getOptions().get("ExpectedPreview")); + boolean actualPreview = processingEnv.isPreviewEnabled(); + System.out.println("Expected PreviewEnabled: " + expectedPreview + + "\n actual PreviewEnabled: " + actualPreview); + if (expectedPreview != actualPreview) + throw new RuntimeException(); + + if (expectedPreview) { + // Create a ProcessingEnvironment that uses the + // default implemention of isPreviewEnabled. + ProcessingEnvironment testEnv = new ProcessingEnvironment() { + @Override public Elements getElementUtils() {return null;} + @Override public Filer getFiler() {return null;} + @Override public Locale getLocale() {return null;} + @Override public Messager getMessager() {return null;} + @Override public Map getOptions() {return null;} + @Override public SourceVersion getSourceVersion() {return null;} + @Override public Types getTypeUtils() {return null;} + }; + if (testEnv.isPreviewEnabled()) { + throw new RuntimeException("Bad true return value from default " + + "ProcessingEnvironment.isPreviewEnabled."); + } + } + } + return true; + } +} diff --git a/test/langtools/tools/javac/processing/model/element/TestElementKindPredicates.java b/test/langtools/tools/javac/processing/model/element/TestElementKindPredicates.java new file mode 100644 index 00000000000..479124812e3 --- /dev/null +++ b/test/langtools/tools/javac/processing/model/element/TestElementKindPredicates.java @@ -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 8222430 + * @summary Test various predicates of ElementKind. + */ + +import java.util.Set; +import java.util.function.Predicate; +import javax.lang.model.element.ElementKind; + +/** + * Test the isClass, isField, and isInterface predicates of ElementKind. + */ +public class TestElementKindPredicates { + public static void main(String... args) { + Set ALL_KINDS = Set.of(ElementKind.values()); + + // isClass: Returns true if this is a kind of class: either CLASS or ENUM. + test(ALL_KINDS, + (ElementKind k) -> Set.of(ElementKind.CLASS, + ElementKind.ENUM).contains(k), + (ElementKind k) -> k.isClass(), "isClass"); + + // isField: Returns true if this is a kind of field: either FIELD or ENUM_CONSTANT. + test(ALL_KINDS, + (ElementKind k) -> Set.of(ElementKind.FIELD, + ElementKind.ENUM_CONSTANT).contains(k), + (ElementKind k) -> k.isField(), "isField"); + + // isInterface: Returns true if this is a kind of interface: either INTERFACE or ANNOTATION_TYPE. + test(ALL_KINDS, + (ElementKind k) -> Set.of(ElementKind.INTERFACE, + ElementKind.ANNOTATION_TYPE).contains(k), + (ElementKind k) -> k.isInterface(), "isInterface"); + } + + private static void test(Set kinds, + Predicate expectedPred, + Predicate actualPred, + String errorMessage) { + for(ElementKind kind : kinds) { + boolean expected = expectedPred.test(kind); + boolean actual = actualPred.test(kind); + + if (expected != actual) { + throw new RuntimeException("Error testing ElementKind." + errorMessage + "(" + kind + + "):\texpected " + expected + "\tgot " + actual); + } + } + } +} diff --git a/test/langtools/tools/javap/AnnoTest.java b/test/langtools/tools/javap/AnnoTest.java index 4ed952122ce..7d78d163e29 100644 --- a/test/langtools/tools/javap/AnnoTest.java +++ b/test/langtools/tools/javap/AnnoTest.java @@ -49,50 +49,50 @@ public class AnnoTest { expect(out, "RuntimeVisibleAnnotations:\n" + - " 0: #18(#19=B#20)\n" + + " 0: #21(#22=B#23)\n" + " AnnoTest$ByteAnno(\n" + " value=(byte) 42\n" + " )\n" + - " 1: #23(#19=S#24)\n" + + " 1: #24(#22=S#25)\n" + " AnnoTest$ShortAnno(\n" + " value=(short) 3\n" + " )"); expect(out, "RuntimeInvisibleAnnotations:\n" + - " 0: #28(#19=[J#29,J#31,J#33,J#35,J#37])\n" + + " 0: #27(#22=[J#28,J#30,J#32,J#34,J#36])\n" + " AnnoTest$ArrayAnno(\n" + " value=[1l,2l,3l,4l,5l]\n" + " )\n" + - " 1: #41(#19=Z#42)\n" + + " 1: #38(#22=Z#39)\n" + " AnnoTest$BooleanAnno(\n" + " value=false\n" + " )\n" + - " 2: #45(#46=c#47)\n" + + " 2: #40(#41=c#42)\n" + " AnnoTest$ClassAnno(\n" + " type=class Ljava/lang/Object;\n" + " )\n" + - " 3: #50(#51=e#52.#53)\n" + + " 3: #43(#44=e#45.#46)\n" + " AnnoTest$EnumAnno(\n" + " kind=Ljavax/lang/model/element/ElementKind;.PACKAGE\n" + " )\n" + - " 4: #56(#19=I#57)\n" + + " 4: #47(#22=I#48)\n" + " AnnoTest$IntAnno(\n" + " value=2\n" + " )\n" + - " 5: #60()\n" + + " 5: #49()\n" + " AnnoTest$IntDefaultAnno\n" + - " 6: #63(#64=s#65)\n" + + " 6: #50(#51=s#52)\n" + " AnnoTest$NameAnno(\n" + " name=\"NAME\"\n" + " )\n" + - " 7: #68(#69=D#70,#72=F#73)\n" + + " 7: #53(#54=D#55,#57=F#58)\n" + " AnnoTest$MultiAnno(\n" + " d=3.14159d\n" + " f=2.71828f\n" + " )\n" + - " 8: #76()\n" + + " 8: #59()\n" + " AnnoTest$SimpleAnno\n" + - " 9: #79(#19=@#56(#19=I#80))\n" + + " 9: #60(#22=@#47(#22=I#61))\n" + " AnnoTest$AnnoAnno(\n" + " value=@AnnoTest$IntAnno(\n" + " value=5\n" + @@ -100,7 +100,7 @@ public class AnnoTest { " )"); expect(out, "RuntimeInvisibleTypeAnnotations:\n" + - " 0: #84(): CLASS_EXTENDS, type_index=0\n" + + " 0: #63(): CLASS_EXTENDS, type_index=0\n" + " AnnoTest$TypeAnno"); if (errors > 0) diff --git a/test/langtools/tools/javap/typeAnnotations/AnnotationDefaultNewlineTest.java b/test/langtools/tools/javap/typeAnnotations/AnnotationDefaultNewlineTest.java index 68fccab87ad..c7cecec12b4 100644 --- a/test/langtools/tools/javap/typeAnnotations/AnnotationDefaultNewlineTest.java +++ b/test/langtools/tools/javap/typeAnnotations/AnnotationDefaultNewlineTest.java @@ -51,7 +51,7 @@ public class AnnotationDefaultNewlineTest { private static final String ExpectedSubstring = " AnnotationDefault:\n" + - " default_value: I#7\n"; + " default_value: I#9\n"; public static void main(String[] args) throws Exception { ToolBox tb = new ToolBox(); diff --git a/test/langtools/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java b/test/langtools/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java index 284144cca53..06ecf1dc02d 100644 --- a/test/langtools/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java +++ b/test/langtools/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java @@ -62,11 +62,11 @@ public class InvisibleParameterAnnotationsTest { " RuntimeVisibleParameterAnnotations:\n" + " parameter 0:\n" + " parameter 1:\n" + - " 0: #16()\n" + + " 0: #14()\n" + " Sample$VisAnno\n" + " RuntimeInvisibleParameterAnnotations:\n" + " parameter 0:\n" + - " 0: #18()\n" + + " 0: #16()\n" + " Sample$InvisAnno\n" + " parameter 1:"; diff --git a/test/lib/jdk/test/lib/SecurityTools.java b/test/lib/jdk/test/lib/SecurityTools.java index 23e055b77e5..30da87f2d32 100644 --- a/test/lib/jdk/test/lib/SecurityTools.java +++ b/test/lib/jdk/test/lib/SecurityTools.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -52,7 +53,7 @@ public class SecurityTools { private SecurityTools() {} - private static ProcessBuilder getProcessBuilder(String tool, List args) { + public static ProcessBuilder getProcessBuilder(String tool, List args) { JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(tool) .addVMArg("-Duser.language=en") .addVMArg("-Duser.country=US"); @@ -62,6 +63,9 @@ public class SecurityTools { for (String arg : args) { if (arg.startsWith("-J")) { launcher.addVMArg(arg.substring(2)); + } else if (Platform.isWindows() && arg.isEmpty()) { + // JDK-6518827: special handling for empty argument on Windows + launcher.addToolArg("\"\""); } else { launcher.addToolArg(arg); } @@ -97,14 +101,13 @@ public class SecurityTools { /** * Runs keytool. * - * @param args arguments to keytool in a single string. Only call this if - * there is no white space inside an argument. This string will - * be split with {@code \s+}. + * @param args arguments to keytool in a single string. The string is + * converted to be List with makeList. * @return an {@link OutputAnalyzer} object * @throws Exception if there is an error */ public static OutputAnalyzer keytool(String args) throws Exception { - return keytool(args.split("\\s+")); + return keytool(makeList(args)); } /** @@ -174,15 +177,14 @@ public class SecurityTools { /** * Runs jarsigner. * - * @param args arguments to jarsigner in a single string. Only call this if - * there is no white space inside an argument. This string will - * be split with {@code \s+}. + * @param args arguments to jarsigner in a single string. The string is + * converted to be List with makeList. * @return an {@link OutputAnalyzer} object * @throws Exception if there is an error */ public static OutputAnalyzer jarsigner(String args) throws Exception { - return jarsigner(args.split("\\s+")); + return jarsigner(makeList(args)); } /** @@ -199,29 +201,79 @@ public class SecurityTools { /** * Runs ktab. * - * @param args arguments to ktab in a single string. Only call this if - * there is no white space inside an argument. This string will - * be split with {@code \s+}. + * @param args arguments to ktab in a single string. The string is + * converted to be List with makeList. * @return an {@link OutputAnalyzer} object * @throws Exception if there is an error */ public static OutputAnalyzer ktab(String args) throws Exception { - return execute(getProcessBuilder( - "ktab", List.of(args.trim().split("\\s+")))); + return execute(getProcessBuilder("ktab", makeList(args))); } /** * Runs klist. * - * @param args arguments to klist in a single string. Only call this if - * there is no white space inside an argument. This string will - * be split with {@code \s+}. + * @param args arguments to klist in a single string. The string is + * converted to be List with makeList. * @return an {@link OutputAnalyzer} object * @throws Exception if there is an error */ public static OutputAnalyzer klist(String args) throws Exception { - return execute(getProcessBuilder( - "klist", List.of(args.trim().split("\\s+")))); + return execute(getProcessBuilder("klist", makeList(args))); + } + + /** + * Runs jar. + * + * @param args arguments to jar in a single string. The string is + * converted to be List with makeList. + * @return an {@link OutputAnalyzer} object + * @throws Exception if there is an error + */ + public static OutputAnalyzer jar(String args) throws Exception { + return execute(getProcessBuilder("jar", makeList(args))); + } + + /** + * Split a line to a list of string. All whitespaces are treated as + * delimiters unless quoted between ` and `. + * + * @param line the input + * @return the list + */ + public static List makeList(String line) { + List result = new ArrayList<>(); + StringBuilder sb = new StringBuilder(); + boolean inBackTick = false; + for (char c : line.toCharArray()) { + if (inBackTick) { + if (c == '`') { + result.add(sb.toString()); + sb.setLength(0); + inBackTick = false; + } else { + sb.append(c); + } + } else { + if (sb.length() == 0 && c == '`') { + // Allow ` inside a string + inBackTick = true; + } else { + if (Character.isWhitespace(c)) { + if (sb.length() != 0) { + result.add(sb.toString()); + sb.setLength(0); + } + } else { + sb.append(c); + } + } + } + } + if (sb.length() != 0) { + result.add(sb.toString()); + } + return result; } } diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java index 2bcf9468867..2f5344ef727 100644 --- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java +++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java @@ -169,11 +169,17 @@ public class DockerTestUtils { generateDockerFile(buildDir.resolve("Dockerfile"), DockerfileConfig.getBaseImageName(), DockerfileConfig.getBaseImageVersion()); - - // Build the docker - execute(DOCKER_COMMAND, "build", "--no-cache", "--tag", imageName, buildDir.toString()) - .shouldHaveExitValue(0) - .shouldContain("Successfully built"); + try { + // Build the docker + execute(DOCKER_COMMAND, "build", "--no-cache", "--tag", imageName, buildDir.toString()) + .shouldHaveExitValue(0) + .shouldContain("Successfully built"); + } catch (Exception e) { + // If docker image building fails there is a good chance it happens due to environment and/or + // configuration other than product failure. Throw jtreg skipped exception in such case + // instead of failing the test. + throw new SkippedException("Building docker image failed. Details: \n" + e.getMessage()); + } } diff --git a/test/lib/jdk/test/lib/process/OutputAnalyzer.java b/test/lib/jdk/test/lib/process/OutputAnalyzer.java index 53fd28ace6f..f758a0cdcf4 100644 --- a/test/lib/jdk/test/lib/process/OutputAnalyzer.java +++ b/test/lib/jdk/test/lib/process/OutputAnalyzer.java @@ -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 @@ -27,6 +27,8 @@ import jdk.test.lib.Asserts; import java.io.IOException; import java.io.PrintStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -56,6 +58,15 @@ public final class OutputAnalyzer { buffer = OutputBuffer.of(buf, buf); } + /** + * Create an OutputAnalyzer, a utility class for verifying output + * + * @param file File to analyze + */ + public OutputAnalyzer(Path file) throws IOException { + this(Files.readString(file)); + } + /** * Create an OutputAnalyzer, a utility class for verifying output * diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java index 1bf5759d81f..91076484934 100644 --- a/test/lib/sun/hotspot/WhiteBox.java +++ b/test/lib/sun/hotspot/WhiteBox.java @@ -541,7 +541,7 @@ public class WhiteBox { public native void disableElfSectionCache(); // Resolved Method Table - public native int resolvedMethodRemovedCount(); + public native long resolvedMethodItemsCount(); // Protection Domain Table public native int protectionDomainRemovedCount(); diff --git a/test/lib/sun/hotspot/gc/GC.java b/test/lib/sun/hotspot/gc/GC.java index 552c7fa9cc2..a1a0ab59335 100644 --- a/test/lib/sun/hotspot/gc/GC.java +++ b/test/lib/sun/hotspot/gc/GC.java @@ -70,4 +70,16 @@ public enum GC { public static boolean isSelectedErgonomically() { return WB.isGCSelectedErgonomically(); } + + /** + * @return the selected GC. + */ + public static GC selected() { + for (GC gc : values()) { + if (gc.isSelected()) { + return gc; + } + } + throw new IllegalStateException("No selected GC found"); + } } diff --git a/test/micro/org/openjdk/bench/java/lang/StringConcat.java b/test/micro/org/openjdk/bench/java/lang/StringConcat.java index c199dcb8c71..8db1aaa4f51 100644 --- a/test/micro/org/openjdk/bench/java/lang/StringConcat.java +++ b/test/micro/org/openjdk/bench/java/lang/StringConcat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -62,6 +62,11 @@ public class StringConcat { return "string" + stringValue; } + @Benchmark + public String concatMethodConstString() { + return "string".concat(stringValue); + } + @Benchmark public String concatConstIntConstInt() { return "string" + intValue + "string" + intValue;