--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/CompileCommands.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+# When FIXPATH is set, let it process the file to make sure all paths are usable
+# by system native tools. The FIXPATH tool assumes arguments preceeded by an @
+# character points to a text file containing further arguments (similar to a
+# linker). It replaces any such arguments with a different temporary filename,
+# whose contents has been processed to make any paths native. To obtain a
+# properly processed compile_commands.json, FIXPATH is then made to invoke an
+# AWK script with the unprocessed json file as the only argument, prepended with
+# an @ character. The AWK script simply copies the contents of this processed
+# file.
+#
+# The sed command encloses the fragments inside brackets and removes the final
+# trailing comma.
+$(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-commands/*.json)
+ $(call LogWarn, Updating compile_commands.json)
+ $(RM) $@
+ $(FIND) $(MAKESUPPORT_OUTPUTDIR)/compile-commands/ -name \*.json | \
+ $(SORT) | $(XARGS) $(CAT) >> $@.tmp
+ $(if $(FIXPATH),$(FIXPATH) $(AWK) 'BEGIN { \
+ tmpfile = substr(ARGV[2],2); \
+ cmd = "$(CP) " "\047" tmpfile "\047" " $@.tmp"; \
+ system(cmd); \
+ }' -- @$@.tmp)
+ $(SED) -e '1s/^/[\$(NEWLINE)/' -e '$(DOLLAR)s/,\s\{0,\}$(DOLLAR)/\$(NEWLINE)]/' $@.tmp > $@
+ $(RM) $@.tmp
+
+TARGETS += $(OUTPUTDIR)/compile_commands.json
+
+all: $(TARGETS)
+
+.PHONY: all
--- a/make/Main.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/Main.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -263,6 +263,31 @@
$(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-ide-project
################################################################################
+# Generate libs and launcher targets for creating compile_commands.json fragments
+define DeclareCompileCommandsRecipe
+ $1-compile-commands:
+ $$(call LogInfo, Generating compile_commands.json fragments for $1)
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk $1-only \
+ GENERATE_COMPILE_COMMANDS_ONLY=true)
+
+ COMPILE_COMMANDS_TARGETS_$2 += $1-compile-commands
+endef
+
+$(foreach t, $(HOTSPOT_VARIANT_LIBS_TARGETS), \
+ $(eval $(call DeclareCompileCommandsRecipe,$t,HOTSPOT)) \
+)
+
+$(foreach t, $(LIBS_TARGETS) $(LAUNCHER_TARGETS), \
+ $(eval $(call DeclareCompileCommandsRecipe,$t,JDK)) \
+)
+
+compile-commands compile-commands-hotspot:
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileCommands.gmk)
+
+ALL_TARGETS += $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK)
+ALL_TARGETS += compile-commands compile-commands-hotspot
+
+################################################################################
# Build demos targets
demos-jdk:
@@ -562,8 +587,12 @@
test-make:
($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
+test-compile-commands:
+ ($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk test-compile-commands)
+
ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
- test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make
+ test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make \
+ test-compile-commands
################################################################################
# Bundles
@@ -738,6 +767,20 @@
$(foreach m, $(ALL_MODULES), $(eval $m-jmod: $($(m)_JMOD_DEPS)))
$(foreach m, $(INTERIM_IMAGE_MODULES), $(eval $m-interim-jmod: $($(m)_JMOD_DEPS)))
+ # Setup the minimal set of generated native source dependencies for hotspot
+ $(foreach v, $(JVM_VARIANTS), \
+ $(eval hotspot-$v-libs-compile-commands: hotspot-$v-gensrc) \
+ $(foreach m, $(filter java.desktop jdk.hotspot.agent, $(GENSRC_MODULES)), \
+ $(eval hotspot-$v-libs-compile-commands: $m-gensrc)) \
+ )
+
+ # For the full JDK compile commands, create all possible generated sources
+ $(foreach m, $(GENSRC_MODULES), $(eval $m-libs-compile-commands: $m-gensrc))
+ $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs-compile-commands: $m-java))
+
+ compile-commands-hotspot: $(COMPILE_COMMANDS_TARGETS_HOTSPOT)
+ compile-commands: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK)
+
# Jmods cannot be created until we have the jmod tool ready to run. During
# a normal build we run it from the exploded image, but when cross compiling
# it's run from the buildjdk, which is either created at build time or user
@@ -854,6 +897,8 @@
test-make: clean-test-make
+ test-compile-commands: compile-commands
+
build-test-lib: exploded-image-optimize
build-test-failure-handler: interim-langtools
@@ -1080,7 +1125,7 @@
# Remove everything, except the output from configure.
clean: $(CLEAN_DIR_TARGETS)
- ($(CD) $(OUTPUTDIR) && $(RM) -r build*.log*)
+ ($(CD) $(OUTPUTDIR) && $(RM) -r build*.log* compile_commands.json)
$(ECHO) Cleaned all build artifacts.
clean-docs:
--- a/make/ModuleWrapper.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/ModuleWrapper.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -100,5 +100,9 @@
$(TARGETS)), \
))
-all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
- $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB)
+ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
+ all: $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS))
+else
+ all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
+ $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB)
+endif
--- a/make/common/JavaCompilation.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/common/JavaCompilation.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -76,8 +76,8 @@
$1_COPY_$$($2_TARGET) := 1
# Now we can setup the dependency that will trigger the copying.
$$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2
- $(MKDIR) -p $$(@D)
- $(CP) $$< $$@
+ $$(call LogInfo, Copying $$(patsubst $(OUTPUTDIR)/%,%, $$@))
+ $$(install-file)
$(CHMOD) -f ug+w $$@
# And do not forget this target
@@ -120,7 +120,8 @@
ifneq ($$($1_CLEAN_$$($2_TARGET)), 1)
$1_CLEAN_$$($2_TARGET) := 1
$$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2
- $(MKDIR) -p $$(@D)
+ $$(call LogInfo, Cleaning $$(patsubst $(OUTPUTDIR)/%,%, $$@))
+ $$(call MakeTargetDir)
export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \
| $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
-e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ ]*#.*/#/g' \
--- a/make/common/JdkNativeCompilation.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/common/JdkNativeCompilation.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -47,6 +47,29 @@
$(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \
$(TOPDIR)/src/$(strip $1)/share/native/$(strip $2)))
+# Find a library
+# Param 1 - module name
+# Param 2 - library name
+# Param 3 - optional subdir for library
+FindLib = \
+ $(call FindLibDirForModule, \
+ $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX)
+
+# Find a static library
+# Param 1 - module name
+# Param 2 - library name
+# Param 3 - optional subdir for library
+FindStaticLib = \
+ $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
+ $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX))
+
+# If only generating compile_commands.json, make these return empty to avoid
+# declaring dependencies.
+ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
+ FindLib =
+ FindStaticLib =
+endif
+
GetJavaHeaderDir = \
$(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))
--- a/make/common/NativeCompilation.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/common/NativeCompilation.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -60,6 +60,29 @@
endef
################################################################################
+# Creates a recipe that creates a compile_commands.json fragment. Remove any
+# occurences of FIXPATH programs from the command to show the actual invocation.
+#
+# Param 1: Name of file to create
+# Param 2: Working directory
+# Param 3: Source file
+# Param 4: Compile command
+# Param 5: Object name
+################################################################################
+define WriteCompileCommandsFragment
+ $(call LogInfo, Creating compile commands fragment for $(notdir $3))
+ $(call MakeDir, $(dir $1))
+ $(call WriteFile,{ \
+ "directory": "$(strip $2)"$(COMMA) \
+ "file": "$(strip $3)"$(COMMA) \
+ "command": "$(strip $(subst $(DQUOTE),\$(DQUOTE),$(subst \,\\,\
+ $(subst $(FIXPATH),,$4))))"$(COMMA) \
+ "output": "$(strip $5)" \
+ }$(COMMA), \
+ $1)
+endef
+
+################################################################################
# Define a native toolchain configuration that can be used by
# SetupNativeCompilation calls
#
@@ -203,6 +226,11 @@
$1_OBJ := $$($$($1_BASE)_OBJECT_DIR)/$$(call replace_with_obj_extension, \
$$($1_FILENAME))
+ # Generate the corresponding compile_commands.json fragment.
+ $1_OBJ_JSON = $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$(subst /,_,$$(subst \
+ $$(OUTPUTDIR)/,,$$($1_OBJ))).json
+ $$($1_BASE)_ALL_OBJS_JSON += $$($1_OBJ_JSON)
+
# Only continue if this object file hasn't been processed already. This lets
# the first found source file override any other with the same name.
ifeq ($$(findstring $$($1_OBJ), $$($$($1_BASE)_OBJS_SO_FAR)), )
@@ -297,8 +325,15 @@
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_OBJ).vardeps)
endif
- $$($1_OBJ): $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
- $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE) | $$($$($1_BASE)_BUILD_INFO)
+ $1_OBJ_DEPS := $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
+ $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE)
+ $1_COMPILE_OPTIONS := $$($1_FLAGS) $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)
+
+ $$($1_OBJ_JSON): $$($1_OBJ_DEPS)
+ $$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$($1_SRC_FILE), \
+ $$($1_COMPILER) $$($1_COMPILE_OPTIONS), $$($1_OBJ))
+
+ $$($1_OBJ): $$($1_OBJ_DEPS) | $$($$($1_BASE)_BUILD_INFO)
$$(call LogInfo, Compiling $$($1_FILENAME) (for $$($$($1_BASE)_BASENAME)))
$$(call MakeDir, $$(@D))
ifneq ($(TOOLCHAIN_TYPE), microsoft)
@@ -307,13 +342,11 @@
# object file in the generated deps files. Fixing it with sed. If
# compiling assembly, don't try this.
$$(call ExecuteWithLog, $$@, \
- $$($1_COMPILER) $$($1_FLAGS) $$($1_DEP_FLAG) $$($1_DEP).tmp \
- $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE))
+ $$($1_COMPILER) $$($1_DEP_FLAG) $$($1_DEP).tmp $$($1_COMPILE_OPTIONS))
$(SED) 's|^$$(@F):|$$@:|' $$($1_DEP).tmp > $$($1_DEP)
else
$$(call ExecuteWithLog, $$@, \
- $$($1_COMPILER) $$($1_FLAGS) $$($1_DEP_FLAG) $$($1_DEP) \
- $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE))
+ $$($1_COMPILER) $$($1_DEP_FLAG) $$($1_DEP) $$($1_COMPILE_OPTIONS))
endif
# Create a dependency target file from the dependency file.
# Solution suggested by http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/
@@ -329,8 +362,7 @@
# on Windows. No need to save exit code from compilation since
# pipefail is always active on Windows.
$$(call ExecuteWithLog, $$@, \
- $$($1_COMPILER) $$($1_FLAGS) -showIncludes \
- $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)) \
+ $$($1_COMPILER) -showIncludes $$($1_COMPILE_OPTIONS)) \
| $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
-e "^$$($1_FILENAME)$$$$" || test "$$$$?" = "1" ; \
$(ECHO) $$@: \\ > $$($1_DEP) ; \
@@ -694,17 +726,25 @@
-include $$($1_PCH_DEP)
-include $$($1_PCH_DEP_TARGETS)
+ $1_PCH_COMMAND := $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \
+ $$($1_OPT_CFLAGS) -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEP)
+
$$($1_PCH_FILE): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
$$(call LogInfo, Generating precompiled header)
$$(call MakeDir, $$(@D))
- $$(call ExecuteWithLog, $$@, \
- $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \
- $$($1_OPT_CFLAGS) \
- -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEP) $$< -o $$@)
+ $$(call ExecuteWithLog, $$@, $$($1_PCH_COMMAND) $$< -o $$@)
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_PCH_DEP) > $$($1_PCH_DEP_TARGETS)
$$($1_ALL_OBJS): $$($1_PCH_FILE)
+ # Generate the corresponding compile_commands.json fragment.
+ $1_PCH_FILE_JSON := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$(subst /,_,$$(subst \
+ $$(OUTPUTDIR)/,,$$($1_PCH_FILE))).json
+ $1_ALL_OBJS_JSON += $$($1_PCH_FILE_JSON)
+
+ $$($1_PCH_FILE_JSON): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
+ $$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$<, \
+ $$($1_PCH_COMMAND) $$< -o $$($1_PCH_FILE), $$($1_PCH_FILE))
endif
endif
endif
@@ -1025,6 +1065,10 @@
endif
endif
endif
+
+ ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
+ $1 := $$($1_ALL_OBJS_JSON)
+ endif
endef
endif # _NATIVE_COMPILATION_GMK
--- a/make/conf/jib-profiles.js Fri Oct 05 14:22:24 2018 +0200
+++ b/make/conf/jib-profiles.js Fri Oct 05 14:22:53 2018 +0200
@@ -522,7 +522,7 @@
.forEach(function (name) {
var maketestName = name + "-testmake";
profiles[maketestName] = concatObjects(profiles[name], testmakeBase);
- profiles[maketestName].default_make_targets = [ "test-make" ];
+ profiles[maketestName].default_make_targets = [ "test-make", "test-compile-commands" ];
});
// Profiles for building the zero jvm variant. These are used for verification.
--- a/make/data/unicodedata/UnicodeData.txt Fri Oct 05 14:22:24 2018 +0200
+++ b/make/data/unicodedata/UnicodeData.txt Fri Oct 05 14:22:53 2018 +0200
@@ -11729,6 +11729,7 @@
32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+32FF;SQUARE ERA NAME NEWERA;So;0;L;<square> 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;;
3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
--- a/make/hotspot/lib/CompileJvm.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/hotspot/lib/CompileJvm.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -214,15 +214,17 @@
$(VM_VERSION_OBJ): $(filter-out $(VM_VERSION_OBJ) $(JVM_MAPFILE), \
$(BUILD_LIBJVM_TARGET_DEPS))
-ifeq ($(OPENJDK_TARGET_OS), windows)
- # It doesn't matter which jvm.lib file gets exported, but we need
- # to pick just one.
- ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN))
- $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
- DEST := $(LIB_OUTPUTDIR), \
- FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \
- ))
- TARGETS += $(COPY_JVM_LIB)
+ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ # It doesn't matter which jvm.lib file gets exported, but we need
+ # to pick just one.
+ ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN))
+ $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
+ DEST := $(LIB_OUTPUTDIR), \
+ FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \
+ ))
+ TARGETS += $(COPY_JVM_LIB)
+ endif
endif
endif
@@ -261,44 +263,46 @@
# Search the output for the operator(s) of interest, to see where they are
# referenced.
-ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
+ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
+ ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
- DEMANGLED_REGEXP := [^:]operator (new|delete)
+ DEMANGLED_REGEXP := [^:]operator (new|delete)
- # Running c++filt to find offending symbols in all files is too expensive,
- # especially on Solaris, so use mangled names when looking for symbols.
- # Save the demangling for when something is actually found.
- ifeq ($(TOOLCHAIN_TYPE), solstudio)
- MANGLED_SYMS := \
- __1c2n6FL_pv_ \
- __1c2N6FL_pv_ \
- __1c2k6Fpv_v_ \
- __1c2K6Fpv_v_ \
- #
- UNDEF_PATTERN := UNDEF
- else
- MANGLED_SYMS := \
- _ZdaPv \
- _ZdlPv \
- _Znam \
- _Znwm \
- #
- UNDEF_PATTERN := ' U '
+ # Running c++filt to find offending symbols in all files is too expensive,
+ # especially on Solaris, so use mangled names when looking for symbols.
+ # Save the demangling for when something is actually found.
+ ifeq ($(TOOLCHAIN_TYPE), solstudio)
+ MANGLED_SYMS := \
+ __1c2n6FL_pv_ \
+ __1c2N6FL_pv_ \
+ __1c2k6Fpv_v_ \
+ __1c2K6Fpv_v_ \
+ #
+ UNDEF_PATTERN := UNDEF
+ else
+ MANGLED_SYMS := \
+ _ZdaPv \
+ _ZdlPv \
+ _Znam \
+ _Znwm \
+ #
+ UNDEF_PATTERN := ' U '
+ endif
+
+ define SetupOperatorNewDeleteCheck
+ $1.op_check: $1
+ if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \
+ | $(GREP) $(UNDEF_PATTERN)`" ]; then \
+ $(ECHO) "$$<: Error: Use of global operators new and delete is not allowed in Hotspot:"; \
+ $(NM) $$< | $(CXXFILT) | $(EGREP) '$(DEMANGLED_REGEXP)' | $(GREP) $(UNDEF_PATTERN); \
+ $(ECHO) "See: $(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \
+ exit 1; \
+ fi
+ $(TOUCH) $$@
+
+ TARGETS += $1.op_check
+ endef
+
+ $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o)))
endif
-
- define SetupOperatorNewDeleteCheck
- $1.op_check: $1
- if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \
- | $(GREP) $(UNDEF_PATTERN)`" ]; then \
- $(ECHO) "$$<: Error: Use of global operators new and delete is not allowed in Hotspot:"; \
- $(NM) $$< | $(CXXFILT) | $(EGREP) '$(DEMANGLED_REGEXP)' | $(GREP) $(UNDEF_PATTERN); \
- $(ECHO) "See: $(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \
- exit 1; \
- fi
- $(TOUCH) $$@
-
- TARGETS += $1.op_check
- endef
-
- $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o)))
endif
--- a/make/launcher/Launcher-jdk.pack.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/launcher/Launcher-jdk.pack.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -91,21 +91,15 @@
CFLAGS_solaris := -KPIC, \
CFLAGS_macosx := -fPIC, \
DISABLED_WARNINGS_clang := format-nonliteral, \
- LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
- $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
+ LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe, \
MANIFEST := $(TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
+ EXTRA_OBJECT_FILES := $(UNPACKEXE_ZIPOBJS) \
))
-ifneq ($(USE_EXTERNAL_LIBZ), true)
-
- $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS)
-
-endif
-
TARGETS += $(BUILD_UNPACKEXE)
################################################################################
--- a/make/launcher/LauncherCommon.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/launcher/LauncherCommon.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -135,7 +135,7 @@
$1_LIBS += -lz
endif
- $1_WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
+ $1_WINDOWS_JLI_LIB := $(call FindStaticLib, java.base, jli, /libjli)
$$(eval $$(call SetupJdkExecutable, BUILD_LAUNCHER_$1, \
NAME := $1, \
@@ -181,11 +181,11 @@
TARGETS += $$($1)
ifeq ($(OPENJDK_TARGET_OS), aix)
- $$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a
+ $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static)
endif
ifeq ($(OPENJDK_TARGET_OS), windows)
- $$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib \
+ $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, java, /libjava) \
$$($1_WINDOWS_JLI_LIB)
endif
endef
--- a/make/lib/Awt2dLibraries.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -739,11 +739,11 @@
ifeq ($(ENABLE_HEADLESS_ONLY), false)
$(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
else
- $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
+ $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_headless)
endif
ifeq ($(OPENJDK_TARGET_OS), macosx)
- $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
+ $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_lwawt)
endif
endif # OPENJDK_TARGET_OS
--- a/make/lib/Lib-jdk.accessibility.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/lib/Lib-jdk.accessibility.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -55,7 +55,7 @@
VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
)
- $$(BUILD_JAVAACCESSBRIDGE$1): $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib
+ $$(BUILD_JAVAACCESSBRIDGE$1): $(call FindStaticLib, java.desktop, jawt, /libjawt)
TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1)
endef
--- a/make/lib/LibCommon.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/make/lib/LibCommon.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -61,24 +61,6 @@
endif
endif
-################################################################################
-# Find a library
-# Param 1 - module name
-# Param 2 - library name
-# Param 3 - optional subdir for library
-FindLib = \
- $(call FindLibDirForModule, \
- $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX)
-
-################################################################################
-# Find a static library
-# Param 1 - module name
-# Param 2 - library name
-# Param 3 - optional subdir for library
-FindStaticLib = \
- $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
- $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX))
-
# Put the libraries here.
INSTALL_LIBRARIES_HERE := $(call FindLibDirForModule, $(MODULE))
--- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp Fri Oct 05 14:22:53 2018 +0200
@@ -487,6 +487,21 @@
}
#endif // PRODUCT
+bool ClassLoaderDataGraph::is_valid(ClassLoaderData* loader_data) {
+ DEBUG_ONLY( if (!VMError::is_error_reported()) { assert_locked_or_safepoint(ClassLoaderDataGraph_lock); } )
+ if (loader_data != NULL) {
+ if (loader_data == ClassLoaderData::the_null_class_loader_data()) {
+ return true;
+ }
+ for (ClassLoaderData* data = _head; data != NULL; data = data->next()) {
+ if (loader_data == data) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
// Move class loader data from main list to the unloaded list for unloading
// and deallocation later.
bool ClassLoaderDataGraph::do_unloading(bool do_cleaning) {
--- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp Fri Oct 05 14:22:53 2018 +0200
@@ -146,6 +146,10 @@
#ifndef PRODUCT
static bool contains_loader_data(ClassLoaderData* loader_data);
#endif
+
+ // Check if ClassLoaderData is part of the ClassLoaderDataGraph (not unloaded)
+ // Usage without lock only allowed during error reporting.
+ static bool is_valid(ClassLoaderData* loader_data);
};
class LockedClassesDo : public KlassClosure {
--- a/src/hotspot/share/code/codeBlob.cpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/code/codeBlob.cpp Fri Oct 05 14:22:53 2018 +0200
@@ -26,7 +26,9 @@
#include "jvm.h"
#include "code/codeBlob.hpp"
#include "code/codeCache.hpp"
+#include "code/icBuffer.hpp"
#include "code/relocInfo.hpp"
+#include "code/vtableStubs.hpp"
#include "compiler/disassembler.hpp"
#include "interpreter/bytecode.hpp"
#include "memory/allocation.inline.hpp"
@@ -559,6 +561,67 @@
st->print_cr("[CodeBlob]");
}
+void CodeBlob::dump_for_addr(address addr, outputStream* st, bool verbose) const {
+ if (is_buffer_blob()) {
+ // the interpreter is generated into a buffer blob
+ InterpreterCodelet* i = Interpreter::codelet_containing(addr);
+ if (i != NULL) {
+ st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an Interpreter codelet", p2i(addr), (int)(addr - i->code_begin()));
+ i->print_on(st);
+ return;
+ }
+ if (Interpreter::contains(addr)) {
+ st->print_cr(INTPTR_FORMAT " is pointing into interpreter code"
+ " (not bytecode specific)", p2i(addr));
+ return;
+ }
+ //
+ if (AdapterHandlerLibrary::contains(this)) {
+ st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an AdapterHandler", p2i(addr), (int)(addr - code_begin()));
+ AdapterHandlerLibrary::print_handler_on(st, this);
+ }
+ // the stubroutines are generated into a buffer blob
+ StubCodeDesc* d = StubCodeDesc::desc_for(addr);
+ if (d != NULL) {
+ st->print_cr(INTPTR_FORMAT " is at begin+%d in a stub", p2i(addr), (int)(addr - d->begin()));
+ d->print_on(st);
+ st->cr();
+ return;
+ }
+ if (StubRoutines::contains(addr)) {
+ st->print_cr(INTPTR_FORMAT " is pointing to an (unnamed) stub routine", p2i(addr));
+ return;
+ }
+ // the InlineCacheBuffer is using stubs generated into a buffer blob
+ if (InlineCacheBuffer::contains(addr)) {
+ st->print_cr(INTPTR_FORMAT " is pointing into InlineCacheBuffer", p2i(addr));
+ return;
+ }
+ VtableStub* v = VtableStubs::stub_containing(addr);
+ if (v != NULL) {
+ st->print_cr(INTPTR_FORMAT " is at entry_point+%d in a vtable stub", p2i(addr), (int)(addr - v->entry_point()));
+ v->print_on(st);
+ st->cr();
+ return;
+ }
+ }
+ if (is_nmethod()) {
+ nmethod* nm = (nmethod*)this;
+ ResourceMark rm;
+ st->print(INTPTR_FORMAT " is at entry_point+%d in (nmethod*)" INTPTR_FORMAT,
+ p2i(addr), (int)(addr - nm->entry_point()), p2i(nm));
+ if (verbose) {
+ st->print(" for ");
+ nm->method()->print_value_on(st);
+ }
+ st->cr();
+ nm->print_nmethod(verbose);
+ return;
+ }
+ st->print_cr(INTPTR_FORMAT " is at code_begin+%d in ", p2i(addr), (int)(addr - code_begin()));
+ print_on(st);
+}
+
void RuntimeBlob::verify() {
ShouldNotReachHere();
}
--- a/src/hotspot/share/code/codeBlob.hpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/code/codeBlob.hpp Fri Oct 05 14:22:53 2018 +0200
@@ -221,6 +221,7 @@
virtual void print() const { print_on(tty); };
virtual void print_on(outputStream* st) const;
virtual void print_value_on(outputStream* st) const;
+ void dump_for_addr(address addr, outputStream* st, bool verbose) const;
void print_code();
// Print the comment associated with offset on stream, if there is one
--- a/src/hotspot/share/memory/metaspace.cpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/memory/metaspace.cpp Fri Oct 05 14:22:53 2018 +0200
@@ -863,6 +863,42 @@
#endif
}
+// Utils to check if a pointer or range is part of a committed metaspace region.
+metaspace::VirtualSpaceNode* MetaspaceUtils::find_enclosing_virtual_space(const void* p) {
+ VirtualSpaceNode* vsn = Metaspace::space_list()->find_enclosing_space(p);
+ if (Metaspace::using_class_space() && vsn == NULL) {
+ vsn = Metaspace::class_space_list()->find_enclosing_space(p);
+ }
+ return vsn;
+}
+
+bool MetaspaceUtils::is_in_committed(const void* p) {
+#if INCLUDE_CDS
+ if (UseSharedSpaces) {
+ for (int idx = MetaspaceShared::ro; idx <= MetaspaceShared::mc; idx++) {
+ if (FileMapInfo::current_info()->is_in_shared_region(p, idx)) {
+ return true;
+ }
+ }
+ }
+#endif
+ return find_enclosing_virtual_space(p) != NULL;
+}
+
+bool MetaspaceUtils::is_range_in_committed(const void* from, const void* to) {
+#if INCLUDE_CDS
+ if (UseSharedSpaces) {
+ for (int idx = MetaspaceShared::ro; idx <= MetaspaceShared::mc; idx++) {
+ if (FileMapInfo::current_info()->is_in_shared_region(from, idx)) {
+ return FileMapInfo::current_info()->is_in_shared_region(to, idx);
+ }
+ }
+ }
+#endif
+ VirtualSpaceNode* vsn = find_enclosing_virtual_space(from);
+ return (vsn != NULL) && vsn->contains(to);
+}
+
// Metaspace methods
--- a/src/hotspot/share/memory/metaspace.hpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/memory/metaspace.hpp Fri Oct 05 14:22:53 2018 +0200
@@ -71,6 +71,7 @@
class PrintCLDMetaspaceInfoClosure;
class SpaceManager;
class VirtualSpaceList;
+ class VirtualSpaceNode;
}
// Metaspaces each have a SpaceManager and allocations
@@ -297,6 +298,10 @@
// Spacemanager updates running counters.
friend class metaspace::SpaceManager;
+ // Special access for error reporting (checks without locks).
+ friend class oopDesc;
+ friend class Klass;
+
// Running counters for statistics concerning in-use chunks.
// Note: capacity = used + free + waste + overhead. Note that we do not
// count free and waste. Their sum can be deduces from the three other values.
@@ -324,6 +329,12 @@
// Helper for print_xx_report.
static void print_vs(outputStream* out, size_t scale);
+ // Utils to check if a pointer or range is part of a committed metaspace region
+ // without acquiring any locks.
+ static metaspace::VirtualSpaceNode* find_enclosing_virtual_space(const void* p);
+ static bool is_in_committed(const void* p);
+ static bool is_range_in_committed(const void* from, const void* to);
+
public:
// Collect used metaspace statistics. This involves walking the CLDG. The resulting
--- a/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp Fri Oct 05 14:22:53 2018 +0200
@@ -141,17 +141,17 @@
// This function looks at the mmap regions in the metaspace without locking.
// The chunks are added with store ordering and not deleted except for at
// unloading time during a safepoint.
-bool VirtualSpaceList::contains(const void* ptr) {
+VirtualSpaceNode* VirtualSpaceList::find_enclosing_space(const void* ptr) {
// List should be stable enough to use an iterator here because removing virtual
// space nodes is only allowed at a safepoint.
VirtualSpaceListIterator iter(virtual_space_list());
while (iter.repeat()) {
VirtualSpaceNode* vsn = iter.get_next();
if (vsn->contains(ptr)) {
- return true;
+ return vsn;
}
}
- return false;
+ return NULL;
}
void VirtualSpaceList::retire_current_virtual_space() {
--- a/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp Fri Oct 05 14:22:53 2018 +0200
@@ -116,7 +116,8 @@
void inc_virtual_space_count();
void dec_virtual_space_count();
- bool contains(const void* ptr);
+ VirtualSpaceNode* find_enclosing_space(const void* ptr);
+ bool contains(const void* ptr) { return find_enclosing_space(ptr) != NULL; }
// Unlink empty VirtualSpaceNodes and free it.
void purge(ChunkManager* chunk_manager);
--- a/src/hotspot/share/oops/klass.cpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/oops/klass.cpp Fri Oct 05 14:22:53 2018 +0200
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.inline.hpp"
#include "classfile/dictionary.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
@@ -740,6 +741,22 @@
guarantee(obj->klass()->is_klass(), "klass field is not a klass");
}
+Klass* Klass::decode_klass_raw(narrowKlass narrow_klass) {
+ return (Klass*)(void*)( (uintptr_t)Universe::narrow_klass_base() +
+ ((uintptr_t)narrow_klass << Universe::narrow_klass_shift()));
+}
+
+bool Klass::is_valid(Klass* k) {
+ if (!is_aligned(k, sizeof(MetaWord))) return false;
+ if ((size_t)k < os::min_page_size()) return false;
+
+ if (!os::is_readable_range(k, k + 1)) return false;
+ if (!MetaspaceUtils::is_range_in_committed(k, k + 1)) return false;
+
+ if (!Symbol::is_valid(k->name())) return false;
+ return ClassLoaderDataGraph::is_valid(k->class_loader_data());
+}
+
klassVtable Klass::vtable() const {
return klassVtable(const_cast<Klass*>(this), start_of_vtable(), vtable_length() / vtableEntry::size());
}
--- a/src/hotspot/share/oops/klass.hpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/oops/klass.hpp Fri Oct 05 14:22:53 2018 +0200
@@ -715,6 +715,10 @@
virtual void oop_verify_on(oop obj, outputStream* st);
+ // for error reporting
+ static Klass* decode_klass_raw(narrowKlass narrow_klass);
+ static bool is_valid(Klass* k);
+
static bool is_null(narrowKlass obj);
static bool is_null(Klass* obj);
--- a/src/hotspot/share/oops/oop.cpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/oops/oop.cpp Fri Oct 05 14:22:53 2018 +0200
@@ -171,6 +171,63 @@
return UseCompressedClassPointers;
}
+oop oopDesc::decode_oop_raw(narrowOop narrow_oop) {
+ return (oop)(void*)( (uintptr_t)Universe::narrow_oop_base() +
+ ((uintptr_t)narrow_oop << Universe::narrow_oop_shift()));
+}
+
+void* oopDesc::load_klass_raw(oop obj) {
+ if (UseCompressedClassPointers) {
+ narrowKlass narrow_klass = *(obj->compressed_klass_addr());
+ if (narrow_klass == 0) return NULL;
+ return (void*)Klass::decode_klass_raw(narrow_klass);
+ } else {
+ return *(void**)(obj->klass_addr());
+ }
+}
+
+void* oopDesc::load_oop_raw(oop obj, int offset) {
+ uintptr_t addr = (uintptr_t)(void*)obj + (uint)offset;
+ if (UseCompressedOops) {
+ narrowOop narrow_oop = *(narrowOop*)addr;
+ if (narrow_oop == 0) return NULL;
+ return (void*)decode_oop_raw(narrow_oop);
+ } else {
+ return *(void**)addr;
+ }
+}
+
+bool oopDesc::is_valid(oop obj) {
+ if (!is_object_aligned(obj)) return false;
+ if ((size_t)(oopDesc*)obj < os::min_page_size()) return false;
+
+ // We need at least the mark and the klass word in the committed region.
+ if (!os::is_readable_range(obj, (oopDesc*)obj + 1)) return false;
+ if (!Universe::heap()->is_in(obj)) return false;
+
+ Klass* k = (Klass*)load_klass_raw(obj);
+
+ if (!os::is_readable_range(k, k + 1)) return false;
+ return MetaspaceUtils::is_range_in_committed(k, k + 1);
+}
+
+oop oopDesc::oop_or_null(address addr) {
+ if (is_valid(oop(addr))) {
+ // We were just given an oop directly.
+ return oop(addr);
+ }
+
+ // Try to find addr using block_start.
+ HeapWord* p = Universe::heap()->block_start(addr);
+ if (p != NULL && Universe::heap()->block_is_obj(p)) {
+ if (!is_valid(oop(p))) return NULL;
+ return oop(p);
+ }
+
+ // If we can't find it it just may mean that heap wasn't parsable.
+ return NULL;
+}
+
oop oopDesc::obj_field_acquire(int offset) const { return HeapAccess<MO_ACQUIRE>::oop_load_at(as_oop(), offset); }
void oopDesc::obj_field_put_raw(int offset, oop value) { RawAccess<>::oop_store_at(as_oop(), offset, value); }
--- a/src/hotspot/share/oops/oop.hpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/oops/oop.hpp Fri Oct 05 14:22:53 2018 +0200
@@ -334,6 +334,13 @@
assert(has_klass_gap(), "only applicable to compressed klass pointers");
return klass_offset_in_bytes() + sizeof(narrowKlass);
}
+
+ // for error reporting
+ static oop decode_oop_raw(narrowOop narrow_oop);
+ static void* load_klass_raw(oop obj);
+ static void* load_oop_raw(oop obj, int offset);
+ static bool is_valid(oop obj);
+ static oop oop_or_null(address addr);
};
#endif // SHARE_VM_OOPS_OOP_HPP
--- a/src/hotspot/share/oops/symbol.cpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/oops/symbol.cpp Fri Oct 05 14:22:53 2018 +0200
@@ -26,6 +26,7 @@
#include "precompiled.hpp"
#include "classfile/altHashing.hpp"
#include "classfile/classLoaderData.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "logging/log.hpp"
#include "logging/logStream.hpp"
#include "memory/allocation.inline.hpp"
@@ -317,5 +318,21 @@
}
}
+bool Symbol::is_valid(Symbol* s) {
+ if (!is_aligned(s, sizeof(MetaWord))) return false;
+ if ((size_t)s < os::min_page_size()) return false;
+
+ if (!os::is_readable_range(s, s + 1)) return false;
+
+ // Symbols are not allocated in Java heap.
+ if (Universe::heap()->is_in_reserved(s)) return false;
+
+ int len = s->utf8_length();
+ if (len < 0) return false;
+
+ jbyte* bytes = (jbyte*) s->bytes();
+ return os::is_readable_range(bytes, bytes + len);
+}
+
// SymbolTable prints this in its statistics
NOT_PRODUCT(size_t Symbol::_total_count = 0;)
--- a/src/hotspot/share/oops/symbol.hpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/oops/symbol.hpp Fri Oct 05 14:22:53 2018 +0200
@@ -255,6 +255,8 @@
void print() { print_on(tty); }
void print_value() { print_value_on(tty); }
+ static bool is_valid(Symbol* s);
+
#ifndef PRODUCT
// Empty constructor to create a dummy symbol object on stack
// only for getting its vtable pointer.
--- a/src/hotspot/share/runtime/os.cpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/runtime/os.cpp Fri Oct 05 14:22:53 2018 +0200
@@ -1010,6 +1010,15 @@
return (SafeFetch32(aligned, cafebabe) != cafebabe) || (SafeFetch32(aligned, deadbeef) != deadbeef);
}
+bool os::is_readable_range(const void* from, const void* to) {
+ for (address p = align_down((address)from, min_page_size()); p < to; p += min_page_size()) {
+ if (!is_readable_pointer(p)) {
+ return false;
+ }
+ }
+ return true;
+}
+
// moved from debug.cpp (used to be find()) but still called from there
// The verbose parameter is only set by the debug code in one case
@@ -1020,99 +1029,48 @@
st->print_cr("0x0 is NULL");
return;
}
+
+ // Check if addr points into a code blob.
CodeBlob* b = CodeCache::find_blob_unsafe(addr);
if (b != NULL) {
- if (b->is_buffer_blob()) {
- // the interpreter is generated into a buffer blob
- InterpreterCodelet* i = Interpreter::codelet_containing(addr);
- if (i != NULL) {
- st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an Interpreter codelet", p2i(addr), (int)(addr - i->code_begin()));
- i->print_on(st);
- return;
- }
- if (Interpreter::contains(addr)) {
- st->print_cr(INTPTR_FORMAT " is pointing into interpreter code"
- " (not bytecode specific)", p2i(addr));
- return;
- }
- //
- if (AdapterHandlerLibrary::contains(b)) {
- st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an AdapterHandler", p2i(addr), (int)(addr - b->code_begin()));
- AdapterHandlerLibrary::print_handler_on(st, b);
- }
- // the stubroutines are generated into a buffer blob
- StubCodeDesc* d = StubCodeDesc::desc_for(addr);
- if (d != NULL) {
- st->print_cr(INTPTR_FORMAT " is at begin+%d in a stub", p2i(addr), (int)(addr - d->begin()));
- d->print_on(st);
- st->cr();
- return;
- }
- if (StubRoutines::contains(addr)) {
- st->print_cr(INTPTR_FORMAT " is pointing to an (unnamed) stub routine", p2i(addr));
- return;
- }
- // the InlineCacheBuffer is using stubs generated into a buffer blob
- if (InlineCacheBuffer::contains(addr)) {
- st->print_cr(INTPTR_FORMAT " is pointing into InlineCacheBuffer", p2i(addr));
- return;
- }
- VtableStub* v = VtableStubs::stub_containing(addr);
- if (v != NULL) {
- st->print_cr(INTPTR_FORMAT " is at entry_point+%d in a vtable stub", p2i(addr), (int)(addr - v->entry_point()));
- v->print_on(st);
- st->cr();
- return;
- }
- }
- nmethod* nm = b->as_nmethod_or_null();
- if (nm != NULL) {
- ResourceMark rm;
- st->print(INTPTR_FORMAT " is at entry_point+%d in (nmethod*)" INTPTR_FORMAT,
- p2i(addr), (int)(addr - nm->entry_point()), p2i(nm));
- if (verbose) {
- st->print(" for ");
- nm->method()->print_value_on(st);
- }
- st->cr();
- nm->print_nmethod(verbose);
- return;
- }
- st->print_cr(INTPTR_FORMAT " is at code_begin+%d in ", p2i(addr), (int)(addr - b->code_begin()));
- b->print_on(st);
+ b->dump_for_addr(addr, st, verbose);
return;
}
+ // Check if addr points into Java heap.
if (Universe::heap()->is_in(addr)) {
- HeapWord* p = Universe::heap()->block_start(addr);
- bool print = false;
- // If we couldn't find it it just may mean that heap wasn't parsable
- // See if we were just given an oop directly
- if (p != NULL && Universe::heap()->block_is_obj(p)) {
- print = true;
- } else if (p == NULL && oopDesc::is_oop(oop(addr))) {
- p = (HeapWord*) addr;
- print = true;
- }
- if (print) {
- if (p == (HeapWord*) addr) {
- st->print_cr(INTPTR_FORMAT " is an oop", p2i(addr));
+ oop o = oopDesc::oop_or_null(addr);
+ if (o != NULL) {
+ if ((HeapWord*)o == (HeapWord*)addr) {
+ st->print(INTPTR_FORMAT " is an oop: ", p2i(addr));
} else {
- st->print_cr(INTPTR_FORMAT " is pointing into object: " INTPTR_FORMAT, p2i(addr), p2i(p));
+ st->print(INTPTR_FORMAT " is pointing into object: " , p2i(addr));
}
- oop(p)->print_on(st);
+ o->print_on(st);
return;
}
- } else {
- if (Universe::heap()->is_in_reserved(addr)) {
- st->print_cr(INTPTR_FORMAT " is an unallocated location "
- "in the heap", p2i(addr));
+ } else if (Universe::heap()->is_in_reserved(addr)) {
+ st->print_cr(INTPTR_FORMAT " is an unallocated location in the heap", p2i(addr));
+ return;
+ }
+
+ // Compressed oop needs to be decoded first.
+#ifdef _LP64
+ if (UseCompressedOops && ((uintptr_t)addr &~ (uintptr_t)max_juint) == 0) {
+ narrowOop narrow_oop = (narrowOop)(uintptr_t)addr;
+ oop o = oopDesc::decode_oop_raw(narrow_oop);
+
+ if (oopDesc::is_valid(o)) {
+ st->print(UINT32_FORMAT " is a compressed pointer to object: ", narrow_oop);
+ o->print_on(st);
return;
}
}
+#endif
bool accessible = is_readable_pointer(addr);
+ // Check if addr is a JNI handle.
if (align_down((intptr_t)addr, sizeof(intptr_t)) != 0 && accessible) {
if (JNIHandles::is_global_handle((jobject) addr)) {
st->print_cr(INTPTR_FORMAT " is a global jni handle", p2i(addr));
@@ -1131,6 +1089,7 @@
#endif
}
+ // Check if addr belongs to a Java thread.
for (JavaThreadIteratorWithHandle jtiwh; JavaThread *thread = jtiwh.next(); ) {
// Check for privilege stack
if (thread->privileged_stack_top() != NULL &&
@@ -1159,9 +1118,12 @@
}
}
- // Check if in metaspace and print types that have vptrs (only method now)
+ // Check if in metaspace and print types that have vptrs
if (Metaspace::contains(addr)) {
- if (Method::has_method_vptr((const void*)addr)) {
+ if (Klass::is_valid((Klass*)addr)) {
+ st->print_cr(INTPTR_FORMAT " is a pointer to class: ", p2i(addr));
+ ((Klass*)addr)->print_on(st);
+ } else if (Method::is_valid_method((const Method*)addr)) {
((Method*)addr)->print_value_on(st);
st->cr();
} else {
@@ -1171,6 +1133,20 @@
return;
}
+ // Compressed klass needs to be decoded first.
+#ifdef _LP64
+ if (UseCompressedClassPointers && ((uintptr_t)addr &~ (uintptr_t)max_juint) == 0) {
+ narrowKlass narrow_klass = (narrowKlass)(uintptr_t)addr;
+ Klass* k = Klass::decode_klass_raw(narrow_klass);
+
+ if (Klass::is_valid(k)) {
+ st->print_cr(UINT32_FORMAT " is a compressed pointer to class: " INTPTR_FORMAT, narrow_klass, p2i((HeapWord*)k));
+ k->print_on(st);
+ return;
+ }
+ }
+#endif
+
// Try an OS specific find
if (os::find(addr, st)) {
return;
--- a/src/hotspot/share/runtime/os.hpp Fri Oct 05 14:22:24 2018 +0200
+++ b/src/hotspot/share/runtime/os.hpp Fri Oct 05 14:22:53 2018 +0200
@@ -303,6 +303,9 @@
return _page_sizes[0];
}
+ // Return a lower bound for page sizes. Also works before os::init completed.
+ static size_t min_page_size() { return 4 * K; }
+
// Methods for tracing page sizes returned by the above method.
// The region_{min,max}_size parameters should be the values
// passed to page_size_for_region() and page_size should be the result of that
@@ -415,6 +418,7 @@
// Check if pointer points to readable memory (by 4-byte read access)
static bool is_readable_pointer(const void* p);
+ static bool is_readable_range(const void* from, const void* to);
// Routines used to serialize the thread state without using membars
static void serialize_thread_states();
--- a/src/java.base/share/classes/java/lang/Character.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/java/lang/Character.java Fri Oct 05 14:22:53 2018 +0200
@@ -5385,7 +5385,7 @@
0x3260, // 3260..327E; HANGUL
0x327F, // 327F..32CF; COMMON
0x32D0, // 32D0..32FE; KATAKANA
- 0x32FF, // 32FF ; UNKNOWN
+ 0x32FF, // 32FF ; COMMON
0x3300, // 3300..3357; KATAKANA
0x3358, // 3358..33FF; COMMON
0x3400, // 3400..4DB5; HAN
@@ -6902,7 +6902,7 @@
HANGUL, // 3260..327E
COMMON, // 327F..32CF
KATAKANA, // 32D0..32FE
- UNKNOWN, // 32FF
+ COMMON, // 32FF
KATAKANA, // 3300..3357
COMMON, // 3358..33FF
HAN, // 3400..4DB5
--- a/src/java.base/share/classes/java/lang/Class.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/java/lang/Class.java Fri Oct 05 14:22:53 2018 +0200
@@ -64,7 +64,6 @@
import jdk.internal.loader.BootLoader;
import jdk.internal.loader.BuiltinClassLoader;
import jdk.internal.misc.Unsafe;
-import jdk.internal.misc.VM;
import jdk.internal.module.Resources;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.ConstantPool;
@@ -540,11 +539,9 @@
checkMemberAccess(sm, Member.PUBLIC, Reflection.getCallerClass(), false);
}
- // NOTE: the following code may not be strictly correct under
- // the current Java memory model.
-
// Constructor lookup
- if (cachedConstructor == null) {
+ Constructor<T> tmpConstructor = cachedConstructor;
+ if (tmpConstructor == null) {
if (this == Class.class) {
throw new IllegalAccessException(
"Can not call newInstance() on the Class for java.lang.Class"
@@ -555,9 +552,7 @@
final Constructor<T> c = getReflectionFactory().copyConstructor(
getConstructor0(empty, Member.DECLARED));
// Disable accessibility checks on the constructor
- // since we have to do the security check here anyway
- // (the stack depth is wrong for the Constructor's
- // security check to work)
+ // access check is done with the true caller
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<>() {
public Void run() {
@@ -565,32 +560,24 @@
return null;
}
});
- cachedConstructor = c;
+ cachedConstructor = tmpConstructor = c;
} catch (NoSuchMethodException e) {
throw (InstantiationException)
new InstantiationException(getName()).initCause(e);
}
}
- Constructor<T> tmpConstructor = cachedConstructor;
- // Security check (same as in java.lang.reflect.Constructor)
- Class<?> caller = Reflection.getCallerClass();
- if (newInstanceCallerCache != caller) {
- int modifiers = tmpConstructor.getModifiers();
- Reflection.ensureMemberAccess(caller, this, this, modifiers);
- newInstanceCallerCache = caller;
- }
- // Run constructor
+
try {
- return tmpConstructor.newInstance((Object[])null);
+ Class<?> caller = Reflection.getCallerClass();
+ return getReflectionFactory().newInstance(tmpConstructor, null, caller);
} catch (InvocationTargetException e) {
Unsafe.getUnsafe().throwException(e.getTargetException());
// Not reached
return null;
}
}
+
private transient volatile Constructor<T> cachedConstructor;
- private transient volatile Class<?> newInstanceCallerCache;
-
/**
* Determines if the specified {@code Object} is assignment-compatible
--- a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java Fri Oct 05 14:22:53 2018 +0200
@@ -37,7 +37,6 @@
import java.lang.reflect.Modifier;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -578,23 +577,17 @@
InvokerBytecodeGenerator.maybeDump(classBCName(className), classFile);
Class<?> speciesCode;
- ClassLoader cl = topClass().getClassLoader();
- ProtectionDomain pd = null;
- if (cl != null) {
- pd = AccessController.doPrivileged(
- new PrivilegedAction<>() {
- @Override
- public ProtectionDomain run() {
- return topClass().getProtectionDomain();
- }
- });
- }
- try {
- speciesCode = UNSAFE.defineClass(className, classFile, 0, classFile.length, cl, pd);
- } catch (Exception ex) {
- throw newInternalError(ex);
- }
-
+ MethodHandles.Lookup lookup = IMPL_LOOKUP.in(topClass());
+ speciesCode = AccessController.doPrivileged(new PrivilegedAction<>() {
+ @Override
+ public Class<?> run() {
+ try {
+ return lookup.defineClass(classFile);
+ } catch (Exception ex) {
+ throw newInternalError(ex);
+ }
+ }
+ });
return speciesCode.asSubclass(topClass());
}
--- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java Fri Oct 05 14:22:53 2018 +0200
@@ -27,6 +27,7 @@
import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandle;
+import java.lang.ref.WeakReference;
import java.security.AccessController;
import jdk.internal.misc.VM;
@@ -567,21 +568,68 @@
// Shared access checking logic.
// For non-public members or members in package-private classes,
- // it is necessary to perform somewhat expensive security checks.
- // If the security check succeeds for a given class, it will
+ // it is necessary to perform somewhat expensive access checks.
+ // If the access check succeeds for a given class, it will
// always succeed (it is not affected by the granting or revoking
// of permissions); we speed up the check in the common case by
// remembering the last Class for which the check succeeded.
//
- // The simple security check for Constructor is to see if
+ // The simple access check for Constructor is to see if
// the caller has already been seen, verified, and cached.
- // (See also Class.newInstance(), which uses a similar method.)
//
- // A more complicated security check cache is needed for Method and Field
- // The cache can be either null (empty cache), a 2-array of {caller,targetClass},
+ // A more complicated access check cache is needed for Method and Field
+ // The cache can be either null (empty cache), {caller,targetClass} pair,
// or a caller (with targetClass implicitly equal to memberClass).
- // In the 2-array case, the targetClass is always different from the memberClass.
- volatile Object securityCheckCache;
+ // In the {caller,targetClass} case, the targetClass is always different
+ // from the memberClass.
+ volatile Object accessCheckCache;
+
+ private static class Cache {
+ final WeakReference<Class<?>> callerRef;
+ final WeakReference<Class<?>> targetRef;
+
+ Cache(Class<?> caller, Class<?> target) {
+ this.callerRef = new WeakReference<>(caller);
+ this.targetRef = new WeakReference<>(target);
+ }
+
+ boolean isCacheFor(Class<?> caller, Class<?> refc) {
+ return callerRef.get() == caller && targetRef.get() == refc;
+ }
+
+ static Object protectedMemberCallerCache(Class<?> caller, Class<?> refc) {
+ return new Cache(caller, refc);
+ }
+ }
+
+ /*
+ * Returns true if the previous access check was verified for the
+ * given caller accessing a protected member with an instance of
+ * the given targetClass where the target class is different than
+ * the declaring member class.
+ */
+ private boolean isAccessChecked(Class<?> caller, Class<?> targetClass) {
+ Object cache = accessCheckCache; // read volatile
+ if (cache instanceof Cache) {
+ return ((Cache) cache).isCacheFor(caller, targetClass);
+ }
+ return false;
+ }
+
+ /*
+ * Returns true if the previous access check was verified for the
+ * given caller accessing a static member or an instance member of
+ * the target class that is the same as the declaring member class.
+ */
+ private boolean isAccessChecked(Class<?> caller) {
+ Object cache = accessCheckCache; // read volatile
+ if (cache instanceof WeakReference) {
+ @SuppressWarnings("unchecked")
+ WeakReference<Class<?>> ref = (WeakReference<Class<?>>) cache;
+ return ref.get() == caller;
+ }
+ return false;
+ }
final void checkAccess(Class<?> caller, Class<?> memberClass,
Class<?> targetClass, int modifiers)
@@ -603,21 +651,13 @@
if (caller == memberClass) { // quick check
return true; // ACCESS IS OK
}
- Object cache = securityCheckCache; // read volatile
if (targetClass != null // instance member or constructor
&& Modifier.isProtected(modifiers)
&& targetClass != memberClass) {
- // Must match a 2-list of { caller, targetClass }.
- if (cache instanceof Class[]) {
- Class<?>[] cache2 = (Class<?>[]) cache;
- if (cache2[1] == targetClass &&
- cache2[0] == caller) {
- return true; // ACCESS IS OK
- }
- // (Test cache[1] first since range check for [1]
- // subsumes range check for [0].)
+ if (isAccessChecked(caller, targetClass)) {
+ return true; // ACCESS IS OK
}
- } else if (cache == caller) {
+ } else if (isAccessChecked(caller)) {
// Non-protected case (or targetClass == memberClass or static member).
return true; // ACCESS IS OK
}
@@ -642,14 +682,9 @@
Object cache = (targetClass != null
&& Modifier.isProtected(modifiers)
&& targetClass != memberClass)
- ? new Class<?>[] { caller, targetClass }
- : caller;
-
- // Note: The two cache elements are not volatile,
- // but they are effectively final. The Java memory model
- // guarantees that the initializing stores for the cache
- // elements will occur before the volatile write.
- securityCheckCache = cache; // write volatile
+ ? Cache.protectedMemberCallerCache(caller, targetClass)
+ : new WeakReference<>(caller);
+ accessCheckCache = cache; // write volatile
return true;
}
--- a/src/java.base/share/classes/java/lang/reflect/Constructor.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java Fri Oct 05 14:22:53 2018 +0200
@@ -476,18 +476,27 @@
throws InstantiationException, IllegalAccessException,
IllegalArgumentException, InvocationTargetException
{
- if (!override) {
- Class<?> caller = Reflection.getCallerClass();
+ Class<?> caller = override ? null : Reflection.getCallerClass();
+ return newInstanceWithCaller(initargs, !override, caller);
+ }
+
+ /* package-private */
+ T newInstanceWithCaller(Object[] args, boolean checkAccess, Class<?> caller)
+ throws InstantiationException, IllegalAccessException,
+ InvocationTargetException
+ {
+ if (checkAccess)
checkAccess(caller, clazz, clazz, modifiers);
- }
+
if ((clazz.getModifiers() & Modifier.ENUM) != 0)
throw new IllegalArgumentException("Cannot reflectively create enum objects");
+
ConstructorAccessor ca = constructorAccessor; // read volatile
if (ca == null) {
ca = acquireConstructorAccessor();
}
@SuppressWarnings("unchecked")
- T inst = (T) ca.newInstance(initargs);
+ T inst = (T) ca.newInstance(args);
return inst;
}
--- a/src/java.base/share/classes/java/lang/reflect/Proxy.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java Fri Oct 05 14:22:53 2018 +0200
@@ -39,12 +39,11 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
import jdk.internal.loader.BootLoader;
+import jdk.internal.misc.JavaLangAccess;
+import jdk.internal.misc.SharedSecrets;
import jdk.internal.module.Modules;
-import jdk.internal.misc.Unsafe;
import jdk.internal.misc.VM;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
@@ -468,7 +467,7 @@
* in which the proxy class will be defined.
*/
private static final class ProxyBuilder {
- private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+ private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
// prefix for all proxy class names
private static final String proxyClassNamePrefix = "$Proxy";
@@ -535,9 +534,8 @@
byte[] proxyClassFile = ProxyGenerator.generateProxyClass(
proxyName, interfaces.toArray(EMPTY_CLASS_ARRAY), accessFlags);
try {
- Class<?> pc = UNSAFE.defineClass(proxyName, proxyClassFile,
- 0, proxyClassFile.length,
- loader, null);
+ Class<?> pc = JLA.defineClass(loader, proxyName, proxyClassFile,
+ null, "__dynamic_proxy__");
reverseProxyCache.sub(pc).putIfAbsent(loader, Boolean.TRUE);
return pc;
} catch (ClassFormatError e) {
--- a/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java Fri Oct 05 14:22:53 2018 +0200
@@ -159,4 +159,10 @@
public <T extends AccessibleObject> T getRoot(T obj) {
return (T) obj.getRoot();
}
+
+ public <T> T newInstance(Constructor<T> ctor, Object[] args, Class<?> caller)
+ throws IllegalAccessException, InstantiationException, InvocationTargetException
+ {
+ return ctor.newInstanceWithCaller(args, true, caller);
+ }
}
--- a/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java Fri Oct 05 14:22:53 2018 +0200
@@ -27,14 +27,16 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import jdk.internal.misc.Unsafe;
-/** Utility class which assists in calling Unsafe.defineClass() by
+import jdk.internal.misc.JavaLangAccess;
+import jdk.internal.misc.SharedSecrets;
+
+/** Utility class which assists in calling defineClass() by
creating a new class loader which delegates to the one needed in
order for proper resolution of the given bytecodes to occur. */
class ClassDefiner {
- static final Unsafe unsafe = Unsafe.getUnsafe();
+ static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
/** <P> We define generated code into a new class loader which
delegates to the defining loader of the target class. It is
@@ -60,7 +62,7 @@
return new DelegatingClassLoader(parentClassLoader);
}
});
- return unsafe.defineClass(name, bytes, off, len, newLoader, null);
+ return JLA.defineClass(newLoader, name, bytes, null, "__ClassDefiner__");
}
}
--- a/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java Fri Oct 05 14:22:53 2018 +0200
@@ -118,4 +118,8 @@
/** Gets the root of the given AccessibleObject object; null if arg is the root */
public <T extends AccessibleObject> T getRoot(T obj);
+
+ /** Returns a new instance created by the given constructor with access check */
+ public <T> T newInstance(Constructor<T> ctor, Object[] args, Class<?> caller)
+ throws IllegalAccessException, InstantiationException, InvocationTargetException;
}
--- a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java Fri Oct 05 14:22:53 2018 +0200
@@ -398,6 +398,12 @@
return langReflectAccess().getExecutableSharedParameterTypes(ex);
}
+ public <T> T newInstance(Constructor<T> ctor, Object[] args, Class<?> caller)
+ throws IllegalAccessException, InstantiationException, InvocationTargetException
+ {
+ return langReflectAccess().newInstance(ctor, args, caller);
+ }
+
//--------------------------------------------------------------------------
//
// Routines used by serialization
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java Fri Oct 05 14:22:53 2018 +0200
@@ -180,6 +180,7 @@
UNDERSCORE_IDENTIFIER(MIN, JDK8),
PRIVATE_INTERFACE_METHODS(JDK9, Fragments.FeaturePrivateIntfMethods, DiagKind.PLURAL),
LOCAL_VARIABLE_TYPE_INFERENCE(JDK10),
+ VAR_SYNTAX_IMPLICIT_LAMBDAS(JDK11, Fragments.FeatureVarSyntaxInImplicitLambda, DiagKind.PLURAL),
IMPORT_ON_DEMAND_OBSERVABLE_PACKAGES(JDK1_2, JDK8),
SWITCH_MULTIPLE_CASE_LABELS(JDK12, Fragments.FeatureMultipleCaseLabels, DiagKind.PLURAL),
SWITCH_RULE(JDK12, Fragments.FeatureSwitchRules, DiagKind.PLURAL),
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java Fri Oct 05 14:22:53 2018 +0200
@@ -1783,7 +1783,9 @@
if (param.vartype != null &&
isRestrictedLocalVarTypeName(param.vartype, false) &&
param.vartype.hasTag(TYPEARRAY)) {
- log.error(DiagnosticFlag.SYNTAX, param.pos, Errors.VarNotAllowedArray);
+ log.error(DiagnosticFlag.SYNTAX, param.pos,
+ Feature.VAR_SYNTAX_IMPLICIT_LAMBDAS.allowedInSource(source)
+ ? Errors.VarNotAllowedArray : Errors.VarNotAllowedHere);
}
lambdaClassifier.addParameter(param);
if (lambdaClassifier.result() == LambdaParameterKind.ERROR) {
@@ -1794,7 +1796,9 @@
log.error(DiagnosticFlag.SYNTAX, pos, Errors.InvalidLambdaParameterDeclaration(lambdaClassifier.diagFragment));
}
for (JCVariableDecl param: params) {
- if (param.vartype != null && isRestrictedLocalVarTypeName(param.vartype, true)) {
+ if (param.vartype != null
+ && isRestrictedLocalVarTypeName(param.vartype, true)) {
+ checkSourceLevel(param.pos, Feature.VAR_SYNTAX_IMPLICIT_LAMBDAS);
param.startPos = TreeInfo.getStartPos(param.vartype);
param.vartype = null;
}
@@ -1804,9 +1808,9 @@
}
enum LambdaParameterKind {
- EXPLICIT(0),
- IMPLICIT(1),
- VAR(2),
+ VAR(0),
+ EXPLICIT(1),
+ IMPLICIT(2),
ERROR(-1);
private final int index;
@@ -1816,11 +1820,11 @@
}
}
- private final static Fragment[][] decisionTable = new Fragment[][]{
- /* EXPLICIT IMPLICIT VAR */
- /* EXPLICIT */ {null, ImplicitAndExplicitNotAllowed, VarAndExplicitNotAllowed},
- /* IMPLICIT */ {ImplicitAndExplicitNotAllowed, null, VarAndImplicitNotAllowed},
- /* VAR */ {VarAndExplicitNotAllowed, VarAndImplicitNotAllowed, null}
+ private final static Fragment[][] decisionTable = new Fragment[][] {
+ /* VAR EXPLICIT IMPLICIT */
+ /* VAR */ {null, VarAndExplicitNotAllowed, VarAndImplicitNotAllowed},
+ /* EXPLICIT */ {VarAndExplicitNotAllowed, null, ImplicitAndExplicitNotAllowed},
+ /* IMPLICIT */ {VarAndImplicitNotAllowed, ImplicitAndExplicitNotAllowed, null},
};
class LambdaClassifier {
@@ -1849,7 +1853,10 @@
} else if (kind != newKind && kind != LambdaParameterKind.ERROR) {
LambdaParameterKind currentKind = kind;
kind = LambdaParameterKind.ERROR;
- diagFragment = decisionTable[currentKind.index][newKind.index];
+ boolean varIndex = currentKind.index == LambdaParameterKind.VAR.index ||
+ newKind.index == LambdaParameterKind.VAR.index;
+ diagFragment = Feature.VAR_SYNTAX_IMPLICIT_LAMBDAS.allowedInSource(source) || !varIndex ?
+ decisionTable[currentKind.index][newKind.index] : null;
}
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Oct 05 14:22:53 2018 +0200
@@ -2832,6 +2832,9 @@
compiler.misc.feature.raw.string.literals=\
raw string literals
+compiler.misc.feature.var.syntax.in.implicit.lambda=\
+ var syntax in implicit lambdas
+
compiler.warn.underscore.as.identifier=\
as of release 9, ''_'' is a keyword, and may not be used as an identifier
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java Fri Oct 05 14:22:53 2018 +0200
@@ -210,6 +210,7 @@
PlaceholderOutputStream o = getPlaceholderResponseBody();
tmpout.write (bytes(statusLine, 0), 0, statusLine.length());
boolean noContentToSend = false; // assume there is content
+ boolean noContentLengthHeader = false; // must not send Content-length is set
rspHdrs.set ("Date", dateFormat.get().format (new Date()));
/* check for response type that is not allowed to send a body */
@@ -225,6 +226,7 @@
logger.log (Level.WARNING, msg);
}
contentLen = -1;
+ noContentLengthHeader = (rCode != 304);
}
if (isHeadRequest() || rCode == 304) {
@@ -253,7 +255,11 @@
noContentToSend = true;
contentLen = 0;
}
- rspHdrs.set("Content-length", Long.toString(contentLen));
+ if (noContentLengthHeader) {
+ rspHdrs.remove("Content-length");
+ } else {
+ rspHdrs.set("Content-length", Long.toString(contentLen));
+ }
o.setWrappedStream (new FixedLengthOutputStream (this, ros, contentLen));
}
}
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java Fri Oct 05 14:22:53 2018 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -108,7 +108,6 @@
* Otherwise the generated code might be the only reference to the boxed value and since object
* references from nmethods are weak this can cause GC problems.
*
- * @param source
* @return true if the box is cached
*/
private static boolean isBoxCached(JavaConstant source) {
@@ -182,13 +181,13 @@
if (hotspotField.isStatic()) {
HotSpotResolvedJavaType holder = (HotSpotResolvedJavaType) hotspotField.getDeclaringClass();
if (holder.isInitialized()) {
- return memoryAccess.readFieldValue(hotspotField, holder.mirror());
+ return memoryAccess.readFieldValue(hotspotField, holder.mirror(), field.isVolatile());
}
} else {
if (receiver.isNonNull()) {
Object object = ((HotSpotObjectConstantImpl) receiver).object();
if (hotspotField.isInObject(receiver)) {
- return memoryAccess.readFieldValue(hotspotField, object);
+ return memoryAccess.readFieldValue(hotspotField, object, field.isVolatile());
}
}
}
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java Fri Oct 05 14:22:53 2018 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -208,37 +208,34 @@
return ret;
}
- JavaConstant readFieldValue(HotSpotResolvedJavaField field, Object obj) {
+ JavaConstant readFieldValue(HotSpotResolvedJavaField field, Object obj, boolean isVolatile) {
assert obj != null;
assert !field.isStatic() || obj instanceof Class;
long displacement = field.getOffset();
assert checkRead(field.getJavaKind(), displacement, (HotSpotResolvedObjectType) runtime.getHostJVMCIBackend().getMetaAccess().lookupJavaType(obj.getClass()), obj,
runtime.getHostJVMCIBackend().getMetaAccess());
- if (field.getJavaKind() == JavaKind.Object) {
- Object o = UNSAFE.getObject(obj, displacement);
- return HotSpotObjectConstantImpl.forObject(o);
- } else {
- JavaKind kind = field.getJavaKind();
- switch (kind) {
- case Boolean:
- return JavaConstant.forBoolean(UNSAFE.getBoolean(obj, displacement));
- case Byte:
- return JavaConstant.forByte(UNSAFE.getByte(obj, displacement));
- case Char:
- return JavaConstant.forChar(UNSAFE.getChar(obj, displacement));
- case Short:
- return JavaConstant.forShort(UNSAFE.getShort(obj, displacement));
- case Int:
- return JavaConstant.forInt(UNSAFE.getInt(obj, displacement));
- case Long:
- return JavaConstant.forLong(UNSAFE.getLong(obj, displacement));
- case Float:
- return JavaConstant.forFloat(UNSAFE.getFloat(obj, displacement));
- case Double:
- return JavaConstant.forDouble(UNSAFE.getDouble(obj, displacement));
- default:
- throw new IllegalArgumentException("Unsupported kind: " + kind);
- }
+ JavaKind kind = field.getJavaKind();
+ switch (kind) {
+ case Boolean:
+ return JavaConstant.forBoolean(isVolatile ? UNSAFE.getBooleanVolatile(obj, displacement) : UNSAFE.getBoolean(obj, displacement));
+ case Byte:
+ return JavaConstant.forByte(isVolatile ? UNSAFE.getByteVolatile(obj, displacement) : UNSAFE.getByte(obj, displacement));
+ case Char:
+ return JavaConstant.forChar(isVolatile ? UNSAFE.getCharVolatile(obj, displacement) : UNSAFE.getChar(obj, displacement));
+ case Short:
+ return JavaConstant.forShort(isVolatile ? UNSAFE.getShortVolatile(obj, displacement) : UNSAFE.getShort(obj, displacement));
+ case Int:
+ return JavaConstant.forInt(isVolatile ? UNSAFE.getIntVolatile(obj, displacement) : UNSAFE.getInt(obj, displacement));
+ case Long:
+ return JavaConstant.forLong(isVolatile ? UNSAFE.getLongVolatile(obj, displacement) : UNSAFE.getLong(obj, displacement));
+ case Float:
+ return JavaConstant.forFloat(isVolatile ? UNSAFE.getFloatVolatile(obj, displacement) : UNSAFE.getFloat(obj, displacement));
+ case Double:
+ return JavaConstant.forDouble(isVolatile ? UNSAFE.getDoubleVolatile(obj, displacement) : UNSAFE.getDouble(obj, displacement));
+ case Object:
+ return HotSpotObjectConstantImpl.forObject(isVolatile ? UNSAFE.getObjectVolatile(obj, displacement) : UNSAFE.getObject(obj, displacement));
+ default:
+ throw new IllegalArgumentException("Unsupported kind: " + kind);
}
}
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java Fri Oct 05 14:22:53 2018 +0200
@@ -70,7 +70,7 @@
endClass();
byte[] bytes = classWriter.toByteArray();
ASMToolkit.logASM(fullClassName, bytes);
- return SecuritySupport.defineClass(type.getInternalName(), bytes, Event.class.getClassLoader()).asSubclass(Event.class);
+ return SecuritySupport.defineClass(Event.class, bytes).asSubclass(Event.class);
}
private void endClass() {
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventHandlerCreator.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventHandlerCreator.java Fri Oct 05 14:22:53 2018 +0200
@@ -134,7 +134,7 @@
buildWriteMethod();
byte[] bytes = classWriter.toByteArray();
ASMToolkit.logASM(className, bytes);
- return SecuritySupport.defineClass(className, bytes, Event.class.getClassLoader()).asSubclass(EventHandler.class);
+ return SecuritySupport.defineClass(EventHandler.class, bytes).asSubclass(EventHandler.class);
}
public static EventHandler instantiateEventHandler(Class<? extends EventHandler> handlerClass, boolean registered, EventType eventType, EventControl eventControl) throws Error {
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java Fri Oct 05 14:22:24 2018 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java Fri Oct 05 14:22:53 2018 +0200
@@ -31,6 +31,7 @@
import java.io.InputStream;
import java.io.RandomAccessFile;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -71,6 +72,7 @@
*/
public final class SecuritySupport {
private final static Unsafe unsafe = Unsafe.getUnsafe();
+ private final static MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
private final static Module JFR_MODULE = Event.class.getModule();
public final static SafePath JFC_DIRECTORY = getPathInProperty("java.home", "lib/jfr");
@@ -381,8 +383,17 @@
unsafe.ensureClassInitialized(clazz);
}
- static Class<?> defineClass(String name, byte[] bytes, ClassLoader classLoader) {
- return unsafe.defineClass(name, bytes, 0, bytes.length, classLoader, null);
+ static Class<?> defineClass(Class<?> lookupClass, byte[] bytes) {
+ return AccessController.doPrivileged(new PrivilegedAction<>() {
+ @Override
+ public Class<?> run() {
+ try {
+ return MethodHandles.privateLookupIn(lookupClass, LOOKUP).defineClass(bytes);
+ } catch (IllegalAccessException e) {
+ throw new InternalError(e);
+ }
+ }
+ });
}
static Thread createThreadWitNoPermissions(String threadName, Runnable runnable) {
--- a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java Fri Oct 05 14:22:53 2018 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,6 @@
package compiler.jsr292.NonInlinedCall;
-import jdk.internal.misc.Unsafe;
import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.vm.annotation.DontInline;
@@ -68,13 +67,15 @@
public class RedefineTest {
static final MethodHandles.Lookup LOOKUP = MethodHandleHelper.IMPL_LOOKUP;
- static final Unsafe UNSAFE = Unsafe.getUnsafe();
-
static final String NAME = "compiler/jsr292/NonInlinedCall/RedefineTest$T";
static Class<?> getClass(int r) {
byte[] classFile = getClassFile(r);
- return UNSAFE.defineClass(NAME, classFile, 0, classFile.length, null, null);
+ try {
+ return MethodHandles.lookup().defineClass(classFile);
+ } catch (IllegalAccessException e) {
+ throw new Error(e);
+ }
}
/**
--- a/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java Fri Oct 05 14:22:53 2018 +0200
@@ -32,6 +32,9 @@
* java.base/jdk.internal.vm.annotation
* java.base/jdk.internal.misc
*
+ * @library ../jsr292/patches
+ * @build java.base/java.lang.invoke.MethodHandleHelper
+ *
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions
* -Xbatch -XX:-TieredCompilation
* -XX:+FoldStableValues
@@ -64,6 +67,9 @@
import jdk.test.lib.Asserts;
import jdk.test.lib.Platform;
+import java.lang.invoke.MethodHandleHelper;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -393,8 +399,9 @@
}
Test generate() {
- Class<?> c = U.defineClass(className, classFile, 0, classFile.length, THIS_CLASS.getClassLoader(), null);
try {
+ Lookup lookup = MethodHandleHelper.IMPL_LOOKUP.in(MethodHandles.class);
+ Class<?> c = lookup.defineClass(classFile);
return (Test) c.newInstance();
} catch(Exception e) {
throw new Error(e);
--- a/test/hotspot/jtreg/runtime/Dictionary/CleanProtectionDomain.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/hotspot/jtreg/runtime/Dictionary/CleanProtectionDomain.java Fri Oct 05 14:22:53 2018 +0200
@@ -57,11 +57,10 @@
static class Test {
public static void test() throws Exception {
- Unsafe unsafe = Unsafe.getUnsafe();
TestClassLoader classloader = new TestClassLoader();
ProtectionDomain pd = new ProtectionDomain(null, null);
byte klassbuf[] = InMemoryJavaCompiler.compile("TestClass", "class TestClass { }");
- Class klass = unsafe.defineClass(null, klassbuf, 0, klassbuf.length, classloader, pd);
+ Class<?> klass = classloader.defineClass("TestClass", klassbuf, pd);
}
public static void main(String[] args) throws Exception {
@@ -91,6 +90,10 @@
public TestClassLoader() {
super();
}
+
+ public Class<?> defineClass(String name, byte[] bytes, ProtectionDomain pd) {
+ return defineClass(name, bytes, 0, bytes.length, pd);
+ }
}
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/com/sun/net/httpserver/bugs/B8211420.java Fri Oct 05 14:22:53 2018 +0200
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8211420
+ * @run main/othervm B8211420
+ * @summary
+ */
+
+import com.sun.net.httpserver.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.logging.*;
+import java.io.*;
+import java.net.*;
+
+public class B8211420 {
+
+ public static void main (String[] args) throws Exception {
+ Logger logger = Logger.getLogger ("com.sun.net.httpserver");
+ ConsoleHandler c = new ConsoleHandler();
+ c.setLevel (Level.WARNING);
+ logger.addHandler (c);
+ logger.setLevel (Level.WARNING);
+ Handler handler = new Handler();
+ InetSocketAddress addr = new InetSocketAddress (0);
+ HttpServer server = HttpServer.create (addr, 0);
+ HttpContext ctx = server.createContext ("/test", handler);
+ ExecutorService executor = Executors.newCachedThreadPool();
+ server.setExecutor (executor);
+ server.start ();
+
+ URL url = new URL ("http://localhost:"+server.getAddress().getPort()+"/test/foo.html");
+ HttpURLConnection urlc = (HttpURLConnection)url.openConnection ();
+ try {
+ InputStream is = urlc.getInputStream();
+ while (is.read()!= -1) ;
+ is.close ();
+ String prop = urlc.getHeaderField("Content-length");
+ System.out.println ("Content-length = " + prop + " should be null");
+ if (prop != null)
+ throw new RuntimeException("Content-length was present");
+
+ urlc = (HttpURLConnection)url.openConnection();
+ is = urlc.getInputStream();
+ while (is.read()!= -1) ;
+ is.close ();
+ if (urlc.getResponseCode() != 304) // expected for 2nd test
+ throw new RuntimeException("wrong response code");
+ String clen = urlc.getHeaderField("Content-length");
+ System.out.println ("Content-length = " + clen + " should be 99");
+ System.out.println ("len = " + clen.length());
+ if (clen == null || !clen.equals("99"))
+ throw new RuntimeException("Content-length not present or has wrong value");
+ System.out.println ("OK");
+ } finally {
+ server.stop(2);
+ executor.shutdown();
+ }
+ }
+
+ public static boolean error = false;
+
+ static class Handler implements HttpHandler {
+ volatile int invocation = 1;
+ public void handle (HttpExchange t)
+ throws IOException
+ {
+ InputStream is = t.getRequestBody();
+ Headers map = t.getRequestHeaders();
+ Headers rmap = t.getResponseHeaders();
+ while (is.read () != -1) ;
+ is.close();
+ if (invocation++ == 1) {
+ // send a 204 response with no body
+ t.sendResponseHeaders(204, -1);
+ t.close();
+ } else {
+ // send a 304 response with no body but with content - length
+ rmap.add("Content-length", "99");
+ t.sendResponseHeaders(304, -1);
+ t.close();
+ }
+ }
+ }
+}
--- a/test/jdk/java/lang/Character/Scripts.txt Fri Oct 05 14:22:24 2018 +0200
+++ b/test/jdk/java/lang/Character/Scripts.txt Fri Oct 05 14:22:53 2018 +0200
@@ -402,6 +402,7 @@
328A..32B0 ; Common # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT
32B1..32BF ; Common # No [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY
32C0..32CF ; Common # So [16] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..LIMITED LIABILITY SIGN
+32FF ; Common # So SQUARE ERA NAME NEWERA
3358..33FF ; Common # So [168] IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO..SQUARE GAL
4DC0..4DFF ; Common # So [64] HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION
A700..A716 ; Common # Sk [23] MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR
--- a/test/jdk/java/lang/Character/UnicodeData.txt Fri Oct 05 14:22:24 2018 +0200
+++ b/test/jdk/java/lang/Character/UnicodeData.txt Fri Oct 05 14:22:53 2018 +0200
@@ -11729,6 +11729,7 @@
32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+32FF;SQUARE ERA NAME NEWERA;So;0;L;<square> 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;;
3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
Binary file test/jdk/java/lang/Character/charprop00.bin has changed
--- a/test/jdk/java/lang/StackWalker/ReflectionFrames.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/jdk/java/lang/StackWalker/ReflectionFrames.java Fri Oct 05 14:22:53 2018 +0200
@@ -48,6 +48,16 @@
public class ReflectionFrames {
final static boolean verbose = false;
+ final static Class<?> REFLECT_ACCESS = findClass("java.lang.reflect.ReflectAccess");
+ final static Class<?> REFLECTION_FACTORY = findClass("jdk.internal.reflect.ReflectionFactory");
+
+ private static Class<?> findClass(String cn) {
+ try {
+ return Class.forName(cn);
+ } catch (ClassNotFoundException e) {
+ throw new AssertionError(e);
+ }
+ }
/**
* This test invokes new StackInspector() directly from
@@ -327,6 +337,8 @@
List.of(StackInspector.class.getName()
+"::<init>",
Constructor.class.getName()
+ +"::newInstanceWithCaller",
+ Constructor.class.getName()
+"::newInstance",
StackInspector.Caller.class.getName()
+"::create",
@@ -355,6 +367,8 @@
List.of(StackInspector.class.getName()
+"::<init>",
Constructor.class.getName()
+ +"::newInstanceWithCaller",
+ Constructor.class.getName()
+"::newInstance",
StackInspector.Caller.class.getName()
+"::create",
@@ -387,6 +401,8 @@
List.of(StackInspector.class.getName()
+"::<init>",
Constructor.class.getName()
+ +"::newInstanceWithCaller",
+ Constructor.class.getName()
+"::newInstance",
StackInspector.Caller.class.getName()
+"::create",
@@ -436,15 +452,19 @@
assertEquals(obj.collectedFrames,
List.of(StackInspector.class.getName()
+"::<init>",
+ REFLECT_ACCESS.getName()
+ +"::newInstance",
+ REFLECTION_FACTORY.getName()
+ +"::newInstance",
Class.class.getName()
+"::newInstance",
StackInspector.Caller.class.getName()
+"::create",
ReflectionFrames.class.getName()
+"::testNewInstance"));
- // Because Class.newInstance is not filtered, then the
- // caller is Class.class
- assertEquals(obj.cls, Class.class);
+ // Because implementation frames are not filtered, then the
+ // caller is ReflectAccess.class
+ assertEquals(obj.cls, REFLECT_ACCESS);
assertEquals(obj.filtered, 0);
// Calls the StackInspector.reflect method through reflection
@@ -464,6 +484,10 @@
assertEquals(obj.collectedFrames,
List.of(StackInspector.class.getName()
+"::<init>",
+ REFLECT_ACCESS.getName()
+ +"::newInstance",
+ REFLECTION_FACTORY.getName()
+ +"::newInstance",
Class.class.getName()
+"::newInstance",
StackInspector.Caller.class.getName()
@@ -473,9 +497,9 @@
ReflectionFrames.class.getName()
+"::testNewInstance"));
- // Because Class.newInstance is not filtered, then the
- // caller is Class.class
- assertEquals(obj.cls, Class.class);
+ // Because implementation frames are not filtered, then the
+ // caller is ReflectAccess.class
+ assertEquals(obj.cls, REFLECT_ACCESS);
assertEquals(obj.filtered, 0);
// Calls the StackInspector.handle method through reflection
@@ -495,6 +519,10 @@
assertEquals(obj.collectedFrames,
List.of(StackInspector.class.getName()
+"::<init>",
+ REFLECT_ACCESS.getName()
+ +"::newInstance",
+ REFLECTION_FACTORY.getName()
+ +"::newInstance",
Class.class.getName()
+"::newInstance",
StackInspector.Caller.class.getName()
@@ -504,9 +532,9 @@
ReflectionFrames.class.getName()
+"::testNewInstance"));
- // Because Class.newInstance is not filtered, then the
- // caller is Class.class
- assertEquals(obj.cls, Class.class);
+ // Because implementation frames are not filtered, then the
+ // caller is ReflectAccess.class
+ assertEquals(obj.cls, REFLECT_ACCESS);
assertEquals(obj.filtered, 0);
// Sets a non-default walker configured to show
@@ -529,6 +557,8 @@
List.of(StackInspector.class.getName()
+"::<init>",
Constructor.class.getName()
+ +"::newInstanceWithCaller",
+ REFLECT_ACCESS.getName()
+"::newInstance",
Class.class.getName()
+"::newInstance",
@@ -538,9 +568,9 @@
+"::invoke",
ReflectionFrames.class.getName()
+"::testNewInstance"));
- // Because Class.newInstance is not filtered, then the
- // caller is Class.class
- assertEquals(obj.cls, Class.class);
+ // Because implementation frames are not filtered, then the
+ // caller is ReflectAccess.class
+ assertEquals(obj.cls, REFLECT_ACCESS);
assertNotEquals(obj.filtered, 0);
// Calls the StackInspector.reflect method through reflection
@@ -557,10 +587,13 @@
obj = ((StackInspector)StackInspector.Caller.class
.getMethod("reflect", How.class)
.invoke(null, How.CLASS));
+ System.out.println(obj.collectedFrames);
assertEquals(obj.collectedFrames,
List.of(StackInspector.class.getName()
+"::<init>",
Constructor.class.getName()
+ +"::newInstanceWithCaller",
+ REFLECT_ACCESS.getName()
+"::newInstance",
Class.class.getName()
+"::newInstance",
@@ -575,9 +608,9 @@
ReflectionFrames.class.getName()
+"::testNewInstance"));
- // Because Class.newInstance is not filtered, then the
- // caller is Class.class
- assertEquals(obj.cls, Class.class);
+ // Because implementation frames are not filtered, then the
+ // caller is ReflectAccess.class
+ assertEquals(obj.cls, REFLECT_ACCESS);
assertNotEquals(obj.filtered, 0);
// Calls the StackInspector.handle method through reflection
@@ -598,6 +631,8 @@
List.of(StackInspector.class.getName()
+"::<init>",
Constructor.class.getName()
+ +"::newInstanceWithCaller",
+ REFLECT_ACCESS.getName()
+"::newInstance",
Class.class.getName()
+"::newInstance",
@@ -611,9 +646,9 @@
ReflectionFrames.class.getName()
+"::testNewInstance"));
- // Because Class.newInstance is not filtered, then the
- // caller is Class.class
- assertEquals(obj.cls, Class.class);
+ // Because implementation frames are not filtered, then the
+ // caller is ReflectAccess.class
+ assertEquals(obj.cls, REFLECT_ACCESS);
assertNotEquals(obj.filtered, 0);
}
--- a/test/jdk/java/lang/reflect/callerCache/AccessTest.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/jdk/java/lang/reflect/callerCache/AccessTest.java Fri Oct 05 14:22:53 2018 +0200
@@ -149,4 +149,11 @@
super("privateStaticFinalField");
}
}
+
+ public static class NewInstance implements Callable<Object> {
+ public Object call() throws Exception {
+ return Members.class.newInstance();
+ }
+ }
+
}
--- a/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java Fri Oct 05 14:22:53 2018 +0200
@@ -77,7 +77,8 @@
{ "AccessTest$PublicFinalField"},
{ "AccessTest$PrivateFinalField"},
{ "AccessTest$PublicStaticFinalField"},
- { "AccessTest$PrivateStaticFinalField"}
+ { "AccessTest$PrivateStaticFinalField"},
+ { "AccessTest$NewInstance"}
};
}
--- a/test/jdk/jdk/modules/open/Basic.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/jdk/jdk/modules/open/Basic.java Fri Oct 05 14:22:53 2018 +0200
@@ -98,6 +98,9 @@
ctor.setAccessible(true);
ctor.newInstance();
+ // Class::newInstance
+ clazz.newInstance();
+
// method handles
findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup());
findNoArgConstructorAndInvoke(clazz, MethodHandles.lookup());
@@ -122,6 +125,12 @@
ctor.setAccessible(true);
ctor.newInstance();
+ // Class::newInstance
+ try {
+ clazz.newInstance();
+ assertTrue(false);
+ } catch (IllegalAccessException expected) { }
+
// method handles
try {
findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup());
@@ -150,6 +159,9 @@
ctor.setAccessible(true);
ctor.newInstance();
+ // Class::newInstance
+ clazz.newInstance();
+
// method handles
findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup());
findNoArgConstructorAndInvoke(clazz, MethodHandles.lookup());
@@ -174,6 +186,12 @@
ctor.setAccessible(true);
ctor.newInstance();
+ // Class::newInstance
+ try {
+ clazz.newInstance();
+ assertTrue(false);
+ } catch (IllegalAccessException expected) { }
+
// method handles
try {
findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup());
@@ -200,6 +218,7 @@
// core reflection
Class<?> clazz = q.PublicType.class;
clazz.getConstructor().newInstance();
+ clazz.newInstance();
// method handles
findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup());
@@ -226,6 +245,12 @@
ctor.setAccessible(true);
ctor.newInstance();
+ // Class::newInstance
+ try {
+ clazz.newInstance();
+ assertTrue(false);
+ } catch (IllegalAccessException expected) { }
+
// method handles
try {
findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup());
@@ -256,6 +281,12 @@
assertTrue(false);
} catch (InaccessibleObjectException expected) { }
+ // Class::newInstance
+ try {
+ clazz.newInstance();
+ assertTrue(false);
+ } catch (IllegalAccessException expected) { }
+
// method handles
try {
findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup());
@@ -288,6 +319,12 @@
assertTrue(false);
} catch (InaccessibleObjectException expected) { }
+ // Class::newInstance
+ try {
+ clazz.newInstance();
+ assertTrue(false);
+ } catch (IllegalAccessException expected) { }
+
// method handles
try {
findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup());
--- a/test/langtools/tools/javac/T8152616.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/langtools/tools/javac/T8152616.java Fri Oct 05 14:22:53 2018 +0200
@@ -25,8 +25,8 @@
* @test
* @bug 8152616
* @summary Unit test for corner case of PrettyPrinting when SourceOutput is false
- * @run compile --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED T8152616.java
- * @run main T8152616
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.tree
*/
import java.io.File;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/VarInImplicitLambda.java Fri Oct 05 14:22:53 2018 +0200
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.misc.feature.var.syntax.in.implicit.lambda
+// key: compiler.err.feature.not.supported.in.source.plural
+// options: -source 10 -Xlint:-options
+
+import java.util.function.*;
+
+class VarInImplicitLambda {
+ IntBinaryOperator f2 = (var x, y) -> x + y;
+}
--- a/test/langtools/tools/javac/lambda/LambdaParserTest.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/langtools/tools/javac/lambda/LambdaParserTest.java Fri Oct 05 14:22:53 2018 +0200
@@ -107,8 +107,8 @@
}
enum SourceKind {
- SOURCE_9("9"),
- SOURCE_10("10");
+ SOURCE_10("10"),
+ SOURCE_11("11");
String sourceNumber;
@@ -121,9 +121,9 @@
IMPLICIT_1("", ExplicitKind.IMPLICIT),
IMPLICIT_2("var", ExplicitKind.IMPLICIT_VAR),
- EXPLIICT_SIMPLE("A", ExplicitKind.EXPLICIT),
- EXPLIICT_SIMPLE_ARR1("A[]", ExplicitKind.EXPLICIT),
- EXPLIICT_SIMPLE_ARR2("A[][]", ExplicitKind.EXPLICIT),
+ EXPLICIT_SIMPLE("A", ExplicitKind.EXPLICIT),
+ EXPLICIT_SIMPLE_ARR1("A[]", ExplicitKind.EXPLICIT),
+ EXPLICIT_SIMPLE_ARR2("A[][]", ExplicitKind.EXPLICIT),
EXPLICIT_VARARGS("A...", ExplicitKind.EXPLICIT),
EXPLICIT_GENERIC1("A<X>", ExplicitKind.EXPLICIT),
EXPLICIT_GENERIC2("A<? extends X, ? super Y>", ExplicitKind.EXPLICIT),
@@ -157,13 +157,7 @@
}
ExplicitKind explicitKind(SourceKind sk) {
- switch (explicitKind) {
- case IMPLICIT_VAR:
- return (sk == SourceKind.SOURCE_9) ?
- ExplicitKind.EXPLICIT : ExplicitKind.IMPLICIT_VAR;
- default:
- return explicitKind;
- }
+ return explicitKind;
}
}
@@ -299,6 +293,15 @@
errorExpected |= pn == LambdaParameterName.UNDERSCORE &&
lk.arity() > 0;
+ for (int i = 0; i < lk.arity(); i++) {
+ if (!lk.isShort() &&
+ pks[i].explicitKind(sk) == LambdaParameterKind.ExplicitKind.IMPLICIT_VAR &&
+ sk == SourceKind.SOURCE_10) {
+ errorExpected = true;
+ break;
+ }
+ }
+
if (errorExpected != res.hasErrors()) {
fail("invalid diagnostics for source:\n" +
res.compilationInfo() +
--- a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java Fri Oct 05 14:22:24 2018 +0200
+++ b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java Fri Oct 05 14:22:53 2018 +0200
@@ -3,6 +3,7 @@
* @bug 8198512 8199327
* @summary compiler support for local-variable syntax for lambda parameters
* @compile/fail/ref=VarInImplicitLambdaNegTest01.out -XDrawDiagnostics VarInImplicitLambdaNegTest01.java
+ * @compile/fail/ref=VarInImplicitLambdaNegTest01_source10.out -source 10 -XDrawDiagnostics VarInImplicitLambdaNegTest01.java
*/
import java.util.function.*;
--- a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.out Fri Oct 05 14:22:24 2018 +0200
+++ b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.out Fri Oct 05 14:22:53 2018 +0200
@@ -1,6 +1,6 @@
-VarInImplicitLambdaNegTest01.java:11:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.implicit.not.allowed)
VarInImplicitLambdaNegTest01.java:12:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.implicit.not.allowed)
-VarInImplicitLambdaNegTest01.java:13:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.explicit.not.allowed)
-VarInImplicitLambdaNegTest01.java:14:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.implicit.and.explicit.not.allowed)
-VarInImplicitLambdaNegTest01.java:16:52: compiler.err.var.not.allowed.array
+VarInImplicitLambdaNegTest01.java:13:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.implicit.not.allowed)
+VarInImplicitLambdaNegTest01.java:14:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.explicit.not.allowed)
+VarInImplicitLambdaNegTest01.java:15:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.implicit.and.explicit.not.allowed)
+VarInImplicitLambdaNegTest01.java:17:52: compiler.err.var.not.allowed.array
5 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01_source10.out Fri Oct 05 14:22:53 2018 +0200
@@ -0,0 +1,6 @@
+- compiler.warn.source.no.bootclasspath: 10
+VarInImplicitLambdaNegTest01.java:12:36: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.var.syntax.in.implicit.lambda), 10, 11
+VarInImplicitLambdaNegTest01.java:15:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.implicit.and.explicit.not.allowed)
+VarInImplicitLambdaNegTest01.java:17:52: compiler.err.var.not.allowed.here
+3 errors
+1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/make/TestCompileCommands.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -0,0 +1,54 @@
+
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include $(SPEC)
+include MakeBase.gmk
+
+default: all
+
+COMPILE_COMMANDS := $(OUTPUTDIR)/compile_commands.json
+
+# Perform basic compile_commands.json validation:
+# - should start with [ and end with ]
+# - should contain at least one entry (opening {)
+# - last entry should not have a trailing comma (end with })
+verify-compile-commands-json:
+ $(HEAD) -n 1 $(COMPILE_COMMANDS) | $(GREP) -q -e "^\[$$"
+ $(TAIL) -1 $(COMPILE_COMMANDS) | $(GREP) -q -e "^\]$$"
+ $(HEAD) -n 2 $(COMPILE_COMMANDS) | $(GREP) -q -e "{"
+ $(TAIL) -2 $(COMPILE_COMMANDS) | $(GREP) -q -e "}$$"
+
+# Ensure that no native shared library for hotspot was created during the
+# build. Checking hotspot only since on Windows the jdk folders are prepopulated
+# with CRT DLLs. Also note that this test requires a clean build folder.
+verify-no-shared-libraries:
+ $(FIND) $(OUTPUTDIR)/hotspot -type f -name "*$(SHARED_LIBRARY_SUFFIX)" \
+ -exec false {} +
+
+TEST_TARGETS += verify-compile-commands-json verify-no-shared-libraries
+
+all: $(TEST_TARGETS)
+
+.PHONY: default all verify-compile-commands
--- a/test/make/TestMake.gmk Fri Oct 05 14:22:24 2018 +0200
+++ b/test/make/TestMake.gmk Fri Oct 05 14:22:53 2018 +0200
@@ -39,7 +39,10 @@
test-idea:
+$(MAKE) -f TestIdea.gmk $(TEST_SUBTARGET)
+test-compile-commands:
+ +$(MAKE) -f TestCompileCommands.gmk $(TEST_SUBTARGET)
+
all: make-base java-compilation copy-files test-idea
-.PHONY: default all make-base java-compilation copy-files test-idea
+.PHONY: default all make-base java-compilation copy-files test-idea test-compile-commands