--- a/.hgtags Thu Jan 31 10:10:34 2013 +0100
+++ b/.hgtags Thu Jan 31 10:22:25 2013 -0800
@@ -194,3 +194,5 @@
0d625373c69e2ad6f546fd88ab50c6c9aad01271 jdk8-b70
a41ada2ed4ef735449531c6ebe6cec593d890a1c jdk8-b71
6725b3961f987cf40f446d1c11cd324a3bec545f jdk8-b72
+fe94b40ffd9390f6cffcdf51c0389b0e6dde0c13 jdk8-b73
+f627eff819628822a0777af8062244352f2a29cf jdk8-b74
--- a/.hgtags-top-repo Thu Jan 31 10:10:34 2013 +0100
+++ b/.hgtags-top-repo Thu Jan 31 10:22:25 2013 -0800
@@ -194,3 +194,5 @@
105a25ffa4a4f0af70188d4371b4a0385009b7ce jdk8-b70
51ad2a34342055333eb5f36e2fb514b027895708 jdk8-b71
c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72
+93b9664f97eeb6f89397a8842318ebacaac9feb9 jdk8-b73
+b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74
--- a/Makefile Thu Jan 31 10:10:34 2013 +0100
+++ b/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -26,6 +26,11 @@
# If NEWBUILD is defined, use the new build-infra Makefiles and configure.
# See NewMakefile.gmk for more information.
+# If not specified, select what the default build is
+ifndef NEWBUILD
+ NEWBUILD=true
+endif
+
ifeq ($(NEWBUILD),true)
# The new top level Makefile
--- a/NewMakefile.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/NewMakefile.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -23,273 +23,109 @@
# questions.
#
-# Utilities used in this Makefile
-BASENAME=basename
-CAT=cat
-CD=cd
-CMP=cmp
-CP=cp
-ECHO=echo
-MKDIR=mkdir
-PRINTF=printf
-PWD=pwd
-TAR=tar
-ifeq ($(PLATFORM),windows)
- ZIP=zip
-else
- # store symbolic links as the link
- ZIP=zip -y
-endif
-# Insure we have a path that looks like it came from pwd
-# (This is mostly for Windows sake and drive letters)
-define UnixPath # path
-$(shell (cd "$1" && $(PWD)))
-endef
-
-# Current root directory
-CURRENT_DIRECTORY := $(shell $(PWD))
-
-# Build directory root
-BUILD_DIR_ROOT = $(CURRENT_DIRECTORY)/build
-
-# All configured Makefiles to run
-ALL_MAKEFILES = $(wildcard $(BUILD_DIR_ROOT)/*-*/Makefile)
-
-# All bundles to create
-ALL_IMAGE_DIRS = $(wildcard $(BUILD_DIR_ROOT)/*-*/images/*-image)
+# This must be the first rule
+default:
-# Build all the standard 'all', 'images', and 'clean' targets
-all images clean: checks
- @if [ "$(ALL_MAKEFILES)" = "" ] ; then \
- $(ECHO) "ERROR: No configurations to build"; exit 1; \
- fi
- @for bdir in $(dir $(ALL_MAKEFILES)) ; do \
- $(ECHO) "$(CD) $${bdir} && $(MAKE) $@" ; \
- $(CD) $${bdir} && $(MAKE) $@ ; \
- done
-
-# TBD: Deploy input
-$(BUILD_DIR_ROOT)/.deploy_input:
- @if [ "$(ALL_MAKEFILES)" = "" ] ; then \
- $(ECHO) "ERROR: No configurations to build"; exit 1; \
- fi
- @for bdir in $(dir $(ALL_MAKEFILES)) ; do \
- if [ deploy/make/Makefile ] ; then \
- echo "Attempting deploy build." ; \
- ( \
- $(RM) -r $${bdir}/deploy_input ; \
- $(MKDIR) -p $${bdir}/deploy_input ; \
- ( $(CD) $${bdir}/images && $(TAR) -cf - j2sdk-image j2re-image ) \
- | ( $(CD) $${bdir}/deploy_input && $(TAR) -xf - ) ; \
- ) ; \
- fi; \
- done
- touch $@
-
-# TBD: Deploy images
-deploy: $(BUILD_DIR_ROOT)/.deploy_input
- @if [ "$(ALL_MAKEFILES)" = "" ] ; then \
- $(ECHO) "ERROR: No configurations to build"; exit 1; \
- fi
- @for bdir in $(dir $(ALL_MAKEFILES)) ; do \
- if [ deploy/make/Makefile ] ; then \
- echo "Attempting deploy build." ; \
- ( \
- $(CD) deploy/make && \
- $(MAKE) \
- ABS_OUTPUTDIR=$${bdir}/deploy_input \
- OUTPUTDIR=$${bdir}/deploy_input \
- ) ; \
- fi; \
- done
-
-# TBD: Install bundles
-install:
+# Inclusion of this pseudo-target will cause make to execute this file
+# serially, regardless of -j. Recursively called makefiles will not be
+# affected, however. This is required for correct dependency management.
+.NOTPARALLEL:
-# Bundle creation
-bundles:
- @if [ "$(ALL_IMAGE_DIRS)" = "" ] ; then \
- $(ECHO) "ERROR: No images to bundle"; exit 1; \
- fi
- @for i in $(ALL_IMAGE_DIRS) ; do \
- $(MKDIR) -p $${i}/../../bundles && \
- $(RM) $${i}/../../bundles/`$(BASENAME) $${i}`.zip && \
- $(ECHO) "$(CD) $${i} && $(ZIP) -q -r ../../bundles/`$(BASENAME) $${i}`.zip ." && \
- $(CD) $${i} && $(ZIP) -q -r ../../bundles/`$(BASENAME) $${i}`.zip . ; \
- done
-
-# Clobber all the built files
-clobber::
- $(RM) -r $(BUILD_DIR_ROOT)
-
-# Make various checks to insure the build will be successful
-# Possibilities:
-# * Check that if any closed repo is provided, they all must be.
-# * Check that all open repos exist, at least until we are ready for some
-# kind of partial build.
-checks:
- @$(ECHO) "No checks yet"
-
-# Keep track of user targets
-USER_TARGETS += all deploy install images clean clobber checks
-
-###########################################################################
-# To help in adoption of the new configure&&make build process, a bridge
-# build will use the old settings to run configure and do the build.
-
-# Build with the configure bridge
-bridgeBuild: bridge2configure images
-
-# Bridge from old Makefile ALT settings to configure options
-bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
- bash ./configure $(strip $(shell $(CAT) $<))
-
-# Create a file with configure options created from old Makefile mechanisms.
-$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
- $(RM) $@
- $(CP) $< $@
+# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
+# /usr/ccs/bin/make lacks basically every other flow control mechanism.
+TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
-# Use this file to only change when obvious things have changed
-$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
- $(RM) $@.tmp
- $(MKDIR) -p $(BUILD_DIR_ROOT)
- @$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
-ifdef ARCH_DATA_MODEL
- @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
-endif
-ifdef ALT_PARALLEL_COMPILE_JOBS
- @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
-endif
-ifdef ALT_BOOTDIR
- @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
-endif
-ifdef ALT_CUPS_HEADERS_PATH
- @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
-endif
-ifdef ALT_FREETYPE_HEADERS_PATH
- @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
-endif
- @if [ -f $@ ] ; then \
- if ! $(CMP) $@ $@.tmp > /dev/null ; then \
- $(CP) $@.tmp $@ ; \
- fi ; \
- else \
- $(CP) $@.tmp $@ ; \
- fi
- $(RM) $@.tmp
-
-# Clobber all the built files
-clobber:: bridge2clobber
-bridge2clobber::
- $(RM) $(BUILD_DIR_ROOT)/.bridge2*
- $(RM) $(BUILD_DIR_ROOT)/.deploy_input
-
-# Keep track of phony targets
-PHONY_LIST += bridge2configure bridgeBuild bridge2clobber
-
-###########################################################################
-# Sanity checks (history target)
-#
-
-sanity: checks
-
-# Keep track of user targets
-USER_TARGETS += sanity
-
-###########################################################################
-# Javadocs
-#
-
-javadocs:
- cd common/makefiles && $(MAKE) -f MakefileJavadoc.gmk
-
-# Keep track of user targets
-USER_TARGETS += javadocs
-
-###########################################################################
-# JPRT targets
-
-ifndef JPRT_ARCHIVE_BUNDLE
- JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
+# Assume we have GNU make, but check version.
+ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
+ ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
+ $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
+ endif
endif
-jprt_build_product: DEBUG_LEVEL=release
-jprt_build_product: BUILD_DIRNAME=*-release
-jprt_build_product: jprt_build_generic
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+ makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+ makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+root_dir:=$(dir $(makefile_path))
-jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
-jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
-jprt_build_fastdebug: jprt_build_generic
+# ... and then we can include our helper functions
+include $(root_dir)/common/makefiles/MakeHelpers.gmk
-jprt_build_debug: DEBUG_LEVEL=slowdebug
-jprt_build_debug: BUILD_DIRNAME=*-debug
-jprt_build_debug: jprt_build_generic
-
-jprt_build_generic: $(JPRT_ARCHIVE_BUNDLE)
+$(eval $(call ParseLogLevel))
+$(eval $(call ParseConfAndSpec))
-$(JPRT_ARCHIVE_BUNDLE): bridgeBuild bundles
- $(MKDIR) -p $(@D)
- $(RM) $@
- $(CP) $(BUILD_DIR_ROOT)/$(BUILD_DIRNAME)/bundles/j2sdk-image.zip $@
+# Now determine if we have zero, one or several configurations to build.
+ifeq ($(SPEC),)
+ # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
+else
+ ifeq ($(words $(SPEC)),1)
+ # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
+ include $(root_dir)/common/makefiles/Main.gmk
+ else
+ # We are building multiple configurations.
+ # First, find out the valid targets
+ # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find
+ # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
+ all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \
+ $(MAKE) -p -q -f common/makefiles SPEC=$(firstword $(SPEC)) | \
+ grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
-# Keep track of phony targets
-PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
- jprt_build_generic
+$(all_phony_targets):
+ @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true
+
+ endif
+endif
-###########################################################################
-# Help target
+# Include this after a potential spec file has been included so that the bundles target
+# has access to the spec variables.
+include $(root_dir)/common/makefiles/Jprt.gmk
-HELP_FORMAT=%12s%s\n
+# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
+# If you addd more global targets, please update the variable global_targets in MakeHelpers.
help:
- @$(PRINTF) "# JDK Makefile\n"
- @$(PRINTF) "#\n"
- @$(PRINTF) "# Usage: make [Target]\n"
- @$(PRINTF) "#\n"
- @$(PRINTF) "# $(HELP_FORMAT)" "Target " "Description"
- @$(PRINTF) "# $(HELP_FORMAT)" "------ " "-----------"
- @for i in $(USER_TARGETS) ; do \
- $(MAKE) help_$${i} ; \
- done
- @$(PRINTF) "#\n"
+ $(info )
+ $(info OpenJDK Makefile help)
+ $(info =====================)
+ $(info )
+ $(info Common make targets)
+ $(info . make [default] # Compile all product in langtools, hotspot, jaxp, jaxws,)
+ $(info . # corba and jdk)
+ $(info . make all # Compile everything, all repos and images)
+ $(info . make images # Create complete j2sdk and j2re images)
+ $(info . make overlay-images # Create limited images for sparc 64 bit platforms)
+ $(info . make bootcycle-images # Build images twice, second time with newly build JDK)
+ $(info . make install # Install the generated images locally)
+ $(info . make clean # Remove all files generated by make, but not those)
+ $(info . # generated by configure)
+ $(info . make dist-clean # Remove all files, including configuration)
+ $(info . make help # Give some help on using make)
+ $(info . make test # Run tests, default is all tests (see TEST below))
+ $(info )
+ $(info Targets for specific components)
+ $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images))
+ $(info . make <component> # Build <component> and everything it depends on. )
+ $(info . make <component>-only # Build <component> only, without dependencies. This)
+ $(info . # is faster but can result in incorrect build results!)
+ $(info . make clean-<component> # Remove files generated by make for <component>)
+ $(info )
+ $(info Useful make variables)
+ $(info . make CONF= # Build all configurations (note, assignment is empty))
+ $(info . make CONF=<substring> # Build the configuration(s) with a name matching)
+ $(info . # <substring>)
+ $(info )
+ $(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>)
+ $(info . # Available log levels are:)
+ $(info . # 'warn' (default), 'info', 'debug' and 'trace')
+ $(info . # To see executed command lines, use LOG=debug)
+ $(info )
+ $(info . make JOBS=<n> # Run <n> parallel make jobs)
+ $(info . # Note that -jN does not work as expected!)
+ $(info )
+ $(info . make test TEST=<test> # Only run the given test or tests, e.g.)
+ $(info . # make test TEST="jdk_lang jdk_net")
+ $(info )
-help_all:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Build the entire jdk but not the images"
-help_images:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Create the jdk images for the builds"
-help_deploy:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Create the jdk deploy images from the jdk images"
-help_install:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Create the jdk install bundles from the deploy images"
-help_clean:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Clean and prepare for a fresh build from scratch"
-help_clobber:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Clean and also purge any hidden derived data"
-help_checks:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Perform various checks to make sure we can build"
-help_sanity:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Same as 'make checks'"
-help_javadocs:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Build the javadocs"
-help_help:
- @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \
- "Print out the help messages"
-
-# Keep track of user targets
-USER_TARGETS += help
-
-###########################################################################
-# Phony targets
-.PHONY: $(PHONY_LIST) $(USER_TARGETS)
-
-# Force target
-FRC:
+.PHONY: help
--- a/common/autoconf/Makefile.in Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/Makefile.in Thu Jan 31 10:22:25 2013 -0800
@@ -24,4 +24,4 @@
# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
# GENERATED FILE, DO NOT EDIT
SPEC:=@OUTPUT_ROOT@/spec.gmk
-include @SRC_ROOT@/common/makefiles/Makefile
+include @SRC_ROOT@/NewMakefile.gmk
--- a/common/autoconf/autogen.sh Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/autogen.sh Thu Jan 31 10:22:25 2013 -0800
@@ -26,9 +26,11 @@
# Create a timestamp as seconds since epoch
if test "x`uname -s`" = "xSunOS"; then
- # date +%s is not available on Solaris, use this workaround
- # from http://solarisjedi.blogspot.co.uk/2006/06/solaris-date-command-and-epoch-time.html
- TIMESTAMP=`/usr/bin/truss /usr/bin/date 2>&1 | nawk -F= '/^time\(\)/ {gsub(/ /,"",$2);print $2}'`
+ TIMESTAMP=`date +%s`
+ if test "x$TIMESTAMP" = "x%s"; then
+ # date +%s not available on this Solaris, use workaround from nawk(1):
+ TIMESTAMP=`nawk 'BEGIN{print srand()}'`
+ fi
else
TIMESTAMP=`date +%s`
fi
--- a/common/autoconf/basics.m4 Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/basics.m4 Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -234,7 +234,9 @@
BASIC_REQUIRE_PROG(CAT, cat)
BASIC_REQUIRE_PROG(CHMOD, chmod)
BASIC_REQUIRE_PROG(CMP, cmp)
+BASIC_REQUIRE_PROG(COMM, comm)
BASIC_REQUIRE_PROG(CP, cp)
+BASIC_REQUIRE_PROG(CPIO, cpio)
BASIC_REQUIRE_PROG(CUT, cut)
BASIC_REQUIRE_PROG(DATE, date)
BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
@@ -633,6 +635,18 @@
fi
])
+# Check that source files have basic read permissions set. This might
+# not be the case in cygwin in certain conditions.
+AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
+[
+ if test x"$OPENJDK_BUILD_OS" = xwindows; then
+ file_to_test="$SRC_ROOT/LICENSE"
+ if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
+ AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
+ fi
+ fi
+])
+
AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
[
@@ -642,6 +656,8 @@
[OUTPUT_DIR_IS_LOCAL="no"])
AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
+BASIC_CHECK_SRC_PERMS
+
# Check if the user has any old-style ALT_ variables set.
FOUND_ALT_VARIABLES=`env | grep ^ALT_`
--- a/common/autoconf/basics_windows.m4 Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/basics_windows.m4 Thu Jan 31 10:22:25 2013 -0800
@@ -175,7 +175,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -191,7 +191,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
--- a/common/autoconf/build-aux/autoconf-config.guess Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/build-aux/autoconf-config.guess Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,29 @@
#! /bin/sh
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
--- a/common/autoconf/build-aux/config.sub Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/build-aux/config.sub Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,30 @@
#! /bin/sh
+
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
--- a/common/autoconf/build-aux/pkg.m4 Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/build-aux/pkg.m4 Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,30 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
--- a/common/autoconf/closed.version.numbers Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LAUNCHER_NAME=java
-PRODUCT_NAME="Java(TM)"
-PRODUCT_SUFFIX="SE Runtime Environment"
-JDK_RC_PLATFORM_NAME="Platform SE"
-COMPANY_NAME="Oracle Corporation"
-
-# Might need better names for these
-MACOSX_BUNDLE_NAME_BASE="Java SE"
-MACOSX_BUNDLE_ID_BASE="com.oracle.java"
--- a/common/autoconf/compare.sh.in Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/compare.sh.in Thu Jan 31 10:22:25 2013 -0800
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap"
LDD="@LDD@"
MKDIR="@MKDIR@"
+NAWK="@NAWK@"
NM="@NM@"
OBJDUMP="@OBJDUMP@"
OTOOL="@OTOOL@"
--- a/common/autoconf/configure.ac Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/configure.ac Thu Jan 31 10:22:25 2013 -0800
@@ -83,6 +83,9 @@
BASIC_SETUP_PATHS
BASIC_SETUP_LOGGING
+# Check if it's a pure open build or if custom sources are to be used.
+JDKOPT_SETUP_OPEN_OR_CUSTOM
+
# These are needed to be able to create a configuration name (and thus the output directory)
JDKOPT_SETUP_JDK_VARIANT
JDKOPT_SETUP_JVM_VARIANTS
--- a/common/autoconf/generated-configure.sh Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/generated-configure.sh Thu Jan 31 10:22:25 2013 -0800
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for OpenJDK jdk8.
+# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
#
# Report bugs to <build-dev@openjdk.java.net>.
#
@@ -91,7 +91,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -217,18 +216,11 @@
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -760,10 +752,7 @@
JAVA_CHECK
JAVAC_CHECK
COOKED_BUILD_NUMBER
-FULL_VERSION
-RELEASE
JDK_VERSION
-RUNTIME_NAME
COPYRIGHT_YEAR
MACOSX_BUNDLE_ID_BASE
MACOSX_BUNDLE_NAME_BASE
@@ -778,6 +767,7 @@
JDK_MICRO_VERSION
JDK_MINOR_VERSION
JDK_MAJOR_VERSION
+USER_RELEASE_SUFFIX
COMPRESS_JARS
UNLIMITED_CRYPTO
CACERTS_FILE
@@ -785,14 +775,12 @@
BUILD_HEADLESS
SUPPORT_HEADFUL
SUPPORT_HEADLESS
-SET_OPENJDK
BDEPS_FTP
BDEPS_UNZIP
OS_VERSION_MICRO
OS_VERSION_MINOR
OS_VERSION_MAJOR
PKG_CONFIG
-COMM
TIME
STAT
HG
@@ -825,6 +813,7 @@
JVM_VARIANT_SERVER
JVM_VARIANTS
JDK_VARIANT
+SET_OPENJDK
BUILD_LOG_WRAPPER
BUILD_LOG_PREVIOUS
BUILD_LOG
@@ -908,7 +897,9 @@
DIFF
DATE
CUT
+CPIO
CP
+COMM
CMP
CHMOD
CAT
@@ -963,6 +954,7 @@
with_sys_root
with_tools_dir
with_devkit
+enable_openjdk_only
with_jdk_variant
with_jvm_variants
enable_debug
@@ -972,11 +964,13 @@
with_builddeps_server
with_builddeps_dir
with_builddeps_group
-enable_openjdk_only
enable_headful
enable_hotspot_test_in_build
with_cacerts_file
enable_unlimited_crypto
+with_milestone
+with_build_number
+with_user_release_suffix
with_boot_jdk
with_boot_jdk_jvmargs
with_add_source_root
@@ -1439,7 +1433,7 @@
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
@@ -1655,10 +1649,10 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-openjdk-only suppress building custom source even if present
+ [disabled]
--enable-debug set the debug level to fastdebug (shorthand for
--with-debug-level=fastdebug) [disabled]
- --enable-openjdk-only supress building closed source even if present
- [disabled]
--disable-headful disable building headful support (graphical UI
support) [enabled]
--enable-hotspot-test-in-build
@@ -1706,6 +1700,11 @@
--with-builddeps-group chgrp the downloaded build dependencies to this
group
--with-cacerts-file specify alternative cacerts file
+ --with-milestone Set milestone value for build [internal]
+ --with-build-number Set build number value for build [b00]
+ --with-user-release-suffix
+ Add a custom string to the version string if build
+ number isn't set.[username_builddateb00]
--with-boot-jdk path to Boot JDK (used to bootstrap build) [probed]
--with-boot-jdk-jvmargs specify JVM arguments to be passed to all
invocations of the Boot JDK, overriding the default
@@ -1859,7 +1858,7 @@
if $ac_init_version; then
cat <<\_ACEOF
OpenJDK configure jdk8
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -1905,7 +1904,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1943,7 +1942,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
@@ -1981,7 +1980,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_objc_try_compile
@@ -2018,7 +2017,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -2055,7 +2054,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
@@ -2068,10 +2067,10 @@
ac_fn_cxx_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
+ if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2138,7 +2137,7 @@
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2147,7 +2146,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_cxx_check_header_mongrel
@@ -2188,7 +2187,7 @@
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_run
@@ -2202,7 +2201,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2220,7 +2219,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_cxx_check_header_compile
@@ -2397,7 +2396,7 @@
rm -f conftest.val
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_compute_int
@@ -2443,7 +2442,7 @@
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
@@ -2456,7 +2455,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2511,7 +2510,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_cxx_check_func
@@ -2524,7 +2523,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2542,7 +2541,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_compile
cat >config.log <<_ACEOF
@@ -2550,7 +2549,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by OpenJDK $as_me jdk8, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2808,7 +2807,7 @@
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
@@ -2928,6 +2927,32 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
@@ -2991,7 +3016,7 @@
# Include these first...
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -3088,6 +3113,10 @@
# Argument 3: what to do otherwise (remote disk or failure)
+# Check that source files have basic read permissions set. This might
+# not be the case in cygwin in certain conditions.
+
+
#
@@ -3402,7 +3431,7 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -3433,7 +3462,18 @@
-
+###############################################################################
+#
+# Should we build only OpenJDK even if closed sources are present?
+#
+
+
+
+
+###############################################################################
+#
+# Setup version numbers
+#
@@ -3683,7 +3723,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1355963953
+DATE_WHEN_GENERATED=1359376859
###############################################################################
#
@@ -3721,7 +3761,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASENAME+:} false; then :
+if test "${ac_cv_path_BASENAME+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BASENAME in
@@ -3780,7 +3820,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASH+:} false; then :
+if test "${ac_cv_path_BASH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BASH in
@@ -3839,7 +3879,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CAT+:} false; then :
+if test "${ac_cv_path_CAT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CAT in
@@ -3898,7 +3938,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHMOD+:} false; then :
+if test "${ac_cv_path_CHMOD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHMOD in
@@ -3957,7 +3997,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CMP+:} false; then :
+if test "${ac_cv_path_CMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CMP in
@@ -4010,13 +4050,72 @@
+ for ac_prog in comm
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_COMM+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $COMM in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+COMM=$ac_cv_path_COMM
+if test -n "$COMM"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
+$as_echo "$COMM" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$COMM" && break
+done
+
+
+ if test "x$COMM" = x; then
+ if test "xcomm" = x; then
+ PROG_NAME=comm
+ else
+ PROG_NAME=comm
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in cp
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CP+:} false; then :
+if test "${ac_cv_path_CP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CP in
@@ -4069,13 +4168,72 @@
+ for ac_prog in cpio
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CPIO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $CPIO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+CPIO=$ac_cv_path_CPIO
+if test -n "$CPIO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
+$as_echo "$CPIO" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CPIO" && break
+done
+
+
+ if test "x$CPIO" = x; then
+ if test "xcpio" = x; then
+ PROG_NAME=cpio
+ else
+ PROG_NAME=cpio
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
+$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
+ as_fn_error $? "Cannot continue" "$LINENO" 5
+ fi
+
+
+
for ac_prog in cut
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CUT+:} false; then :
+if test "${ac_cv_path_CUT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CUT in
@@ -4134,7 +4292,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DATE+:} false; then :
+if test "${ac_cv_path_DATE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $DATE in
@@ -4193,7 +4351,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DIFF+:} false; then :
+if test "${ac_cv_path_DIFF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $DIFF in
@@ -4252,7 +4410,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DIRNAME+:} false; then :
+if test "${ac_cv_path_DIRNAME+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $DIRNAME in
@@ -4311,7 +4469,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ECHO+:} false; then :
+if test "${ac_cv_path_ECHO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ECHO in
@@ -4370,7 +4528,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_EXPR+:} false; then :
+if test "${ac_cv_path_EXPR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $EXPR in
@@ -4429,7 +4587,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FILE+:} false; then :
+if test "${ac_cv_path_FILE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $FILE in
@@ -4488,7 +4646,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FIND+:} false; then :
+if test "${ac_cv_path_FIND+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $FIND in
@@ -4547,7 +4705,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_HEAD+:} false; then :
+if test "${ac_cv_path_HEAD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $HEAD in
@@ -4606,7 +4764,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LN+:} false; then :
+if test "${ac_cv_path_LN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $LN in
@@ -4665,7 +4823,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LS+:} false; then :
+if test "${ac_cv_path_LS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $LS in
@@ -4724,7 +4882,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MKDIR+:} false; then :
+if test "${ac_cv_path_MKDIR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MKDIR in
@@ -4783,7 +4941,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MKTEMP+:} false; then :
+if test "${ac_cv_path_MKTEMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MKTEMP in
@@ -4842,7 +5000,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MV+:} false; then :
+if test "${ac_cv_path_MV+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MV in
@@ -4901,7 +5059,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PRINTF+:} false; then :
+if test "${ac_cv_path_PRINTF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PRINTF in
@@ -4960,7 +5118,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_THEPWDCMD+:} false; then :
+if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $THEPWDCMD in
@@ -5019,7 +5177,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RM+:} false; then :
+if test "${ac_cv_path_RM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $RM in
@@ -5078,7 +5236,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SH+:} false; then :
+if test "${ac_cv_path_SH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $SH in
@@ -5137,7 +5295,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SORT+:} false; then :
+if test "${ac_cv_path_SORT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $SORT in
@@ -5196,7 +5354,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TAIL+:} false; then :
+if test "${ac_cv_path_TAIL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TAIL in
@@ -5255,7 +5413,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TAR+:} false; then :
+if test "${ac_cv_path_TAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TAR in
@@ -5314,7 +5472,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TEE+:} false; then :
+if test "${ac_cv_path_TEE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TEE in
@@ -5373,7 +5531,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOUCH+:} false; then :
+if test "${ac_cv_path_TOUCH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TOUCH in
@@ -5432,7 +5590,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TR+:} false; then :
+if test "${ac_cv_path_TR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TR in
@@ -5491,7 +5649,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNAME+:} false; then :
+if test "${ac_cv_path_UNAME+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $UNAME in
@@ -5550,7 +5708,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNIQ+:} false; then :
+if test "${ac_cv_path_UNIQ+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $UNIQ in
@@ -5609,7 +5767,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WC+:} false; then :
+if test "${ac_cv_path_WC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $WC in
@@ -5668,7 +5826,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WHICH+:} false; then :
+if test "${ac_cv_path_WHICH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $WHICH in
@@ -5727,7 +5885,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XARGS+:} false; then :
+if test "${ac_cv_path_XARGS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $XARGS in
@@ -5787,7 +5945,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -5837,7 +5995,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -5912,7 +6070,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5991,7 +6149,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
+if test "${ac_cv_path_FGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6070,7 +6228,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
+if test "${ac_cv_path_SED+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -6156,7 +6314,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NAWK+:} false; then :
+if test "${ac_cv_path_NAWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $NAWK in
@@ -6216,7 +6374,7 @@
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CYGPATH+:} false; then :
+if test "${ac_cv_path_CYGPATH+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CYGPATH in
@@ -6256,7 +6414,7 @@
set dummy readlink; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_READLINK+:} false; then :
+if test "${ac_cv_path_READLINK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $READLINK in
@@ -6296,7 +6454,7 @@
set dummy df; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DF+:} false; then :
+if test "${ac_cv_path_DF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $DF in
@@ -6336,7 +6494,7 @@
set dummy SetFile; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SETFILE+:} false; then :
+if test "${ac_cv_path_SETFILE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $SETFILE in
@@ -6382,7 +6540,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
@@ -6398,7 +6556,7 @@
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -6416,7 +6574,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
@@ -6431,7 +6589,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -6449,7 +6607,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
+if test "${ac_cv_target+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
@@ -6464,7 +6622,7 @@
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -7355,6 +7513,53 @@
+# Check if it's a pure open build or if custom sources are to be used.
+
+ # Check whether --enable-openjdk-only was given.
+if test "${enable_openjdk_only+set}" = set; then :
+ enableval=$enable_openjdk_only;
+else
+ enable_openjdk_only="no"
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5
+$as_echo_n "checking for presence of closed sources... " >&6; }
+ if test -d "$SRC_ROOT/jdk/src/closed"; then
+ CLOSED_SOURCE_PRESENT=yes
+ else
+ CLOSED_SOURCE_PRESENT=no
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5
+$as_echo "$CLOSED_SOURCE_PRESENT" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is suppressed (openjdk-only)" >&5
+$as_echo_n "checking if closed source is suppressed (openjdk-only)... " >&6; }
+ SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPPRESS_CLOSED_SOURCE" >&5
+$as_echo "$SUPPRESS_CLOSED_SOURCE" >&6; }
+
+ if test "x$CLOSED_SOURCE_PRESENT" = xno; then
+ OPENJDK=true
+ if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5
+$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;}
+ fi
+ else
+ if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
+ OPENJDK=true
+ else
+ OPENJDK=false
+ fi
+ fi
+
+ if test "x$OPENJDK" = "xtrue"; then
+ SET_OPENJDK="OPENJDK=true"
+ fi
+
+
+
+
# These are needed to be able to create a configuration name (and thus the output directory)
###############################################################################
@@ -7584,7 +7789,7 @@
# from configure, but only server is valid anyway. Fix this
# when hotspot makefiles are rewritten.
if test "x$MACOSX_UNIVERSAL" = xtrue; then
- HOTSPOT_TARGET=universal_product
+ HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
fi
#####
@@ -7883,7 +8088,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PKGHANDLER+:} false; then :
+if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PKGHANDLER"; then
@@ -7985,7 +8190,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -8001,7 +8206,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -8248,7 +8453,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_GMAKE+:} false; then :
+if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_GMAKE in
@@ -8342,7 +8547,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -8358,7 +8563,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -8602,7 +8807,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_MAKE+:} false; then :
+if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_MAKE in
@@ -8696,7 +8901,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -8712,7 +8917,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -8961,7 +9166,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
+if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_TOOLSDIR_GMAKE in
@@ -9055,7 +9260,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -9071,7 +9276,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -9314,7 +9519,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
+if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_TOOLSDIR_MAKE in
@@ -9408,7 +9613,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -9424,7 +9629,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -9710,7 +9915,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNZIP+:} false; then :
+if test "${ac_cv_path_UNZIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $UNZIP in
@@ -9769,7 +9974,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ZIP+:} false; then :
+if test "${ac_cv_path_ZIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ZIP in
@@ -9828,7 +10033,7 @@
set dummy ldd; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LDD+:} false; then :
+if test "${ac_cv_path_LDD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $LDD in
@@ -9874,7 +10079,7 @@
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OTOOL+:} false; then :
+if test "${ac_cv_path_OTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $OTOOL in
@@ -9919,7 +10124,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_READELF+:} false; then :
+if test "${ac_cv_path_READELF+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $READELF in
@@ -9962,7 +10167,7 @@
set dummy hg; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_HG+:} false; then :
+if test "${ac_cv_path_HG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $HG in
@@ -10002,7 +10207,7 @@
set dummy stat; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_STAT+:} false; then :
+if test "${ac_cv_path_STAT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $STAT in
@@ -10042,7 +10247,7 @@
set dummy time; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TIME+:} false; then :
+if test "${ac_cv_path_TIME+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TIME in
@@ -10087,7 +10292,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMM+:} false; then :
+if test "${ac_cv_path_COMM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $COMM in
@@ -10151,7 +10356,7 @@
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -10194,7 +10399,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -10367,7 +10572,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
+if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$BDEPS_UNZIP"; then
@@ -10413,7 +10618,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_BDEPS_FTP+:} false; then :
+if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$BDEPS_FTP"; then
@@ -10462,54 +10667,6 @@
###############################################################################
#
-# Should we build only OpenJDK even if closed sources are present?
-#
-# Check whether --enable-openjdk-only was given.
-if test "${enable_openjdk_only+set}" = set; then :
- enableval=$enable_openjdk_only;
-else
- enable_openjdk_only="no"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5
-$as_echo_n "checking for presence of closed sources... " >&6; }
-if test -d "$SRC_ROOT/jdk/src/closed"; then
- CLOSED_SOURCE_PRESENT=yes
-else
- CLOSED_SOURCE_PRESENT=no
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5
-$as_echo "$CLOSED_SOURCE_PRESENT" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is supressed (openjdk-only)" >&5
-$as_echo_n "checking if closed source is supressed (openjdk-only)... " >&6; }
-SUPRESS_CLOSED_SOURCE="$enable_openjdk_only"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPRESS_CLOSED_SOURCE" >&5
-$as_echo "$SUPRESS_CLOSED_SOURCE" >&6; }
-
-if test "x$CLOSED_SOURCE_PRESENT" = xno; then
- OPENJDK=true
- if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5
-$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;}
- fi
-else
- if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
- OPENJDK=true
- else
- OPENJDK=false
- fi
-fi
-
-if test "x$OPENJDK" = "xtrue"; then
- SET_OPENJDK="OPENJDK=true"
-fi
-
-
-
-###############################################################################
-#
# Should we build a JDK/JVM with headful support (ie a graphical ui)?
# We always build headless support.
#
@@ -10608,10 +10765,56 @@
# Source the version numbers
-. $AUTOCONF_DIR/version.numbers
-if test "x$OPENJDK" = "xfalse"; then
- . $AUTOCONF_DIR/closed.version.numbers
-fi
+. $AUTOCONF_DIR/version-numbers
+
+# Get the settings from parameters
+
+# Check whether --with-milestone was given.
+if test "${with_milestone+set}" = set; then :
+ withval=$with_milestone;
+fi
+
+if test "x$with_milestone" = xyes; then
+ as_fn_error $? "Milestone must have a value" "$LINENO" 5
+elif test "x$with_milestone" != x; then
+ MILESTONE="$with_milestone"
+else
+ MILESTONE=internal
+fi
+
+
+# Check whether --with-build-number was given.
+if test "${with_build_number+set}" = set; then :
+ withval=$with_build_number;
+fi
+
+if test "x$with_build_number" = xyes; then
+ as_fn_error $? "Build number must have a value" "$LINENO" 5
+elif test "x$with_build_number" != x; then
+ JDK_BUILD_NUMBER="$with_build_number"
+fi
+if test "x$JDK_BUILD_NUMBER" = x; then
+ JDK_BUILD_NUMBER=b00
+fi
+
+
+# Check whether --with-user-release-suffix was given.
+if test "${with_user_release_suffix+set}" = set; then :
+ withval=$with_user_release_suffix;
+fi
+
+if test "x$with_user_release_suffix" = xyes; then
+ as_fn_error $? "Release suffix must have a value" "$LINENO" 5
+elif test "x$with_user_release_suffix" != x; then
+ USER_RELEASE_SUFFIX="$with_user_release_suffix"
+else
+ BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
+ # Avoid [:alnum:] since it depends on the locale.
+ CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
+ USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+fi
+
+
# Now set the JDK version, milestone, build number etc.
@@ -10630,33 +10833,12 @@
COPYRIGHT_YEAR=`date +'%Y'`
-RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
-
-
if test "x$JDK_UPDATE_VERSION" != x; then
- JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
-else
- JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
-fi
-
-
-if test "x$MILESTONE" != x; then
- RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}"
-else
- RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}"
-fi
-
-
-if test "x$JDK_BUILD_NUMBER" != x; then
- FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}"
-else
- JDK_BUILD_NUMBER=b00
- BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
- # Avoid [:alnum:] since it depends on the locale.
- CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
- USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
-fi
+ JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
+else
+ JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
+fi
+
COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
@@ -11702,7 +11884,7 @@
set dummy javac; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAC_CHECK+:} false; then :
+if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $JAVAC_CHECK in
@@ -11742,7 +11924,7 @@
set dummy java; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVA_CHECK+:} false; then :
+if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $JAVA_CHECK in
@@ -15801,7 +15983,7 @@
set dummy link; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CYGWIN_LINK+:} false; then :
+if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CYGWIN_LINK in
@@ -16248,7 +16430,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -16264,7 +16446,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -16790,7 +16972,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CC+:} false; then :
+if test "${ac_cv_path_BUILD_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_CC in
@@ -16848,7 +17030,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -16864,7 +17046,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -17101,7 +17283,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_CXX+:} false; then :
+if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_CXX in
@@ -17159,7 +17341,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -17175,7 +17357,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -17410,7 +17592,7 @@
set dummy ld; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BUILD_LD+:} false; then :
+if test "${ac_cv_path_BUILD_LD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_LD in
@@ -17465,7 +17647,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -17481,7 +17663,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -17922,7 +18104,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
+if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TOOLS_DIR_CC in
@@ -17974,7 +18156,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_POTENTIAL_CC+:} false; then :
+if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $POTENTIAL_CC in
@@ -18063,7 +18245,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -18079,7 +18261,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -18387,7 +18569,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
+if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PROPER_COMPILER_CC"; then
@@ -18431,7 +18613,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PROPER_COMPILER_CC"; then
@@ -18499,7 +18681,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -18515,7 +18697,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -18881,7 +19063,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -18925,7 +19107,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -18978,7 +19160,7 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -19093,7 +19275,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -19136,7 +19318,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -19195,7 +19377,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
fi
fi
@@ -19206,7 +19388,7 @@
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19247,7 +19429,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -19257,7 +19439,7 @@
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19294,7 +19476,7 @@
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -19372,7 +19554,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -19491,7 +19673,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
+if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TOOLS_DIR_CXX in
@@ -19543,7 +19725,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
+if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $POTENTIAL_CXX in
@@ -19632,7 +19814,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -19648,7 +19830,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -19956,7 +20138,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
+if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PROPER_COMPILER_CXX"; then
@@ -20000,7 +20182,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
@@ -20068,7 +20250,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -20084,7 +20266,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -20454,7 +20636,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -20498,7 +20680,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -20576,7 +20758,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20613,7 +20795,7 @@
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -20711,7 +20893,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJC+:} false; then :
+if test "${ac_cv_prog_OBJC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJC"; then
@@ -20755,7 +20937,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJC"; then
@@ -20831,7 +21013,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
-if ${ac_cv_objc_compiler_gnu+:} false; then :
+if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20868,7 +21050,7 @@
ac_save_OBJCFLAGS=$OBJCFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
$as_echo_n "checking whether $OBJC accepts -g... " >&6; }
-if ${ac_cv_prog_objc_g+:} false; then :
+if test "${ac_cv_prog_objc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_objc_werror_flag=$ac_objc_werror_flag
@@ -20969,7 +21151,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -20985,7 +21167,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -21244,7 +21426,7 @@
set dummy ${ac_tool_prefix}ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -21284,7 +21466,7 @@
set dummy ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -21350,7 +21532,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -21366,7 +21548,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -21626,7 +21808,7 @@
set dummy link; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINLD+:} false; then :
+if test "${ac_cv_prog_WINLD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$WINLD"; then
@@ -21697,7 +21879,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -21713,7 +21895,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -21965,7 +22147,7 @@
set dummy mt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MT+:} false; then :
+if test "${ac_cv_prog_MT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$MT"; then
@@ -22034,7 +22216,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -22050,7 +22232,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -22286,7 +22468,7 @@
set dummy rc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RC+:} false; then :
+if test "${ac_cv_prog_RC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RC"; then
@@ -22355,7 +22537,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -22371,7 +22553,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -22677,7 +22859,7 @@
set dummy lib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_WINAR+:} false; then :
+if test "${ac_cv_prog_WINAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$WINAR"; then
@@ -22729,7 +22911,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -22745,7 +22927,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -22983,7 +23165,7 @@
set dummy dumpbin; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -23035,7 +23217,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -23051,7 +23233,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -23302,7 +23484,7 @@
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -23418,7 +23600,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=cpp
@@ -23446,7 +23628,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -23462,7 +23644,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -23702,7 +23884,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
if test -z "$CXXCPP"; then
- if ${ac_cv_prog_CXXCPP+:} false; then :
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
@@ -23818,7 +24000,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=cpp
@@ -23846,7 +24028,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -23862,7 +24044,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -24120,7 +24302,7 @@
set dummy as; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_AS+:} false; then :
+if test "${ac_cv_path_AS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $AS in
@@ -24175,7 +24357,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -24191,7 +24373,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -24434,7 +24616,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NM+:} false; then :
+if test "${ac_cv_path_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $NM in
@@ -24492,7 +24674,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -24508,7 +24690,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -24743,7 +24925,7 @@
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_STRIP+:} false; then :
+if test "${ac_cv_path_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $STRIP in
@@ -24798,7 +24980,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -24814,7 +24996,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -25049,7 +25231,7 @@
set dummy mcs; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
+if test "${ac_cv_path_MCS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MCS in
@@ -25104,7 +25286,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -25120,7 +25302,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -25357,7 +25539,7 @@
set dummy ${ac_tool_prefix}nm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NM+:} false; then :
+if test "${ac_cv_prog_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -25397,7 +25579,7 @@
set dummy nm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NM+:} false; then :
+if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NM"; then
@@ -25463,7 +25645,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -25479,7 +25661,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -25715,7 +25897,7 @@
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -25755,7 +25937,7 @@
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -25821,7 +26003,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -25837,7 +26019,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -26080,7 +26262,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJCOPY+:} false; then :
+if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJCOPY"; then
@@ -26124,7 +26306,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJCOPY"; then
@@ -26194,7 +26376,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -26210,7 +26392,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -26451,7 +26633,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -26495,7 +26677,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -26565,7 +26747,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -26581,7 +26763,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -26819,7 +27001,7 @@
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LIPO+:} false; then :
+if test "${ac_cv_path_LIPO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $LIPO in
@@ -26874,7 +27056,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -26890,7 +27072,7 @@
# bat and cmd files are not always considered executable in cygwin causing which
# to not find them
if test "x$new_path" = x \
- && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
+ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then
new_path=`$CYGPATH -u "$path"`
fi
@@ -27134,7 +27316,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27310,7 +27492,7 @@
for ac_header in stdio.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdio_h" = xyes; then :
+if test "x$ac_cv_header_stdio_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STDIO_H 1
_ACEOF
@@ -27339,7 +27521,7 @@
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
$as_echo_n "checking size of int *... " >&6; }
-if ${ac_cv_sizeof_int_p+:} false; then :
+if test "${ac_cv_sizeof_int_p+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then :
@@ -27349,7 +27531,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (int *)
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
ac_cv_sizeof_int_p=0
fi
@@ -27396,7 +27578,7 @@
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
@@ -28396,8 +28578,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
- *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
@@ -28674,7 +28856,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28708,14 +28890,14 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28749,7 +28931,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
@@ -28768,14 +28950,14 @@
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = xyes; then :
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
fi
if test $ac_cv_func_gethostbyname = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28809,14 +28991,14 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
if test $ac_cv_lib_nsl_gethostbyname = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28850,7 +29032,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
@@ -28865,14 +29047,14 @@
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
+if test "x$ac_cv_func_connect" = x""yes; then :
fi
if test $ac_cv_func_connect = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
$as_echo_n "checking for connect in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_connect+:} false; then :
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28906,7 +29088,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = xyes; then :
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
@@ -28914,14 +29096,14 @@
# Guillermo Gomez says -lposix is necessary on A/UX.
ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = xyes; then :
+if test "x$ac_cv_func_remove" = x""yes; then :
fi
if test $ac_cv_func_remove = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
$as_echo_n "checking for remove in -lposix... " >&6; }
-if ${ac_cv_lib_posix_remove+:} false; then :
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -28955,7 +29137,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = xyes; then :
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
@@ -28963,14 +29145,14 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = xyes; then :
+if test "x$ac_cv_func_shmat" = x""yes; then :
fi
if test $ac_cv_func_shmat = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
$as_echo_n "checking for shmat in -lipc... " >&6; }
-if ${ac_cv_lib_ipc_shmat+:} false; then :
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29004,7 +29186,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
@@ -29022,7 +29204,7 @@
# John Interrante, Karl Berry
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -29056,7 +29238,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
@@ -30063,7 +30245,7 @@
LDFLAGS="$FREETYPE2_LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
$as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
-if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
+if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30097,7 +30279,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
$as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
-if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
+if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
FREETYPE2_FOUND=true
else
as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
@@ -30385,7 +30567,7 @@
for ac_header in alsa/asoundlib.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
+if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ALSA_ASOUNDLIB_H 1
_ACEOF
@@ -30444,7 +30626,7 @@
USE_EXTERNAL_LIBJPEG=true
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
$as_echo_n "checking for main in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_main+:} false; then :
+if test "${ac_cv_lib_jpeg_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30472,7 +30654,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
$as_echo "$ac_cv_lib_jpeg_main" >&6; }
-if test "x$ac_cv_lib_jpeg_main" = xyes; then :
+if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
@@ -30496,7 +30678,7 @@
USE_EXTERNAL_LIBJPEG=true
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
$as_echo_n "checking for main in -lgif... " >&6; }
-if ${ac_cv_lib_gif_main+:} false; then :
+if test "${ac_cv_lib_gif_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30524,7 +30706,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
$as_echo "$ac_cv_lib_gif_main" >&6; }
-if test "x$ac_cv_lib_gif_main" = xyes; then :
+if test "x$ac_cv_lib_gif_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGIF 1
_ACEOF
@@ -30554,7 +30736,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
$as_echo_n "checking for compress in -lz... " >&6; }
-if ${ac_cv_lib_z_compress+:} false; then :
+if test "${ac_cv_lib_z_compress+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30588,7 +30770,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
$as_echo "$ac_cv_lib_z_compress" >&6; }
-if test "x$ac_cv_lib_z_compress" = xyes; then :
+if test "x$ac_cv_lib_z_compress" = x""yes; then :
ZLIB_FOUND=yes
else
ZLIB_FOUND=no
@@ -30681,7 +30863,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
$as_echo_n "checking for cos in -lm... " >&6; }
-if ${ac_cv_lib_m_cos+:} false; then :
+if test "${ac_cv_lib_m_cos+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30715,7 +30897,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes; then :
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -30739,7 +30921,7 @@
LIBS=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30773,7 +30955,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
_ACEOF
@@ -31010,7 +31192,7 @@
# The name of the Service Agent jar.
SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
- SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
+ SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
fi
@@ -31417,7 +31599,7 @@
set dummy ccache; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CCACHE+:} false; then :
+if test "${ac_cv_path_CCACHE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CCACHE in
@@ -31546,6 +31728,14 @@
# Check for some common pitfalls
+ if test x"$OPENJDK_BUILD_OS" = xwindows; then
+ file_to_test="$SRC_ROOT/LICENSE"
+ if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
+ as_fn_error $? "Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin." "$LINENO" 5
+ fi
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5
$as_echo_n "checking if build directory is on local disk... " >&6; }
@@ -31576,6 +31766,8 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5
$as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; }
+
+
# Check if the user has any old-style ALT_ variables set.
FOUND_ALT_VARIABLES=`env | grep ^ALT_`
@@ -31668,21 +31860,10 @@
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
+ test "x$cache_file" != "x/dev/null" &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
+ cat confcache >$cache_file
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -31714,7 +31895,7 @@
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -31815,7 +31996,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -32123,7 +32303,7 @@
# values after options handling.
ac_log="
This file was extended by OpenJDK $as_me jdk8, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -32186,7 +32366,7 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
OpenJDK config.status jdk8
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -32315,7 +32495,7 @@
"$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
"$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -32337,10 +32517,9 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -32348,13 +32527,12 @@
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -32376,7 +32554,7 @@
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
@@ -32404,7 +32582,7 @@
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -32452,7 +32630,7 @@
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -32484,7 +32662,7 @@
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
@@ -32518,7 +32696,7 @@
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -32530,8 +32708,8 @@
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -32632,7 +32810,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -32651,7 +32829,7 @@
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -32660,7 +32838,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -32686,8 +32864,8 @@
esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -32812,22 +32990,21 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$ac_tmp/stdin"
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -32838,20 +33015,20 @@
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
+ mv "$tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
;;
--- a/common/autoconf/jdk-options.m4 Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/jdk-options.m4 Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -235,7 +235,7 @@
# from configure, but only server is valid anyway. Fix this
# when hotspot makefiles are rewritten.
if test "x$MACOSX_UNIVERSAL" = xtrue; then
- HOTSPOT_TARGET=universal_product
+ HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
fi
#####
@@ -247,46 +247,50 @@
AC_SUBST(BUILD_VARIANT_RELEASE)
])
-AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
-[
###############################################################################
#
# Should we build only OpenJDK even if closed sources are present?
#
-AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
- [supress building closed source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
+AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
+[
+ AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
+ [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
-AC_MSG_CHECKING([for presence of closed sources])
-if test -d "$SRC_ROOT/jdk/src/closed"; then
+ AC_MSG_CHECKING([for presence of closed sources])
+ if test -d "$SRC_ROOT/jdk/src/closed"; then
CLOSED_SOURCE_PRESENT=yes
-else
+ else
CLOSED_SOURCE_PRESENT=no
-fi
-AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
+ fi
+ AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
-AC_MSG_CHECKING([if closed source is supressed (openjdk-only)])
-SUPRESS_CLOSED_SOURCE="$enable_openjdk_only"
-AC_MSG_RESULT([$SUPRESS_CLOSED_SOURCE])
+ AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)])
+ SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
+ AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE])
-if test "x$CLOSED_SOURCE_PRESENT" = xno; then
- OPENJDK=true
- if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
- AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
- fi
-else
- if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
+ if test "x$CLOSED_SOURCE_PRESENT" = xno; then
OPENJDK=true
+ if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
+ AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
+ fi
else
- OPENJDK=false
+ if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
+ OPENJDK=true
+ else
+ OPENJDK=false
+ fi
fi
-fi
-if test "x$OPENJDK" = "xtrue"; then
+ if test "x$OPENJDK" = "xtrue"; then
SET_OPENJDK="OPENJDK=true"
-fi
+ fi
-AC_SUBST(SET_OPENJDK)
+ AC_SUBST(SET_OPENJDK)
+])
+
+AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
+[
###############################################################################
#
@@ -369,13 +373,52 @@
AC_SUBST(COMPRESS_JARS)
])
+###############################################################################
+#
+# Setup version numbers
+#
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
[
# Source the version numbers
-. $AUTOCONF_DIR/version.numbers
-if test "x$OPENJDK" = "xfalse"; then
- . $AUTOCONF_DIR/closed.version.numbers
+. $AUTOCONF_DIR/version-numbers
+
+# Get the settings from parameters
+AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
+ [Set milestone value for build @<:@internal@:>@])])
+if test "x$with_milestone" = xyes; then
+ AC_MSG_ERROR([Milestone must have a value])
+elif test "x$with_milestone" != x; then
+ MILESTONE="$with_milestone"
+fi
+if test "x$MILESTONE" = x; then
+ MILESTONE=internal
fi
+
+AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
+ [Set build number value for build @<:@b00@:>@])])
+if test "x$with_build_number" = xyes; then
+ AC_MSG_ERROR([Build number must have a value])
+elif test "x$with_build_number" != x; then
+ JDK_BUILD_NUMBER="$with_build_number"
+fi
+if test "x$JDK_BUILD_NUMBER" = x; then
+ JDK_BUILD_NUMBER=b00
+fi
+
+AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
+ [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
+if test "x$with_user_release_suffix" = xyes; then
+ AC_MSG_ERROR([Release suffix must have a value])
+elif test "x$with_user_release_suffix" != x; then
+ USER_RELEASE_SUFFIX="$with_user_release_suffix"
+else
+ BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
+ # Avoid [:alnum:] since it depends on the locale.
+ CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
+ USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+fi
+AC_SUBST(USER_RELEASE_SUFFIX)
+
# Now set the JDK version, milestone, build number etc.
AC_SUBST(JDK_MAJOR_VERSION)
AC_SUBST(JDK_MINOR_VERSION)
@@ -394,34 +437,13 @@
COPYRIGHT_YEAR=`date +'%Y'`
AC_SUBST(COPYRIGHT_YEAR)
-RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
-AC_SUBST(RUNTIME_NAME)
-
if test "x$JDK_UPDATE_VERSION" != x; then
- JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
+ JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
else
- JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
+ JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
fi
AC_SUBST(JDK_VERSION)
-if test "x$MILESTONE" != x; then
- RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}"
-else
- RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}"
-fi
-AC_SUBST(RELEASE)
-
-if test "x$JDK_BUILD_NUMBER" != x; then
- FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}"
-else
- JDK_BUILD_NUMBER=b00
- BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
- # Avoid [:alnum:] since it depends on the locale.
- CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
- USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
-fi
-AC_SUBST(FULL_VERSION)
COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
AC_SUBST(COOKED_BUILD_NUMBER)
])
@@ -434,7 +456,7 @@
# The name of the Service Agent jar.
SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
- SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
+ SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
fi
AC_SUBST(SALIB_NAME)
--- a/common/autoconf/libraries.m4 Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/libraries.m4 Thu Jan 31 10:22:25 2013 -0800
@@ -136,6 +136,12 @@
AC_PATH_X
AC_PATH_XTRA
+# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
+# this doesn't make sense so we remove it.
+if test "x$COMPILE_TYPE" = xcross; then
+ X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
+fi
+
if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
HELP_MSG_MISSING_DEPENDENCY([x11])
AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
--- a/common/autoconf/spec.gmk.in Thu Jan 31 10:10:34 2013 +0100
+++ b/common/autoconf/spec.gmk.in Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -163,11 +163,22 @@
# Different version strings generated from the above information.
JDK_VERSION:=@JDK_VERSION@
-RUNTIME_NAME:=@RUNTIME_NAME@
-FULL_VERSION:=@FULL_VERSION@
-JRE_RELEASE_VERSION:=@FULL_VERSION@
-RELEASE:=@RELEASE@
+RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
+# These variables need to be generated here so that MILESTONE and
+# JDK_BUILD_NUMBER can be overridden on the make command line.
+ifeq ($(MILESTONE),)
+ RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
+else
+ RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
+endif
+ifeq ($(JDK_BUILD_NUMBER),b00)
+ USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
+ FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER)
+else
+ FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER)
+endif
+JRE_RELEASE_VERSION:=$(FULL_VERSION)
# How to compile the code: release, fastdebug or slowdebug
DEBUG_LEVEL:=@DEBUG_LEVEL@
@@ -220,6 +231,7 @@
HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
+JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release
LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist
CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
@@ -420,6 +432,8 @@
NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii
+JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner
+
# Base flags for RC
# Guarding this against resetting value. Legacy make files include spec multiple
# times.
@@ -440,10 +454,13 @@
# CD is going away, but remains to cater for legacy makefiles.
CD:=cd
CHMOD:=@CHMOD@
+COMM:=@COMM@
CP:=@CP@
+CPIO:=@CPIO@
CUT:=@CUT@
DATE:=@DATE@
DIFF:=@DIFF@
+DIRNAME:=@DIRNAME@
FIND:=@FIND@
FIND_DELETE:=@FIND_DELETE@
ECHO:=@ECHO@
@@ -468,6 +485,7 @@
TIME:=@TIME@
TR:=@TR@
TOUCH:=@TOUCH@
+UNIQ:=@UNIQ@
WC:=@WC@
XARGS:=@XARGS@
ZIPEXE:=@ZIP@
@@ -600,5 +618,21 @@
OS_VERSION_MINOR:=@OS_VERSION_MINOR@
OS_VERSION_MICRO:=@OS_VERSION_MICRO@
+# Images directory definitions
+JDK_IMAGE_SUBDIR:=j2sdk-image
+JRE_IMAGE_SUBDIR:=j2re-image
+JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image
+JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image
+JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
+JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
+JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR)
+JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR)
+
+# Macosx bundles directory definitions
+JDK_BUNDLE_SUBDIR:=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
+JRE_BUNDLE_SUBDIR:=j2re-bundle/jre$(JDK_VERSION).jre/Contents
+JDK_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR)
+JRE_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
+
# Include the custom-spec.gmk file if it exists
-include $(dir @SPEC@)/custom-spec.gmk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/autoconf/version-numbers Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+JDK_MAJOR_VERSION=1
+JDK_MINOR_VERSION=8
+JDK_MICRO_VERSION=0
+JDK_UPDATE_VERSION=
+LAUNCHER_NAME=openjdk
+PRODUCT_NAME=OpenJDK
+PRODUCT_SUFFIX="Runtime Environment"
+JDK_RC_PLATFORM_NAME=Platform
+COMPANY_NAME=N/A
+
+# Might need better names for these
+MACOSX_BUNDLE_NAME_BASE="OpenJDK"
+MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
--- a/common/autoconf/version.numbers Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. 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.
-#
-
-JDK_MAJOR_VERSION=1
-JDK_MINOR_VERSION=8
-JDK_MICRO_VERSION=0
-JDK_UPDATE_VERSION=
-JDK_BUILD_NUMBER=
-MILESTONE=internal
-LAUNCHER_NAME=openjdk
-PRODUCT_NAME=OpenJDK
-PRODUCT_SUFFIX="Runtime Environment"
-JDK_RC_PLATFORM_NAME=Platform
-COMPANY_NAME=N/A
-
-# Might need better names for these
-MACOSX_BUNDLE_NAME_BASE="OpenJDK"
-MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
--- a/common/bin/compare.sh Thu Jan 31 10:10:34 2013 +0100
+++ b/common/bin/compare.sh Thu Jan 31 10:22:25 2013 -0800
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -98,24 +98,30 @@
if test "x$SUFFIX" = "xclass"; then
# To improve performance when large diffs are found, do a rough filtering of classes
# elibeble for these exceptions
- if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
+ if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
+ -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
+ -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
$JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap
$JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
$GREP '^[<>]' | \
$SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
+ -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
-e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
-e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
-e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
fi
fi
if test "x$SUFFIX" = "xproperties"; then
- $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
- | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
- | $SED -e '/^#/d' -e '/^$/d' \
- -e :a -e '/\\$/N; s/\\\n//; ta' \
- -e 's/^[ \t]*//;s/[ \t]*$//' \
- -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
+ # Run through nawk to add possibly missing newline at end of file.
+ $CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned
+# Disable this exception since we aren't changing the properties cleaning method yet.
+# $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
+# | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
+# | $SED -e '/^#/d' -e '/^$/d' \
+# -e :a -e '/\\$/N; s/\\\n//; ta' \
+# -e 's/^[ \t]*//;s/[ \t]*$//' \
+# -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
fi
if test -n "$TMP"; then
@@ -305,14 +311,17 @@
THIS_FILE=$WORK_DIR/$f.this
$MKDIR -p $(dirname $OTHER_FILE)
$MKDIR -p $(dirname $THIS_FILE)
+ #Note that | doesn't work on mac sed.
$CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
-e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
- -e 's/\(Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\), [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* \(AM\|PM\) [A-Z][A-Z]*/(removed)/' \
+ -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \
+ -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \
-e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
> $OTHER_FILE
$CAT $THIS_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
-e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
- -e 's/\(Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\), [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* \(AM\|PM\) [A-Z][A-Z]*/(removed)/' \
+ -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \
+ -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \
-e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
> $THIS_FILE
else
@@ -341,9 +350,15 @@
OTHER_DIR=$2
WORK_DIR=$3
ZIP_FILE=$4
+ # Optionally provide different name for other zipfile
+ OTHER_ZIP_FILE=$5
THIS_ZIP=$THIS_DIR/$ZIP_FILE
- OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
+ if [ -n "$OTHER_ZIP_FILE" ]; then
+ OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE
+ else
+ OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
+ fi
THIS_SUFFIX="${THIS_ZIP##*.}"
OTHER_SUFFIX="${OTHER_ZIP##*.}"
@@ -370,14 +385,14 @@
(cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
# Find all archives inside and unzip them as well to compare the contents rather than
- # the archives.
- EXCEPTIONS=""
- for pack in $($FIND $THIS_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do
+ # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it.
+ EXCEPTIONS="pie.jar.pack.gz"
+ for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
($UNPACK200 $pack $pack.jar)
# Filter out the unzipped archives from the diff below.
EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
done
- for pack in $($FIND $OTHER_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do
+ for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
($UNPACK200 $pack $pack.jar)
EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
done
@@ -953,6 +968,9 @@
echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs"
echo "Example:"
echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
+ echo ""
+ echo "-2zips <file1> <file2> Compare two zip files only"
+ echo ""
exit 10
fi
@@ -1014,6 +1032,13 @@
-execs)
CMP_EXECS=true
;;
+ -2zips)
+ CMP_2_ZIPS=true
+ THIS_FILE=$2
+ OTHER_FILE=$3
+ shift
+ shift
+ ;;
*)
CMP_NAMES=false
CMP_PERMS=false
@@ -1032,6 +1057,18 @@
shift
done
+if [ "$CMP_2_ZIPS" = "true" ]; then
+ THIS_DIR="$(dirname $THIS_FILE)"
+ THIS_DIR="$(cd "$THIS_DIR" && pwd )"
+ OTHER_DIR="$(dirname $OTHER_FILE)"
+ OTHER_DIR="$(cd "$OTHER_DIR" && pwd )"
+ THIS_FILE_NAME="$(basename $THIS_FILE)"
+ OTHER_FILE_NAME="$(basename $OTHER_FILE)"
+ echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
+ compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME
+ exit
+fi
+
if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
CMP_NAMES=true
CMP_PERMS=true
@@ -1073,7 +1110,11 @@
# Figure out the layout of the this build. Which kinds of images have been produced
-if [ -d "$THIS/deploy/j2sdk-image" ]; then
+if [ -d "$THIS/install/j2sdk-image" ]; then
+ THIS_J2SDK="$THIS/install/j2sdk-image"
+ THIS_J2RE="$THIS/install/j2re-image"
+ echo "Comparing install images"
+elif [ -d "$THIS/deploy/j2sdk-image" ]; then
THIS_J2SDK="$THIS/deploy/j2sdk-image"
THIS_J2RE="$THIS/deploy/j2re-image"
echo "Comparing deploy images"
@@ -1081,9 +1122,16 @@
THIS_J2SDK="$THIS/images/j2sdk-image"
THIS_J2RE="$THIS/images/j2re-image"
fi
+
if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
- THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
- THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+ if [ -d "$THIS/install/j2sdk-image" ]; then
+ # If there is an install image, prefer that, it's also overlay
+ THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
+ THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
+ else
+ THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
+ THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+ fi
fi
if [ -d "$THIS/images/j2sdk-bundle" ]; then
@@ -1100,7 +1148,9 @@
OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
fi
-
+elif [ -d "$OTHER/images/j2sdk-image" ]; then
+ OTHER_J2SDK="$OTHER/images/j2sdk-image"
+ OTHER_J2RE="$OTHER/images/j2re-image"
fi
if [ -d "$OTHER/j2sdk-bundle" ]; then
@@ -1144,6 +1194,26 @@
echo "WARNING! Other build doesn't contain docs, skipping doc compare."
fi
+if [ -d "$OTHER/images" ]; then
+ OTHER_SEC_DIR="$OTHER/images"
+else
+ OTHER_SEC_DIR="$OTHER/tmp"
+fi
+OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
+THIS_SEC_DIR="$THIS/images"
+THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
+if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+ if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
+ JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
+ else
+ JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
+ fi
+ OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
+ OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
+ THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
+ THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
+fi
+
##########################################################################################
# Do the work
@@ -1260,6 +1330,24 @@
if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
fi
+ if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then
+ if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then
+ echo "sec-bin.zip..."
+ compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip
+ fi
+ fi
+ if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then
+ if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then
+ echo "sec-windows-bin.zip..."
+ compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip
+ fi
+ fi
+ if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then
+ if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then
+ echo "$JGSS_WINDOWS_BIN..."
+ compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN
+ fi
+ fi
fi
if [ "$CMP_JARS" = "true" ]; then
--- a/common/bin/compare_exceptions.sh.incl Thu Jan 31 10:10:34 2013 +0100
+++ b/common/bin/compare_exceptions.sh.incl Thu Jan 31 10:22:25 2013 -0800
@@ -813,6 +813,10 @@
if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+ACCEPTED_JARZIP_CONTENTS="
+/bin/w2k_lsa_auth.dll
+"
+
# Probably should add all libs here
ACCEPTED_SMALL_SIZE_DIFF="
./demo/jvmti/gctest/lib/gctest.dll
@@ -821,6 +825,7 @@
./jre/bin/attach.dll
./jre/bin/java_crw_demo.dll
./jre/bin/jsoundds.dll
+./jre/bin/server/jvm.dll
./bin/appletviewer.exe
./bin/extcheck.exe
./bin/idlj.exe
@@ -882,6 +887,17 @@
./jre/bin/unpack200.exe
"
+# jabswitch.exe is compiled and linked with incremental turned on in the old
+# build. This makes no sense, so it's turned off in the new build.
+ACCEPTED_SIZE_DIFF="
+./bin/jabswitch.exe
+./jre/bin/jabswitch.exe
+"
+ACCEPTED_DIS_DIFF="
+./bin/jabswitch.exe
+./jre/bin/jabswitch.exe
+"
+
# On windows, there are unavoidable allignment issues making
# a perfect disasm diff impossible. Filter out the following:
# * Random parts of C++ symbols (this is a bit greedy, but does the trick)
--- a/common/makefiles/IdlCompilation.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/IdlCompilation.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -87,7 +87,7 @@
$1_SRC := $$(abspath $$($1_SRC))
$1_BIN := $$(abspath $$($1_BIN))
# Find all existing java files and existing class files.
-$$(shell $(MKDIR) -p $$($1_SRC) $$($1_BIN))
+$$(eval $$(call MakeDir,$$($1_BIN)))
$1_SRCS := $$(shell find $$($1_SRC) -name "*.idl")
$1_BINS := $$(shell find $$($1_BIN) -name "*.java")
# Prepend the source/bin path to the filter expressions.
--- a/common/makefiles/JavaCompilation.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/JavaCompilation.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -111,9 +111,9 @@
ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
$1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
else
- $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include)
- $$(eval $$(call ListPathsSafelyNow,$1_GREP_INCLUDE_PATTERNS,\n, \
- >> $$($1_BIN)/_the.$$($1_JARNAME)_include))
+ $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include && \
+ $$(strip $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
+ >> $$($1_BIN)/_the.$$($1_JARNAME)_include))
$1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
endif
endif
@@ -124,9 +124,9 @@
ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
$1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
else
- $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
- $$(eval $$(call ListPathsSafelyNow,$1_GREP_EXCLUDE_PATTERNS,\n, \
- >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude))
+ $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude && \
+ $$(strip $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
+ >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude))
$1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
endif
endif
@@ -137,19 +137,25 @@
else
$1_JARINDEX = true
endif
- # When this macro is run in the same makefile as the java compilation, dependencies are transfered
- # in make variables. When the macro is run in a different makefile than the java compilation, the
- # dependencies need to be found in the filesystem.
+ # When this macro is run in the same makefile as the java compilation, dependencies are
+ # transfered in make variables. When the macro is run in a different makefile than the
+ # java compilation, the dependencies need to be found in the filesystem.
ifneq (,$2)
$1_DEPS:=$2
else
+ $1_DEPS:=$$(filter $$(addprefix %,$$($1_FIND_PATTERNS)),\
+ $$(call CacheFind $$($1_SRCS)))
+ ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
+ $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
+ endif
+ ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
+ $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
+ endif
# The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
# lines, but not here for use in make dependencies.
- $1_DEPS:=$$(shell $(FIND) $$($1_SRCS) -type f -a \( $$($1_FIND_PATTERNS) \) \
- $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES)) \
- $$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
+ $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
ifeq (,$$($1_SKIP_METAINF))
- $1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null)
+ $1_DEPS+=$$(call CacheFind $$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
endif
endif
@@ -210,6 +216,8 @@
# Here is the rule that creates/updates the jar file.
$$($1_JAR) : $$($1_DEPS)
$(MKDIR) -p $$($1_BIN)
+ $$($1_GREP_INCLUDE_OUTPUT)
+ $$($1_GREP_EXCLUDE_OUTPUT)
$$(if $$($1_MANIFEST),\
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
@@ -242,14 +250,14 @@
define SetupZipArchive
# param 1 is for example ZIP_MYSOURCE
# param 2,3,4,5,6,7,8,9 are named args.
- # SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
+ # SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
$(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
$(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
# Find all files in the source tree.
- $1_SUFFIX_FILTER := $$(patsubst %,-o -name $(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
- $1_ALL_SRCS := $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i -type f -a ! -name "_the.*" \( -name FALSE_DUMMY $$($1_SUFFIX_FILTER) \) ))
+ $1_ALL_SRCS := $$(call not-containing,_the.,\
+ $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind $$($1_SRC))))
ifneq ($$($1_INCLUDES),)
$1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
@@ -259,6 +267,12 @@
else
$1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
endif
+ endif
+ ifneq ($$($1_INCLUDE_FILES),)
+ $1_SRC_INCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
+ $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
+ endif
+ ifneq ($$($1_SRC_INCLUDES),)
$1_ALL_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS))
endif
ifneq ($$($1_EXCLUDES),)
@@ -376,7 +390,7 @@
$$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
$$(eval $$(call MakeDir,$$($1_BIN)))
# Find all files in the source trees.
- $1_ALL_SRCS := $$(filter-out $(OVR_SRCS),$$(shell $(FIND) $$($1_SRC) -type f))
+ $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
# Extract the java files.
ifneq ($$($1_EXCLUDE_FILES),)
$1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
@@ -408,8 +422,6 @@
# Find all files to be copied from source to bin.
ifneq (,$$($1_COPY))
- # Rewrite list of patterns into a find statement.
- $1_COPY_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_COPY))
# Search for all files to be copied.
$1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
# Copy these explicitly
@@ -436,8 +448,6 @@
# Find all property files to be copied and cleaned from source to bin.
ifneq (,$$($1_CLEAN))
- # Rewrite list of patterns into a find statement.
- $1_CLEAN_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_CLEAN))
# Search for all files to be copied.
$1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
# Copy and clean must also respect filters.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/makefiles/Jprt.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,209 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+# This file is included by the root NewerMakefile and contains targets
+# and utilities needed by JPRT.
+
+# Utilities used in this Makefile. Most of this makefile executes without
+# the context of a spec file from configure.
+CAT=cat
+CMP=cmp
+CP=cp
+ECHO=echo
+MKDIR=mkdir
+PRINTF=printf
+PWD=pwd
+# Insure we have a path that looks like it came from pwd
+# (This is mostly for Windows sake and drive letters)
+define UnixPath # path
+$(shell (cd "$1" && $(PWD)))
+endef
+
+BUILD_DIR_ROOT:=$(root_dir)/build
+
+ifdef OPENJDK
+ OPEN_BUILD=true
+else
+ OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
+ $(wildcard $(root_dir)/jdk/make/closed), \
+ $(wildcard $(root_dir)/jdk/test/closed), \
+ $(wildcard $(root_dir)/hotspot/src/closed), \
+ $(wildcard $(root_dir)/hotspot/make/closed), \
+ $(wildcard $(root_dir)/hotspot/test/closed)), \
+ false,true)
+endif
+
+HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
+
+###########################################################################
+# To help in adoption of the new configure&&make build process, a bridge
+# build will use the old settings to run configure and do the build.
+
+# Build with the configure bridge. After running configure, restart make
+# to parse the new spec file.
+BRIDGE_TARGETS := all
+bridgeBuild: bridge2configure
+ @cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS)
+
+# Bridge from old Makefile ALT settings to configure options
+bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
+ bash ./configure $(strip $(shell $(CAT) $<))
+
+# Create a file with configure options created from old Makefile mechanisms.
+$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
+ $(RM) $@
+ $(CP) $< $@
+
+# Use this file to only change when obvious things have changed
+$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
+ $(RM) $@.tmp
+ $(MKDIR) -p $(BUILD_DIR_ROOT)
+ @$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
+ifdef ARCH_DATA_MODEL
+ @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
+endif
+ifeq ($(ARCH_DATA_MODEL),32)
+ @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
+endif
+ifdef ALT_PARALLEL_COMPILE_JOBS
+ @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
+endif
+ifdef ALT_BOOTDIR
+ @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
+endif
+ifdef ALT_CUPS_HEADERS_PATH
+ @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
+endif
+ifdef ALT_FREETYPE_HEADERS_PATH
+ @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
+endif
+ifeq ($(HOTSPOT_AVAILABLE),false)
+ ifdef ALT_JDK_IMPORT_PATH
+ @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
+ endif
+endif
+ifeq ($(OPEN_BUILD),true)
+ @$(ECHO) " --enable-openjdk-only " >> $@.tmp
+else
+ # Todo: move to closed?
+ ifdef ALT_MOZILLA_HEADERS_PATH
+ @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
+ endif
+ ifdef ALT_JUNIT_DIR
+ @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
+ endif
+ ifdef ANT_HOME
+ @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
+ endif
+ ifdef ALT_JAVAFX_ZIP_DIR
+ @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
+ endif
+ ifdef ALT_WIXDIR
+ @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
+ endif
+ ifdef ALT_CCSS_SIGNING_DIR
+ @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
+ endif
+ ifdef ALT_SLASH_JAVA
+ @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
+ endif
+ ifdef ALT_SPARKLE_FRAMEWORK_DIR
+ @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
+ endif
+endif
+ @if [ -f $@ ] ; then \
+ if ! $(CMP) $@ $@.tmp > /dev/null ; then \
+ $(CP) $@.tmp $@ ; \
+ fi ; \
+ else \
+ $(CP) $@.tmp $@ ; \
+ fi
+ $(RM) $@.tmp
+
+PHONY_LIST += bridge2configure bridgeBuild
+
+###########################################################################
+# JPRT targets
+
+ifndef JPRT_ARCHIVE_BUNDLE
+ JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
+endif
+ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
+ JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
+endif
+
+# These targets execute in a SPEC free context, before calling bridgeBuild
+# to generate the SPEC.
+jprt_build_product: DEBUG_LEVEL=release
+jprt_build_product: BUILD_DIRNAME=*-release
+jprt_build_product: jprt_build_generic
+
+jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
+jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
+jprt_build_fastdebug: jprt_build_generic
+
+jprt_build_debug: DEBUG_LEVEL=slowdebug
+jprt_build_debug: BUILD_DIRNAME=*-debug
+jprt_build_debug: jprt_build_generic
+
+jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle
+jprt_build_generic: bridgeBuild
+
+# This target must be called in the context of a SPEC file
+jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
+ @$(call CheckIfMakeAtEnd)
+
+# This target must be called in the context of a SPEC file
+$(JPRT_ARCHIVE_BUNDLE): bundles
+ $(MKDIR) -p $(@D)
+ $(RM) $@
+ $(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@
+
+# This target must be called in the context of a SPEC file
+bundles: all
+ @$(call TargetEnter)
+ $(MKDIR) -p $(BUILD_OUTPUT)/bundles
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
+ $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
+ $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
+else
+ $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
+ $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
+ if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
+ $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
+ fi
+endif
+ @$(call TargetExit)
+
+# Keep track of phony targets
+PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
+ jprt_build_generic bundles jprt_bundle
+
+###########################################################################
+# Phony targets
+.PHONY: $(PHONY_LIST)
+
+# Force target
+FRC:
--- a/common/makefiles/Main.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/Main.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -65,7 +65,15 @@
### Main targets
-all: jdk
+default: jdk
+ @$(call CheckIfMakeAtEnd)
+
+all: images docs
+ @$(call CheckIfMakeAtEnd)
+
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
+ all: overlay-images
+endif
start-make:
@$(call AtMakeStart)
@@ -126,12 +134,6 @@
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
@$(call TargetExit)
-bundles: images bundles-only
-bundles-only: start-make
- @$(call TargetEnter)
- @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk bundles)
- @$(call TargetExit)
-
install: images install-only
install-only: start-make
@$(call TargetEnter)
@@ -144,6 +146,12 @@
@($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
@$(call TargetExit)
+sign-jars: jdk sign-jars-only
+sign-jars-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
+ @$(call TargetExit)
+
bootcycle-images:
@$(ECHO) Boot cycle build step 1: Building the JDK image normally
@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(SPEC) images)
--- a/common/makefiles/MakeBase.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/MakeBase.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -391,4 +391,46 @@
endef
endif
+# Convenience functions for working around make's limitations with $(filter ).
+containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
+not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
+
+################################################################################
+# In Cygwin, finds are very costly, both because of expensive forks and because
+# of bad file system caching. Find is used extensively in $(shell) commands to
+# find source files. This makes rerunning make with no or few changes rather
+# expensive. To speed this up, these two macros are used to cache the results
+# of simple find commands for reuse.
+#
+# Runs a find and stores both the directories where it was run and the results.
+# This macro can be called multiple times to add to the cache. Only finds files
+# with no filters.
+#
+# Needs to be called with $(eval )
+#
+# Param 1 - Dir to find in
+ifeq ($(OPENJDK_BUILD_OS),windows)
+define FillCacheFind
+ FIND_CACHE_DIR += $1
+ FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l))
+endef
+else
+define FillCacheFind
+endef
+endif
+
+# Mimics find by looking in the cache if all of the directories have been cached.
+# Otherwise reverts to shell find. This is safe to call on all platforms, even if
+# cache is deactivated.
+#
+# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
+# Param 1 - Dirs to find in
+define CacheFind
+ $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1),\
+ $(shell $(FIND) $1 -type f -o -type l),\
+ $(filter $(addsuffix %,$1),$(FIND_CACHE)))
+endef
+
+################################################################################
+
endif # _MAKEBASE_GMK
--- a/common/makefiles/MakeHelpers.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/MakeHelpers.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -50,7 +50,7 @@
# Global targets are possible to run either with or without a SPEC. The prototypical
# global target is "help".
-global_targets=help configure
+global_targets=help jprt% bridgeBuild
##############################
# Functions
@@ -112,7 +112,7 @@
# Do not indent this function, this will add whitespace at the start which the caller won't handle
define GetRealTarget
-$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),all))
+$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
endef
# Do not indent this function, this will add whitespace at the start which the caller won't handle
@@ -126,10 +126,7 @@
# Check if the current target is the last goal
$(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
# If the target is 'foo-only', check if our goal was stated as 'foo'
- $(if $(filter $(patsubst %-only,%,$@),$(call LastGoal)),$(call AtMakeEnd))
- # If no goal is given, 'all' is default, but the last target executed for all is 'jdk-only'. Check for that, too.
- # At most one of the tests can be true.
- $(if $(subst all,,$(call LastGoal)),,$(if $(filter $@,jdk-only),$(call AtMakeEnd)))
+ $(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd))
endef
# Hook to be called when starting to execute a top-level target
--- a/common/makefiles/Makefile Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -23,109 +23,4 @@
# questions.
#
-# This must be the first rule
-all:
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
-# /usr/ccs/bin/make lacks basically every other flow control mechanism.
-TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
-
-# Assume we have GNU make, but check version.
-ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
- ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
- $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
- endif
-endif
-
-# Locate this Makefile
-ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
- makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
- makefile_path:=$(lastword $(MAKEFILE_LIST))
-endif
-root_dir:=$(patsubst %/common/makefiles/Makefile,%,$(makefile_path))
-
-# ... and then we can include our helper functions
-include $(dir $(makefile_path))/MakeHelpers.gmk
-
-$(eval $(call ParseLogLevel))
-$(eval $(call ParseConfAndSpec))
-
-# Now determine if we have zero, one or several configurations to build.
-ifeq ($(SPEC),)
- # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
-else
- ifeq ($(words $(SPEC)),1)
- # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
- include $(dir $(makefile_path))/Main.gmk
- else
- # We are building multiple configurations.
- # First, find out the valid targets
- # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find
- # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
- all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \
- $(MAKE) -p -q -f $(makefile_path) SPEC=$(firstword $(SPEC)) | \
- grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
-
-$(all_phony_targets):
- @$(foreach spec,$(SPEC),($(MAKE) -f $(makefile_path) SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true
-
- endif
-endif
-
-# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you addd more global targets, please update the variable global_targets in MakeHelpers.
-
-help:
- $(info )
- $(info OpenJDK Makefile help)
- $(info =====================)
- $(info )
- $(info Common make targets)
- $(info . make [all] # Compile all code but do not create images)
- $(info . make images # Create complete j2sdk and j2re images)
- $(info . make overlay-images # Create limited images for sparc 64 bit platforms)
- $(info . make bootcycle-images # Build images twice, second time with newly build JDK)
- $(info . make install # Install the generated images locally)
- $(info . make clean # Remove all files generated by make, but not those)
- $(info . # generated by configure)
- $(info . make dist-clean # Remove all files, including configuration)
- $(info . make help # Give some help on using make)
- $(info . make test # Run tests, default is all tests (see TEST below))
- $(info )
- $(info Targets for specific components)
- $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images))
- $(info . make <component> # Build <component> and everything it depends on. )
- $(info . make <component>-only # Build <component> only, without dependencies. This)
- $(info . # is faster but can result in incorrect build results!)
- $(info . make clean-<component> # Remove files generated by make for <component>)
- $(info )
- $(info Useful make variables)
- $(info . make CONF= # Build all configurations (note, assignment is empty))
- $(info . make CONF=<substring> # Build the configuration(s) with a name matching)
- $(info . # <substring>)
- $(info )
- $(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>)
- $(info . # Available log levels are:)
- $(info . # 'warn' (default), 'info', 'debug' and 'trace')
- $(info . # To see executed command lines, use LOG=debug)
- $(info )
- $(info . make JOBS=<n> # Run <n> parallel make jobs)
- $(info . # Note that -jN does not work as expected!)
- $(info )
- $(info . make test TEST=<test> # Only run the given test or tests, e.g.)
- $(info . # make test TEST="jdk_lang jdk_net")
- $(info )
-
-configure:
- @$(SHELL) $(root_dir)/configure $(CONFIGURE_ARGS)
- @echo ====================================================
- @echo "Note: This is a non-recommended way of running configure."
- @echo "Instead, run 'sh configure' in the top-level directory"
-
-.PHONY: help configure
+include ../../NewMakefile.gmk
--- a/common/makefiles/NativeCompilation.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/NativeCompilation.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -236,7 +236,7 @@
$$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
# Find all files in the source trees. Sort to remove duplicates.
- $1_ALL_SRCS := $$(sort $$(shell $(FIND) $$($1_SRC) -type f))
+ $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
# Extract the C/C++ files.
$1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
$1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
--- a/common/makefiles/javadoc/CORE_PKGS.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/javadoc/CORE_PKGS.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -127,6 +127,11 @@
java.sql \
java.text \
java.text.spi \
+ java.time \
+ java.time.temporal \
+ java.time.calendar \
+ java.time.format \
+ java.time.zone \
java.util \
java.util.concurrent \
java.util.concurrent.atomic \
--- a/common/makefiles/javadoc/Javadoc.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/common/makefiles/javadoc/Javadoc.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,6 @@
# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
#
-CLASSPATH_SEPARATOR = :
-
DOCSDIR=$(OUTPUT_ROOT)/docs
TEMPDIR=$(OUTPUT_ROOT)/docstemp
@@ -137,7 +135,7 @@
# List of all possible directories for javadoc to look for sources
# NOTE: Quotes are required around sourcepath argument only on Windows.
# Otherwise, you get "No packages or classes specified." due
-# to $(CLASSPATH_SEPARATOR) being interpreted as an end of
+# to $(PATH_SEP) being interpreted as an end of
# command (newline or shell ; character)
ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
$(JDK_IMPSRC) \
@@ -154,7 +152,7 @@
EMPTY:=
SPACE:= $(EMPTY) $(EMPTY)
RELEASEDOCS_SOURCEPATH = \
- $(subst $(SPACE),$(CLASSPATH_SEPARATOR),$(strip $(ALL_SOURCE_DIRS)))
+ $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
define prep-target
$(MKDIR) -p $(@D)
@@ -271,6 +269,7 @@
-quiet \
-use \
-keywords \
+ -Xdoclint:none \
$(ADDITIONAL_JAVADOCFLAGS)
ifdef OPENJDK
--- a/common/src/fixpath.c Thu Jan 31 10:10:34 2013 +0100
+++ b/common/src/fixpath.c Thu Jan 31 10:22:25 2013 -0800
@@ -29,6 +29,29 @@
#include <string.h>
#include <malloc.h>
+void report_error()
+{
+ LPVOID lpMsgBuf;
+ DWORD dw = GetLastError();
+
+ FormatMessage(
+ FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ dw,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR) &lpMsgBuf,
+ 0,
+ NULL);
+
+ fprintf(stderr,
+ "Could not start process! Failed with error %d: %s\n",
+ dw, lpMsgBuf);
+
+ LocalFree(lpMsgBuf);
+}
+
/*
* Test if pos points to /cygdrive/_/ where _ can
* be any character.
@@ -256,7 +279,7 @@
DWORD exitCode;
if (argc<3 || argv[1][0] != '-' || (argv[1][1] != 'c' && argv[1][1] != 'm')) {
- fprintf(stderr, "Usage: fixpath -c|m<path@path@...> /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt");
+ fprintf(stderr, "Usage: fixpath -c|m<path@path@...> /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt\n");
exit(0);
}
@@ -308,11 +331,10 @@
0,
&si,
&pi);
- if(!rc)
- {
- //Could not start process;
- fprintf(stderr, "Could not start process!\n");
- exit(-1);
+ if(!rc) {
+ // Could not start process for some reason. Try to report why:
+ report_error();
+ exit(rc);
}
WaitForSingleObject(pi.hProcess,INFINITE);
--- a/corba/.hgtags Thu Jan 31 10:10:34 2013 +0100
+++ b/corba/.hgtags Thu Jan 31 10:22:25 2013 -0800
@@ -194,3 +194,5 @@
603cceb495c8133d47b26a7502d51c7d8a67d76b jdk8-b70
8171d23e914d758836527b80b06debcfdb718f2d jdk8-b71
cb40427f47145b01b7e53c3e02b38ff7625efbda jdk8-b72
+191afde59e7be0e1a1d76d06f2a32ff17444f0ec jdk8-b73
+2132845cf5f717ff5c240a2431c0c0e03e66e3a5 jdk8-b74
--- a/hotspot/.hgtags Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/.hgtags Thu Jan 31 10:22:25 2013 -0800
@@ -306,3 +306,8 @@
e94068d4ff52849c8aa0786a53a59b63d1312a39 jdk8-b70
0847210f85480bf3848dc90bc2ab23c0a4791b55 jdk8-b71
d5cb5830f570d1304ea4b196dde672a291b55f29 jdk8-b72
+1e129851479e4f5df439109fca2c7be1f1613522 hs25-b15
+11619f33cd683c2f1d6ef72f1c6ff3dacf5a9f1c jdk8-b73
+70c89bd6b895a10d25ca70e08093c09ff2005fda hs25-b16
+1a3e54283c54aaa8b3437813e8507fbdc966e5b6 jdk8-b74
+b4391649e91ea8d37f66317a03d6d2573a93d10d hs25-b17
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Thu Jan 31 10:22:25 2013 -0800
@@ -52,6 +52,9 @@
private static int LOW_OFFSET;
private static int HIGH_OFFSET;
private static int FIELD_SLOTS;
+ private static short FIELDINFO_TAG_SIZE;
+ private static short FIELDINFO_TAG_MASK;
+ private static short FIELDINFO_TAG_OFFSET;
// ClassState constants
private static int CLASS_STATE_ALLOCATED;
@@ -96,9 +99,13 @@
NAME_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::name_index_offset").intValue();
SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::signature_index_offset").intValue();
INITVAL_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::initval_index_offset").intValue();
- LOW_OFFSET = db.lookupIntConstant("FieldInfo::low_offset").intValue();
- HIGH_OFFSET = db.lookupIntConstant("FieldInfo::high_offset").intValue();
+ LOW_OFFSET = db.lookupIntConstant("FieldInfo::low_packed_offset").intValue();
+ HIGH_OFFSET = db.lookupIntConstant("FieldInfo::high_packed_offset").intValue();
FIELD_SLOTS = db.lookupIntConstant("FieldInfo::field_slots").intValue();
+ FIELDINFO_TAG_SIZE = db.lookupIntConstant("FIELDINFO_TAG_SIZE").shortValue();
+ FIELDINFO_TAG_MASK = db.lookupIntConstant("FIELDINFO_TAG_MASK").shortValue();
+ FIELDINFO_TAG_OFFSET = db.lookupIntConstant("FIELDINFO_TAG_OFFSET").shortValue();
+
// read ClassState constants
CLASS_STATE_ALLOCATED = db.lookupIntConstant("InstanceKlass::allocated").intValue();
CLASS_STATE_LOADED = db.lookupIntConstant("InstanceKlass::loaded").intValue();
@@ -314,8 +321,12 @@
public int getFieldOffset(int index) {
U2Array fields = getFields();
- return VM.getVM().buildIntFromShorts(fields.at(index * FIELD_SLOTS + LOW_OFFSET),
- fields.at(index * FIELD_SLOTS + HIGH_OFFSET));
+ short lo = fields.at(index * FIELD_SLOTS + LOW_OFFSET);
+ short hi = fields.at(index * FIELD_SLOTS + HIGH_OFFSET);
+ if ((lo & FIELDINFO_TAG_MASK) == FIELDINFO_TAG_OFFSET) {
+ return VM.getVM().buildIntFromShorts(lo, hi) >> FIELDINFO_TAG_SIZE;
+ }
+ throw new RuntimeException("should not reach here");
}
// Accessors for declared fields
--- a/hotspot/make/bsd/makefiles/mapfile-vers-debug Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/make/bsd/makefiles/mapfile-vers-debug Thu Jan 31 10:22:25 2013 -0800
@@ -1,9 +1,9 @@
#
-# @(#)mapfile-vers-debug 1.18 07/10/25 16:47:35
+# @(#)mapfile-vers-debug 1.18 07/10/25 16:47:35
#
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -126,8 +126,9 @@
JVM_GetClassModifiers;
JVM_GetClassName;
JVM_GetClassNameUTF;
- JVM_GetClassSignature;
+ JVM_GetClassSignature;
JVM_GetClassSigners;
+ JVM_GetClassTypeAnnotations;
JVM_GetComponentType;
JVM_GetDeclaredClasses;
JVM_GetDeclaringClass;
@@ -154,6 +155,7 @@
JVM_GetMethodIxNameUTF;
JVM_GetMethodIxSignatureUTF;
JVM_GetMethodParameterAnnotations;
+ JVM_GetMethodParameters;
JVM_GetPrimitiveArrayElement;
JVM_GetProtectionDomain;
JVM_GetSockName;
@@ -203,7 +205,6 @@
JVM_NewMultiArray;
JVM_OnExit;
JVM_Open;
- JVM_PrintStackTrace;
JVM_RaiseSignal;
JVM_RawMonitorCreate;
JVM_RawMonitorDestroy;
@@ -283,7 +284,7 @@
# This is for Forte Analyzer profiling support.
AsyncGetCallTrace;
- # INSERT VTABLE SYMBOLS HERE
+ # INSERT VTABLE SYMBOLS HERE
local:
*;
--- a/hotspot/make/bsd/makefiles/mapfile-vers-product Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/make/bsd/makefiles/mapfile-vers-product Thu Jan 31 10:22:25 2013 -0800
@@ -3,7 +3,7 @@
#
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -128,6 +128,7 @@
JVM_GetClassNameUTF;
JVM_GetClassSignature;
JVM_GetClassSigners;
+ JVM_GetClassTypeAnnotations;
JVM_GetComponentType;
JVM_GetDeclaredClasses;
JVM_GetDeclaringClass;
@@ -154,6 +155,7 @@
JVM_GetMethodIxNameUTF;
JVM_GetMethodIxSignatureUTF;
JVM_GetMethodParameterAnnotations;
+ JVM_GetMethodParameters;
JVM_GetPrimitiveArrayElement;
JVM_GetProtectionDomain;
JVM_GetSockName;
@@ -203,7 +205,6 @@
JVM_NewMultiArray;
JVM_OnExit;
JVM_Open;
- JVM_PrintStackTrace;
JVM_RaiseSignal;
JVM_RawMonitorCreate;
JVM_RawMonitorDestroy;
--- a/hotspot/make/hotspot_version Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/make/hotspot_version Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,11 @@
#
# Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2012
+HOTSPOT_VM_COPYRIGHT=Copyright 2013
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=14
+HS_BUILD_NUMBER=17
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
--- a/hotspot/make/linux/makefiles/mapfile-vers-debug Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/make/linux/makefiles/mapfile-vers-debug Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -124,6 +124,7 @@
JVM_GetClassNameUTF;
JVM_GetClassSignature;
JVM_GetClassSigners;
+ JVM_GetClassTypeAnnotations;
JVM_GetComponentType;
JVM_GetDeclaredClasses;
JVM_GetDeclaringClass;
@@ -150,6 +151,7 @@
JVM_GetMethodIxNameUTF;
JVM_GetMethodIxSignatureUTF;
JVM_GetMethodParameterAnnotations;
+ JVM_GetMethodParameters;
JVM_GetPrimitiveArrayElement;
JVM_GetProtectionDomain;
JVM_GetSockName;
@@ -199,7 +201,6 @@
JVM_NewMultiArray;
JVM_OnExit;
JVM_Open;
- JVM_PrintStackTrace;
JVM_RaiseSignal;
JVM_RawMonitorCreate;
JVM_RawMonitorDestroy;
--- a/hotspot/make/linux/makefiles/mapfile-vers-product Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/make/linux/makefiles/mapfile-vers-product Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -124,6 +124,7 @@
JVM_GetClassNameUTF;
JVM_GetClassSignature;
JVM_GetClassSigners;
+ JVM_GetClassTypeAnnotations;
JVM_GetComponentType;
JVM_GetDeclaredClasses;
JVM_GetDeclaringClass;
@@ -150,6 +151,7 @@
JVM_GetMethodIxNameUTF;
JVM_GetMethodIxSignatureUTF;
JVM_GetMethodParameterAnnotations;
+ JVM_GetMethodParameters;
JVM_GetPrimitiveArrayElement;
JVM_GetProtectionDomain;
JVM_GetSockName;
@@ -199,7 +201,6 @@
JVM_NewMultiArray;
JVM_OnExit;
JVM_Open;
- JVM_PrintStackTrace;
JVM_RaiseSignal;
JVM_RawMonitorCreate;
JVM_RawMonitorDestroy;
--- a/hotspot/make/solaris/makefiles/mapfile-vers Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/make/solaris/makefiles/mapfile-vers Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -26,235 +26,236 @@
SUNWprivate_1.1 {
global:
- # JNI
+ # JNI
JNI_CreateJavaVM;
JNI_GetCreatedJavaVMs;
JNI_GetDefaultJavaVMInitArgs;
-
- # JVM
- JVM_Accept;
- JVM_ActiveProcessorCount;
- JVM_AllocateNewArray;
- JVM_AllocateNewObject;
- JVM_ArrayCopy;
- JVM_AssertionStatusDirectives;
- JVM_Available;
- JVM_Bind;
- JVM_ClassDepth;
- JVM_ClassLoaderDepth;
- JVM_Clone;
- JVM_Close;
- JVM_CX8Field;
- JVM_CompileClass;
- JVM_CompileClasses;
- JVM_CompilerCommand;
- JVM_Connect;
- JVM_ConstantPoolGetClassAt;
- JVM_ConstantPoolGetClassAtIfLoaded;
- JVM_ConstantPoolGetDoubleAt;
- JVM_ConstantPoolGetFieldAt;
- JVM_ConstantPoolGetFieldAtIfLoaded;
- JVM_ConstantPoolGetFloatAt;
- JVM_ConstantPoolGetIntAt;
- JVM_ConstantPoolGetLongAt;
- JVM_ConstantPoolGetMethodAt;
- JVM_ConstantPoolGetMethodAtIfLoaded;
- JVM_ConstantPoolGetMemberRefInfoAt;
- JVM_ConstantPoolGetSize;
- JVM_ConstantPoolGetStringAt;
- JVM_ConstantPoolGetUTF8At;
- JVM_CountStackFrames;
- JVM_CurrentClassLoader;
- JVM_CurrentLoadedClass;
- JVM_CurrentThread;
- JVM_CurrentTimeMillis;
- JVM_DefineClass;
- JVM_DefineClassWithSource;
- JVM_DefineClassWithSourceCond;
- JVM_DesiredAssertionStatus;
- JVM_DisableCompiler;
- JVM_DoPrivileged;
- JVM_DTraceGetVersion;
- JVM_DTraceActivate;
- JVM_DTraceIsProbeEnabled;
- JVM_DTraceIsSupported;
- JVM_DTraceDispose;
- JVM_DumpAllStacks;
- JVM_DumpThreads;
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindClassFromBootLoader;
- JVM_FindLibraryEntry;
- JVM_FindLoadedClass;
- JVM_FindPrimitiveClass;
- JVM_FindSignal;
- JVM_FreeMemory;
- JVM_GC;
- JVM_GetAllThreads;
- JVM_GetArrayElement;
- JVM_GetArrayLength;
- JVM_GetCPClassNameUTF;
- JVM_GetCPFieldClassNameUTF;
- JVM_GetCPFieldModifiers;
- JVM_GetCPFieldNameUTF;
- JVM_GetCPFieldSignatureUTF;
- JVM_GetCPMethodClassNameUTF;
- JVM_GetCPMethodModifiers;
- JVM_GetCPMethodNameUTF;
- JVM_GetCPMethodSignatureUTF;
- JVM_GetCallerClass;
- JVM_GetClassAccessFlags;
- JVM_GetClassAnnotations;
- JVM_GetClassCPEntriesCount;
- JVM_GetClassCPTypes;
- JVM_GetClassConstantPool;
- JVM_GetClassContext;
- JVM_GetClassDeclaredConstructors;
- JVM_GetClassDeclaredFields;
- JVM_GetClassDeclaredMethods;
- JVM_GetClassFieldsCount;
- JVM_GetClassInterfaces;
- JVM_GetClassLoader;
- JVM_GetClassMethodsCount;
- JVM_GetClassModifiers;
- JVM_GetClassName;
- JVM_GetClassNameUTF;
- JVM_GetClassSignature;
- JVM_GetClassSigners;
- JVM_GetComponentType;
- JVM_GetDeclaredClasses;
- JVM_GetDeclaringClass;
- JVM_GetEnclosingMethodInfo;
- JVM_GetFieldAnnotations;
- JVM_GetFieldIxModifiers;
- JVM_GetHostName;
- JVM_GetInheritedAccessControlContext;
- JVM_GetInterfaceVersion;
- JVM_GetLastErrorString;
- JVM_GetManagement;
- JVM_GetMethodAnnotations;
- JVM_GetMethodDefaultAnnotationValue;
- JVM_GetMethodIxArgsSize;
- JVM_GetMethodIxByteCode;
- JVM_GetMethodIxByteCodeLength;
- JVM_GetMethodIxExceptionIndexes;
- JVM_GetMethodIxExceptionTableEntry;
- JVM_GetMethodIxExceptionTableLength;
- JVM_GetMethodIxExceptionsCount;
- JVM_GetMethodIxLocalsCount;
- JVM_GetMethodIxMaxStack;
- JVM_GetMethodIxModifiers;
- JVM_GetMethodIxNameUTF;
- JVM_GetMethodIxSignatureUTF;
- JVM_GetMethodParameterAnnotations;
- JVM_GetPrimitiveArrayElement;
- JVM_GetProtectionDomain;
- JVM_GetSockName;
- JVM_GetSockOpt;
- JVM_GetStackAccessControlContext;
- JVM_GetStackTraceDepth;
- JVM_GetStackTraceElement;
- JVM_GetSystemPackage;
- JVM_GetSystemPackages;
- JVM_GetThreadStateNames;
- JVM_GetThreadStateValues;
- JVM_GetVersionInfo;
- JVM_Halt;
- JVM_HoldsLock;
- JVM_IHashCode;
- JVM_InitAgentProperties;
- JVM_InitProperties;
- JVM_InitializeCompiler;
- JVM_InitializeSocketLibrary;
- JVM_InternString;
- JVM_Interrupt;
- JVM_InvokeMethod;
- JVM_IsArrayClass;
- JVM_IsConstructorIx;
- JVM_IsInterface;
- JVM_IsInterrupted;
- JVM_IsNaN;
- JVM_IsPrimitiveClass;
- JVM_IsSameClassPackage;
- JVM_IsSilentCompiler;
- JVM_IsSupportedJNIVersion;
- JVM_IsThreadAlive;
- JVM_LatestUserDefinedLoader;
- JVM_Listen;
- JVM_LoadClass0;
- JVM_LoadLibrary;
- JVM_Lseek;
- JVM_MaxObjectInspectionAge;
- JVM_MaxMemory;
- JVM_MonitorNotify;
- JVM_MonitorNotifyAll;
- JVM_MonitorWait;
- JVM_NativePath;
- JVM_NanoTime;
- JVM_NewArray;
- JVM_NewInstanceFromConstructor;
- JVM_NewMultiArray;
- JVM_OnExit;
- JVM_Open;
- JVM_PrintStackTrace;
- JVM_RaiseSignal;
- JVM_RawMonitorCreate;
- JVM_RawMonitorDestroy;
- JVM_RawMonitorEnter;
- JVM_RawMonitorExit;
- JVM_Read;
- JVM_Recv;
- JVM_RecvFrom;
- JVM_RegisterSignal;
- JVM_ReleaseUTF;
- JVM_ResolveClass;
- JVM_ResumeThread;
- JVM_Send;
- JVM_SendTo;
- JVM_SetArrayElement;
- JVM_SetClassSigners;
- JVM_SetLength;
+
+ # JVM
+ JVM_Accept;
+ JVM_ActiveProcessorCount;
+ JVM_AllocateNewArray;
+ JVM_AllocateNewObject;
+ JVM_ArrayCopy;
+ JVM_AssertionStatusDirectives;
+ JVM_Available;
+ JVM_Bind;
+ JVM_ClassDepth;
+ JVM_ClassLoaderDepth;
+ JVM_Clone;
+ JVM_Close;
+ JVM_CX8Field;
+ JVM_CompileClass;
+ JVM_CompileClasses;
+ JVM_CompilerCommand;
+ JVM_Connect;
+ JVM_ConstantPoolGetClassAt;
+ JVM_ConstantPoolGetClassAtIfLoaded;
+ JVM_ConstantPoolGetDoubleAt;
+ JVM_ConstantPoolGetFieldAt;
+ JVM_ConstantPoolGetFieldAtIfLoaded;
+ JVM_ConstantPoolGetFloatAt;
+ JVM_ConstantPoolGetIntAt;
+ JVM_ConstantPoolGetLongAt;
+ JVM_ConstantPoolGetMethodAt;
+ JVM_ConstantPoolGetMethodAtIfLoaded;
+ JVM_ConstantPoolGetMemberRefInfoAt;
+ JVM_ConstantPoolGetSize;
+ JVM_ConstantPoolGetStringAt;
+ JVM_ConstantPoolGetUTF8At;
+ JVM_CountStackFrames;
+ JVM_CurrentClassLoader;
+ JVM_CurrentLoadedClass;
+ JVM_CurrentThread;
+ JVM_CurrentTimeMillis;
+ JVM_DefineClass;
+ JVM_DefineClassWithSource;
+ JVM_DefineClassWithSourceCond;
+ JVM_DesiredAssertionStatus;
+ JVM_DisableCompiler;
+ JVM_DoPrivileged;
+ JVM_DTraceGetVersion;
+ JVM_DTraceActivate;
+ JVM_DTraceIsProbeEnabled;
+ JVM_DTraceIsSupported;
+ JVM_DTraceDispose;
+ JVM_DumpAllStacks;
+ JVM_DumpThreads;
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindClassFromBootLoader;
+ JVM_FindLibraryEntry;
+ JVM_FindLoadedClass;
+ JVM_FindPrimitiveClass;
+ JVM_FindSignal;
+ JVM_FreeMemory;
+ JVM_GC;
+ JVM_GetAllThreads;
+ JVM_GetArrayElement;
+ JVM_GetArrayLength;
+ JVM_GetCPClassNameUTF;
+ JVM_GetCPFieldClassNameUTF;
+ JVM_GetCPFieldModifiers;
+ JVM_GetCPFieldNameUTF;
+ JVM_GetCPFieldSignatureUTF;
+ JVM_GetCPMethodClassNameUTF;
+ JVM_GetCPMethodModifiers;
+ JVM_GetCPMethodNameUTF;
+ JVM_GetCPMethodSignatureUTF;
+ JVM_GetCallerClass;
+ JVM_GetClassAccessFlags;
+ JVM_GetClassAnnotations;
+ JVM_GetClassCPEntriesCount;
+ JVM_GetClassCPTypes;
+ JVM_GetClassConstantPool;
+ JVM_GetClassContext;
+ JVM_GetClassDeclaredConstructors;
+ JVM_GetClassDeclaredFields;
+ JVM_GetClassDeclaredMethods;
+ JVM_GetClassFieldsCount;
+ JVM_GetClassInterfaces;
+ JVM_GetClassLoader;
+ JVM_GetClassMethodsCount;
+ JVM_GetClassModifiers;
+ JVM_GetClassName;
+ JVM_GetClassNameUTF;
+ JVM_GetClassSignature;
+ JVM_GetClassSigners;
+ JVM_GetComponentType;
+ JVM_GetClassTypeAnnotations;
+ JVM_GetDeclaredClasses;
+ JVM_GetDeclaringClass;
+ JVM_GetEnclosingMethodInfo;
+ JVM_GetFieldAnnotations;
+ JVM_GetFieldIxModifiers;
+ JVM_GetHostName;
+ JVM_GetInheritedAccessControlContext;
+ JVM_GetInterfaceVersion;
+ JVM_GetLastErrorString;
+ JVM_GetManagement;
+ JVM_GetMethodAnnotations;
+ JVM_GetMethodDefaultAnnotationValue;
+ JVM_GetMethodIxArgsSize;
+ JVM_GetMethodIxByteCode;
+ JVM_GetMethodIxByteCodeLength;
+ JVM_GetMethodIxExceptionIndexes;
+ JVM_GetMethodIxExceptionTableEntry;
+ JVM_GetMethodIxExceptionTableLength;
+ JVM_GetMethodIxExceptionsCount;
+ JVM_GetMethodIxLocalsCount;
+ JVM_GetMethodIxMaxStack;
+ JVM_GetMethodIxModifiers;
+ JVM_GetMethodIxNameUTF;
+ JVM_GetMethodIxSignatureUTF;
+ JVM_GetMethodParameterAnnotations;
+ JVM_GetMethodParameters;
+ JVM_GetPrimitiveArrayElement;
+ JVM_GetProtectionDomain;
+ JVM_GetSockName;
+ JVM_GetSockOpt;
+ JVM_GetStackAccessControlContext;
+ JVM_GetStackTraceDepth;
+ JVM_GetStackTraceElement;
+ JVM_GetSystemPackage;
+ JVM_GetSystemPackages;
+ JVM_GetThreadStateNames;
+ JVM_GetThreadStateValues;
+ JVM_GetVersionInfo;
+ JVM_Halt;
+ JVM_HoldsLock;
+ JVM_IHashCode;
+ JVM_InitAgentProperties;
+ JVM_InitProperties;
+ JVM_InitializeCompiler;
+ JVM_InitializeSocketLibrary;
+ JVM_InternString;
+ JVM_Interrupt;
+ JVM_InvokeMethod;
+ JVM_IsArrayClass;
+ JVM_IsConstructorIx;
+ JVM_IsInterface;
+ JVM_IsInterrupted;
+ JVM_IsNaN;
+ JVM_IsPrimitiveClass;
+ JVM_IsSameClassPackage;
+ JVM_IsSilentCompiler;
+ JVM_IsSupportedJNIVersion;
+ JVM_IsThreadAlive;
+ JVM_LatestUserDefinedLoader;
+ JVM_Listen;
+ JVM_LoadClass0;
+ JVM_LoadLibrary;
+ JVM_Lseek;
+ JVM_MaxObjectInspectionAge;
+ JVM_MaxMemory;
+ JVM_MonitorNotify;
+ JVM_MonitorNotifyAll;
+ JVM_MonitorWait;
+ JVM_NativePath;
+ JVM_NanoTime;
+ JVM_NewArray;
+ JVM_NewInstanceFromConstructor;
+ JVM_NewMultiArray;
+ JVM_OnExit;
+ JVM_Open;
+ JVM_RaiseSignal;
+ JVM_RawMonitorCreate;
+ JVM_RawMonitorDestroy;
+ JVM_RawMonitorEnter;
+ JVM_RawMonitorExit;
+ JVM_Read;
+ JVM_Recv;
+ JVM_RecvFrom;
+ JVM_RegisterSignal;
+ JVM_ReleaseUTF;
+ JVM_ResolveClass;
+ JVM_ResumeThread;
+ JVM_Send;
+ JVM_SendTo;
+ JVM_SetArrayElement;
+ JVM_SetClassSigners;
+ JVM_SetLength;
JVM_SetNativeThreadName;
- JVM_SetPrimitiveArrayElement;
- JVM_SetProtectionDomain;
- JVM_SetSockOpt;
- JVM_SetThreadPriority;
- JVM_Sleep;
- JVM_Socket;
- JVM_SocketAvailable;
- JVM_SocketClose;
- JVM_SocketShutdown;
- JVM_StartThread;
- JVM_StopThread;
- JVM_SuspendThread;
- JVM_SupportsCX8;
- JVM_Sync;
- JVM_Timeout;
- JVM_TotalMemory;
- JVM_TraceInstructions;
- JVM_TraceMethodCalls;
- JVM_UnloadLibrary;
- JVM_Write;
- JVM_Yield;
- JVM_handle_solaris_signal;
+ JVM_SetPrimitiveArrayElement;
+ JVM_SetProtectionDomain;
+ JVM_SetSockOpt;
+ JVM_SetThreadPriority;
+ JVM_Sleep;
+ JVM_Socket;
+ JVM_SocketAvailable;
+ JVM_SocketClose;
+ JVM_SocketShutdown;
+ JVM_StartThread;
+ JVM_StopThread;
+ JVM_SuspendThread;
+ JVM_SupportsCX8;
+ JVM_Sync;
+ JVM_Timeout;
+ JVM_TotalMemory;
+ JVM_TraceInstructions;
+ JVM_TraceMethodCalls;
+ JVM_UnloadLibrary;
+ JVM_Write;
+ JVM_Yield;
+ JVM_handle_solaris_signal;
- # miscellaneous functions
- jio_fprintf;
- jio_printf;
- jio_snprintf;
- jio_vfprintf;
- jio_vsnprintf;
+ # miscellaneous functions
+ jio_fprintf;
+ jio_printf;
+ jio_snprintf;
+ jio_vfprintf;
+ jio_vsnprintf;
- # Needed because there is no JVM interface for this.
- sysThreadAvailableStackWithSlack;
+ # Needed because there is no JVM interface for this.
+ sysThreadAvailableStackWithSlack;
- # This is for Forte Analyzer profiling support.
- AsyncGetCallTrace;
+ # This is for Forte Analyzer profiling support.
+ AsyncGetCallTrace;
- # INSERT VTABLE SYMBOLS HERE
+ # INSERT VTABLE SYMBOLS HERE
local:
*;
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -675,8 +675,8 @@
AbstractAssembler::flush();
}
- inline void emit_long(int); // shadows AbstractAssembler::emit_long
- inline void emit_data(int x) { emit_long(x); }
+ inline void emit_int32(int); // shadows AbstractAssembler::emit_int32
+ inline void emit_data(int x) { emit_int32(x); }
inline void emit_data(int, RelocationHolder const&);
inline void emit_data(int, relocInfo::relocType rtype);
// helper for above fcns
@@ -691,12 +691,12 @@
inline void add(Register s1, Register s2, Register d );
inline void add(Register s1, int simm13a, Register d );
- void addcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(add_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void addcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(add_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void addc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(addc_op3 ) | rs1(s1) | rs2(s2) ); }
- void addc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(addc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void addccc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(addc_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void addccc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(addc_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void addcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(add_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void addcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(add_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void addc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(addc_op3 ) | rs1(s1) | rs2(s2) ); }
+ void addc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(addc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void addccc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(addc_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void addccc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(addc_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 136
@@ -749,76 +749,76 @@
// at address s1 is swapped with the data in d. If the values are not equal,
// the the contents of memory at s1 is loaded into d, without the swap.
- void casa( Register s1, Register s2, Register d, int ia = -1 ) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(casa_op3 ) | rs1(s1) | (ia == -1 ? immed(true) : imm_asi(ia)) | rs2(s2)); }
- void casxa( Register s1, Register s2, Register d, int ia = -1 ) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(casxa_op3) | rs1(s1) | (ia == -1 ? immed(true) : imm_asi(ia)) | rs2(s2)); }
+ void casa( Register s1, Register s2, Register d, int ia = -1 ) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(casa_op3 ) | rs1(s1) | (ia == -1 ? immed(true) : imm_asi(ia)) | rs2(s2)); }
+ void casxa( Register s1, Register s2, Register d, int ia = -1 ) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(casxa_op3) | rs1(s1) | (ia == -1 ? immed(true) : imm_asi(ia)) | rs2(s2)); }
// pp 152
- void udiv( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(udiv_op3 ) | rs1(s1) | rs2(s2)); }
- void udiv( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(udiv_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void sdiv( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sdiv_op3 ) | rs1(s1) | rs2(s2)); }
- void sdiv( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sdiv_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void udivcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(udiv_op3 | cc_bit_op3) | rs1(s1) | rs2(s2)); }
- void udivcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(udiv_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void sdivcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sdiv_op3 | cc_bit_op3) | rs1(s1) | rs2(s2)); }
- void sdivcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sdiv_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void udiv( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(udiv_op3 ) | rs1(s1) | rs2(s2)); }
+ void udiv( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(udiv_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void sdiv( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sdiv_op3 ) | rs1(s1) | rs2(s2)); }
+ void sdiv( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sdiv_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void udivcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(udiv_op3 | cc_bit_op3) | rs1(s1) | rs2(s2)); }
+ void udivcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(udiv_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void sdivcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sdiv_op3 | cc_bit_op3) | rs1(s1) | rs2(s2)); }
+ void sdivcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sdiv_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 155
- void done() { v9_only(); cti(); emit_long( op(arith_op) | fcn(0) | op3(done_op3) ); }
- void retry() { v9_only(); cti(); emit_long( op(arith_op) | fcn(1) | op3(retry_op3) ); }
+ void done() { v9_only(); cti(); emit_int32( op(arith_op) | fcn(0) | op3(done_op3) ); }
+ void retry() { v9_only(); cti(); emit_int32( op(arith_op) | fcn(1) | op3(retry_op3) ); }
// pp 156
- void fadd( FloatRegisterImpl::Width w, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | fs1(s1, w) | opf(0x40 + w) | fs2(s2, w)); }
- void fsub( FloatRegisterImpl::Width w, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | fs1(s1, w) | opf(0x44 + w) | fs2(s2, w)); }
+ void fadd( FloatRegisterImpl::Width w, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | fs1(s1, w) | opf(0x40 + w) | fs2(s2, w)); }
+ void fsub( FloatRegisterImpl::Width w, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | fs1(s1, w) | opf(0x44 + w) | fs2(s2, w)); }
// pp 157
- void fcmp( FloatRegisterImpl::Width w, CC cc, FloatRegister s1, FloatRegister s2) { v8_no_cc(cc); emit_long( op(arith_op) | cmpcc(cc) | op3(fpop2_op3) | fs1(s1, w) | opf(0x50 + w) | fs2(s2, w)); }
- void fcmpe( FloatRegisterImpl::Width w, CC cc, FloatRegister s1, FloatRegister s2) { v8_no_cc(cc); emit_long( op(arith_op) | cmpcc(cc) | op3(fpop2_op3) | fs1(s1, w) | opf(0x54 + w) | fs2(s2, w)); }
+ void fcmp( FloatRegisterImpl::Width w, CC cc, FloatRegister s1, FloatRegister s2) { v8_no_cc(cc); emit_int32( op(arith_op) | cmpcc(cc) | op3(fpop2_op3) | fs1(s1, w) | opf(0x50 + w) | fs2(s2, w)); }
+ void fcmpe( FloatRegisterImpl::Width w, CC cc, FloatRegister s1, FloatRegister s2) { v8_no_cc(cc); emit_int32( op(arith_op) | cmpcc(cc) | op3(fpop2_op3) | fs1(s1, w) | opf(0x54 + w) | fs2(s2, w)); }
// pp 159
- void ftox( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v9_only(); emit_long( op(arith_op) | fd(d, FloatRegisterImpl::D) | op3(fpop1_op3) | opf(0x80 + w) | fs2(s, w)); }
- void ftoi( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_long( op(arith_op) | fd(d, FloatRegisterImpl::S) | op3(fpop1_op3) | opf(0xd0 + w) | fs2(s, w)); }
+ void ftox( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v9_only(); emit_int32( op(arith_op) | fd(d, FloatRegisterImpl::D) | op3(fpop1_op3) | opf(0x80 + w) | fs2(s, w)); }
+ void ftoi( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, FloatRegisterImpl::S) | op3(fpop1_op3) | opf(0xd0 + w) | fs2(s, w)); }
// pp 160
- void ftof( FloatRegisterImpl::Width sw, FloatRegisterImpl::Width dw, FloatRegister s, FloatRegister d ) { emit_long( op(arith_op) | fd(d, dw) | op3(fpop1_op3) | opf(0xc0 + sw + dw*4) | fs2(s, sw)); }
+ void ftof( FloatRegisterImpl::Width sw, FloatRegisterImpl::Width dw, FloatRegister s, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, dw) | op3(fpop1_op3) | opf(0xc0 + sw + dw*4) | fs2(s, sw)); }
// pp 161
- void fxtof( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v9_only(); emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x80 + w*4) | fs2(s, FloatRegisterImpl::D)); }
- void fitof( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0xc0 + w*4) | fs2(s, FloatRegisterImpl::S)); }
+ void fxtof( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v9_only(); emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x80 + w*4) | fs2(s, FloatRegisterImpl::D)); }
+ void fitof( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0xc0 + w*4) | fs2(s, FloatRegisterImpl::S)); }
// pp 162
- void fmov( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w); emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x00 + w) | fs2(s, w)); }
+ void fmov( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w); emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x00 + w) | fs2(s, w)); }
- void fneg( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w); emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x04 + w) | fs2(s, w)); }
+ void fneg( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w); emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x04 + w) | fs2(s, w)); }
// page 144 sparc v8 architecture (double prec works on v8 if the source and destination registers are the same). fnegs is the only instruction available
// on v8 to do negation of single, double and quad precision floats.
- void fneg( FloatRegisterImpl::Width w, FloatRegister sd ) { if (VM_Version::v9_instructions_work()) emit_long( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x04 + w) | fs2(sd, w)); else emit_long( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x05) | fs2(sd, w)); }
+ void fneg( FloatRegisterImpl::Width w, FloatRegister sd ) { if (VM_Version::v9_instructions_work()) emit_int32( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x04 + w) | fs2(sd, w)); else emit_int32( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x05) | fs2(sd, w)); }
- void fabs( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w); emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x08 + w) | fs2(s, w)); }
+ void fabs( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { v8_s_only(w); emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x08 + w) | fs2(s, w)); }
// page 144 sparc v8 architecture (double prec works on v8 if the source and destination registers are the same). fabss is the only instruction available
// on v8 to do abs operation on single/double/quad precision floats.
- void fabs( FloatRegisterImpl::Width w, FloatRegister sd ) { if (VM_Version::v9_instructions_work()) emit_long( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x08 + w) | fs2(sd, w)); else emit_long( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x09) | fs2(sd, w)); }
+ void fabs( FloatRegisterImpl::Width w, FloatRegister sd ) { if (VM_Version::v9_instructions_work()) emit_int32( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x08 + w) | fs2(sd, w)); else emit_int32( op(arith_op) | fd(sd, w) | op3(fpop1_op3) | opf(0x09) | fs2(sd, w)); }
// pp 163
- void fmul( FloatRegisterImpl::Width w, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | fs1(s1, w) | opf(0x48 + w) | fs2(s2, w)); }
- void fmul( FloatRegisterImpl::Width sw, FloatRegisterImpl::Width dw, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_long( op(arith_op) | fd(d, dw) | op3(fpop1_op3) | fs1(s1, sw) | opf(0x60 + sw + dw*4) | fs2(s2, sw)); }
- void fdiv( FloatRegisterImpl::Width w, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | fs1(s1, w) | opf(0x4c + w) | fs2(s2, w)); }
+ void fmul( FloatRegisterImpl::Width w, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | fs1(s1, w) | opf(0x48 + w) | fs2(s2, w)); }
+ void fmul( FloatRegisterImpl::Width sw, FloatRegisterImpl::Width dw, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, dw) | op3(fpop1_op3) | fs1(s1, sw) | opf(0x60 + sw + dw*4) | fs2(s2, sw)); }
+ void fdiv( FloatRegisterImpl::Width w, FloatRegister s1, FloatRegister s2, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | fs1(s1, w) | opf(0x4c + w) | fs2(s2, w)); }
// pp 164
- void fsqrt( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_long( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x28 + w) | fs2(s, w)); }
+ void fsqrt( FloatRegisterImpl::Width w, FloatRegister s, FloatRegister d ) { emit_int32( op(arith_op) | fd(d, w) | op3(fpop1_op3) | opf(0x28 + w) | fs2(s, w)); }
// pp 165
@@ -827,22 +827,22 @@
// pp 167
- void flushw() { v9_only(); emit_long( op(arith_op) | op3(flushw_op3) ); }
+ void flushw() { v9_only(); emit_int32( op(arith_op) | op3(flushw_op3) ); }
// pp 168
- void illtrap( int const22a) { if (const22a != 0) v9_only(); emit_long( op(branch_op) | u_field(const22a, 21, 0) ); }
+ void illtrap( int const22a) { if (const22a != 0) v9_only(); emit_int32( op(branch_op) | u_field(const22a, 21, 0) ); }
// v8 unimp == illtrap(0)
// pp 169
- void impdep1( int id1, int const19a ) { v9_only(); emit_long( op(arith_op) | fcn(id1) | op3(impdep1_op3) | u_field(const19a, 18, 0)); }
- void impdep2( int id1, int const19a ) { v9_only(); emit_long( op(arith_op) | fcn(id1) | op3(impdep2_op3) | u_field(const19a, 18, 0)); }
+ void impdep1( int id1, int const19a ) { v9_only(); emit_int32( op(arith_op) | fcn(id1) | op3(impdep1_op3) | u_field(const19a, 18, 0)); }
+ void impdep2( int id1, int const19a ) { v9_only(); emit_int32( op(arith_op) | fcn(id1) | op3(impdep2_op3) | u_field(const19a, 18, 0)); }
// pp 149 (v8)
- void cpop1( int opc, int cr1, int cr2, int crd ) { v8_only(); emit_long( op(arith_op) | fcn(crd) | op3(impdep1_op3) | u_field(cr1, 18, 14) | opf(opc) | u_field(cr2, 4, 0)); }
- void cpop2( int opc, int cr1, int cr2, int crd ) { v8_only(); emit_long( op(arith_op) | fcn(crd) | op3(impdep2_op3) | u_field(cr1, 18, 14) | opf(opc) | u_field(cr2, 4, 0)); }
+ void cpop1( int opc, int cr1, int cr2, int crd ) { v8_only(); emit_int32( op(arith_op) | fcn(crd) | op3(impdep1_op3) | u_field(cr1, 18, 14) | opf(opc) | u_field(cr2, 4, 0)); }
+ void cpop2( int opc, int cr1, int cr2, int crd ) { v8_only(); emit_int32( op(arith_op) | fcn(crd) | op3(impdep2_op3) | u_field(cr1, 18, 14) | opf(opc) | u_field(cr2, 4, 0)); }
// pp 170
@@ -872,8 +872,8 @@
// 173
- void ldfa( FloatRegisterImpl::Width w, Register s1, Register s2, int ia, FloatRegister d ) { v9_only(); emit_long( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3 | alt_bit_op3, w) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void ldfa( FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d ) { v9_only(); emit_long( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3 | alt_bit_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void ldfa( FloatRegisterImpl::Width w, Register s1, Register s2, int ia, FloatRegister d ) { v9_only(); emit_int32( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3 | alt_bit_op3, w) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void ldfa( FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d ) { v9_only(); emit_int32( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3 | alt_bit_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 175, lduw is ld on v8
@@ -896,22 +896,22 @@
// pp 177
- void ldsba( Register s1, Register s2, int ia, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldsb_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void ldsba( Register s1, int simm13a, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldsb_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void ldsha( Register s1, Register s2, int ia, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldsh_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void ldsha( Register s1, int simm13a, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldsh_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void ldswa( Register s1, Register s2, int ia, Register d ) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(ldsw_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void ldswa( Register s1, int simm13a, Register d ) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(ldsw_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void lduba( Register s1, Register s2, int ia, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldub_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void lduba( Register s1, int simm13a, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldub_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void lduha( Register s1, Register s2, int ia, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(lduh_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void lduha( Register s1, int simm13a, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(lduh_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void lduwa( Register s1, Register s2, int ia, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(lduw_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void lduwa( Register s1, int simm13a, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(lduw_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void ldxa( Register s1, Register s2, int ia, Register d ) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(ldx_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void ldxa( Register s1, int simm13a, Register d ) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(ldx_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void ldda( Register s1, Register s2, int ia, Register d ) { v9_dep(); emit_long( op(ldst_op) | rd(d) | op3(ldd_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void ldda( Register s1, int simm13a, Register d ) { v9_dep(); emit_long( op(ldst_op) | rd(d) | op3(ldd_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void ldsba( Register s1, Register s2, int ia, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldsb_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void ldsba( Register s1, int simm13a, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldsb_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void ldsha( Register s1, Register s2, int ia, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldsh_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void ldsha( Register s1, int simm13a, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldsh_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void ldswa( Register s1, Register s2, int ia, Register d ) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(ldsw_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void ldswa( Register s1, int simm13a, Register d ) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(ldsw_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void lduba( Register s1, Register s2, int ia, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldub_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void lduba( Register s1, int simm13a, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldub_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void lduha( Register s1, Register s2, int ia, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(lduh_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void lduha( Register s1, int simm13a, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(lduh_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void lduwa( Register s1, Register s2, int ia, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(lduw_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void lduwa( Register s1, int simm13a, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(lduw_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void ldxa( Register s1, Register s2, int ia, Register d ) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(ldx_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void ldxa( Register s1, int simm13a, Register d ) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(ldx_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void ldda( Register s1, Register s2, int ia, Register d ) { v9_dep(); emit_int32( op(ldst_op) | rd(d) | op3(ldd_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void ldda( Register s1, int simm13a, Register d ) { v9_dep(); emit_int32( op(ldst_op) | rd(d) | op3(ldd_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 179
@@ -920,111 +920,111 @@
// pp 180
- void ldstuba( Register s1, Register s2, int ia, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldstub_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void ldstuba( Register s1, int simm13a, Register d ) { emit_long( op(ldst_op) | rd(d) | op3(ldstub_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void ldstuba( Register s1, Register s2, int ia, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldstub_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void ldstuba( Register s1, int simm13a, Register d ) { emit_int32( op(ldst_op) | rd(d) | op3(ldstub_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 181
- void and3( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(and_op3 ) | rs1(s1) | rs2(s2) ); }
- void and3( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(and_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void andcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(and_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void andcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(and_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void andn( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(andn_op3 ) | rs1(s1) | rs2(s2) ); }
- void andn( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(andn_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void andncc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(andn_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void andncc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(andn_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void or3( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(or_op3 ) | rs1(s1) | rs2(s2) ); }
- void or3( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(or_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void orcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(or_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void orcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(or_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void orn( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(orn_op3) | rs1(s1) | rs2(s2) ); }
- void orn( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(orn_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void orncc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(orn_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void orncc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(orn_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void xor3( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(xor_op3 ) | rs1(s1) | rs2(s2) ); }
- void xor3( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(xor_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void xorcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(xor_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void xorcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(xor_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void xnor( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(xnor_op3 ) | rs1(s1) | rs2(s2) ); }
- void xnor( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(xnor_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void xnorcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(xnor_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void xnorcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(xnor_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void and3( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(and_op3 ) | rs1(s1) | rs2(s2) ); }
+ void and3( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(and_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void andcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(and_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void andcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(and_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void andn( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(andn_op3 ) | rs1(s1) | rs2(s2) ); }
+ void andn( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(andn_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void andncc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(andn_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void andncc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(andn_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void or3( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(or_op3 ) | rs1(s1) | rs2(s2) ); }
+ void or3( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(or_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void orcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(or_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void orcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(or_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void orn( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(orn_op3) | rs1(s1) | rs2(s2) ); }
+ void orn( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(orn_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void orncc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(orn_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void orncc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(orn_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void xor3( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(xor_op3 ) | rs1(s1) | rs2(s2) ); }
+ void xor3( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(xor_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void xorcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(xor_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void xorcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(xor_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void xnor( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(xnor_op3 ) | rs1(s1) | rs2(s2) ); }
+ void xnor( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(xnor_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void xnorcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(xnor_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void xnorcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(xnor_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 183
- void membar( Membar_mask_bits const7a ) { v9_only(); emit_long( op(arith_op) | op3(membar_op3) | rs1(O7) | immed(true) | u_field( int(const7a), 6, 0)); }
+ void membar( Membar_mask_bits const7a ) { v9_only(); emit_int32( op(arith_op) | op3(membar_op3) | rs1(O7) | immed(true) | u_field( int(const7a), 6, 0)); }
// pp 185
- void fmov( FloatRegisterImpl::Width w, Condition c, bool floatCC, CC cca, FloatRegister s2, FloatRegister d ) { v9_only(); emit_long( op(arith_op) | fd(d, w) | op3(fpop2_op3) | cond_mov(c) | opf_cc(cca, floatCC) | opf_low6(w) | fs2(s2, w)); }
+ void fmov( FloatRegisterImpl::Width w, Condition c, bool floatCC, CC cca, FloatRegister s2, FloatRegister d ) { v9_only(); emit_int32( op(arith_op) | fd(d, w) | op3(fpop2_op3) | cond_mov(c) | opf_cc(cca, floatCC) | opf_low6(w) | fs2(s2, w)); }
// pp 189
- void fmov( FloatRegisterImpl::Width w, RCondition c, Register s1, FloatRegister s2, FloatRegister d ) { v9_only(); emit_long( op(arith_op) | fd(d, w) | op3(fpop2_op3) | rs1(s1) | rcond(c) | opf_low5(4 + w) | fs2(s2, w)); }
+ void fmov( FloatRegisterImpl::Width w, RCondition c, Register s1, FloatRegister s2, FloatRegister d ) { v9_only(); emit_int32( op(arith_op) | fd(d, w) | op3(fpop2_op3) | rs1(s1) | rcond(c) | opf_low5(4 + w) | fs2(s2, w)); }
// pp 191
- void movcc( Condition c, bool floatCC, CC cca, Register s2, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(movcc_op3) | mov_cc(cca, floatCC) | cond_mov(c) | rs2(s2) ); }
- void movcc( Condition c, bool floatCC, CC cca, int simm11a, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(movcc_op3) | mov_cc(cca, floatCC) | cond_mov(c) | immed(true) | simm(simm11a, 11) ); }
+ void movcc( Condition c, bool floatCC, CC cca, Register s2, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(movcc_op3) | mov_cc(cca, floatCC) | cond_mov(c) | rs2(s2) ); }
+ void movcc( Condition c, bool floatCC, CC cca, int simm11a, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(movcc_op3) | mov_cc(cca, floatCC) | cond_mov(c) | immed(true) | simm(simm11a, 11) ); }
// pp 195
- void movr( RCondition c, Register s1, Register s2, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(movr_op3) | rs1(s1) | rcond(c) | rs2(s2) ); }
- void movr( RCondition c, Register s1, int simm10a, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(movr_op3) | rs1(s1) | rcond(c) | immed(true) | simm(simm10a, 10) ); }
+ void movr( RCondition c, Register s1, Register s2, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(movr_op3) | rs1(s1) | rcond(c) | rs2(s2) ); }
+ void movr( RCondition c, Register s1, int simm10a, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(movr_op3) | rs1(s1) | rcond(c) | immed(true) | simm(simm10a, 10) ); }
// pp 196
- void mulx( Register s1, Register s2, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(mulx_op3 ) | rs1(s1) | rs2(s2) ); }
- void mulx( Register s1, int simm13a, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(mulx_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void sdivx( Register s1, Register s2, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(sdivx_op3) | rs1(s1) | rs2(s2) ); }
- void sdivx( Register s1, int simm13a, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(sdivx_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void udivx( Register s1, Register s2, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(udivx_op3) | rs1(s1) | rs2(s2) ); }
- void udivx( Register s1, int simm13a, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(udivx_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void mulx( Register s1, Register s2, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(mulx_op3 ) | rs1(s1) | rs2(s2) ); }
+ void mulx( Register s1, int simm13a, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(mulx_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void sdivx( Register s1, Register s2, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(sdivx_op3) | rs1(s1) | rs2(s2) ); }
+ void sdivx( Register s1, int simm13a, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(sdivx_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void udivx( Register s1, Register s2, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(udivx_op3) | rs1(s1) | rs2(s2) ); }
+ void udivx( Register s1, int simm13a, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(udivx_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 197
- void umul( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(umul_op3 ) | rs1(s1) | rs2(s2) ); }
- void umul( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(umul_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void smul( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(smul_op3 ) | rs1(s1) | rs2(s2) ); }
- void smul( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(smul_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void umulcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(umul_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void umulcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(umul_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void smulcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(smul_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void smulcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(smul_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void umul( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(umul_op3 ) | rs1(s1) | rs2(s2) ); }
+ void umul( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(umul_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void smul( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(smul_op3 ) | rs1(s1) | rs2(s2) ); }
+ void smul( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(smul_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void umulcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(umul_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void umulcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(umul_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void smulcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(smul_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void smulcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(smul_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 199
- void mulscc( Register s1, Register s2, Register d ) { v9_dep(); emit_long( op(arith_op) | rd(d) | op3(mulscc_op3) | rs1(s1) | rs2(s2) ); }
- void mulscc( Register s1, int simm13a, Register d ) { v9_dep(); emit_long( op(arith_op) | rd(d) | op3(mulscc_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void mulscc( Register s1, Register s2, Register d ) { v9_dep(); emit_int32( op(arith_op) | rd(d) | op3(mulscc_op3) | rs1(s1) | rs2(s2) ); }
+ void mulscc( Register s1, int simm13a, Register d ) { v9_dep(); emit_int32( op(arith_op) | rd(d) | op3(mulscc_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 201
- void nop() { emit_long( op(branch_op) | op2(sethi_op2) ); }
+ void nop() { emit_int32( op(branch_op) | op2(sethi_op2) ); }
// pp 202
- void popc( Register s, Register d) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(popc_op3) | rs2(s)); }
- void popc( int simm13a, Register d) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(popc_op3) | immed(true) | simm(simm13a, 13)); }
+ void popc( Register s, Register d) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(popc_op3) | rs2(s)); }
+ void popc( int simm13a, Register d) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(popc_op3) | immed(true) | simm(simm13a, 13)); }
// pp 203
- void prefetch( Register s1, Register s2, PrefetchFcn f) { v9_only(); emit_long( op(ldst_op) | fcn(f) | op3(prefetch_op3) | rs1(s1) | rs2(s2) ); }
+ void prefetch( Register s1, Register s2, PrefetchFcn f) { v9_only(); emit_int32( op(ldst_op) | fcn(f) | op3(prefetch_op3) | rs1(s1) | rs2(s2) ); }
void prefetch( Register s1, int simm13a, PrefetchFcn f) { v9_only(); emit_data( op(ldst_op) | fcn(f) | op3(prefetch_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
- void prefetcha( Register s1, Register s2, int ia, PrefetchFcn f ) { v9_only(); emit_long( op(ldst_op) | fcn(f) | op3(prefetch_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void prefetcha( Register s1, int simm13a, PrefetchFcn f ) { v9_only(); emit_long( op(ldst_op) | fcn(f) | op3(prefetch_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void prefetcha( Register s1, Register s2, int ia, PrefetchFcn f ) { v9_only(); emit_int32( op(ldst_op) | fcn(f) | op3(prefetch_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void prefetcha( Register s1, int simm13a, PrefetchFcn f ) { v9_only(); emit_int32( op(ldst_op) | fcn(f) | op3(prefetch_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 208
// not implementing read privileged register
- inline void rdy( Register d) { v9_dep(); emit_long( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(0, 18, 14)); }
- inline void rdccr( Register d) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(2, 18, 14)); }
- inline void rdasi( Register d) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(3, 18, 14)); }
- inline void rdtick( Register d) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(4, 18, 14)); } // Spoon!
- inline void rdpc( Register d) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(5, 18, 14)); }
- inline void rdfprs( Register d) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(6, 18, 14)); }
+ inline void rdy( Register d) { v9_dep(); emit_int32( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(0, 18, 14)); }
+ inline void rdccr( Register d) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(2, 18, 14)); }
+ inline void rdasi( Register d) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(3, 18, 14)); }
+ inline void rdtick( Register d) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(4, 18, 14)); } // Spoon!
+ inline void rdpc( Register d) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(5, 18, 14)); }
+ inline void rdfprs( Register d) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(rdreg_op3) | u_field(6, 18, 14)); }
// pp 213
@@ -1033,47 +1033,47 @@
// pp 214
- void save( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(save_op3) | rs1(s1) | rs2(s2) ); }
+ void save( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(save_op3) | rs1(s1) | rs2(s2) ); }
void save( Register s1, int simm13a, Register d ) {
// make sure frame is at least large enough for the register save area
assert(-simm13a >= 16 * wordSize, "frame too small");
- emit_long( op(arith_op) | rd(d) | op3(save_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) );
+ emit_int32( op(arith_op) | rd(d) | op3(save_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) );
}
- void restore( Register s1 = G0, Register s2 = G0, Register d = G0 ) { emit_long( op(arith_op) | rd(d) | op3(restore_op3) | rs1(s1) | rs2(s2) ); }
- void restore( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(restore_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void restore( Register s1 = G0, Register s2 = G0, Register d = G0 ) { emit_int32( op(arith_op) | rd(d) | op3(restore_op3) | rs1(s1) | rs2(s2) ); }
+ void restore( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(restore_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 216
- void saved() { v9_only(); emit_long( op(arith_op) | fcn(0) | op3(saved_op3)); }
- void restored() { v9_only(); emit_long( op(arith_op) | fcn(1) | op3(saved_op3)); }
+ void saved() { v9_only(); emit_int32( op(arith_op) | fcn(0) | op3(saved_op3)); }
+ void restored() { v9_only(); emit_int32( op(arith_op) | fcn(1) | op3(saved_op3)); }
// pp 217
inline void sethi( int imm22a, Register d, RelocationHolder const& rspec = RelocationHolder() );
// pp 218
- void sll( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sll_op3) | rs1(s1) | sx(0) | rs2(s2) ); }
- void sll( Register s1, int imm5a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sll_op3) | rs1(s1) | sx(0) | immed(true) | u_field(imm5a, 4, 0) ); }
- void srl( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(srl_op3) | rs1(s1) | sx(0) | rs2(s2) ); }
- void srl( Register s1, int imm5a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(srl_op3) | rs1(s1) | sx(0) | immed(true) | u_field(imm5a, 4, 0) ); }
- void sra( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sra_op3) | rs1(s1) | sx(0) | rs2(s2) ); }
- void sra( Register s1, int imm5a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sra_op3) | rs1(s1) | sx(0) | immed(true) | u_field(imm5a, 4, 0) ); }
+ void sll( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sll_op3) | rs1(s1) | sx(0) | rs2(s2) ); }
+ void sll( Register s1, int imm5a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sll_op3) | rs1(s1) | sx(0) | immed(true) | u_field(imm5a, 4, 0) ); }
+ void srl( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(srl_op3) | rs1(s1) | sx(0) | rs2(s2) ); }
+ void srl( Register s1, int imm5a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(srl_op3) | rs1(s1) | sx(0) | immed(true) | u_field(imm5a, 4, 0) ); }
+ void sra( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sra_op3) | rs1(s1) | sx(0) | rs2(s2) ); }
+ void sra( Register s1, int imm5a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sra_op3) | rs1(s1) | sx(0) | immed(true) | u_field(imm5a, 4, 0) ); }
- void sllx( Register s1, Register s2, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(sll_op3) | rs1(s1) | sx(1) | rs2(s2) ); }
- void sllx( Register s1, int imm6a, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(sll_op3) | rs1(s1) | sx(1) | immed(true) | u_field(imm6a, 5, 0) ); }
- void srlx( Register s1, Register s2, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(srl_op3) | rs1(s1) | sx(1) | rs2(s2) ); }
- void srlx( Register s1, int imm6a, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(srl_op3) | rs1(s1) | sx(1) | immed(true) | u_field(imm6a, 5, 0) ); }
- void srax( Register s1, Register s2, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(sra_op3) | rs1(s1) | sx(1) | rs2(s2) ); }
- void srax( Register s1, int imm6a, Register d ) { v9_only(); emit_long( op(arith_op) | rd(d) | op3(sra_op3) | rs1(s1) | sx(1) | immed(true) | u_field(imm6a, 5, 0) ); }
+ void sllx( Register s1, Register s2, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(sll_op3) | rs1(s1) | sx(1) | rs2(s2) ); }
+ void sllx( Register s1, int imm6a, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(sll_op3) | rs1(s1) | sx(1) | immed(true) | u_field(imm6a, 5, 0) ); }
+ void srlx( Register s1, Register s2, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(srl_op3) | rs1(s1) | sx(1) | rs2(s2) ); }
+ void srlx( Register s1, int imm6a, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(srl_op3) | rs1(s1) | sx(1) | immed(true) | u_field(imm6a, 5, 0) ); }
+ void srax( Register s1, Register s2, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(sra_op3) | rs1(s1) | sx(1) | rs2(s2) ); }
+ void srax( Register s1, int imm6a, Register d ) { v9_only(); emit_int32( op(arith_op) | rd(d) | op3(sra_op3) | rs1(s1) | sx(1) | immed(true) | u_field(imm6a, 5, 0) ); }
// pp 220
- void sir( int simm13a ) { emit_long( op(arith_op) | fcn(15) | op3(sir_op3) | immed(true) | simm(simm13a, 13)); }
+ void sir( int simm13a ) { emit_int32( op(arith_op) | fcn(15) | op3(sir_op3) | immed(true) | simm(simm13a, 13)); }
// pp 221
- void stbar() { emit_long( op(arith_op) | op3(membar_op3) | u_field(15, 18, 14)); }
+ void stbar() { emit_int32( op(arith_op) | op3(membar_op3) | u_field(15, 18, 14)); }
// pp 222
@@ -1087,8 +1087,8 @@
// pp 224
- void stfa( FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2, int ia ) { v9_only(); emit_long( op(ldst_op) | fd(d, w) | alt_op3(stf_op3 | alt_bit_op3, w) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void stfa( FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a ) { v9_only(); emit_long( op(ldst_op) | fd(d, w) | alt_op3(stf_op3 | alt_bit_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void stfa( FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2, int ia ) { v9_only(); emit_int32( op(ldst_op) | fd(d, w) | alt_op3(stf_op3 | alt_bit_op3, w) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void stfa( FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a ) { v9_only(); emit_int32( op(ldst_op) | fd(d, w) | alt_op3(stf_op3 | alt_bit_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// p 226
@@ -1105,16 +1105,16 @@
// pp 177
- void stba( Register d, Register s1, Register s2, int ia ) { emit_long( op(ldst_op) | rd(d) | op3(stb_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void stba( Register d, Register s1, int simm13a ) { emit_long( op(ldst_op) | rd(d) | op3(stb_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void stha( Register d, Register s1, Register s2, int ia ) { emit_long( op(ldst_op) | rd(d) | op3(sth_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void stha( Register d, Register s1, int simm13a ) { emit_long( op(ldst_op) | rd(d) | op3(sth_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void stwa( Register d, Register s1, Register s2, int ia ) { emit_long( op(ldst_op) | rd(d) | op3(stw_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void stwa( Register d, Register s1, int simm13a ) { emit_long( op(ldst_op) | rd(d) | op3(stw_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void stxa( Register d, Register s1, Register s2, int ia ) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(stx_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void stxa( Register d, Register s1, int simm13a ) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(stx_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void stda( Register d, Register s1, Register s2, int ia ) { emit_long( op(ldst_op) | rd(d) | op3(std_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void stda( Register d, Register s1, int simm13a ) { emit_long( op(ldst_op) | rd(d) | op3(std_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void stba( Register d, Register s1, Register s2, int ia ) { emit_int32( op(ldst_op) | rd(d) | op3(stb_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void stba( Register d, Register s1, int simm13a ) { emit_int32( op(ldst_op) | rd(d) | op3(stb_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void stha( Register d, Register s1, Register s2, int ia ) { emit_int32( op(ldst_op) | rd(d) | op3(sth_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void stha( Register d, Register s1, int simm13a ) { emit_int32( op(ldst_op) | rd(d) | op3(sth_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void stwa( Register d, Register s1, Register s2, int ia ) { emit_int32( op(ldst_op) | rd(d) | op3(stw_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void stwa( Register d, Register s1, int simm13a ) { emit_int32( op(ldst_op) | rd(d) | op3(stw_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void stxa( Register d, Register s1, Register s2, int ia ) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(stx_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void stxa( Register d, Register s1, int simm13a ) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(stx_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void stda( Register d, Register s1, Register s2, int ia ) { emit_int32( op(ldst_op) | rd(d) | op3(std_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void stda( Register d, Register s1, int simm13a ) { emit_int32( op(ldst_op) | rd(d) | op3(std_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 97 (v8)
@@ -1129,15 +1129,15 @@
// pp 230
- void sub( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sub_op3 ) | rs1(s1) | rs2(s2) ); }
- void sub( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sub_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void sub( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sub_op3 ) | rs1(s1) | rs2(s2) ); }
+ void sub( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sub_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void subcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sub_op3 | cc_bit_op3 ) | rs1(s1) | rs2(s2) ); }
- void subcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(sub_op3 | cc_bit_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void subc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(subc_op3 ) | rs1(s1) | rs2(s2) ); }
- void subc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(subc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void subccc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(subc_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
- void subccc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(subc_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void subcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sub_op3 | cc_bit_op3 ) | rs1(s1) | rs2(s2) ); }
+ void subcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(sub_op3 | cc_bit_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void subc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(subc_op3 ) | rs1(s1) | rs2(s2) ); }
+ void subc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(subc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void subccc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(subc_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
+ void subccc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(subc_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 231
@@ -1146,55 +1146,55 @@
// pp 232
- void swapa( Register s1, Register s2, int ia, Register d ) { v9_dep(); emit_long( op(ldst_op) | rd(d) | op3(swap_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
- void swapa( Register s1, int simm13a, Register d ) { v9_dep(); emit_long( op(ldst_op) | rd(d) | op3(swap_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void swapa( Register s1, Register s2, int ia, Register d ) { v9_dep(); emit_int32( op(ldst_op) | rd(d) | op3(swap_op3 | alt_bit_op3) | rs1(s1) | imm_asi(ia) | rs2(s2) ); }
+ void swapa( Register s1, int simm13a, Register d ) { v9_dep(); emit_int32( op(ldst_op) | rd(d) | op3(swap_op3 | alt_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 234, note op in book is wrong, see pp 268
- void taddcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(taddcc_op3 ) | rs1(s1) | rs2(s2) ); }
- void taddcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(taddcc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void taddcctv( Register s1, Register s2, Register d ) { v9_dep(); emit_long( op(arith_op) | rd(d) | op3(taddcctv_op3) | rs1(s1) | rs2(s2) ); }
- void taddcctv( Register s1, int simm13a, Register d ) { v9_dep(); emit_long( op(arith_op) | rd(d) | op3(taddcctv_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void taddcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(taddcc_op3 ) | rs1(s1) | rs2(s2) ); }
+ void taddcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(taddcc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void taddcctv( Register s1, Register s2, Register d ) { v9_dep(); emit_int32( op(arith_op) | rd(d) | op3(taddcctv_op3) | rs1(s1) | rs2(s2) ); }
+ void taddcctv( Register s1, int simm13a, Register d ) { v9_dep(); emit_int32( op(arith_op) | rd(d) | op3(taddcctv_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 235
- void tsubcc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(tsubcc_op3 ) | rs1(s1) | rs2(s2) ); }
- void tsubcc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(tsubcc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
- void tsubcctv( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(tsubcctv_op3) | rs1(s1) | rs2(s2) ); }
- void tsubcctv( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(tsubcctv_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void tsubcc( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(tsubcc_op3 ) | rs1(s1) | rs2(s2) ); }
+ void tsubcc( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(tsubcc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+ void tsubcctv( Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(tsubcctv_op3) | rs1(s1) | rs2(s2) ); }
+ void tsubcctv( Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(tsubcctv_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
// pp 237
- void trap( Condition c, CC cc, Register s1, Register s2 ) { v8_no_cc(cc); emit_long( op(arith_op) | cond(c) | op3(trap_op3) | rs1(s1) | trapcc(cc) | rs2(s2)); }
- void trap( Condition c, CC cc, Register s1, int trapa ) { v8_no_cc(cc); emit_long( op(arith_op) | cond(c) | op3(trap_op3) | rs1(s1) | trapcc(cc) | immed(true) | u_field(trapa, 6, 0)); }
+ void trap( Condition c, CC cc, Register s1, Register s2 ) { v8_no_cc(cc); emit_int32( op(arith_op) | cond(c) | op3(trap_op3) | rs1(s1) | trapcc(cc) | rs2(s2)); }
+ void trap( Condition c, CC cc, Register s1, int trapa ) { v8_no_cc(cc); emit_int32( op(arith_op) | cond(c) | op3(trap_op3) | rs1(s1) | trapcc(cc) | immed(true) | u_field(trapa, 6, 0)); }
// simple uncond. trap
void trap( int trapa ) { trap( always, icc, G0, trapa ); }
// pp 239 omit write priv register for now
- inline void wry( Register d) { v9_dep(); emit_long( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(0, 29, 25)); }
- inline void wrccr(Register s) { v9_only(); emit_long( op(arith_op) | rs1(s) | op3(wrreg_op3) | u_field(2, 29, 25)); }
- inline void wrccr(Register s, int simm13a) { v9_only(); emit_long( op(arith_op) |
+ inline void wry( Register d) { v9_dep(); emit_int32( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(0, 29, 25)); }
+ inline void wrccr(Register s) { v9_only(); emit_int32( op(arith_op) | rs1(s) | op3(wrreg_op3) | u_field(2, 29, 25)); }
+ inline void wrccr(Register s, int simm13a) { v9_only(); emit_int32( op(arith_op) |
rs1(s) |
op3(wrreg_op3) |
u_field(2, 29, 25) |
immed(true) |
simm(simm13a, 13)); }
- inline void wrasi(Register d) { v9_only(); emit_long( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(3, 29, 25)); }
+ inline void wrasi(Register d) { v9_only(); emit_int32( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(3, 29, 25)); }
// wrasi(d, imm) stores (d xor imm) to asi
- inline void wrasi(Register d, int simm13a) { v9_only(); emit_long( op(arith_op) | rs1(d) | op3(wrreg_op3) |
+ inline void wrasi(Register d, int simm13a) { v9_only(); emit_int32( op(arith_op) | rs1(d) | op3(wrreg_op3) |
u_field(3, 29, 25) | immed(true) | simm(simm13a, 13)); }
- inline void wrfprs( Register d) { v9_only(); emit_long( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(6, 29, 25)); }
+ inline void wrfprs( Register d) { v9_only(); emit_int32( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(6, 29, 25)); }
// VIS3 instructions
- void movstosw( FloatRegister s, Register d ) { vis3_only(); emit_long( op(arith_op) | rd(d) | op3(mftoi_op3) | opf(mstosw_opf) | fs2(s, FloatRegisterImpl::S)); }
- void movstouw( FloatRegister s, Register d ) { vis3_only(); emit_long( op(arith_op) | rd(d) | op3(mftoi_op3) | opf(mstouw_opf) | fs2(s, FloatRegisterImpl::S)); }
- void movdtox( FloatRegister s, Register d ) { vis3_only(); emit_long( op(arith_op) | rd(d) | op3(mftoi_op3) | opf(mdtox_opf) | fs2(s, FloatRegisterImpl::D)); }
+ void movstosw( FloatRegister s, Register d ) { vis3_only(); emit_int32( op(arith_op) | rd(d) | op3(mftoi_op3) | opf(mstosw_opf) | fs2(s, FloatRegisterImpl::S)); }
+ void movstouw( FloatRegister s, Register d ) { vis3_only(); emit_int32( op(arith_op) | rd(d) | op3(mftoi_op3) | opf(mstouw_opf) | fs2(s, FloatRegisterImpl::S)); }
+ void movdtox( FloatRegister s, Register d ) { vis3_only(); emit_int32( op(arith_op) | rd(d) | op3(mftoi_op3) | opf(mdtox_opf) | fs2(s, FloatRegisterImpl::D)); }
- void movwtos( Register s, FloatRegister d ) { vis3_only(); emit_long( op(arith_op) | fd(d, FloatRegisterImpl::S) | op3(mftoi_op3) | opf(mwtos_opf) | rs2(s)); }
- void movxtod( Register s, FloatRegister d ) { vis3_only(); emit_long( op(arith_op) | fd(d, FloatRegisterImpl::D) | op3(mftoi_op3) | opf(mxtod_opf) | rs2(s)); }
+ void movwtos( Register s, FloatRegister d ) { vis3_only(); emit_int32( op(arith_op) | fd(d, FloatRegisterImpl::S) | op3(mftoi_op3) | opf(mwtos_opf) | rs2(s)); }
+ void movxtod( Register s, FloatRegister d ) { vis3_only(); emit_int32( op(arith_op) | fd(d, FloatRegisterImpl::D) | op3(mftoi_op3) | opf(mxtod_opf) | rs2(s)); }
// Creation
Assembler(CodeBuffer* code) : AbstractAssembler(code) {
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -35,24 +35,24 @@
# endif
}
-inline void Assembler::emit_long(int x) {
+inline void Assembler::emit_int32(int x) {
check_delay();
- AbstractAssembler::emit_long(x);
+ AbstractAssembler::emit_int32(x);
}
inline void Assembler::emit_data(int x, relocInfo::relocType rtype) {
relocate(rtype);
- emit_long(x);
+ emit_int32(x);
}
inline void Assembler::emit_data(int x, RelocationHolder const& rspec) {
relocate(rspec);
- emit_long(x);
+ emit_int32(x);
}
-inline void Assembler::add(Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | rs2(s2) ); }
-inline void Assembler::add(Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+inline void Assembler::add(Register s1, Register s2, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::add(Register s1, int simm13a, Register d ) { emit_int32( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
inline void Assembler::bpr( RCondition c, bool a, Predict p, Register s1, address d, relocInfo::relocType rt ) { v9_only(); cti(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(bpr_op2) | wdisp16(intptr_t(d), intptr_t(pc())) | predict(p) | rs1(s1), rt); has_delay_slot(); }
inline void Assembler::bpr( RCondition c, bool a, Predict p, Register s1, Label& L) { bpr( c, a, p, s1, target(L)); }
@@ -79,93 +79,93 @@
inline void Assembler::call( address d, relocInfo::relocType rt ) { cti(); emit_data( op(call_op) | wdisp(intptr_t(d), intptr_t(pc()), 30), rt); has_delay_slot(); assert(rt != relocInfo::virtual_call_type, "must use virtual_call_Relocation::spec"); }
inline void Assembler::call( Label& L, relocInfo::relocType rt ) { call( target(L), rt); }
-inline void Assembler::flush( Register s1, Register s2) { emit_long( op(arith_op) | op3(flush_op3) | rs1(s1) | rs2(s2)); }
+inline void Assembler::flush( Register s1, Register s2) { emit_int32( op(arith_op) | op3(flush_op3) | rs1(s1) | rs2(s2)); }
inline void Assembler::flush( Register s1, int simm13a) { emit_data( op(arith_op) | op3(flush_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::jmpl( Register s1, Register s2, Register d ) { cti(); emit_long( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
+inline void Assembler::jmpl( Register s1, Register s2, Register d ) { cti(); emit_int32( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
inline void Assembler::jmpl( Register s1, int simm13a, Register d, RelocationHolder const& rspec ) { cti(); emit_data( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); has_delay_slot(); }
-inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d) { emit_int32( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); }
-inline void Assembler::ldfsr( Register s1, Register s2) { v9_dep(); emit_long( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldfsr( Register s1, Register s2) { v9_dep(); emit_int32( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldfsr( Register s1, int simm13a) { v9_dep(); emit_data( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldxfsr( Register s1, Register s2) { v9_only(); emit_long( op(ldst_op) | rd(G1) | op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldxfsr( Register s1, Register s2) { v9_only(); emit_int32( op(ldst_op) | rd(G1) | op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldxfsr( Register s1, int simm13a) { v9_only(); emit_data( op(ldst_op) | rd(G1) | op3(ldfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldc( Register s1, Register s2, int crd) { v8_only(); emit_long( op(ldst_op) | fcn(crd) | op3(ldc_op3 ) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldc( Register s1, Register s2, int crd) { v8_only(); emit_int32( op(ldst_op) | fcn(crd) | op3(ldc_op3 ) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldc( Register s1, int simm13a, int crd) { v8_only(); emit_data( op(ldst_op) | fcn(crd) | op3(ldc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::lddc( Register s1, Register s2, int crd) { v8_only(); emit_long( op(ldst_op) | fcn(crd) | op3(lddc_op3 ) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::lddc( Register s1, Register s2, int crd) { v8_only(); emit_int32( op(ldst_op) | fcn(crd) | op3(lddc_op3 ) | rs1(s1) | rs2(s2) ); }
inline void Assembler::lddc( Register s1, int simm13a, int crd) { v8_only(); emit_data( op(ldst_op) | fcn(crd) | op3(lddc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldcsr( Register s1, Register s2, int crd) { v8_only(); emit_long( op(ldst_op) | fcn(crd) | op3(ldcsr_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldcsr( Register s1, Register s2, int crd) { v8_only(); emit_int32( op(ldst_op) | fcn(crd) | op3(ldcsr_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldcsr( Register s1, int simm13a, int crd) { v8_only(); emit_data( op(ldst_op) | fcn(crd) | op3(ldcsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldsb( Register s1, Register s2, Register d) { emit_long( op(ldst_op) | rd(d) | op3(ldsb_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldsb( Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(ldsb_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldsb( Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(ldsb_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldsh( Register s1, Register s2, Register d) { emit_long( op(ldst_op) | rd(d) | op3(ldsh_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldsh( Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(ldsh_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldsh( Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(ldsh_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldsw( Register s1, Register s2, Register d) { emit_long( op(ldst_op) | rd(d) | op3(ldsw_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldsw( Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(ldsw_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldsw( Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(ldsw_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldub( Register s1, Register s2, Register d) { emit_long( op(ldst_op) | rd(d) | op3(ldub_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldub( Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(ldub_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldub( Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(ldub_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::lduh( Register s1, Register s2, Register d) { emit_long( op(ldst_op) | rd(d) | op3(lduh_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::lduh( Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(lduh_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::lduh( Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(lduh_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::lduw( Register s1, Register s2, Register d) { emit_long( op(ldst_op) | rd(d) | op3(lduw_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::lduw( Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(lduw_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::lduw( Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(lduw_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldx( Register s1, Register s2, Register d) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(ldx_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldx( Register s1, Register s2, Register d) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(ldx_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldx( Register s1, int simm13a, Register d) { v9_only(); emit_data( op(ldst_op) | rd(d) | op3(ldx_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldd( Register s1, Register s2, Register d) { v9_dep(); assert(d->is_even(), "not even"); emit_long( op(ldst_op) | rd(d) | op3(ldd_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldd( Register s1, Register s2, Register d) { v9_dep(); assert(d->is_even(), "not even"); emit_int32( op(ldst_op) | rd(d) | op3(ldd_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldd( Register s1, int simm13a, Register d) { v9_dep(); assert(d->is_even(), "not even"); emit_data( op(ldst_op) | rd(d) | op3(ldd_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::ldstub( Register s1, Register s2, Register d) { emit_long( op(ldst_op) | rd(d) | op3(ldstub_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::ldstub( Register s1, Register s2, Register d) { emit_int32( op(ldst_op) | rd(d) | op3(ldstub_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::ldstub( Register s1, int simm13a, Register d) { emit_data( op(ldst_op) | rd(d) | op3(ldstub_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::rett( Register s1, Register s2 ) { cti(); emit_long( op(arith_op) | op3(rett_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
+inline void Assembler::rett( Register s1, Register s2 ) { cti(); emit_int32( op(arith_op) | op3(rett_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
inline void Assembler::rett( Register s1, int simm13a, relocInfo::relocType rt) { cti(); emit_data( op(arith_op) | op3(rett_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rt); has_delay_slot(); }
inline void Assembler::sethi( int imm22a, Register d, RelocationHolder const& rspec ) { emit_data( op(branch_op) | rd(d) | op2(sethi_op2) | hi22(imm22a), rspec); }
// pp 222
-inline void Assembler::stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2) { emit_int32( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stf( FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(stf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::stfsr( Register s1, Register s2) { v9_dep(); emit_long( op(ldst_op) | op3(stfsr_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stfsr( Register s1, Register s2) { v9_dep(); emit_int32( op(ldst_op) | op3(stfsr_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stfsr( Register s1, int simm13a) { v9_dep(); emit_data( op(ldst_op) | op3(stfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::stxfsr( Register s1, Register s2) { v9_only(); emit_long( op(ldst_op) | rd(G1) | op3(stfsr_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stxfsr( Register s1, Register s2) { v9_only(); emit_int32( op(ldst_op) | rd(G1) | op3(stfsr_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stxfsr( Register s1, int simm13a) { v9_only(); emit_data( op(ldst_op) | rd(G1) | op3(stfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
// p 226
-inline void Assembler::stb( Register d, Register s1, Register s2) { emit_long( op(ldst_op) | rd(d) | op3(stb_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stb( Register d, Register s1, Register s2) { emit_int32( op(ldst_op) | rd(d) | op3(stb_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stb( Register d, Register s1, int simm13a) { emit_data( op(ldst_op) | rd(d) | op3(stb_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::sth( Register d, Register s1, Register s2) { emit_long( op(ldst_op) | rd(d) | op3(sth_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::sth( Register d, Register s1, Register s2) { emit_int32( op(ldst_op) | rd(d) | op3(sth_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::sth( Register d, Register s1, int simm13a) { emit_data( op(ldst_op) | rd(d) | op3(sth_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::stw( Register d, Register s1, Register s2) { emit_long( op(ldst_op) | rd(d) | op3(stw_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stw( Register d, Register s1, Register s2) { emit_int32( op(ldst_op) | rd(d) | op3(stw_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stw( Register d, Register s1, int simm13a) { emit_data( op(ldst_op) | rd(d) | op3(stw_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::stx( Register d, Register s1, Register s2) { v9_only(); emit_long( op(ldst_op) | rd(d) | op3(stx_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stx( Register d, Register s1, Register s2) { v9_only(); emit_int32( op(ldst_op) | rd(d) | op3(stx_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stx( Register d, Register s1, int simm13a) { v9_only(); emit_data( op(ldst_op) | rd(d) | op3(stx_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::std( Register d, Register s1, Register s2) { v9_dep(); assert(d->is_even(), "not even"); emit_long( op(ldst_op) | rd(d) | op3(std_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::std( Register d, Register s1, Register s2) { v9_dep(); assert(d->is_even(), "not even"); emit_int32( op(ldst_op) | rd(d) | op3(std_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::std( Register d, Register s1, int simm13a) { v9_dep(); assert(d->is_even(), "not even"); emit_data( op(ldst_op) | rd(d) | op3(std_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
// v8 p 99
-inline void Assembler::stc( int crd, Register s1, Register s2) { v8_only(); emit_long( op(ldst_op) | fcn(crd) | op3(stc_op3 ) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stc( int crd, Register s1, Register s2) { v8_only(); emit_int32( op(ldst_op) | fcn(crd) | op3(stc_op3 ) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stc( int crd, Register s1, int simm13a) { v8_only(); emit_data( op(ldst_op) | fcn(crd) | op3(stc_op3 ) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::stdc( int crd, Register s1, Register s2) { v8_only(); emit_long( op(ldst_op) | fcn(crd) | op3(stdc_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stdc( int crd, Register s1, Register s2) { v8_only(); emit_int32( op(ldst_op) | fcn(crd) | op3(stdc_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stdc( int crd, Register s1, int simm13a) { v8_only(); emit_data( op(ldst_op) | fcn(crd) | op3(stdc_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::stcsr( int crd, Register s1, Register s2) { v8_only(); emit_long( op(ldst_op) | fcn(crd) | op3(stcsr_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stcsr( int crd, Register s1, Register s2) { v8_only(); emit_int32( op(ldst_op) | fcn(crd) | op3(stcsr_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stcsr( int crd, Register s1, int simm13a) { v8_only(); emit_data( op(ldst_op) | fcn(crd) | op3(stcsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::stdcq( int crd, Register s1, Register s2) { v8_only(); emit_long( op(ldst_op) | fcn(crd) | op3(stdcq_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::stdcq( int crd, Register s1, Register s2) { v8_only(); emit_int32( op(ldst_op) | fcn(crd) | op3(stdcq_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::stdcq( int crd, Register s1, int simm13a) { v8_only(); emit_data( op(ldst_op) | fcn(crd) | op3(stdcq_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
// pp 231
-inline void Assembler::swap( Register s1, Register s2, Register d) { v9_dep(); emit_long( op(ldst_op) | rd(d) | op3(swap_op3) | rs1(s1) | rs2(s2) ); }
+inline void Assembler::swap( Register s1, Register s2, Register d) { v9_dep(); emit_int32( op(ldst_op) | rd(d) | op3(swap_op3) | rs1(s1) | rs2(s2) ); }
inline void Assembler::swap( Register s1, int simm13a, Register d) { v9_dep(); emit_data( op(ldst_op) | rd(d) | op3(swap_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP
--- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -137,7 +137,7 @@
}
__ ret(); // return from interpreter activation
__ delayed()->restore(I5_savedSP, G0, SP); // remove interpreter frame
- NOT_PRODUCT(__ emit_long(0);) // marker for disassembly
+ NOT_PRODUCT(__ emit_int32(0);) // marker for disassembly
return entry;
}
@@ -232,7 +232,7 @@
}
__ retl(); // return from interpreter activation
__ delayed()->nop(); // schedule this better
- NOT_PRODUCT(__ emit_long(0);) // marker for disassembly
+ NOT_PRODUCT(__ emit_int32(0);) // marker for disassembly
return entry;
}
@@ -1473,7 +1473,7 @@
__ brx(Assembler::equal, false, Assembler::pt, skip); \
__ delayed()->nop(); \
__ breakpoint_trap(); \
- __ emit_long(marker); \
+ __ emit_int32(marker); \
__ bind(skip); \
}
#else
--- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1224,7 +1224,7 @@
// Relocation with special format (see relocInfo_sparc.hpp).
relocate(rspec, 1);
// Assembler::sethi(0x3fffff, d);
- emit_long( op(branch_op) | rd(d) | op2(sethi_op2) | hi22(0x3fffff) );
+ emit_int32( op(branch_op) | rd(d) | op2(sethi_op2) | hi22(0x3fffff) );
// Don't add relocation for 'add'. Do patching during 'sethi' processing.
add(d, 0x3ff, d);
@@ -1240,7 +1240,7 @@
// Relocation with special format (see relocInfo_sparc.hpp).
relocate(rspec, 1);
// Assembler::sethi(encoded_k, d);
- emit_long( op(branch_op) | rd(d) | op2(sethi_op2) | hi22(encoded_k) );
+ emit_int32( op(branch_op) | rd(d) | op2(sethi_op2) | hi22(encoded_k) );
// Don't add relocation for 'add'. Do patching during 'sethi' processing.
add(d, low10(encoded_k), d);
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -259,7 +259,7 @@
}
__ ret(); // return from interpreter activation
__ delayed()->restore(I5_savedSP, G0, SP); // remove interpreter frame
- NOT_PRODUCT(__ emit_long(0);) // marker for disassembly
+ NOT_PRODUCT(__ emit_int32(0);) // marker for disassembly
return entry;
}
--- a/hotspot/src/cpu/sparc/vm/vmStructs_sparc.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/vmStructs_sparc.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,7 +29,7 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
\
/******************************/ \
/* JavaCallWrapper */ \
@@ -37,22 +37,12 @@
/******************************/ \
/* JavaFrameAnchor */ \
/******************************/ \
- volatile_nonstatic_field(JavaFrameAnchor, _flags, int) \
- \
+ volatile_nonstatic_field(JavaFrameAnchor, _flags, int)
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must */
- /* be present there) */
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must */
- /* be present there) */
-
-
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
/******************************/ \
/* Register numbers (C2 only) */ \
/******************************/ \
@@ -90,15 +80,6 @@
declare_c2_constant(R_G6_num) \
declare_c2_constant(R_G7_num)
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_INT_CONSTANTS_OS_CPU macro (and must */
- /* be present there) */
-
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */
- /* be present there) */
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP
--- a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -259,6 +259,10 @@
if (!has_vis1()) // Drop to 0 if no VIS1 support
UseVIS = 0;
+ if (FLAG_IS_DEFAULT(ContendedPaddingWidth) &&
+ (cache_line_size > ContendedPaddingWidth))
+ ContendedPaddingWidth = cache_line_size;
+
#ifndef PRODUCT
if (PrintMiscellaneous && Verbose) {
tty->print("Allocation");
@@ -286,6 +290,9 @@
if (PrefetchFieldsAhead > 0) {
tty->print_cr("PrefetchFieldsAhead %d", PrefetchFieldsAhead);
}
+ if (ContendedPaddingWidth > 0) {
+ tty->print_cr("ContendedPaddingWidth %d", ContendedPaddingWidth);
+ }
}
#endif // PRODUCT
}
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -182,7 +182,7 @@
// make this go away someday
void Assembler::emit_data(jint data, relocInfo::relocType rtype, int format) {
if (rtype == relocInfo::none)
- emit_long(data);
+ emit_int32(data);
else emit_data(data, Relocation::spec_simple(rtype), format);
}
@@ -202,7 +202,7 @@
else
code_section()->relocate(inst_mark(), rspec, format);
}
- emit_long(data);
+ emit_int32(data);
}
static int encode(Register r) {
@@ -243,7 +243,7 @@
} else {
emit_int8(op1);
emit_int8(op2 | encode(dst));
- emit_long(imm32);
+ emit_int32(imm32);
}
}
@@ -254,7 +254,7 @@
assert((op1 & 0x02) == 0, "sign-extension bit should not be set");
emit_int8(op1);
emit_int8(op2 | encode(dst));
- emit_long(imm32);
+ emit_int32(imm32);
}
// immediate-to-memory forms
@@ -268,7 +268,7 @@
} else {
emit_int8(op1);
emit_operand(rm, adr, 4);
- emit_long(imm32);
+ emit_int32(imm32);
}
}
@@ -976,7 +976,7 @@
emit_int8(0x1F);
emit_int8((unsigned char)0x80);
// emit_rm(cbuf, 0x2, EAX_enc, EAX_enc);
- emit_long(0); // 32-bits offset (4 bytes)
+ emit_int32(0); // 32-bits offset (4 bytes)
}
void Assembler::addr_nop_8() {
@@ -987,7 +987,7 @@
emit_int8((unsigned char)0x84);
// emit_rm(cbuf, 0x2, EAX_enc, 0x4);
emit_int8(0x00); // emit_rm(cbuf, 0x0, EAX_enc, EAX_enc);
- emit_long(0); // 32-bits offset (4 bytes)
+ emit_int32(0); // 32-bits offset (4 bytes)
}
void Assembler::addsd(XMMRegister dst, XMMRegister src) {
@@ -1076,7 +1076,7 @@
prefix(dst);
emit_int8((unsigned char)0x81);
emit_operand(rsp, dst, 4);
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::andl(Register dst, int32_t imm32) {
@@ -1204,7 +1204,7 @@
prefix(dst);
emit_int8((unsigned char)0x81);
emit_operand(rdi, dst, 4);
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::cmpl(Register dst, int32_t imm32) {
@@ -1408,7 +1408,7 @@
} else {
emit_int8(0x69);
emit_int8((unsigned char)(0xC0 | encode));
- emit_long(value);
+ emit_int32(value);
}
}
@@ -1440,7 +1440,7 @@
"must be 32bit offset (call4)");
emit_int8(0x0F);
emit_int8((unsigned char)(0x80 | cc));
- emit_long(offs - long_size);
+ emit_int32(offs - long_size);
}
} else {
// Note: could eliminate cond. jumps to this jump if condition
@@ -1450,7 +1450,7 @@
L.add_patch_at(code(), locator());
emit_int8(0x0F);
emit_int8((unsigned char)(0x80 | cc));
- emit_long(0);
+ emit_int32(0);
}
}
@@ -1498,7 +1498,7 @@
emit_int8((offs - short_size) & 0xFF);
} else {
emit_int8((unsigned char)0xE9);
- emit_long(offs - long_size);
+ emit_int32(offs - long_size);
}
} else {
// By default, forward jumps are always 32-bit displacements, since
@@ -1508,7 +1508,7 @@
InstructionMark im(this);
L.add_patch_at(code(), locator());
emit_int8((unsigned char)0xE9);
- emit_long(0);
+ emit_int32(0);
}
}
@@ -1732,7 +1732,7 @@
void Assembler::movl(Register dst, int32_t imm32) {
int encode = prefix_and_encode(dst->encoding());
emit_int8((unsigned char)(0xB8 | encode));
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::movl(Register dst, Register src) {
@@ -1753,7 +1753,7 @@
prefix(dst);
emit_int8((unsigned char)0xC7);
emit_operand(rax, dst, 4);
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::movl(Address dst, Register src) {
@@ -2263,6 +2263,18 @@
emit_simd_arith(0x67, dst, src, VEX_SIMD_66);
}
+void Assembler::vpackuswb(XMMRegister dst, XMMRegister nds, XMMRegister src, bool vector256) {
+ assert(VM_Version::supports_avx() && !vector256 || VM_Version::supports_avx2(), "256 bit integer vectors requires AVX2");
+ emit_vex_arith(0x67, dst, nds, src, VEX_SIMD_66, vector256);
+}
+
+void Assembler::vpermq(XMMRegister dst, XMMRegister src, int imm8, bool vector256) {
+ int encode = simd_prefix_and_encode(dst, xnoreg, src, VEX_SIMD_66, VEX_OPCODE_0F_3A, true, vector256);
+ emit_int8(0x00);
+ emit_int8(0xC0 | encode);
+ emit_int8(imm8);
+}
+
void Assembler::pcmpestri(XMMRegister dst, Address src, int imm8) {
assert(VM_Version::supports_sse4_2(), "");
InstructionMark im(this);
@@ -2468,6 +2480,26 @@
emit_int8((unsigned char)(0xC0 | encode));
}
+void Assembler::vptest(XMMRegister dst, Address src) {
+ assert(VM_Version::supports_avx(), "");
+ InstructionMark im(this);
+ bool vector256 = true;
+ assert(dst != xnoreg, "sanity");
+ int dst_enc = dst->encoding();
+ // swap src<->dst for encoding
+ vex_prefix(src, 0, dst_enc, VEX_SIMD_66, VEX_OPCODE_0F_38, false, vector256);
+ emit_int8(0x17);
+ emit_operand(dst, src);
+}
+
+void Assembler::vptest(XMMRegister dst, XMMRegister src) {
+ assert(VM_Version::supports_avx(), "");
+ bool vector256 = true;
+ int encode = vex_prefix_and_encode(dst, xnoreg, src, VEX_SIMD_66, vector256, VEX_OPCODE_0F_38);
+ emit_int8(0x17);
+ emit_int8((unsigned char)(0xC0 | encode));
+}
+
void Assembler::punpcklbw(XMMRegister dst, Address src) {
NOT_LP64(assert(VM_Version::supports_sse2(), ""));
assert((UseAVX > 0), "SSE mode requires address alignment 16 bytes");
@@ -2499,7 +2531,7 @@
// in 64bits we push 64bits onto the stack but only
// take a 32bit immediate
emit_int8(0x68);
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::push(Register src) {
@@ -2544,12 +2576,18 @@
emit_int8((unsigned char)0xA5);
}
+// sets rcx bytes with rax, value at [edi]
+void Assembler::rep_stosb() {
+ emit_int8((unsigned char)0xF3); // REP
+ LP64_ONLY(prefix(REX_W));
+ emit_int8((unsigned char)0xAA); // STOSB
+}
+
// sets rcx pointer sized words with rax, value at [edi]
// generic
-void Assembler::rep_set() { // rep_set
- emit_int8((unsigned char)0xF3);
- // STOSQ
- LP64_ONLY(prefix(REX_W));
+void Assembler::rep_stos() {
+ emit_int8((unsigned char)0xF3); // REP
+ LP64_ONLY(prefix(REX_W)); // LP64:STOSQ, LP32:STOSD
emit_int8((unsigned char)0xAB);
}
@@ -2785,7 +2823,7 @@
emit_int8((unsigned char)0xF7);
emit_int8((unsigned char)(0xC0 | encode));
}
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::testl(Register dst, Register src) {
@@ -3650,6 +3688,15 @@
emit_int8(0x01);
}
+// duplicate 4-bytes integer data from src into 8 locations in dest
+void Assembler::vpbroadcastd(XMMRegister dst, XMMRegister src) {
+ assert(VM_Version::supports_avx2(), "");
+ bool vector256 = true;
+ int encode = vex_prefix_and_encode(dst, xnoreg, src, VEX_SIMD_66, vector256, VEX_OPCODE_0F_38);
+ emit_int8(0x58);
+ emit_int8((unsigned char)(0xC0 | encode));
+}
+
void Assembler::vzeroupper() {
assert(VM_Version::supports_avx(), "");
(void)vex_prefix_and_encode(xmm0, xmm0, xmm0, VEX_SIMD_NONE);
@@ -4720,7 +4767,7 @@
prefixq(dst);
emit_int8((unsigned char)0x81);
emit_operand(rsp, dst, 4);
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::andq(Register dst, int32_t imm32) {
@@ -4793,7 +4840,7 @@
prefixq(dst);
emit_int8((unsigned char)0x81);
emit_operand(rdi, dst, 4);
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::cmpq(Register dst, int32_t imm32) {
@@ -4932,7 +4979,7 @@
} else {
emit_int8(0x69);
emit_int8((unsigned char)(0xC0 | encode));
- emit_long(value);
+ emit_int32(value);
}
}
@@ -5085,7 +5132,7 @@
InstructionMark im(this);
int encode = prefixq_and_encode(dst->encoding());
emit_int8((unsigned char)(0xC7 | encode));
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::movslq(Address dst, int32_t imm32) {
@@ -5094,7 +5141,7 @@
prefixq(dst);
emit_int8((unsigned char)0xC7);
emit_operand(rax, dst, 4);
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::movslq(Register dst, Address src) {
@@ -5172,7 +5219,7 @@
prefixq(dst);
emit_int8((unsigned char)0x81);
emit_operand(rcx, dst, 4);
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::orq(Register dst, int32_t imm32) {
@@ -5407,7 +5454,7 @@
emit_int8((unsigned char)0xF7);
emit_int8((unsigned char)(0xC0 | encode));
}
- emit_long(imm32);
+ emit_int32(imm32);
}
void Assembler::testq(Register dst, Register src) {
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -832,7 +832,8 @@
// These do register sized moves/scans
void rep_mov();
- void rep_set();
+ void rep_stos();
+ void rep_stosb();
void repne_scan();
#ifdef _LP64
void repne_scanl();
@@ -1394,6 +1395,10 @@
// Pack with unsigned saturation
void packuswb(XMMRegister dst, XMMRegister src);
void packuswb(XMMRegister dst, Address src);
+ void vpackuswb(XMMRegister dst, XMMRegister nds, XMMRegister src, bool vector256);
+
+ // Pemutation of 64bit words
+ void vpermq(XMMRegister dst, XMMRegister src, int imm8, bool vector256);
// SSE4.2 string instructions
void pcmpestri(XMMRegister xmm1, XMMRegister xmm2, int imm8);
@@ -1443,9 +1448,12 @@
// Shift Right by bytes Logical DoubleQuadword Immediate
void psrldq(XMMRegister dst, int shift);
- // Logical Compare Double Quadword
+ // Logical Compare 128bit
void ptest(XMMRegister dst, XMMRegister src);
void ptest(XMMRegister dst, Address src);
+ // Logical Compare 256bit
+ void vptest(XMMRegister dst, XMMRegister src);
+ void vptest(XMMRegister dst, Address src);
// Interleave Low Bytes
void punpcklbw(XMMRegister dst, XMMRegister src);
@@ -1753,6 +1761,9 @@
void vextractf128h(Address dst, XMMRegister src);
void vextracti128h(Address dst, XMMRegister src);
+ // duplicate 4-bytes integer data from src into 8 locations in dest
+ void vpbroadcastd(XMMRegister dst, XMMRegister src);
+
// AVX instruction which is used to clear upper 128 bits of YMM registers and
// to avoid transaction penalty between AVX and SSE states. There is no
// penalty if legacy SSE instructions are encoded using VEX prefix because
--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -120,6 +120,9 @@
product(bool, UseUnalignedLoadStores, false, \
"Use SSE2 MOVDQU instruction for Arraycopy") \
\
+ product(bool, UseFastStosb, false, \
+ "Use fast-string operation for zeroing: rep stosb") \
+ \
/* assembler */ \
product(bool, Use486InstrsOnly, false, \
"Use 80486 Compliant instruction subset") \
--- a/hotspot/src/cpu/x86/vm/jni_x86.h Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/jni_x86.h Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,14 +38,9 @@
#define JNICALL
typedef int jint;
-#if defined(_LP64) && !defined(__APPLE__)
+#if defined(_LP64)
typedef long jlong;
#else
- /*
- * On _LP64 __APPLE__ "long" and "long long" are both 64 bits,
- * but we use the "long long" typedef to avoid complaints from
- * the __APPLE__ compiler about fprintf formats.
- */
typedef long long jlong;
#endif
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -2540,7 +2540,7 @@
// 0000 1111 1000 tttn #32-bit disp
emit_int8(0x0F);
emit_int8((unsigned char)(0x80 | cc));
- emit_long(offs - long_size);
+ emit_int32(offs - long_size);
}
} else {
#ifdef ASSERT
@@ -5224,6 +5224,22 @@
}
+void MacroAssembler::clear_mem(Register base, Register cnt, Register tmp) {
+ // cnt - number of qwords (8-byte words).
+ // base - start address, qword aligned.
+ assert(base==rdi, "base register must be edi for rep stos");
+ assert(tmp==rax, "tmp register must be eax for rep stos");
+ assert(cnt==rcx, "cnt register must be ecx for rep stos");
+
+ xorptr(tmp, tmp);
+ if (UseFastStosb) {
+ shlptr(cnt,3); // convert to number of bytes
+ rep_stosb();
+ } else {
+ NOT_LP64(shlptr(cnt,1);) // convert to number of dwords for 32-bit VM
+ rep_stos();
+ }
+}
// IndexOf for constant substrings with size >= 8 chars
// which don't need to be loaded through stack.
@@ -5659,42 +5675,114 @@
testl(cnt2, cnt2);
jcc(Assembler::zero, LENGTH_DIFF_LABEL);
- // Load first characters
+ // Compare first characters
load_unsigned_short(result, Address(str1, 0));
load_unsigned_short(cnt1, Address(str2, 0));
-
- // Compare first characters
subl(result, cnt1);
jcc(Assembler::notZero, POP_LABEL);
- decrementl(cnt2);
- jcc(Assembler::zero, LENGTH_DIFF_LABEL);
-
- {
- // Check after comparing first character to see if strings are equivalent
- Label LSkip2;
- // Check if the strings start at same location
- cmpptr(str1, str2);
- jccb(Assembler::notEqual, LSkip2);
-
- // Check if the length difference is zero (from stack)
- cmpl(Address(rsp, 0), 0x0);
- jcc(Assembler::equal, LENGTH_DIFF_LABEL);
-
- // Strings might not be equivalent
- bind(LSkip2);
- }
+ cmpl(cnt2, 1);
+ jcc(Assembler::equal, LENGTH_DIFF_LABEL);
+
+ // Check if the strings start at the same location.
+ cmpptr(str1, str2);
+ jcc(Assembler::equal, LENGTH_DIFF_LABEL);
Address::ScaleFactor scale = Address::times_2;
int stride = 8;
- // Advance to next element
- addptr(str1, 16/stride);
- addptr(str2, 16/stride);
-
- if (UseSSE42Intrinsics) {
+ if (UseAVX >= 2) {
+ Label COMPARE_WIDE_VECTORS, VECTOR_NOT_EQUAL, COMPARE_WIDE_TAIL, COMPARE_SMALL_STR;
+ Label COMPARE_WIDE_VECTORS_LOOP, COMPARE_16_CHARS, COMPARE_INDEX_CHAR;
+ Label COMPARE_TAIL_LONG;
+ int pcmpmask = 0x19;
+
+ // Setup to compare 16-chars (32-bytes) vectors,
+ // start from first character again because it has aligned address.
+ int stride2 = 16;
+ int adr_stride = stride << scale;
+ int adr_stride2 = stride2 << scale;
+
+ assert(result == rax && cnt2 == rdx && cnt1 == rcx, "pcmpestri");
+ // rax and rdx are used by pcmpestri as elements counters
+ movl(result, cnt2);
+ andl(cnt2, ~(stride2-1)); // cnt2 holds the vector count
+ jcc(Assembler::zero, COMPARE_TAIL_LONG);
+
+ // fast path : compare first 2 8-char vectors.
+ bind(COMPARE_16_CHARS);
+ movdqu(vec1, Address(str1, 0));
+ pcmpestri(vec1, Address(str2, 0), pcmpmask);
+ jccb(Assembler::below, COMPARE_INDEX_CHAR);
+
+ movdqu(vec1, Address(str1, adr_stride));
+ pcmpestri(vec1, Address(str2, adr_stride), pcmpmask);
+ jccb(Assembler::aboveEqual, COMPARE_WIDE_VECTORS);
+ addl(cnt1, stride);
+
+ // Compare the characters at index in cnt1
+ bind(COMPARE_INDEX_CHAR); //cnt1 has the offset of the mismatching character
+ load_unsigned_short(result, Address(str1, cnt1, scale));
+ load_unsigned_short(cnt2, Address(str2, cnt1, scale));
+ subl(result, cnt2);
+ jmp(POP_LABEL);
+
+ // Setup the registers to start vector comparison loop
+ bind(COMPARE_WIDE_VECTORS);
+ lea(str1, Address(str1, result, scale));
+ lea(str2, Address(str2, result, scale));
+ subl(result, stride2);
+ subl(cnt2, stride2);
+ jccb(Assembler::zero, COMPARE_WIDE_TAIL);
+ negptr(result);
+
+ // In a loop, compare 16-chars (32-bytes) at once using (vpxor+vptest)
+ bind(COMPARE_WIDE_VECTORS_LOOP);
+ vmovdqu(vec1, Address(str1, result, scale));
+ vpxor(vec1, Address(str2, result, scale));
+ vptest(vec1, vec1);
+ jccb(Assembler::notZero, VECTOR_NOT_EQUAL);
+ addptr(result, stride2);
+ subl(cnt2, stride2);
+ jccb(Assembler::notZero, COMPARE_WIDE_VECTORS_LOOP);
+
+ // compare wide vectors tail
+ bind(COMPARE_WIDE_TAIL);
+ testptr(result, result);
+ jccb(Assembler::zero, LENGTH_DIFF_LABEL);
+
+ movl(result, stride2);
+ movl(cnt2, result);
+ negptr(result);
+ jmpb(COMPARE_WIDE_VECTORS_LOOP);
+
+ // Identifies the mismatching (higher or lower)16-bytes in the 32-byte vectors.
+ bind(VECTOR_NOT_EQUAL);
+ lea(str1, Address(str1, result, scale));
+ lea(str2, Address(str2, result, scale));
+ jmp(COMPARE_16_CHARS);
+
+ // Compare tail chars, length between 1 to 15 chars
+ bind(COMPARE_TAIL_LONG);
+ movl(cnt2, result);
+ cmpl(cnt2, stride);
+ jccb(Assembler::less, COMPARE_SMALL_STR);
+
+ movdqu(vec1, Address(str1, 0));
+ pcmpestri(vec1, Address(str2, 0), pcmpmask);
+ jcc(Assembler::below, COMPARE_INDEX_CHAR);
+ subptr(cnt2, stride);
+ jccb(Assembler::zero, LENGTH_DIFF_LABEL);
+ lea(str1, Address(str1, result, scale));
+ lea(str2, Address(str2, result, scale));
+ negptr(cnt2);
+ jmpb(WHILE_HEAD_LABEL);
+
+ bind(COMPARE_SMALL_STR);
+ } else if (UseSSE42Intrinsics) {
Label COMPARE_WIDE_VECTORS, VECTOR_NOT_EQUAL, COMPARE_TAIL;
int pcmpmask = 0x19;
- // Setup to compare 16-byte vectors
+ // Setup to compare 8-char (16-byte) vectors,
+ // start from first character again because it has aligned address.
movl(result, cnt2);
andl(cnt2, ~(stride - 1)); // cnt2 holds the vector count
jccb(Assembler::zero, COMPARE_TAIL);
@@ -5726,7 +5814,7 @@
jccb(Assembler::notZero, COMPARE_WIDE_VECTORS);
// compare wide vectors tail
- testl(result, result);
+ testptr(result, result);
jccb(Assembler::zero, LENGTH_DIFF_LABEL);
movl(cnt2, stride);
@@ -5738,21 +5826,20 @@
// Mismatched characters in the vectors
bind(VECTOR_NOT_EQUAL);
- addptr(result, cnt1);
- movptr(cnt2, result);
- load_unsigned_short(result, Address(str1, cnt2, scale));
- load_unsigned_short(cnt1, Address(str2, cnt2, scale));
- subl(result, cnt1);
+ addptr(cnt1, result);
+ load_unsigned_short(result, Address(str1, cnt1, scale));
+ load_unsigned_short(cnt2, Address(str2, cnt1, scale));
+ subl(result, cnt2);
jmpb(POP_LABEL);
bind(COMPARE_TAIL); // limit is zero
movl(cnt2, result);
// Fallthru to tail compare
}
-
// Shift str2 and str1 to the end of the arrays, negate min
- lea(str1, Address(str1, cnt2, scale, 0));
- lea(str2, Address(str2, cnt2, scale, 0));
+ lea(str1, Address(str1, cnt2, scale));
+ lea(str2, Address(str2, cnt2, scale));
+ decrementl(cnt2); // first character was compared already
negptr(cnt2);
// Compare the rest of the elements
@@ -5817,7 +5904,44 @@
shll(limit, 1); // byte count != 0
movl(result, limit); // copy
- if (UseSSE42Intrinsics) {
+ if (UseAVX >= 2) {
+ // With AVX2, use 32-byte vector compare
+ Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
+
+ // Compare 32-byte vectors
+ andl(result, 0x0000001e); // tail count (in bytes)
+ andl(limit, 0xffffffe0); // vector count (in bytes)
+ jccb(Assembler::zero, COMPARE_TAIL);
+
+ lea(ary1, Address(ary1, limit, Address::times_1));
+ lea(ary2, Address(ary2, limit, Address::times_1));
+ negptr(limit);
+
+ bind(COMPARE_WIDE_VECTORS);
+ vmovdqu(vec1, Address(ary1, limit, Address::times_1));
+ vmovdqu(vec2, Address(ary2, limit, Address::times_1));
+ vpxor(vec1, vec2);
+
+ vptest(vec1, vec1);
+ jccb(Assembler::notZero, FALSE_LABEL);
+ addptr(limit, 32);
+ jcc(Assembler::notZero, COMPARE_WIDE_VECTORS);
+
+ testl(result, result);
+ jccb(Assembler::zero, TRUE_LABEL);
+
+ vmovdqu(vec1, Address(ary1, result, Address::times_1, -32));
+ vmovdqu(vec2, Address(ary2, result, Address::times_1, -32));
+ vpxor(vec1, vec2);
+
+ vptest(vec1, vec1);
+ jccb(Assembler::notZero, FALSE_LABEL);
+ jmpb(TRUE_LABEL);
+
+ bind(COMPARE_TAIL); // limit is zero
+ movl(limit, result);
+ // Fallthru to tail compare
+ } else if (UseSSE42Intrinsics) {
// With SSE4.2, use double quad vector compare
Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
@@ -5995,29 +6119,53 @@
{
assert( UseSSE >= 2, "supported cpu only" );
Label L_fill_32_bytes_loop, L_check_fill_8_bytes, L_fill_8_bytes_loop, L_fill_8_bytes;
- // Fill 32-byte chunks
movdl(xtmp, value);
- pshufd(xtmp, xtmp, 0);
-
- subl(count, 8 << shift);
- jcc(Assembler::less, L_check_fill_8_bytes);
- align(16);
-
- BIND(L_fill_32_bytes_loop);
-
- if (UseUnalignedLoadStores) {
- movdqu(Address(to, 0), xtmp);
- movdqu(Address(to, 16), xtmp);
+ if (UseAVX >= 2 && UseUnalignedLoadStores) {
+ // Fill 64-byte chunks
+ Label L_fill_64_bytes_loop, L_check_fill_32_bytes;
+ vpbroadcastd(xtmp, xtmp);
+
+ subl(count, 16 << shift);
+ jcc(Assembler::less, L_check_fill_32_bytes);
+ align(16);
+
+ BIND(L_fill_64_bytes_loop);
+ vmovdqu(Address(to, 0), xtmp);
+ vmovdqu(Address(to, 32), xtmp);
+ addptr(to, 64);
+ subl(count, 16 << shift);
+ jcc(Assembler::greaterEqual, L_fill_64_bytes_loop);
+
+ BIND(L_check_fill_32_bytes);
+ addl(count, 8 << shift);
+ jccb(Assembler::less, L_check_fill_8_bytes);
+ vmovdqu(Address(to, 0), xtmp);
+ addptr(to, 32);
+ subl(count, 8 << shift);
} else {
- movq(Address(to, 0), xtmp);
- movq(Address(to, 8), xtmp);
- movq(Address(to, 16), xtmp);
- movq(Address(to, 24), xtmp);
+ // Fill 32-byte chunks
+ pshufd(xtmp, xtmp, 0);
+
+ subl(count, 8 << shift);
+ jcc(Assembler::less, L_check_fill_8_bytes);
+ align(16);
+
+ BIND(L_fill_32_bytes_loop);
+
+ if (UseUnalignedLoadStores) {
+ movdqu(Address(to, 0), xtmp);
+ movdqu(Address(to, 16), xtmp);
+ } else {
+ movq(Address(to, 0), xtmp);
+ movq(Address(to, 8), xtmp);
+ movq(Address(to, 16), xtmp);
+ movq(Address(to, 24), xtmp);
+ }
+
+ addptr(to, 32);
+ subl(count, 8 << shift);
+ jcc(Assembler::greaterEqual, L_fill_32_bytes_loop);
}
-
- addptr(to, 32);
- subl(count, 8 << shift);
- jcc(Assembler::greaterEqual, L_fill_32_bytes_loop);
BIND(L_check_fill_8_bytes);
addl(count, 8 << shift);
jccb(Assembler::zero, L_exit);
@@ -6061,6 +6209,128 @@
}
BIND(L_exit);
}
+
+// encode char[] to byte[] in ISO_8859_1
+void MacroAssembler::encode_iso_array(Register src, Register dst, Register len,
+ XMMRegister tmp1Reg, XMMRegister tmp2Reg,
+ XMMRegister tmp3Reg, XMMRegister tmp4Reg,
+ Register tmp5, Register result) {
+ // rsi: src
+ // rdi: dst
+ // rdx: len
+ // rcx: tmp5
+ // rax: result
+ ShortBranchVerifier sbv(this);
+ assert_different_registers(src, dst, len, tmp5, result);
+ Label L_done, L_copy_1_char, L_copy_1_char_exit;
+
+ // set result
+ xorl(result, result);
+ // check for zero length
+ testl(len, len);
+ jcc(Assembler::zero, L_done);
+ movl(result, len);
+
+ // Setup pointers
+ lea(src, Address(src, len, Address::times_2)); // char[]
+ lea(dst, Address(dst, len, Address::times_1)); // byte[]
+ negptr(len);
+
+ if (UseSSE42Intrinsics || UseAVX >= 2) {
+ Label L_chars_8_check, L_copy_8_chars, L_copy_8_chars_exit;
+ Label L_chars_16_check, L_copy_16_chars, L_copy_16_chars_exit;
+
+ if (UseAVX >= 2) {
+ Label L_chars_32_check, L_copy_32_chars, L_copy_32_chars_exit;
+ movl(tmp5, 0xff00ff00); // create mask to test for Unicode chars in vector
+ movdl(tmp1Reg, tmp5);
+ vpbroadcastd(tmp1Reg, tmp1Reg);
+ jmpb(L_chars_32_check);
+
+ bind(L_copy_32_chars);
+ vmovdqu(tmp3Reg, Address(src, len, Address::times_2, -64));
+ vmovdqu(tmp4Reg, Address(src, len, Address::times_2, -32));
+ vpor(tmp2Reg, tmp3Reg, tmp4Reg, /* vector256 */ true);
+ vptest(tmp2Reg, tmp1Reg); // check for Unicode chars in vector
+ jccb(Assembler::notZero, L_copy_32_chars_exit);
+ vpackuswb(tmp3Reg, tmp3Reg, tmp4Reg, /* vector256 */ true);
+ vpermq(tmp4Reg, tmp3Reg, 0xD8, /* vector256 */ true);
+ vmovdqu(Address(dst, len, Address::times_1, -32), tmp4Reg);
+
+ bind(L_chars_32_check);
+ addptr(len, 32);
+ jccb(Assembler::lessEqual, L_copy_32_chars);
+
+ bind(L_copy_32_chars_exit);
+ subptr(len, 16);
+ jccb(Assembler::greater, L_copy_16_chars_exit);
+
+ } else if (UseSSE42Intrinsics) {
+ movl(tmp5, 0xff00ff00); // create mask to test for Unicode chars in vector
+ movdl(tmp1Reg, tmp5);
+ pshufd(tmp1Reg, tmp1Reg, 0);
+ jmpb(L_chars_16_check);
+ }
+
+ bind(L_copy_16_chars);
+ if (UseAVX >= 2) {
+ vmovdqu(tmp2Reg, Address(src, len, Address::times_2, -32));
+ vptest(tmp2Reg, tmp1Reg);
+ jccb(Assembler::notZero, L_copy_16_chars_exit);
+ vpackuswb(tmp2Reg, tmp2Reg, tmp1Reg, /* vector256 */ true);
+ vpermq(tmp3Reg, tmp2Reg, 0xD8, /* vector256 */ true);
+ } else {
+ if (UseAVX > 0) {
+ movdqu(tmp3Reg, Address(src, len, Address::times_2, -32));
+ movdqu(tmp4Reg, Address(src, len, Address::times_2, -16));
+ vpor(tmp2Reg, tmp3Reg, tmp4Reg, /* vector256 */ false);
+ } else {
+ movdqu(tmp3Reg, Address(src, len, Address::times_2, -32));
+ por(tmp2Reg, tmp3Reg);
+ movdqu(tmp4Reg, Address(src, len, Address::times_2, -16));
+ por(tmp2Reg, tmp4Reg);
+ }
+ ptest(tmp2Reg, tmp1Reg); // check for Unicode chars in vector
+ jccb(Assembler::notZero, L_copy_16_chars_exit);
+ packuswb(tmp3Reg, tmp4Reg);
+ }
+ movdqu(Address(dst, len, Address::times_1, -16), tmp3Reg);
+
+ bind(L_chars_16_check);
+ addptr(len, 16);
+ jccb(Assembler::lessEqual, L_copy_16_chars);
+
+ bind(L_copy_16_chars_exit);
+ subptr(len, 8);
+ jccb(Assembler::greater, L_copy_8_chars_exit);
+
+ bind(L_copy_8_chars);
+ movdqu(tmp3Reg, Address(src, len, Address::times_2, -16));
+ ptest(tmp3Reg, tmp1Reg);
+ jccb(Assembler::notZero, L_copy_8_chars_exit);
+ packuswb(tmp3Reg, tmp1Reg);
+ movq(Address(dst, len, Address::times_1, -8), tmp3Reg);
+ addptr(len, 8);
+ jccb(Assembler::lessEqual, L_copy_8_chars);
+
+ bind(L_copy_8_chars_exit);
+ subptr(len, 8);
+ jccb(Assembler::zero, L_done);
+ }
+
+ bind(L_copy_1_char);
+ load_unsigned_short(tmp5, Address(src, len, Address::times_2, 0));
+ testl(tmp5, 0xff00); // check if Unicode char
+ jccb(Assembler::notZero, L_copy_1_char_exit);
+ movb(Address(dst, len, Address::times_1, 0), tmp5);
+ addptr(len, 1);
+ jccb(Assembler::less, L_copy_1_char);
+
+ bind(L_copy_1_char_exit);
+ addptr(result, len); // len is negative count of not processed elements
+ bind(L_done);
+}
+
#undef BIND
#undef BLOCK_COMMENT
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1011,6 +1011,10 @@
Assembler::vxorpd(dst, nds, src, vector256);
}
+ // Simple version for AVX2 256bit vectors
+ void vpxor(XMMRegister dst, XMMRegister src) { Assembler::vpxor(dst, dst, src, true); }
+ void vpxor(XMMRegister dst, Address src) { Assembler::vpxor(dst, dst, src, true); }
+
// Move packed integer values from low 128 bit to hign 128 bit in 256 bit vector.
void vinserti128h(XMMRegister dst, XMMRegister nds, XMMRegister src) {
if (UseAVX > 1) // vinserti128h is available only in AVX2
@@ -1096,6 +1100,9 @@
// C2 compiled method's prolog code.
void verified_entry(int framesize, bool stack_bang, bool fp_mode_24b);
+ // clear memory of size 'cnt' qwords, starting at 'base'.
+ void clear_mem(Register base, Register cnt, Register rtmp);
+
// IndexOf strings.
// Small strings are loaded through stack if they cross page boundary.
void string_indexof(Register str1, Register str2,
@@ -1128,6 +1135,10 @@
Register to, Register value, Register count,
Register rtmp, XMMRegister xtmp);
+ void encode_iso_array(Register src, Register dst, Register len,
+ XMMRegister tmp1, XMMRegister tmp2, XMMRegister tmp3,
+ XMMRegister tmp4, Register tmp5, Register result);
+
#undef VIRTUAL
};
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -796,16 +796,22 @@
__ align(OptoLoopAlignment);
__ BIND(L_copy_64_bytes_loop);
- if(UseUnalignedLoadStores) {
- __ movdqu(xmm0, Address(from, 0));
- __ movdqu(Address(from, to_from, Address::times_1, 0), xmm0);
- __ movdqu(xmm1, Address(from, 16));
- __ movdqu(Address(from, to_from, Address::times_1, 16), xmm1);
- __ movdqu(xmm2, Address(from, 32));
- __ movdqu(Address(from, to_from, Address::times_1, 32), xmm2);
- __ movdqu(xmm3, Address(from, 48));
- __ movdqu(Address(from, to_from, Address::times_1, 48), xmm3);
-
+ if (UseUnalignedLoadStores) {
+ if (UseAVX >= 2) {
+ __ vmovdqu(xmm0, Address(from, 0));
+ __ vmovdqu(Address(from, to_from, Address::times_1, 0), xmm0);
+ __ vmovdqu(xmm1, Address(from, 32));
+ __ vmovdqu(Address(from, to_from, Address::times_1, 32), xmm1);
+ } else {
+ __ movdqu(xmm0, Address(from, 0));
+ __ movdqu(Address(from, to_from, Address::times_1, 0), xmm0);
+ __ movdqu(xmm1, Address(from, 16));
+ __ movdqu(Address(from, to_from, Address::times_1, 16), xmm1);
+ __ movdqu(xmm2, Address(from, 32));
+ __ movdqu(Address(from, to_from, Address::times_1, 32), xmm2);
+ __ movdqu(xmm3, Address(from, 48));
+ __ movdqu(Address(from, to_from, Address::times_1, 48), xmm3);
+ }
} else {
__ movq(xmm0, Address(from, 0));
__ movq(Address(from, to_from, Address::times_1, 0), xmm0);
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1286,23 +1286,54 @@
// end_to - destination array end address
// qword_count - 64-bits element count, negative
// to - scratch
- // L_copy_32_bytes - entry label
+ // L_copy_bytes - entry label
// L_copy_8_bytes - exit label
//
- void copy_32_bytes_forward(Register end_from, Register end_to,
+ void copy_bytes_forward(Register end_from, Register end_to,
Register qword_count, Register to,
- Label& L_copy_32_bytes, Label& L_copy_8_bytes) {
+ Label& L_copy_bytes, Label& L_copy_8_bytes) {
DEBUG_ONLY(__ stop("enter at entry label, not here"));
Label L_loop;
__ align(OptoLoopAlignment);
- __ BIND(L_loop);
- if(UseUnalignedLoadStores) {
- __ movdqu(xmm0, Address(end_from, qword_count, Address::times_8, -24));
- __ movdqu(Address(end_to, qword_count, Address::times_8, -24), xmm0);
- __ movdqu(xmm1, Address(end_from, qword_count, Address::times_8, - 8));
- __ movdqu(Address(end_to, qword_count, Address::times_8, - 8), xmm1);
-
+ if (UseUnalignedLoadStores) {
+ Label L_end;
+ // Copy 64-bytes per iteration
+ __ BIND(L_loop);
+ if (UseAVX >= 2) {
+ __ vmovdqu(xmm0, Address(end_from, qword_count, Address::times_8, -56));
+ __ vmovdqu(Address(end_to, qword_count, Address::times_8, -56), xmm0);
+ __ vmovdqu(xmm1, Address(end_from, qword_count, Address::times_8, -24));
+ __ vmovdqu(Address(end_to, qword_count, Address::times_8, -24), xmm1);
+ } else {
+ __ movdqu(xmm0, Address(end_from, qword_count, Address::times_8, -56));
+ __ movdqu(Address(end_to, qword_count, Address::times_8, -56), xmm0);
+ __ movdqu(xmm1, Address(end_from, qword_count, Address::times_8, -40));
+ __ movdqu(Address(end_to, qword_count, Address::times_8, -40), xmm1);
+ __ movdqu(xmm2, Address(end_from, qword_count, Address::times_8, -24));
+ __ movdqu(Address(end_to, qword_count, Address::times_8, -24), xmm2);
+ __ movdqu(xmm3, Address(end_from, qword_count, Address::times_8, - 8));
+ __ movdqu(Address(end_to, qword_count, Address::times_8, - 8), xmm3);
+ }
+ __ BIND(L_copy_bytes);
+ __ addptr(qword_count, 8);
+ __ jcc(Assembler::lessEqual, L_loop);
+ __ subptr(qword_count, 4); // sub(8) and add(4)
+ __ jccb(Assembler::greater, L_end);
+ // Copy trailing 32 bytes
+ if (UseAVX >= 2) {
+ __ vmovdqu(xmm0, Address(end_from, qword_count, Address::times_8, -24));
+ __ vmovdqu(Address(end_to, qword_count, Address::times_8, -24), xmm0);
+ } else {
+ __ movdqu(xmm0, Address(end_from, qword_count, Address::times_8, -24));
+ __ movdqu(Address(end_to, qword_count, Address::times_8, -24), xmm0);
+ __ movdqu(xmm1, Address(end_from, qword_count, Address::times_8, - 8));
+ __ movdqu(Address(end_to, qword_count, Address::times_8, - 8), xmm1);
+ }
+ __ addptr(qword_count, 4);
+ __ BIND(L_end);
} else {
+ // Copy 32-bytes per iteration
+ __ BIND(L_loop);
__ movq(to, Address(end_from, qword_count, Address::times_8, -24));
__ movq(Address(end_to, qword_count, Address::times_8, -24), to);
__ movq(to, Address(end_from, qword_count, Address::times_8, -16));
@@ -1311,15 +1342,15 @@
__ movq(Address(end_to, qword_count, Address::times_8, - 8), to);
__ movq(to, Address(end_from, qword_count, Address::times_8, - 0));
__ movq(Address(end_to, qword_count, Address::times_8, - 0), to);
+
+ __ BIND(L_copy_bytes);
+ __ addptr(qword_count, 4);
+ __ jcc(Assembler::lessEqual, L_loop);
}
- __ BIND(L_copy_32_bytes);
- __ addptr(qword_count, 4);
- __ jcc(Assembler::lessEqual, L_loop);
__ subptr(qword_count, 4);
__ jcc(Assembler::less, L_copy_8_bytes); // Copy trailing qwords
}
-
// Copy big chunks backward
//
// Inputs:
@@ -1327,23 +1358,55 @@
// dest - destination array address
// qword_count - 64-bits element count
// to - scratch
- // L_copy_32_bytes - entry label
+ // L_copy_bytes - entry label
// L_copy_8_bytes - exit label
//
- void copy_32_bytes_backward(Register from, Register dest,
+ void copy_bytes_backward(Register from, Register dest,
Register qword_count, Register to,
- Label& L_copy_32_bytes, Label& L_copy_8_bytes) {
+ Label& L_copy_bytes, Label& L_copy_8_bytes) {
DEBUG_ONLY(__ stop("enter at entry label, not here"));
Label L_loop;
__ align(OptoLoopAlignment);
- __ BIND(L_loop);
- if(UseUnalignedLoadStores) {
- __ movdqu(xmm0, Address(from, qword_count, Address::times_8, 16));
- __ movdqu(Address(dest, qword_count, Address::times_8, 16), xmm0);
- __ movdqu(xmm1, Address(from, qword_count, Address::times_8, 0));
- __ movdqu(Address(dest, qword_count, Address::times_8, 0), xmm1);
-
+ if (UseUnalignedLoadStores) {
+ Label L_end;
+ // Copy 64-bytes per iteration
+ __ BIND(L_loop);
+ if (UseAVX >= 2) {
+ __ vmovdqu(xmm0, Address(from, qword_count, Address::times_8, 32));
+ __ vmovdqu(Address(dest, qword_count, Address::times_8, 32), xmm0);
+ __ vmovdqu(xmm1, Address(from, qword_count, Address::times_8, 0));
+ __ vmovdqu(Address(dest, qword_count, Address::times_8, 0), xmm1);
+ } else {
+ __ movdqu(xmm0, Address(from, qword_count, Address::times_8, 48));
+ __ movdqu(Address(dest, qword_count, Address::times_8, 48), xmm0);
+ __ movdqu(xmm1, Address(from, qword_count, Address::times_8, 32));
+ __ movdqu(Address(dest, qword_count, Address::times_8, 32), xmm1);
+ __ movdqu(xmm2, Address(from, qword_count, Address::times_8, 16));
+ __ movdqu(Address(dest, qword_count, Address::times_8, 16), xmm2);
+ __ movdqu(xmm3, Address(from, qword_count, Address::times_8, 0));
+ __ movdqu(Address(dest, qword_count, Address::times_8, 0), xmm3);
+ }
+ __ BIND(L_copy_bytes);
+ __ subptr(qword_count, 8);
+ __ jcc(Assembler::greaterEqual, L_loop);
+
+ __ addptr(qword_count, 4); // add(8) and sub(4)
+ __ jccb(Assembler::less, L_end);
+ // Copy trailing 32 bytes
+ if (UseAVX >= 2) {
+ __ vmovdqu(xmm0, Address(from, qword_count, Address::times_8, 0));
+ __ vmovdqu(Address(dest, qword_count, Address::times_8, 0), xmm0);
+ } else {
+ __ movdqu(xmm0, Address(from, qword_count, Address::times_8, 16));
+ __ movdqu(Address(dest, qword_count, Address::times_8, 16), xmm0);
+ __ movdqu(xmm1, Address(from, qword_count, Address::times_8, 0));
+ __ movdqu(Address(dest, qword_count, Address::times_8, 0), xmm1);
+ }
+ __ subptr(qword_count, 4);
+ __ BIND(L_end);
} else {
+ // Copy 32-bytes per iteration
+ __ BIND(L_loop);
__ movq(to, Address(from, qword_count, Address::times_8, 24));
__ movq(Address(dest, qword_count, Address::times_8, 24), to);
__ movq(to, Address(from, qword_count, Address::times_8, 16));
@@ -1352,10 +1415,11 @@
__ movq(Address(dest, qword_count, Address::times_8, 8), to);
__ movq(to, Address(from, qword_count, Address::times_8, 0));
__ movq(Address(dest, qword_count, Address::times_8, 0), to);
+
+ __ BIND(L_copy_bytes);
+ __ subptr(qword_count, 4);
+ __ jcc(Assembler::greaterEqual, L_loop);
}
- __ BIND(L_copy_32_bytes);
- __ subptr(qword_count, 4);
- __ jcc(Assembler::greaterEqual, L_loop);
__ addptr(qword_count, 4);
__ jcc(Assembler::greater, L_copy_8_bytes); // Copy trailing qwords
}
@@ -1385,7 +1449,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_32_bytes, L_copy_8_bytes, L_copy_4_bytes, L_copy_2_bytes;
+ Label L_copy_bytes, L_copy_8_bytes, L_copy_4_bytes, L_copy_2_bytes;
Label L_copy_byte, L_exit;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
@@ -1417,7 +1481,7 @@
__ lea(end_from, Address(from, qword_count, Address::times_8, -8));
__ lea(end_to, Address(to, qword_count, Address::times_8, -8));
__ negptr(qword_count); // make the count negative
- __ jmp(L_copy_32_bytes);
+ __ jmp(L_copy_bytes);
// Copy trailing qwords
__ BIND(L_copy_8_bytes);
@@ -1460,8 +1524,8 @@
__ leave(); // required for proper stackwalking of RuntimeStub frame
__ ret(0);
- // Copy in 32-bytes chunks
- copy_32_bytes_forward(end_from, end_to, qword_count, rax, L_copy_32_bytes, L_copy_8_bytes);
+ // Copy in multi-bytes chunks
+ copy_bytes_forward(end_from, end_to, qword_count, rax, L_copy_bytes, L_copy_8_bytes);
__ jmp(L_copy_4_bytes);
return start;
@@ -1488,7 +1552,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_32_bytes, L_copy_8_bytes, L_copy_4_bytes, L_copy_2_bytes;
+ Label L_copy_bytes, L_copy_8_bytes, L_copy_4_bytes, L_copy_2_bytes;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
const Register count = rdx; // elements count
@@ -1531,10 +1595,10 @@
// Check for and copy trailing dword
__ BIND(L_copy_4_bytes);
__ testl(byte_count, 4);
- __ jcc(Assembler::zero, L_copy_32_bytes);
+ __ jcc(Assembler::zero, L_copy_bytes);
__ movl(rax, Address(from, qword_count, Address::times_8));
__ movl(Address(to, qword_count, Address::times_8), rax);
- __ jmp(L_copy_32_bytes);
+ __ jmp(L_copy_bytes);
// Copy trailing qwords
__ BIND(L_copy_8_bytes);
@@ -1549,8 +1613,8 @@
__ leave(); // required for proper stackwalking of RuntimeStub frame
__ ret(0);
- // Copy in 32-bytes chunks
- copy_32_bytes_backward(from, to, qword_count, rax, L_copy_32_bytes, L_copy_8_bytes);
+ // Copy in multi-bytes chunks
+ copy_bytes_backward(from, to, qword_count, rax, L_copy_bytes, L_copy_8_bytes);
restore_arg_regs();
inc_counter_np(SharedRuntime::_jbyte_array_copy_ctr); // Update counter after rscratch1 is free
@@ -1585,7 +1649,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_32_bytes, L_copy_8_bytes, L_copy_4_bytes,L_copy_2_bytes,L_exit;
+ Label L_copy_bytes, L_copy_8_bytes, L_copy_4_bytes,L_copy_2_bytes,L_exit;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
const Register count = rdx; // elements count
@@ -1616,7 +1680,7 @@
__ lea(end_from, Address(from, qword_count, Address::times_8, -8));
__ lea(end_to, Address(to, qword_count, Address::times_8, -8));
__ negptr(qword_count);
- __ jmp(L_copy_32_bytes);
+ __ jmp(L_copy_bytes);
// Copy trailing qwords
__ BIND(L_copy_8_bytes);
@@ -1652,8 +1716,8 @@
__ leave(); // required for proper stackwalking of RuntimeStub frame
__ ret(0);
- // Copy in 32-bytes chunks
- copy_32_bytes_forward(end_from, end_to, qword_count, rax, L_copy_32_bytes, L_copy_8_bytes);
+ // Copy in multi-bytes chunks
+ copy_bytes_forward(end_from, end_to, qword_count, rax, L_copy_bytes, L_copy_8_bytes);
__ jmp(L_copy_4_bytes);
return start;
@@ -1700,7 +1764,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_32_bytes, L_copy_8_bytes, L_copy_4_bytes;
+ Label L_copy_bytes, L_copy_8_bytes, L_copy_4_bytes;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
const Register count = rdx; // elements count
@@ -1735,10 +1799,10 @@
// Check for and copy trailing dword
__ BIND(L_copy_4_bytes);
__ testl(word_count, 2);
- __ jcc(Assembler::zero, L_copy_32_bytes);
+ __ jcc(Assembler::zero, L_copy_bytes);
__ movl(rax, Address(from, qword_count, Address::times_8));
__ movl(Address(to, qword_count, Address::times_8), rax);
- __ jmp(L_copy_32_bytes);
+ __ jmp(L_copy_bytes);
// Copy trailing qwords
__ BIND(L_copy_8_bytes);
@@ -1753,8 +1817,8 @@
__ leave(); // required for proper stackwalking of RuntimeStub frame
__ ret(0);
- // Copy in 32-bytes chunks
- copy_32_bytes_backward(from, to, qword_count, rax, L_copy_32_bytes, L_copy_8_bytes);
+ // Copy in multi-bytes chunks
+ copy_bytes_backward(from, to, qword_count, rax, L_copy_bytes, L_copy_8_bytes);
restore_arg_regs();
inc_counter_np(SharedRuntime::_jshort_array_copy_ctr); // Update counter after rscratch1 is free
@@ -1790,7 +1854,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_32_bytes, L_copy_8_bytes, L_copy_4_bytes, L_exit;
+ Label L_copy_bytes, L_copy_8_bytes, L_copy_4_bytes, L_exit;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
const Register count = rdx; // elements count
@@ -1826,7 +1890,7 @@
__ lea(end_from, Address(from, qword_count, Address::times_8, -8));
__ lea(end_to, Address(to, qword_count, Address::times_8, -8));
__ negptr(qword_count);
- __ jmp(L_copy_32_bytes);
+ __ jmp(L_copy_bytes);
// Copy trailing qwords
__ BIND(L_copy_8_bytes);
@@ -1853,8 +1917,8 @@
__ leave(); // required for proper stackwalking of RuntimeStub frame
__ ret(0);
- // Copy 32-bytes chunks
- copy_32_bytes_forward(end_from, end_to, qword_count, rax, L_copy_32_bytes, L_copy_8_bytes);
+ // Copy in multi-bytes chunks
+ copy_bytes_forward(end_from, end_to, qword_count, rax, L_copy_bytes, L_copy_8_bytes);
__ jmp(L_copy_4_bytes);
return start;
@@ -1882,7 +1946,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_32_bytes, L_copy_8_bytes, L_copy_2_bytes, L_exit;
+ Label L_copy_bytes, L_copy_8_bytes, L_copy_2_bytes, L_exit;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
const Register count = rdx; // elements count
@@ -1916,10 +1980,10 @@
// Check for and copy trailing dword
__ testl(dword_count, 1);
- __ jcc(Assembler::zero, L_copy_32_bytes);
+ __ jcc(Assembler::zero, L_copy_bytes);
__ movl(rax, Address(from, dword_count, Address::times_4, -4));
__ movl(Address(to, dword_count, Address::times_4, -4), rax);
- __ jmp(L_copy_32_bytes);
+ __ jmp(L_copy_bytes);
// Copy trailing qwords
__ BIND(L_copy_8_bytes);
@@ -1937,8 +2001,8 @@
__ leave(); // required for proper stackwalking of RuntimeStub frame
__ ret(0);
- // Copy in 32-bytes chunks
- copy_32_bytes_backward(from, to, qword_count, rax, L_copy_32_bytes, L_copy_8_bytes);
+ // Copy in multi-bytes chunks
+ copy_bytes_backward(from, to, qword_count, rax, L_copy_bytes, L_copy_8_bytes);
__ bind(L_exit);
if (is_oop) {
@@ -1976,7 +2040,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_32_bytes, L_copy_8_bytes, L_exit;
+ Label L_copy_bytes, L_copy_8_bytes, L_exit;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
const Register qword_count = rdx; // elements count
@@ -2008,7 +2072,7 @@
__ lea(end_from, Address(from, qword_count, Address::times_8, -8));
__ lea(end_to, Address(to, qword_count, Address::times_8, -8));
__ negptr(qword_count);
- __ jmp(L_copy_32_bytes);
+ __ jmp(L_copy_bytes);
// Copy trailing qwords
__ BIND(L_copy_8_bytes);
@@ -2027,8 +2091,8 @@
__ ret(0);
}
- // Copy 64-byte chunks
- copy_32_bytes_forward(end_from, end_to, qword_count, rax, L_copy_32_bytes, L_copy_8_bytes);
+ // Copy in multi-bytes chunks
+ copy_bytes_forward(end_from, end_to, qword_count, rax, L_copy_bytes, L_copy_8_bytes);
if (is_oop) {
__ BIND(L_exit);
@@ -2065,7 +2129,7 @@
StubCodeMark mark(this, "StubRoutines", name);
address start = __ pc();
- Label L_copy_32_bytes, L_copy_8_bytes, L_exit;
+ Label L_copy_bytes, L_copy_8_bytes, L_exit;
const Register from = rdi; // source array address
const Register to = rsi; // destination array address
const Register qword_count = rdx; // elements count
@@ -2091,7 +2155,7 @@
gen_write_ref_array_pre_barrier(to, saved_count, dest_uninitialized);
}
- __ jmp(L_copy_32_bytes);
+ __ jmp(L_copy_bytes);
// Copy trailing qwords
__ BIND(L_copy_8_bytes);
@@ -2110,8 +2174,8 @@
__ ret(0);
}
- // Copy in 32-bytes chunks
- copy_32_bytes_backward(from, to, qword_count, rax, L_copy_32_bytes, L_copy_8_bytes);
+ // Copy in multi-bytes chunks
+ copy_bytes_backward(from, to, qword_count, rax, L_copy_bytes, L_copy_8_bytes);
if (is_oop) {
__ BIND(L_exit);
--- a/hotspot/src/cpu/x86/vm/vmStructs_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/vmStructs_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,7 +29,7 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
\
/******************************/ \
/* JavaCallWrapper */ \
@@ -37,31 +37,14 @@
/******************************/ \
/* JavaFrameAnchor */ \
/******************************/ \
- volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*) \
- \
+ volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must */
- /* be present there) */
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must */
- /* be present there) */
-
-
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_INT_CONSTANTS_OS_CPU macro (and must */
- /* be present there) */
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */
- /* be present there) */
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // CPU_X86_VM_VMSTRUCTS_X86_HPP
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -429,7 +429,7 @@
}
char buf[256];
- jio_snprintf(buf, sizeof(buf), "(%u cores per cpu, %u threads per core) family %d model %d stepping %d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+ jio_snprintf(buf, sizeof(buf), "(%u cores per cpu, %u threads per core) family %d model %d stepping %d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
cores_per_cpu(), threads_per_core(),
cpu_family(), _model, _stepping,
(supports_cmov() ? ", cmov" : ""),
@@ -446,6 +446,7 @@
(supports_avx() ? ", avx" : ""),
(supports_avx2() ? ", avx2" : ""),
(supports_aes() ? ", aes" : ""),
+ (supports_erms() ? ", erms" : ""),
(supports_mmx_ext() ? ", mmxext" : ""),
(supports_3dnow_prefetch() ? ", 3dnowpref" : ""),
(supports_lzcnt() ? ", lzcnt": ""),
@@ -660,6 +661,14 @@
}
}
}
+#if defined(COMPILER2) && defined(_ALLBSD_SOURCE)
+ if (MaxVectorSize > 16) {
+ // Limit vectors size to 16 bytes on BSD until it fixes
+ // restoring upper 128bit of YMM registers on return
+ // from signal handler.
+ FLAG_SET_DEFAULT(MaxVectorSize, 16);
+ }
+#endif // COMPILER2
// Use population count instruction if available.
if (supports_popcnt()) {
@@ -671,6 +680,16 @@
FLAG_SET_DEFAULT(UsePopCountInstruction, false);
}
+ // Use fast-string operations if available.
+ if (supports_erms()) {
+ if (FLAG_IS_DEFAULT(UseFastStosb)) {
+ UseFastStosb = true;
+ }
+ } else if (UseFastStosb) {
+ warning("fast-string operations are not available on this CPU");
+ FLAG_SET_DEFAULT(UseFastStosb, false);
+ }
+
#ifdef COMPILER2
if (FLAG_IS_DEFAULT(AlignVector)) {
// Modern processors allow misaligned memory operations for vectors.
@@ -734,6 +753,10 @@
PrefetchFieldsAhead = prefetch_fields_ahead();
#endif
+ if (FLAG_IS_DEFAULT(ContendedPaddingWidth) &&
+ (cache_line_size > ContendedPaddingWidth))
+ ContendedPaddingWidth = cache_line_size;
+
#ifndef PRODUCT
if (PrintMiscellaneous && Verbose) {
tty->print_cr("Logical CPUs per core: %u",
@@ -780,6 +803,9 @@
if (PrefetchFieldsAhead > 0) {
tty->print_cr("PrefetchFieldsAhead %d", PrefetchFieldsAhead);
}
+ if (ContendedPaddingWidth > 0) {
+ tty->print_cr("ContendedPaddingWidth %d", ContendedPaddingWidth);
+ }
}
#endif // !PRODUCT
}
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -204,7 +204,8 @@
avx2 : 1,
: 2,
bmi2 : 1,
- : 23;
+ erms : 1,
+ : 22;
} bits;
};
@@ -247,7 +248,8 @@
CPU_TSCINV = (1 << 16),
CPU_AVX = (1 << 17),
CPU_AVX2 = (1 << 18),
- CPU_AES = (1 << 19)
+ CPU_AES = (1 << 19),
+ CPU_ERMS = (1 << 20) // enhanced 'rep movsb/stosb' instructions
} cpuFeatureFlags;
enum {
@@ -425,6 +427,8 @@
result |= CPU_TSCINV;
if (_cpuid_info.std_cpuid1_ecx.bits.aes != 0)
result |= CPU_AES;
+ if (_cpuid_info.sef_cpuid7_ebx.bits.erms != 0)
+ result |= CPU_ERMS;
// AMD features.
if (is_amd()) {
@@ -489,7 +493,7 @@
return (_cpuid_info.std_max_function >= 0xB) &&
// eax[4:0] | ebx[0:15] == 0 indicates invalid topology level.
// Some cpus have max cpuid >= 0xB but do not support processor topology.
- ((_cpuid_info.tpl_cpuidB0_eax & 0x1f | _cpuid_info.tpl_cpuidB0_ebx.bits.logical_cpus) != 0);
+ (((_cpuid_info.tpl_cpuidB0_eax & 0x1f) | _cpuid_info.tpl_cpuidB0_ebx.bits.logical_cpus) != 0);
}
static uint cores_per_cpu() {
@@ -550,6 +554,7 @@
static bool supports_avx2() { return (_cpuFeatures & CPU_AVX2) != 0; }
static bool supports_tsc() { return (_cpuFeatures & CPU_TSC) != 0; }
static bool supports_aes() { return (_cpuFeatures & CPU_AES) != 0; }
+ static bool supports_erms() { return (_cpuFeatures & CPU_ERMS) != 0; }
// Intel features
static bool is_intel_family_core() { return is_intel() &&
--- a/hotspot/src/cpu/x86/vm/x86_32.ad Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad Thu Jan 31 10:22:25 2013 -0800
@@ -11572,15 +11572,28 @@
// =======================================================================
// fast clearing of an array
instruct rep_stos(eCXRegI cnt, eDIRegP base, eAXRegI zero, Universe dummy, eFlagsReg cr) %{
+ predicate(!UseFastStosb);
match(Set dummy (ClearArray cnt base));
effect(USE_KILL cnt, USE_KILL base, KILL zero, KILL cr);
- format %{ "SHL ECX,1\t# Convert doublewords to words\n\t"
- "XOR EAX,EAX\n\t"
+ format %{ "XOR EAX,EAX\t# ClearArray:\n\t"
+ "SHL ECX,1\t# Convert doublewords to words\n\t"
"REP STOS\t# store EAX into [EDI++] while ECX--" %}
- opcode(0,0x4);
- ins_encode( Opcode(0xD1), RegOpc(ECX),
- OpcRegReg(0x33,EAX,EAX),
- Opcode(0xF3), Opcode(0xAB) );
+ ins_encode %{
+ __ clear_mem($base$$Register, $cnt$$Register, $zero$$Register);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+instruct rep_fast_stosb(eCXRegI cnt, eDIRegP base, eAXRegI zero, Universe dummy, eFlagsReg cr) %{
+ predicate(UseFastStosb);
+ match(Set dummy (ClearArray cnt base));
+ effect(USE_KILL cnt, USE_KILL base, KILL zero, KILL cr);
+ format %{ "XOR EAX,EAX\t# ClearArray:\n\t"
+ "SHL ECX,3\t# Convert doublewords to bytes\n\t"
+ "REP STOSB\t# store EAX into [EDI++] while ECX--" %}
+ ins_encode %{
+ __ clear_mem($base$$Register, $cnt$$Register, $zero$$Register);
+ %}
ins_pipe( pipe_slow );
%}
@@ -11674,6 +11687,23 @@
ins_pipe( pipe_slow );
%}
+// encode char[] to byte[] in ISO_8859_1
+instruct encode_iso_array(eSIRegP src, eDIRegP dst, eDXRegI len,
+ regD tmp1, regD tmp2, regD tmp3, regD tmp4,
+ eCXRegI tmp5, eAXRegI result, eFlagsReg cr) %{
+ match(Set result (EncodeISOArray src (Binary dst len)));
+ effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, USE_KILL src, USE_KILL dst, USE_KILL len, KILL tmp5, KILL cr);
+
+ format %{ "Encode array $src,$dst,$len -> $result // KILL ECX, EDX, $tmp1, $tmp2, $tmp3, $tmp4, ESI, EDI " %}
+ ins_encode %{
+ __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register,
+ $tmp1$$XMMRegister, $tmp2$$XMMRegister, $tmp3$$XMMRegister,
+ $tmp4$$XMMRegister, $tmp5$$Register, $result$$Register);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+
//----------Control Flow Instructions------------------------------------------
// Signed compare Instructions
instruct compI_eReg(eFlagsReg cr, rRegI op1, rRegI op2) %{
--- a/hotspot/src/cpu/x86/vm/x86_64.ad Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad Thu Jan 31 10:22:25 2013 -0800
@@ -10374,16 +10374,33 @@
instruct rep_stos(rcx_RegL cnt, rdi_RegP base, rax_RegI zero, Universe dummy,
rFlagsReg cr)
%{
+ predicate(!UseFastStosb);
match(Set dummy (ClearArray cnt base));
effect(USE_KILL cnt, USE_KILL base, KILL zero, KILL cr);
- format %{ "xorl rax, rax\t# ClearArray:\n\t"
- "rep stosq\t# Store rax to *rdi++ while rcx--" %}
- ins_encode(opc_reg_reg(0x33, RAX, RAX), // xorl %eax, %eax
- Opcode(0xF3), Opcode(0x48), Opcode(0xAB)); // rep REX_W stos
+ format %{ "xorq rax, rax\t# ClearArray:\n\t"
+ "rep stosq\t# Store rax to *rdi++ while rcx--" %}
+ ins_encode %{
+ __ clear_mem($base$$Register, $cnt$$Register, $zero$$Register);
+ %}
ins_pipe(pipe_slow);
%}
+instruct rep_fast_stosb(rcx_RegL cnt, rdi_RegP base, rax_RegI zero, Universe dummy,
+ rFlagsReg cr)
+%{
+ predicate(UseFastStosb);
+ match(Set dummy (ClearArray cnt base));
+ effect(USE_KILL cnt, USE_KILL base, KILL zero, KILL cr);
+ format %{ "xorq rax, rax\t# ClearArray:\n\t"
+ "shlq rcx,3\t# Convert doublewords to bytes\n\t"
+ "rep stosb\t# Store rax to *rdi++ while rcx--" %}
+ ins_encode %{
+ __ clear_mem($base$$Register, $cnt$$Register, $zero$$Register);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
instruct string_compare(rdi_RegP str1, rcx_RegI cnt1, rsi_RegP str2, rdx_RegI cnt2,
rax_RegI result, regD tmp1, rFlagsReg cr)
%{
@@ -10478,6 +10495,23 @@
ins_pipe( pipe_slow );
%}
+// encode char[] to byte[] in ISO_8859_1
+instruct encode_iso_array(rsi_RegP src, rdi_RegP dst, rdx_RegI len,
+ regD tmp1, regD tmp2, regD tmp3, regD tmp4,
+ rcx_RegI tmp5, rax_RegI result, rFlagsReg cr) %{
+ match(Set result (EncodeISOArray src (Binary dst len)));
+ effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, USE_KILL src, USE_KILL dst, USE_KILL len, KILL tmp5, KILL cr);
+
+ format %{ "Encode array $src,$dst,$len -> $result // KILL RCX, RDX, $tmp1, $tmp2, $tmp3, $tmp4, RSI, RDI " %}
+ ins_encode %{
+ __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register,
+ $tmp1$$XMMRegister, $tmp2$$XMMRegister, $tmp3$$XMMRegister,
+ $tmp4$$XMMRegister, $tmp5$$Register, $result$$Register);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+
//----------Control Flow Instructions------------------------------------------
// Signed compare Instructions
--- a/hotspot/src/cpu/zero/vm/frame_zero.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/zero/vm/frame_zero.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -98,10 +98,20 @@
#endif // CC_INTERP
void frame::patch_pc(Thread* thread, address pc) {
- // We borrow this call to set the thread pointer in the interpreter
- // state; the hook to set up deoptimized frames isn't supplied it.
- assert(pc == NULL, "should be");
- get_interpreterState()->set_thread((JavaThread *) thread);
+
+ if (pc != NULL) {
+ _cb = CodeCache::find_blob(pc);
+ SharkFrame* sharkframe = zeroframe()->as_shark_frame();
+ sharkframe->set_pc(pc);
+ _pc = pc;
+ _deopt_state = is_deoptimized;
+
+ } else {
+ // We borrow this call to set the thread pointer in the interpreter
+ // state; the hook to set up deoptimized frames isn't supplied it.
+ assert(pc == NULL, "should be");
+ get_interpreterState()->set_thread((JavaThread *) thread);
+ }
}
bool frame::safe_for_sender(JavaThread *thread) {
--- a/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -45,27 +45,36 @@
case ZeroFrame::ENTRY_FRAME:
_pc = StubRoutines::call_stub_return_pc();
_cb = NULL;
+ _deopt_state = not_deoptimized;
break;
case ZeroFrame::INTERPRETER_FRAME:
_pc = NULL;
_cb = NULL;
+ _deopt_state = not_deoptimized;
break;
- case ZeroFrame::SHARK_FRAME:
+ case ZeroFrame::SHARK_FRAME: {
_pc = zero_sharkframe()->pc();
_cb = CodeCache::find_blob_unsafe(pc());
+ address original_pc = nmethod::get_deopt_original_pc(this);
+ if (original_pc != NULL) {
+ _pc = original_pc;
+ _deopt_state = is_deoptimized;
+ } else {
+ _deopt_state = not_deoptimized;
+ }
break;
-
+ }
case ZeroFrame::FAKE_STUB_FRAME:
_pc = NULL;
_cb = NULL;
+ _deopt_state = not_deoptimized;
break;
default:
ShouldNotReachHere();
}
- _deopt_state = not_deoptimized;
}
// Accessors
--- a/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -68,6 +68,10 @@
return (address) value_of_word(pc_off);
}
+ void set_pc(address pc) const {
+ *((address*) addr_of_word(pc_off)) = pc;
+ }
+
intptr_t* unextended_sp() const {
return (intptr_t *) value_of_word(unextended_sp_off);
}
--- a/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -30,28 +30,12 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must */
- /* be present there) */
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must */
- /* be present there) */
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_INT_CONSTANTS_OS_CPU macro (and must */
- /* be present there) */
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */
- /* be present there) */
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -243,29 +243,32 @@
int mib[2];
size_t len;
int cpu_val;
- u_long mem_val;
+ julong mem_val;
/* get processors count via hw.ncpus sysctl */
mib[0] = CTL_HW;
mib[1] = HW_NCPU;
len = sizeof(cpu_val);
if (sysctl(mib, 2, &cpu_val, &len, NULL, 0) != -1 && cpu_val >= 1) {
+ assert(len == sizeof(cpu_val), "unexpected data size");
set_processor_count(cpu_val);
}
else {
set_processor_count(1); // fallback
}
- /* get physical memory via hw.usermem sysctl (hw.usermem is used
- * instead of hw.physmem because we need size of allocatable memory
+ /* get physical memory via hw.memsize sysctl (hw.memsize is used
+ * since it returns a 64 bit value)
*/
mib[0] = CTL_HW;
- mib[1] = HW_USERMEM;
+ mib[1] = HW_MEMSIZE;
len = sizeof(mem_val);
- if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1)
+ if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) {
+ assert(len == sizeof(mem_val), "unexpected data size");
_physical_memory = mem_val;
- else
+ } else {
_physical_memory = 256*1024*1024; // fallback (XXXBSD?)
+ }
#ifdef __OpenBSD__
{
@@ -298,12 +301,12 @@
// The next steps are taken in the product version:
//
- // Obtain the JAVA_HOME value from the location of libjvm[_g].so.
+ // Obtain the JAVA_HOME value from the location of libjvm.so.
// This library should be located at:
- // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm[_g].so.
+ // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm.so.
//
// If "/jre/lib/" appears at the right place in the path, then we
- // assume libjvm[_g].so is installed in a JDK and we use this path.
+ // assume libjvm.so is installed in a JDK and we use this path.
//
// Otherwise exit with message: "Could not create the Java virtual machine."
//
@@ -313,9 +316,9 @@
// instead of exit check for $JAVA_HOME environment variable.
//
// If it is defined and we are able to locate $JAVA_HOME/jre/lib/<arch>,
- // then we append a fake suffix "hotspot/libjvm[_g].so" to this path so
- // it looks like libjvm[_g].so is installed there
- // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm[_g].so.
+ // then we append a fake suffix "hotspot/libjvm.so" to this path so
+ // it looks like libjvm.so is installed there
+ // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm.so.
//
// Otherwise exit.
//
@@ -1228,7 +1231,7 @@
return getcwd(buf, buflen);
}
-// check if addr is inside libjvm[_g].so
+// check if addr is inside libjvm.so
bool os::address_is_in_vm(address addr) {
static address libjvm_base_addr;
Dl_info dlinfo;
@@ -1689,7 +1692,7 @@
static char saved_jvm_path[MAXPATHLEN] = {0};
-// Find the full path to the current module, libjvm or libjvm_g
+// Find the full path to the current module, libjvm
void os::jvm_path(char *buf, jint buflen) {
// Error checking.
if (buflen < MAXPATHLEN) {
@@ -1732,10 +1735,9 @@
char* jrelib_p;
int len;
- // Check the current module name "libjvm" or "libjvm_g".
+ // Check the current module name "libjvm"
p = strrchr(buf, '/');
assert(strstr(p, "/libjvm") == p, "invalid library name");
- p = strstr(p, "_g") ? "_g" : "";
rp = realpath(java_home_var, buf);
if (rp == NULL)
@@ -1764,11 +1766,9 @@
// to complete the path to JVM being overridden. Otherwise fallback
// to the path to the current library.
if (0 == access(buf, F_OK)) {
- // Use current module name "libjvm[_g]" instead of
- // "libjvm"debug_only("_g")"" since for fastdebug version
- // we should have "libjvm" but debug_only("_g") adds "_g"!
+ // Use current module name "libjvm"
len = strlen(buf);
- snprintf(buf + len, buflen-len, "/libjvm%s%s", p, JNI_LIB_SUFFIX);
+ snprintf(buf + len, buflen-len, "/libjvm%s", JNI_LIB_SUFFIX);
} else {
// Fall back to path of current library
rp = realpath(dli_fname, buf);
@@ -4094,11 +4094,12 @@
}
-- _nParked ;
- // In theory we could move the ST of 0 into _Event past the unlock(),
- // but then we'd need a MEMBAR after the ST.
_Event = 0 ;
status = pthread_mutex_unlock(_mutex);
assert_status(status == 0, status, "mutex_unlock");
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other.
+ OrderAccess::fence();
}
guarantee (_Event >= 0, "invariant") ;
}
@@ -4161,40 +4162,44 @@
status = pthread_mutex_unlock(_mutex);
assert_status(status == 0, status, "mutex_unlock");
assert (_nParked == 0, "invariant") ;
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other.
+ OrderAccess::fence();
return ret;
}
void os::PlatformEvent::unpark() {
- int v, AnyWaiters ;
- for (;;) {
- v = _Event ;
- if (v > 0) {
- // The LD of _Event could have reordered or be satisfied
- // by a read-aside from this processor's write buffer.
- // To avoid problems execute a barrier and then
- // ratify the value.
- OrderAccess::fence() ;
- if (_Event == v) return ;
- continue ;
- }
- if (Atomic::cmpxchg (v+1, &_Event, v) == v) break ;
+ // Transitions for _Event:
+ // 0 :=> 1
+ // 1 :=> 1
+ // -1 :=> either 0 or 1; must signal target thread
+ // That is, we can safely transition _Event from -1 to either
+ // 0 or 1. Forcing 1 is slightly more efficient for back-to-back
+ // unpark() calls.
+ // See also: "Semaphores in Plan 9" by Mullender & Cox
+ //
+ // Note: Forcing a transition from "-1" to "1" on an unpark() means
+ // that it will take two back-to-back park() calls for the owning
+ // thread to block. This has the benefit of forcing a spurious return
+ // from the first park() call after an unpark() call which will help
+ // shake out uses of park() and unpark() without condition variables.
+
+ if (Atomic::xchg(1, &_Event) >= 0) return;
+
+ // Wait for the thread associated with the event to vacate
+ int status = pthread_mutex_lock(_mutex);
+ assert_status(status == 0, status, "mutex_lock");
+ int AnyWaiters = _nParked;
+ assert(AnyWaiters == 0 || AnyWaiters == 1, "invariant");
+ if (AnyWaiters != 0 && WorkAroundNPTLTimedWaitHang) {
+ AnyWaiters = 0;
+ pthread_cond_signal(_cond);
}
- if (v < 0) {
- // Wait for the thread associated with the event to vacate
- int status = pthread_mutex_lock(_mutex);
- assert_status(status == 0, status, "mutex_lock");
- AnyWaiters = _nParked ;
- assert (AnyWaiters == 0 || AnyWaiters == 1, "invariant") ;
- if (AnyWaiters != 0 && WorkAroundNPTLTimedWaitHang) {
- AnyWaiters = 0 ;
- pthread_cond_signal (_cond);
- }
- status = pthread_mutex_unlock(_mutex);
- assert_status(status == 0, status, "mutex_unlock");
- if (AnyWaiters != 0) {
- status = pthread_cond_signal(_cond);
- assert_status(status == 0, status, "cond_signal");
- }
+ status = pthread_mutex_unlock(_mutex);
+ assert_status(status == 0, status, "mutex_unlock");
+ if (AnyWaiters != 0) {
+ status = pthread_cond_signal(_cond);
+ assert_status(status == 0, status, "cond_signal");
}
// Note that we signal() _after dropping the lock for "immortal" Events.
@@ -4280,13 +4285,14 @@
}
void Parker::park(bool isAbsolute, jlong time) {
+ // Ideally we'd do something useful while spinning, such
+ // as calling unpackTime().
+
// Optional fast-path check:
// Return immediately if a permit is available.
- if (_counter > 0) {
- _counter = 0 ;
- OrderAccess::fence();
- return ;
- }
+ // We depend on Atomic::xchg() having full barrier semantics
+ // since we are doing a lock-free update to _counter.
+ if (Atomic::xchg(0, &_counter) > 0) return;
Thread* thread = Thread::current();
assert(thread->is_Java_thread(), "Must be JavaThread");
@@ -4327,6 +4333,8 @@
_counter = 0;
status = pthread_mutex_unlock(_mutex);
assert (status == 0, "invariant") ;
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other and Java-level accesses.
OrderAccess::fence();
return;
}
@@ -4363,12 +4371,14 @@
_counter = 0 ;
status = pthread_mutex_unlock(_mutex) ;
assert_status(status == 0, status, "invariant") ;
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other and Java-level accesses.
+ OrderAccess::fence();
+
// If externally suspended while waiting, re-suspend
if (jt->handle_special_suspend_equivalent_condition()) {
jt->java_suspend_self();
}
-
- OrderAccess::fence();
}
void Parker::unpark() {
--- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,14 +59,6 @@
return ":";
}
-inline const char* os::jlong_format_specifier() {
- return "%lld";
-}
-
-inline const char* os::julong_format_specifier() {
- return "%llu";
-}
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
--- a/hotspot/src/os/linux/vm/os_linux.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -321,12 +321,12 @@
// The next steps are taken in the product version:
//
- // Obtain the JAVA_HOME value from the location of libjvm[_g].so.
+ // Obtain the JAVA_HOME value from the location of libjvm.so.
// This library should be located at:
- // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm[_g].so.
+ // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm.so.
//
// If "/jre/lib/" appears at the right place in the path, then we
- // assume libjvm[_g].so is installed in a JDK and we use this path.
+ // assume libjvm.so is installed in a JDK and we use this path.
//
// Otherwise exit with message: "Could not create the Java virtual machine."
//
@@ -336,9 +336,9 @@
// instead of exit check for $JAVA_HOME environment variable.
//
// If it is defined and we are able to locate $JAVA_HOME/jre/lib/<arch>,
- // then we append a fake suffix "hotspot/libjvm[_g].so" to this path so
- // it looks like libjvm[_g].so is installed there
- // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm[_g].so.
+ // then we append a fake suffix "hotspot/libjvm.so" to this path so
+ // it looks like libjvm.so is installed there
+ // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm.so.
//
// Otherwise exit.
//
@@ -1679,7 +1679,7 @@
return getcwd(buf, buflen);
}
-// check if addr is inside libjvm[_g].so
+// check if addr is inside libjvm.so
bool os::address_is_in_vm(address addr) {
static address libjvm_base_addr;
Dl_info dlinfo;
@@ -2180,7 +2180,7 @@
static char saved_jvm_path[MAXPATHLEN] = {0};
-// Find the full path to the current module, libjvm.so or libjvm_g.so
+// Find the full path to the current module, libjvm.so
void os::jvm_path(char *buf, jint buflen) {
// Error checking.
if (buflen < MAXPATHLEN) {
@@ -2223,10 +2223,9 @@
char* jrelib_p;
int len;
- // Check the current module name "libjvm.so" or "libjvm_g.so".
+ // Check the current module name "libjvm.so".
p = strrchr(buf, '/');
assert(strstr(p, "/libjvm") == p, "invalid library name");
- p = strstr(p, "_g") ? "_g" : "";
rp = realpath(java_home_var, buf);
if (rp == NULL)
@@ -2242,11 +2241,9 @@
}
if (0 == access(buf, F_OK)) {
- // Use current module name "libjvm[_g].so" instead of
- // "libjvm"debug_only("_g")".so" since for fastdebug version
- // we should have "libjvm.so" but debug_only("_g") adds "_g"!
+ // Use current module name "libjvm.so"
len = strlen(buf);
- snprintf(buf + len, buflen-len, "/hotspot/libjvm%s.so", p);
+ snprintf(buf + len, buflen-len, "/hotspot/libjvm.so");
} else {
// Go back to path of .so
rp = realpath(dli_fname, buf);
@@ -5004,11 +5001,12 @@
}
-- _nParked ;
- // In theory we could move the ST of 0 into _Event past the unlock(),
- // but then we'd need a MEMBAR after the ST.
_Event = 0 ;
status = pthread_mutex_unlock(_mutex);
assert_status(status == 0, status, "mutex_unlock");
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other.
+ OrderAccess::fence();
}
guarantee (_Event >= 0, "invariant") ;
}
@@ -5071,40 +5069,44 @@
status = pthread_mutex_unlock(_mutex);
assert_status(status == 0, status, "mutex_unlock");
assert (_nParked == 0, "invariant") ;
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other.
+ OrderAccess::fence();
return ret;
}
void os::PlatformEvent::unpark() {
- int v, AnyWaiters ;
- for (;;) {
- v = _Event ;
- if (v > 0) {
- // The LD of _Event could have reordered or be satisfied
- // by a read-aside from this processor's write buffer.
- // To avoid problems execute a barrier and then
- // ratify the value.
- OrderAccess::fence() ;
- if (_Event == v) return ;
- continue ;
- }
- if (Atomic::cmpxchg (v+1, &_Event, v) == v) break ;
- }
- if (v < 0) {
- // Wait for the thread associated with the event to vacate
- int status = pthread_mutex_lock(_mutex);
- assert_status(status == 0, status, "mutex_lock");
- AnyWaiters = _nParked ;
- assert (AnyWaiters == 0 || AnyWaiters == 1, "invariant") ;
- if (AnyWaiters != 0 && WorkAroundNPTLTimedWaitHang) {
- AnyWaiters = 0 ;
- pthread_cond_signal (_cond);
- }
- status = pthread_mutex_unlock(_mutex);
- assert_status(status == 0, status, "mutex_unlock");
- if (AnyWaiters != 0) {
- status = pthread_cond_signal(_cond);
- assert_status(status == 0, status, "cond_signal");
- }
+ // Transitions for _Event:
+ // 0 :=> 1
+ // 1 :=> 1
+ // -1 :=> either 0 or 1; must signal target thread
+ // That is, we can safely transition _Event from -1 to either
+ // 0 or 1. Forcing 1 is slightly more efficient for back-to-back
+ // unpark() calls.
+ // See also: "Semaphores in Plan 9" by Mullender & Cox
+ //
+ // Note: Forcing a transition from "-1" to "1" on an unpark() means
+ // that it will take two back-to-back park() calls for the owning
+ // thread to block. This has the benefit of forcing a spurious return
+ // from the first park() call after an unpark() call which will help
+ // shake out uses of park() and unpark() without condition variables.
+
+ if (Atomic::xchg(1, &_Event) >= 0) return;
+
+ // Wait for the thread associated with the event to vacate
+ int status = pthread_mutex_lock(_mutex);
+ assert_status(status == 0, status, "mutex_lock");
+ int AnyWaiters = _nParked;
+ assert(AnyWaiters == 0 || AnyWaiters == 1, "invariant");
+ if (AnyWaiters != 0 && WorkAroundNPTLTimedWaitHang) {
+ AnyWaiters = 0;
+ pthread_cond_signal(_cond);
+ }
+ status = pthread_mutex_unlock(_mutex);
+ assert_status(status == 0, status, "mutex_unlock");
+ if (AnyWaiters != 0) {
+ status = pthread_cond_signal(_cond);
+ assert_status(status == 0, status, "cond_signal");
}
// Note that we signal() _after dropping the lock for "immortal" Events.
@@ -5190,13 +5192,14 @@
}
void Parker::park(bool isAbsolute, jlong time) {
+ // Ideally we'd do something useful while spinning, such
+ // as calling unpackTime().
+
// Optional fast-path check:
// Return immediately if a permit is available.
- if (_counter > 0) {
- _counter = 0 ;
- OrderAccess::fence();
- return ;
- }
+ // We depend on Atomic::xchg() having full barrier semantics
+ // since we are doing a lock-free update to _counter.
+ if (Atomic::xchg(0, &_counter) > 0) return;
Thread* thread = Thread::current();
assert(thread->is_Java_thread(), "Must be JavaThread");
@@ -5237,6 +5240,8 @@
_counter = 0;
status = pthread_mutex_unlock(_mutex);
assert (status == 0, "invariant") ;
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other and Java-level accesses.
OrderAccess::fence();
return;
}
@@ -5273,12 +5278,14 @@
_counter = 0 ;
status = pthread_mutex_unlock(_mutex) ;
assert_status(status == 0, status, "invariant") ;
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other and Java-level accesses.
+ OrderAccess::fence();
+
// If externally suspended while waiting, re-suspend
if (jt->handle_special_suspend_equivalent_condition()) {
jt->java_suspend_self();
}
-
- OrderAccess::fence();
}
void Parker::unpark() {
--- a/hotspot/src/os/linux/vm/os_linux.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -68,14 +68,6 @@
return ":";
}
-inline const char* os::jlong_format_specifier() {
- return "%lld";
-}
-
-inline const char* os::julong_format_specifier() {
- return "%llu";
-}
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
--- a/hotspot/src/os/posix/launcher/java_md.c Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/posix/launcher/java_md.c Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1876,11 +1876,6 @@
}
}
-const char *
-jlong_format_specifier() {
- return "%lld";
-}
-
/*
* Block current thread and continue execution in a new thread
*/
--- a/hotspot/src/os/posix/launcher/java_md.h Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/posix/launcher/java_md.h Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,12 @@
#define Counter2Micros(counts) (1)
#endif /* HAVE_GETHRTIME */
+#ifdef _LP64
+#define JLONG_FORMAT "%ld"
+#else
+#define JLONG_FORMAT "%lld"
+#endif
+
/*
* Function prototypes.
*/
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -734,12 +734,12 @@
// The next steps are taken in the product version:
//
- // Obtain the JAVA_HOME value from the location of libjvm[_g].so.
+ // Obtain the JAVA_HOME value from the location of libjvm.so.
// This library should be located at:
- // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm[_g].so.
+ // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm.so.
//
// If "/jre/lib/" appears at the right place in the path, then we
- // assume libjvm[_g].so is installed in a JDK and we use this path.
+ // assume libjvm.so is installed in a JDK and we use this path.
//
// Otherwise exit with message: "Could not create the Java virtual machine."
//
@@ -749,9 +749,9 @@
// instead of exit check for $JAVA_HOME environment variable.
//
// If it is defined and we are able to locate $JAVA_HOME/jre/lib/<arch>,
- // then we append a fake suffix "hotspot/libjvm[_g].so" to this path so
- // it looks like libjvm[_g].so is installed there
- // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm[_g].so.
+ // then we append a fake suffix "hotspot/libjvm.so" to this path so
+ // it looks like libjvm.so is installed there
+ // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm.so.
//
// Otherwise exit.
//
@@ -1934,7 +1934,7 @@
return getcwd(buf, buflen);
}
-// check if addr is inside libjvm[_g].so
+// check if addr is inside libjvm.so
bool os::address_is_in_vm(address addr) {
static address libjvm_base_addr;
Dl_info dlinfo;
@@ -2474,7 +2474,7 @@
static char saved_jvm_path[MAXPATHLEN] = { 0 };
-// Find the full path to the current module, libjvm.so or libjvm_g.so
+// Find the full path to the current module, libjvm.so
void os::jvm_path(char *buf, jint buflen) {
// Error checking.
if (buflen < MAXPATHLEN) {
@@ -2522,10 +2522,9 @@
strcpy(cpu_arch, "amd64");
}
#endif
- // Check the current module name "libjvm.so" or "libjvm_g.so".
+ // Check the current module name "libjvm.so".
p = strrchr(buf, '/');
assert(strstr(p, "/libjvm") == p, "invalid library name");
- p = strstr(p, "_g") ? "_g" : "";
realpath(java_home_var, buf);
// determine if this is a legacy image or modules image
@@ -2538,11 +2537,9 @@
}
if (0 == access(buf, F_OK)) {
- // Use current module name "libjvm[_g].so" instead of
- // "libjvm"debug_only("_g")".so" since for fastdebug version
- // we should have "libjvm.so" but debug_only("_g") adds "_g"!
+ // Use current module name "libjvm.so"
len = strlen(buf);
- snprintf(buf + len, buflen-len, "/hotspot/libjvm%s.so", p);
+ snprintf(buf + len, buflen-len, "/hotspot/libjvm.so");
} else {
// Go back to path of .so
realpath((char *)dlinfo.dli_fname, buf);
@@ -6017,6 +6014,9 @@
_Event = 0 ;
status = os::Solaris::mutex_unlock(_mutex);
assert_status(status == 0, status, "mutex_unlock");
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other.
+ OrderAccess::fence();
}
}
@@ -6058,51 +6058,43 @@
_Event = 0 ;
status = os::Solaris::mutex_unlock(_mutex);
assert_status(status == 0, status, "mutex_unlock");
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other.
+ OrderAccess::fence();
return ret;
}
void os::PlatformEvent::unpark() {
- int v, AnyWaiters;
-
- // Increment _Event.
- // Another acceptable implementation would be to simply swap 1
- // into _Event:
- // if (Swap (&_Event, 1) < 0) {
- // mutex_lock (_mutex) ; AnyWaiters = nParked; mutex_unlock (_mutex) ;
- // if (AnyWaiters) cond_signal (_cond) ;
- // }
-
- for (;;) {
- v = _Event ;
- if (v > 0) {
- // The LD of _Event could have reordered or be satisfied
- // by a read-aside from this processor's write buffer.
- // To avoid problems execute a barrier and then
- // ratify the value. A degenerate CAS() would also work.
- // Viz., CAS (v+0, &_Event, v) == v).
- OrderAccess::fence() ;
- if (_Event == v) return ;
- continue ;
- }
- if (Atomic::cmpxchg (v+1, &_Event, v) == v) break ;
- }
+ // Transitions for _Event:
+ // 0 :=> 1
+ // 1 :=> 1
+ // -1 :=> either 0 or 1; must signal target thread
+ // That is, we can safely transition _Event from -1 to either
+ // 0 or 1. Forcing 1 is slightly more efficient for back-to-back
+ // unpark() calls.
+ // See also: "Semaphores in Plan 9" by Mullender & Cox
+ //
+ // Note: Forcing a transition from "-1" to "1" on an unpark() means
+ // that it will take two back-to-back park() calls for the owning
+ // thread to block. This has the benefit of forcing a spurious return
+ // from the first park() call after an unpark() call which will help
+ // shake out uses of park() and unpark() without condition variables.
+
+ if (Atomic::xchg(1, &_Event) >= 0) return;
// If the thread associated with the event was parked, wake it.
- if (v < 0) {
- int status ;
- // Wait for the thread assoc with the PlatformEvent to vacate.
- status = os::Solaris::mutex_lock(_mutex);
- assert_status(status == 0, status, "mutex_lock");
- AnyWaiters = _nParked ;
- status = os::Solaris::mutex_unlock(_mutex);
- assert_status(status == 0, status, "mutex_unlock");
- guarantee (AnyWaiters == 0 || AnyWaiters == 1, "invariant") ;
- if (AnyWaiters != 0) {
- // We intentional signal *after* dropping the lock
- // to avoid a common class of futile wakeups.
- status = os::Solaris::cond_signal(_cond);
- assert_status(status == 0, status, "cond_signal");
- }
+ // Wait for the thread assoc with the PlatformEvent to vacate.
+ int status = os::Solaris::mutex_lock(_mutex);
+ assert_status(status == 0, status, "mutex_lock");
+ int AnyWaiters = _nParked;
+ status = os::Solaris::mutex_unlock(_mutex);
+ assert_status(status == 0, status, "mutex_unlock");
+ guarantee(AnyWaiters == 0 || AnyWaiters == 1, "invariant");
+ if (AnyWaiters != 0) {
+ // We intentional signal *after* dropping the lock
+ // to avoid a common class of futile wakeups.
+ status = os::Solaris::cond_signal(_cond);
+ assert_status(status == 0, status, "cond_signal");
}
}
@@ -6180,14 +6172,14 @@
}
void Parker::park(bool isAbsolute, jlong time) {
+ // Ideally we'd do something useful while spinning, such
+ // as calling unpackTime().
// Optional fast-path check:
// Return immediately if a permit is available.
- if (_counter > 0) {
- _counter = 0 ;
- OrderAccess::fence();
- return ;
- }
+ // We depend on Atomic::xchg() having full barrier semantics
+ // since we are doing a lock-free update to _counter.
+ if (Atomic::xchg(0, &_counter) > 0) return;
// Optional fast-exit: Check interrupt before trying to wait
Thread* thread = Thread::current();
@@ -6229,6 +6221,8 @@
_counter = 0;
status = os::Solaris::mutex_unlock(_mutex);
assert (status == 0, "invariant") ;
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other and Java-level accesses.
OrderAccess::fence();
return;
}
@@ -6270,12 +6264,14 @@
_counter = 0 ;
status = os::Solaris::mutex_unlock(_mutex);
assert_status(status == 0, status, "mutex_unlock") ;
+ // Paranoia to ensure our locked and lock-free paths interact
+ // correctly with each other and Java-level accesses.
+ OrderAccess::fence();
// If externally suspended while waiting, re-suspend
if (jt->handle_special_suspend_equivalent_condition()) {
jt->java_suspend_self();
}
- OrderAccess::fence();
}
void Parker::unpark() {
--- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,9 +50,6 @@
inline const char* os::line_separator() { return "\n"; }
inline const char* os::path_separator() { return ":"; }
-inline const char* os::jlong_format_specifier() { return "%lld"; }
-inline const char* os::julong_format_specifier() { return "%llu"; }
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
--- a/hotspot/src/os/windows/launcher/java_md.c Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/windows/launcher/java_md.c Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1323,11 +1323,6 @@
}
}
-const char *
-jlong_format_specifier() {
- return "%I64d";
-}
-
/*
* Block current thread and continue execution in a new thread
*/
--- a/hotspot/src/os/windows/launcher/java_md.h Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/windows/launcher/java_md.h Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,6 +69,8 @@
extern int _main(int argc, char **argv);
#endif
+#define JLONG_FORMAT "%I64d"
+
/*
* Function prototypes.
*/
--- a/hotspot/src/os/windows/vm/decoder_windows.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/windows/vm/decoder_windows.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -49,7 +49,7 @@
pfn_SymSetOptions _pfnSymSetOptions = (pfn_SymSetOptions)::GetProcAddress(handle, "SymSetOptions");
pfn_SymInitialize _pfnSymInitialize = (pfn_SymInitialize)::GetProcAddress(handle, "SymInitialize");
_pfnSymGetSymFromAddr64 = (pfn_SymGetSymFromAddr64)::GetProcAddress(handle, "SymGetSymFromAddr64");
- _pfnUndecorateSymbolName = (pfn_UndecorateSymbolName)GetProcAddress(handle, "UnDecorateSymbolName");
+ _pfnUndecorateSymbolName = (pfn_UndecorateSymbolName)::GetProcAddress(handle, "UnDecorateSymbolName");
if (_pfnSymSetOptions == NULL || _pfnSymInitialize == NULL || _pfnSymGetSymFromAddr64 == NULL) {
_pfnSymGetSymFromAddr64 = NULL;
@@ -60,8 +60,9 @@
return;
}
- _pfnSymSetOptions(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS);
- if (!_pfnSymInitialize(GetCurrentProcess(), NULL, TRUE)) {
+ HANDLE hProcess = ::GetCurrentProcess();
+ _pfnSymSetOptions(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_EXACT_SYMBOLS);
+ if (!_pfnSymInitialize(hProcess, NULL, TRUE)) {
_pfnSymGetSymFromAddr64 = NULL;
_pfnUndecorateSymbolName = NULL;
::FreeLibrary(handle);
@@ -70,6 +71,77 @@
return;
}
+ // set pdb search paths
+ pfn_SymSetSearchPath _pfn_SymSetSearchPath =
+ (pfn_SymSetSearchPath)::GetProcAddress(handle, "SymSetSearchPath");
+ pfn_SymGetSearchPath _pfn_SymGetSearchPath =
+ (pfn_SymGetSearchPath)::GetProcAddress(handle, "SymGetSearchPath");
+ if (_pfn_SymSetSearchPath != NULL && _pfn_SymGetSearchPath != NULL) {
+ char paths[MAX_PATH];
+ int len = sizeof(paths);
+ if (!_pfn_SymGetSearchPath(hProcess, paths, len)) {
+ paths[0] = '\0';
+ } else {
+ // available spaces in path buffer
+ len -= (int)strlen(paths);
+ }
+
+ char tmp_path[MAX_PATH];
+ DWORD dwSize;
+ HMODULE hJVM = ::GetModuleHandle("jvm.dll");
+ tmp_path[0] = '\0';
+ // append the path where jvm.dll is located
+ if (hJVM != NULL && (dwSize = ::GetModuleFileName(hJVM, tmp_path, sizeof(tmp_path))) > 0) {
+ while (dwSize > 0 && tmp_path[dwSize] != '\\') {
+ dwSize --;
+ }
+
+ tmp_path[dwSize] = '\0';
+
+ if (dwSize > 0 && len > (int)dwSize + 1) {
+ strncat(paths, os::path_separator(), 1);
+ strncat(paths, tmp_path, dwSize);
+ len -= dwSize + 1;
+ }
+ }
+
+ // append $JRE/bin. Arguments::get_java_home actually returns $JRE
+ // path
+ char *p = Arguments::get_java_home();
+ assert(p != NULL, "empty java home");
+ size_t java_home_len = strlen(p);
+ if (len > (int)java_home_len + 5) {
+ strncat(paths, os::path_separator(), 1);
+ strncat(paths, p, java_home_len);
+ strncat(paths, "\\bin", 4);
+ len -= (int)(java_home_len + 5);
+ }
+
+ // append $JDK/bin path if it exists
+ assert(java_home_len < MAX_PATH, "Invalid path length");
+ // assume $JRE is under $JDK, construct $JDK/bin path and
+ // see if it exists or not
+ if (strncmp(&p[java_home_len - 3], "jre", 3) == 0) {
+ strncpy(tmp_path, p, java_home_len - 3);
+ tmp_path[java_home_len - 3] = '\0';
+ strncat(tmp_path, "bin", 3);
+
+ // if the directory exists
+ DWORD dwAttrib = GetFileAttributes(tmp_path);
+ if (dwAttrib != INVALID_FILE_ATTRIBUTES &&
+ (dwAttrib & FILE_ATTRIBUTE_DIRECTORY)) {
+ // tmp_path should have the same length as java_home_len, since we only
+ // replaced 'jre' with 'bin'
+ if (len > (int)java_home_len + 1) {
+ strncat(paths, os::path_separator(), 1);
+ strncat(paths, tmp_path, java_home_len);
+ }
+ }
+ }
+
+ _pfn_SymSetSearchPath(hProcess, paths);
+ }
+
// find out if jvm.dll contains private symbols, by decoding
// current function and comparing the result
address addr = (address)Decoder::demangle;
--- a/hotspot/src/os/windows/vm/decoder_windows.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/windows/vm/decoder_windows.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -35,6 +35,8 @@
typedef BOOL (WINAPI *pfn_SymInitialize)(HANDLE, PCTSTR, BOOL);
typedef BOOL (WINAPI *pfn_SymGetSymFromAddr64)(HANDLE, DWORD64, PDWORD64, PIMAGEHLP_SYMBOL64);
typedef DWORD (WINAPI *pfn_UndecorateSymbolName)(const char*, char*, DWORD, DWORD);
+typedef BOOL (WINAPI *pfn_SymSetSearchPath)(HANDLE, PCTSTR);
+typedef BOOL (WINAPI *pfn_SymGetSearchPath)(HANDLE, PTSTR, int);
class WindowsDecoder : public AbstractDecoder {
--- a/hotspot/src/os/windows/vm/os_windows.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -182,7 +182,7 @@
if (!getenv("_ALT_JAVA_HOME_DIR", home_dir, MAX_PATH)) {
os::jvm_path(home_dir, sizeof(home_dir));
- // Found the full path to jvm[_g].dll.
+ // Found the full path to jvm.dll.
// Now cut the path to <java_home>/jre if we can.
*(strrchr(home_dir, '\\')) = '\0'; /* get rid of \jvm.dll */
pslash = strrchr(home_dir, '\\');
@@ -1715,7 +1715,7 @@
static char saved_jvm_path[MAX_PATH] = {0};
-// Find the full path to the current module, jvm.dll or jvm_g.dll
+// Find the full path to the current module, jvm.dll
void os::jvm_path(char *buf, jint buflen) {
// Error checking.
if (buflen < MAX_PATH) {
@@ -1874,8 +1874,22 @@
}
return TRUE;
break;
+ case CTRL_LOGOFF_EVENT: {
+ // Don't terminate JVM if it is running in a non-interactive session,
+ // such as a service process.
+ USEROBJECTFLAGS flags;
+ HANDLE handle = GetProcessWindowStation();
+ if (handle != NULL &&
+ GetUserObjectInformation(handle, UOI_FLAGS, &flags,
+ sizeof( USEROBJECTFLAGS), NULL)) {
+ // If it is a non-interactive session, let next handler to deal
+ // with it.
+ if ((flags.dwFlags & WSF_VISIBLE) == 0) {
+ return FALSE;
+ }
+ }
+ }
case CTRL_CLOSE_EVENT:
- case CTRL_LOGOFF_EVENT:
case CTRL_SHUTDOWN_EVENT:
os::signal_raise(SIGTERM);
return TRUE;
@@ -2946,7 +2960,7 @@
}
if( Verbose && PrintMiscellaneous ) {
reserveTimer.stop();
- tty->print_cr("reserve_memory of %Ix bytes took %ld ms (%ld ticks)", bytes,
+ tty->print_cr("reserve_memory of %Ix bytes took " JLONG_FORMAT " ms (" JLONG_FORMAT " ticks)", bytes,
reserveTimer.milliseconds(), reserveTimer.ticks());
}
}
@@ -4305,7 +4319,7 @@
if (hFile == NULL) {
if (PrintMiscellaneous && Verbose) {
DWORD err = GetLastError();
- tty->print_cr("CreateFile() failed: GetLastError->%ld.");
+ tty->print_cr("CreateFile() failed: GetLastError->%ld.", err);
}
return NULL;
}
@@ -4355,7 +4369,7 @@
if (hMap == NULL) {
if (PrintMiscellaneous && Verbose) {
DWORD err = GetLastError();
- tty->print_cr("CreateFileMapping() failed: GetLastError->%ld.");
+ tty->print_cr("CreateFileMapping() failed: GetLastError->%ld.", err);
}
CloseHandle(hFile);
return NULL;
@@ -4565,6 +4579,7 @@
}
v = _Event ;
_Event = 0 ;
+ // see comment at end of os::PlatformEvent::park() below:
OrderAccess::fence() ;
// If we encounter a nearly simultanous timeout expiry and unpark()
// we return OS_OK indicating we awoke via unpark().
@@ -4602,25 +4617,25 @@
void os::PlatformEvent::unpark() {
guarantee (_ParkHandle != NULL, "Invariant") ;
- int v ;
- for (;;) {
- v = _Event ; // Increment _Event if it's < 1.
- if (v > 0) {
- // If it's already signaled just return.
- // The LD of _Event could have reordered or be satisfied
- // by a read-aside from this processor's write buffer.
- // To avoid problems execute a barrier and then
- // ratify the value. A degenerate CAS() would also work.
- // Viz., CAS (v+0, &_Event, v) == v).
- OrderAccess::fence() ;
- if (_Event == v) return ;
- continue ;
- }
- if (Atomic::cmpxchg (v+1, &_Event, v) == v) break ;
- }
- if (v < 0) {
- ::SetEvent (_ParkHandle) ;
- }
+
+ // Transitions for _Event:
+ // 0 :=> 1
+ // 1 :=> 1
+ // -1 :=> either 0 or 1; must signal target thread
+ // That is, we can safely transition _Event from -1 to either
+ // 0 or 1. Forcing 1 is slightly more efficient for back-to-back
+ // unpark() calls.
+ // See also: "Semaphores in Plan 9" by Mullender & Cox
+ //
+ // Note: Forcing a transition from "-1" to "1" on an unpark() means
+ // that it will take two back-to-back park() calls for the owning
+ // thread to block. This has the benefit of forcing a spurious return
+ // from the first park() call after an unpark() call which will help
+ // shake out uses of park() and unpark() without condition variables.
+
+ if (Atomic::xchg(1, &_Event) >= 0) return;
+
+ ::SetEvent(_ParkHandle);
}
--- a/hotspot/src/os/windows/vm/os_windows.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os/windows/vm/os_windows.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,6 @@
inline const char* os::path_separator() { return ";"; }
inline const char* os::dll_file_extension() { return ".dll"; }
-inline const char* os::jlong_format_specifier() { return "%I64d"; }
-inline const char* os::julong_format_specifier() { return "%I64u"; }
-
inline const int os::default_file_open_flags() { return O_BINARY | O_NOINHERIT;}
// File names are case-insensitive on windows only
--- a/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,37 +29,26 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
\
/******************************/ \
/* Threads (NOTE: incomplete) */ \
/******************************/ \
nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
- nonstatic_field(OSThread, _pthread_id, pthread_t) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ nonstatic_field(OSThread, _pthread_id, pthread_t)
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
\
/**********************/ \
/* Posix Thread IDs */ \
/**********************/ \
\
declare_unsigned_integer_type(OSThread::thread_id_t) \
- declare_unsigned_integer_type(pthread_t) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ declare_unsigned_integer_type(pthread_t)
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
--- a/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -30,21 +30,13 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
--- a/hotspot/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,7 +29,7 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
\
/******************************/ \
/* Threads (NOTE: incomplete) */ \
@@ -37,38 +37,27 @@
\
nonstatic_field(JavaThread, _base_of_stack_pointer, intptr_t*) \
nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
- nonstatic_field(OSThread, _pthread_id, pthread_t) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ nonstatic_field(OSThread, _pthread_id, pthread_t)
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
\
/**********************/ \
/* POSIX Thread IDs */ \
/**********************/ \
\
declare_integer_type(OSThread::thread_id_t) \
- declare_unsigned_integer_type(pthread_t) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ declare_unsigned_integer_type(pthread_t)
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
\
/************************/ \
/* JavaThread constants */ \
/************************/ \
\
- declare_constant(JavaFrameAnchor::flushed) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ declare_constant(JavaFrameAnchor::flushed)
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP
--- a/hotspot/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,37 +29,26 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
\
/******************************/ \
/* Threads (NOTE: incomplete) */ \
/******************************/ \
nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
- nonstatic_field(OSThread, _pthread_id, pthread_t) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ nonstatic_field(OSThread, _pthread_id, pthread_t)
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
\
/**********************/ \
/* Posix Thread IDs */ \
/**********************/ \
\
declare_integer_type(OSThread::thread_id_t) \
- declare_unsigned_integer_type(pthread_t) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ declare_unsigned_integer_type(pthread_t)
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
--- a/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -30,21 +30,12 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- /* This must be the last entry, and must be present */ \
- last_entry()
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP
--- a/hotspot/src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,44 +29,32 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
\
/******************************/ \
/* Threads (NOTE: incomplete) */ \
/******************************/ \
\
nonstatic_field(JavaThread, _base_of_stack_pointer, intptr_t*) \
- nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
\
/**********************/ \
/* Solaris Thread IDs */ \
/**********************/ \
\
- declare_unsigned_integer_type(OSThread::thread_id_t) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ declare_unsigned_integer_type(OSThread::thread_id_t)
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
\
/************************/ \
/* JavaThread constants */ \
/************************/ \
\
- declare_constant(JavaFrameAnchor::flushed) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ declare_constant(JavaFrameAnchor::flushed)
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP
--- a/hotspot/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,36 +29,24 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
\
/******************************/ \
/* Threads (NOTE: incomplete) */ \
/******************************/ \
\
- nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t)
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
\
/**********************/ \
/* Solaris Thread IDs */ \
/**********************/ \
\
- declare_unsigned_integer_type(OSThread::thread_id_t) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ declare_unsigned_integer_type(OSThread::thread_id_t)
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP
--- a/hotspot/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,32 +29,21 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
\
/******************************/ \
/* Threads (NOTE: incomplete) */ \
/******************************/ \
\
nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
- unchecked_nonstatic_field(OSThread, _thread_handle, sizeof(HANDLE)) /* NOTE: no type */ \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ unchecked_nonstatic_field(OSThread, _thread_handle, sizeof(HANDLE)) /* NOTE: no type */
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
\
- declare_unsigned_integer_type(OSThread::thread_id_t) \
- /* This must be the last entry, and must be present */ \
- last_entry()
+ declare_unsigned_integer_type(OSThread::thread_id_t)
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
#endif // OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP
--- a/hotspot/src/share/tools/ProjectCreator/ProjectCreator.java Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/tools/ProjectCreator/ProjectCreator.java Thu Jan 31 10:22:25 2013 -0800
@@ -36,7 +36,7 @@
+ "into .dsp file, substituting for path given in "
+ "-sourceBase. Example: HotSpotWorkSpace>");
System.err.println(" -dllLoc <path to directory in which to put "
- + "jvm.dll and jvm_g.dll; no trailing slash>");
+ + "jvm.dll; no trailing slash>");
System.err.println(" If any of the above are specified, "
+ "they must all be.");
System.err.println(" Additional, optional arguments, which can be "
--- a/hotspot/src/share/tools/launcher/java.c Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/tools/launcher/java.c Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -808,7 +808,7 @@
static int
parse_stack_size(const char *s, jlong *result) {
jlong n = 0;
- int args_read = sscanf(s, jlong_format_specifier(), &n);
+ int args_read = sscanf(s, JLONG_FORMAT, &n);
if (args_read != 1) {
return 0;
}
--- a/hotspot/src/share/tools/launcher/java.h Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/tools/launcher/java.h Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,6 @@
jboolean RemovableMachineDependentOption(char * option);
void PrintMachineDependentOptions();
-const char *jlong_format_specifier();
/*
* Block current thread and continue execution in new thread
*/
--- a/hotspot/src/share/vm/adlc/formssel.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/adlc/formssel.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -862,8 +862,10 @@
( strcmp(_matrule->_rChild->_opType,"AryEq" )==0 ||
strcmp(_matrule->_rChild->_opType,"StrComp" )==0 ||
strcmp(_matrule->_rChild->_opType,"StrEquals" )==0 ||
- strcmp(_matrule->_rChild->_opType,"StrIndexOf")==0 )) {
+ strcmp(_matrule->_rChild->_opType,"StrIndexOf")==0 ||
+ strcmp(_matrule->_rChild->_opType,"EncodeISOArray")==0)) {
// String.(compareTo/equals/indexOf) and Arrays.equals
+ // and sun.nio.cs.iso8859_1$Encoder.EncodeISOArray
// take 1 control and 1 memory edges.
return 2;
}
--- a/hotspot/src/share/vm/asm/assembler.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/asm/assembler.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -216,8 +216,6 @@
bool isByte(int x) const { return 0 <= x && x < 0x100; }
bool isShiftCount(int x) const { return 0 <= x && x < 32; }
- void emit_long(jint x) { emit_int32(x); } // deprecated
-
// Instruction boundaries (required when emitting relocatable values).
class InstructionMark: public StackObj {
private:
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -3223,7 +3223,12 @@
}
if (try_inline_full(callee, holder_known, bc, receiver))
return true;
- print_inlining(callee, _inline_bailout_msg, /*success*/ false);
+
+ // Entire compilation could fail during try_inline_full call.
+ // In that case printing inlining decision info is useless.
+ if (!bailed_out())
+ print_inlining(callee, _inline_bailout_msg, /*success*/ false);
+
return false;
}
@@ -3753,7 +3758,8 @@
push_scope(callee, cont);
// the BlockListBuilder for the callee could have bailed out
- CHECK_BAILOUT_(false);
+ if (bailed_out())
+ return false;
// Temporarily set up bytecode stream so we can append instructions
// (only using the bci of this stream)
@@ -3819,7 +3825,8 @@
iterate_all_blocks(callee_start_block == NULL);
// If we bailed out during parsing, return immediately (this is bad news)
- if (bailed_out()) return false;
+ if (bailed_out())
+ return false;
// iterate_all_blocks theoretically traverses in random order; in
// practice, we have only traversed the continuation if we are
@@ -3828,9 +3835,6 @@
!continuation()->is_set(BlockBegin::was_visited_flag),
"continuation should not have been parsed yet if we created it");
- // If we bailed out during parsing, return immediately (this is bad news)
- CHECK_BAILOUT_(false);
-
// At this point we are almost ready to return and resume parsing of
// the caller back in the GraphBuilder. The only thing we want to do
// first is an optimization: during parsing of the callee we
@@ -4171,7 +4175,10 @@
else
log->inline_success("receiver is statically known");
} else {
- log->inline_fail(msg);
+ if (msg != NULL)
+ log->inline_fail(msg);
+ else
+ log->inline_fail("reason unknown");
}
}
--- a/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -360,7 +360,7 @@
ValueType* t = x->type();
switch (t->tag()) {
case intTag : output()->print("%d" , t->as_IntConstant ()->value()); break;
- case longTag : output()->print(os::jlong_format_specifier(), t->as_LongConstant()->value()); output()->print("L"); break;
+ case longTag : output()->print(JLONG_FORMAT, t->as_LongConstant()->value()); output()->print("L"); break;
case floatTag : output()->print("%g" , t->as_FloatConstant ()->value()); break;
case doubleTag : output()->print("%gD" , t->as_DoubleConstant()->value()); break;
case objectTag : print_object(x); break;
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_LIR.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1563,7 +1563,7 @@
switch (type()) {
case T_ADDRESS:out->print("address:%d",as_jint()); break;
case T_INT: out->print("int:%d", as_jint()); break;
- case T_LONG: out->print("lng:%lld", as_jlong()); break;
+ case T_LONG: out->print("lng:" JLONG_FORMAT, as_jlong()); break;
case T_FLOAT: out->print("flt:%f", as_jfloat()); break;
case T_DOUBLE: out->print("dbl:%f", as_jdouble()); break;
case T_OBJECT: out->print("obj:0x%x", as_jobject()); break;
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_LIR.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -2259,7 +2259,7 @@
typedef enum { inputMode, firstMode = inputMode, tempMode, outputMode, numModes, invalidMode = -1 } OprMode;
enum {
- maxNumberOfOperands = 16,
+ maxNumberOfOperands = 20,
maxNumberOfInfos = 4
};
--- a/hotspot/src/share/vm/c1/c1_globals.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_globals.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -147,7 +147,7 @@
"Inline methods containing exception handlers " \
"(NOTE: does not work with current backend)") \
\
- develop(bool, InlineSynchronizedMethods, true, \
+ product(bool, InlineSynchronizedMethods, true, \
"Inline synchronized methods") \
\
develop(bool, InlineNIOCheckIndex, true, \
--- a/hotspot/src/share/vm/ci/ciReplay.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/ci/ciReplay.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -645,7 +645,7 @@
java_mirror->bool_field_put(fd.offset(), value);
} else if (strcmp(field_signature, "J") == 0) {
jlong value;
- if (sscanf(string_value, INT64_FORMAT, &value) != 1) {
+ if (sscanf(string_value, JLONG_FORMAT, &value) != 1) {
fprintf(stderr, "Error parsing long: %s\n", string_value);
return;
}
--- a/hotspot/src/share/vm/ci/ciType.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/ci/ciType.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -60,6 +60,19 @@
}
// ------------------------------------------------------------------
+// ciType::name
+//
+// Return the name of this type
+const char* ciType::name() {
+ if (is_primitive_type()) {
+ return type2name(basic_type());
+ } else {
+ assert(is_klass(), "must be");
+ return as_klass()->name()->as_utf8();
+ }
+}
+
+// ------------------------------------------------------------------
// ciType::print_impl
//
// Implementation of the print method.
@@ -73,7 +86,8 @@
//
// Print the name of this type
void ciType::print_name_on(outputStream* st) {
- st->print(type2name(basic_type()));
+ ResourceMark rm;
+ st->print(name());
}
--- a/hotspot/src/share/vm/ci/ciType.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/ci/ciType.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -77,6 +77,7 @@
bool is_type() const { return true; }
bool is_classless() const { return is_primitive_type(); }
+ const char* name();
virtual void print_name_on(outputStream* st);
void print_name() {
print_name_on(tty);
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,7 @@
#include "services/classLoadingService.hpp"
#include "services/threadService.hpp"
#include "utilities/array.hpp"
+#include "utilities/globalDefinitions.hpp"
// We generally try to create the oops directly when parsing, rather than
// allocating temporary data structures and copying the bytes twice. A
@@ -906,6 +907,7 @@
bool* is_synthetic_addr,
u2* generic_signature_index_addr,
AnnotationArray** field_annotations,
+ AnnotationArray** field_type_annotations,
ClassFileParser::FieldAnnotationCollector* parsed_annotations,
TRAPS) {
ClassFileStream* cfs = stream();
@@ -917,6 +919,10 @@
int runtime_visible_annotations_length = 0;
u1* runtime_invisible_annotations = NULL;
int runtime_invisible_annotations_length = 0;
+ u1* runtime_visible_type_annotations = NULL;
+ int runtime_visible_type_annotations_length = 0;
+ u1* runtime_invisible_type_annotations = NULL;
+ int runtime_invisible_type_annotations_length = 0;
while (attributes_count--) {
cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length
u2 attribute_name_index = cfs->get_u2_fast();
@@ -965,12 +971,28 @@
runtime_visible_annotations_length = attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
assert(runtime_visible_annotations != NULL, "null visible annotations");
+ parse_annotations(loader_data,
+ runtime_visible_annotations,
+ runtime_visible_annotations_length,
+ cp,
+ parsed_annotations,
+ CHECK);
cfs->skip_u1(runtime_visible_annotations_length, CHECK);
} else if (PreserveAllAnnotations && attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
runtime_invisible_annotations_length = attribute_length;
runtime_invisible_annotations = cfs->get_u1_buffer();
assert(runtime_invisible_annotations != NULL, "null invisible annotations");
cfs->skip_u1(runtime_invisible_annotations_length, CHECK);
+ } else if (attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) {
+ runtime_visible_type_annotations_length = attribute_length;
+ runtime_visible_type_annotations = cfs->get_u1_buffer();
+ assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
+ cfs->skip_u1(runtime_visible_type_annotations_length, CHECK);
+ } else if (PreserveAllAnnotations && attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) {
+ runtime_invisible_type_annotations_length = attribute_length;
+ runtime_invisible_type_annotations = cfs->get_u1_buffer();
+ assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
+ cfs->skip_u1(runtime_invisible_type_annotations_length, CHECK);
} else {
cfs->skip_u1(attribute_length, CHECK); // Skip unknown attributes
}
@@ -988,6 +1010,12 @@
runtime_invisible_annotations,
runtime_invisible_annotations_length,
CHECK);
+ *field_type_annotations = assemble_annotations(loader_data,
+ runtime_visible_type_annotations,
+ runtime_visible_type_annotations_length,
+ runtime_invisible_type_annotations,
+ runtime_invisible_type_annotations_length,
+ CHECK);
return;
}
@@ -1084,6 +1112,7 @@
bool is_interface,
FieldAllocationCount *fac,
Array<AnnotationArray*>** fields_annotations,
+ Array<AnnotationArray*>** fields_type_annotations,
u2* java_fields_count_ptr, TRAPS) {
ClassFileStream* cfs = stream();
cfs->guarantee_more(2, CHECK_NULL); // length
@@ -1119,6 +1148,7 @@
THREAD, u2, total_fields * (FieldInfo::field_slots + 1));
AnnotationArray* field_annotations = NULL;
+ AnnotationArray* field_type_annotations = NULL;
// The generic signature slots start after all other fields' data.
int generic_signature_slot = total_fields * FieldInfo::field_slots;
int num_generic_signature = 0;
@@ -1160,7 +1190,7 @@
cp, attributes_count, is_static, signature_index,
&constantvalue_index, &is_synthetic,
&generic_signature_index, &field_annotations,
- &parsed_annotations,
+ &field_type_annotations, &parsed_annotations,
CHECK_NULL);
if (field_annotations != NULL) {
if (*fields_annotations == NULL) {
@@ -1170,6 +1200,14 @@
}
(*fields_annotations)->at_put(n, field_annotations);
}
+ if (field_type_annotations != NULL) {
+ if (*fields_type_annotations == NULL) {
+ *fields_type_annotations = MetadataFactory::new_array<AnnotationArray*>(
+ loader_data, length, NULL,
+ CHECK_NULL);
+ }
+ (*fields_type_annotations)->at_put(n, field_type_annotations);
+ }
if (is_synthetic) {
access_flags.set_is_synthetic();
}
@@ -1185,19 +1223,16 @@
field->initialize(access_flags.as_short(),
name_index,
signature_index,
- constantvalue_index,
- 0);
- if (parsed_annotations.has_any_annotations())
- parsed_annotations.apply_to(field);
-
+ constantvalue_index);
BasicType type = cp->basic_type_for_signature_at(signature_index);
// Remember how many oops we encountered and compute allocation type
FieldAllocationType atype = fac->update(is_static, type);
-
- // The correct offset is computed later (all oop fields will be located together)
- // We temporarily store the allocation type in the offset field
- field->set_offset(atype);
+ field->set_allocation_type(atype);
+
+ // After field is initialized with type, we can augment it with aux info
+ if (parsed_annotations.has_any_annotations())
+ parsed_annotations.apply_to(field);
}
int index = length;
@@ -1228,17 +1263,13 @@
field->initialize(JVM_ACC_FIELD_INTERNAL,
injected[n].name_index,
injected[n].signature_index,
- 0,
0);
BasicType type = FieldType::basic_type(injected[n].signature());
// Remember how many oops we encountered and compute allocation type
FieldAllocationType atype = fac->update(false, type);
-
- // The correct offset is computed later (all oop fields will be located together)
- // We temporarily store the allocation type in the offset field
- field->set_offset(atype);
+ field->set_allocation_type(atype);
index++;
}
}
@@ -1704,7 +1735,8 @@
}
// Sift through annotations, looking for those significant to the VM:
-void ClassFileParser::parse_annotations(u1* buffer, int limit,
+void ClassFileParser::parse_annotations(ClassLoaderData* loader_data,
+ u1* buffer, int limit,
constantPoolHandle cp,
ClassFileParser::AnnotationCollector* coll,
TRAPS) {
@@ -1721,9 +1753,12 @@
e_type_off = 7, // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;'
e_con_off = 9, // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME'
e_size = 11, // end of 'e' annotation
- c_tag_val = 'c',
- c_con_off = 7, // utf8 payload, such as 'I' or 'Ljava/lang/String;'
+ c_tag_val = 'c', // payload is type
+ c_con_off = 7, // utf8 payload, such as 'I'
c_size = 9, // end of 'c' annotation
+ s_tag_val = 's', // payload is String
+ s_con_off = 7, // utf8 payload, such as 'Ljava/lang/String;'
+ s_size = 9,
min_size = 6 // smallest possible size (zero members)
};
while ((--nann) >= 0 && (index-2 + min_size <= limit)) {
@@ -1742,57 +1777,63 @@
}
// Here is where parsing particular annotations will take place.
- AnnotationCollector::ID id = coll->annotation_index(aname);
+ AnnotationCollector::ID id = coll->annotation_index(loader_data, aname);
if (id == AnnotationCollector::_unknown) continue;
coll->set_annotation(id);
- // If there are no values, just set the bit and move on:
- if (count == 0) continue;
-
- // For the record, here is how annotation payloads can be collected.
- // Suppose we want to capture @Retention.value. Here is how:
- //if (id == AnnotationCollector::_class_Retention) {
- // Symbol* payload = NULL;
- // if (count == 1
- // && e_size == (index0 - index) // match size
- // && e_tag_val == *(abase + tag_off)
- // && (check_symbol_at(cp, Bytes::get_Java_u2(abase + e_type_off))
- // == vmSymbols::RetentionPolicy_signature())
- // && member == vmSymbols::value_name()) {
- // payload = check_symbol_at(cp, Bytes::get_Java_u2(abase + e_con_off));
- // }
- // check_property(payload != NULL,
- // "Invalid @Retention annotation at offset %u in class file %s",
- // index0, CHECK);
- // if (payload != NULL) {
- // payload->increment_refcount();
- // coll->_class_RetentionPolicy = payload;
- // }
- //}
+
+ if (id == AnnotationCollector::_sun_misc_Contended) {
+ if (count == 1
+ && s_size == (index - index0) // match size
+ && s_tag_val == *(abase + tag_off)
+ && member == vmSymbols::value_name()) {
+ u2 group_index = Bytes::get_Java_u2(abase + s_con_off);
+ coll->set_contended_group(group_index);
+ } else {
+ coll->set_contended_group(0); // default contended group
+ }
+ coll->set_contended(true);
+ } else {
+ coll->set_contended(false);
+ }
}
}
-ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Symbol* name) {
+ClassFileParser::AnnotationCollector::ID
+ClassFileParser::AnnotationCollector::annotation_index(ClassLoaderData* loader_data,
+ Symbol* name) {
vmSymbols::SID sid = vmSymbols::find_sid(name);
+ // Privileged code can use all annotations. Other code silently drops some.
+ bool privileged = loader_data->is_the_null_class_loader_data() ||
+ loader_data->is_anonymous();
switch (sid) {
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
if (_location != _in_method) break; // only allow for methods
+ if (!privileged) break; // only allow in privileged code
return _method_ForceInline;
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature):
if (_location != _in_method) break; // only allow for methods
+ if (!privileged) break; // only allow in privileged code
return _method_DontInline;
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature):
if (_location != _in_method) break; // only allow for methods
+ if (!privileged) break; // only allow in privileged code
return _method_LambdaForm_Compiled;
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature):
if (_location != _in_method) break; // only allow for methods
+ if (!privileged) break; // only allow in privileged code
return _method_LambdaForm_Hidden;
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_misc_Contended_signature):
+ if (_location != _in_field && _location != _in_class) break; // only allow for fields and classes
+ if (!EnableContended || (RestrictContended && !privileged)) break; // honor privileges
+ return _sun_misc_Contended;
default: break;
}
return AnnotationCollector::_unknown;
}
void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) {
- fatal("no field annotations yet");
+ if (is_contended())
+ f->set_contended_group(contended_group());
}
void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) {
@@ -1807,7 +1848,7 @@
}
void ClassFileParser::ClassAnnotationCollector::apply_to(instanceKlassHandle k) {
- fatal("no class annotations yet");
+ k->set_is_contended(is_contended());
}
@@ -1831,6 +1872,7 @@
AnnotationArray** method_annotations,
AnnotationArray** method_parameter_annotations,
AnnotationArray** method_default_annotations,
+ AnnotationArray** method_type_annotations,
TRAPS) {
ClassFileStream* cfs = stream();
methodHandle nullHandle;
@@ -1903,6 +1945,8 @@
u2** localvariable_table_start;
u2* localvariable_type_table_length;
u2** localvariable_type_table_start;
+ u2 method_parameters_length = 0;
+ u1* method_parameters_data = NULL;
bool parsed_code_attribute = false;
bool parsed_checked_exceptions_attribute = false;
bool parsed_stackmap_attribute = false;
@@ -1918,6 +1962,10 @@
int runtime_visible_parameter_annotations_length = 0;
u1* runtime_invisible_parameter_annotations = NULL;
int runtime_invisible_parameter_annotations_length = 0;
+ u1* runtime_visible_type_annotations = NULL;
+ int runtime_visible_type_annotations_length = 0;
+ u1* runtime_invisible_type_annotations = NULL;
+ int runtime_invisible_type_annotations_length = 0;
u1* annotation_default = NULL;
int annotation_default_length = 0;
@@ -2108,6 +2156,26 @@
parse_checked_exceptions(&checked_exceptions_length,
method_attribute_length,
cp, CHECK_(nullHandle));
+ } else if (method_attribute_name == vmSymbols::tag_method_parameters()) {
+ method_parameters_length = cfs->get_u1_fast();
+ // Track the actual size (note: this is written for clarity; a
+ // decent compiler will CSE and constant-fold this into a single
+ // expression)
+ u2 actual_size = 1;
+ method_parameters_data = cfs->get_u1_buffer();
+ actual_size += 2 * method_parameters_length;
+ cfs->skip_u2_fast(method_parameters_length);
+ actual_size += 4 * method_parameters_length;
+ cfs->skip_u4_fast(method_parameters_length);
+ // Enforce attribute length
+ if (method_attribute_length != actual_size) {
+ classfile_parse_error(
+ "Invalid MethodParameters method attribute length %u in class file %s",
+ method_attribute_length, CHECK_(nullHandle));
+ }
+ // ignore this attribute if it cannot be reflected
+ if (!SystemDictionary::Parameter_klass_loaded())
+ method_parameters_length = 0;
} else if (method_attribute_name == vmSymbols::tag_synthetic()) {
if (method_attribute_length != 0) {
classfile_parse_error(
@@ -2135,7 +2203,8 @@
runtime_visible_annotations_length = method_attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
assert(runtime_visible_annotations != NULL, "null visible annotations");
- parse_annotations(runtime_visible_annotations,
+ parse_annotations(loader_data,
+ runtime_visible_annotations,
runtime_visible_annotations_length, cp, &parsed_annotations,
CHECK_(nullHandle));
cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle));
@@ -2159,6 +2228,17 @@
annotation_default = cfs->get_u1_buffer();
assert(annotation_default != NULL, "null annotation default");
cfs->skip_u1(annotation_default_length, CHECK_(nullHandle));
+ } else if (method_attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) {
+ runtime_visible_type_annotations_length = method_attribute_length;
+ runtime_visible_type_annotations = cfs->get_u1_buffer();
+ assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
+ // No need for the VM to parse Type annotations
+ cfs->skip_u1(runtime_visible_type_annotations_length, CHECK_(nullHandle));
+ } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_type_annotations()) {
+ runtime_invisible_type_annotations_length = method_attribute_length;
+ runtime_invisible_type_annotations = cfs->get_u1_buffer();
+ assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
+ cfs->skip_u1(runtime_invisible_type_annotations_length, CHECK_(nullHandle));
} else {
// Skip unknown attributes
cfs->skip_u1(method_attribute_length, CHECK_(nullHandle));
@@ -2184,7 +2264,8 @@
Method* m = Method::allocate(
loader_data, code_length, access_flags, linenumber_table_length,
total_lvt_length, exception_table_length, checked_exceptions_length,
- generic_signature_index, ConstMethod::NORMAL, CHECK_(nullHandle));
+ method_parameters_length, generic_signature_index,
+ ConstMethod::NORMAL, CHECK_(nullHandle));
ClassLoadingService::add_class_method_size(m->size()*HeapWordSize);
@@ -2232,6 +2313,21 @@
exception_table_start, size);
}
+ // Copy method parameters
+ if (method_parameters_length > 0) {
+ MethodParametersElement* elem = m->constMethod()->method_parameters_start();
+ for(int i = 0; i < method_parameters_length; i++) {
+ elem[i].name_cp_index =
+ Bytes::get_Java_u2(method_parameters_data);
+ method_parameters_data += 2;
+ u4 flags = Bytes::get_Java_u4(method_parameters_data);
+ // This caused an alignment fault on Sparc, if flags was a u4
+ elem[i].flags_lo = extract_low_short_from_int(flags);
+ elem[i].flags_hi = extract_high_short_from_int(flags);
+ method_parameters_data += 4;
+ }
+ }
+
// Copy checked exceptions
if (checked_exceptions_length > 0) {
int size = checked_exceptions_length * sizeof(CheckedExceptionElement) / sizeof(u2);
@@ -2333,6 +2429,12 @@
NULL,
0,
CHECK_(nullHandle));
+ *method_type_annotations = assemble_annotations(loader_data,
+ runtime_visible_type_annotations,
+ runtime_visible_type_annotations_length,
+ runtime_invisible_type_annotations,
+ runtime_invisible_type_annotations_length,
+ CHECK_(nullHandle));
if (name == vmSymbols::finalize_method_name() &&
signature == vmSymbols::void_method_signature()) {
@@ -2364,12 +2466,14 @@
Array<AnnotationArray*>** methods_annotations,
Array<AnnotationArray*>** methods_parameter_annotations,
Array<AnnotationArray*>** methods_default_annotations,
+ Array<AnnotationArray*>** methods_type_annotations,
bool* has_default_methods,
TRAPS) {
ClassFileStream* cfs = stream();
AnnotationArray* method_annotations = NULL;
AnnotationArray* method_parameter_annotations = NULL;
AnnotationArray* method_default_annotations = NULL;
+ AnnotationArray* method_type_annotations = NULL;
cfs->guarantee_more(2, CHECK_NULL); // length
u2 length = cfs->get_u2_fast();
if (length == 0) {
@@ -2386,6 +2490,7 @@
&method_annotations,
&method_parameter_annotations,
&method_default_annotations,
+ &method_type_annotations,
CHECK_NULL);
if (method->is_final()) {
@@ -2396,22 +2501,40 @@
*has_default_methods = true;
}
methods->at_put(index, method());
- if (*methods_annotations == NULL) {
- *methods_annotations =
- MetadataFactory::new_array<AnnotationArray*>(loader_data, length, NULL, CHECK_NULL);
+
+ if (method_annotations != NULL) {
+ if (*methods_annotations == NULL) {
+ *methods_annotations =
+ MetadataFactory::new_array<AnnotationArray*>(loader_data, length, NULL, CHECK_NULL);
+ }
+ (*methods_annotations)->at_put(index, method_annotations);
+ }
+
+ if (method_parameter_annotations != NULL) {
+ if (*methods_parameter_annotations == NULL) {
+ *methods_parameter_annotations =
+ MetadataFactory::new_array<AnnotationArray*>(loader_data, length, NULL, CHECK_NULL);
+ }
+ (*methods_parameter_annotations)->at_put(index, method_parameter_annotations);
}
- (*methods_annotations)->at_put(index, method_annotations);
- if (*methods_parameter_annotations == NULL) {
- *methods_parameter_annotations =
- MetadataFactory::new_array<AnnotationArray*>(loader_data, length, NULL, CHECK_NULL);
+
+ if (method_default_annotations != NULL) {
+ if (*methods_default_annotations == NULL) {
+ *methods_default_annotations =
+ MetadataFactory::new_array<AnnotationArray*>(loader_data, length, NULL, CHECK_NULL);
+ }
+ (*methods_default_annotations)->at_put(index, method_default_annotations);
}
- (*methods_parameter_annotations)->at_put(index, method_parameter_annotations);
- if (*methods_default_annotations == NULL) {
- *methods_default_annotations =
- MetadataFactory::new_array<AnnotationArray*>(loader_data, length, NULL, CHECK_NULL);
+
+ if (method_type_annotations != NULL) {
+ if (*methods_type_annotations == NULL) {
+ *methods_type_annotations =
+ MetadataFactory::new_array<AnnotationArray*>(loader_data, length, NULL, CHECK_NULL);
+ }
+ (*methods_type_annotations)->at_put(index, method_type_annotations);
}
- (*methods_default_annotations)->at_put(index, method_default_annotations);
}
+
if (_need_verify && length > 1) {
// Check duplicated methods
ResourceMark rm(THREAD);
@@ -2445,6 +2568,7 @@
Array<AnnotationArray*>* methods_annotations,
Array<AnnotationArray*>* methods_parameter_annotations,
Array<AnnotationArray*>* methods_default_annotations,
+ Array<AnnotationArray*>* methods_type_annotations,
TRAPS) {
int length = methods->length();
// If JVMTI original method ordering or sharing is enabled we have to
@@ -2463,7 +2587,8 @@
// Note that the ordering is not alphabetical, see Symbol::fast_compare
Method::sort_methods(methods, methods_annotations,
methods_parameter_annotations,
- methods_default_annotations);
+ methods_default_annotations,
+ methods_type_annotations);
// If JVMTI original method ordering or sharing is enabled construct int
// array remembering the original ordering
@@ -2728,6 +2853,10 @@
int runtime_visible_annotations_length = 0;
u1* runtime_invisible_annotations = NULL;
int runtime_invisible_annotations_length = 0;
+ u1* runtime_visible_type_annotations = NULL;
+ int runtime_visible_type_annotations_length = 0;
+ u1* runtime_invisible_type_annotations = NULL;
+ int runtime_invisible_type_annotations_length = 0;
u1* inner_classes_attribute_start = NULL;
u4 inner_classes_attribute_length = 0;
u2 enclosing_method_class_index = 0;
@@ -2795,7 +2924,8 @@
runtime_visible_annotations_length = attribute_length;
runtime_visible_annotations = cfs->get_u1_buffer();
assert(runtime_visible_annotations != NULL, "null visible annotations");
- parse_annotations(runtime_visible_annotations,
+ parse_annotations(loader_data,
+ runtime_visible_annotations,
runtime_visible_annotations_length,
cp,
parsed_annotations,
@@ -2834,6 +2964,17 @@
classfile_parse_error("Multiple BootstrapMethods attributes in class file %s", CHECK);
parsed_bootstrap_methods_attribute = true;
parse_classfile_bootstrap_methods_attribute(loader_data, cp, attribute_length, CHECK);
+ } else if (tag == vmSymbols::tag_runtime_visible_type_annotations()) {
+ runtime_visible_type_annotations_length = attribute_length;
+ runtime_visible_type_annotations = cfs->get_u1_buffer();
+ assert(runtime_visible_type_annotations != NULL, "null visible type annotations");
+ // No need for the VM to parse Type annotations
+ cfs->skip_u1(runtime_visible_type_annotations_length, CHECK);
+ } else if (PreserveAllAnnotations && tag == vmSymbols::tag_runtime_invisible_type_annotations()) {
+ runtime_invisible_type_annotations_length = attribute_length;
+ runtime_invisible_type_annotations = cfs->get_u1_buffer();
+ assert(runtime_invisible_type_annotations != NULL, "null invisible type annotations");
+ cfs->skip_u1(runtime_invisible_type_annotations_length, CHECK);
} else {
// Unknown attribute
cfs->skip_u1(attribute_length, CHECK);
@@ -2850,6 +2991,13 @@
runtime_invisible_annotations_length,
CHECK);
set_class_annotations(annotations);
+ AnnotationArray* type_annotations = assemble_annotations(loader_data,
+ runtime_visible_type_annotations,
+ runtime_visible_type_annotations_length,
+ runtime_invisible_type_annotations,
+ runtime_invisible_type_annotations_length,
+ CHECK);
+ set_class_type_annotations(type_annotations);
if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) {
u2 num_of_classes = parse_classfile_inner_classes_attribute(
@@ -2956,6 +3104,7 @@
TempNewSymbol& parsed_name,
bool verify,
TRAPS) {
+
// When a retransformable agent is attached, JVMTI caches the
// class bytes that existed before the first retransformation.
// If RedefineClasses() was used before the retransformable
@@ -3190,18 +3339,20 @@
// Fields (offsets are filled in later)
FieldAllocationCount fac;
Array<AnnotationArray*>* fields_annotations = NULL;
+ Array<AnnotationArray*>* fields_type_annotations = NULL;
Array<u2>* fields = parse_fields(loader_data, class_name, cp, access_flags.is_interface(), &fac, &fields_annotations,
+ &fields_type_annotations,
&java_fields_count,
CHECK_(nullHandle));
// Methods
bool has_final_method = false;
AccessFlags promoted_flags;
promoted_flags.set_flags(0);
- // These need to be oop pointers because they are allocated lazily
- // inside parse_methods inside a nested HandleMark
+
Array<AnnotationArray*>* methods_annotations = NULL;
Array<AnnotationArray*>* methods_parameter_annotations = NULL;
Array<AnnotationArray*>* methods_default_annotations = NULL;
+ Array<AnnotationArray*>* methods_type_annotations = NULL;
Array<Method*>* methods = parse_methods(loader_data,
cp, access_flags.is_interface(),
&promoted_flags,
@@ -3209,6 +3360,7 @@
&methods_annotations,
&methods_parameter_annotations,
&methods_default_annotations,
+ &methods_type_annotations,
&has_default_methods,
CHECK_(nullHandle));
@@ -3270,6 +3422,7 @@
methods_annotations,
methods_parameter_annotations,
methods_default_annotations,
+ methods_type_annotations,
CHECK_(nullHandle));
// promote flags from parse_methods() to the klass' flags
@@ -3290,18 +3443,21 @@
// Size of Java itable (in words)
itable_size = access_flags.is_interface() ? 0 : klassItable::compute_itable_size(transitive_interfaces);
+ // get the padding width from the option
+ // TODO: Ask VM about specific CPU we are running on
+ int pad_size = ContendedPaddingWidth;
+
// Field size and offset computation
int nonstatic_field_size = super_klass() == NULL ? 0 : super_klass->nonstatic_field_size();
#ifndef PRODUCT
int orig_nonstatic_field_size = 0;
#endif
- int static_field_size = 0;
int next_static_oop_offset;
int next_static_double_offset;
int next_static_word_offset;
int next_static_short_offset;
int next_static_byte_offset;
- int next_static_type_offset;
+ int next_static_padded_offset;
int next_nonstatic_oop_offset;
int next_nonstatic_double_offset;
int next_nonstatic_word_offset;
@@ -3311,11 +3467,36 @@
int first_nonstatic_oop_offset;
int first_nonstatic_field_offset;
int next_nonstatic_field_offset;
+ int next_nonstatic_padded_offset;
+
+ // Count the contended fields by type.
+ int static_contended_count = 0;
+ int nonstatic_contended_count = 0;
+ FieldAllocationCount fac_contended;
+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+ FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
+ if (fs.is_contended()) {
+ fac_contended.count[atype]++;
+ if (fs.access_flags().is_static()) {
+ static_contended_count++;
+ } else {
+ nonstatic_contended_count++;
+ }
+ }
+ }
+ int contended_count = static_contended_count + nonstatic_contended_count;
+
// Calculate the starting byte offsets
next_static_oop_offset = InstanceMirrorKlass::offset_of_static_fields();
+
+ // class is contended, pad before all the fields
+ if (parsed_annotations.is_contended()) {
+ next_static_oop_offset += pad_size;
+ }
+
next_static_double_offset = next_static_oop_offset +
- (fac.count[STATIC_OOP] * heapOopSize);
+ ((fac.count[STATIC_OOP] - fac_contended.count[STATIC_OOP]) * heapOopSize);
if ( fac.count[STATIC_DOUBLE] &&
(Universe::field_type_should_be_aligned(T_DOUBLE) ||
Universe::field_type_should_be_aligned(T_LONG)) ) {
@@ -3323,25 +3504,29 @@
}
next_static_word_offset = next_static_double_offset +
- (fac.count[STATIC_DOUBLE] * BytesPerLong);
+ ((fac.count[STATIC_DOUBLE] - fac_contended.count[STATIC_DOUBLE]) * BytesPerLong);
next_static_short_offset = next_static_word_offset +
- (fac.count[STATIC_WORD] * BytesPerInt);
+ ((fac.count[STATIC_WORD] - fac_contended.count[STATIC_WORD]) * BytesPerInt);
next_static_byte_offset = next_static_short_offset +
- (fac.count[STATIC_SHORT] * BytesPerShort);
- next_static_type_offset = align_size_up((next_static_byte_offset +
- fac.count[STATIC_BYTE] ), wordSize );
- static_field_size = (next_static_type_offset -
- next_static_oop_offset) / wordSize;
+ ((fac.count[STATIC_SHORT] - fac_contended.count[STATIC_SHORT]) * BytesPerShort);
+ next_static_padded_offset = next_static_byte_offset +
+ ((fac.count[STATIC_BYTE] - fac_contended.count[STATIC_BYTE]) * 1);
first_nonstatic_field_offset = instanceOopDesc::base_offset_in_bytes() +
nonstatic_field_size * heapOopSize;
+
+ // class is contended, pad before all the fields
+ if (parsed_annotations.is_contended()) {
+ first_nonstatic_field_offset += pad_size;
+ }
+
next_nonstatic_field_offset = first_nonstatic_field_offset;
- unsigned int nonstatic_double_count = fac.count[NONSTATIC_DOUBLE];
- unsigned int nonstatic_word_count = fac.count[NONSTATIC_WORD];
- unsigned int nonstatic_short_count = fac.count[NONSTATIC_SHORT];
- unsigned int nonstatic_byte_count = fac.count[NONSTATIC_BYTE];
- unsigned int nonstatic_oop_count = fac.count[NONSTATIC_OOP];
+ unsigned int nonstatic_double_count = fac.count[NONSTATIC_DOUBLE] - fac_contended.count[NONSTATIC_DOUBLE];
+ unsigned int nonstatic_word_count = fac.count[NONSTATIC_WORD] - fac_contended.count[NONSTATIC_WORD];
+ unsigned int nonstatic_short_count = fac.count[NONSTATIC_SHORT] - fac_contended.count[NONSTATIC_SHORT];
+ unsigned int nonstatic_byte_count = fac.count[NONSTATIC_BYTE] - fac_contended.count[NONSTATIC_BYTE];
+ unsigned int nonstatic_oop_count = fac.count[NONSTATIC_OOP] - fac_contended.count[NONSTATIC_OOP];
bool super_has_nonstatic_fields =
(super_klass() != NULL && super_klass->has_nonstatic_fields());
@@ -3414,12 +3599,12 @@
}
if( allocation_style == 0 ) {
- // Fields order: oops, longs/doubles, ints, shorts/chars, bytes
+ // Fields order: oops, longs/doubles, ints, shorts/chars, bytes, padded fields
next_nonstatic_oop_offset = next_nonstatic_field_offset;
next_nonstatic_double_offset = next_nonstatic_oop_offset +
(nonstatic_oop_count * heapOopSize);
} else if( allocation_style == 1 ) {
- // Fields order: longs/doubles, ints, shorts/chars, bytes, oops
+ // Fields order: longs/doubles, ints, shorts/chars, bytes, oops, padded fields
next_nonstatic_double_offset = next_nonstatic_field_offset;
} else if( allocation_style == 2 ) {
// Fields allocation: oops fields in super and sub classes are together.
@@ -3498,27 +3683,33 @@
(nonstatic_word_count * BytesPerInt);
next_nonstatic_byte_offset = next_nonstatic_short_offset +
(nonstatic_short_count * BytesPerShort);
-
- int notaligned_offset;
- if( allocation_style == 0 ) {
- notaligned_offset = next_nonstatic_byte_offset + nonstatic_byte_count;
- } else { // allocation_style == 1
- next_nonstatic_oop_offset = next_nonstatic_byte_offset + nonstatic_byte_count;
+ next_nonstatic_padded_offset = next_nonstatic_byte_offset +
+ nonstatic_byte_count;
+
+ // let oops jump before padding with this allocation style
+ if( allocation_style == 1 ) {
+ next_nonstatic_oop_offset = next_nonstatic_padded_offset;
if( nonstatic_oop_count > 0 ) {
next_nonstatic_oop_offset = align_size_up(next_nonstatic_oop_offset, heapOopSize);
}
- notaligned_offset = next_nonstatic_oop_offset + (nonstatic_oop_count * heapOopSize);
+ next_nonstatic_padded_offset = next_nonstatic_oop_offset + (nonstatic_oop_count * heapOopSize);
}
- next_nonstatic_type_offset = align_size_up(notaligned_offset, heapOopSize );
- nonstatic_field_size = nonstatic_field_size + ((next_nonstatic_type_offset
- - first_nonstatic_field_offset)/heapOopSize);
// Iterate over fields again and compute correct offsets.
// The field allocation type was temporarily stored in the offset slot.
// oop fields are located before non-oop fields (static and non-static).
for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+
+ // skip already laid out fields
+ if (fs.is_offset_set()) continue;
+
+ // contended fields are handled below
+ if (fs.is_contended()) continue;
+
int real_offset;
- FieldAllocationType atype = (FieldAllocationType) fs.offset();
+ FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
+
+ // pack the rest of the fields
switch (atype) {
case STATIC_OOP:
real_offset = next_static_oop_offset;
@@ -3607,13 +3798,225 @@
fs.set_offset(real_offset);
}
+
+ // Handle the contended cases.
+ //
+ // Each contended field should not intersect the cache line with another contended field.
+ // In the absence of alignment information, we end up with pessimistically separating
+ // the fields with full-width padding.
+ //
+ // Additionally, this should not break alignment for the fields, so we round the alignment up
+ // for each field.
+ if (contended_count > 0) {
+
+ // if there is at least one contended field, we need to have pre-padding for them
+ if (nonstatic_contended_count > 0) {
+ next_nonstatic_padded_offset += pad_size;
+ }
+
+ // collect all contended groups
+ BitMap bm(cp->size());
+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+ // skip already laid out fields
+ if (fs.is_offset_set()) continue;
+
+ if (fs.is_contended()) {
+ bm.set_bit(fs.contended_group());
+ }
+ }
+
+ int current_group = -1;
+ while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) {
+
+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+
+ // skip already laid out fields
+ if (fs.is_offset_set()) continue;
+
+ // skip non-contended fields and fields from different group
+ if (!fs.is_contended() || (fs.contended_group() != current_group)) continue;
+
+ // handle statics below
+ if (fs.access_flags().is_static()) continue;
+
+ int real_offset;
+ FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
+
+ switch (atype) {
+ case NONSTATIC_BYTE:
+ next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, 1);
+ real_offset = next_nonstatic_padded_offset;
+ next_nonstatic_padded_offset += 1;
+ break;
+
+ case NONSTATIC_SHORT:
+ next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerShort);
+ real_offset = next_nonstatic_padded_offset;
+ next_nonstatic_padded_offset += BytesPerShort;
+ break;
+
+ case NONSTATIC_WORD:
+ next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerInt);
+ real_offset = next_nonstatic_padded_offset;
+ next_nonstatic_padded_offset += BytesPerInt;
+ break;
+
+ case NONSTATIC_DOUBLE:
+ next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerLong);
+ real_offset = next_nonstatic_padded_offset;
+ next_nonstatic_padded_offset += BytesPerLong;
+ break;
+
+ case NONSTATIC_OOP:
+ next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, heapOopSize);
+ real_offset = next_nonstatic_padded_offset;
+ next_nonstatic_padded_offset += heapOopSize;
+
+ // Create new oop map
+ nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
+ nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
+ nonstatic_oop_map_count += 1;
+ if( first_nonstatic_oop_offset == 0 ) { // Undefined
+ first_nonstatic_oop_offset = real_offset;
+ }
+ break;
+
+ default:
+ ShouldNotReachHere();
+ }
+
+ if (fs.contended_group() == 0) {
+ // Contended group defines the equivalence class over the fields:
+ // the fields within the same contended group are not inter-padded.
+ // The only exception is default group, which does not incur the
+ // equivalence, and so requires intra-padding.
+ next_nonstatic_padded_offset += pad_size;
+ }
+
+ fs.set_offset(real_offset);
+ } // for
+
+ // Start laying out the next group.
+ // Note that this will effectively pad the last group in the back;
+ // this is expected to alleviate memory contention effects for
+ // subclass fields and/or adjacent object.
+ // If this was the default group, the padding is already in place.
+ if (current_group != 0) {
+ next_nonstatic_padded_offset += pad_size;
+ }
+ }
+
+ // handle static fields
+
+ // if there is at least one contended field, we need to have pre-padding for them
+ if (static_contended_count > 0) {
+ next_static_padded_offset += pad_size;
+ }
+
+ current_group = -1;
+ while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) {
+
+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+
+ // skip already laid out fields
+ if (fs.is_offset_set()) continue;
+
+ // skip non-contended fields and fields from different group
+ if (!fs.is_contended() || (fs.contended_group() != current_group)) continue;
+
+ // non-statics already handled above
+ if (!fs.access_flags().is_static()) continue;
+
+ int real_offset;
+ FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
+
+ switch (atype) {
+
+ case STATIC_BYTE:
+ next_static_padded_offset = align_size_up(next_static_padded_offset, 1);
+ real_offset = next_static_padded_offset;
+ next_static_padded_offset += 1;
+ break;
+
+ case STATIC_SHORT:
+ next_static_padded_offset = align_size_up(next_static_padded_offset, BytesPerShort);
+ real_offset = next_static_padded_offset;
+ next_static_padded_offset += BytesPerShort;
+ break;
+
+ case STATIC_WORD:
+ next_static_padded_offset = align_size_up(next_static_padded_offset, BytesPerInt);
+ real_offset = next_static_padded_offset;
+ next_static_padded_offset += BytesPerInt;
+ break;
+
+ case STATIC_DOUBLE:
+ next_static_padded_offset = align_size_up(next_static_padded_offset, BytesPerLong);
+ real_offset = next_static_padded_offset;
+ next_static_padded_offset += BytesPerLong;
+ break;
+
+ case STATIC_OOP:
+ next_static_padded_offset = align_size_up(next_static_padded_offset, heapOopSize);
+ real_offset = next_static_padded_offset;
+ next_static_padded_offset += heapOopSize;
+ break;
+
+ default:
+ ShouldNotReachHere();
+ }
+
+ if (fs.contended_group() == 0) {
+ // Contended group defines the equivalence class over the fields:
+ // the fields within the same contended group are not inter-padded.
+ // The only exception is default group, which does not incur the
+ // equivalence, and so requires intra-padding.
+ next_static_padded_offset += pad_size;
+ }
+
+ fs.set_offset(real_offset);
+ } // for
+
+ // Start laying out the next group.
+ // Note that this will effectively pad the last group in the back;
+ // this is expected to alleviate memory contention effects for
+ // subclass fields and/or adjacent object.
+ // If this was the default group, the padding is already in place.
+ if (current_group != 0) {
+ next_static_padded_offset += pad_size;
+ }
+
+ }
+
+ } // handle contended
+
// Size of instances
int instance_size;
+ int notaligned_offset = next_nonstatic_padded_offset;
+
+ // Entire class is contended, pad in the back.
+ // This helps to alleviate memory contention effects for subclass fields
+ // and/or adjacent object.
+ if (parsed_annotations.is_contended()) {
+ notaligned_offset += pad_size;
+ next_static_padded_offset += pad_size;
+ }
+
+ int next_static_type_offset = align_size_up(next_static_padded_offset, wordSize);
+ int static_field_size = (next_static_type_offset -
+ InstanceMirrorKlass::offset_of_static_fields()) / wordSize;
+
+ next_nonstatic_type_offset = align_size_up(notaligned_offset, heapOopSize );
+ nonstatic_field_size = nonstatic_field_size + ((next_nonstatic_type_offset
+ - first_nonstatic_field_offset)/heapOopSize);
+
next_nonstatic_type_offset = align_size_up(notaligned_offset, wordSize );
instance_size = align_object_size(next_nonstatic_type_offset / wordSize);
- assert(instance_size == align_object_size(align_size_up((instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize), wordSize) / wordSize), "consistent layout helper value");
+ assert(instance_size == align_object_size(align_size_up(
+ (instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize + ((parsed_annotations.is_contended()) ? pad_size : 0)),
+ wordSize) / wordSize), "consistent layout helper value");
// Number of non-static oop map blocks allocated at end of klass.
const unsigned int total_oop_map_count =
@@ -3687,11 +4090,13 @@
if (is_anonymous()) // I am well known to myself
cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve
+ // Allocate an annotation type if needed.
if (fields_annotations != NULL ||
methods_annotations != NULL ||
methods_parameter_annotations != NULL ||
- methods_default_annotations != NULL) {
- // Allocate an annotation type if needed.
+ methods_default_annotations != NULL ||
+ fields_type_annotations != NULL ||
+ methods_type_annotations != NULL) {
Annotations* anno = Annotations::allocate(loader_data,
fields_annotations, methods_annotations,
methods_parameter_annotations,
@@ -3701,6 +4106,16 @@
this_klass->set_annotations(NULL);
}
+ if (fields_type_annotations != NULL ||
+ methods_type_annotations != NULL) {
+ assert(this_klass->annotations() != NULL, "annotations should have been allocated");
+ Annotations* anno = Annotations::allocate(loader_data,
+ fields_type_annotations,
+ methods_type_annotations,
+ NULL,
+ NULL, CHECK_(nullHandle));
+ this_klass->annotations()->set_type_annotations(anno);
+ }
this_klass->set_minor_version(minor_version);
this_klass->set_major_version(major_version);
@@ -3725,6 +4140,7 @@
// Fill in field values obtained by parse_classfile_attributes
if (parsed_annotations.has_any_annotations())
parsed_annotations.apply_to(this_klass);
+
// Create annotations
if (_annotations != NULL && this_klass->annotations() == NULL) {
Annotations* anno = Annotations::allocate(loader_data, CHECK_NULL);
@@ -3732,6 +4148,19 @@
}
apply_parsed_class_attributes(this_klass);
+ // Create type annotations
+ if (_type_annotations != NULL) {
+ if (this_klass->annotations() == NULL) {
+ Annotations* anno = Annotations::allocate(loader_data, CHECK_NULL);
+ this_klass->set_annotations(anno);
+ }
+ if (this_klass->annotations()->type_annotations() == NULL) {
+ Annotations* anno = Annotations::allocate(loader_data, CHECK_NULL);
+ this_klass->annotations()->set_type_annotations(anno);
+ }
+ this_klass->annotations()->type_annotations()->set_class_annotations(_type_annotations);
+ }
+
// Miranda methods
if ((num_miranda_methods > 0) ||
// if this class introduced new miranda methods or
@@ -3771,7 +4200,10 @@
// check that if this class is an interface then it doesn't have static methods
if (this_klass->is_interface()) {
- check_illegal_static_method(this_klass, CHECK_(nullHandle));
+ /* An interface in a JAVA 8 classfile can be static */
+ if (_major_version < JAVA_8_VERSION) {
+ check_illegal_static_method(this_klass, CHECK_(nullHandle));
+ }
}
@@ -3864,6 +4296,18 @@
}
#endif
+#ifndef PRODUCT
+ if (PrintFieldLayout) {
+ print_field_layout(name,
+ fields,
+ cp,
+ instance_size,
+ first_nonstatic_field_offset,
+ next_nonstatic_field_offset,
+ next_static_type_offset);
+ }
+#endif
+
// preserve result across HandleMark
preserve_this_klass = this_klass();
}
@@ -3876,6 +4320,38 @@
return this_klass;
}
+void ClassFileParser::print_field_layout(Symbol* name,
+ Array<u2>* fields,
+ constantPoolHandle cp,
+ int instance_size,
+ int instance_fields_start,
+ int instance_fields_end,
+ int static_fields_end) {
+ tty->print("%s: field layout\n", name->as_klass_external_name());
+ tty->print(" @%3d %s\n", instance_fields_start, "--- instance fields start ---");
+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+ if (!fs.access_flags().is_static()) {
+ tty->print(" @%3d \"%s\" %s\n",
+ fs.offset(),
+ fs.name()->as_klass_external_name(),
+ fs.signature()->as_klass_external_name());
+ }
+ }
+ tty->print(" @%3d %s\n", instance_fields_end, "--- instance fields end ---");
+ tty->print(" @%3d %s\n", instance_size * wordSize, "--- instance ends ---");
+ tty->print(" @%3d %s\n", InstanceMirrorKlass::offset_of_static_fields(), "--- static fields start ---");
+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+ if (fs.access_flags().is_static()) {
+ tty->print(" @%3d \"%s\" %s\n",
+ fs.offset(),
+ fs.name()->as_klass_external_name(),
+ fs.signature()->as_klass_external_name());
+ }
+ }
+ tty->print(" @%3d %s\n", static_fields_end, "--- static fields end ---");
+ tty->print("\n");
+}
+
unsigned int
ClassFileParser::compute_oop_map_count(instanceKlassHandle super,
unsigned int nonstatic_oop_map_count,
@@ -4325,6 +4801,7 @@
const bool is_bridge = (flags & JVM_ACC_BRIDGE) != 0;
const bool is_strict = (flags & JVM_ACC_STRICT) != 0;
const bool is_synchronized = (flags & JVM_ACC_SYNCHRONIZED) != 0;
+ const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
const bool major_gte_15 = _major_version >= JAVA_1_5_VERSION;
const bool major_gte_8 = _major_version >= JAVA_8_VERSION;
const bool is_initializer = (name == vmSymbols::object_initializer_name());
@@ -4332,11 +4809,33 @@
bool is_illegal = false;
if (is_interface) {
- if (!is_public || is_static || is_final || is_native ||
- ((is_synchronized || is_strict) && major_gte_15 &&
- (!major_gte_8 || is_abstract)) ||
- (!major_gte_8 && !is_abstract)) {
- is_illegal = true;
+ if (major_gte_8) {
+ // Class file version is JAVA_8_VERSION or later Methods of
+ // interfaces may set any of the flags except ACC_PROTECTED,
+ // ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must
+ // have exactly one of the ACC_PUBLIC or ACC_PRIVATE flags set.
+ if ((is_public == is_private) || /* Only one of private and public should be true - XNOR */
+ (is_native || is_protected || is_final || is_synchronized) ||
+ // If a specific method of a class or interface has its
+ // ACC_ABSTRACT flag set, it must not have any of its
+ // ACC_FINAL, ACC_NATIVE, ACC_PRIVATE, ACC_STATIC,
+ // ACC_STRICT, or ACC_SYNCHRONIZED flags set. No need to
+ // check for ACC_FINAL, ACC_NATIVE or ACC_SYNCHRONIZED as
+ // those flags are illegal irrespective of ACC_ABSTRACT being set or not.
+ (is_abstract && (is_private || is_static || is_strict))) {
+ is_illegal = true;
+ }
+ } else if (major_gte_15) {
+ // Class file version in the interval [JAVA_1_5_VERSION, JAVA_8_VERSION)
+ if (!is_public || is_static || is_final || is_synchronized ||
+ is_native || !is_abstract || is_strict) {
+ is_illegal = true;
+ }
+ } else {
+ // Class file version is pre-JAVA_1_5_VERSION
+ if (!is_public || is_static || is_final || is_native || !is_abstract) {
+ is_illegal = true;
+ }
}
} else { // not interface
if (is_initializer) {
--- a/hotspot/src/share/vm/classfile/classFileParser.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/classFileParser.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -64,6 +64,7 @@
int _sde_length;
Array<u2>* _inner_classes;
AnnotationArray* _annotations;
+ AnnotationArray* _type_annotations;
void set_class_synthetic_flag(bool x) { _synthetic_flag = x; }
void set_class_sourcefile(Symbol* x) { _sourcefile = x; }
@@ -71,12 +72,14 @@
void set_class_sde_buffer(char* x, int len) { _sde_buffer = x; _sde_length = len; }
void set_class_inner_classes(Array<u2>* x) { _inner_classes = x; }
void set_class_annotations(AnnotationArray* x) { _annotations = x; }
+ void set_class_type_annotations(AnnotationArray* x) { _type_annotations = x; }
void init_parsed_class_attributes() {
_synthetic_flag = false;
_sourcefile = NULL;
_generic_signature = NULL;
_sde_buffer = NULL;
_sde_length = 0;
+ _annotations = _type_annotations = NULL;
// initialize the other flags too:
_has_finalizer = _has_empty_finalizer = _has_vanilla_constructor = false;
_max_bootstrap_specifier_index = -1;
@@ -92,17 +95,20 @@
_method_DontInline,
_method_LambdaForm_Compiled,
_method_LambdaForm_Hidden,
+ _sun_misc_Contended,
_annotation_LIMIT
};
const Location _location;
int _annotations_present;
+ u2 _contended_group;
+
AnnotationCollector(Location location)
: _location(location), _annotations_present(0)
{
assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
}
// If this annotation name has an ID, report it (or _none).
- ID annotation_index(Symbol* name);
+ ID annotation_index(ClassLoaderData* loader_data, Symbol* name);
// Set the annotation name:
void set_annotation(ID id) {
assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
@@ -111,6 +117,12 @@
// Report if the annotation is present.
bool has_any_annotations() { return _annotations_present != 0; }
bool has_annotation(ID id) { return (nth_bit((int)id) & _annotations_present) != 0; }
+
+ void set_contended_group(u2 group) { _contended_group = group; }
+ u2 contended_group() { return _contended_group; }
+
+ void set_contended(bool contended) { set_annotation(_sun_misc_Contended); }
+ bool is_contended() { return has_annotation(_sun_misc_Contended); }
};
class FieldAnnotationCollector: public AnnotationCollector {
public:
@@ -163,6 +175,7 @@
bool* is_synthetic_addr,
u2* generic_signature_index_addr,
AnnotationArray** field_annotations,
+ AnnotationArray** field_type_annotations,
FieldAnnotationCollector* parsed_annotations,
TRAPS);
Array<u2>* parse_fields(ClassLoaderData* loader_data,
@@ -170,8 +183,17 @@
constantPoolHandle cp, bool is_interface,
FieldAllocationCount *fac,
Array<AnnotationArray*>** fields_annotations,
+ Array<AnnotationArray*>** fields_type_annotations,
u2* java_fields_count_ptr, TRAPS);
+ void print_field_layout(Symbol* name,
+ Array<u2>* fields,
+ constantPoolHandle cp,
+ int instance_size,
+ int instance_fields_start,
+ int instance_fields_end,
+ int static_fields_end);
+
// Method parsing
methodHandle parse_method(ClassLoaderData* loader_data,
constantPoolHandle cp,
@@ -180,6 +202,7 @@
AnnotationArray** method_annotations,
AnnotationArray** method_parameter_annotations,
AnnotationArray** method_default_annotations,
+ AnnotationArray** method_type_annotations,
TRAPS);
Array<Method*>* parse_methods(ClassLoaderData* loader_data,
constantPoolHandle cp,
@@ -189,6 +212,7 @@
Array<AnnotationArray*>** methods_annotations,
Array<AnnotationArray*>** methods_parameter_annotations,
Array<AnnotationArray*>** methods_default_annotations,
+ Array<AnnotationArray*>** methods_type_annotations,
bool* has_default_method,
TRAPS);
Array<int>* sort_methods(ClassLoaderData* loader_data,
@@ -196,6 +220,7 @@
Array<AnnotationArray*>* methods_annotations,
Array<AnnotationArray*>* methods_parameter_annotations,
Array<AnnotationArray*>* methods_default_annotations,
+ Array<AnnotationArray*>* methods_type_annotations,
TRAPS);
u2* parse_exception_table(ClassLoaderData* loader_data,
u4 code_length, u4 exception_table_length,
@@ -239,7 +264,8 @@
int runtime_invisible_annotations_length, TRAPS);
int skip_annotation(u1* buffer, int limit, int index);
int skip_annotation_value(u1* buffer, int limit, int index);
- void parse_annotations(u1* buffer, int limit, constantPoolHandle cp,
+ void parse_annotations(ClassLoaderData* loader_data,
+ u1* buffer, int limit, constantPoolHandle cp,
/* Results (currently, only one result is supported): */
AnnotationCollector* result,
TRAPS);
--- a/hotspot/src/share/vm/classfile/classFileStream.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/classFileStream.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -93,3 +93,10 @@
}
_current += length * 2;
}
+
+void ClassFileStream::skip_u4(int length, TRAPS) {
+ if (_need_verify) {
+ guarantee_more(length * 4, CHECK);
+ }
+ _current += length * 4;
+}
--- a/hotspot/src/share/vm/classfile/classFileStream.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/classFileStream.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -133,6 +133,11 @@
_current += 2 * length;
}
+ void skip_u4(int length, TRAPS);
+ void skip_u4_fast(int length) {
+ _current += 4 * length;
+ }
+
// Tells whether eos is reached
bool at_eos() const { return _current == _buffer_end; }
};
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -318,6 +318,7 @@
}
Metaspace* ClassLoaderData::metaspace_non_null() {
+ assert(!DumpSharedSpaces, "wrong metaspace!");
// If the metaspace has not been allocated, create a new one. Might want
// to create smaller arena for Reflection class loaders also.
// The reason for the delayed allocation is because some class loaders are
@@ -330,10 +331,19 @@
}
if (this == the_null_class_loader_data()) {
assert (class_loader() == NULL, "Must be");
- size_t word_size = Metaspace::first_chunk_word_size();
- set_metaspace(new Metaspace(_metaspace_lock, word_size));
+ set_metaspace(new Metaspace(_metaspace_lock, Metaspace::BootMetaspaceType));
+ } else if (is_anonymous()) {
+ if (TraceClassLoaderData && Verbose && class_loader() != NULL) {
+ tty->print_cr("is_anonymous: %s", class_loader()->klass()->internal_name());
+ }
+ set_metaspace(new Metaspace(_metaspace_lock, Metaspace::AnonymousMetaspaceType));
+ } else if (class_loader()->is_a(SystemDictionary::reflect_DelegatingClassLoader_klass())) {
+ if (TraceClassLoaderData && Verbose && class_loader() != NULL) {
+ tty->print_cr("is_reflection: %s", class_loader()->klass()->internal_name());
+ }
+ set_metaspace(new Metaspace(_metaspace_lock, Metaspace::ReflectionMetaspaceType));
} else {
- set_metaspace(new Metaspace(_metaspace_lock)); // default size for now.
+ set_metaspace(new Metaspace(_metaspace_lock, Metaspace::StandardMetaspaceType));
}
}
return _metaspace;
@@ -672,8 +682,8 @@
"only supported for null loader data for now");
assert (!_shared_metaspaces_initialized, "only initialize once");
MutexLockerEx ml(metaspace_lock(), Mutex::_no_safepoint_check_flag);
- _ro_metaspace = new Metaspace(_metaspace_lock, SharedReadOnlySize/wordSize);
- _rw_metaspace = new Metaspace(_metaspace_lock, SharedReadWriteSize/wordSize);
+ _ro_metaspace = new Metaspace(_metaspace_lock, Metaspace::ROMetaspaceType);
+ _rw_metaspace = new Metaspace(_metaspace_lock, Metaspace::ReadWriteMetaspaceType);
_shared_metaspaces_initialized = true;
}
--- a/hotspot/src/share/vm/classfile/defaultMethods.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1148,7 +1148,8 @@
int code_length = bytecodes->length();
Method* m = Method::allocate(cp->pool_holder()->class_loader_data(),
- code_length, flags, 0, 0, 0, 0, 0, mt, CHECK_NULL);
+ code_length, flags, 0, 0, 0, 0, 0, 0,
+ mt, CHECK_NULL);
m->set_constants(NULL); // This will get filled in later
m->set_name_index(cp->utf8(name));
@@ -1284,13 +1285,15 @@
enum { ANNOTATIONS, PARAMETERS, DEFAULTS, NUM_ARRAYS };
- Array<AnnotationArray*>* original_annots[NUM_ARRAYS];
+ Array<AnnotationArray*>* original_annots[NUM_ARRAYS] = { NULL };
Array<Method*>* original_methods = klass->methods();
Annotations* annots = klass->annotations();
- original_annots[ANNOTATIONS] = annots->methods_annotations();
- original_annots[PARAMETERS] = annots->methods_parameter_annotations();
- original_annots[DEFAULTS] = annots->methods_default_annotations();
+ if (annots != NULL) {
+ original_annots[ANNOTATIONS] = annots->methods_annotations();
+ original_annots[PARAMETERS] = annots->methods_parameter_annotations();
+ original_annots[DEFAULTS] = annots->methods_default_annotations();
+ }
Array<int>* original_ordering = klass->method_ordering();
Array<int>* merged_ordering = Universe::the_empty_int_array();
@@ -1369,9 +1372,15 @@
// Replace klass methods with new merged lists
klass->set_methods(merged_methods);
- annots->set_methods_annotations(merged_annots[ANNOTATIONS]);
- annots->set_methods_parameter_annotations(merged_annots[PARAMETERS]);
- annots->set_methods_default_annotations(merged_annots[DEFAULTS]);
+ if (annots != NULL) {
+ annots->set_methods_annotations(merged_annots[ANNOTATIONS]);
+ annots->set_methods_parameter_annotations(merged_annots[PARAMETERS]);
+ annots->set_methods_default_annotations(merged_annots[DEFAULTS]);
+ } else {
+ assert(merged_annots[ANNOTATIONS] == NULL, "Must be");
+ assert(merged_annots[PARAMETERS] == NULL, "Must be");
+ assert(merged_annots[DEFAULTS] == NULL, "Must be");
+ }
ClassLoaderData* cld = klass->class_loader_data();
MetadataFactory::free_array(cld, original_methods);
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -687,19 +687,6 @@
}
-Method* java_lang_Class::resolved_constructor(oop java_class) {
- Metadata* constructor = java_class->metadata_field(_resolved_constructor_offset);
- assert(constructor == NULL || constructor->is_method(), "should be method");
- return ((Method*)constructor);
-}
-
-
-void java_lang_Class::set_resolved_constructor(oop java_class, Method* constructor) {
- assert(constructor->is_method(), "should be method");
- java_class->metadata_field_put(_resolved_constructor_offset, constructor);
-}
-
-
bool java_lang_Class::is_primitive(oop java_class) {
// should assert:
//assert(java_lang_Class::is_instance(java_class), "must be a Class object");
@@ -924,7 +911,6 @@
// Write the thread status value to threadStatus field in java.lang.Thread java class.
void java_lang_Thread::set_thread_status(oop java_thread,
java_lang_Thread::ThreadStatus status) {
- assert(JavaThread::current()->thread_state() == _thread_in_vm, "Java Thread is not running in vm");
// The threadStatus is only present starting in 1.5
if (_thread_status_offset > 0) {
java_thread->int_field_put(_thread_status_offset, status);
@@ -1158,179 +1144,43 @@
}
}
-// Print stack trace element to resource allocated buffer
-char* java_lang_Throwable::print_stack_element_to_buffer(Method* method, int bci) {
- // Get strings and string lengths
- InstanceKlass* klass = method->method_holder();
- const char* klass_name = klass->external_name();
- int buf_len = (int)strlen(klass_name);
- char* source_file_name;
- if (klass->source_file_name() == NULL) {
- source_file_name = NULL;
+// After this many redefines, the stack trace is unreliable.
+const int MAX_VERSION = USHRT_MAX;
+
+// Helper backtrace functions to store bci|version together.
+static inline int merge_bci_and_version(int bci, int version) {
+ // only store u2 for version, checking for overflow.
+ if (version > USHRT_MAX || version < 0) version = MAX_VERSION;
+ assert((jushort)bci == bci, "bci should be short");
+ return build_int_from_shorts(version, bci);
+}
+
+static inline int bci_at(unsigned int merged) {
+ return extract_high_short_from_int(merged);
+}
+static inline int version_at(unsigned int merged) {
+ return extract_low_short_from_int(merged);
+}
+
+static inline bool version_matches(Method* method, int version) {
+ return (method->constants()->version() == version && version < MAX_VERSION);
+}
+
+static inline int get_line_number(Method* method, int bci) {
+ int line_number = 0;
+ if (method->is_native()) {
+ // Negative value different from -1 below, enabling Java code in
+ // class java.lang.StackTraceElement to distinguish "native" from
+ // "no LineNumberTable". JDK tests for -2.
+ line_number = -2;
} else {
- source_file_name = klass->source_file_name()->as_C_string();
- buf_len += (int)strlen(source_file_name);
- }
- char* method_name = method->name()->as_C_string();
- buf_len += (int)strlen(method_name);
-
- // Allocate temporary buffer with extra space for formatting and line number
- char* buf = NEW_RESOURCE_ARRAY(char, buf_len + 64);
-
- // Print stack trace line in buffer
- sprintf(buf, "\tat %s.%s", klass_name, method_name);
- if (method->is_native()) {
- strcat(buf, "(Native Method)");
- } else {
- int line_number = method->line_number_from_bci(bci);
- if (source_file_name != NULL && (line_number != -1)) {
- // Sourcename and linenumber
- sprintf(buf + (int)strlen(buf), "(%s:%d)", source_file_name, line_number);
- } else if (source_file_name != NULL) {
- // Just sourcename
- sprintf(buf + (int)strlen(buf), "(%s)", source_file_name);
- } else {
- // Neither soucename and linenumber
- sprintf(buf + (int)strlen(buf), "(Unknown Source)");
- }
- nmethod* nm = method->code();
- if (WizardMode && nm != NULL) {
- sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm);
+ // Returns -1 if no LineNumberTable, and otherwise actual line number
+ line_number = method->line_number_from_bci(bci);
+ if (line_number == -1 && ShowHiddenFrames) {
+ line_number = bci + 1000000;
}
}
-
- return buf;
-}
-
-
-void java_lang_Throwable::print_stack_element(Handle stream, Method* method, int bci) {
- ResourceMark rm;
- char* buf = print_stack_element_to_buffer(method, bci);
- print_to_stream(stream, buf);
-}
-
-void java_lang_Throwable::print_stack_element(outputStream *st, Method* method, int bci) {
- ResourceMark rm;
- char* buf = print_stack_element_to_buffer(method, bci);
- st->print_cr("%s", buf);
-}
-
-void java_lang_Throwable::print_to_stream(Handle stream, const char* str) {
- if (stream.is_null()) {
- tty->print_cr("%s", str);
- } else {
- EXCEPTION_MARK;
- JavaValue result(T_VOID);
- Handle arg (THREAD, oopFactory::new_charArray(str, THREAD));
- if (!HAS_PENDING_EXCEPTION) {
- JavaCalls::call_virtual(&result,
- stream,
- KlassHandle(THREAD, stream->klass()),
- vmSymbols::println_name(),
- vmSymbols::char_array_void_signature(),
- arg,
- THREAD);
- }
- // Ignore any exceptions. we are in the middle of exception handling. Same as classic VM.
- if (HAS_PENDING_EXCEPTION) CLEAR_PENDING_EXCEPTION;
- }
-
-}
-
-
-const char* java_lang_Throwable::no_stack_trace_message() {
- return "\t<<no stack trace available>>";
-}
-
-
-// Currently used only for exceptions occurring during startup
-void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) {
- Thread *THREAD = Thread::current();
- Handle h_throwable(THREAD, throwable);
- while (h_throwable.not_null()) {
- objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
- if (result.is_null()) {
- st->print_cr(no_stack_trace_message());
- return;
- }
-
- while (result.not_null()) {
- typeArrayHandle methods (THREAD,
- typeArrayOop(result->obj_at(trace_methods_offset)));
- typeArrayHandle bcis (THREAD,
- typeArrayOop(result->obj_at(trace_bcis_offset)));
-
- if (methods.is_null() || bcis.is_null()) {
- st->print_cr(no_stack_trace_message());
- return;
- }
-
- int length = methods()->length();
- for (int index = 0; index < length; index++) {
- Method* method = ((Method*)methods()->metadata_at(index));
- if (method == NULL) goto handle_cause;
- int bci = bcis->ushort_at(index);
- print_stack_element(st, method, bci);
- }
- result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset)));
- }
- handle_cause:
- {
- EXCEPTION_MARK;
- JavaValue result(T_OBJECT);
- JavaCalls::call_virtual(&result,
- h_throwable,
- KlassHandle(THREAD, h_throwable->klass()),
- vmSymbols::getCause_name(),
- vmSymbols::void_throwable_signature(),
- THREAD);
- // Ignore any exceptions. we are in the middle of exception handling. Same as classic VM.
- if (HAS_PENDING_EXCEPTION) {
- CLEAR_PENDING_EXCEPTION;
- h_throwable = Handle();
- } else {
- h_throwable = Handle(THREAD, (oop) result.get_jobject());
- if (h_throwable.not_null()) {
- st->print("Caused by: ");
- print(h_throwable, st);
- st->cr();
- }
- }
- }
- }
-}
-
-
-void java_lang_Throwable::print_stack_trace(oop throwable, oop print_stream) {
- // Note: this is no longer used in Merlin, but we support it for compatibility.
- Thread *thread = Thread::current();
- Handle stream(thread, print_stream);
- objArrayHandle result (thread, objArrayOop(backtrace(throwable)));
- if (result.is_null()) {
- print_to_stream(stream, no_stack_trace_message());
- return;
- }
-
- while (result.not_null()) {
- typeArrayHandle methods(thread,
- typeArrayOop(result->obj_at(trace_methods_offset)));
- typeArrayHandle bcis (thread,
- typeArrayOop(result->obj_at(trace_bcis_offset)));
-
- if (methods.is_null() || bcis.is_null()) {
- print_to_stream(stream, no_stack_trace_message());
- return;
- }
-
- int length = methods()->length();
- for (int index = 0; index < length; index++) {
- Method* method = ((Method*)methods()->metadata_at(index));
- if (method == NULL) return;
- int bci = bcis->ushort_at(index);
- print_stack_element(stream, method, bci);
- }
- result = objArrayHandle(thread, objArrayOop(result->obj_at(trace_next_offset)));
- }
+ return line_number;
}
// This class provides a simple wrapper over the internal structure of
@@ -1350,13 +1200,30 @@
enum {
trace_methods_offset = java_lang_Throwable::trace_methods_offset,
- trace_bcis_offset = java_lang_Throwable::trace_bcis_offset,
+ trace_bcis_offset = java_lang_Throwable::trace_bcis_offset,
trace_mirrors_offset = java_lang_Throwable::trace_mirrors_offset,
trace_next_offset = java_lang_Throwable::trace_next_offset,
trace_size = java_lang_Throwable::trace_size,
trace_chunk_size = java_lang_Throwable::trace_chunk_size
};
+ // get info out of chunks
+ static typeArrayOop get_methods(objArrayHandle chunk) {
+ typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset));
+ assert(methods != NULL, "method array should be initialized in backtrace");
+ return methods;
+ }
+ static typeArrayOop get_bcis(objArrayHandle chunk) {
+ typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset));
+ assert(bcis != NULL, "bci array should be initialized in backtrace");
+ return bcis;
+ }
+ static objArrayOop get_mirrors(objArrayHandle chunk) {
+ objArrayOop mirrors = objArrayOop(chunk->obj_at(trace_mirrors_offset));
+ assert(mirrors != NULL, "mirror array should be initialized in backtrace");
+ return mirrors;
+ }
+
// constructor for new backtrace
BacktraceBuilder(TRAPS): _methods(NULL), _bcis(NULL), _head(NULL), _mirrors(NULL) {
expand(CHECK);
@@ -1364,6 +1231,19 @@
_index = 0;
}
+ BacktraceBuilder(objArrayHandle backtrace) {
+ _methods = get_methods(backtrace);
+ _bcis = get_bcis(backtrace);
+ _mirrors = get_mirrors(backtrace);
+ assert(_methods->length() == _bcis->length() &&
+ _methods->length() == _mirrors->length(),
+ "method and source information arrays should match");
+
+ // head is the preallocated backtrace
+ _backtrace = _head = backtrace();
+ _index = 0;
+ }
+
void expand(TRAPS) {
objArrayHandle old_head(THREAD, _head);
Pause_No_Safepoint_Verifier pnsv(&_nsv);
@@ -1371,10 +1251,10 @@
objArrayOop head = oopFactory::new_objectArray(trace_size, CHECK);
objArrayHandle new_head(THREAD, head);
- typeArrayOop methods = oopFactory::new_metaDataArray(trace_chunk_size, CHECK);
+ typeArrayOop methods = oopFactory::new_shortArray(trace_chunk_size, CHECK);
typeArrayHandle new_methods(THREAD, methods);
- typeArrayOop bcis = oopFactory::new_shortArray(trace_chunk_size, CHECK);
+ typeArrayOop bcis = oopFactory::new_intArray(trace_chunk_size, CHECK);
typeArrayHandle new_bcis(THREAD, bcis);
objArrayOop mirrors = oopFactory::new_objectArray(trace_chunk_size, CHECK);
@@ -1389,7 +1269,7 @@
_head = new_head();
_methods = new_methods();
- _bcis = new_bcis();
+ _bcis = new_bcis();
_mirrors = new_mirrors();
_index = 0;
}
@@ -1403,7 +1283,6 @@
// shorts. The later line number lookup would just smear the -1
// to a 0 even if it could be recorded.
if (bci == SynchronizationEntryBCI) bci = 0;
- assert(bci == (jushort)bci, "doesn't fit");
if (_index >= trace_chunk_size) {
methodHandle mhandle(THREAD, method);
@@ -1411,26 +1290,148 @@
method = mhandle();
}
- _methods->metadata_at_put(_index, method);
- _bcis->ushort_at_put(_index, bci);
- // we need to save the mirrors in the backtrace to keep the methods from
- // being unloaded if their class loader is unloaded while we still have
- // this stack trace.
+ _methods->short_at_put(_index, method->method_idnum());
+ _bcis->int_at_put(_index, merge_bci_and_version(bci, method->constants()->version()));
+
+ // We need to save the mirrors in the backtrace to keep the class
+ // from being unloaded while we still have this stack trace.
+ assert(method->method_holder()->java_mirror() != NULL, "never push null for mirror");
_mirrors->obj_at_put(_index, method->method_holder()->java_mirror());
_index++;
}
- Method* current_method() {
- assert(_index >= 0 && _index < trace_chunk_size, "out of range");
- return ((Method*)_methods->metadata_at(_index));
+};
+
+// Print stack trace element to resource allocated buffer
+char* java_lang_Throwable::print_stack_element_to_buffer(Handle mirror,
+ int method_id, int version, int bci) {
+
+ // Get strings and string lengths
+ InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(mirror()));
+ const char* klass_name = holder->external_name();
+ int buf_len = (int)strlen(klass_name);
+
+ // pushing to the stack trace added one.
+ Method* method = holder->method_with_idnum(method_id);
+ char* method_name = method->name()->as_C_string();
+ buf_len += (int)strlen(method_name);
+
+ char* source_file_name = NULL;
+ if (version_matches(method, version)) {
+ Symbol* source = holder->source_file_name();
+ if (source != NULL) {
+ source_file_name = source->as_C_string();
+ buf_len += (int)strlen(source_file_name);
+ }
+ }
+
+ // Allocate temporary buffer with extra space for formatting and line number
+ char* buf = NEW_RESOURCE_ARRAY(char, buf_len + 64);
+
+ // Print stack trace line in buffer
+ sprintf(buf, "\tat %s.%s", klass_name, method_name);
+
+ if (!version_matches(method, version)) {
+ strcat(buf, "(Redefined)");
+ } else {
+ int line_number = get_line_number(method, bci);
+ if (line_number == -2) {
+ strcat(buf, "(Native Method)");
+ } else {
+ if (source_file_name != NULL && (line_number != -1)) {
+ // Sourcename and linenumber
+ sprintf(buf + (int)strlen(buf), "(%s:%d)", source_file_name, line_number);
+ } else if (source_file_name != NULL) {
+ // Just sourcename
+ sprintf(buf + (int)strlen(buf), "(%s)", source_file_name);
+ } else {
+ // Neither sourcename nor linenumber
+ sprintf(buf + (int)strlen(buf), "(Unknown Source)");
+ }
+ nmethod* nm = method->code();
+ if (WizardMode && nm != NULL) {
+ sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm);
+ }
+ }
}
- jushort current_bci() {
- assert(_index >= 0 && _index < trace_chunk_size, "out of range");
- return _bcis->ushort_at(_index);
+ return buf;
+}
+
+void java_lang_Throwable::print_stack_element(outputStream *st, Handle mirror,
+ int method_id, int version, int bci) {
+ ResourceMark rm;
+ char* buf = print_stack_element_to_buffer(mirror, method_id, version, bci);
+ st->print_cr("%s", buf);
+}
+
+void java_lang_Throwable::print_stack_element(outputStream *st, methodHandle method, int bci) {
+ Handle mirror = method->method_holder()->java_mirror();
+ int method_id = method->method_idnum();
+ int version = method->constants()->version();
+ print_stack_element(st, mirror, method_id, version, bci);
+}
+
+const char* java_lang_Throwable::no_stack_trace_message() {
+ return "\t<<no stack trace available>>";
+}
+
+
+// Currently used only for exceptions occurring during startup
+void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) {
+ Thread *THREAD = Thread::current();
+ Handle h_throwable(THREAD, throwable);
+ while (h_throwable.not_null()) {
+ objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
+ if (result.is_null()) {
+ st->print_cr(no_stack_trace_message());
+ return;
+ }
+
+ while (result.not_null()) {
+
+ // Get method id, bci, version and mirror from chunk
+ typeArrayHandle methods (THREAD, BacktraceBuilder::get_methods(result));
+ typeArrayHandle bcis (THREAD, BacktraceBuilder::get_bcis(result));
+ objArrayHandle mirrors (THREAD, BacktraceBuilder::get_mirrors(result));
+
+ int length = methods()->length();
+ for (int index = 0; index < length; index++) {
+ Handle mirror(THREAD, mirrors->obj_at(index));
+ // NULL mirror means end of stack trace
+ if (mirror.is_null()) goto handle_cause;
+ int method = methods->short_at(index);
+ int version = version_at(bcis->int_at(index));
+ int bci = bci_at(bcis->int_at(index));
+ print_stack_element(st, mirror, method, version, bci);
+ }
+ result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset)));
+ }
+ handle_cause:
+ {
+ EXCEPTION_MARK;
+ JavaValue cause(T_OBJECT);
+ JavaCalls::call_virtual(&cause,
+ h_throwable,
+ KlassHandle(THREAD, h_throwable->klass()),
+ vmSymbols::getCause_name(),
+ vmSymbols::void_throwable_signature(),
+ THREAD);
+ // Ignore any exceptions. we are in the middle of exception handling. Same as classic VM.
+ if (HAS_PENDING_EXCEPTION) {
+ CLEAR_PENDING_EXCEPTION;
+ h_throwable = Handle();
+ } else {
+ h_throwable = Handle(THREAD, (oop) cause.get_jobject());
+ if (h_throwable.not_null()) {
+ st->print("Caused by: ");
+ print(h_throwable, st);
+ st->cr();
+ }
+ }
+ }
}
-};
-
+}
void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle method, TRAPS) {
if (!StackTraceInThrowable) return;
@@ -1591,21 +1592,8 @@
// No-op if stack trace is disabled
if (!StackTraceInThrowable) return;
-
- objArrayOop h_oop = oopFactory::new_objectArray(trace_size, CHECK);
- objArrayHandle backtrace (THREAD, h_oop);
- typeArrayOop m_oop = oopFactory::new_metaDataArray(trace_chunk_size, CHECK);
- typeArrayHandle methods (THREAD, m_oop);
- typeArrayOop b = oopFactory::new_shortArray(trace_chunk_size, CHECK);
- typeArrayHandle bcis(THREAD, b);
- objArrayOop mirror_oop = oopFactory::new_objectArray(trace_chunk_size, CHECK);
- objArrayHandle mirrors (THREAD, mirror_oop);
-
- // backtrace has space for one chunk (next is NULL)
- backtrace->obj_at_put(trace_methods_offset, methods());
- backtrace->obj_at_put(trace_bcis_offset, bcis());
- backtrace->obj_at_put(trace_mirrors_offset, mirrors());
- set_backtrace(throwable(), backtrace());
+ BacktraceBuilder bt(CHECK); // creates a backtrace
+ set_backtrace(throwable(), bt.backtrace());
}
@@ -1617,48 +1605,26 @@
assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check");
- objArrayOop backtrace = (objArrayOop)java_lang_Throwable::backtrace(throwable());
- assert(backtrace != NULL, "backtrace not preallocated");
-
- oop m = backtrace->obj_at(trace_methods_offset);
- typeArrayOop methods = typeArrayOop(m);
- assert(methods != NULL && methods->length() > 0, "method array not preallocated");
-
- oop b = backtrace->obj_at(trace_bcis_offset);
- typeArrayOop bcis = typeArrayOop(b);
- assert(bcis != NULL, "bci array not preallocated");
-
- oop mr = backtrace->obj_at(trace_mirrors_offset);
- objArrayOop mirrors = objArrayOop(mr);
- assert(mirrors != NULL, "bci array not preallocated");
-
- assert(methods->length() == bcis->length() &&
- methods->length() == mirrors->length(),
- "method and bci arrays should match");
-
- JavaThread* thread = JavaThread::current();
- ResourceMark rm(thread);
- vframeStream st(thread);
+ JavaThread* THREAD = JavaThread::current();
+
+ objArrayHandle backtrace (THREAD, (objArrayOop)java_lang_Throwable::backtrace(throwable()));
+ assert(backtrace.not_null(), "backtrace should have been preallocated");
+
+ ResourceMark rm(THREAD);
+ vframeStream st(THREAD);
+
+ BacktraceBuilder bt(backtrace);
// Unlike fill_in_stack_trace we do not skip fillInStackTrace or throwable init
// methods as preallocated errors aren't created by "java" code.
// fill in as much stack trace as possible
+ typeArrayOop methods = BacktraceBuilder::get_methods(backtrace);
int max_chunks = MIN2(methods->length(), (int)MaxJavaStackTraceDepth);
int chunk_count = 0;
for (;!st.at_end(); st.next()) {
- // Add entry and smear the -1 bci to 0 since the array only holds
- // unsigned shorts. The later line number lookup would just smear
- // the -1 to a 0 even if it could be recorded.
- int bci = st.bci();
- if (bci == SynchronizationEntryBCI) bci = 0;
- assert(bci == (jushort)bci, "doesn't fit");
- bcis->ushort_at_put(chunk_count, bci);
- methods->metadata_at_put(chunk_count, st.method());
- mirrors->obj_at_put(chunk_count,
- st.method()->method_holder()->java_mirror());
-
+ bt.push(st.method(), st.bci(), CHECK);
chunk_count++;
// Bail-out for deep stacks
@@ -1672,7 +1638,6 @@
java_lang_Throwable::set_stacktrace(throwable(), java_lang_Throwable::unassigned_stacktrace());
assert(java_lang_Throwable::unassigned_stacktrace() != NULL, "not initialized");
}
-
}
@@ -1691,12 +1656,12 @@
chunk = next;
}
assert(chunk != NULL && chunk->obj_at(trace_next_offset) == NULL, "sanity check");
- // Count element in remaining partial chunk
- typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset));
- typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset));
- assert(methods != NULL && bcis != NULL, "sanity check");
- for (int i = 0; i < methods->length(); i++) {
- if (methods->metadata_at(i) == NULL) break;
+ // Count element in remaining partial chunk. NULL value for mirror
+ // marks the end of the stack trace elements that are saved.
+ objArrayOop mirrors = BacktraceBuilder::get_mirrors(chunk);
+ assert(mirrors != NULL, "sanity check");
+ for (int i = 0; i < mirrors->length(); i++) {
+ if (mirrors->obj_at(i) == NULL) break;
depth++;
}
}
@@ -1722,25 +1687,28 @@
if (chunk == NULL) {
THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL);
}
- // Get method,bci from chunk
- typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset));
- typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset));
- assert(methods != NULL && bcis != NULL, "sanity check");
- methodHandle method(THREAD, ((Method*)methods->metadata_at(chunk_index)));
- int bci = bcis->ushort_at(chunk_index);
+ // Get method id, bci, version and mirror from chunk
+ typeArrayOop methods = BacktraceBuilder::get_methods(chunk);
+ typeArrayOop bcis = BacktraceBuilder::get_bcis(chunk);
+ objArrayOop mirrors = BacktraceBuilder::get_mirrors(chunk);
+
+ assert(methods != NULL && bcis != NULL && mirrors != NULL, "sanity check");
+
+ int method = methods->short_at(chunk_index);
+ int version = version_at(bcis->int_at(chunk_index));
+ int bci = bci_at(bcis->int_at(chunk_index));
+ Handle mirror(THREAD, mirrors->obj_at(chunk_index));
+
// Chunk can be partial full
- if (method.is_null()) {
+ if (mirror.is_null()) {
THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL);
}
- oop element = java_lang_StackTraceElement::create(method, bci, CHECK_0);
+ oop element = java_lang_StackTraceElement::create(mirror, method, version, bci, CHECK_0);
return element;
}
-oop java_lang_StackTraceElement::create(methodHandle method, int bci, TRAPS) {
- // SystemDictionary::stackTraceElement_klass() will be null for pre-1.4 JDKs
- assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4");
-
+oop java_lang_StackTraceElement::create(Handle mirror, int method_id, int version, int bci, TRAPS) {
// Allocate java.lang.StackTraceElement instance
Klass* k = SystemDictionary::StackTraceElement_klass();
assert(k != NULL, "must be loaded in 1.4+");
@@ -1752,37 +1720,39 @@
Handle element = ik->allocate_instance_handle(CHECK_0);
// Fill in class name
ResourceMark rm(THREAD);
- const char* str = method->method_holder()->external_name();
+ InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(mirror()));
+ const char* str = holder->external_name();
oop classname = StringTable::intern((char*) str, CHECK_0);
java_lang_StackTraceElement::set_declaringClass(element(), classname);
+
// Fill in method name
+ Method* method = holder->method_with_idnum(method_id);
oop methodname = StringTable::intern(method->name(), CHECK_0);
java_lang_StackTraceElement::set_methodName(element(), methodname);
- // Fill in source file name
- Symbol* source = method->method_holder()->source_file_name();
- if (ShowHiddenFrames && source == NULL)
- source = vmSymbols::unknown_class_name();
- oop filename = StringTable::intern(source, CHECK_0);
- java_lang_StackTraceElement::set_fileName(element(), filename);
- // File in source line number
- int line_number;
- if (method->is_native()) {
- // Negative value different from -1 below, enabling Java code in
- // class java.lang.StackTraceElement to distinguish "native" from
- // "no LineNumberTable".
- line_number = -2;
+
+ if (!version_matches(method, version)) {
+ // The method was redefined, accurate line number information isn't available
+ java_lang_StackTraceElement::set_fileName(element(), NULL);
+ java_lang_StackTraceElement::set_lineNumber(element(), -1);
} else {
- // Returns -1 if no LineNumberTable, and otherwise actual line number
- line_number = method->line_number_from_bci(bci);
- if (line_number == -1 && ShowHiddenFrames) {
- line_number = bci + 1000000;
- }
+ // Fill in source file name and line number.
+ Symbol* source = holder->source_file_name();
+ if (ShowHiddenFrames && source == NULL)
+ source = vmSymbols::unknown_class_name();
+ oop filename = StringTable::intern(source, CHECK_0);
+ java_lang_StackTraceElement::set_fileName(element(), filename);
+
+ int line_number = get_line_number(method, bci);
+ java_lang_StackTraceElement::set_lineNumber(element(), line_number);
}
- java_lang_StackTraceElement::set_lineNumber(element(), line_number);
-
return element();
}
+oop java_lang_StackTraceElement::create(methodHandle method, int bci, TRAPS) {
+ Handle mirror (THREAD, method->method_holder()->java_mirror());
+ int method_id = method->method_idnum();
+ return create(mirror, method_id, method->constants()->version(), bci, THREAD);
+}
void java_lang_reflect_AccessibleObject::compute_offsets() {
Klass* k = SystemDictionary::reflect_AccessibleObject_klass();
@@ -1813,10 +1783,12 @@
annotations_offset = -1;
parameter_annotations_offset = -1;
annotation_default_offset = -1;
+ type_annotations_offset = -1;
compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature());
compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature());
compute_optional_offset(parameter_annotations_offset, k, vmSymbols::parameter_annotations_name(), vmSymbols::byte_array_signature());
compute_optional_offset(annotation_default_offset, k, vmSymbols::annotation_default_name(), vmSymbols::byte_array_signature());
+ compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature());
}
Handle java_lang_reflect_Method::create(TRAPS) {
@@ -1962,6 +1934,22 @@
method->obj_field_put(annotation_default_offset, value);
}
+bool java_lang_reflect_Method::has_type_annotations_field() {
+ return (type_annotations_offset >= 0);
+}
+
+oop java_lang_reflect_Method::type_annotations(oop method) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ assert(has_type_annotations_field(), "type_annotations field must be present");
+ return method->obj_field(type_annotations_offset);
+}
+
+void java_lang_reflect_Method::set_type_annotations(oop method, oop value) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ assert(has_type_annotations_field(), "type_annotations field must be present");
+ method->obj_field_put(type_annotations_offset, value);
+}
+
void java_lang_reflect_Constructor::compute_offsets() {
Klass* k = SystemDictionary::reflect_Constructor_klass();
compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature());
@@ -1973,9 +1961,11 @@
signature_offset = -1;
annotations_offset = -1;
parameter_annotations_offset = -1;
+ type_annotations_offset = -1;
compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature());
compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature());
compute_optional_offset(parameter_annotations_offset, k, vmSymbols::parameter_annotations_name(), vmSymbols::byte_array_signature());
+ compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature());
}
Handle java_lang_reflect_Constructor::create(TRAPS) {
@@ -2086,6 +2076,22 @@
method->obj_field_put(parameter_annotations_offset, value);
}
+bool java_lang_reflect_Constructor::has_type_annotations_field() {
+ return (type_annotations_offset >= 0);
+}
+
+oop java_lang_reflect_Constructor::type_annotations(oop constructor) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ assert(has_type_annotations_field(), "type_annotations field must be present");
+ return constructor->obj_field(type_annotations_offset);
+}
+
+void java_lang_reflect_Constructor::set_type_annotations(oop constructor, oop value) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ assert(has_type_annotations_field(), "type_annotations field must be present");
+ constructor->obj_field_put(type_annotations_offset, value);
+}
+
void java_lang_reflect_Field::compute_offsets() {
Klass* k = SystemDictionary::reflect_Field_klass();
compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature());
@@ -2096,8 +2102,10 @@
// The generic signature and annotations fields are only present in 1.5
signature_offset = -1;
annotations_offset = -1;
+ type_annotations_offset = -1;
compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature());
compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature());
+ compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature());
}
Handle java_lang_reflect_Field::create(TRAPS) {
@@ -2192,6 +2200,21 @@
field->obj_field_put(annotations_offset, value);
}
+bool java_lang_reflect_Field::has_type_annotations_field() {
+ return (type_annotations_offset >= 0);
+}
+
+oop java_lang_reflect_Field::type_annotations(oop field) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ assert(has_type_annotations_field(), "type_annotations field must be present");
+ return field->obj_field(type_annotations_offset);
+}
+
+void java_lang_reflect_Field::set_type_annotations(oop field, oop value) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ assert(has_type_annotations_field(), "type_annotations field must be present");
+ field->obj_field_put(type_annotations_offset, value);
+}
void sun_reflect_ConstantPool::compute_offsets() {
Klass* k = SystemDictionary::reflect_ConstantPool_klass();
@@ -2202,6 +2225,66 @@
}
}
+void java_lang_reflect_Parameter::compute_offsets() {
+ Klass* k = SystemDictionary::reflect_Parameter_klass();
+ if(NULL != k) {
+ compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature());
+ compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature());
+ compute_offset(index_offset, k, vmSymbols::index_name(), vmSymbols::int_signature());
+ compute_offset(executable_offset, k, vmSymbols::executable_name(), vmSymbols::executable_signature());
+ }
+}
+
+Handle java_lang_reflect_Parameter::create(TRAPS) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ Symbol* name = vmSymbols::java_lang_reflect_Parameter();
+ Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH);
+ instanceKlassHandle klass (THREAD, k);
+ // Ensure it is initialized
+ klass->initialize(CHECK_NH);
+ return klass->allocate_instance_handle(CHECK_NH);
+}
+
+oop java_lang_reflect_Parameter::name(oop param) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ return param->obj_field(name_offset);
+}
+
+void java_lang_reflect_Parameter::set_name(oop param, oop value) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ param->obj_field_put(name_offset, value);
+}
+
+int java_lang_reflect_Parameter::modifiers(oop param) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ return param->int_field(modifiers_offset);
+}
+
+void java_lang_reflect_Parameter::set_modifiers(oop param, int value) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ param->int_field_put(modifiers_offset, value);
+}
+
+int java_lang_reflect_Parameter::index(oop param) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ return param->int_field(index_offset);
+}
+
+void java_lang_reflect_Parameter::set_index(oop param, int value) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ param->int_field_put(index_offset, value);
+}
+
+oop java_lang_reflect_Parameter::executable(oop param) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ return param->obj_field(executable_offset);
+}
+
+void java_lang_reflect_Parameter::set_executable(oop param, oop value) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ param->obj_field_put(executable_offset, value);
+}
+
Handle sun_reflect_ConstantPool::create(TRAPS) {
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
@@ -2836,7 +2919,6 @@
int java_lang_Class::_klass_offset;
int java_lang_Class::_array_klass_offset;
-int java_lang_Class::_resolved_constructor_offset;
int java_lang_Class::_oop_size_offset;
int java_lang_Class::_static_oop_field_count_offset;
GrowableArray<Klass*>* java_lang_Class::_fixup_mirror_list = NULL;
@@ -2857,6 +2939,7 @@
int java_lang_reflect_Method::annotations_offset;
int java_lang_reflect_Method::parameter_annotations_offset;
int java_lang_reflect_Method::annotation_default_offset;
+int java_lang_reflect_Method::type_annotations_offset;
int java_lang_reflect_Constructor::clazz_offset;
int java_lang_reflect_Constructor::parameterTypes_offset;
int java_lang_reflect_Constructor::exceptionTypes_offset;
@@ -2865,6 +2948,7 @@
int java_lang_reflect_Constructor::signature_offset;
int java_lang_reflect_Constructor::annotations_offset;
int java_lang_reflect_Constructor::parameter_annotations_offset;
+int java_lang_reflect_Constructor::type_annotations_offset;
int java_lang_reflect_Field::clazz_offset;
int java_lang_reflect_Field::name_offset;
int java_lang_reflect_Field::type_offset;
@@ -2872,6 +2956,11 @@
int java_lang_reflect_Field::modifiers_offset;
int java_lang_reflect_Field::signature_offset;
int java_lang_reflect_Field::annotations_offset;
+int java_lang_reflect_Field::type_annotations_offset;
+int java_lang_reflect_Parameter::name_offset;
+int java_lang_reflect_Parameter::modifiers_offset;
+int java_lang_reflect_Parameter::index_offset;
+int java_lang_reflect_Parameter::executable_offset;
int java_lang_boxing_object::value_offset;
int java_lang_boxing_object::long_value_offset;
int java_lang_ref_Reference::referent_offset;
@@ -3056,6 +3145,8 @@
sun_reflect_ConstantPool::compute_offsets();
sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets();
}
+ if (JDK_Version::is_jdk18x_version())
+ java_lang_reflect_Parameter::compute_offsets();
// generated interpreter code wants to know about the offsets we just computed:
AbstractAssembler::update_delayed_values();
@@ -3181,7 +3272,6 @@
// Fake fields
// CHECK_OFFSET("java/lang/Class", java_lang_Class, klass); // %%% this needs to be checked
// CHECK_OFFSET("java/lang/Class", java_lang_Class, array_klass); // %%% this needs to be checked
- // CHECK_OFFSET("java/lang/Class", java_lang_Class, resolved_constructor); // %%% this needs to be checked
// java.lang.Throwable
--- a/hotspot/src/share/vm/classfile/javaClasses.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/javaClasses.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -206,7 +206,6 @@
#define CLASS_INJECTED_FIELDS(macro) \
macro(java_lang_Class, klass, intptr_signature, false) \
- macro(java_lang_Class, resolved_constructor, intptr_signature, false) \
macro(java_lang_Class, array_klass, intptr_signature, false) \
macro(java_lang_Class, oop_size, int_signature, false) \
macro(java_lang_Class, static_oop_field_count, int_signature, false)
@@ -218,7 +217,6 @@
// The fake offsets are added by the class loader when java.lang.Class is loaded
static int _klass_offset;
- static int _resolved_constructor_offset;
static int _array_klass_offset;
static int _oop_size_offset;
@@ -254,15 +252,11 @@
static bool is_primitive(oop java_class);
static BasicType primitive_type(oop java_class);
static oop primitive_mirror(BasicType t);
- // JVM_NewInstance support
- static Method* resolved_constructor(oop java_class);
- static void set_resolved_constructor(oop java_class, Method* constructor);
// JVM_NewArray support
static Klass* array_klass(oop java_class);
static void set_array_klass(oop java_class, Klass* klass);
// compiler support for class operations
static int klass_offset_in_bytes() { return _klass_offset; }
- static int resolved_constructor_offset_in_bytes() { return _resolved_constructor_offset; }
static int array_klass_offset_in_bytes() { return _array_klass_offset; }
// Support for classRedefinedCount field
static int classRedefinedCount(oop the_class_mirror);
@@ -469,8 +463,7 @@
static int static_unassigned_stacktrace_offset;
// Printing
- static char* print_stack_element_to_buffer(Method* method, int bci);
- static void print_to_stream(Handle stream, const char* str);
+ static char* print_stack_element_to_buffer(Handle mirror, int method, int version, int bci);
// StackTrace (programmatic access, new since 1.4)
static void clear_stacktrace(oop throwable);
// No stack trace available
@@ -490,12 +483,9 @@
static oop message(oop throwable);
static oop message(Handle throwable);
static void set_message(oop throwable, oop value);
- // Print stack trace stored in exception by call-back to Java
- // Note: this is no longer used in Merlin, but we still suppport
- // it for compatibility.
- static void print_stack_trace(oop throwable, oop print_stream);
- static void print_stack_element(Handle stream, Method* method, int bci);
- static void print_stack_element(outputStream *st, Method* method, int bci);
+ static void print_stack_element(outputStream *st, Handle mirror, int method,
+ int version, int bci);
+ static void print_stack_element(outputStream *st, methodHandle method, int bci);
static void print_stack_usage(Handle stream);
// Allocate space for backtrace (created but stack trace not filled in)
@@ -554,6 +544,7 @@
static int annotations_offset;
static int parameter_annotations_offset;
static int annotation_default_offset;
+ static int type_annotations_offset;
static void compute_offsets();
@@ -599,6 +590,10 @@
static oop annotation_default(oop method);
static void set_annotation_default(oop method, oop value);
+ static bool has_type_annotations_field();
+ static oop type_annotations(oop method);
+ static void set_type_annotations(oop method, oop value);
+
// Debugging
friend class JavaClasses;
};
@@ -618,6 +613,7 @@
static int signature_offset;
static int annotations_offset;
static int parameter_annotations_offset;
+ static int type_annotations_offset;
static void compute_offsets();
@@ -653,6 +649,10 @@
static oop parameter_annotations(oop method);
static void set_parameter_annotations(oop method, oop value);
+ static bool has_type_annotations_field();
+ static oop type_annotations(oop constructor);
+ static void set_type_annotations(oop constructor, oop value);
+
// Debugging
friend class JavaClasses;
};
@@ -671,6 +671,7 @@
static int modifiers_offset;
static int signature_offset;
static int annotations_offset;
+ static int type_annotations_offset;
static void compute_offsets();
@@ -710,10 +711,45 @@
static oop annotation_default(oop method);
static void set_annotation_default(oop method, oop value);
+ static bool has_type_annotations_field();
+ static oop type_annotations(oop field);
+ static void set_type_annotations(oop field, oop value);
+
// Debugging
friend class JavaClasses;
};
+class java_lang_reflect_Parameter {
+ private:
+ // Note that to reduce dependencies on the JDK we compute these
+ // offsets at run-time.
+ static int name_offset;
+ static int modifiers_offset;
+ static int index_offset;
+ static int executable_offset;
+
+ static void compute_offsets();
+
+ public:
+ // Allocation
+ static Handle create(TRAPS);
+
+ // Accessors
+ static oop name(oop field);
+ static void set_name(oop field, oop value);
+
+ static int index(oop reflect);
+ static void set_index(oop reflect, int value);
+
+ static int modifiers(oop reflect);
+ static void set_modifiers(oop reflect, int value);
+
+ static oop executable(oop constructor);
+ static void set_executable(oop constructor, oop value);
+
+ friend class JavaClasses;
+};
+
// Interface to sun.reflect.ConstantPool objects
class sun_reflect_ConstantPool {
private:
@@ -1217,7 +1253,8 @@
static void set_lineNumber(oop element, int value);
// Create an instance of StackTraceElement
- static oop create(methodHandle m, int bci, TRAPS);
+ static oop create(Handle mirror, int method, int version, int bci, TRAPS);
+ static oop create(methodHandle method, int bci, TRAPS);
// Debugging
friend class JavaClasses;
--- a/hotspot/src/share/vm/classfile/placeholders.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/placeholders.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -142,7 +142,7 @@
}
-// placeholder used to track class loading internal states
+// placeholder is used to track class loading internal states
// placeholder existence now for loading superclass/superinterface
// superthreadQ tracks class circularity, while loading superclass/superinterface
// loadInstanceThreadQ tracks load_instance_class calls
@@ -153,15 +153,17 @@
// All claimants remove SeenThread after completing action
// On removal: if definer and all queues empty, remove entry
// Note: you can be in both placeholders and systemDictionary
-// see parse_stream for redefine classes
// Therefore - must always check SD first
// Ignores the case where entry is not found
void PlaceholderTable::find_and_remove(int index, unsigned int hash,
- Symbol* name, ClassLoaderData* loader_data, Thread* thread) {
+ Symbol* name, ClassLoaderData* loader_data,
+ classloadAction action,
+ Thread* thread) {
assert_locked_or_safepoint(SystemDictionary_lock);
PlaceholderEntry *probe = get_entry(index, hash, name, loader_data);
if (probe != NULL) {
- // No other threads using this entry
+ probe->remove_seen_thread(thread, action);
+ // If no other threads using this entry, and this thread is not using this entry for other states
if ((probe->superThreadQ() == NULL) && (probe->loadInstanceThreadQ() == NULL)
&& (probe->defineThreadQ() == NULL) && (probe->definer() == NULL)) {
remove_entry(index, hash, name, loader_data);
--- a/hotspot/src/share/vm/classfile/placeholders.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/placeholders.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@
};
// find_and_add returns probe pointer - old or new
- // If no entry exists, add a placeholder entry and push SeenThread
+ // If no entry exists, add a placeholder entry and push SeenThread for classloadAction
// If entry exists, reuse entry and push SeenThread for classloadAction
PlaceholderEntry* find_and_add(int index, unsigned int hash,
Symbol* name, ClassLoaderData* loader_data,
@@ -92,9 +92,11 @@
void remove_entry(int index, unsigned int hash,
Symbol* name, ClassLoaderData* loader_data);
-// Remove placeholder information
+ // find_and_remove first removes SeenThread for classloadAction
+ // If all queues are empty and definer is null, remove the PlacheholderEntry completely
void find_and_remove(int index, unsigned int hash,
- Symbol* name, ClassLoaderData* loader_data, Thread* thread);
+ Symbol* name, ClassLoaderData* loader_data,
+ classloadAction action, Thread* thread);
// GC support.
void classes_do(KlassClosure* f);
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -172,7 +172,7 @@
assert(klass_h() == NULL, "Should not have result with exception pending");
Handle e(THREAD, PENDING_EXCEPTION);
CLEAR_PENDING_EXCEPTION;
- THROW_MSG_CAUSE_0(vmSymbols::java_lang_NoClassDefFoundError(), class_name->as_C_string(), e);
+ THROW_MSG_CAUSE_NULL(vmSymbols::java_lang_NoClassDefFoundError(), class_name->as_C_string(), e);
} else {
return NULL;
}
@@ -181,9 +181,9 @@
if (klass_h() == NULL) {
ResourceMark rm(THREAD);
if (throw_error) {
- THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), class_name->as_C_string());
+ THROW_MSG_NULL(vmSymbols::java_lang_NoClassDefFoundError(), class_name->as_C_string());
} else {
- THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), class_name->as_C_string());
+ THROW_MSG_NULL(vmSymbols::java_lang_ClassNotFoundException(), class_name->as_C_string());
}
}
return (Klass*)klass_h();
@@ -343,29 +343,29 @@
}
if (throw_circularity_error) {
ResourceMark rm(THREAD);
- THROW_MSG_0(vmSymbols::java_lang_ClassCircularityError(), child_name->as_C_string());
+ THROW_MSG_NULL(vmSymbols::java_lang_ClassCircularityError(), child_name->as_C_string());
}
// java.lang.Object should have been found above
assert(class_name != NULL, "null super class for resolving");
// Resolve the super class or interface, check results on return
- Klass* superk = NULL;
- superk = SystemDictionary::resolve_or_null(class_name,
+ Klass* superk = SystemDictionary::resolve_or_null(class_name,
class_loader,
protection_domain,
THREAD);
KlassHandle superk_h(THREAD, superk);
- // Note: clean up of placeholders currently in callers of
- // resolve_super_or_fail - either at update_dictionary time
- // or on error
+ // Clean up of placeholders moved so that each classloadAction registrar self-cleans up
+ // It is no longer necessary to keep the placeholder table alive until update_dictionary
+ // or error. GC used to walk the placeholder table as strong roots.
+ // The instanceKlass is kept alive because the class loader is on the stack,
+ // which keeps the loader_data alive, as well as all instanceKlasses in
+ // the loader_data. parseClassFile adds the instanceKlass to loader_data.
{
- MutexLocker mu(SystemDictionary_lock, THREAD);
- PlaceholderEntry* probe = placeholders()->get_entry(p_index, p_hash, child_name, loader_data);
- if (probe != NULL) {
- probe->remove_seen_thread(THREAD, PlaceholderTable::LOAD_SUPER);
- }
+ MutexLocker mu(SystemDictionary_lock, THREAD);
+ placeholders()->find_and_remove(p_index, p_hash, child_name, loader_data, PlaceholderTable::LOAD_SUPER, THREAD);
+ SystemDictionary_lock->notify_all();
}
if (HAS_PENDING_EXCEPTION || superk_h() == NULL) {
// can null superk
@@ -430,8 +430,8 @@
// We're using a No_Safepoint_Verifier to catch any place where we
// might potentially do a GC at all.
- // SystemDictionary::do_unloading() asserts that classes are only
- // unloaded at a safepoint.
+ // Dictionary::do_unloading() asserts that classes in SD are only
+ // unloaded at a safepoint. Anonymous classes are not in SD.
No_Safepoint_Verifier nosafepoint;
dictionary()->add_protection_domain(d_index, d_hash, klass, loader_data,
protection_domain, THREAD);
@@ -486,7 +486,6 @@
// super class loading here.
// This also is critical in cases where the original thread gets stalled
// even in non-circularity situations.
-// Note: only one thread can define the class, but multiple can resolve
// Note: must call resolve_super_or_fail even if null super -
// to force placeholder entry creation for this class for circularity detection
// Caller must check for pending exception
@@ -518,14 +517,6 @@
protection_domain,
true,
CHECK_(nh));
- // We don't redefine the class, so we just need to clean up if there
- // was not an error (don't want to modify any system dictionary
- // data structures).
- {
- MutexLocker mu(SystemDictionary_lock, THREAD);
- placeholders()->find_and_remove(p_index, p_hash, name, loader_data, THREAD);
- SystemDictionary_lock->notify_all();
- }
// parallelCapable class loaders do NOT wait for parallel superclass loads to complete
// Serial class loaders and bootstrap classloader do wait for superclass loads
@@ -595,6 +586,10 @@
// Do lookup to see if class already exist and the protection domain
// has the right access
+ // This call uses find which checks protection domain already matches
+ // All subsequent calls use find_class, and set has_loaded_class so that
+ // before we return a result we call out to java to check for valid protection domain
+ // to allow returning the Klass* and add it to the pd_set if it is valid
unsigned int d_hash = dictionary()->compute_hash(name, loader_data);
int d_index = dictionary()->hash_to_index(d_hash);
Klass* probe = dictionary()->find(d_index, d_hash, name, loader_data,
@@ -652,7 +647,7 @@
}
}
- // If the class in is in the placeholder table, class loading is in progress
+ // If the class is in the placeholder table, class loading is in progress
if (super_load_in_progress && havesupername==true) {
k = SystemDictionary::handle_parallel_super_load(name, superclassname,
class_loader, protection_domain, lockObject, THREAD);
@@ -664,7 +659,9 @@
}
}
+ bool throw_circularity_error = false;
if (!class_has_been_loaded) {
+ bool load_instance_added = false;
// add placeholder entry to record loading instance class
// Five cases:
@@ -690,7 +687,7 @@
// No performance benefit and no deadlock issues.
// case 5. parallelCapable user level classloaders - without objectLocker
// Allow parallel classloading of a class/classloader pair
- bool throw_circularity_error = false;
+
{
MutexLocker mu(SystemDictionary_lock, THREAD);
if (class_loader.is_null() || !is_parallelCapable(class_loader)) {
@@ -726,12 +723,13 @@
}
}
}
- // All cases: add LOAD_INSTANCE
+ // All cases: add LOAD_INSTANCE holding SystemDictionary_lock
// case 3: UnsyncloadClass || case 5: parallelCapable: allow competing threads to try
// LOAD_INSTANCE in parallel
- // add placeholder entry even if error - callers will remove on error
+
if (!throw_circularity_error && !class_has_been_loaded) {
PlaceholderEntry* newprobe = placeholders()->find_and_add(p_index, p_hash, name, loader_data, PlaceholderTable::LOAD_INSTANCE, NULL, THREAD);
+ load_instance_added = true;
// For class loaders that do not acquire the classloader object lock,
// if they did not catch another thread holding LOAD_INSTANCE,
// need a check analogous to the acquire ObjectLocker/find_class
@@ -740,19 +738,18 @@
// class loaders holding the ObjectLock shouldn't find the class here
Klass* check = find_class(d_index, d_hash, name, loader_data);
if (check != NULL) {
- // Klass is already loaded, so just return it
+ // Klass is already loaded, so return it after checking/adding protection domain
k = instanceKlassHandle(THREAD, check);
class_has_been_loaded = true;
- newprobe->remove_seen_thread(THREAD, PlaceholderTable::LOAD_INSTANCE);
- placeholders()->find_and_remove(p_index, p_hash, name, loader_data, THREAD);
- SystemDictionary_lock->notify_all();
}
}
}
+
// must throw error outside of owning lock
if (throw_circularity_error) {
+ assert(!HAS_PENDING_EXCEPTION && load_instance_added == false,"circularity error cleanup");
ResourceMark rm(THREAD);
- THROW_MSG_0(vmSymbols::java_lang_ClassCircularityError(), name->as_C_string());
+ THROW_MSG_NULL(vmSymbols::java_lang_ClassCircularityError(), name->as_C_string());
}
if (!class_has_been_loaded) {
@@ -782,20 +779,6 @@
}
}
- // clean up placeholder entries for success or error
- // This cleans up LOAD_INSTANCE entries
- // It also cleans up LOAD_SUPER entries on errors from
- // calling load_instance_class
- {
- MutexLocker mu(SystemDictionary_lock, THREAD);
- PlaceholderEntry* probe = placeholders()->get_entry(p_index, p_hash, name, loader_data);
- if (probe != NULL) {
- probe->remove_seen_thread(THREAD, PlaceholderTable::LOAD_INSTANCE);
- placeholders()->find_and_remove(p_index, p_hash, name, loader_data, THREAD);
- SystemDictionary_lock->notify_all();
- }
- }
-
// If everything was OK (no exceptions, no null return value), and
// class_loader is NOT the defining loader, do a little more bookkeeping.
if (!HAS_PENDING_EXCEPTION && !k.is_null() &&
@@ -819,18 +802,22 @@
}
}
}
- if (HAS_PENDING_EXCEPTION || k.is_null()) {
- // On error, clean up placeholders
- {
- MutexLocker mu(SystemDictionary_lock, THREAD);
- placeholders()->find_and_remove(p_index, p_hash, name, loader_data, THREAD);
- SystemDictionary_lock->notify_all();
- }
- return NULL;
- }
+ } // load_instance_class loop
+
+ if (load_instance_added == true) {
+ // clean up placeholder entries for LOAD_INSTANCE success or error
+ // This brackets the SystemDictionary updates for both defining
+ // and initiating loaders
+ MutexLocker mu(SystemDictionary_lock, THREAD);
+ placeholders()->find_and_remove(p_index, p_hash, name, loader_data, PlaceholderTable::LOAD_INSTANCE, THREAD);
+ SystemDictionary_lock->notify_all();
}
}
+ if (HAS_PENDING_EXCEPTION || k.is_null()) {
+ return NULL;
+ }
+
#ifdef ASSERT
{
ClassLoaderData* loader_data = k->class_loader_data();
@@ -850,8 +837,8 @@
// so we cannot allow GC to occur while we're holding this entry.
// We're using a No_Safepoint_Verifier to catch any place where we
// might potentially do a GC at all.
- // SystemDictionary::do_unloading() asserts that classes are only
- // unloaded at a safepoint.
+ // Dictionary::do_unloading() asserts that classes in SD are only
+ // unloaded at a safepoint. Anonymous classes are not in SD.
No_Safepoint_Verifier nosafepoint;
if (dictionary()->is_valid_protection_domain(d_index, d_hash, name,
loader_data,
@@ -898,8 +885,8 @@
// so we cannot allow GC to occur while we're holding this entry.
// We're using a No_Safepoint_Verifier to catch any place where we
// might potentially do a GC at all.
- // SystemDictionary::do_unloading() asserts that classes are only
- // unloaded at a safepoint.
+ // Dictionary::do_unloading() asserts that classes in SD are only
+ // unloaded at a safepoint. Anonymous classes are not in SD.
No_Safepoint_Verifier nosafepoint;
return dictionary()->find(d_index, d_hash, class_name, loader_data,
protection_domain, THREAD);
@@ -965,10 +952,6 @@
// throw potential ClassFormatErrors.
//
// Note: "name" is updated.
- // Further note: a placeholder will be added for this class when
- // super classes are loaded (resolve_super_or_fail). We expect this
- // to be called for all classes but java.lang.Object; and we preload
- // java.lang.Object through resolve_or_fail, not this path.
instanceKlassHandle k = ClassFileParser(st).parseClassFile(class_name,
loader_data,
@@ -979,21 +962,6 @@
true,
THREAD);
- // We don't redefine the class, so we just need to clean up whether there
- // was an error or not (don't want to modify any system dictionary
- // data structures).
- // Parsed name could be null if we threw an error before we got far
- // enough along to parse it -- in that case, there is nothing to clean up.
- if (parsed_name != NULL) {
- unsigned int p_hash = placeholders()->compute_hash(parsed_name,
- loader_data);
- int p_index = placeholders()->hash_to_index(p_hash);
- {
- MutexLocker mu(SystemDictionary_lock, THREAD);
- placeholders()->find_and_remove(p_index, p_hash, parsed_name, loader_data, THREAD);
- SystemDictionary_lock->notify_all();
- }
- }
if (host_klass.not_null() && k.not_null()) {
assert(EnableInvokeDynamic, "");
@@ -1062,10 +1030,6 @@
// throw potential ClassFormatErrors.
//
// Note: "name" is updated.
- // Further note: a placeholder will be added for this class when
- // super classes are loaded (resolve_super_or_fail). We expect this
- // to be called for all classes but java.lang.Object; and we preload
- // java.lang.Object through resolve_or_fail, not this path.
instanceKlassHandle k = ClassFileParser(st).parseClassFile(class_name,
loader_data,
@@ -1114,25 +1078,7 @@
}
}
- // If parsing the class file or define_instance_class failed, we
- // need to remove the placeholder added on our behalf. But we
- // must make sure parsed_name is valid first (it won't be if we had
- // a format error before the class was parsed far enough to
- // find the name).
- if (HAS_PENDING_EXCEPTION && parsed_name != NULL) {
- unsigned int p_hash = placeholders()->compute_hash(parsed_name,
- loader_data);
- int p_index = placeholders()->hash_to_index(p_hash);
- {
- MutexLocker mu(SystemDictionary_lock, THREAD);
- placeholders()->find_and_remove(p_index, p_hash, parsed_name, loader_data, THREAD);
- SystemDictionary_lock->notify_all();
- }
- return NULL;
- }
-
- // Make sure that we didn't leave a place holder in the
- // SystemDictionary; this is only done on success
+ // Make sure we have an entry in the SystemDictionary on success
debug_only( {
if (!HAS_PENDING_EXCEPTION) {
assert(parsed_name != NULL, "parsed_name is still null?");
@@ -1547,8 +1493,7 @@
// Other cases fall through, and may run into duplicate defines
// caught by finding an entry in the SystemDictionary
if ((UnsyncloadClass || is_parallelDefine(class_loader)) && (probe->instance_klass() != NULL)) {
- probe->remove_seen_thread(THREAD, PlaceholderTable::DEFINE_CLASS);
- placeholders()->find_and_remove(p_index, p_hash, name_h, loader_data, THREAD);
+ placeholders()->find_and_remove(p_index, p_hash, name_h, loader_data, PlaceholderTable::DEFINE_CLASS, THREAD);
SystemDictionary_lock->notify_all();
#ifdef ASSERT
Klass* check = find_class(d_index, d_hash, name_h, loader_data);
@@ -1578,8 +1523,7 @@
probe->set_instance_klass(k());
}
probe->set_definer(NULL);
- probe->remove_seen_thread(THREAD, PlaceholderTable::DEFINE_CLASS);
- placeholders()->find_and_remove(p_index, p_hash, name_h, loader_data, THREAD);
+ placeholders()->find_and_remove(p_index, p_hash, name_h, loader_data, PlaceholderTable::DEFINE_CLASS, THREAD);
SystemDictionary_lock->notify_all();
}
}
@@ -1736,6 +1680,8 @@
}
return newsize;
}
+// Assumes classes in the SystemDictionary are only unloaded at a safepoint
+// Note: anonymous classes are not in the SD.
bool SystemDictionary::do_unloading(BoolObjectClosure* is_alive) {
// First, mark for unload all ClassLoaderData referencing a dead class loader.
bool has_dead_loaders = ClassLoaderDataGraph::do_unloading(is_alive);
@@ -2105,9 +2051,7 @@
// All loaded classes get a unique ID.
TRACE_INIT_ID(k);
- // Check for a placeholder. If there, remove it and make a
- // new system dictionary entry.
- placeholders()->find_and_remove(p_index, p_hash, name, loader_data, THREAD);
+ // Make a new system dictionary entry.
Klass* sd_check = find_class(d_index, d_hash, name, loader_data);
if (sd_check == NULL) {
dictionary()->add_klass(name, loader_data, k);
@@ -2116,12 +2060,8 @@
#ifdef ASSERT
sd_check = find_class(d_index, d_hash, name, loader_data);
assert (sd_check != NULL, "should have entry in system dictionary");
-// Changed to allow PH to remain to complete class circularity checking
-// while only one thread can define a class at one time, multiple
-// classes can resolve the superclass for a class at one time,
-// and the placeholder is used to track that
-// Symbol* ph_check = find_placeholder(name, class_loader);
-// assert (ph_check == NULL, "should not have a placeholder entry");
+ // Note: there may be a placeholder entry: for circularity testing
+ // or for parallel defines
#endif
SystemDictionary_lock->notify_all();
}
--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -131,6 +131,7 @@
do_klass(Properties_klass, java_util_Properties, Pre ) \
do_klass(reflect_AccessibleObject_klass, java_lang_reflect_AccessibleObject, Pre ) \
do_klass(reflect_Field_klass, java_lang_reflect_Field, Pre ) \
+ do_klass(reflect_Parameter_klass, java_lang_reflect_Parameter, Opt ) \
do_klass(reflect_Method_klass, java_lang_reflect_Method, Pre ) \
do_klass(reflect_Constructor_klass, java_lang_reflect_Constructor, Pre ) \
\
@@ -459,6 +460,7 @@
// Tells whether ClassLoader.checkPackageAccess is present
static bool has_checkPackageAccess() { return _has_checkPackageAccess; }
+ static bool Parameter_klass_loaded() { return WK_KLASS(reflect_Parameter_klass) != NULL; }
static bool Class_klass_loaded() { return WK_KLASS(Class_klass) != NULL; }
static bool Cloneable_klass_loaded() { return WK_KLASS(Cloneable_klass) != NULL; }
static bool Object_klass_loaded() { return WK_KLASS(Object_klass) != NULL; }
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -86,6 +86,7 @@
template(java_lang_reflect_Method, "java/lang/reflect/Method") \
template(java_lang_reflect_Constructor, "java/lang/reflect/Constructor") \
template(java_lang_reflect_Field, "java/lang/reflect/Field") \
+ template(java_lang_reflect_Parameter, "java/lang/reflect/Parameter") \
template(java_lang_reflect_Array, "java/lang/reflect/Array") \
template(java_lang_StringBuffer, "java/lang/StringBuffer") \
template(java_lang_StringBuilder, "java/lang/StringBuilder") \
@@ -126,6 +127,7 @@
template(tag_line_number_table, "LineNumberTable") \
template(tag_local_variable_table, "LocalVariableTable") \
template(tag_local_variable_type_table, "LocalVariableTypeTable") \
+ template(tag_method_parameters, "MethodParameters") \
template(tag_stack_map_table, "StackMapTable") \
template(tag_synthetic, "Synthetic") \
template(tag_deprecated, "Deprecated") \
@@ -136,6 +138,8 @@
template(tag_runtime_visible_parameter_annotations, "RuntimeVisibleParameterAnnotations") \
template(tag_runtime_invisible_parameter_annotations,"RuntimeInvisibleParameterAnnotations") \
template(tag_annotation_default, "AnnotationDefault") \
+ template(tag_runtime_visible_type_annotations, "RuntimeVisibleTypeAnnotations") \
+ template(tag_runtime_invisible_type_annotations, "RuntimeInvisibleTypeAnnotations") \
template(tag_enclosing_method, "EnclosingMethod") \
template(tag_bootstrap_methods, "BootstrapMethods") \
\
@@ -190,7 +194,10 @@
template(java_lang_VirtualMachineError, "java/lang/VirtualMachineError") \
template(java_lang_StackOverflowError, "java/lang/StackOverflowError") \
template(java_lang_StackTraceElement, "java/lang/StackTraceElement") \
+ \
+ /* Concurrency support */ \
template(java_util_concurrent_locks_AbstractOwnableSynchronizer, "java/util/concurrent/locks/AbstractOwnableSynchronizer") \
+ template(sun_misc_Contended_signature, "Lsun/misc/Contended;") \
\
/* class symbols needed by intrinsics */ \
VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, template, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \
@@ -233,12 +240,17 @@
/* Support for annotations (JDK 1.5 and above) */ \
\
template(annotations_name, "annotations") \
+ template(index_name, "index") \
+ template(executable_name, "executable") \
template(parameter_annotations_name, "parameterAnnotations") \
template(annotation_default_name, "annotationDefault") \
template(sun_reflect_ConstantPool, "sun/reflect/ConstantPool") \
template(ConstantPool_name, "constantPoolOop") \
template(sun_reflect_UnsafeStaticFieldAccessorImpl, "sun/reflect/UnsafeStaticFieldAccessorImpl")\
template(base_name, "base") \
+ /* Type Annotations (JDK 8 and above) */ \
+ template(type_annotations_name, "typeAnnotations") \
+ \
\
/* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \
template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
@@ -275,7 +287,7 @@
NOT_LP64( do_alias(intptr_signature, int_signature) ) \
LP64_ONLY( do_alias(intptr_signature, long_signature) ) \
template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \
- \
+ \
/* common method and field names */ \
template(object_initializer_name, "<init>") \
template(class_initializer_name, "<clinit>") \
@@ -374,7 +386,6 @@
template(basicType_name, "basicType") \
template(append_name, "append") \
template(klass_name, "klass") \
- template(resolved_constructor_name, "resolved_constructor") \
template(array_klass_name, "array_klass") \
template(oop_size_name, "oop_size") \
template(static_oop_field_count_name, "static_oop_field_count") \
@@ -470,6 +481,7 @@
template(class_signature, "Ljava/lang/Class;") \
template(string_signature, "Ljava/lang/String;") \
template(reference_signature, "Ljava/lang/ref/Reference;") \
+ template(executable_signature, "Ljava/lang/reflect/Executable;") \
template(concurrenthashmap_signature, "Ljava/util/concurrent/ConcurrentHashMap;") \
template(String_StringBuilder_signature, "(Ljava/lang/String;)Ljava/lang/StringBuilder;") \
template(int_StringBuilder_signature, "(I)Ljava/lang/StringBuilder;") \
@@ -723,6 +735,11 @@
do_intrinsic(_checkIndex, java_nio_Buffer, checkIndex_name, int_int_signature, F_R) \
do_name( checkIndex_name, "checkIndex") \
\
+ do_class(sun_nio_cs_iso8859_1_Encoder, "sun/nio/cs/ISO_8859_1$Encoder") \
+ do_intrinsic(_encodeISOArray, sun_nio_cs_iso8859_1_Encoder, encodeISOArray_name, encodeISOArray_signature, F_S) \
+ do_name( encodeISOArray_name, "encodeISOArray") \
+ do_signature(encodeISOArray_signature, "([CI[BII)I") \
+ \
/* java/lang/ref/Reference */ \
do_intrinsic(_Reference_get, java_lang_ref_Reference, get_name, void_object_signature, F_R) \
\
--- a/hotspot/src/share/vm/code/codeCache.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/code/codeCache.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -30,6 +30,7 @@
#include "code/icBuffer.hpp"
#include "code/nmethod.hpp"
#include "code/pcDesc.hpp"
+#include "compiler/compileBroker.hpp"
#include "gc_implementation/shared/markSweep.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/gcLocker.hpp"
@@ -39,6 +40,7 @@
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/handles.inline.hpp"
+#include "runtime/arguments.hpp"
#include "runtime/icache.hpp"
#include "runtime/java.hpp"
#include "runtime/mutexLocker.hpp"
@@ -168,6 +170,8 @@
return (nmethod*)cb;
}
+static size_t maxCodeCacheUsed = 0;
+
CodeBlob* CodeCache::allocate(int size) {
// Do not seize the CodeCache lock here--if the caller has not
// already done so, we are going to lose bigtime, since the code
@@ -192,6 +196,8 @@
(address)_heap->end() - (address)_heap->begin());
}
}
+ maxCodeCacheUsed = MAX2(maxCodeCacheUsed, ((address)_heap->high_boundary() -
+ (address)_heap->low_boundary()) - unallocated_capacity());
verify_if_often();
print_trace("allocation", cb, size);
return cb;
@@ -928,7 +934,14 @@
FREE_C_HEAP_ARRAY(int, buckets, mtCode);
}
+#endif // !PRODUCT
+
void CodeCache::print() {
+ print_summary(tty);
+
+#ifndef PRODUCT
+ if (!Verbose) return;
+
CodeBlob_sizes live;
CodeBlob_sizes dead;
@@ -953,7 +966,7 @@
}
- if (Verbose) {
+ if (WizardMode) {
// print the oop_map usage
int code_size = 0;
int number_of_blobs = 0;
@@ -977,20 +990,30 @@
tty->print_cr(" map size = %d", map_size);
}
+#endif // !PRODUCT
}
-#endif // PRODUCT
+void CodeCache::print_summary(outputStream* st, bool detailed) {
+ size_t total = (_heap->high_boundary() - _heap->low_boundary());
+ st->print_cr("CodeCache: size=" SIZE_FORMAT "Kb used=" SIZE_FORMAT
+ "Kb max_used=" SIZE_FORMAT "Kb free=" SIZE_FORMAT
+ "Kb max_free_chunk=" SIZE_FORMAT "Kb",
+ total/K, (total - unallocated_capacity())/K,
+ maxCodeCacheUsed/K, unallocated_capacity()/K, largest_free_block()/K);
-void CodeCache::print_bounds(outputStream* st) {
- st->print_cr("Code Cache [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
- _heap->low_boundary(),
- _heap->high(),
- _heap->high_boundary());
- st->print_cr(" total_blobs=" UINT32_FORMAT " nmethods=" UINT32_FORMAT
- " adapters=" UINT32_FORMAT " free_code_cache=" SIZE_FORMAT "Kb"
- " largest_free_block=" SIZE_FORMAT,
- nof_blobs(), nof_nmethods(), nof_adapters(),
- unallocated_capacity()/K, largest_free_block());
+ if (detailed) {
+ st->print_cr(" bounds [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT "]",
+ _heap->low_boundary(),
+ _heap->high(),
+ _heap->high_boundary());
+ st->print_cr(" total_blobs=" UINT32_FORMAT " nmethods=" UINT32_FORMAT
+ " adapters=" UINT32_FORMAT,
+ nof_blobs(), nof_nmethods(), nof_adapters());
+ st->print_cr(" compilation: %s", CompileBroker::should_compile_new_jobs() ?
+ "enabled" : Arguments::mode() == Arguments::_int ?
+ "disabled (interpreter mode)" :
+ "disabled (not enough contiguous free space left)");
+ }
}
void CodeCache::log_state(outputStream* st) {
--- a/hotspot/src/share/vm/code/codeCache.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/code/codeCache.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -145,11 +145,11 @@
static void prune_scavenge_root_nmethods();
// Printing/debugging
- static void print() PRODUCT_RETURN; // prints summary
+ static void print(); // prints summary
static void print_internals();
static void verify(); // verifies the code cache
static void print_trace(const char* event, CodeBlob* cb, int size = 0) PRODUCT_RETURN;
- static void print_bounds(outputStream* st); // Prints a summary of the bounds of the code cache
+ static void print_summary(outputStream* st, bool detailed = true); // Prints a summary of the code cache usage
static void log_state(outputStream* st);
// The full limits of the codeCache
--- a/hotspot/src/share/vm/compiler/abstractCompiler.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/compiler/abstractCompiler.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -50,6 +50,7 @@
// Missing feature tests
virtual bool supports_native() { return true; }
virtual bool supports_osr () { return true; }
+ virtual bool can_compile_method(methodHandle method) { return true; }
#if defined(TIERED) || ( !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK))
virtual bool is_c1 () { return false; }
virtual bool is_c2 () { return false; }
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1218,7 +1218,7 @@
// lock, make sure that the compilation
// isn't prohibited in a straightforward way.
- if (compiler(comp_level) == NULL || compilation_is_prohibited(method, osr_bci, comp_level)) {
+ if (compiler(comp_level) == NULL || !compiler(comp_level)->can_compile_method(method) || compilation_is_prohibited(method, osr_bci, comp_level)) {
return NULL;
}
@@ -1714,6 +1714,20 @@
}
}
+// wrapper for CodeCache::print_summary()
+static void codecache_print(bool detailed)
+{
+ ResourceMark rm;
+ stringStream s;
+ // Dump code cache into a buffer before locking the tty,
+ {
+ MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+ CodeCache::print_summary(&s, detailed);
+ }
+ ttyLocker ttyl;
+ tty->print_cr(s.as_string());
+}
+
// ------------------------------------------------------------------
// CompileBroker::invoke_compiler_on_method
//
@@ -1841,6 +1855,9 @@
tty->print_cr("size: %d time: %d inlined: %d bytes", code_size, (int)time.milliseconds(), task->num_inlined_bytecodes());
}
+ if (PrintCodeCacheOnCompilation)
+ codecache_print(/* detailed= */ false);
+
// Disable compilation, if required.
switch (compilable) {
case ciEnv::MethodCompilable_never:
@@ -1885,6 +1902,7 @@
UseInterpreter = true;
if (UseCompiler || AlwaysCompileLoopMethods ) {
if (xtty != NULL) {
+ ResourceMark rm;
stringStream s;
// Dump code cache state into a buffer before locking the tty,
// because log_state() will use locks causing lock conflicts.
@@ -1898,9 +1916,9 @@
}
warning("CodeCache is full. Compiler has been disabled.");
warning("Try increasing the code cache size using -XX:ReservedCodeCacheSize=");
- CodeCache::print_bounds(tty);
#ifndef PRODUCT
if (CompileTheWorld || ExitOnFullCodeCache) {
+ codecache_print(/* detailed= */ true);
before_exit(JavaThread::current());
exit_globals(); // will delete tty
vm_direct_exit(CompileTheWorld ? 0 : 1);
@@ -1913,6 +1931,7 @@
AlwaysCompileLoopMethods = false;
}
}
+ codecache_print(/* detailed= */ true);
}
// ------------------------------------------------------------------
--- a/hotspot/src/share/vm/compiler/oopMap.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/compiler/oopMap.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -542,17 +542,17 @@
st->print("Oop");
break;
case OopMapValue::value_value:
- st->print("Value" );
+ st->print("Value");
break;
case OopMapValue::narrowoop_value:
- tty->print("NarrowOop" );
+ st->print("NarrowOop");
break;
case OopMapValue::callee_saved_value:
- st->print("Callers_" );
+ st->print("Callers_");
optional->print_on(st);
break;
case OopMapValue::derived_oop_value:
- st->print("Derived_oop_" );
+ st->print("Derived_oop_");
optional->print_on(st);
break;
default:
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -56,7 +56,7 @@
if (_generations == NULL)
vm_exit_during_initialization("Unable to allocate gen spec");
- if (ParNewGeneration::in_use()) {
+ if (UseParNewGC) {
if (UseAdaptiveSizePolicy) {
_generations[0] = new GenerationSpec(Generation::ASParNew,
_initial_gen0_size, _max_gen0_size);
@@ -96,7 +96,7 @@
void ConcurrentMarkSweepPolicy::initialize_gc_policy_counters() {
// initialize the policy counters - 2 collectors, 3 generations
- if (ParNewGeneration::in_use()) {
+ if (UseParNewGC) {
_gc_policy_counters = new GCPolicyCounters("ParNew:CMS", 2, 3);
}
else {
@@ -119,7 +119,7 @@
assert(size_policy() != NULL, "A size policy is required");
// initialize the policy counters - 2 collectors, 3 generations
- if (ParNewGeneration::in_use()) {
+ if (UseParNewGC) {
_gc_policy_counters = new CMSGCAdaptivePolicyCounters("ParNew:CMS", 2, 3,
size_policy());
}
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -214,7 +214,6 @@
assert(q->forwardee() == NULL, "should be forwarded to NULL");
}
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::register_live_oop(q, adjusted_size));
compact_top += adjusted_size;
// we need to update the offset table so that the beginnings of objects can be
@@ -555,7 +554,7 @@
reportIndexedFreeListStatistics();
size_t total_size = totalSizeInIndexedFreeLists() +
_dictionary->total_chunk_size(DEBUG_ONLY(freelistLock()));
- gclog_or_tty->print(" free=%ld frag=%1.4f\n", total_size, flsFrag());
+ gclog_or_tty->print(" free=" SIZE_FORMAT " frag=%1.4f\n", total_size, flsFrag());
}
}
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -827,10 +827,10 @@
GenCollectedHeap* gch = GenCollectedHeap::heap();
if (PrintGCDetails) {
if (Verbose) {
- gclog_or_tty->print(" [%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]",
+ gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]",
level(), short_name(), s, used(), capacity());
} else {
- gclog_or_tty->print(" [%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]",
+ gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]",
level(), short_name(), s, used() / K, capacity() / K);
}
}
@@ -3338,7 +3338,7 @@
if (Verbose && PrintGC) {
size_t new_mem_size = _virtual_space.committed_size();
size_t old_mem_size = new_mem_size - bytes;
- gclog_or_tty->print_cr("Expanding %s from %ldK by %ldK to %ldK",
+ gclog_or_tty->print_cr("Expanding %s from " SIZE_FORMAT "K by " SIZE_FORMAT "K to " SIZE_FORMAT "K",
name(), old_mem_size/K, bytes/K, new_mem_size/K);
}
}
@@ -9203,7 +9203,7 @@
if (Verbose && PrintGCDetails) {
size_t new_mem_size = _virtual_space.committed_size();
size_t old_mem_size = new_mem_size + bytes;
- gclog_or_tty->print_cr("Shrinking %s from %ldK by %ldK to %ldK",
+ gclog_or_tty->print_cr("Shrinking %s from " SIZE_FORMAT "K by " SIZE_FORMAT "K to " SIZE_FORMAT "K",
name(), old_mem_size/K, bytes/K, new_mem_size/K);
}
}
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -85,7 +85,7 @@
_curr_index(0), _length(0), _first_par_unreserved_idx(0),
_region_live_threshold_bytes(0), _remaining_reclaimable_bytes(0) {
_region_live_threshold_bytes =
- HeapRegion::GrainBytes * (size_t) G1OldCSetRegionLiveThresholdPercent / 100;
+ HeapRegion::GrainBytes * (size_t) G1MixedGCLiveThresholdPercent / 100;
}
#ifndef PRODUCT
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -192,6 +192,7 @@
setEmpty();
_capacity = (jint) capacity;
_saved_index = -1;
+ _should_expand = false;
NOT_PRODUCT(_max_depth = 0);
return true;
}
@@ -747,8 +748,8 @@
assert(_heap_end != NULL, "heap bounds should look ok");
assert(_heap_start < _heap_end, "heap bounds should look ok");
- // reset all the marking data structures and any necessary flags
- clear_marking_state();
+ // Reset all the marking data structures and any necessary flags
+ reset_marking_state();
if (verbose_low()) {
gclog_or_tty->print_cr("[global] resetting");
@@ -766,6 +767,23 @@
set_concurrent_marking_in_progress();
}
+
+void ConcurrentMark::reset_marking_state(bool clear_overflow) {
+ _markStack.set_should_expand();
+ _markStack.setEmpty(); // Also clears the _markStack overflow flag
+ if (clear_overflow) {
+ clear_has_overflown();
+ } else {
+ assert(has_overflown(), "pre-condition");
+ }
+ _finger = _heap_start;
+
+ for (uint i = 0; i < _max_worker_id; ++i) {
+ CMTaskQueue* queue = _task_queues->queue(i);
+ queue->set_empty();
+ }
+}
+
void ConcurrentMark::set_phase(uint active_tasks, bool concurrent) {
assert(active_tasks <= _max_worker_id, "we should not have more");
@@ -796,7 +814,7 @@
void ConcurrentMark::set_non_marking_state() {
// We set the global marking state to some default values when we're
// not doing marking.
- clear_marking_state();
+ reset_marking_state();
_active_tasks = 0;
clear_concurrent_marking_in_progress();
}
@@ -963,7 +981,7 @@
// not clear the overflow flag since we rely on it being true when
// we exit this method to abort the pause and restart concurent
// marking.
- clear_marking_state(concurrent() /* clear_overflow */);
+ reset_marking_state(concurrent() /* clear_overflow */);
force_overflow()->update();
if (G1Log::fine()) {
@@ -1257,8 +1275,9 @@
if (has_overflown()) {
// Oops. We overflowed. Restart concurrent marking.
_restart_for_overflow = true;
- // Clear the flag. We do not need it any more.
- clear_has_overflown();
+ // Clear the marking state because we will be restarting
+ // marking due to overflowing the global mark stack.
+ reset_marking_state();
if (G1TraceMarkStackOverflow) {
gclog_or_tty->print_cr("\nRemark led to restart for overflow.");
}
@@ -1282,6 +1301,8 @@
/* option */ VerifyOption_G1UseNextMarking);
}
assert(!restart_for_overflow(), "sanity");
+ // Completely reset the marking state since marking completed
+ set_non_marking_state();
}
// Expand the marking stack, if we have to and if we can.
@@ -1289,11 +1310,6 @@
_markStack.expand();
}
- // Reset the marking state if marking completed
- if (!restart_for_overflow()) {
- set_non_marking_state();
- }
-
#if VERIFY_OBJS_PROCESSED
_scan_obj_cl.objs_processed = 0;
ThreadLocalObjQueue::objs_enqueued = 0;
@@ -2963,22 +2979,6 @@
}
#endif // PRODUCT
-void ConcurrentMark::clear_marking_state(bool clear_overflow) {
- _markStack.set_should_expand();
- _markStack.setEmpty(); // Also clears the _markStack overflow flag
- if (clear_overflow) {
- clear_has_overflown();
- } else {
- assert(has_overflown(), "pre-condition");
- }
- _finger = _heap_start;
-
- for (uint i = 0; i < _max_worker_id; ++i) {
- CMTaskQueue* queue = _task_queues->queue(i);
- queue->set_empty();
- }
-}
-
// Aggregate the counting data that was constructed concurrently
// with marking.
class AggregateCountDataHRClosure: public HeapRegionClosure {
@@ -3185,7 +3185,7 @@
// Clear the liveness counting data
clear_all_count_data();
// Empty mark stack
- clear_marking_state();
+ reset_marking_state();
for (uint i = 0; i < _max_worker_id; ++i) {
_tasks[i]->clear_region_fields();
}
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -478,15 +478,18 @@
// It resets the global marking data structures, as well as the
// task local ones; should be called during initial mark.
void reset();
- // It resets all the marking data structures.
- void clear_marking_state(bool clear_overflow = true);
+
+ // Resets all the marking data structures. Called when we have to restart
+ // marking or when marking completes (via set_non_marking_state below).
+ void reset_marking_state(bool clear_overflow = true);
+
+ // We do this after we're done with marking so that the marking data
+ // structures are initialised to a sensible and predictable state.
+ void set_non_marking_state();
// It should be called to indicate which phase we're in (concurrent
// mark or remark) and how many threads are currently active.
void set_phase(uint active_tasks, bool concurrent);
- // We do this after we're done with marking so that the marking data
- // structures are initialised to a sensible and predictable state.
- void set_non_marking_state();
// prints all gathered CM-related statistics
void print_stats();
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -159,13 +159,11 @@
VM_CGC_Operation op(&final_cl, verbose_str, true /* needs_pll */);
VMThread::execute(&op);
}
- if (cm()->restart_for_overflow() &&
- G1TraceMarkStackOverflow) {
- gclog_or_tty->print_cr("Restarting conc marking because of MS overflow "
- "in remark (restart #%d).", iter);
- }
-
if (cm()->restart_for_overflow()) {
+ if (G1TraceMarkStackOverflow) {
+ gclog_or_tty->print_cr("Restarting conc marking because of MS overflow "
+ "in remark (restart #%d).", iter);
+ }
if (G1Log::fine()) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -3668,7 +3668,7 @@
gclog_or_tty->stamp(PrintGCTimeStamps);
GCCauseString gc_cause_str = GCCauseString("GC pause", gc_cause())
- .append(g1_policy()->gcs_are_young() ? " (young)" : " (mixed)")
+ .append(g1_policy()->gcs_are_young() ? "(young)" : "(mixed)")
.append(g1_policy()->during_initial_mark_pause() ? " (initial-mark)" : "");
gclog_or_tty->print("[%s", (const char*)gc_cause_str);
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -309,9 +309,9 @@
}
G1YoungGenSizer::G1YoungGenSizer() : _sizer_kind(SizerDefaults), _adaptive_size(true) {
- assert(G1DefaultMinNewGenPercent <= G1DefaultMaxNewGenPercent, "Min larger than max");
- assert(G1DefaultMinNewGenPercent > 0 && G1DefaultMinNewGenPercent < 100, "Min out of bounds");
- assert(G1DefaultMaxNewGenPercent > 0 && G1DefaultMaxNewGenPercent < 100, "Max out of bounds");
+ assert(G1NewSizePercent <= G1MaxNewSizePercent, "Min larger than max");
+ assert(G1NewSizePercent > 0 && G1NewSizePercent < 100, "Min out of bounds");
+ assert(G1MaxNewSizePercent > 0 && G1MaxNewSizePercent < 100, "Max out of bounds");
if (FLAG_IS_CMDLINE(NewRatio)) {
if (FLAG_IS_CMDLINE(NewSize) || FLAG_IS_CMDLINE(MaxNewSize)) {
@@ -344,12 +344,12 @@
}
uint G1YoungGenSizer::calculate_default_min_length(uint new_number_of_heap_regions) {
- uint default_value = (new_number_of_heap_regions * G1DefaultMinNewGenPercent) / 100;
+ uint default_value = (new_number_of_heap_regions * G1NewSizePercent) / 100;
return MAX2(1U, default_value);
}
uint G1YoungGenSizer::calculate_default_max_length(uint new_number_of_heap_regions) {
- uint default_value = (new_number_of_heap_regions * G1DefaultMaxNewGenPercent) / 100;
+ uint default_value = (new_number_of_heap_regions * G1MaxNewSizePercent) / 100;
return MAX2(1U, default_value);
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -94,18 +94,18 @@
// will occur.
//
// If nothing related to the the young gen size is set on the command
-// line we should allow the young gen to be between
-// G1DefaultMinNewGenPercent and G1DefaultMaxNewGenPercent of the
-// heap size. This means that every time the heap size changes the
-// limits for the young gen size will be updated.
+// line we should allow the young gen to be between G1NewSizePercent
+// and G1MaxNewSizePercent of the heap size. This means that every time
+// the heap size changes, the limits for the young gen size will be
+// recalculated.
//
// If only -XX:NewSize is set we should use the specified value as the
-// minimum size for young gen. Still using G1DefaultMaxNewGenPercent
-// of the heap as maximum.
+// minimum size for young gen. Still using G1MaxNewSizePercent of the
+// heap as maximum.
//
// If only -XX:MaxNewSize is set we should use the specified value as the
-// maximum size for young gen. Still using G1DefaultMinNewGenPercent
-// of the heap as minimum.
+// maximum size for young gen. Still using G1NewSizePercent of the heap
+// as minimum.
//
// If -XX:NewSize and -XX:MaxNewSize are both specified we use these values.
// No updates when the heap size changes. There is a special case when
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -131,17 +131,23 @@
#ifndef PRODUCT
+template <> const int WorkerDataArray<int>::_uninitialized = -1;
+template <> const double WorkerDataArray<double>::_uninitialized = -1.0;
+template <> const size_t WorkerDataArray<size_t>::_uninitialized = (size_t)-1;
+
template <class T>
void WorkerDataArray<T>::reset() {
for (uint i = 0; i < _length; i++) {
- _data[i] = (T)-1;
+ _data[i] = (T)_uninitialized;
}
}
template <class T>
void WorkerDataArray<T>::verify() {
for (uint i = 0; i < _length; i++) {
- assert(_data[i] >= (T)0, err_msg("Invalid data for worker %d", i));
+ assert(_data[i] != _uninitialized,
+ err_msg("Invalid data for worker " UINT32_FORMAT ", data: %lf, uninitialized: %lf",
+ i, (double)_data[i], (double)_uninitialized));
}
}
@@ -201,20 +207,20 @@
_last_termination_attempts.verify();
_last_gc_worker_end_times_ms.verify();
- for (uint i = 0; i < _active_gc_threads; i++) {
- double worker_time = _last_gc_worker_end_times_ms.get(i) - _last_gc_worker_start_times_ms.get(i);
- _last_gc_worker_times_ms.set(i, worker_time);
+ for (uint i = 0; i < _active_gc_threads; i++) {
+ double worker_time = _last_gc_worker_end_times_ms.get(i) - _last_gc_worker_start_times_ms.get(i);
+ _last_gc_worker_times_ms.set(i, worker_time);
- double worker_known_time = _last_ext_root_scan_times_ms.get(i) +
- _last_satb_filtering_times_ms.get(i) +
- _last_update_rs_times_ms.get(i) +
- _last_scan_rs_times_ms.get(i) +
- _last_obj_copy_times_ms.get(i) +
- _last_termination_times_ms.get(i);
+ double worker_known_time = _last_ext_root_scan_times_ms.get(i) +
+ _last_satb_filtering_times_ms.get(i) +
+ _last_update_rs_times_ms.get(i) +
+ _last_scan_rs_times_ms.get(i) +
+ _last_obj_copy_times_ms.get(i) +
+ _last_termination_times_ms.get(i);
- double worker_other_time = worker_time - worker_known_time;
- _last_gc_worker_other_times_ms.set(i, worker_other_time);
- }
+ double worker_other_time = worker_time - worker_known_time;
+ _last_gc_worker_other_times_ms.set(i, worker_other_time);
+ }
_last_gc_worker_times_ms.verify();
_last_gc_worker_other_times_ms.verify();
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -35,6 +35,8 @@
const char* _print_format;
bool _print_sum;
+ NOT_PRODUCT(static const T _uninitialized;)
+
// We are caching the sum and average to only have to calculate them once.
// This is not done in an MT-safe way. It is intetened to allow single
// threaded code to call sum() and average() multiple times in any order
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -282,10 +282,8 @@
if (r->startsHumongous()) {
// We must adjust the pointers on the single H object.
oop obj = oop(r->bottom());
- debug_only(GenMarkSweep::track_interior_pointers(obj));
// point all the oops to the new location
obj->adjust_pointers();
- debug_only(GenMarkSweep::check_interior_pointers());
}
} else {
// This really ought to be "as_CompactibleSpace"...
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -287,23 +287,24 @@
"The number of times we'll force an overflow during " \
"concurrent marking") \
\
- experimental(uintx, G1DefaultMinNewGenPercent, 20, \
- "Percentage (0-100) of the heap size to use as minimum " \
- "young gen size.") \
+ experimental(uintx, G1NewSizePercent, 5, \
+ "Percentage (0-100) of the heap size to use as default " \
+ "minimum young gen size.") \
\
- experimental(uintx, G1DefaultMaxNewGenPercent, 80, \
- "Percentage (0-100) of the heap size to use as maximum " \
- "young gen size.") \
+ experimental(uintx, G1MaxNewSizePercent, 60, \
+ "Percentage (0-100) of the heap size to use as default " \
+ " maximum young gen size.") \
\
- experimental(uintx, G1OldCSetRegionLiveThresholdPercent, 90, \
- "Threshold for regions to be added to the collection set. " \
- "Regions with more live bytes than this will not be collected.") \
+ experimental(uintx, G1MixedGCLiveThresholdPercent, 65, \
+ "Threshold for regions to be considered for inclusion in the " \
+ "collection set of mixed GCs. " \
+ "Regions with live bytes exceeding this will not be collected.") \
\
- product(uintx, G1HeapWastePercent, 5, \
+ product(uintx, G1HeapWastePercent, 10, \
"Amount of space, expressed as a percentage of the heap size, " \
"that G1 is willing not to collect to avoid expensive GCs.") \
\
- product(uintx, G1MixedGCCountTarget, 4, \
+ product(uintx, G1MixedGCCountTarget, 8, \
"The target number of mixed GCs after a marking cycle.") \
\
experimental(uintx, G1OldCSetRegionThresholdPercent, 10, \
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -878,12 +878,6 @@
bool ParNewGeneration::_avoid_promotion_undo = false;
-void ParNewGeneration::adjust_desired_tenuring_threshold() {
- // Set the desired survivor size to half the real survivor space
- _tenuring_threshold =
- age_table()->compute_tenuring_threshold(to()->capacity()/HeapWordSize);
-}
-
// A Generation that does parallel young-gen collection.
void ParNewGeneration::collect(bool full,
@@ -1013,6 +1007,8 @@
size_policy->reset_gc_overhead_limit_count();
assert(to()->is_empty(), "to space should be empty now");
+
+ adjust_desired_tenuring_threshold();
} else {
assert(_promo_failure_scan_stack.is_empty(), "post condition");
_promo_failure_scan_stack.clear(true); // Clear cached segments.
@@ -1035,7 +1031,6 @@
from()->set_concurrent_iteration_safe_limit(from()->top());
to()->set_concurrent_iteration_safe_limit(to()->top());
- adjust_desired_tenuring_threshold();
if (ResizePLAB) {
plab_stats()->adjust_desired_plab_sz(n_workers);
}
@@ -1623,7 +1618,3 @@
const char* ParNewGeneration::name() const {
return "par new generation";
}
-
-bool ParNewGeneration::in_use() {
- return UseParNewGC && ParallelGCThreads > 0;
-}
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -347,10 +347,6 @@
bool survivor_overflow() { return _survivor_overflow; }
void set_survivor_overflow(bool v) { _survivor_overflow = v; }
- // Adjust the tenuring threshold. See the implementation for
- // the details of the policy.
- virtual void adjust_desired_tenuring_threshold();
-
public:
ParNewGeneration(ReservedSpace rs, size_t initial_byte_size, int level);
@@ -361,8 +357,6 @@
delete _task_queues;
}
- static bool in_use();
-
virtual void ref_processor_init();
virtual Generation::Name kind() { return Generation::ParNew; }
virtual const char* name() const;
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -164,7 +164,6 @@
start_array->allocate_block(compact_top);
}
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::register_live_oop(oop(q), size));
compact_top += size;
assert(compact_top <= dest->space()->end(),
"Exceeding space in destination");
@@ -225,7 +224,6 @@
start_array->allocate_block(compact_top);
}
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::register_live_oop(oop(q), sz));
compact_top += sz;
assert(compact_top <= dest->space()->end(),
"Exceeding space in destination");
@@ -304,11 +302,8 @@
HeapWord* end = _first_dead;
while (q < end) {
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::track_interior_pointers(oop(q)));
// point all the oops to the new location
size_t size = oop(q)->adjust_pointers();
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::check_interior_pointers());
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::validate_live_oop(oop(q), size));
q += size;
}
@@ -328,11 +323,8 @@
Prefetch::write(q, interval);
if (oop(q)->is_gc_marked()) {
// q is alive
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::track_interior_pointers(oop(q)));
// point all the oops to the new location
size_t size = oop(q)->adjust_pointers();
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::check_interior_pointers());
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::validate_live_oop(oop(q), size));
debug_only(prev_q = q);
q += size;
} else {
@@ -366,7 +358,6 @@
while (q < end) {
size_t size = oop(q)->size();
assert(!oop(q)->is_gc_marked(), "should be unmarked (special dense prefix handling)");
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::live_oop_moved_to(q, size, q));
debug_only(prev_q = q);
q += size;
}
@@ -401,7 +392,6 @@
Prefetch::write(compaction_top, copy_interval);
// copy object and reinit its mark
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::live_oop_moved_to(q, size, compaction_top));
assert(q != compaction_top, "everything in this pass should be moving");
Copy::aligned_conjoint_words(q, compaction_top, size);
oop(compaction_top)->init_mark();
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -99,25 +99,6 @@
bool PSParallelCompact::_dwl_initialized = false;
#endif // #ifdef ASSERT
-#ifdef VALIDATE_MARK_SWEEP
-GrowableArray<void*>* PSParallelCompact::_root_refs_stack = NULL;
-GrowableArray<oop> * PSParallelCompact::_live_oops = NULL;
-GrowableArray<oop> * PSParallelCompact::_live_oops_moved_to = NULL;
-GrowableArray<size_t>* PSParallelCompact::_live_oops_size = NULL;
-size_t PSParallelCompact::_live_oops_index = 0;
-GrowableArray<void*>* PSParallelCompact::_other_refs_stack = NULL;
-GrowableArray<void*>* PSParallelCompact::_adjusted_pointers = NULL;
-bool PSParallelCompact::_pointer_tracking = false;
-bool PSParallelCompact::_root_tracking = true;
-
-GrowableArray<HeapWord*>* PSParallelCompact::_cur_gc_live_oops = NULL;
-GrowableArray<HeapWord*>* PSParallelCompact::_cur_gc_live_oops_moved_to = NULL;
-GrowableArray<size_t> * PSParallelCompact::_cur_gc_live_oops_size = NULL;
-GrowableArray<HeapWord*>* PSParallelCompact::_last_gc_live_oops = NULL;
-GrowableArray<HeapWord*>* PSParallelCompact::_last_gc_live_oops_moved_to = NULL;
-GrowableArray<size_t> * PSParallelCompact::_last_gc_live_oops_size = NULL;
-#endif
-
void SplitInfo::record(size_t src_region_idx, size_t partial_obj_size,
HeapWord* destination)
{
@@ -2715,151 +2696,6 @@
}
#endif // #ifdef ASSERT
-
-#ifdef VALIDATE_MARK_SWEEP
-
-void PSParallelCompact::track_adjusted_pointer(void* p, bool isroot) {
- if (!ValidateMarkSweep)
- return;
-
- if (!isroot) {
- if (_pointer_tracking) {
- guarantee(_adjusted_pointers->contains(p), "should have seen this pointer");
- _adjusted_pointers->remove(p);
- }
- } else {
- ptrdiff_t index = _root_refs_stack->find(p);
- if (index != -1) {
- int l = _root_refs_stack->length();
- if (l > 0 && l - 1 != index) {
- void* last = _root_refs_stack->pop();
- assert(last != p, "should be different");
- _root_refs_stack->at_put(index, last);
- } else {
- _root_refs_stack->remove(p);
- }
- }
- }
-}
-
-
-void PSParallelCompact::check_adjust_pointer(void* p) {
- _adjusted_pointers->push(p);
-}
-
-
-class AdjusterTracker: public OopClosure {
- public:
- AdjusterTracker() {};
- void do_oop(oop* o) { PSParallelCompact::check_adjust_pointer(o); }
- void do_oop(narrowOop* o) { PSParallelCompact::check_adjust_pointer(o); }
-};
-
-
-void PSParallelCompact::track_interior_pointers(oop obj) {
- if (ValidateMarkSweep) {
- _adjusted_pointers->clear();
- _pointer_tracking = true;
-
- AdjusterTracker checker;
- obj->oop_iterate_no_header(&checker);
- }
-}
-
-
-void PSParallelCompact::check_interior_pointers() {
- if (ValidateMarkSweep) {
- _pointer_tracking = false;
- guarantee(_adjusted_pointers->length() == 0, "should have processed the same pointers");
- }
-}
-
-
-void PSParallelCompact::reset_live_oop_tracking() {
- if (ValidateMarkSweep) {
- guarantee((size_t)_live_oops->length() == _live_oops_index, "should be at end of live oops");
- _live_oops_index = 0;
- }
-}
-
-
-void PSParallelCompact::register_live_oop(oop p, size_t size) {
- if (ValidateMarkSweep) {
- _live_oops->push(p);
- _live_oops_size->push(size);
- _live_oops_index++;
- }
-}
-
-void PSParallelCompact::validate_live_oop(oop p, size_t size) {
- if (ValidateMarkSweep) {
- oop obj = _live_oops->at((int)_live_oops_index);
- guarantee(obj == p, "should be the same object");
- guarantee(_live_oops_size->at((int)_live_oops_index) == size, "should be the same size");
- _live_oops_index++;
- }
-}
-
-void PSParallelCompact::live_oop_moved_to(HeapWord* q, size_t size,
- HeapWord* compaction_top) {
- assert(oop(q)->forwardee() == NULL || oop(q)->forwardee() == oop(compaction_top),
- "should be moved to forwarded location");
- if (ValidateMarkSweep) {
- PSParallelCompact::validate_live_oop(oop(q), size);
- _live_oops_moved_to->push(oop(compaction_top));
- }
- if (RecordMarkSweepCompaction) {
- _cur_gc_live_oops->push(q);
- _cur_gc_live_oops_moved_to->push(compaction_top);
- _cur_gc_live_oops_size->push(size);
- }
-}
-
-
-void PSParallelCompact::compaction_complete() {
- if (RecordMarkSweepCompaction) {
- GrowableArray<HeapWord*>* _tmp_live_oops = _cur_gc_live_oops;
- GrowableArray<HeapWord*>* _tmp_live_oops_moved_to = _cur_gc_live_oops_moved_to;
- GrowableArray<size_t> * _tmp_live_oops_size = _cur_gc_live_oops_size;
-
- _cur_gc_live_oops = _last_gc_live_oops;
- _cur_gc_live_oops_moved_to = _last_gc_live_oops_moved_to;
- _cur_gc_live_oops_size = _last_gc_live_oops_size;
- _last_gc_live_oops = _tmp_live_oops;
- _last_gc_live_oops_moved_to = _tmp_live_oops_moved_to;
- _last_gc_live_oops_size = _tmp_live_oops_size;
- }
-}
-
-
-void PSParallelCompact::print_new_location_of_heap_address(HeapWord* q) {
- if (!RecordMarkSweepCompaction) {
- tty->print_cr("Requires RecordMarkSweepCompaction to be enabled");
- return;
- }
-
- if (_last_gc_live_oops == NULL) {
- tty->print_cr("No compaction information gathered yet");
- return;
- }
-
- for (int i = 0; i < _last_gc_live_oops->length(); i++) {
- HeapWord* old_oop = _last_gc_live_oops->at(i);
- size_t sz = _last_gc_live_oops_size->at(i);
- if (old_oop <= q && q < (old_oop + sz)) {
- HeapWord* new_oop = _last_gc_live_oops_moved_to->at(i);
- size_t offset = (q - old_oop);
- tty->print_cr("Address " PTR_FORMAT, q);
- tty->print_cr(" Was in oop " PTR_FORMAT ", size %d, at offset %d", old_oop, sz, offset);
- tty->print_cr(" Now in oop " PTR_FORMAT ", actual address " PTR_FORMAT, new_oop, new_oop + offset);
- return;
- }
- }
-
- tty->print_cr("Address " PTR_FORMAT " not found in live oop information from last GC", q);
-}
-#endif //VALIDATE_MARK_SWEEP
-
// Update interior oops in the ranges of regions [beg_region, end_region).
void
PSParallelCompact::update_and_deadwood_in_dense_prefix(ParCompactionManager* cm,
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1006,34 +1006,6 @@
// Reset time since last full gc
static void reset_millis_since_last_gc();
- protected:
-#ifdef VALIDATE_MARK_SWEEP
- static GrowableArray<void*>* _root_refs_stack;
- static GrowableArray<oop> * _live_oops;
- static GrowableArray<oop> * _live_oops_moved_to;
- static GrowableArray<size_t>* _live_oops_size;
- static size_t _live_oops_index;
- static size_t _live_oops_index_at_perm;
- static GrowableArray<void*>* _other_refs_stack;
- static GrowableArray<void*>* _adjusted_pointers;
- static bool _pointer_tracking;
- static bool _root_tracking;
-
- // The following arrays are saved since the time of the last GC and
- // assist in tracking down problems where someone has done an errant
- // store into the heap, usually to an oop that wasn't properly
- // handleized across a GC. If we crash or otherwise fail before the
- // next GC, we can query these arrays to find out the object we had
- // intended to do the store to (assuming it is still alive) and the
- // offset within that object. Covered under RecordMarkSweepCompaction.
- static GrowableArray<HeapWord*> * _cur_gc_live_oops;
- static GrowableArray<HeapWord*> * _cur_gc_live_oops_moved_to;
- static GrowableArray<size_t>* _cur_gc_live_oops_size;
- static GrowableArray<HeapWord*> * _last_gc_live_oops;
- static GrowableArray<HeapWord*> * _last_gc_live_oops_moved_to;
- static GrowableArray<size_t>* _last_gc_live_oops_size;
-#endif
-
public:
class MarkAndPushClosure: public OopClosure {
private:
@@ -1191,25 +1163,6 @@
// Time since last full gc (in milliseconds).
static jlong millis_since_last_gc();
-#ifdef VALIDATE_MARK_SWEEP
- static void track_adjusted_pointer(void* p, bool isroot);
- static void check_adjust_pointer(void* p);
- static void track_interior_pointers(oop obj);
- static void check_interior_pointers();
-
- static void reset_live_oop_tracking();
- static void register_live_oop(oop p, size_t size);
- static void validate_live_oop(oop p, size_t size);
- static void live_oop_moved_to(HeapWord* q, size_t size, HeapWord* compaction_top);
- static void compaction_complete();
-
- // Querying operation of RecordMarkSweepCompaction results.
- // Finds and prints the current base oop and offset for a word
- // within an oop that was live during the last GC. Helpful for
- // tracking down heap stomps.
- static void print_new_location_of_heap_address(HeapWord* q);
-#endif // #ifdef VALIDATE_MARK_SWEEP
-
#ifndef PRODUCT
// Debugging support.
static const char* space_names[last_space_id];
@@ -1250,12 +1203,7 @@
inline void PSParallelCompact::follow_root(ParCompactionManager* cm, T* p) {
assert(!Universe::heap()->is_in_reserved(p),
"roots shouldn't be things within the heap");
-#ifdef VALIDATE_MARK_SWEEP
- if (ValidateMarkSweep) {
- guarantee(!_root_refs_stack->contains(p), "should only be in here once");
- _root_refs_stack->push(p);
- }
-#endif
+
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
@@ -1294,20 +1242,10 @@
oopDesc::encode_store_heap_oop_not_null(p, new_obj);
}
}
- VALIDATE_MARK_SWEEP_ONLY(track_adjusted_pointer(p, isroot));
}
template <class T>
inline void PSParallelCompact::KeepAliveClosure::do_oop_work(T* p) {
-#ifdef VALIDATE_MARK_SWEEP
- if (ValidateMarkSweep) {
- if (!Universe::heap()->is_in_reserved(p)) {
- _root_refs_stack->push(p);
- } else {
- _other_refs_stack->push(p);
- }
- }
-#endif
mark_and_push(_compaction_manager, p);
}
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -529,7 +529,7 @@
if (PrintTenuringDistribution) {
gclog_or_tty->cr();
- gclog_or_tty->print_cr("Desired survivor size %ld bytes, new threshold %u (max %u)",
+ gclog_or_tty->print_cr("Desired survivor size " SIZE_FORMAT " bytes, new threshold %u (max %u)",
size_policy->calculated_survivor_size_in_bytes(),
_tenuring_threshold, MaxTenuringThreshold);
}
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -808,8 +808,9 @@
st->print(" to "); to_space()->print_on(st);
}
+// Note that a space is not printed before the [NAME:
void PSYoungGen::print_used_change(size_t prev_used) const {
- gclog_or_tty->print(" [%s:", name());
+ gclog_or_tty->print("[%s:", name());
gclog_or_tty->print(" " SIZE_FORMAT "K"
"->" SIZE_FORMAT "K"
"(" SIZE_FORMAT "K)",
--- a/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,7 @@
if (PrintTenuringDistribution) {
gclog_or_tty->cr();
- gclog_or_tty->print_cr("Desired survivor size %ld bytes, new threshold %u (max %u)",
+ gclog_or_tty->print_cr("Desired survivor size " SIZE_FORMAT " bytes, new threshold %u (max %u)",
desired_survivor_size*oopSize, result, MaxTenuringThreshold);
}
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -42,26 +42,6 @@
PreservedMark* MarkSweep::_preserved_marks = NULL;
ReferenceProcessor* MarkSweep::_ref_processor = NULL;
-#ifdef VALIDATE_MARK_SWEEP
-GrowableArray<void*>* MarkSweep::_root_refs_stack = NULL;
-GrowableArray<oop> * MarkSweep::_live_oops = NULL;
-GrowableArray<oop> * MarkSweep::_live_oops_moved_to = NULL;
-GrowableArray<size_t>* MarkSweep::_live_oops_size = NULL;
-size_t MarkSweep::_live_oops_index = 0;
-size_t MarkSweep::_live_oops_index_at_perm = 0;
-GrowableArray<void*>* MarkSweep::_other_refs_stack = NULL;
-GrowableArray<void*>* MarkSweep::_adjusted_pointers = NULL;
-bool MarkSweep::_pointer_tracking = false;
-bool MarkSweep::_root_tracking = true;
-
-GrowableArray<HeapWord*>* MarkSweep::_cur_gc_live_oops = NULL;
-GrowableArray<HeapWord*>* MarkSweep::_cur_gc_live_oops_moved_to = NULL;
-GrowableArray<size_t> * MarkSweep::_cur_gc_live_oops_size = NULL;
-GrowableArray<HeapWord*>* MarkSweep::_last_gc_live_oops = NULL;
-GrowableArray<HeapWord*>* MarkSweep::_last_gc_live_oops_moved_to = NULL;
-GrowableArray<size_t> * MarkSweep::_last_gc_live_oops_size = NULL;
-#endif
-
MarkSweep::FollowRootClosure MarkSweep::follow_root_closure;
CodeBlobToOopClosure MarkSweep::follow_code_root_closure(&MarkSweep::follow_root_closure, /*do_marking=*/ true);
@@ -185,142 +165,6 @@
}
}
-#ifdef VALIDATE_MARK_SWEEP
-
-void MarkSweep::track_adjusted_pointer(void* p, bool isroot) {
- if (!ValidateMarkSweep)
- return;
-
- if (!isroot) {
- if (_pointer_tracking) {
- guarantee(_adjusted_pointers->contains(p), "should have seen this pointer");
- _adjusted_pointers->remove(p);
- }
- } else {
- ptrdiff_t index = _root_refs_stack->find(p);
- if (index != -1) {
- int l = _root_refs_stack->length();
- if (l > 0 && l - 1 != index) {
- void* last = _root_refs_stack->pop();
- assert(last != p, "should be different");
- _root_refs_stack->at_put(index, last);
- } else {
- _root_refs_stack->remove(p);
- }
- }
- }
-}
-
-void MarkSweep::check_adjust_pointer(void* p) {
- _adjusted_pointers->push(p);
-}
-
-class AdjusterTracker: public OopClosure {
- public:
- AdjusterTracker() {}
- void do_oop(oop* o) { MarkSweep::check_adjust_pointer(o); }
- void do_oop(narrowOop* o) { MarkSweep::check_adjust_pointer(o); }
-};
-
-void MarkSweep::track_interior_pointers(oop obj) {
- if (ValidateMarkSweep) {
- _adjusted_pointers->clear();
- _pointer_tracking = true;
-
- AdjusterTracker checker;
- obj->oop_iterate_no_header(&checker);
- }
-}
-
-void MarkSweep::check_interior_pointers() {
- if (ValidateMarkSweep) {
- _pointer_tracking = false;
- guarantee(_adjusted_pointers->length() == 0, "should have processed the same pointers");
- }
-}
-
-void MarkSweep::reset_live_oop_tracking() {
- if (ValidateMarkSweep) {
- guarantee((size_t)_live_oops->length() == _live_oops_index, "should be at end of live oops");
- _live_oops_index = 0;
- }
-}
-
-void MarkSweep::register_live_oop(oop p, size_t size) {
- if (ValidateMarkSweep) {
- _live_oops->push(p);
- _live_oops_size->push(size);
- _live_oops_index++;
- }
-}
-
-void MarkSweep::validate_live_oop(oop p, size_t size) {
- if (ValidateMarkSweep) {
- oop obj = _live_oops->at((int)_live_oops_index);
- guarantee(obj == p, "should be the same object");
- guarantee(_live_oops_size->at((int)_live_oops_index) == size, "should be the same size");
- _live_oops_index++;
- }
-}
-
-void MarkSweep::live_oop_moved_to(HeapWord* q, size_t size,
- HeapWord* compaction_top) {
- assert(oop(q)->forwardee() == NULL || oop(q)->forwardee() == oop(compaction_top),
- "should be moved to forwarded location");
- if (ValidateMarkSweep) {
- MarkSweep::validate_live_oop(oop(q), size);
- _live_oops_moved_to->push(oop(compaction_top));
- }
- if (RecordMarkSweepCompaction) {
- _cur_gc_live_oops->push(q);
- _cur_gc_live_oops_moved_to->push(compaction_top);
- _cur_gc_live_oops_size->push(size);
- }
-}
-
-void MarkSweep::compaction_complete() {
- if (RecordMarkSweepCompaction) {
- GrowableArray<HeapWord*>* _tmp_live_oops = _cur_gc_live_oops;
- GrowableArray<HeapWord*>* _tmp_live_oops_moved_to = _cur_gc_live_oops_moved_to;
- GrowableArray<size_t> * _tmp_live_oops_size = _cur_gc_live_oops_size;
-
- _cur_gc_live_oops = _last_gc_live_oops;
- _cur_gc_live_oops_moved_to = _last_gc_live_oops_moved_to;
- _cur_gc_live_oops_size = _last_gc_live_oops_size;
- _last_gc_live_oops = _tmp_live_oops;
- _last_gc_live_oops_moved_to = _tmp_live_oops_moved_to;
- _last_gc_live_oops_size = _tmp_live_oops_size;
- }
-}
-
-void MarkSweep::print_new_location_of_heap_address(HeapWord* q) {
- if (!RecordMarkSweepCompaction) {
- tty->print_cr("Requires RecordMarkSweepCompaction to be enabled");
- return;
- }
-
- if (_last_gc_live_oops == NULL) {
- tty->print_cr("No compaction information gathered yet");
- return;
- }
-
- for (int i = 0; i < _last_gc_live_oops->length(); i++) {
- HeapWord* old_oop = _last_gc_live_oops->at(i);
- size_t sz = _last_gc_live_oops_size->at(i);
- if (old_oop <= q && q < (old_oop + sz)) {
- HeapWord* new_oop = _last_gc_live_oops_moved_to->at(i);
- size_t offset = (q - old_oop);
- tty->print_cr("Address " PTR_FORMAT, q);
- tty->print_cr(" Was in oop " PTR_FORMAT ", size " SIZE_FORMAT ", at offset " SIZE_FORMAT, old_oop, sz, offset);
- tty->print_cr(" Now in oop " PTR_FORMAT ", actual address " PTR_FORMAT, new_oop, new_oop + offset);
- return;
- }
- }
-
- tty->print_cr("Address " PTR_FORMAT " not found in live oop information from last GC", q);
-}
-#endif //VALIDATE_MARK_SWEEP
-
MarkSweep::IsAliveClosure MarkSweep::is_alive;
void MarkSweep::IsAliveClosure::do_object(oop p) { ShouldNotReachHere(); }
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -44,21 +44,6 @@
//
// Class unloading will only occur when a full gc is invoked.
-// If VALIDATE_MARK_SWEEP is defined, the -XX:+ValidateMarkSweep flag will
-// be operational, and will provide slow but comprehensive self-checks within
-// the GC. This is not enabled by default in product or release builds,
-// since the extra call to track_adjusted_pointer() in _adjust_pointer()
-// would be too much overhead, and would disturb performance measurement.
-// However, debug builds are sometimes way too slow to run GC tests!
-#ifdef ASSERT
-#define VALIDATE_MARK_SWEEP 1
-#endif
-#ifdef VALIDATE_MARK_SWEEP
-#define VALIDATE_MARK_SWEEP_ONLY(code) code
-#else
-#define VALIDATE_MARK_SWEEP_ONLY(code)
-#endif
-
// declared at end
class PreservedMark;
@@ -147,33 +132,6 @@
// Reference processing (used in ...follow_contents)
static ReferenceProcessor* _ref_processor;
-#ifdef VALIDATE_MARK_SWEEP
- static GrowableArray<void*>* _root_refs_stack;
- static GrowableArray<oop> * _live_oops;
- static GrowableArray<oop> * _live_oops_moved_to;
- static GrowableArray<size_t>* _live_oops_size;
- static size_t _live_oops_index;
- static size_t _live_oops_index_at_perm;
- static GrowableArray<void*>* _other_refs_stack;
- static GrowableArray<void*>* _adjusted_pointers;
- static bool _pointer_tracking;
- static bool _root_tracking;
-
- // The following arrays are saved since the time of the last GC and
- // assist in tracking down problems where someone has done an errant
- // store into the heap, usually to an oop that wasn't properly
- // handleized across a GC. If we crash or otherwise fail before the
- // next GC, we can query these arrays to find out the object we had
- // intended to do the store to (assuming it is still alive) and the
- // offset within that object. Covered under RecordMarkSweepCompaction.
- static GrowableArray<HeapWord*> * _cur_gc_live_oops;
- static GrowableArray<HeapWord*> * _cur_gc_live_oops_moved_to;
- static GrowableArray<size_t>* _cur_gc_live_oops_size;
- static GrowableArray<HeapWord*> * _last_gc_live_oops;
- static GrowableArray<HeapWord*> * _last_gc_live_oops_moved_to;
- static GrowableArray<size_t>* _last_gc_live_oops_size;
-#endif
-
// Non public closures
static KeepAliveClosure keep_alive;
@@ -227,24 +185,6 @@
static void adjust_pointer(oop* p) { adjust_pointer(p, false); }
static void adjust_pointer(narrowOop* p) { adjust_pointer(p, false); }
-#ifdef VALIDATE_MARK_SWEEP
- static void track_adjusted_pointer(void* p, bool isroot);
- static void check_adjust_pointer(void* p);
- static void track_interior_pointers(oop obj);
- static void check_interior_pointers();
-
- static void reset_live_oop_tracking();
- static void register_live_oop(oop p, size_t size);
- static void validate_live_oop(oop p, size_t size);
- static void live_oop_moved_to(HeapWord* q, size_t size, HeapWord* compaction_top);
- static void compaction_complete();
-
- // Querying operation of RecordMarkSweepCompaction results.
- // Finds and prints the current base oop and offset for a word
- // within an oop that was live during the last GC. Helpful for
- // tracking down heap stomps.
- static void print_new_location_of_heap_address(HeapWord* q);
-#endif
};
class PreservedMark VALUE_OBJ_CLASS_SPEC {
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -46,12 +46,6 @@
template <class T> inline void MarkSweep::follow_root(T* p) {
assert(!Universe::heap()->is_in_reserved(p),
"roots shouldn't be things within the heap");
-#ifdef VALIDATE_MARK_SWEEP
- if (ValidateMarkSweep) {
- guarantee(!_root_refs_stack->contains(p), "should only be in here once");
- _root_refs_stack->push(p);
- }
-#endif
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
@@ -97,19 +91,9 @@
oopDesc::encode_store_heap_oop_not_null(p, new_obj);
}
}
- VALIDATE_MARK_SWEEP_ONLY(track_adjusted_pointer(p, isroot));
}
template <class T> inline void MarkSweep::KeepAliveClosure::do_oop_work(T* p) {
-#ifdef VALIDATE_MARK_SWEEP
- if (ValidateMarkSweep) {
- if (!Universe::heap()->is_in_reserved(p)) {
- _root_refs_stack->push(p);
- } else {
- _other_refs_stack->push(p);
- }
- }
-#endif
mark_and_push(p);
}
--- a/hotspot/src/share/vm/gc_interface/gcCause.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/gc_interface/gcCause.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -99,9 +99,9 @@
public:
GCCauseString(const char* prefix, GCCause::Cause cause) {
if (PrintGCCause) {
- _position = jio_snprintf(_buffer, _length, "%s (%s)", prefix, GCCause::to_string(cause));
+ _position = jio_snprintf(_buffer, _length, "%s (%s) ", prefix, GCCause::to_string(cause));
} else {
- _position = jio_snprintf(_buffer, _length, "%s", prefix);
+ _position = jio_snprintf(_buffer, _length, "%s ", prefix);
}
assert(_position >= 0 && _position <= _length,
err_msg("Need to increase the buffer size in GCCauseString? %d", _position));
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -417,7 +417,7 @@
// exception handler lookup
KlassHandle h_klass(THREAD, h_exception->klass());
- handler_bci = h_method->fast_exception_handler_bci_for(h_klass, current_bci, THREAD);
+ handler_bci = Method::fast_exception_handler_bci_for(h_method, h_klass, current_bci, THREAD);
if (HAS_PENDING_EXCEPTION) {
// We threw an exception while trying to find the exception handler.
// Transfer the new exception to the exception handle which will
--- a/hotspot/src/share/vm/interpreter/rewriter.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/interpreter/rewriter.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -27,13 +27,8 @@
#include "interpreter/interpreter.hpp"
#include "interpreter/rewriter.hpp"
#include "memory/gcLocker.hpp"
-#include "memory/metadataFactory.hpp"
-#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
#include "oops/generateOopMap.hpp"
-#include "oops/objArrayOop.hpp"
-#include "oops/oop.inline.hpp"
-#include "prims/methodComparator.hpp"
#include "prims/methodHandles.hpp"
// Computes a CPC map (new_index -> original_index) for constant pool entries
@@ -402,13 +397,6 @@
}
-void Rewriter::rewrite(instanceKlassHandle klass, constantPoolHandle cpool, Array<Method*>* methods, TRAPS) {
- ResourceMark rm(THREAD);
- Rewriter rw(klass, cpool, methods, CHECK);
- // (That's all, folks.)
-}
-
-
Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, Array<Method*>* methods, TRAPS)
: _klass(klass),
_pool(cpool),
@@ -453,46 +441,25 @@
restore_bytecodes();
return;
}
-}
-// Relocate jsr/rets in a method. This can't be done with the rewriter
-// stage because it can throw other exceptions, leaving the bytecodes
-// pointing at constant pool cache entries.
-// Link and check jvmti dependencies while we're iterating over the methods.
-// JSR292 code calls with a different set of methods, so two entry points.
-void Rewriter::relocate_and_link(instanceKlassHandle this_oop, TRAPS) {
- relocate_and_link(this_oop, this_oop->methods(), THREAD);
-}
-
-void Rewriter::relocate_and_link(instanceKlassHandle this_oop,
- Array<Method*>* methods, TRAPS) {
- int len = methods->length();
+ // Relocate after everything, but still do this under the is_rewritten flag,
+ // so methods with jsrs in custom class lists in aren't attempted to be
+ // rewritten in the RO section of the shared archive.
+ // Relocated bytecodes don't have to be restored, only the cp cache entries
for (int i = len-1; i >= 0; i--) {
- methodHandle m(THREAD, methods->at(i));
+ methodHandle m(THREAD, _methods->at(i));
if (m->has_jsrs()) {
- m = rewrite_jsrs(m, CHECK);
+ m = rewrite_jsrs(m, THREAD);
+ // Restore bytecodes to their unrewritten state if there are exceptions
+ // relocating bytecodes. If some are relocated, that is ok because that
+ // doesn't affect constant pool to cpCache rewriting.
+ if (HAS_PENDING_EXCEPTION) {
+ restore_bytecodes();
+ return;
+ }
// Method might have gotten rewritten.
methods->at_put(i, m());
}
-
- // Set up method entry points for compiler and interpreter .
- m->link_method(m, CHECK);
-
- // This is for JVMTI and unrelated to relocator but the last thing we do
-#ifdef ASSERT
- if (StressMethodComparator) {
- static int nmc = 0;
- for (int j = i; j >= 0 && j >= i-4; j--) {
- if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc);
- bool z = MethodComparator::methods_EMCP(m(),
- methods->at(j));
- if (j == i && !z) {
- tty->print("MethodComparator FAIL: "); m->print(); m->print_codes();
- assert(z, "method must compare equal to itself");
- }
- }
- }
-#endif //ASSERT
}
}
--- a/hotspot/src/share/vm/interpreter/rewriter.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/interpreter/rewriter.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -158,14 +158,6 @@
public:
// Driver routine:
static void rewrite(instanceKlassHandle klass, TRAPS);
- static void rewrite(instanceKlassHandle klass, constantPoolHandle cpool, Array<Method*>* methods, TRAPS);
-
- // Second pass, not gated by is_rewritten flag
- static void relocate_and_link(instanceKlassHandle klass, TRAPS);
- // JSR292 version to call with it's own methods.
- static void relocate_and_link(instanceKlassHandle klass,
- Array<Method*>* methods, TRAPS);
-
};
#endif // SHARE_VM_INTERPRETER_REWRITER_HPP
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -67,7 +67,8 @@
}
template <class Chunk_t, template <class> class FreeList_t>
-TreeList<Chunk_t, FreeList_t>::TreeList() {}
+TreeList<Chunk_t, FreeList_t>::TreeList() : _parent(NULL),
+ _left(NULL), _right(NULL) {}
template <class Chunk_t, template <class> class FreeList_t>
TreeList<Chunk_t, FreeList_t>*
@@ -82,7 +83,7 @@
tl->link_head(tc);
tl->link_tail(tc);
tl->set_count(1);
-
+ assert(tl->parent() == NULL, "Should be clear");
return tl;
}
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -777,6 +777,15 @@
full_gc_count,
GCCause::_metadata_GC_threshold);
VMThread::execute(&op);
+
+ // If GC was locked out, try again. Check
+ // before checking success because the prologue
+ // could have succeeded and the GC still have
+ // been locked out.
+ if (op.gc_locked()) {
+ continue;
+ }
+
if (op.prologue_succeeded()) {
return op.result();
}
@@ -818,7 +827,7 @@
if (_generations == NULL)
vm_exit_during_initialization("Unable to allocate gen spec");
- if (UseParNewGC && ParallelGCThreads > 0) {
+ if (UseParNewGC) {
_generations[0] = new GenerationSpec(Generation::ParNew, _initial_gen0_size, _max_gen0_size);
} else {
_generations[0] = new GenerationSpec(Generation::DefNew, _initial_gen0_size, _max_gen0_size);
@@ -831,10 +840,9 @@
void MarkSweepPolicy::initialize_gc_policy_counters() {
// initialize the policy counters - 2 collectors, 3 generations
- if (UseParNewGC && ParallelGCThreads > 0) {
+ if (UseParNewGC) {
_gc_policy_counters = new GCPolicyCounters("ParNew:MSC", 2, 3);
- }
- else {
+ } else {
_gc_policy_counters = new GCPolicyCounters("Copy:MSC", 2, 3);
}
}
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -550,6 +550,11 @@
return allocate(size, is_tlab);
}
+void DefNewGeneration::adjust_desired_tenuring_threshold() {
+ // Set the desired survivor size to half the real survivor space
+ _tenuring_threshold =
+ age_table()->compute_tenuring_threshold(to()->capacity()/HeapWordSize);
+}
void DefNewGeneration::collect(bool full,
bool clear_all_soft_refs,
@@ -649,9 +654,7 @@
assert(to()->is_empty(), "to space should be empty now");
- // Set the desired survivor size to half the real survivor space
- _tenuring_threshold =
- age_table()->compute_tenuring_threshold(to()->capacity()/HeapWordSize);
+ adjust_desired_tenuring_threshold();
// A successful scavenge should restart the GC time limit count which is
// for full GC's.
--- a/hotspot/src/share/vm/memory/defNewGeneration.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/defNewGeneration.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -124,7 +124,9 @@
_should_allocate_from_space = true;
}
- protected:
+ // Tenuring
+ void adjust_desired_tenuring_threshold();
+
// Spaces
EdenSpace* _eden_space;
ContiguousSpace* _from_space;
--- a/hotspot/src/share/vm/memory/filemap.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/filemap.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -119,6 +119,7 @@
_header._magic = 0xf00baba2;
_header._version = _current_version;
_header._alignment = alignment;
+ _header._obj_alignment = ObjectAlignmentInBytes;
// The following fields are for sanity checks for whether this archive
// will function correctly with this JVM and the bootclasspath it's
@@ -211,7 +212,11 @@
// Remove the existing file in case another process has it open.
remove(_full_path);
+#ifdef _WINDOWS // if 0444 is used on Windows, then remove() will fail.
+ int fd = open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0744);
+#else
int fd = open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0444);
+#endif
if (fd < 0) {
fail_stop("Unable to create shared archive file %s.", _full_path);
}
@@ -370,9 +375,8 @@
return rs;
}
// the reserved virtual memory is for mapping class data sharing archive
- if (MemTracker::is_on()) {
- MemTracker::record_virtual_memory_type((address)rs.base(), mtClassShared);
- }
+ MemTracker::record_virtual_memory_type((address)rs.base(), mtClassShared);
+
return rs;
}
@@ -394,6 +398,11 @@
fail_continue(err_msg("Unable to map %s shared space at required address.", shared_region_name[i]));
return NULL;
}
+#ifdef _WINDOWS
+ // This call is Windows-only because the memory_type gets recorded for the other platforms
+ // in method FileMapInfo::reserve_shared_memory(), which is not called on Windows.
+ MemTracker::record_virtual_memory_type((address)base, mtClassShared);
+#endif
return base;
}
@@ -465,6 +474,12 @@
" version or build of HotSpot.");
return false;
}
+ if (_header._obj_alignment != ObjectAlignmentInBytes) {
+ fail_continue("The shared archive file's ObjectAlignmentInBytes of %d"
+ " does not equal the current ObjectAlignmentInBytes of %d.",
+ _header._obj_alignment, ObjectAlignmentInBytes);
+ return false;
+ }
// Cannot verify interpreter yet, as it can only be created after the GC
// heap has been initialized.
--- a/hotspot/src/share/vm/memory/filemap.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/filemap.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -63,6 +63,7 @@
int _magic; // identify file type.
int _version; // (from enum, above.)
size_t _alignment; // how shared archive should be aligned
+ int _obj_alignment; // value of ObjectAlignmentInBytes
struct space_info {
int _file_offset; // sizeof(this) rounded to vm page size
--- a/hotspot/src/share/vm/memory/genMarkSweep.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/genMarkSweep.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -100,21 +100,8 @@
mark_sweep_phase3(level);
- VALIDATE_MARK_SWEEP_ONLY(
- if (ValidateMarkSweep) {
- guarantee(_root_refs_stack->length() == 0, "should be empty by now");
- }
- )
-
mark_sweep_phase4();
- VALIDATE_MARK_SWEEP_ONLY(
- if (ValidateMarkSweep) {
- guarantee(_live_oops->length() == _live_oops_moved_to->length(),
- "should be the same size");
- }
- )
-
restore_marks();
// Set saved marks for allocation profiler (and other things? -- dld)
@@ -187,31 +174,6 @@
_preserved_marks = (PreservedMark*)scratch;
_preserved_count = 0;
-
-#ifdef VALIDATE_MARK_SWEEP
- if (ValidateMarkSweep) {
- _root_refs_stack = new (ResourceObj::C_HEAP, mtGC) GrowableArray<void*>(100, true);
- _other_refs_stack = new (ResourceObj::C_HEAP, mtGC) GrowableArray<void*>(100, true);
- _adjusted_pointers = new (ResourceObj::C_HEAP, mtGC) GrowableArray<void*>(100, true);
- _live_oops = new (ResourceObj::C_HEAP, mtGC) GrowableArray<oop>(100, true);
- _live_oops_moved_to = new (ResourceObj::C_HEAP, mtGC) GrowableArray<oop>(100, true);
- _live_oops_size = new (ResourceObj::C_HEAP, mtGC) GrowableArray<size_t>(100, true);
- }
- if (RecordMarkSweepCompaction) {
- if (_cur_gc_live_oops == NULL) {
- _cur_gc_live_oops = new(ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(100, true);
- _cur_gc_live_oops_moved_to = new(ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(100, true);
- _cur_gc_live_oops_size = new(ResourceObj::C_HEAP, mtGC) GrowableArray<size_t>(100, true);
- _last_gc_live_oops = new(ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(100, true);
- _last_gc_live_oops_moved_to = new(ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(100, true);
- _last_gc_live_oops_size = new(ResourceObj::C_HEAP, mtGC) GrowableArray<size_t>(100, true);
- } else {
- _cur_gc_live_oops->clear();
- _cur_gc_live_oops_moved_to->clear();
- _cur_gc_live_oops_size->clear();
- }
- }
-#endif
}
@@ -225,19 +187,6 @@
_preserved_oop_stack.clear(true);
_marking_stack.clear();
_objarray_stack.clear(true);
-
-#ifdef VALIDATE_MARK_SWEEP
- if (ValidateMarkSweep) {
- delete _root_refs_stack;
- delete _other_refs_stack;
- delete _adjusted_pointers;
- delete _live_oops;
- delete _live_oops_size;
- delete _live_oops_moved_to;
- _live_oops_index = 0;
- _live_oops_index_at_perm = 0;
- }
-#endif
}
void GenMarkSweep::mark_sweep_phase1(int level,
@@ -246,8 +195,6 @@
TraceTime tm("phase 1", PrintGC && Verbose, true, gclog_or_tty);
trace(" 1");
- VALIDATE_MARK_SWEEP_ONLY(reset_live_oop_tracking());
-
GenCollectedHeap* gch = GenCollectedHeap::heap();
// Because follow_root_closure is created statically, cannot
@@ -315,8 +262,6 @@
TraceTime tm("phase 2", PrintGC && Verbose, true, gclog_or_tty);
trace("2");
- VALIDATE_MARK_SWEEP_ONLY(reset_live_oop_tracking());
-
gch->prepare_for_compaction();
}
@@ -337,8 +282,6 @@
// Need new claim bits for the pointer adjustment tracing.
ClassLoaderDataGraph::clear_claimed_marks();
- VALIDATE_MARK_SWEEP_ONLY(reset_live_oop_tracking());
-
// Because the two closures below are created statically, cannot
// use OopsInGenClosure constructor which takes a generation,
// as the Universe has not been created when the static constructors
@@ -393,10 +336,6 @@
TraceTime tm("phase 4", PrintGC && Verbose, true, gclog_or_tty);
trace("4");
- VALIDATE_MARK_SWEEP_ONLY(reset_live_oop_tracking());
-
GenCompactClosure blk;
gch->generation_iterate(&blk, true);
-
- VALIDATE_MARK_SWEEP_ONLY(compaction_complete());
}
--- a/hotspot/src/share/vm/memory/metachunk.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/metachunk.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -56,6 +56,7 @@
assert(chunk_end > chunk_bottom, "Chunk must be too small");
chunk->set_end(chunk_end);
chunk->set_next(NULL);
+ chunk->set_prev(NULL);
chunk->set_word_size(word_size);
#ifdef ASSERT
size_t data_word_size = pointer_delta(chunk_end, chunk_bottom, sizeof(MetaWord));
@@ -76,15 +77,15 @@
}
// _bottom points to the start of the chunk including the overhead.
-size_t Metachunk::used_word_size() {
+size_t Metachunk::used_word_size() const {
return pointer_delta(_top, _bottom, sizeof(MetaWord));
}
-size_t Metachunk::free_word_size() {
+size_t Metachunk::free_word_size() const {
return pointer_delta(_end, _top, sizeof(MetaWord));
}
-size_t Metachunk::capacity_word_size() {
+size_t Metachunk::capacity_word_size() const {
return pointer_delta(_end, _bottom, sizeof(MetaWord));
}
@@ -93,6 +94,10 @@
" bottom " PTR_FORMAT " top " PTR_FORMAT
" end " PTR_FORMAT " size " SIZE_FORMAT,
bottom(), top(), end(), word_size());
+ if (Verbose) {
+ st->print_cr(" used " SIZE_FORMAT " free " SIZE_FORMAT,
+ used_word_size(), free_word_size());
+ }
}
#ifndef PRODUCT
--- a/hotspot/src/share/vm/memory/metachunk.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/metachunk.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -67,9 +67,11 @@
void set_word_size(size_t v) { _word_size = v; }
public:
#ifdef ASSERT
- Metachunk() : _bottom(NULL), _end(NULL), _top(NULL), _is_free(false) {}
+ Metachunk() : _bottom(NULL), _end(NULL), _top(NULL), _is_free(false),
+ _next(NULL), _prev(NULL) {}
#else
- Metachunk() : _bottom(NULL), _end(NULL), _top(NULL) {}
+ Metachunk() : _bottom(NULL), _end(NULL), _top(NULL),
+ _next(NULL), _prev(NULL) {}
#endif
// Used to add a Metachunk to a list of Metachunks
@@ -102,15 +104,15 @@
}
// Reset top to bottom so chunk can be reused.
- void reset_empty() { _top = (_bottom + _overhead); }
+ void reset_empty() { _top = (_bottom + _overhead); _next = NULL; _prev = NULL; }
bool is_empty() { return _top == (_bottom + _overhead); }
// used (has been allocated)
// free (available for future allocations)
// capacity (total size of chunk)
- size_t used_word_size();
- size_t free_word_size();
- size_t capacity_word_size();
+ size_t used_word_size() const;
+ size_t free_word_size() const;
+ size_t capacity_word_size()const;
// Debug support
#ifdef ASSERT
--- a/hotspot/src/share/vm/memory/metadataFactory.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/metadataFactory.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -66,7 +66,11 @@
if (data != NULL) {
assert(loader_data != NULL, "shouldn't pass null");
int size = data->size();
- loader_data->metaspace_non_null()->deallocate((MetaWord*)data, size, false);
+ if (DumpSharedSpaces) {
+ loader_data->ro_metaspace()->deallocate((MetaWord*)data, size, false);
+ } else {
+ loader_data->metaspace_non_null()->deallocate((MetaWord*)data, size, false);
+ }
}
}
@@ -77,6 +81,7 @@
assert(loader_data != NULL, "shouldn't pass null");
int size = md->size();
// Call metadata's deallocate function which will call deallocate fields
+ assert(!DumpSharedSpaces, "cannot deallocate metadata when dumping CDS archive");
assert(!md->on_stack(), "can't deallocate things on stack");
md->deallocate_contents(loader_data);
loader_data->metaspace_non_null()->deallocate((MetaWord*)md, size, md->is_klass());
--- a/hotspot/src/share/vm/memory/metaspace.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/metaspace.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -58,11 +58,23 @@
// Used in declarations in SpaceManager and ChunkManager
enum ChunkIndex {
- SmallIndex = 0,
- MediumIndex = 1,
- HumongousIndex = 2,
- NumberOfFreeLists = 2,
- NumberOfInUseLists = 3
+ ZeroIndex = 0,
+ SpecializedIndex = ZeroIndex,
+ SmallIndex = SpecializedIndex + 1,
+ MediumIndex = SmallIndex + 1,
+ HumongousIndex = MediumIndex + 1,
+ NumberOfFreeLists = 3,
+ NumberOfInUseLists = 4
+};
+
+enum ChunkSizes { // in words.
+ ClassSpecializedChunk = 128,
+ SpecializedChunk = 128,
+ ClassSmallChunk = 256,
+ SmallChunk = 512,
+ ClassMediumChunk = 1 * K,
+ MediumChunk = 8 * K,
+ HumongousChunkGranularity = 8
};
static ChunkIndex next_chunk_index(ChunkIndex i) {
@@ -126,6 +138,7 @@
// HumongousChunk
ChunkList _free_chunks[NumberOfFreeLists];
+
// HumongousChunk
ChunkTreeDictionary _humongous_dictionary;
@@ -169,6 +182,10 @@
Metachunk* chunk_freelist_allocate(size_t word_size);
void chunk_freelist_deallocate(Metachunk* chunk);
+ // Map a size to a list index assuming that there are lists
+ // for special, small, medium, and humongous chunks.
+ static ChunkIndex list_index(size_t size);
+
// Total of the space in the free chunks list
size_t free_chunks_total();
size_t free_chunks_total_in_bytes();
@@ -180,8 +197,6 @@
Atomic::add_ptr(count, &_free_chunks_count);
Atomic::add_ptr(v, &_free_chunks_total);
}
- ChunkList* free_medium_chunks() { return &_free_chunks[1]; }
- ChunkList* free_small_chunks() { return &_free_chunks[0]; }
ChunkTreeDictionary* humongous_dictionary() {
return &_humongous_dictionary;
}
@@ -400,7 +415,14 @@
VirtualSpaceList(size_t word_size);
VirtualSpaceList(ReservedSpace rs);
- Metachunk* get_new_chunk(size_t word_size, size_t grow_chunks_by_words);
+ Metachunk* get_new_chunk(size_t word_size,
+ size_t grow_chunks_by_words,
+ size_t medium_chunk_bunch);
+
+ // Get the first chunk for a Metaspace. Used for
+ // special cases such as the boot class loader, reflection
+ // class loader and anonymous class loader.
+ Metachunk* get_initialization_chunk(size_t word_size, size_t chunk_bunch);
VirtualSpaceNode* current_virtual_space() {
return _current_virtual_space;
@@ -501,9 +523,13 @@
friend class Metadebug;
private:
+
// protects allocations and contains.
Mutex* const _lock;
+ // Chunk related size
+ size_t _medium_chunk_bunch;
+
// List of chunks in use by this SpaceManager. Allocations
// are done from the current chunk. The list is used for deallocating
// chunks when the SpaceManager is freed.
@@ -532,6 +558,7 @@
static const int _expand_lock_rank;
static Mutex* const _expand_lock;
+ private:
// Accessors
Metachunk* chunks_in_use(ChunkIndex index) const { return _chunks_in_use[index]; }
void set_chunks_in_use(ChunkIndex index, Metachunk* v) { _chunks_in_use[index] = v; }
@@ -554,23 +581,37 @@
Mutex* lock() const { return _lock; }
+ const char* chunk_size_name(ChunkIndex index) const;
+
+ protected:
+ void initialize();
+
public:
- SpaceManager(Mutex* lock, VirtualSpaceList* vs_list);
+ SpaceManager(Mutex* lock,
+ VirtualSpaceList* vs_list);
~SpaceManager();
- enum ChunkSizes { // in words.
- SmallChunk = 512,
- MediumChunk = 8 * K,
- MediumChunkBunch = 4 * MediumChunk
+ enum ChunkMultiples {
+ MediumChunkMultiple = 4
};
// Accessors
+ size_t specialized_chunk_size() { return SpecializedChunk; }
+ size_t small_chunk_size() { return (size_t) vs_list()->is_class() ? ClassSmallChunk : SmallChunk; }
+ size_t medium_chunk_size() { return (size_t) vs_list()->is_class() ? ClassMediumChunk : MediumChunk; }
+ size_t medium_chunk_bunch() { return medium_chunk_size() * MediumChunkMultiple; }
+
size_t allocation_total() const { return _allocation_total; }
void inc_allocation_total(size_t v) { Atomic::add_ptr(v, &_allocation_total); }
- static bool is_humongous(size_t word_size) { return word_size > MediumChunk; }
+ bool is_humongous(size_t word_size) { return word_size > medium_chunk_size(); }
static Mutex* expand_lock() { return _expand_lock; }
+ // Set the sizes for the initial chunks.
+ void get_initial_chunk_sizes(Metaspace::MetaspaceType type,
+ size_t* chunk_word_size,
+ size_t* class_chunk_word_size);
+
size_t sum_capacity_in_chunks_in_use() const;
size_t sum_used_in_chunks_in_use() const;
size_t sum_free_in_chunks_in_use() const;
@@ -580,6 +621,8 @@
size_t sum_count_in_chunks_in_use();
size_t sum_count_in_chunks_in_use(ChunkIndex i);
+ Metachunk* get_new_chunk(size_t word_size, size_t grow_chunks_by_words);
+
// Block allocation and deallocation.
// Allocates a block from the current chunk
MetaWord* allocate(size_t word_size);
@@ -772,8 +815,10 @@
return false;
}
- // Commit only 1 page instead of the whole reserved space _rs.size()
- size_t committed_byte_size = os::vm_page_size();
+ // An allocation out of this Virtualspace that is larger
+ // than an initial commit size can waste that initial committed
+ // space.
+ size_t committed_byte_size = 0;
bool result = virtual_space()->initialize(_rs, committed_byte_size);
if (result) {
set_top((MetaWord*)virtual_space()->low());
@@ -799,7 +844,8 @@
st->print_cr(" space @ " PTR_FORMAT " " SIZE_FORMAT "K, %3d%% used "
"[" PTR_FORMAT ", " PTR_FORMAT ", "
PTR_FORMAT ", " PTR_FORMAT ")",
- vs, capacity / K, used * 100 / capacity,
+ vs, capacity / K,
+ capacity == 0 ? 0 : used * 100 / capacity,
bottom(), top(), end(),
vs->high_boundary());
}
@@ -922,7 +968,8 @@
}
Metachunk* VirtualSpaceList::get_new_chunk(size_t word_size,
- size_t grow_chunks_by_words) {
+ size_t grow_chunks_by_words,
+ size_t medium_chunk_bunch) {
// Get a chunk from the chunk freelist
Metachunk* next = chunk_manager()->chunk_freelist_allocate(grow_chunks_by_words);
@@ -935,8 +982,8 @@
if (next == NULL) {
// Not enough room in current virtual space. Try to commit
// more space.
- size_t expand_vs_by_words = MAX2((size_t)SpaceManager::MediumChunkBunch,
- grow_chunks_by_words);
+ size_t expand_vs_by_words = MAX2(medium_chunk_bunch,
+ grow_chunks_by_words);
size_t page_size_words = os::vm_page_size() / BytesPerWord;
size_t aligned_expand_vs_by_words = align_size_up(expand_vs_by_words,
page_size_words);
@@ -954,12 +1001,6 @@
// Got it. It's on the list now. Get a chunk from it.
next = current_virtual_space()->get_chunk_vs_with_expand(grow_chunks_by_words);
}
- if (TraceMetadataHumongousAllocation && SpaceManager::is_humongous(word_size)) {
- gclog_or_tty->print_cr(" aligned_expand_vs_by_words " PTR_FORMAT,
- aligned_expand_vs_by_words);
- gclog_or_tty->print_cr(" grow_vs_words " PTR_FORMAT,
- grow_vs_words);
- }
} else {
// Allocation will fail and induce a GC
if (TraceMetadataChunkAllocation && Verbose) {
@@ -974,9 +1015,20 @@
}
}
+ assert(next == NULL || (next->next() == NULL && next->prev() == NULL),
+ "New chunk is still on some list");
return next;
}
+Metachunk* VirtualSpaceList::get_initialization_chunk(size_t chunk_word_size,
+ size_t chunk_bunch) {
+ // Get a chunk from the chunk freelist
+ Metachunk* new_chunk = get_new_chunk(chunk_word_size,
+ chunk_word_size,
+ chunk_bunch);
+ return new_chunk;
+}
+
void VirtualSpaceList::print_on(outputStream* st) const {
if (TraceMetadataChunkAllocation && Verbose) {
VirtualSpaceListIterator iter(virtual_space_list());
@@ -1373,16 +1425,17 @@
void ChunkList::add_at_head(Metachunk* head, Metachunk* tail) {
assert_lock_strong(SpaceManager::expand_lock());
- assert(tail->next() == NULL, "Not the tail");
+ assert(head == tail || tail->next() == NULL,
+ "Not the tail or the head has already been added to a list");
if (TraceMetadataChunkAllocation && Verbose) {
- tty->print("ChunkList::add_at_head: ");
+ gclog_or_tty->print("ChunkList::add_at_head(head, tail): ");
Metachunk* cur = head;
while (cur != NULL) {
- tty->print(PTR_FORMAT " (" SIZE_FORMAT ") ", cur, cur->word_size());
+ gclog_or_tty->print(PTR_FORMAT " (" SIZE_FORMAT ") ", cur, cur->word_size());
cur = cur->next();
}
- tty->print_cr("");
+ gclog_or_tty->print_cr("");
}
if (tail != NULL) {
@@ -1486,13 +1539,13 @@
void ChunkManager::locked_print_free_chunks(outputStream* st) {
assert_lock_strong(SpaceManager::expand_lock());
- st->print_cr("Free chunk total 0x%x count 0x%x",
+ st->print_cr("Free chunk total " SIZE_FORMAT " count " SIZE_FORMAT,
_free_chunks_total, _free_chunks_count);
}
void ChunkManager::locked_print_sum_free_chunks(outputStream* st) {
assert_lock_strong(SpaceManager::expand_lock());
- st->print_cr("Sum free chunk total 0x%x count 0x%x",
+ st->print_cr("Sum free chunk total " SIZE_FORMAT " count " SIZE_FORMAT,
sum_free_chunks(), sum_free_chunks_count());
}
ChunkList* ChunkManager::free_chunks(ChunkIndex index) {
@@ -1504,7 +1557,7 @@
size_t ChunkManager::sum_free_chunks() {
assert_lock_strong(SpaceManager::expand_lock());
size_t result = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = ZeroIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
ChunkList* list = free_chunks(i);
if (list == NULL) {
@@ -1520,7 +1573,7 @@
size_t ChunkManager::sum_free_chunks_count() {
assert_lock_strong(SpaceManager::expand_lock());
size_t count = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = ZeroIndex; i < NumberOfFreeLists; i = next_chunk_index(i)) {
ChunkList* list = free_chunks(i);
if (list == NULL) {
continue;
@@ -1532,15 +1585,9 @@
}
ChunkList* ChunkManager::find_free_chunks_list(size_t word_size) {
- switch (word_size) {
- case SpaceManager::SmallChunk :
- return &_free_chunks[0];
- case SpaceManager::MediumChunk :
- return &_free_chunks[1];
- default:
- assert(word_size > SpaceManager::MediumChunk, "List inconsistency");
- return &_free_chunks[2];
- }
+ ChunkIndex index = list_index(word_size);
+ assert(index < HumongousIndex, "No humongous list");
+ return free_chunks(index);
}
void ChunkManager::free_chunks_put(Metachunk* chunk) {
@@ -1574,7 +1621,7 @@
slow_locked_verify();
Metachunk* chunk = NULL;
- if (!SpaceManager::is_humongous(word_size)) {
+ if (list_index(word_size) != HumongousIndex) {
ChunkList* free_list = find_free_chunks_list(word_size);
assert(free_list != NULL, "Sanity check");
@@ -1587,8 +1634,8 @@
// Remove the chunk as the head of the list.
free_list->set_head(chunk->next());
- chunk->set_next(NULL);
- // Chunk has been removed from the chunks free list.
+
+ // Chunk is being removed from the chunks free list.
dec_free_chunks_total(chunk->capacity_word_size());
if (TraceMetadataChunkAllocation && Verbose) {
@@ -1614,8 +1661,14 @@
#ifdef ASSERT
chunk->set_is_free(false);
#endif
+ } else {
+ return NULL;
}
}
+
+ // Remove it from the links to this freelist
+ chunk->set_next(NULL);
+ chunk->set_prev(NULL);
slow_locked_verify();
return chunk;
}
@@ -1630,13 +1683,20 @@
return NULL;
}
- assert(word_size <= chunk->word_size() ||
- SpaceManager::is_humongous(chunk->word_size()),
- "Non-humongous variable sized chunk");
+ assert((word_size <= chunk->word_size()) ||
+ list_index(chunk->word_size() == HumongousIndex),
+ "Non-humongous variable sized chunk");
if (TraceMetadataChunkAllocation) {
- tty->print("ChunkManager::chunk_freelist_allocate: chunk "
- PTR_FORMAT " size " SIZE_FORMAT " ",
- chunk, chunk->word_size());
+ size_t list_count;
+ if (list_index(word_size) < HumongousIndex) {
+ ChunkList* list = find_free_chunks_list(word_size);
+ list_count = list->sum_list_count();
+ } else {
+ list_count = humongous_dictionary()->total_count();
+ }
+ tty->print("ChunkManager::chunk_freelist_allocate: " PTR_FORMAT " chunk "
+ PTR_FORMAT " size " SIZE_FORMAT " count " SIZE_FORMAT " ",
+ this, chunk, chunk->word_size(), list_count);
locked_print_free_chunks(tty);
}
@@ -1651,10 +1711,42 @@
// SpaceManager methods
+void SpaceManager::get_initial_chunk_sizes(Metaspace::MetaspaceType type,
+ size_t* chunk_word_size,
+ size_t* class_chunk_word_size) {
+ switch (type) {
+ case Metaspace::BootMetaspaceType:
+ *chunk_word_size = Metaspace::first_chunk_word_size();
+ *class_chunk_word_size = Metaspace::first_class_chunk_word_size();
+ break;
+ case Metaspace::ROMetaspaceType:
+ *chunk_word_size = SharedReadOnlySize / wordSize;
+ *class_chunk_word_size = ClassSpecializedChunk;
+ break;
+ case Metaspace::ReadWriteMetaspaceType:
+ *chunk_word_size = SharedReadWriteSize / wordSize;
+ *class_chunk_word_size = ClassSpecializedChunk;
+ break;
+ case Metaspace::AnonymousMetaspaceType:
+ case Metaspace::ReflectionMetaspaceType:
+ *chunk_word_size = SpecializedChunk;
+ *class_chunk_word_size = ClassSpecializedChunk;
+ break;
+ default:
+ *chunk_word_size = SmallChunk;
+ *class_chunk_word_size = ClassSmallChunk;
+ break;
+ }
+ assert(chunk_word_size != 0 && class_chunk_word_size != 0,
+ err_msg("Initial chunks sizes bad: data " SIZE_FORMAT
+ " class " SIZE_FORMAT,
+ chunk_word_size, class_chunk_word_size));
+}
+
size_t SpaceManager::sum_free_in_chunks_in_use() const {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
size_t free = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* chunk = chunks_in_use(i);
while (chunk != NULL) {
free += chunk->free_word_size();
@@ -1667,9 +1759,7 @@
size_t SpaceManager::sum_waste_in_chunks_in_use() const {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
size_t result = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
-
-
+ for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
result += sum_waste_in_chunks_in_use(i);
}
@@ -1678,7 +1768,6 @@
size_t SpaceManager::sum_waste_in_chunks_in_use(ChunkIndex index) const {
size_t result = 0;
- size_t count = 0;
Metachunk* chunk = chunks_in_use(index);
// Count the free space in all the chunk but not the
// current chunk from which allocations are still being done.
@@ -1688,7 +1777,6 @@
result += chunk->free_word_size();
prev = chunk;
chunk = chunk->next();
- count++;
}
}
return result;
@@ -1697,7 +1785,7 @@
size_t SpaceManager::sum_capacity_in_chunks_in_use() const {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
size_t sum = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* chunk = chunks_in_use(i);
while (chunk != NULL) {
// Just changed this sum += chunk->capacity_word_size();
@@ -1711,7 +1799,7 @@
size_t SpaceManager::sum_count_in_chunks_in_use() {
size_t count = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
count = count + sum_count_in_chunks_in_use(i);
}
@@ -1732,7 +1820,7 @@
size_t SpaceManager::sum_used_in_chunks_in_use() const {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
size_t used = 0;
- for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* chunk = chunks_in_use(i);
while (chunk != NULL) {
used += chunk->used_word_size();
@@ -1744,19 +1832,17 @@
void SpaceManager::locked_print_chunks_in_use_on(outputStream* st) const {
- Metachunk* small_chunk = chunks_in_use(SmallIndex);
- st->print_cr("SpaceManager: small chunk " PTR_FORMAT
- " free " SIZE_FORMAT,
- small_chunk,
- small_chunk->free_word_size());
-
- Metachunk* medium_chunk = chunks_in_use(MediumIndex);
- st->print("medium chunk " PTR_FORMAT, medium_chunk);
- Metachunk* tail = current_chunk();
- st->print_cr(" current chunk " PTR_FORMAT, tail);
-
- Metachunk* head = chunks_in_use(HumongousIndex);
- st->print_cr("humongous chunk " PTR_FORMAT, head);
+ for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
+ Metachunk* chunk = chunks_in_use(i);
+ st->print("SpaceManager: %s " PTR_FORMAT,
+ chunk_size_name(i), chunk);
+ if (chunk != NULL) {
+ st->print_cr(" free " SIZE_FORMAT,
+ chunk->free_word_size());
+ } else {
+ st->print_cr("");
+ }
+ }
vs_list()->chunk_manager()->locked_print_free_chunks(st);
vs_list()->chunk_manager()->locked_print_sum_free_chunks(st);
@@ -1772,18 +1858,28 @@
if (chunks_in_use(MediumIndex) == NULL &&
(!has_small_chunk_limit() ||
sum_count_in_chunks_in_use(SmallIndex) < _small_chunk_limit)) {
- chunk_word_size = (size_t) SpaceManager::SmallChunk;
- if (word_size + Metachunk::overhead() > SpaceManager::SmallChunk) {
- chunk_word_size = MediumChunk;
+ chunk_word_size = (size_t) small_chunk_size();
+ if (word_size + Metachunk::overhead() > small_chunk_size()) {
+ chunk_word_size = medium_chunk_size();
}
} else {
- chunk_word_size = MediumChunk;
+ chunk_word_size = medium_chunk_size();
}
- // Might still need a humongous chunk
+ // Might still need a humongous chunk. Enforce an
+ // eight word granularity to facilitate reuse (some
+ // wastage but better chance of reuse).
+ size_t if_humongous_sized_chunk =
+ align_size_up(word_size + Metachunk::overhead(),
+ HumongousChunkGranularity);
chunk_word_size =
- MAX2((size_t) chunk_word_size, word_size + Metachunk::overhead());
-
+ MAX2((size_t) chunk_word_size, if_humongous_sized_chunk);
+
+ assert(!SpaceManager::is_humongous(word_size) ||
+ chunk_word_size == if_humongous_sized_chunk,
+ err_msg("Size calculation is wrong, word_size " SIZE_FORMAT
+ " chunk_word_size " SIZE_FORMAT,
+ word_size, chunk_word_size));
if (TraceMetadataHumongousAllocation &&
SpaceManager::is_humongous(word_size)) {
gclog_or_tty->print_cr("Metadata humongous allocation:");
@@ -1805,15 +1901,21 @@
MutexLockerEx cl(SpaceManager::expand_lock(), Mutex::_no_safepoint_check_flag);
if (TraceMetadataChunkAllocation && Verbose) {
+ size_t words_left = 0;
+ size_t words_used = 0;
+ if (current_chunk() != NULL) {
+ words_left = current_chunk()->free_word_size();
+ words_used = current_chunk()->used_word_size();
+ }
gclog_or_tty->print_cr("SpaceManager::grow_and_allocate for " SIZE_FORMAT
- " words " SIZE_FORMAT " space left",
- word_size, current_chunk() != NULL ?
- current_chunk()->free_word_size() : 0);
+ " words " SIZE_FORMAT " words used " SIZE_FORMAT
+ " words left",
+ word_size, words_used, words_left);
}
// Get another chunk out of the virtual space
size_t grow_chunks_by_words = calc_chunk_size(word_size);
- Metachunk* next = vs_list()->get_new_chunk(word_size, grow_chunks_by_words);
+ Metachunk* next = get_new_chunk(word_size, grow_chunks_by_words);
// If a chunk was available, add it to the in-use chunk list
// and do an allocation from it.
@@ -1828,7 +1930,7 @@
void SpaceManager::print_on(outputStream* st) const {
- for (ChunkIndex i = SmallIndex;
+ for (ChunkIndex i = ZeroIndex;
i < NumberOfInUseLists ;
i = next_chunk_index(i) ) {
st->print_cr(" chunks_in_use " PTR_FORMAT " chunk size " PTR_FORMAT,
@@ -1847,12 +1949,18 @@
}
}
-SpaceManager::SpaceManager(Mutex* lock, VirtualSpaceList* vs_list) :
+SpaceManager::SpaceManager(Mutex* lock,
+ VirtualSpaceList* vs_list) :
_vs_list(vs_list),
_allocation_total(0),
- _lock(lock) {
+ _lock(lock)
+{
+ initialize();
+}
+
+void SpaceManager::initialize() {
Metadebug::init_allocation_fail_alot_count();
- for (ChunkIndex i = SmallIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
_chunks_in_use[i] = NULL;
}
_current_chunk = NULL;
@@ -1885,30 +1993,37 @@
// Add all the chunks in use by this space manager
// to the global list of free chunks.
- // Small chunks. There is one _current_chunk for each
- // Metaspace. It could point to a small or medium chunk.
- // Rather than determine which it is, follow the list of
- // small chunks to add them to the free list
- Metachunk* small_chunk = chunks_in_use(SmallIndex);
- chunk_manager->free_small_chunks()->add_at_head(small_chunk);
- set_chunks_in_use(SmallIndex, NULL);
-
- // After the small chunk are the medium chunks
- Metachunk* medium_chunk = chunks_in_use(MediumIndex);
- assert(medium_chunk == NULL ||
- medium_chunk->word_size() == MediumChunk,
- "Chunk is on the wrong list");
-
- if (medium_chunk != NULL) {
- Metachunk* head = medium_chunk;
- // If there is a medium chunk then the _current_chunk can only
- // point to the last medium chunk.
- Metachunk* tail = current_chunk();
- chunk_manager->free_medium_chunks()->add_at_head(head, tail);
- set_chunks_in_use(MediumIndex, NULL);
+ // Follow each list of chunks-in-use and add them to the
+ // free lists. Each list is NULL terminated.
+
+ for (ChunkIndex i = ZeroIndex; i < HumongousIndex; i = next_chunk_index(i)) {
+ if (TraceMetadataChunkAllocation && Verbose) {
+ gclog_or_tty->print_cr("returned %d %s chunks to freelist",
+ sum_count_in_chunks_in_use(i),
+ chunk_size_name(i));
+ }
+ Metachunk* chunks = chunks_in_use(i);
+ chunk_manager->free_chunks(i)->add_at_head(chunks);
+ set_chunks_in_use(i, NULL);
+ if (TraceMetadataChunkAllocation && Verbose) {
+ gclog_or_tty->print_cr("updated freelist count %d %s",
+ chunk_manager->free_chunks(i)->sum_list_count(),
+ chunk_size_name(i));
+ }
+ assert(i != HumongousIndex, "Humongous chunks are handled explicitly later");
}
+ // The medium chunk case may be optimized by passing the head and
+ // tail of the medium chunk list to add_at_head(). The tail is often
+ // the current chunk but there are probably exceptions.
+
// Humongous chunks
+ if (TraceMetadataChunkAllocation && Verbose) {
+ gclog_or_tty->print_cr("returned %d %s humongous chunks to dictionary",
+ sum_count_in_chunks_in_use(HumongousIndex),
+ chunk_size_name(HumongousIndex));
+ gclog_or_tty->print("Humongous chunk dictionary: ");
+ }
// Humongous chunks are never the current chunk.
Metachunk* humongous_chunks = chunks_in_use(HumongousIndex);
@@ -1916,14 +2031,65 @@
#ifdef ASSERT
humongous_chunks->set_is_free(true);
#endif
+ if (TraceMetadataChunkAllocation && Verbose) {
+ gclog_or_tty->print(PTR_FORMAT " (" SIZE_FORMAT ") ",
+ humongous_chunks,
+ humongous_chunks->word_size());
+ }
+ assert(humongous_chunks->word_size() == (size_t)
+ align_size_up(humongous_chunks->word_size(),
+ HumongousChunkGranularity),
+ err_msg("Humongous chunk size is wrong: word size " SIZE_FORMAT
+ " granularity " SIZE_FORMAT,
+ humongous_chunks->word_size(), HumongousChunkGranularity));
Metachunk* next_humongous_chunks = humongous_chunks->next();
chunk_manager->humongous_dictionary()->return_chunk(humongous_chunks);
humongous_chunks = next_humongous_chunks;
}
+ if (TraceMetadataChunkAllocation && Verbose) {
+ gclog_or_tty->print_cr("");
+ gclog_or_tty->print_cr("updated dictionary count %d %s",
+ chunk_manager->humongous_dictionary()->total_count(),
+ chunk_size_name(HumongousIndex));
+ }
set_chunks_in_use(HumongousIndex, NULL);
chunk_manager->slow_locked_verify();
}
+const char* SpaceManager::chunk_size_name(ChunkIndex index) const {
+ switch (index) {
+ case SpecializedIndex:
+ return "Specialized";
+ case SmallIndex:
+ return "Small";
+ case MediumIndex:
+ return "Medium";
+ case HumongousIndex:
+ return "Humongous";
+ default:
+ return NULL;
+ }
+}
+
+ChunkIndex ChunkManager::list_index(size_t size) {
+ switch (size) {
+ case SpecializedChunk:
+ assert(SpecializedChunk == ClassSpecializedChunk,
+ "Need branch for ClassSpecializedChunk");
+ return SpecializedIndex;
+ case SmallChunk:
+ case ClassSmallChunk:
+ return SmallIndex;
+ case MediumChunk:
+ case ClassMediumChunk:
+ return MediumIndex;
+ default:
+ assert(size > MediumChunk || size > ClassMediumChunk,
+ "Not a humongous chunk");
+ return HumongousIndex;
+ }
+}
+
void SpaceManager::deallocate(MetaWord* p, size_t word_size) {
assert_lock_strong(_lock);
size_t min_size = TreeChunk<Metablock, FreeList>::min_size();
@@ -1942,52 +2108,13 @@
// Find the correct list and and set the current
// chunk for that list.
- switch (new_chunk->word_size()) {
- case SpaceManager::SmallChunk :
- if (chunks_in_use(SmallIndex) == NULL) {
- // First chunk to add to the list
- set_chunks_in_use(SmallIndex, new_chunk);
- } else {
- assert(current_chunk()->word_size() == SpaceManager::SmallChunk,
- err_msg( "Incorrect mix of sizes in chunk list "
- SIZE_FORMAT " new chunk " SIZE_FORMAT,
- current_chunk()->word_size(), new_chunk->word_size()));
- current_chunk()->set_next(new_chunk);
- }
- // Make current chunk
+ ChunkIndex index = ChunkManager::list_index(new_chunk->word_size());
+
+ if (index != HumongousIndex) {
set_current_chunk(new_chunk);
- break;
- case SpaceManager::MediumChunk :
- if (chunks_in_use(MediumIndex) == NULL) {
- // About to add the first medium chunk so teminate the
- // small chunk list. In general once medium chunks are
- // being added, we're past the need for small chunks.
- if (current_chunk() != NULL) {
- // Only a small chunk or the initial chunk could be
- // the current chunk if this is the first medium chunk.
- assert(current_chunk()->word_size() == SpaceManager::SmallChunk ||
- chunks_in_use(SmallIndex) == NULL,
- err_msg("Should be a small chunk or initial chunk, current chunk "
- SIZE_FORMAT " new chunk " SIZE_FORMAT,
- current_chunk()->word_size(), new_chunk->word_size()));
- current_chunk()->set_next(NULL);
- }
- // First chunk to add to the list
- set_chunks_in_use(MediumIndex, new_chunk);
-
- } else {
- // As a minimum the first medium chunk added would
- // have become the _current_chunk
- // so the _current_chunk has to be non-NULL here
- // (although not necessarily still the first medium chunk).
- assert(current_chunk()->word_size() == SpaceManager::MediumChunk,
- "A medium chunk should the current chunk");
- current_chunk()->set_next(new_chunk);
- }
- // Make current chunk
- set_current_chunk(new_chunk);
- break;
- default: {
+ new_chunk->set_next(chunks_in_use(index));
+ set_chunks_in_use(index, new_chunk);
+ } else {
// For null class loader data and DumpSharedSpaces, the first chunk isn't
// small, so small will be null. Link this first chunk as the current
// chunk.
@@ -2002,8 +2129,7 @@
new_chunk->set_next(chunks_in_use(HumongousIndex));
set_chunks_in_use(HumongousIndex, new_chunk);
- assert(new_chunk->word_size() > MediumChunk, "List inconsistency");
- }
+ assert(new_chunk->word_size() > medium_chunk_size(), "List inconsistency");
}
assert(new_chunk->is_empty(), "Not ready for reuse");
@@ -2015,6 +2141,22 @@
}
}
+Metachunk* SpaceManager::get_new_chunk(size_t word_size,
+ size_t grow_chunks_by_words) {
+
+ Metachunk* next = vs_list()->get_new_chunk(word_size,
+ grow_chunks_by_words,
+ medium_chunk_bunch());
+
+ if (TraceMetadataHumongousAllocation &&
+ SpaceManager::is_humongous(next->word_size())) {
+ gclog_or_tty->print_cr(" new humongous chunk word size " PTR_FORMAT,
+ next->word_size());
+ }
+
+ return next;
+}
+
MetaWord* SpaceManager::allocate(size_t word_size) {
MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
@@ -2090,12 +2232,7 @@
// verfication of chunks does not work since
// being in the dictionary alters a chunk.
if (block_freelists()->total_size() == 0) {
- // Skip the small chunks because their next link points to
- // medium chunks. This is because the small chunk is the
- // current chunk (for allocations) until it is full and the
- // the addition of the next chunk does not NULL the next
- // like of the small chunk.
- for (ChunkIndex i = MediumIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
+ for (ChunkIndex i = ZeroIndex; i < NumberOfInUseLists; i = next_chunk_index(i)) {
Metachunk* curr = chunks_in_use(i);
while (curr != NULL) {
curr->verify();
@@ -2108,15 +2245,15 @@
void SpaceManager::verify_chunk_size(Metachunk* chunk) {
assert(is_humongous(chunk->word_size()) ||
- chunk->word_size() == MediumChunk ||
- chunk->word_size() == SmallChunk,
+ chunk->word_size() == medium_chunk_size() ||
+ chunk->word_size() == small_chunk_size() ||
+ chunk->word_size() == specialized_chunk_size(),
"Chunk size is wrong");
return;
}
#ifdef ASSERT
void SpaceManager::verify_allocation_total() {
-#if 0
// Verification is only guaranteed at a safepoint.
if (SafepointSynchronize::is_at_safepoint()) {
gclog_or_tty->print_cr("Chunk " PTR_FORMAT " allocation_total " SIZE_FORMAT
@@ -2129,7 +2266,6 @@
assert(allocation_total() == sum_used_in_chunks_in_use(),
err_msg("allocation total is not consistent %d vs %d",
allocation_total(), sum_used_in_chunks_in_use()));
-#endif
}
#endif
@@ -2142,7 +2278,7 @@
size_t capacity = 0;
// Add up statistics for all chunks in this SpaceManager.
- for (ChunkIndex index = SmallIndex;
+ for (ChunkIndex index = ZeroIndex;
index < NumberOfInUseLists;
index = next_chunk_index(index)) {
for (Metachunk* curr = chunks_in_use(index);
@@ -2160,7 +2296,7 @@
}
}
- size_t free = current_chunk()->free_word_size();
+ size_t free = current_chunk() == NULL ? 0 : current_chunk()->free_word_size();
// Free space isn't wasted.
waste -= free;
@@ -2171,25 +2307,18 @@
#ifndef PRODUCT
void SpaceManager::mangle_freed_chunks() {
- for (ChunkIndex index = SmallIndex;
+ for (ChunkIndex index = ZeroIndex;
index < NumberOfInUseLists;
index = next_chunk_index(index)) {
for (Metachunk* curr = chunks_in_use(index);
curr != NULL;
curr = curr->next()) {
- // Try to detect incorrectly terminated small chunk
- // list.
- assert(index == MediumIndex || curr != chunks_in_use(MediumIndex),
- err_msg("Mangling medium chunks in small chunks? "
- "curr " PTR_FORMAT " medium list " PTR_FORMAT,
- curr, chunks_in_use(MediumIndex)));
curr->mangle();
}
}
}
#endif // PRODUCT
-
// MetaspaceAux
size_t MetaspaceAux::used_in_bytes(Metaspace::MetadataType mdtype) {
@@ -2236,7 +2365,7 @@
return reserved * BytesPerWord;
}
-size_t MetaspaceAux::min_chunk_size() { return SpaceManager::MediumChunk; }
+size_t MetaspaceAux::min_chunk_size() { return Metaspace::first_chunk_word_size(); }
size_t MetaspaceAux::free_chunks_total(Metaspace::MetadataType mdtype) {
ChunkManager* chunk = (mdtype == Metaspace::ClassType) ?
@@ -2316,26 +2445,44 @@
// Print total fragmentation for class and data metaspaces separately
void MetaspaceAux::print_waste(outputStream* out) {
- size_t small_waste = 0, medium_waste = 0, large_waste = 0;
- size_t cls_small_waste = 0, cls_medium_waste = 0, cls_large_waste = 0;
+ size_t specialized_waste = 0, small_waste = 0, medium_waste = 0, large_waste = 0;
+ size_t specialized_count = 0, small_count = 0, medium_count = 0, large_count = 0;
+ size_t cls_specialized_waste = 0, cls_small_waste = 0, cls_medium_waste = 0, cls_large_waste = 0;
+ size_t cls_specialized_count = 0, cls_small_count = 0, cls_medium_count = 0, cls_large_count = 0;
ClassLoaderDataGraphMetaspaceIterator iter;
while (iter.repeat()) {
Metaspace* msp = iter.get_next();
if (msp != NULL) {
+ specialized_waste += msp->vsm()->sum_waste_in_chunks_in_use(SpecializedIndex);
+ specialized_count += msp->vsm()->sum_count_in_chunks_in_use(SpecializedIndex);
small_waste += msp->vsm()->sum_waste_in_chunks_in_use(SmallIndex);
+ small_count += msp->vsm()->sum_count_in_chunks_in_use(SmallIndex);
medium_waste += msp->vsm()->sum_waste_in_chunks_in_use(MediumIndex);
+ medium_count += msp->vsm()->sum_count_in_chunks_in_use(MediumIndex);
large_waste += msp->vsm()->sum_waste_in_chunks_in_use(HumongousIndex);
-
+ large_count += msp->vsm()->sum_count_in_chunks_in_use(HumongousIndex);
+
+ cls_specialized_waste += msp->class_vsm()->sum_waste_in_chunks_in_use(SpecializedIndex);
+ cls_specialized_count += msp->class_vsm()->sum_count_in_chunks_in_use(SpecializedIndex);
cls_small_waste += msp->class_vsm()->sum_waste_in_chunks_in_use(SmallIndex);
+ cls_small_count += msp->class_vsm()->sum_count_in_chunks_in_use(SmallIndex);
cls_medium_waste += msp->class_vsm()->sum_waste_in_chunks_in_use(MediumIndex);
+ cls_medium_count += msp->class_vsm()->sum_count_in_chunks_in_use(MediumIndex);
cls_large_waste += msp->class_vsm()->sum_waste_in_chunks_in_use(HumongousIndex);
+ cls_large_count += msp->class_vsm()->sum_count_in_chunks_in_use(HumongousIndex);
}
}
out->print_cr("Total fragmentation waste (words) doesn't count free space");
- out->print(" data: small " SIZE_FORMAT " medium " SIZE_FORMAT,
- small_waste, medium_waste);
- out->print_cr(" class: small " SIZE_FORMAT, cls_small_waste);
+ out->print_cr(" data: " SIZE_FORMAT " specialized(s) " SIZE_FORMAT ", "
+ SIZE_FORMAT " small(s) " SIZE_FORMAT ", "
+ SIZE_FORMAT " medium(s) " SIZE_FORMAT,
+ specialized_count, specialized_waste, small_count,
+ small_waste, medium_count, medium_waste);
+ out->print_cr(" class: " SIZE_FORMAT " specialized(s) " SIZE_FORMAT ", "
+ SIZE_FORMAT " small(s) " SIZE_FORMAT,
+ cls_specialized_count, cls_specialized_waste,
+ cls_small_count, cls_small_waste);
}
// Dump global metaspace things from the end of ClassLoaderDataGraph
@@ -2354,13 +2501,10 @@
// Metaspace methods
size_t Metaspace::_first_chunk_word_size = 0;
-
-Metaspace::Metaspace(Mutex* lock, size_t word_size) {
- initialize(lock, word_size);
-}
-
-Metaspace::Metaspace(Mutex* lock) {
- initialize(lock);
+size_t Metaspace::_first_class_chunk_word_size = 0;
+
+Metaspace::Metaspace(Mutex* lock, MetaspaceType type) {
+ initialize(lock, type);
}
Metaspace::~Metaspace() {
@@ -2412,11 +2556,18 @@
}
}
- // Initialize this before initializing the VirtualSpaceList
+ // Initialize these before initializing the VirtualSpaceList
_first_chunk_word_size = InitialBootClassLoaderMetaspaceSize / BytesPerWord;
+ _first_chunk_word_size = align_word_size_up(_first_chunk_word_size);
+ // Make the first class chunk bigger than a medium chunk so it's not put
+ // on the medium chunk list. The next chunk will be small and progress
+ // from there. This size calculated by -version.
+ _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,
+ (ClassMetaspaceSize/BytesPerWord)*2);
+ _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);
// Arbitrarily set the initial virtual space to a multiple
// of the boot class loader size.
- size_t word_size = VIRTUALSPACEMULTIPLIER * Metaspace::first_chunk_word_size();
+ size_t word_size = VIRTUALSPACEMULTIPLIER * first_chunk_word_size();
// Initialize the list of virtual spaces.
_space_list = new VirtualSpaceList(word_size);
}
@@ -2431,23 +2582,8 @@
_class_space_list = new VirtualSpaceList(rs);
}
-
-void Metaspace::initialize(Mutex* lock, size_t initial_size) {
- // Use SmallChunk size if not specified. If specified, use this size for
- // the data metaspace.
- size_t word_size;
- size_t class_word_size;
- if (initial_size == 0) {
- word_size = (size_t) SpaceManager::SmallChunk;
- class_word_size = (size_t) SpaceManager::SmallChunk;
- } else {
- word_size = initial_size;
- // Make the first class chunk bigger than a medium chunk so it's not put
- // on the medium chunk list. The next chunk will be small and progress
- // from there. This size calculated by -version.
- class_word_size = MIN2((size_t)SpaceManager::MediumChunk*5,
- (ClassMetaspaceSize/BytesPerWord)*2);
- }
+void Metaspace::initialize(Mutex* lock,
+ MetaspaceType type) {
assert(space_list() != NULL,
"Metadata VirtualSpaceList has not been initialized");
@@ -2456,6 +2592,11 @@
if (_vsm == NULL) {
return;
}
+ size_t word_size;
+ size_t class_word_size;
+ vsm()->get_initial_chunk_sizes(type,
+ &word_size,
+ &class_word_size);
assert(class_space_list() != NULL,
"Class VirtualSpaceList has not been initialized");
@@ -2470,7 +2611,8 @@
// Allocate chunk for metadata objects
Metachunk* new_chunk =
- space_list()->current_virtual_space()->get_chunk_vs_with_expand(word_size);
+ space_list()->get_initialization_chunk(word_size,
+ vsm()->medium_chunk_bunch());
assert(!DumpSharedSpaces || new_chunk != NULL, "should have enough space for both chunks");
if (new_chunk != NULL) {
// Add to this manager's list of chunks in use and current_chunk().
@@ -2479,12 +2621,18 @@
// Allocate chunk for class metadata objects
Metachunk* class_chunk =
- class_space_list()->current_virtual_space()->get_chunk_vs_with_expand(class_word_size);
+ class_space_list()->get_initialization_chunk(class_word_size,
+ class_vsm()->medium_chunk_bunch());
if (class_chunk != NULL) {
class_vsm()->add_chunk(class_chunk, true);
}
}
+size_t Metaspace::align_word_size_up(size_t word_size) {
+ size_t byte_size = word_size * wordSize;
+ return ReservedSpace::allocation_align_size_up(byte_size) / wordSize;
+}
+
MetaWord* Metaspace::allocate(size_t word_size, MetadataType mdtype) {
// DumpSharedSpaces doesn't use class metadata area (yet)
if (mdtype == ClassType && !DumpSharedSpaces) {
@@ -2610,6 +2758,12 @@
// If result is still null, we are out of memory.
if (result == NULL) {
+ if (Verbose && TraceMetadataChunkAllocation) {
+ gclog_or_tty->print_cr("Metaspace allocation failed for size "
+ SIZE_FORMAT, word_size);
+ if (loader_data->metaspace_or_null() != NULL) loader_data->metaspace_or_null()->dump(gclog_or_tty);
+ MetaspaceAux::dump(gclog_or_tty);
+ }
// -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError support
report_java_out_of_memory("Metadata space");
--- a/hotspot/src/share/vm/memory/metaspace.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/metaspace.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -87,11 +87,23 @@
public:
enum MetadataType {ClassType, NonClassType};
+ enum MetaspaceType {
+ StandardMetaspaceType,
+ BootMetaspaceType,
+ ROMetaspaceType,
+ ReadWriteMetaspaceType,
+ AnonymousMetaspaceType,
+ ReflectionMetaspaceType
+ };
private:
- void initialize(Mutex* lock, size_t initial_size = 0);
+ void initialize(Mutex* lock, MetaspaceType type);
+
+ // Align up the word size to the allocation word size
+ static size_t align_word_size_up(size_t);
static size_t _first_chunk_word_size;
+ static size_t _first_class_chunk_word_size;
SpaceManager* _vsm;
SpaceManager* vsm() const { return _vsm; }
@@ -110,8 +122,7 @@
public:
- Metaspace(Mutex* lock, size_t initial_size);
- Metaspace(Mutex* lock);
+ Metaspace(Mutex* lock, MetaspaceType type);
~Metaspace();
// Initialize globals for Metaspace
@@ -119,6 +130,7 @@
static void initialize_class_space(ReservedSpace rs);
static size_t first_chunk_word_size() { return _first_chunk_word_size; }
+ static size_t first_class_chunk_word_size() { return _first_class_chunk_word_size; }
char* bottom() const;
size_t used_words(MetadataType mdtype) const;
--- a/hotspot/src/share/vm/memory/metaspaceShared.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/metaspaceShared.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -373,17 +373,44 @@
md_top = wc.get_top();
// Print shared spaces all the time
- const char* fmt = "%s space: " PTR_FORMAT " out of " PTR_FORMAT " words allocated at " PTR_FORMAT ".";
+ const char* fmt = "%s space: %9d [ %4.1f%% of total] out of %9d bytes [%4.1f%% used] at " PTR_FORMAT;
Metaspace* ro_space = _loader_data->ro_metaspace();
Metaspace* rw_space = _loader_data->rw_metaspace();
- tty->print_cr(fmt, "ro", ro_space->used_words(Metaspace::NonClassType),
- ro_space->capacity_words(Metaspace::NonClassType),
- ro_space->bottom());
- tty->print_cr(fmt, "rw", rw_space->used_words(Metaspace::NonClassType),
- rw_space->capacity_words(Metaspace::NonClassType),
- rw_space->bottom());
- tty->print_cr(fmt, "md", md_top - md_low, md_end-md_low, md_low);
- tty->print_cr(fmt, "mc", mc_top - mc_low, mc_end-mc_low, mc_low);
+ const size_t BPW = BytesPerWord;
+
+ // Allocated size of each space (may not be all occupied)
+ const size_t ro_alloced = ro_space->capacity_words(Metaspace::NonClassType) * BPW;
+ const size_t rw_alloced = rw_space->capacity_words(Metaspace::NonClassType) * BPW;
+ const size_t md_alloced = md_end-md_low;
+ const size_t mc_alloced = mc_end-mc_low;
+ const size_t total_alloced = ro_alloced + rw_alloced + md_alloced + mc_alloced;
+
+ // Occupied size of each space.
+ const size_t ro_bytes = ro_space->used_words(Metaspace::NonClassType) * BPW;
+ const size_t rw_bytes = rw_space->used_words(Metaspace::NonClassType) * BPW;
+ const size_t md_bytes = size_t(md_top - md_low);
+ const size_t mc_bytes = size_t(mc_top - mc_low);
+
+ // Percent of total size
+ const size_t total_bytes = ro_bytes + rw_bytes + md_bytes + mc_bytes;
+ const double ro_t_perc = ro_bytes / double(total_bytes) * 100.0;
+ const double rw_t_perc = rw_bytes / double(total_bytes) * 100.0;
+ const double md_t_perc = md_bytes / double(total_bytes) * 100.0;
+ const double mc_t_perc = mc_bytes / double(total_bytes) * 100.0;
+
+ // Percent of fullness of each space
+ const double ro_u_perc = ro_bytes / double(ro_alloced) * 100.0;
+ const double rw_u_perc = rw_bytes / double(rw_alloced) * 100.0;
+ const double md_u_perc = md_bytes / double(md_alloced) * 100.0;
+ const double mc_u_perc = mc_bytes / double(mc_alloced) * 100.0;
+ const double total_u_perc = total_bytes / double(total_alloced) * 100.0;
+
+ tty->print_cr(fmt, "ro", ro_bytes, ro_t_perc, ro_alloced, ro_u_perc, ro_space->bottom());
+ tty->print_cr(fmt, "rw", rw_bytes, rw_t_perc, rw_alloced, rw_u_perc, rw_space->bottom());
+ tty->print_cr(fmt, "md", md_bytes, md_t_perc, md_alloced, md_u_perc, md_low);
+ tty->print_cr(fmt, "mc", mc_bytes, mc_t_perc, mc_alloced, mc_u_perc, mc_low);
+ tty->print_cr("total : %9d [100.0%% of total] out of %9d bytes [%4.1f%% used]",
+ total_bytes, total_alloced, total_u_perc);
// Update the vtable pointers in all of the Klass objects in the
// heap. They should point to newly generated vtable.
@@ -689,9 +716,15 @@
bool MetaspaceShared::map_shared_spaces(FileMapInfo* mapinfo) {
size_t image_alignment = mapinfo->alignment();
- // Map in the shared memory and then map the regions on top of it
+#ifndef _WINDOWS
+ // Map in the shared memory and then map the regions on top of it.
+ // On Windows, don't map the memory here because it will cause the
+ // mappings of the regions to fail.
ReservedSpace shared_rs = mapinfo->reserve_shared_memory();
if (!shared_rs.is_reserved()) return false;
+#endif
+
+ assert(!DumpSharedSpaces, "Should not be called with DumpSharedSpaces");
// Map each shared region
if ((_ro_base = mapinfo->map_region(ro)) != NULL &&
@@ -708,8 +741,10 @@
if (_rw_base != NULL) mapinfo->unmap_region(rw);
if (_md_base != NULL) mapinfo->unmap_region(md);
if (_mc_base != NULL) mapinfo->unmap_region(mc);
+#ifndef _WINDOWS
// Release the entire mapped region
shared_rs.release();
+#endif
// If -Xshare:on is specified, print out the error message and exit VM,
// otherwise, set UseSharedSpaces to false and continue.
if (RequireSharedSpaces) {
--- a/hotspot/src/share/vm/memory/space.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/space.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -411,7 +411,6 @@
assert(q->forwardee() == NULL, "should be forwarded to NULL");
}
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::register_live_oop(q, size));
compact_top += size;
// we need to update the offset table so that the beginnings of objects can be
@@ -470,13 +469,10 @@
if (oop(q)->is_gc_marked()) {
// q is alive
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::track_interior_pointers(oop(q)));
// point all the oops to the new location
size_t size = oop(q)->adjust_pointers();
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::check_interior_pointers());
debug_only(prev_q = q);
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::validate_live_oop(oop(q), size));
q += size;
} else {
--- a/hotspot/src/share/vm/memory/space.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/space.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -655,16 +655,10 @@
assert(block_is_obj(q), \
"should be at block boundaries, and should be looking at objs"); \
\
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::track_interior_pointers(oop(q))); \
- \
/* point all the oops to the new location */ \
size_t size = oop(q)->adjust_pointers(); \
size = adjust_obj_size(size); \
\
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::check_interior_pointers()); \
- \
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::validate_live_oop(oop(q), size)); \
- \
q += size; \
} \
\
@@ -685,12 +679,9 @@
Prefetch::write(q, interval); \
if (oop(q)->is_gc_marked()) { \
/* q is alive */ \
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::track_interior_pointers(oop(q))); \
/* point all the oops to the new location */ \
size_t size = oop(q)->adjust_pointers(); \
size = adjust_obj_size(size); \
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::check_interior_pointers()); \
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::validate_live_oop(oop(q), size)); \
debug_only(prev_q = q); \
q += size; \
} else { \
@@ -725,7 +716,6 @@
size_t size = obj_size(q); \
assert(!oop(q)->is_gc_marked(), \
"should be unmarked (special dense prefix handling)"); \
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::live_oop_moved_to(q, size, q)); \
debug_only(prev_q = q); \
q += size; \
} \
@@ -759,8 +749,6 @@
Prefetch::write(compaction_top, copy_interval); \
\
/* copy object and reinit its mark */ \
- VALIDATE_MARK_SWEEP_ONLY(MarkSweep::live_oop_moved_to(q, size, \
- compaction_top)); \
assert(q != compaction_top, "everything in this pass should be moving"); \
Copy::aligned_conjoint_words(q, compaction_top, size); \
oop(compaction_top)->init_mark(); \
--- a/hotspot/src/share/vm/memory/tenuredGeneration.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/tenuredGeneration.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -62,7 +62,7 @@
_virtual_space.reserved_size(),
_the_space, _gen_counters);
#ifndef SERIALGC
- if (UseParNewGC && ParallelGCThreads > 0) {
+ if (UseParNewGC) {
typedef ParGCAllocBufferWithBOT* ParGCAllocBufferWithBOTPtr;
_alloc_buffers = NEW_C_HEAP_ARRAY(ParGCAllocBufferWithBOTPtr,
ParallelGCThreads, mtGC);
--- a/hotspot/src/share/vm/memory/universe.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/memory/universe.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -228,7 +228,7 @@
if (size < alignment || size % alignment != 0) {
ResourceMark rm;
stringStream st;
- st.print("Size of %s (%ld bytes) must be aligned to %ld bytes", name, size, alignment);
+ st.print("Size of %s (" UINTX_FORMAT " bytes) must be aligned to " UINTX_FORMAT " bytes", name, size, alignment);
char* error = st.as_string();
vm_exit_during_initialization(error);
}
--- a/hotspot/src/share/vm/oops/annotations.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/annotations.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -61,6 +61,9 @@
free_contents(loader_data, methods_annotations());
free_contents(loader_data, methods_parameter_annotations());
free_contents(loader_data, methods_default_annotations());
+
+ // Recursively deallocate optional Annotations linked through this one
+ MetadataFactory::free_metadata(loader_data, type_annotations());
}
// Set the annotation at 'idnum' to 'anno'.
--- a/hotspot/src/share/vm/oops/annotations.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/annotations.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -38,7 +38,8 @@
typedef Array<u1> AnnotationArray;
// Class to hold the various types of annotations. The only metadata that points
-// to this is InstanceKlass.
+// to this is InstanceKlass, or another Annotations instance if this is a
+// a type_annotation instance.
class Annotations: public MetaspaceObj {
@@ -58,6 +59,8 @@
// such annotations.
// Index is the idnum, which is initially the same as the methods array index.
Array<AnnotationArray*>* _methods_default_annotations;
+ // Type annotations for this class, or null if none.
+ Annotations* _type_annotations;
// Constructor where some some values are known to not be null
Annotations(Array<AnnotationArray*>* fa, Array<AnnotationArray*>* ma,
@@ -66,7 +69,8 @@
_fields_annotations(fa),
_methods_annotations(ma),
_methods_parameter_annotations(mpa),
- _methods_default_annotations(mda) {}
+ _methods_default_annotations(mda),
+ _type_annotations(NULL) {}
public:
// Allocate instance of this class
@@ -81,22 +85,26 @@
static int size() { return sizeof(Annotations) / wordSize; }
// Constructor to initialize to null
- Annotations() : _class_annotations(NULL), _fields_annotations(NULL),
+ Annotations() : _class_annotations(NULL),
+ _fields_annotations(NULL),
_methods_annotations(NULL),
_methods_parameter_annotations(NULL),
- _methods_default_annotations(NULL) {}
+ _methods_default_annotations(NULL),
+ _type_annotations(NULL) {}
AnnotationArray* class_annotations() const { return _class_annotations; }
Array<AnnotationArray*>* fields_annotations() const { return _fields_annotations; }
Array<AnnotationArray*>* methods_annotations() const { return _methods_annotations; }
Array<AnnotationArray*>* methods_parameter_annotations() const { return _methods_parameter_annotations; }
Array<AnnotationArray*>* methods_default_annotations() const { return _methods_default_annotations; }
+ Annotations* type_annotations() const { return _type_annotations; }
void set_class_annotations(AnnotationArray* md) { _class_annotations = md; }
void set_fields_annotations(Array<AnnotationArray*>* md) { _fields_annotations = md; }
void set_methods_annotations(Array<AnnotationArray*>* md) { _methods_annotations = md; }
void set_methods_parameter_annotations(Array<AnnotationArray*>* md) { _methods_parameter_annotations = md; }
void set_methods_default_annotations(Array<AnnotationArray*>* md) { _methods_default_annotations = md; }
+ void set_type_annotations(Annotations* annos) { _type_annotations = annos; }
// Redefine classes support
AnnotationArray* get_method_annotations_of(int idnum)
@@ -129,6 +137,7 @@
inline AnnotationArray* get_method_annotations_from(int idnum, Array<AnnotationArray*>* annos);
void set_annotations(Array<AnnotationArray*>* md, Array<AnnotationArray*>** md_p) { *md_p = md; }
+ bool is_klass() const { return false; }
private:
void set_methods_annotations_of(instanceKlassHandle ik,
int idnum, AnnotationArray* anno,
--- a/hotspot/src/share/vm/oops/constMethod.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/constMethod.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -39,18 +39,21 @@
int localvariable_table_length,
int exception_table_length,
int checked_exceptions_length,
+ int method_parameters_length,
u2 generic_signature_index,
MethodType method_type,
TRAPS) {
int size = ConstMethod::size(byte_code_size,
- compressed_line_number_size,
- localvariable_table_length,
- exception_table_length,
- checked_exceptions_length,
- generic_signature_index);
+ compressed_line_number_size,
+ localvariable_table_length,
+ exception_table_length,
+ checked_exceptions_length,
+ method_parameters_length,
+ generic_signature_index);
return new (loader_data, size, true, THREAD) ConstMethod(
byte_code_size, compressed_line_number_size, localvariable_table_length,
- exception_table_length, checked_exceptions_length, generic_signature_index,
+ exception_table_length, checked_exceptions_length,
+ method_parameters_length, generic_signature_index,
method_type, size);
}
@@ -59,6 +62,7 @@
int localvariable_table_length,
int exception_table_length,
int checked_exceptions_length,
+ int method_parameters_length,
u2 generic_signature_index,
MethodType method_type,
int size) {
@@ -74,7 +78,8 @@
checked_exceptions_length,
compressed_line_number_size,
localvariable_table_length,
- exception_table_length);
+ exception_table_length,
+ method_parameters_length);
set_method_type(method_type);
assert(this->size() == size, "wrong size for object");
}
@@ -92,11 +97,12 @@
// How big must this constMethodObject be?
int ConstMethod::size(int code_size,
- int compressed_line_number_size,
- int local_variable_table_length,
- int exception_table_length,
- int checked_exceptions_length,
- u2 generic_signature_index) {
+ int compressed_line_number_size,
+ int local_variable_table_length,
+ int exception_table_length,
+ int checked_exceptions_length,
+ int method_parameters_length,
+ u2 generic_signature_index) {
int extra_bytes = code_size;
if (compressed_line_number_size > 0) {
extra_bytes += compressed_line_number_size;
@@ -117,6 +123,10 @@
if (generic_signature_index != 0) {
extra_bytes += sizeof(u2);
}
+ if (method_parameters_length > 0) {
+ extra_bytes += sizeof(u2);
+ extra_bytes += method_parameters_length * sizeof(MethodParametersElement);
+ }
int extra_words = align_size_up(extra_bytes, BytesPerWord) / BytesPerWord;
return align_object_size(header_size() + extra_words);
}
@@ -143,6 +153,18 @@
u2* ConstMethod::checked_exceptions_length_addr() const {
// Located immediately before the generic signature index.
assert(has_checked_exceptions(), "called only if table is present");
+ if(has_method_parameters()) {
+ // If method parameters present, locate immediately before them.
+ return (u2*)method_parameters_start() - 1;
+ } else {
+ // Else, the exception table is at the end of the constMethod.
+ return has_generic_signature() ? (last_u2_element() - 1) :
+ last_u2_element();
+ }
+}
+
+u2* ConstMethod::method_parameters_length_addr() const {
+ assert(has_method_parameters(), "called only if table is present");
return has_generic_signature() ? (last_u2_element() - 1) :
last_u2_element();
}
@@ -153,11 +175,15 @@
// If checked_exception present, locate immediately before them.
return (u2*) checked_exceptions_start() - 1;
} else {
- // Else, the exception table is at the end of the constMethod or
- // immediately before the generic signature index.
+ if(has_method_parameters()) {
+ // If method parameters present, locate immediately before them.
+ return (u2*)method_parameters_start() - 1;
+ } else {
+ // Else, the exception table is at the end of the constMethod.
return has_generic_signature() ? (last_u2_element() - 1) :
last_u2_element();
}
+ }
}
u2* ConstMethod::localvariable_table_length_addr() const {
@@ -170,12 +196,16 @@
// If checked_exception present, locate immediately before them.
return (u2*) checked_exceptions_start() - 1;
} else {
- // Else, the linenumber table is at the end of the constMethod or
- // immediately before the generic signature index.
+ if(has_method_parameters()) {
+ // If method parameters present, locate immediately before them.
+ return (u2*)method_parameters_start() - 1;
+ } else {
+ // Else, the exception table is at the end of the constMethod.
return has_generic_signature() ? (last_u2_element() - 1) :
last_u2_element();
}
}
+ }
}
// Update the flags to indicate the presence of these optional fields.
@@ -183,29 +213,57 @@
int checked_exceptions_len,
int compressed_line_number_size,
int localvariable_table_len,
- int exception_table_len) {
- // Must be done in the order below, otherwise length_addr accessors
- // will not work. Only set bit in header if length is positive.
+ int exception_table_len,
+ int method_parameters_len) {
assert(_flags == 0, "Error");
- if (compressed_line_number_size > 0) {
+ if (compressed_line_number_size > 0)
_flags |= _has_linenumber_table;
- }
- if (generic_signature_index != 0) {
+ if (generic_signature_index != 0)
_flags |= _has_generic_signature;
+ if (method_parameters_len > 0)
+ _flags |= _has_method_parameters;
+ if (checked_exceptions_len > 0)
+ _flags |= _has_checked_exceptions;
+ if (exception_table_len > 0)
+ _flags |= _has_exception_table;
+ if (localvariable_table_len > 0)
+ _flags |= _has_localvariable_table;
+
+ // This code is extremely brittle and should possibly be revised.
+ // The *_length_addr functions walk backwards through the
+ // constMethod data, using each of the length indexes ahead of them,
+ // as well as the flags variable. Therefore, the indexes must be
+ // initialized in reverse order, or else they will compute the wrong
+ // offsets. Moving the initialization of _flags into a separate
+ // block solves *half* of the problem, but the following part will
+ // still break if the order is not exactly right.
+ //
+ // Also, the servicability agent needs to be informed anytime
+ // anything is added here. It might be advisable to have some sort
+ // of indication of this inline.
+ if (generic_signature_index != 0)
*(generic_signature_index_addr()) = generic_signature_index;
- }
- if (checked_exceptions_len > 0) {
- _flags |= _has_checked_exceptions;
+ // New data should probably go here.
+ if (method_parameters_len > 0)
+ *(method_parameters_length_addr()) = method_parameters_len;
+ if (checked_exceptions_len > 0)
*(checked_exceptions_length_addr()) = checked_exceptions_len;
- }
- if (exception_table_len > 0) {
- _flags |= _has_exception_table;
+ if (exception_table_len > 0)
*(exception_table_length_addr()) = exception_table_len;
- }
- if (localvariable_table_len > 0) {
- _flags |= _has_localvariable_table;
+ if (localvariable_table_len > 0)
*(localvariable_table_length_addr()) = localvariable_table_len;
- }
+}
+
+int ConstMethod::method_parameters_length() const {
+ return has_method_parameters() ? *(method_parameters_length_addr()) : 0;
+}
+
+MethodParametersElement* ConstMethod::method_parameters_start() const {
+ u2* addr = method_parameters_length_addr();
+ u2 length = *addr;
+ assert(length > 0, "should only be called if table is present");
+ addr -= length * sizeof(MethodParametersElement) / sizeof(u2);
+ return (MethodParametersElement*) addr;
}
@@ -298,6 +356,10 @@
}
guarantee(compressed_table_end <= m_end, "invalid method layout");
// Verify checked exceptions, exception table and local variable tables
+ if (has_method_parameters()) {
+ u2* addr = method_parameters_length_addr();
+ guarantee(*addr > 0 && (address) addr >= compressed_table_end && (address) addr < m_end, "invalid method layout");
+ }
if (has_checked_exceptions()) {
u2* addr = checked_exceptions_length_addr();
guarantee(*addr > 0 && (address) addr >= compressed_table_end && (address) addr < m_end, "invalid method layout");
@@ -318,6 +380,8 @@
uncompressed_table_start = (u2*) exception_table_start();
} else if (has_checked_exceptions()) {
uncompressed_table_start = (u2*) checked_exceptions_start();
+ } else if (has_method_parameters()) {
+ uncompressed_table_start = (u2*) method_parameters_start();
} else {
uncompressed_table_start = (u2*) m_end;
}
--- a/hotspot/src/share/vm/oops/constMethod.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/constMethod.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -77,9 +77,18 @@
// | (access flags bit tells whether table is present) |
// | (indexed from end of ConstMethod*) |
// |------------------------------------------------------|
+// | method parameters elements + length (length last) |
+// | (length is u2, elements are u2, u4 structures) |
+// | (see class MethodParametersElement) |
+// | (access flags bit tells whether table is present) |
+// | (indexed from end of ConstMethod*) |
+// |------------------------------------------------------|
// | generic signature index (u2) |
// | (indexed from start of constMethodOop) |
// |------------------------------------------------------|
+//
+// IMPORTANT: If anything gets added here, there need to be changes to
+// ensure that ServicabilityAgent doesn't get broken as a result!
// Utitily class decribing elements in checked exceptions table inlined in Method*.
@@ -109,6 +118,18 @@
u2 catch_type_index;
};
+// Utility class describing elements in method parameters
+class MethodParametersElement VALUE_OBJ_CLASS_SPEC {
+ public:
+ u2 name_cp_index;
+ // This has to happen, otherwise it will cause SIGBUS from a
+ // misaligned u4 on some architectures (ie SPARC)
+ // because MethodParametersElements are only aligned mod 2
+ // within the ConstMethod container u2 flags_hi;
+ u2 flags_hi;
+ u2 flags_lo;
+};
+
class ConstMethod : public MetaspaceObj {
friend class VMStructs;
@@ -123,7 +144,8 @@
_has_localvariable_table = 4,
_has_exception_table = 8,
_has_generic_signature = 16,
- _is_overpass = 32
+ _has_method_parameters = 32,
+ _is_overpass = 64
};
// Bit vector of signature
@@ -160,6 +182,7 @@
int localvariable_table_length,
int exception_table_length,
int checked_exceptions_length,
+ int method_parameters_length,
u2 generic_signature_index,
MethodType is_overpass,
int size);
@@ -171,6 +194,7 @@
int localvariable_table_length,
int exception_table_length,
int checked_exceptions_length,
+ int method_parameters_length,
u2 generic_signature_index,
MethodType mt,
TRAPS);
@@ -182,7 +206,8 @@
int checked_exceptions_len,
int compressed_line_number_size,
int localvariable_table_len,
- int exception_table_len);
+ int exception_table_len,
+ int method_parameters_length);
bool has_generic_signature() const
{ return (_flags & _has_generic_signature) != 0; }
@@ -199,6 +224,9 @@
bool has_exception_handler() const
{ return (_flags & _has_exception_table) != 0; }
+ bool has_method_parameters() const
+ { return (_flags & _has_method_parameters) != 0; }
+
MethodType method_type() const {
return ((_flags & _is_overpass) == 0) ? NORMAL : OVERPASS;
}
@@ -284,10 +312,11 @@
// Size needed
static int size(int code_size, int compressed_line_number_size,
- int local_variable_table_length,
- int exception_table_length,
- int checked_exceptions_length,
- u2 generic_signature_index);
+ int local_variable_table_length,
+ int exception_table_length,
+ int checked_exceptions_length,
+ int method_parameters_length,
+ u2 generic_signature_index);
int size() const { return _constMethod_size;}
void set_constMethod_size(int size) { _constMethod_size = size; }
@@ -308,6 +337,7 @@
u2* checked_exceptions_length_addr() const;
u2* localvariable_table_length_addr() const;
u2* exception_table_length_addr() const;
+ u2* method_parameters_length_addr() const;
// checked exceptions
int checked_exceptions_length() const;
@@ -321,6 +351,10 @@
int exception_table_length() const;
ExceptionTableElement* exception_table_start() const;
+ // method parameters table
+ int method_parameters_length() const;
+ MethodParametersElement* method_parameters_start() const;
+
// byte codes
void set_code(address code) {
if (code_size() > 0) {
--- a/hotspot/src/share/vm/oops/constantPool.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/constantPool.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@
set_pool_holder(NULL);
set_flags(0);
// only set to non-zero if constant pool is merged by RedefineClasses
- set_orig_length(0);
+ set_version(0);
set_lock(new Monitor(Monitor::nonleaf + 2, "A constant pool lock"));
// all fields are initialized; needed for GC
set_on_stack(false);
--- a/hotspot/src/share/vm/oops/constantPool.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/constantPool.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -103,8 +103,8 @@
union {
// set for CDS to restore resolved references
int _resolved_reference_length;
- // only set to non-zero if constant pool is merged by RedefineClasses
- int _orig_length;
+ // keeps version number for redefined classes (used in backtrace)
+ int _version;
} _saved;
Monitor* _lock;
@@ -784,8 +784,11 @@
static void copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i, constantPoolHandle to_cp, int to_i, TRAPS);
static void copy_entry_to(constantPoolHandle from_cp, int from_i, constantPoolHandle to_cp, int to_i, TRAPS);
int find_matching_entry(int pattern_i, constantPoolHandle search_cp, TRAPS);
- int orig_length() const { return _saved._orig_length; }
- void set_orig_length(int orig_length) { _saved._orig_length = orig_length; }
+ int version() const { return _saved._version; }
+ void set_version(int version) { _saved._version = version; }
+ void increment_and_save_version(int version) {
+ _saved._version = version >= 0 ? (version + 1) : version; // keep overflow
+ }
void set_resolved_reference_length(int length) { _saved._resolved_reference_length = length; }
int resolved_reference_length() const { return _saved._resolved_reference_length; }
--- a/hotspot/src/share/vm/oops/fieldInfo.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/fieldInfo.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -43,14 +43,29 @@
public:
// fields
// Field info extracted from the class file and stored
- // as an array of 7 shorts
+ // as an array of 6 shorts.
+
+#define FIELDINFO_TAG_SIZE 2
+#define FIELDINFO_TAG_BLANK 0
+#define FIELDINFO_TAG_OFFSET 1
+#define FIELDINFO_TAG_TYPE_PLAIN 2
+#define FIELDINFO_TAG_TYPE_CONTENDED 3
+#define FIELDINFO_TAG_MASK 3
+
+ // Packed field has the tag, and can be either of:
+ // hi bits <--------------------------- lo bits
+ // |---------high---------|---------low---------|
+ // ..........................................00 - blank
+ // [------------------offset----------------]01 - real field offset
+ // ......................[-------type-------]10 - plain field with type
+ // [--contention_group--][-------type-------]11 - contended field with type and contention group
enum FieldOffset {
access_flags_offset = 0,
name_index_offset = 1,
signature_index_offset = 2,
initval_index_offset = 3,
- low_offset = 4,
- high_offset = 5,
+ low_packed_offset = 4,
+ high_packed_offset = 5,
field_slots = 6
};
@@ -76,17 +91,90 @@
void initialize(u2 access_flags,
u2 name_index,
u2 signature_index,
- u2 initval_index,
- u4 offset) {
+ u2 initval_index) {
_shorts[access_flags_offset] = access_flags;
_shorts[name_index_offset] = name_index;
_shorts[signature_index_offset] = signature_index;
_shorts[initval_index_offset] = initval_index;
- set_offset(offset);
+ _shorts[low_packed_offset] = 0;
+ _shorts[high_packed_offset] = 0;
}
u2 access_flags() const { return _shorts[access_flags_offset]; }
- u4 offset() const { return build_int_from_shorts(_shorts[low_offset], _shorts[high_offset]); }
+ u4 offset() const {
+ u2 lo = _shorts[low_packed_offset];
+ switch(lo & FIELDINFO_TAG_MASK) {
+ case FIELDINFO_TAG_OFFSET:
+ return build_int_from_shorts(_shorts[low_packed_offset], _shorts[high_packed_offset]) >> FIELDINFO_TAG_SIZE;
+#ifndef PRODUCT
+ case FIELDINFO_TAG_TYPE_PLAIN:
+ ShouldNotReachHere2("Asking offset for the plain type field");
+ case FIELDINFO_TAG_TYPE_CONTENDED:
+ ShouldNotReachHere2("Asking offset for the contended type field");
+ case FIELDINFO_TAG_BLANK:
+ ShouldNotReachHere2("Asking offset for the blank field");
+#endif
+ }
+ ShouldNotReachHere();
+ return 0;
+ }
+
+ bool is_contended() const {
+ u2 lo = _shorts[low_packed_offset];
+ switch(lo & FIELDINFO_TAG_MASK) {
+ case FIELDINFO_TAG_TYPE_PLAIN:
+ return false;
+ case FIELDINFO_TAG_TYPE_CONTENDED:
+ return true;
+#ifndef PRODUCT
+ case FIELDINFO_TAG_OFFSET:
+ ShouldNotReachHere2("Asking contended flag for the field with offset");
+ case FIELDINFO_TAG_BLANK:
+ ShouldNotReachHere2("Asking contended flag for the blank field");
+#endif
+ }
+ ShouldNotReachHere();
+ return false;
+ }
+
+ u2 contended_group() const {
+ u2 lo = _shorts[low_packed_offset];
+ switch(lo & FIELDINFO_TAG_MASK) {
+ case FIELDINFO_TAG_TYPE_PLAIN:
+ return 0;
+ case FIELDINFO_TAG_TYPE_CONTENDED:
+ return _shorts[high_packed_offset];
+#ifndef PRODUCT
+ case FIELDINFO_TAG_OFFSET:
+ ShouldNotReachHere2("Asking the contended group for the field with offset");
+ case FIELDINFO_TAG_BLANK:
+ ShouldNotReachHere2("Asking the contended group for the blank field");
+#endif
+ }
+ ShouldNotReachHere();
+ return 0;
+ }
+
+ u2 allocation_type() const {
+ u2 lo = _shorts[low_packed_offset];
+ switch(lo & FIELDINFO_TAG_MASK) {
+ case FIELDINFO_TAG_TYPE_PLAIN:
+ case FIELDINFO_TAG_TYPE_CONTENDED:
+ return (lo >> FIELDINFO_TAG_SIZE);
+#ifndef PRODUCT
+ case FIELDINFO_TAG_OFFSET:
+ ShouldNotReachHere2("Asking the field type for field with offset");
+ case FIELDINFO_TAG_BLANK:
+ ShouldNotReachHere2("Asking the field type for the blank field");
+#endif
+ }
+ ShouldNotReachHere();
+ return 0;
+ }
+
+ bool is_offset_set() const {
+ return (_shorts[low_packed_offset] & FIELDINFO_TAG_MASK) == FIELDINFO_TAG_OFFSET;
+ }
Symbol* name(constantPoolHandle cp) const {
int index = name_index();
@@ -106,8 +194,46 @@
void set_access_flags(u2 val) { _shorts[access_flags_offset] = val; }
void set_offset(u4 val) {
- _shorts[low_offset] = extract_low_short_from_int(val);
- _shorts[high_offset] = extract_high_short_from_int(val);
+ val = val << FIELDINFO_TAG_SIZE; // make room for tag
+ _shorts[low_packed_offset] = extract_low_short_from_int(val) | FIELDINFO_TAG_OFFSET;
+ _shorts[high_packed_offset] = extract_high_short_from_int(val);
+ }
+
+ void set_allocation_type(int type) {
+ u2 lo = _shorts[low_packed_offset];
+ switch(lo & FIELDINFO_TAG_MASK) {
+ case FIELDINFO_TAG_BLANK:
+ _shorts[low_packed_offset] = ((type << FIELDINFO_TAG_SIZE)) & 0xFFFF;
+ _shorts[low_packed_offset] &= ~FIELDINFO_TAG_MASK;
+ _shorts[low_packed_offset] |= FIELDINFO_TAG_TYPE_PLAIN;
+ return;
+#ifndef PRODUCT
+ case FIELDINFO_TAG_TYPE_PLAIN:
+ case FIELDINFO_TAG_TYPE_CONTENDED:
+ case FIELDINFO_TAG_OFFSET:
+ ShouldNotReachHere2("Setting the field type with overwriting");
+#endif
+ }
+ ShouldNotReachHere();
+ }
+
+ void set_contended_group(u2 val) {
+ u2 lo = _shorts[low_packed_offset];
+ switch(lo & FIELDINFO_TAG_MASK) {
+ case FIELDINFO_TAG_TYPE_PLAIN:
+ _shorts[low_packed_offset] |= FIELDINFO_TAG_TYPE_CONTENDED;
+ _shorts[high_packed_offset] = val;
+ return;
+#ifndef PRODUCT
+ case FIELDINFO_TAG_TYPE_CONTENDED:
+ ShouldNotReachHere2("Overwriting contended group");
+ case FIELDINFO_TAG_BLANK:
+ ShouldNotReachHere2("Setting contended group for the blank field");
+ case FIELDINFO_TAG_OFFSET:
+ ShouldNotReachHere2("Setting contended group for field with offset");
+#endif
+ }
+ ShouldNotReachHere();
}
bool is_internal() const {
--- a/hotspot/src/share/vm/oops/fieldStreams.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/fieldStreams.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -160,9 +160,26 @@
return field()->offset();
}
+ int allocation_type() const {
+ return field()->allocation_type();
+ }
+
void set_offset(int offset) {
field()->set_offset(offset);
}
+
+ bool is_offset_set() const {
+ return field()->is_offset_set();
+ }
+
+ bool is_contended() const {
+ return field()->is_contended();
+ }
+
+ int contended_group() const {
+ return field()->contended_group();
+ }
+
};
// Iterate over only the internal fields
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -47,6 +47,7 @@
#include "oops/symbol.hpp"
#include "prims/jvmtiExport.hpp"
#include "prims/jvmtiRedefineClassesTrace.hpp"
+#include "prims/methodComparator.hpp"
#include "runtime/fieldDescriptor.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/javaCalls.hpp"
@@ -160,6 +161,8 @@
#endif // ndef DTRACE_ENABLED
+volatile int InstanceKlass::_total_instanceKlass_count = 0;
+
Klass* InstanceKlass::allocate_instance_klass(ClassLoaderData* loader_data,
int vtable_len,
int itable_len,
@@ -203,6 +206,7 @@
access_flags, !host_klass.is_null());
}
+ Atomic::inc(&_total_instanceKlass_count);
return ik;
}
@@ -361,6 +365,9 @@
set_protection_domain(NULL);
set_signers(NULL);
set_init_lock(NULL);
+
+ // We should deallocate the Annotations instance
+ MetadataFactory::free_metadata(loader_data, annotations());
set_annotations(NULL);
}
@@ -599,7 +606,7 @@
}
// relocate jsrs and link methods after they are all rewritten
- this_oop->relocate_and_link_methods(CHECK_false);
+ this_oop->link_methods(CHECK_false);
// Initialize the vtable and interface table after
// methods have been rewritten since rewrite may
@@ -647,10 +654,31 @@
// Now relocate and link method entry points after class is rewritten.
// This is outside is_rewritten flag. In case of an exception, it can be
// executed more than once.
-void InstanceKlass::relocate_and_link_methods(TRAPS) {
- assert(is_loaded(), "must be loaded");
- instanceKlassHandle this_oop(THREAD, this);
- Rewriter::relocate_and_link(this_oop, CHECK);
+void InstanceKlass::link_methods(TRAPS) {
+ int len = methods()->length();
+ for (int i = len-1; i >= 0; i--) {
+ methodHandle m(THREAD, methods()->at(i));
+
+ // Set up method entry points for compiler and interpreter .
+ m->link_method(m, CHECK);
+
+ // This is for JVMTI and unrelated to relocator but the last thing we do
+#ifdef ASSERT
+ if (StressMethodComparator) {
+ ResourceMark rm(THREAD);
+ static int nmc = 0;
+ for (int j = i; j >= 0 && j >= i-4; j--) {
+ if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc);
+ bool z = MethodComparator::methods_EMCP(m(),
+ methods()->at(j));
+ if (j == i && !z) {
+ tty->print("MethodComparator FAIL: "); m->print(); m->print_codes();
+ assert(z, "method must compare equal to itself");
+ }
+ }
+ }
+#endif //ASSERT
+ }
}
@@ -2306,6 +2334,9 @@
if (_array_name != NULL) _array_name->decrement_refcount();
if (_source_file_name != NULL) _source_file_name->decrement_refcount();
if (_source_debug_extension != NULL) FREE_C_HEAP_ARRAY(char, _source_debug_extension, mtClass);
+
+ assert(_total_instanceKlass_count >= 1, "Sanity check");
+ Atomic::dec(&_total_instanceKlass_count);
}
void InstanceKlass::set_source_file_name(Symbol* n) {
@@ -2859,11 +2890,7 @@
st->print(BULLET"fake entry for mirror: ");
mirrored_klass->print_value_on_maybe_null(st);
st->cr();
- st->print(BULLET"fake entry resolved_constructor: ");
- Method* ctor = java_lang_Class::resolved_constructor(obj);
- ctor->print_value_on_maybe_null(st);
Klass* array_klass = java_lang_Class::array_klass(obj);
- st->cr();
st->print(BULLET"fake entry for array: ");
array_klass->print_value_on_maybe_null(st);
st->cr();
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -31,6 +31,7 @@
#include "oops/fieldInfo.hpp"
#include "oops/instanceOop.hpp"
#include "oops/klassVtable.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.hpp"
#include "runtime/os.hpp"
#include "utilities/accessFlags.hpp"
@@ -170,6 +171,11 @@
initialization_error // error happened during initialization
};
+ static int number_of_instance_classes() { return _total_instanceKlass_count; }
+
+ private:
+ static volatile int _total_instanceKlass_count;
+
protected:
// Protection domain.
oop _protection_domain;
@@ -219,12 +225,17 @@
u2 _java_fields_count; // The number of declared Java fields
int _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks
+ // _is_marked_dependent can be set concurrently, thus cannot be part of the
+ // _misc_flags.
bool _is_marked_dependent; // used for marking during flushing and deoptimization
+
enum {
_misc_rewritten = 1 << 0, // methods rewritten.
_misc_has_nonstatic_fields = 1 << 1, // for sizing with UseCompressedOops
_misc_should_verify_class = 1 << 2, // allow caching of preverification
- _misc_is_anonymous = 1 << 3 // has embedded _inner_classes field
+ _misc_is_anonymous = 1 << 3, // has embedded _inner_classes field
+ _misc_is_contended = 1 << 4, // marked with contended annotation
+ _misc_has_default_methods = 1 << 5 // class/superclass/implemented interfaces has default methods
};
u2 _misc_flags;
u2 _minor_version; // minor version number of class file
@@ -247,10 +258,6 @@
jint _cached_class_file_len; // JVMTI: length of above
JvmtiCachedClassFieldMap* _jvmti_cached_class_field_map; // JVMTI: used during heap iteration
- // true if class, superclass, or implemented interfaces have default methods
- bool _has_default_methods;
-
- volatile u2 _idnum_allocated_count; // JNI/JVMTI: increments with the addition of methods, old ids don't change
// Method array.
Array<Method*>* _methods;
// Interface (Klass*s) this class declares locally to implement.
@@ -274,6 +281,8 @@
// ...
Array<u2>* _fields;
+ volatile u2 _idnum_allocated_count; // JNI/JVMTI: increments with the addition of methods, old ids don't change
+
// Class states are defined as ClassState (see above).
// Place the _init_state here to utilize the unused 2-byte after
// _idnum_allocated_count.
@@ -454,7 +463,7 @@
bool link_class_or_fail(TRAPS); // returns false on failure
void unlink_class();
void rewrite_class(TRAPS);
- void relocate_and_link_methods(TRAPS);
+ void link_methods(TRAPS);
Method* class_initializer();
// set the class to initialized if no static initializer is present
@@ -544,6 +553,17 @@
return is_anonymous() ? java_mirror() : class_loader();
}
+ bool is_contended() const {
+ return (_misc_flags & _misc_is_contended) != 0;
+ }
+ void set_is_contended(bool value) {
+ if (value) {
+ _misc_flags |= _misc_is_contended;
+ } else {
+ _misc_flags &= ~_misc_is_contended;
+ }
+ }
+
// signers
objArrayOop signers() const { return _signers; }
void set_signers(objArrayOop s) { klass_oop_store((oop*)&_signers, s); }
@@ -610,8 +630,16 @@
return _jvmti_cached_class_field_map;
}
- bool has_default_methods() const { return _has_default_methods; }
- void set_has_default_methods(bool b) { _has_default_methods = b; }
+ bool has_default_methods() const {
+ return (_misc_flags & _misc_has_default_methods) != 0;
+ }
+ void set_has_default_methods(bool b) {
+ if (b) {
+ _misc_flags |= _misc_has_default_methods;
+ } else {
+ _misc_flags &= ~_misc_has_default_methods;
+ }
+ }
// for adding methods, ConstMethod::UNSET_IDNUM means no more ids available
inline u2 next_method_idnum();
@@ -657,6 +685,10 @@
if (annotations() == NULL) return NULL;
return annotations()->fields_annotations();
}
+ Annotations* type_annotations() const {
+ if (annotations() == NULL) return NULL;
+ return annotations()->type_annotations();
+ }
// allocation
instanceOop allocate_instance(TRAPS);
--- a/hotspot/src/share/vm/oops/method.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/method.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -64,6 +64,7 @@
int localvariable_table_length,
int exception_table_length,
int checked_exceptions_length,
+ int method_parameters_length,
u2 generic_signature_index,
ConstMethod::MethodType method_type,
TRAPS) {
@@ -75,6 +76,7 @@
localvariable_table_length,
exception_table_length,
checked_exceptions_length,
+ method_parameters_length,
generic_signature_index,
method_type,
CHECK_NULL);
@@ -192,16 +194,16 @@
return buf;
}
-int Method::fast_exception_handler_bci_for(KlassHandle ex_klass, int throw_bci, TRAPS) {
+int Method::fast_exception_handler_bci_for(methodHandle mh, KlassHandle ex_klass, int throw_bci, TRAPS) {
// exception table holds quadruple entries of the form (beg_bci, end_bci, handler_bci, klass_index)
// access exception table
- ExceptionTable table(this);
+ ExceptionTable table(mh());
int length = table.length();
// iterate through all entries sequentially
- constantPoolHandle pool(THREAD, constants());
+ constantPoolHandle pool(THREAD, mh->constants());
for (int i = 0; i < length; i ++) {
//reacquire the table in case a GC happened
- ExceptionTable table(this);
+ ExceptionTable table(mh());
int beg_bci = table.start_pc(i);
int end_bci = table.end_pc(i);
assert(beg_bci <= end_bci, "inconsistent exception table");
@@ -1035,8 +1037,10 @@
methodHandle m;
{
- Method* m_oop = Method::allocate(loader_data, 0, accessFlags_from(flags_bits),
- 0, 0, 0, 0, 0, ConstMethod::NORMAL, CHECK_(empty));
+ Method* m_oop = Method::allocate(loader_data, 0,
+ accessFlags_from(flags_bits),
+ 0, 0, 0, 0, 0, 0,
+ ConstMethod::NORMAL, CHECK_(empty));
m = methodHandle(THREAD, m_oop);
}
m->set_constants(cp());
@@ -1088,6 +1092,7 @@
int checked_exceptions_len = m->checked_exceptions_length();
int localvariable_len = m->localvariable_table_length();
int exception_table_len = m->exception_table_length();
+ int method_parameters_len = m->method_parameters_length();
ClassLoaderData* loader_data = m->method_holder()->class_loader_data();
Method* newm_oop = Method::allocate(loader_data,
@@ -1097,6 +1102,7 @@
localvariable_len,
exception_table_len,
checked_exceptions_len,
+ method_parameters_len,
generic_signature_index,
m->method_type(),
CHECK_(methodHandle()));
@@ -1331,13 +1337,15 @@
Array<AnnotationArray*>* methods_annotations,
Array<AnnotationArray*>* methods_parameter_annotations,
Array<AnnotationArray*>* methods_default_annotations,
+ Array<AnnotationArray*>* methods_type_annotations,
bool idempotent) {
int length = methods->length();
if (length > 1) {
bool do_annotations = false;
if (methods_annotations != NULL ||
methods_parameter_annotations != NULL ||
- methods_default_annotations != NULL) {
+ methods_default_annotations != NULL ||
+ methods_type_annotations != NULL) {
do_annotations = true;
}
if (do_annotations) {
@@ -1356,6 +1364,7 @@
assert(methods_annotations == NULL || methods_annotations->length() == methods->length(), "");
assert(methods_parameter_annotations == NULL || methods_parameter_annotations->length() == methods->length(), "");
assert(methods_default_annotations == NULL || methods_default_annotations->length() == methods->length(), "");
+ assert(methods_type_annotations == NULL || methods_type_annotations->length() == methods->length(), "");
if (do_annotations) {
ResourceMark rm;
// Allocate temporary storage
@@ -1363,6 +1372,7 @@
reorder_based_on_method_index(methods, methods_annotations, temp_array);
reorder_based_on_method_index(methods, methods_parameter_annotations, temp_array);
reorder_based_on_method_index(methods, methods_default_annotations, temp_array);
+ reorder_based_on_method_index(methods, methods_type_annotations, temp_array);
}
// Reset method ordering
--- a/hotspot/src/share/vm/oops/method.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/oops/method.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -160,6 +160,7 @@
int localvariable_table_length,
int exception_table_length,
int checked_exceptions_length,
+ int method_parameters_length,
u2 generic_signature_index,
ConstMethod::MethodType method_type,
TRAPS);
@@ -225,6 +226,13 @@
}
return ik->annotations()->get_method_default_annotations_of(method_idnum());
}
+ AnnotationArray* type_annotations() const {
+ InstanceKlass* ik = method_holder();
+ Annotations* type_annos = ik->type_annotations();
+ if (type_annos == NULL)
+ return NULL;
+ return type_annos->get_method_annotations_of(method_idnum());
+}
#ifdef CC_INTERP
void set_result_index(BasicType type);
@@ -343,7 +351,7 @@
// exception handler which caused the exception to be thrown, which
// is needed for proper retries. See, for example,
// InterpreterRuntime::exception_handler_for_exception.
- int fast_exception_handler_bci_for(KlassHandle ex_klass, int throw_bci, TRAPS);
+ static int fast_exception_handler_bci_for(methodHandle mh, KlassHandle ex_klass, int throw_bci, TRAPS);
// method data access
MethodData* method_data() const {
@@ -473,6 +481,12 @@
void print_codes_on(outputStream* st) const PRODUCT_RETURN;
void print_codes_on(int from, int to, outputStream* st) const PRODUCT_RETURN;
+ // method parameters
+ int method_parameters_length() const
+ { return constMethod()->method_parameters_length(); }
+ MethodParametersElement* method_parameters_start() const
+ { return constMethod()->method_parameters_start(); }
+
// checked exceptions
int checked_exceptions_length() const
{ return constMethod()->checked_exceptions_length(); }
@@ -790,6 +804,7 @@
Array<AnnotationArray*>* methods_annotations,
Array<AnnotationArray*>* methods_parameter_annotations,
Array<AnnotationArray*>* methods_default_annotations,
+ Array<AnnotationArray*>* methods_type_annotations,
bool idempotent = false);
// Deallocation function for redefine classes or if an error occurs
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -46,7 +46,8 @@
_method(callee),
_site_invoke_ratio(site_invoke_ratio),
_max_inline_level(max_inline_level),
- _count_inline_bcs(method()->code_size_for_inlining())
+ _count_inline_bcs(method()->code_size_for_inlining()),
+ _subtrees(c->comp_arena(), 2, 0, NULL)
{
NOT_PRODUCT(_count_inlines = 0;)
if (_caller_jvms != NULL) {
@@ -209,16 +210,18 @@
if ( callee_method->dont_inline()) return "don't inline by annotation";
if ( callee_method->has_unloaded_classes_in_signature()) return "unloaded signature classes";
- if (callee_method->force_inline() || callee_method->should_inline()) {
+ if (callee_method->should_inline()) {
// ignore heuristic controls on inlining
return NULL;
}
// Now perform checks which are heuristic
- if (callee_method->has_compiled_code() &&
- callee_method->instructions_size() > InlineSmallCode) {
+ if (!callee_method->force_inline()) {
+ if (callee_method->has_compiled_code() &&
+ callee_method->instructions_size() > InlineSmallCode) {
return "already compiled into a big method";
+ }
}
// don't inline exception code unless the top method belongs to an
@@ -277,12 +280,15 @@
//-----------------------------try_to_inline-----------------------------------
// return NULL if ok, reason for not inlining otherwise
// Relocated from "InliningClosure::try_to_inline"
-const char* InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) {
-
+const char* InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result, bool& should_delay) {
// Old algorithm had funny accumulating BC-size counters
if (UseOldInlining && ClipInlining
&& (int)count_inline_bcs() >= DesiredMethodLimit) {
- return "size > DesiredMethodLimit";
+ if (!callee_method->force_inline() || !IncrementalInline) {
+ return "size > DesiredMethodLimit";
+ } else if (!C->inlining_incrementally()) {
+ should_delay = true;
+ }
}
const char *msg = NULL;
@@ -303,8 +309,13 @@
if (callee_method->code_size() > MaxTrivialSize) {
// don't inline into giant methods
- if (C->unique() > (uint)NodeCountInliningCutoff) {
- return "NodeCountInliningCutoff";
+ if (C->over_inlining_cutoff()) {
+ if ((!callee_method->force_inline() && !caller_method->is_compiled_lambda_form())
+ || !IncrementalInline) {
+ return "NodeCountInliningCutoff";
+ } else {
+ should_delay = true;
+ }
}
if ((!UseInterpreter || CompileTheWorld) &&
@@ -323,7 +334,11 @@
return "not an accessor";
}
if (inline_level() > _max_inline_level) {
- return "inlining too deep";
+ if (!callee_method->force_inline() || !IncrementalInline) {
+ return "inlining too deep";
+ } else if (!C->inlining_incrementally()) {
+ should_delay = true;
+ }
}
// detect direct and indirect recursive inlining
@@ -348,7 +363,11 @@
if (UseOldInlining && ClipInlining
&& (int)count_inline_bcs() + size >= DesiredMethodLimit) {
- return "size > DesiredMethodLimit";
+ if (!callee_method->force_inline() || !IncrementalInline) {
+ return "size > DesiredMethodLimit";
+ } else if (!C->inlining_incrementally()) {
+ should_delay = true;
+ }
}
// ok, inline this method
@@ -413,8 +432,9 @@
}
//------------------------------ok_to_inline-----------------------------------
-WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, ciCallProfile& profile, WarmCallInfo* initial_wci) {
+WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, ciCallProfile& profile, WarmCallInfo* initial_wci, bool& should_delay) {
assert(callee_method != NULL, "caller checks for optimized virtual!");
+ assert(!should_delay, "should be initialized to false");
#ifdef ASSERT
// Make sure the incoming jvms has the same information content as me.
// This means that we can eventually make this whole class AllStatic.
@@ -444,7 +464,7 @@
// Check if inlining policy says no.
WarmCallInfo wci = *(initial_wci);
- failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci);
+ failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci, should_delay);
if (failure_msg != NULL && C->log() != NULL) {
C->log()->inline_fail(failure_msg);
}
--- a/hotspot/src/share/vm/opto/c2_globals.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -516,6 +516,9 @@
develop(bool, SpecialArraysEquals, true, \
"special version of Arrays.equals(char[],char[])") \
\
+ product(bool, SpecialEncodeISOArray, true, \
+ "special version of ISO_8859_1$Encoder.encodeISOArray") \
+ \
develop(bool, BailoutToInterpreterForThrows, false, \
"Compiled methods which throws/catches exceptions will be " \
"deopt and intp.") \
@@ -606,6 +609,16 @@
\
develop(bool, VerifyAliases, false, \
"perform extra checks on the results of alias analysis") \
+ \
+ product(bool, IncrementalInline, true, \
+ "do post parse inlining") \
+ \
+ develop(bool, AlwaysIncrementalInline, false, \
+ "do all inlining incrementally") \
+ \
+ product(intx, LiveNodeCountInliningCutoff, 20000, \
+ "max number of live nodes in a method") \
+
C2_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG)
--- a/hotspot/src/share/vm/opto/callGenerator.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/callGenerator.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -262,8 +262,11 @@
// Allow inlining decisions to be delayed
class LateInlineCallGenerator : public DirectCallGenerator {
+ protected:
CallGenerator* _inline_cg;
+ virtual bool do_late_inline_check(JVMState* jvms) { return true; }
+
public:
LateInlineCallGenerator(ciMethod* method, CallGenerator* inline_cg) :
DirectCallGenerator(method, true), _inline_cg(inline_cg) {}
@@ -279,7 +282,9 @@
// Record that this call site should be revisited once the main
// parse is finished.
- Compile::current()->add_late_inline(this);
+ if (!is_mh_late_inline()) {
+ C->add_late_inline(this);
+ }
// Emit the CallStaticJava and request separate projections so
// that the late inlining logic can distinguish between fall
@@ -287,15 +292,34 @@
// as is done for allocations and macro expansion.
return DirectCallGenerator::generate(jvms);
}
+
+ virtual void print_inlining_late(const char* msg) {
+ CallNode* call = call_node();
+ Compile* C = Compile::current();
+ C->print_inlining_insert(this);
+ C->print_inlining(method(), call->jvms()->depth()-1, call->jvms()->bci(), msg);
+ }
+
};
-
void LateInlineCallGenerator::do_late_inline() {
// Can't inline it
if (call_node() == NULL || call_node()->outcnt() == 0 ||
call_node()->in(0) == NULL || call_node()->in(0)->is_top())
return;
+ for (int i1 = 0; i1 < method()->arg_size(); i1++) {
+ if (call_node()->in(TypeFunc::Parms + i1)->is_top()) {
+ assert(Compile::current()->inlining_incrementally(), "shouldn't happen during parsing");
+ return;
+ }
+ }
+
+ if (call_node()->in(TypeFunc::Memory)->is_top()) {
+ assert(Compile::current()->inlining_incrementally(), "shouldn't happen during parsing");
+ return;
+ }
+
CallStaticJavaNode* call = call_node();
// Make a clone of the JVMState that appropriate to use for driving a parse
@@ -324,6 +348,11 @@
}
}
+ if (!do_late_inline_check(jvms)) {
+ map->disconnect_inputs(NULL, C);
+ return;
+ }
+
C->print_inlining_insert(this);
CompileLog* log = C->log();
@@ -360,6 +389,10 @@
result = (result_size == 1) ? kit.pop() : kit.pop_pair();
}
+ C->set_has_loops(C->has_loops() || _inline_cg->method()->has_loops());
+ C->env()->notice_inlined_method(_inline_cg->method());
+ C->set_inlining_progress(true);
+
kit.replace_call(call, result);
}
@@ -368,6 +401,83 @@
return new LateInlineCallGenerator(method, inline_cg);
}
+class LateInlineMHCallGenerator : public LateInlineCallGenerator {
+ ciMethod* _caller;
+ int _attempt;
+ bool _input_not_const;
+
+ virtual bool do_late_inline_check(JVMState* jvms);
+ virtual bool already_attempted() const { return _attempt > 0; }
+
+ public:
+ LateInlineMHCallGenerator(ciMethod* caller, ciMethod* callee, bool input_not_const) :
+ LateInlineCallGenerator(callee, NULL), _caller(caller), _attempt(0), _input_not_const(input_not_const) {}
+
+ virtual bool is_mh_late_inline() const { return true; }
+
+ virtual JVMState* generate(JVMState* jvms) {
+ JVMState* new_jvms = LateInlineCallGenerator::generate(jvms);
+ if (_input_not_const) {
+ // inlining won't be possible so no need to enqueue right now.
+ call_node()->set_generator(this);
+ } else {
+ Compile::current()->add_late_inline(this);
+ }
+ return new_jvms;
+ }
+
+ virtual void print_inlining_late(const char* msg) {
+ if (!_input_not_const) return;
+ LateInlineCallGenerator::print_inlining_late(msg);
+ }
+};
+
+bool LateInlineMHCallGenerator::do_late_inline_check(JVMState* jvms) {
+
+ CallGenerator* cg = for_method_handle_inline(jvms, _caller, method(), _input_not_const);
+
+ if (!_input_not_const) {
+ _attempt++;
+ }
+
+ if (cg != NULL) {
+ assert(!cg->is_late_inline() && cg->is_inline(), "we're doing late inlining");
+ _inline_cg = cg;
+ Compile::current()->dec_number_of_mh_late_inlines();
+ return true;
+ }
+
+ call_node()->set_generator(this);
+ return false;
+}
+
+CallGenerator* CallGenerator::for_mh_late_inline(ciMethod* caller, ciMethod* callee, bool input_not_const) {
+ Compile::current()->inc_number_of_mh_late_inlines();
+ CallGenerator* cg = new LateInlineMHCallGenerator(caller, callee, input_not_const);
+ return cg;
+}
+
+class LateInlineStringCallGenerator : public LateInlineCallGenerator {
+
+ public:
+ LateInlineStringCallGenerator(ciMethod* method, CallGenerator* inline_cg) :
+ LateInlineCallGenerator(method, inline_cg) {}
+
+ virtual JVMState* generate(JVMState* jvms) {
+ Compile *C = Compile::current();
+ C->print_inlining_skip(this);
+
+ C->add_string_late_inline(this);
+
+ JVMState* new_jvms = DirectCallGenerator::generate(jvms);
+ return new_jvms;
+ }
+};
+
+CallGenerator* CallGenerator::for_string_late_inline(ciMethod* method, CallGenerator* inline_cg) {
+ return new LateInlineStringCallGenerator(method, inline_cg);
+}
+
//---------------------------WarmCallGenerator--------------------------------
// Internal class which handles initial deferral of inlining decisions.
@@ -586,35 +696,53 @@
}
-CallGenerator* CallGenerator::for_method_handle_call(JVMState* jvms, ciMethod* caller, ciMethod* callee) {
+CallGenerator* CallGenerator::for_method_handle_call(JVMState* jvms, ciMethod* caller, ciMethod* callee, bool delayed_forbidden) {
assert(callee->is_method_handle_intrinsic() ||
callee->is_compiled_lambda_form(), "for_method_handle_call mismatch");
- CallGenerator* cg = CallGenerator::for_method_handle_inline(jvms, caller, callee);
- if (cg != NULL)
- return cg;
- return CallGenerator::for_direct_call(callee);
+ bool input_not_const;
+ CallGenerator* cg = CallGenerator::for_method_handle_inline(jvms, caller, callee, input_not_const);
+ Compile* C = Compile::current();
+ if (cg != NULL) {
+ if (!delayed_forbidden && AlwaysIncrementalInline) {
+ return CallGenerator::for_late_inline(callee, cg);
+ } else {
+ return cg;
+ }
+ }
+ int bci = jvms->bci();
+ ciCallProfile profile = caller->call_profile_at_bci(bci);
+ int call_site_count = caller->scale_count(profile.count());
+
+ if (IncrementalInline && call_site_count > 0 &&
+ (input_not_const || !C->inlining_incrementally() || C->over_inlining_cutoff())) {
+ return CallGenerator::for_mh_late_inline(caller, callee, input_not_const);
+ } else {
+ // Out-of-line call.
+ return CallGenerator::for_direct_call(callee);
+ }
}
-CallGenerator* CallGenerator::for_method_handle_inline(JVMState* jvms, ciMethod* caller, ciMethod* callee) {
+CallGenerator* CallGenerator::for_method_handle_inline(JVMState* jvms, ciMethod* caller, ciMethod* callee, bool& input_not_const) {
GraphKit kit(jvms);
PhaseGVN& gvn = kit.gvn();
Compile* C = kit.C;
vmIntrinsics::ID iid = callee->intrinsic_id();
+ input_not_const = true;
switch (iid) {
case vmIntrinsics::_invokeBasic:
{
// Get MethodHandle receiver:
Node* receiver = kit.argument(0);
if (receiver->Opcode() == Op_ConP) {
+ input_not_const = false;
const TypeOopPtr* oop_ptr = receiver->bottom_type()->is_oopptr();
ciMethod* target = oop_ptr->const_oop()->as_method_handle()->get_vmtarget();
guarantee(!target->is_method_handle_intrinsic(), "should not happen"); // XXX remove
const int vtable_index = Method::invalid_vtable_index;
- CallGenerator* cg = C->call_generator(target, vtable_index, false, jvms, true, PROB_ALWAYS);
+ CallGenerator* cg = C->call_generator(target, vtable_index, false, jvms, true, PROB_ALWAYS, true, true);
+ assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
if (cg != NULL && cg->is_inline())
return cg;
- } else {
- if (PrintInlining) C->print_inlining(callee, jvms->depth() - 1, jvms->bci(), "receiver not constant");
}
}
break;
@@ -627,6 +755,7 @@
// Get MemberName argument:
Node* member_name = kit.argument(callee->arg_size() - 1);
if (member_name->Opcode() == Op_ConP) {
+ input_not_const = false;
const TypeOopPtr* oop_ptr = member_name->bottom_type()->is_oopptr();
ciMethod* target = oop_ptr->const_oop()->as_member_name()->get_vmtarget();
@@ -659,9 +788,25 @@
}
}
}
- const int vtable_index = Method::invalid_vtable_index;
- const bool call_is_virtual = target->is_abstract(); // FIXME workaround
- CallGenerator* cg = C->call_generator(target, vtable_index, call_is_virtual, jvms, true, PROB_ALWAYS);
+
+ // Try to get the most accurate receiver type
+ const bool is_virtual = (iid == vmIntrinsics::_linkToVirtual);
+ const bool is_virtual_or_interface = (is_virtual || iid == vmIntrinsics::_linkToInterface);
+ int vtable_index = Method::invalid_vtable_index;
+ bool call_does_dispatch = false;
+
+ if (is_virtual_or_interface) {
+ ciInstanceKlass* klass = target->holder();
+ Node* receiver_node = kit.argument(0);
+ const TypeOopPtr* receiver_type = gvn.type(receiver_node)->isa_oopptr();
+ // call_does_dispatch and vtable_index are out-parameters. They might be changed.
+ target = C->optimize_virtual_call(caller, jvms->bci(), klass, target, receiver_type,
+ is_virtual,
+ call_does_dispatch, vtable_index); // out-parameters
+ }
+
+ CallGenerator* cg = C->call_generator(target, vtable_index, call_does_dispatch, jvms, true, PROB_ALWAYS, true, true);
+ assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
if (cg != NULL && cg->is_inline())
return cg;
}
--- a/hotspot/src/share/vm/opto/callGenerator.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/callGenerator.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -68,6 +68,12 @@
// is_late_inline: supports conversion of call into an inline
virtual bool is_late_inline() const { return false; }
+ // same but for method handle calls
+ virtual bool is_mh_late_inline() const { return false; }
+
+ // for method handle calls: have we tried inlinining the call already?
+ virtual bool already_attempted() const { ShouldNotReachHere(); return false; }
+
// Replace the call with an inline version of the code
virtual void do_late_inline() { ShouldNotReachHere(); }
@@ -112,11 +118,13 @@
static CallGenerator* for_virtual_call(ciMethod* m, int vtable_index); // virtual, interface
static CallGenerator* for_dynamic_call(ciMethod* m); // invokedynamic
- static CallGenerator* for_method_handle_call( JVMState* jvms, ciMethod* caller, ciMethod* callee);
- static CallGenerator* for_method_handle_inline(JVMState* jvms, ciMethod* caller, ciMethod* callee);
+ static CallGenerator* for_method_handle_call( JVMState* jvms, ciMethod* caller, ciMethod* callee, bool delayed_forbidden);
+ static CallGenerator* for_method_handle_inline(JVMState* jvms, ciMethod* caller, ciMethod* callee, bool& input_not_const);
// How to generate a replace a direct call with an inline version
static CallGenerator* for_late_inline(ciMethod* m, CallGenerator* inline_cg);
+ static CallGenerator* for_mh_late_inline(ciMethod* caller, ciMethod* callee, bool input_not_const);
+ static CallGenerator* for_string_late_inline(ciMethod* m, CallGenerator* inline_cg);
// How to make a call but defer the decision whether to inline or not.
static CallGenerator* for_warm_call(WarmCallInfo* ci,
@@ -147,6 +155,8 @@
CallGenerator* cg);
virtual Node* generate_predicate(JVMState* jvms) { return NULL; };
+ virtual void print_inlining_late(const char* msg) { ShouldNotReachHere(); }
+
static void print_inlining(Compile* C, ciMethod* callee, int inline_level, int bci, const char* msg) {
if (PrintInlining)
C->print_inlining(callee, inline_level, bci, msg);
--- a/hotspot/src/share/vm/opto/callnode.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/callnode.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -25,6 +25,7 @@
#include "precompiled.hpp"
#include "ci/bcEscapeAnalyzer.hpp"
#include "compiler/oopMap.hpp"
+#include "opto/callGenerator.hpp"
#include "opto/callnode.hpp"
#include "opto/escape.hpp"
#include "opto/locknode.hpp"
@@ -164,13 +165,13 @@
#ifndef PRODUCT
-void ReturnNode::dump_req() const {
+void ReturnNode::dump_req(outputStream *st) const {
// Dump the required inputs, enclosed in '(' and ')'
uint i; // Exit value of loop
- for( i=0; i<req(); i++ ) { // For all required inputs
- if( i == TypeFunc::Parms ) tty->print("returns");
- if( in(i) ) tty->print("%c%d ", Compile::current()->node_arena()->contains(in(i)) ? ' ' : 'o', in(i)->_idx);
- else tty->print("_ ");
+ for (i = 0; i < req(); i++) { // For all required inputs
+ if (i == TypeFunc::Parms) st->print("returns");
+ if (in(i)) st->print("%c%d ", Compile::current()->node_arena()->contains(in(i)) ? ' ' : 'o', in(i)->_idx);
+ else st->print("_ ");
}
}
#endif
@@ -207,13 +208,13 @@
}
#ifndef PRODUCT
-void RethrowNode::dump_req() const {
+void RethrowNode::dump_req(outputStream *st) const {
// Dump the required inputs, enclosed in '(' and ')'
uint i; // Exit value of loop
- for( i=0; i<req(); i++ ) { // For all required inputs
- if( i == TypeFunc::Parms ) tty->print("exception");
- if( in(i) ) tty->print("%c%d ", Compile::current()->node_arena()->contains(in(i)) ? ' ' : 'o', in(i)->_idx);
- else tty->print("_ ");
+ for (i = 0; i < req(); i++) { // For all required inputs
+ if (i == TypeFunc::Parms) st->print("exception");
+ if (in(i)) st->print("%c%d ", Compile::current()->node_arena()->contains(in(i)) ? ' ' : 'o', in(i)->_idx);
+ else st->print("_ ");
}
}
#endif
@@ -329,7 +330,8 @@
st->print(" %s%d]=#ScObj" INT32_FORMAT, msg, i, sco_n);
return;
}
- if( OptoReg::is_valid(regalloc->get_reg_first(n))) { // Check for undefined
+ if (regalloc->node_regs_max_index() > 0 &&
+ OptoReg::is_valid(regalloc->get_reg_first(n))) { // Check for undefined
char buf[50];
regalloc->dump_register(n,buf);
st->print(" %s%d]=%s",msg,i,buf);
@@ -380,7 +382,7 @@
//------------------------------format-----------------------------------------
void JVMState::format(PhaseRegAlloc *regalloc, const Node *n, outputStream* st) const {
st->print(" #");
- if( _method ) {
+ if (_method) {
_method->print_short_name(st);
st->print(" @ bci:%d ",_bci);
} else {
@@ -392,21 +394,22 @@
MachSafePointNode *mcall = n->as_MachSafePoint();
uint i;
// Print locals
- for( i = 0; i < (uint)loc_size(); i++ )
- format_helper( regalloc, st, mcall->local(this, i), "L[", i, &scobjs );
+ for (i = 0; i < (uint)loc_size(); i++)
+ format_helper(regalloc, st, mcall->local(this, i), "L[", i, &scobjs);
// Print stack
for (i = 0; i < (uint)stk_size(); i++) {
if ((uint)(_stkoff + i) >= mcall->len())
st->print(" oob ");
else
- format_helper( regalloc, st, mcall->stack(this, i), "STK[", i, &scobjs );
+ format_helper(regalloc, st, mcall->stack(this, i), "STK[", i, &scobjs);
}
for (i = 0; (int)i < nof_monitors(); i++) {
Node *box = mcall->monitor_box(this, i);
Node *obj = mcall->monitor_obj(this, i);
- if ( OptoReg::is_valid(regalloc->get_reg_first(box)) ) {
+ if (regalloc->node_regs_max_index() > 0 &&
+ OptoReg::is_valid(regalloc->get_reg_first(box))) {
box = BoxLockNode::box_node(box);
- format_helper( regalloc, st, box, "MON-BOX[", i, &scobjs );
+ format_helper(regalloc, st, box, "MON-BOX[", i, &scobjs);
} else {
OptoReg::Name box_reg = BoxLockNode::reg(box);
st->print(" MON-BOX%d=%s+%d",
@@ -419,7 +422,7 @@
if (BoxLockNode::box_node(box)->is_eliminated())
obj_msg = "MON-OBJ(LOCK ELIMINATED)[";
}
- format_helper( regalloc, st, obj, obj_msg, i, &scobjs );
+ format_helper(regalloc, st, obj, obj_msg, i, &scobjs);
}
for (i = 0; i < (uint)scobjs.length(); i++) {
@@ -462,9 +465,9 @@
st->print(" [");
cifield = iklass->nonstatic_field_at(0);
cifield->print_name_on(st);
- format_helper( regalloc, st, fld_node, ":", 0, &scobjs );
+ format_helper(regalloc, st, fld_node, ":", 0, &scobjs);
} else {
- format_helper( regalloc, st, fld_node, "[", 0, &scobjs );
+ format_helper(regalloc, st, fld_node, "[", 0, &scobjs);
}
for (uint j = 1; j < nf; j++) {
fld_node = mcall->in(first_ind+j);
@@ -472,9 +475,9 @@
st->print(", [");
cifield = iklass->nonstatic_field_at(j);
cifield->print_name_on(st);
- format_helper( regalloc, st, fld_node, ":", j, &scobjs );
+ format_helper(regalloc, st, fld_node, ":", j, &scobjs);
} else {
- format_helper( regalloc, st, fld_node, ", [", j, &scobjs );
+ format_helper(regalloc, st, fld_node, ", [", j, &scobjs);
}
}
}
@@ -482,7 +485,7 @@
}
}
st->print_cr("");
- if (caller() != NULL) caller()->format(regalloc, n, st);
+ if (caller() != NULL) caller()->format(regalloc, n, st);
}
@@ -585,15 +588,15 @@
uint CallNode::cmp( const Node &n ) const
{ return _tf == ((CallNode&)n)._tf && _jvms == ((CallNode&)n)._jvms; }
#ifndef PRODUCT
-void CallNode::dump_req() const {
+void CallNode::dump_req(outputStream *st) const {
// Dump the required inputs, enclosed in '(' and ')'
uint i; // Exit value of loop
- for( i=0; i<req(); i++ ) { // For all required inputs
- if( i == TypeFunc::Parms ) tty->print("(");
- if( in(i) ) tty->print("%c%d ", Compile::current()->node_arena()->contains(in(i)) ? ' ' : 'o', in(i)->_idx);
- else tty->print("_ ");
+ for (i = 0; i < req(); i++) { // For all required inputs
+ if (i == TypeFunc::Parms) st->print("(");
+ if (in(i)) st->print("%c%d ", Compile::current()->node_arena()->contains(in(i)) ? ' ' : 'o', in(i)->_idx);
+ else st->print("_ ");
}
- tty->print(")");
+ st->print(")");
}
void CallNode::dump_spec(outputStream *st) const {
@@ -775,16 +778,38 @@
// and the exception object may not exist if an exception handler
// swallows the exception but all the other must exist and be found.
assert(projs->fallthrough_proj != NULL, "must be found");
- assert(projs->fallthrough_catchproj != NULL, "must be found");
- assert(projs->fallthrough_memproj != NULL, "must be found");
- assert(projs->fallthrough_ioproj != NULL, "must be found");
- assert(projs->catchall_catchproj != NULL, "must be found");
+ assert(Compile::current()->inlining_incrementally() || projs->fallthrough_catchproj != NULL, "must be found");
+ assert(Compile::current()->inlining_incrementally() || projs->fallthrough_memproj != NULL, "must be found");
+ assert(Compile::current()->inlining_incrementally() || projs->fallthrough_ioproj != NULL, "must be found");
+ assert(Compile::current()->inlining_incrementally() || projs->catchall_catchproj != NULL, "must be found");
if (separate_io_proj) {
- assert(projs->catchall_memproj != NULL, "must be found");
- assert(projs->catchall_ioproj != NULL, "must be found");
+ assert(Compile::current()->inlining_incrementally() || projs->catchall_memproj != NULL, "must be found");
+ assert(Compile::current()->inlining_incrementally() || projs->catchall_ioproj != NULL, "must be found");
}
}
+Node *CallNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+ CallGenerator* cg = generator();
+ if (can_reshape && cg != NULL && cg->is_mh_late_inline() && !cg->already_attempted()) {
+ // Check whether this MH handle call becomes a candidate for inlining
+ ciMethod* callee = cg->method();
+ vmIntrinsics::ID iid = callee->intrinsic_id();
+ if (iid == vmIntrinsics::_invokeBasic) {
+ if (in(TypeFunc::Parms)->Opcode() == Op_ConP) {
+ phase->C->prepend_late_inline(cg);
+ set_generator(NULL);
+ }
+ } else {
+ assert(callee->has_member_arg(), "wrong type of call?");
+ if (in(TypeFunc::Parms + callee->arg_size() - 1)->Opcode() == Op_ConP) {
+ phase->C->prepend_late_inline(cg);
+ set_generator(NULL);
+ }
+ }
+ }
+ return SafePointNode::Ideal(phase, can_reshape);
+}
+
//=============================================================================
uint CallJavaNode::size_of() const { return sizeof(*this); }
--- a/hotspot/src/share/vm/opto/callnode.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/callnode.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -126,7 +126,7 @@
virtual uint ideal_reg() const { return NotAMachineReg; }
virtual uint match_edge(uint idx) const;
#ifndef PRODUCT
- virtual void dump_req() const;
+ virtual void dump_req(outputStream *st = tty) const;
#endif
};
@@ -147,7 +147,7 @@
virtual uint match_edge(uint idx) const;
virtual uint ideal_reg() const { return NotAMachineReg; }
#ifndef PRODUCT
- virtual void dump_req() const;
+ virtual void dump_req(outputStream *st = tty) const;
#endif
};
@@ -507,6 +507,7 @@
Node* exobj;
};
+class CallGenerator;
//------------------------------CallNode---------------------------------------
// Call nodes now subsume the function of debug nodes at callsites, so they
@@ -517,26 +518,31 @@
const TypeFunc *_tf; // Function type
address _entry_point; // Address of method being called
float _cnt; // Estimate of number of times called
+ CallGenerator* _generator; // corresponding CallGenerator for some late inline calls
CallNode(const TypeFunc* tf, address addr, const TypePtr* adr_type)
: SafePointNode(tf->domain()->cnt(), NULL, adr_type),
_tf(tf),
_entry_point(addr),
- _cnt(COUNT_UNKNOWN)
+ _cnt(COUNT_UNKNOWN),
+ _generator(NULL)
{
init_class_id(Class_Call);
}
- const TypeFunc* tf() const { return _tf; }
- const address entry_point() const { return _entry_point; }
- const float cnt() const { return _cnt; }
+ const TypeFunc* tf() const { return _tf; }
+ const address entry_point() const { return _entry_point; }
+ const float cnt() const { return _cnt; }
+ CallGenerator* generator() const { return _generator; }
- void set_tf(const TypeFunc* tf) { _tf = tf; }
- void set_entry_point(address p) { _entry_point = p; }
- void set_cnt(float c) { _cnt = c; }
+ void set_tf(const TypeFunc* tf) { _tf = tf; }
+ void set_entry_point(address p) { _entry_point = p; }
+ void set_cnt(float c) { _cnt = c; }
+ void set_generator(CallGenerator* cg) { _generator = cg; }
virtual const Type *bottom_type() const;
virtual const Type *Value( PhaseTransform *phase ) const;
+ virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
virtual Node *Identity( PhaseTransform *phase ) { return this; }
virtual uint cmp( const Node &n ) const;
virtual uint size_of() const = 0;
@@ -573,7 +579,7 @@
virtual uint match_edge(uint idx) const;
#ifndef PRODUCT
- virtual void dump_req() const;
+ virtual void dump_req(outputStream *st = tty) const;
virtual void dump_spec(outputStream *st) const;
#endif
};
--- a/hotspot/src/share/vm/opto/cfgnode.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -363,6 +363,49 @@
return true; // The Region node is unreachable - it is dead.
}
+bool RegionNode::try_clean_mem_phi(PhaseGVN *phase) {
+ // Incremental inlining + PhaseStringOpts sometimes produce:
+ //
+ // cmpP with 1 top input
+ // |
+ // If
+ // / \
+ // IfFalse IfTrue /- Some Node
+ // \ / / /
+ // Region / /-MergeMem
+ // \---Phi
+ //
+ //
+ // It's expected by PhaseStringOpts that the Region goes away and is
+ // replaced by If's control input but because there's still a Phi,
+ // the Region stays in the graph. The top input from the cmpP is
+ // propagated forward and a subgraph that is useful goes away. The
+ // code below replaces the Phi with the MergeMem so that the Region
+ // is simplified.
+
+ PhiNode* phi = has_unique_phi();
+ if (phi && phi->type() == Type::MEMORY && req() == 3 && phi->is_diamond_phi(true)) {
+ MergeMemNode* m = NULL;
+ assert(phi->req() == 3, "same as region");
+ for (uint i = 1; i < 3; ++i) {
+ Node *mem = phi->in(i);
+ if (mem && mem->is_MergeMem() && in(i)->outcnt() == 1) {
+ // Nothing is control-dependent on path #i except the region itself.
+ m = mem->as_MergeMem();
+ uint j = 3 - i;
+ Node* other = phi->in(j);
+ if (other && other == m->base_memory()) {
+ // m is a successor memory to other, and is not pinned inside the diamond, so push it out.
+ // This will allow the diamond to collapse completely.
+ phase->is_IterGVN()->replace_node(phi, m);
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+}
+
//------------------------------Ideal------------------------------------------
// Return a node which is more "ideal" than the current node. Must preserve
// the CFG, but we can still strip out dead paths.
@@ -375,6 +418,10 @@
bool has_phis = false;
if (can_reshape) { // Need DU info to check for Phi users
has_phis = (has_phi() != NULL); // Cache result
+ if (has_phis && try_clean_mem_phi(phase)) {
+ has_phis = false;
+ }
+
if (!has_phis) { // No Phi users? Nothing merging?
for (uint i = 1; i < req()-1; i++) {
Node *if1 = in(i);
@@ -1005,7 +1052,9 @@
//------------------------------is_diamond_phi---------------------------------
// Does this Phi represent a simple well-shaped diamond merge? Return the
// index of the true path or 0 otherwise.
-int PhiNode::is_diamond_phi() const {
+// If check_control_only is true, do not inspect the If node at the
+// top, and return -1 (not an edge number) on success.
+int PhiNode::is_diamond_phi(bool check_control_only) const {
// Check for a 2-path merge
Node *region = in(0);
if( !region ) return 0;
@@ -1018,6 +1067,7 @@
Node *iff = ifp1->in(0);
if( !iff || !iff->is_If() ) return 0;
if( iff != ifp2->in(0) ) return 0;
+ if (check_control_only) return -1;
// Check for a proper bool/cmp
const Node *b = iff->in(1);
if( !b->is_Bool() ) return 0;
--- a/hotspot/src/share/vm/opto/cfgnode.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/cfgnode.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -95,6 +95,7 @@
virtual Node *Identity( PhaseTransform *phase );
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
virtual const RegMask &out_RegMask() const;
+ bool try_clean_mem_phi(PhaseGVN *phase);
};
//------------------------------JProjNode--------------------------------------
@@ -181,7 +182,7 @@
LoopSafety simple_data_loop_check(Node *in) const;
// Is it unsafe data loop? It becomes a dead loop if this phi node removed.
bool is_unsafe_data_reference(Node *in) const;
- int is_diamond_phi() const;
+ int is_diamond_phi(bool check_control_only = false) const;
virtual int Opcode() const;
virtual bool pinned() const { return in(0) != 0; }
virtual const TypePtr *adr_type() const { verify_adr_type(true); return _adr_type; }
--- a/hotspot/src/share/vm/opto/classes.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/classes.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -127,6 +127,7 @@
macro(DivMod)
macro(DivModI)
macro(DivModL)
+macro(EncodeISOArray)
macro(EncodeP)
macro(EncodePKlass)
macro(ExpD)
--- a/hotspot/src/share/vm/opto/compile.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/compile.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -136,7 +136,7 @@
void Compile::register_intrinsic(CallGenerator* cg) {
if (_intrinsics == NULL) {
- _intrinsics = new GrowableArray<CallGenerator*>(60);
+ _intrinsics = new (comp_arena())GrowableArray<CallGenerator*>(comp_arena(), 60, 0, NULL);
}
// This code is stolen from ciObjectFactory::insert.
// Really, GrowableArray should have methods for
@@ -365,6 +365,21 @@
}
}
+void Compile::remove_useless_late_inlines(GrowableArray<CallGenerator*>* inlines, Unique_Node_List &useful) {
+ int shift = 0;
+ for (int i = 0; i < inlines->length(); i++) {
+ CallGenerator* cg = inlines->at(i);
+ CallNode* call = cg->call_node();
+ if (shift > 0) {
+ inlines->at_put(i-shift, cg);
+ }
+ if (!useful.member(call)) {
+ shift++;
+ }
+ }
+ inlines->trunc_to(inlines->length()-shift);
+}
+
// Disconnect all useless nodes by disconnecting those at the boundary.
void Compile::remove_useless_nodes(Unique_Node_List &useful) {
uint next = 0;
@@ -394,6 +409,9 @@
remove_macro_node(n);
}
}
+ // clean up the late inline lists
+ remove_useless_late_inlines(&_string_late_inlines, useful);
+ remove_useless_late_inlines(&_late_inlines, useful);
debug_only(verify_graph_edges(true/*check for no_dead_code*/);)
}
@@ -611,6 +629,12 @@
_printer(IdealGraphPrinter::printer()),
#endif
_congraph(NULL),
+ _late_inlines(comp_arena(), 2, 0, NULL),
+ _string_late_inlines(comp_arena(), 2, 0, NULL),
+ _late_inlines_pos(0),
+ _number_of_mh_late_inlines(0),
+ _inlining_progress(false),
+ _inlining_incrementally(false),
_print_inlining_list(NULL),
_print_inlining(0) {
C = this;
@@ -668,7 +692,7 @@
PhaseGVN gvn(node_arena(), estimated_size);
set_initial_gvn(&gvn);
- if (PrintInlining) {
+ if (PrintInlining || PrintIntrinsics NOT_PRODUCT( || PrintOptoInlining)) {
_print_inlining_list = new (comp_arena())GrowableArray<PrintInliningBuffer>(comp_arena(), 1, 1, PrintInliningBuffer());
}
{ // Scope for timing the parser
@@ -737,29 +761,13 @@
rethrow_exceptions(kit.transfer_exceptions_into_jvms());
}
- if (!failing() && has_stringbuilder()) {
- {
- // remove useless nodes to make the usage analysis simpler
- ResourceMark rm;
- PhaseRemoveUseless pru(initial_gvn(), &for_igvn);
- }
-
- {
- ResourceMark rm;
- print_method("Before StringOpts", 3);
- PhaseStringOpts pso(initial_gvn(), &for_igvn);
- print_method("After StringOpts", 3);
- }
-
- // now inline anything that we skipped the first time around
- while (_late_inlines.length() > 0) {
- CallGenerator* cg = _late_inlines.pop();
- cg->do_late_inline();
- if (failing()) return;
- }
+ assert(IncrementalInline || (_late_inlines.length() == 0 && !has_mh_late_inlines()), "incremental inlining is off");
+
+ if (_late_inlines.length() == 0 && !has_mh_late_inlines() && !failing() && has_stringbuilder()) {
+ inline_string_calls(true);
}
- assert(_late_inlines.length() == 0, "should have been processed");
- dump_inlining();
+
+ if (failing()) return;
print_method("Before RemoveUseless", 3);
@@ -906,6 +914,9 @@
_dead_node_list(comp_arena()),
_dead_node_count(0),
_congraph(NULL),
+ _number_of_mh_late_inlines(0),
+ _inlining_progress(false),
+ _inlining_incrementally(false),
_print_inlining_list(NULL),
_print_inlining(0) {
C = this;
@@ -1760,6 +1771,124 @@
assert(predicate_count()==0, "should be clean!");
}
+// StringOpts and late inlining of string methods
+void Compile::inline_string_calls(bool parse_time) {
+ {
+ // remove useless nodes to make the usage analysis simpler
+ ResourceMark rm;
+ PhaseRemoveUseless pru(initial_gvn(), for_igvn());
+ }
+
+ {
+ ResourceMark rm;
+ print_method("Before StringOpts", 3);
+ PhaseStringOpts pso(initial_gvn(), for_igvn());
+ print_method("After StringOpts", 3);
+ }
+
+ // now inline anything that we skipped the first time around
+ if (!parse_time) {
+ _late_inlines_pos = _late_inlines.length();
+ }
+
+ while (_string_late_inlines.length() > 0) {
+ CallGenerator* cg = _string_late_inlines.pop();
+ cg->do_late_inline();
+ if (failing()) return;
+ }
+ _string_late_inlines.trunc_to(0);
+}
+
+void Compile::inline_incrementally_one(PhaseIterGVN& igvn) {
+ assert(IncrementalInline, "incremental inlining should be on");
+ PhaseGVN* gvn = initial_gvn();
+
+ set_inlining_progress(false);
+ for_igvn()->clear();
+ gvn->replace_with(&igvn);
+
+ int i = 0;
+
+ for (; i <_late_inlines.length() && !inlining_progress(); i++) {
+ CallGenerator* cg = _late_inlines.at(i);
+ _late_inlines_pos = i+1;
+ cg->do_late_inline();
+ if (failing()) return;
+ }
+ int j = 0;
+ for (; i < _late_inlines.length(); i++, j++) {
+ _late_inlines.at_put(j, _late_inlines.at(i));
+ }
+ _late_inlines.trunc_to(j);
+
+ {
+ ResourceMark rm;
+ PhaseRemoveUseless pru(C->initial_gvn(), C->for_igvn());
+ }
+
+ igvn = PhaseIterGVN(gvn);
+}
+
+// Perform incremental inlining until bound on number of live nodes is reached
+void Compile::inline_incrementally(PhaseIterGVN& igvn) {
+ PhaseGVN* gvn = initial_gvn();
+
+ set_inlining_incrementally(true);
+ set_inlining_progress(true);
+ uint low_live_nodes = 0;
+
+ while(inlining_progress() && _late_inlines.length() > 0) {
+
+ if (live_nodes() > (uint)LiveNodeCountInliningCutoff) {
+ if (low_live_nodes < (uint)LiveNodeCountInliningCutoff * 8 / 10) {
+ // PhaseIdealLoop is expensive so we only try it once we are
+ // out of loop and we only try it again if the previous helped
+ // got the number of nodes down significantly
+ PhaseIdealLoop ideal_loop( igvn, false, true );
+ if (failing()) return;
+ low_live_nodes = live_nodes();
+ _major_progress = true;
+ }
+
+ if (live_nodes() > (uint)LiveNodeCountInliningCutoff) {
+ break;
+ }
+ }
+
+ inline_incrementally_one(igvn);
+
+ if (failing()) return;
+
+ igvn.optimize();
+
+ if (failing()) return;
+ }
+
+ assert( igvn._worklist.size() == 0, "should be done with igvn" );
+
+ if (_string_late_inlines.length() > 0) {
+ assert(has_stringbuilder(), "inconsistent");
+ for_igvn()->clear();
+ initial_gvn()->replace_with(&igvn);
+
+ inline_string_calls(false);
+
+ if (failing()) return;
+
+ {
+ ResourceMark rm;
+ PhaseRemoveUseless pru(initial_gvn(), for_igvn());
+ }
+
+ igvn = PhaseIterGVN(gvn);
+
+ igvn.optimize();
+ }
+
+ set_inlining_incrementally(false);
+}
+
+
//------------------------------Optimize---------------------------------------
// Given a graph, optimize it.
void Compile::Optimize() {
@@ -1792,6 +1921,12 @@
if (failing()) return;
+ inline_incrementally(igvn);
+
+ print_method("Incremental Inline", 2);
+
+ if (failing()) return;
+
// Perform escape analysis
if (_do_escape_analysis && ConnectionGraph::has_candidates(this)) {
if (has_loops()) {
@@ -1914,6 +2049,7 @@
} // (End scope of igvn; run destructor if necessary for asserts.)
+ dump_inlining();
// A method with only infinite loops has no edges entering loops from root
{
NOT_PRODUCT( TracePhase t2("graphReshape", &_t_graphReshaping, TimeCompiler); )
@@ -3361,7 +3497,29 @@
}
void Compile::dump_inlining() {
- if (PrintInlining) {
+ if (PrintInlining || PrintIntrinsics NOT_PRODUCT( || PrintOptoInlining)) {
+ // Print inlining message for candidates that we couldn't inline
+ // for lack of space or non constant receiver
+ for (int i = 0; i < _late_inlines.length(); i++) {
+ CallGenerator* cg = _late_inlines.at(i);
+ cg->print_inlining_late("live nodes > LiveNodeCountInliningCutoff");
+ }
+ Unique_Node_List useful;
+ useful.push(root());
+ for (uint next = 0; next < useful.size(); ++next) {
+ Node* n = useful.at(next);
+ if (n->is_Call() && n->as_Call()->generator() != NULL && n->as_Call()->generator()->call_node() == n) {
+ CallNode* call = n->as_Call();
+ CallGenerator* cg = call->generator();
+ cg->print_inlining_late("receiver not constant");
+ }
+ uint max = n->len();
+ for ( uint i = 0; i < max; ++i ) {
+ Node *m = n->in(i);
+ if ( m == NULL ) continue;
+ useful.push(m);
+ }
+ }
for (int i = 0; i < _print_inlining_list->length(); i++) {
tty->print(_print_inlining_list->at(i).ss()->as_string());
}
--- a/hotspot/src/share/vm/opto/compile.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/compile.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -72,6 +72,7 @@
class JVMState;
class TypeData;
class TypePtr;
+class TypeOopPtr;
class TypeFunc;
class Unique_Node_List;
class nmethod;
@@ -280,6 +281,8 @@
int _orig_pc_slot_offset_in_bytes;
int _major_progress; // Count of something big happening
+ bool _inlining_progress; // progress doing incremental inlining?
+ bool _inlining_incrementally;// Are we doing incremental inlining (post parse)
bool _has_loops; // True if the method _may_ have some loops
bool _has_split_ifs; // True if the method _may_ have some split-if
bool _has_unsafe_access; // True if the method _may_ produce faults in unsafe loads or stores.
@@ -367,8 +370,13 @@
Unique_Node_List* _for_igvn; // Initial work-list for next round of Iterative GVN
WarmCallInfo* _warm_calls; // Sorted work-list for heat-based inlining.
- GrowableArray<CallGenerator*> _late_inlines; // List of CallGenerators to be revisited after
- // main parsing has finished.
+ GrowableArray<CallGenerator*> _late_inlines; // List of CallGenerators to be revisited after
+ // main parsing has finished.
+ GrowableArray<CallGenerator*> _string_late_inlines; // same but for string operations
+
+ int _late_inlines_pos; // Where in the queue should the next late inlining candidate go (emulate depth first inlining)
+ uint _number_of_mh_late_inlines; // number of method handle late inlining still pending
+
// Inlining may not happen in parse order which would make
// PrintInlining output confusing. Keep track of PrintInlining
@@ -491,6 +499,10 @@
int fixed_slots() const { assert(_fixed_slots >= 0, ""); return _fixed_slots; }
void set_fixed_slots(int n) { _fixed_slots = n; }
int major_progress() const { return _major_progress; }
+ void set_inlining_progress(bool z) { _inlining_progress = z; }
+ int inlining_progress() const { return _inlining_progress; }
+ void set_inlining_incrementally(bool z) { _inlining_incrementally = z; }
+ int inlining_incrementally() const { return _inlining_incrementally; }
void set_major_progress() { _major_progress++; }
void clear_major_progress() { _major_progress = 0; }
int num_loop_opts() const { return _num_loop_opts; }
@@ -729,9 +741,17 @@
// Decide how to build a call.
// The profile factor is a discount to apply to this site's interp. profile.
- CallGenerator* call_generator(ciMethod* call_method, int vtable_index, bool call_is_virtual, JVMState* jvms, bool allow_inline, float profile_factor, bool allow_intrinsics = true);
+ CallGenerator* call_generator(ciMethod* call_method, int vtable_index, bool call_does_dispatch, JVMState* jvms, bool allow_inline, float profile_factor, bool allow_intrinsics = true, bool delayed_forbidden = false);
bool should_delay_inlining(ciMethod* call_method, JVMState* jvms);
+ // Helper functions to identify inlining potential at call-site
+ ciMethod* optimize_virtual_call(ciMethod* caller, int bci, ciInstanceKlass* klass,
+ ciMethod* callee, const TypeOopPtr* receiver_type,
+ bool is_virtual,
+ bool &call_does_dispatch, int &vtable_index);
+ ciMethod* optimize_inlining(ciMethod* caller, int bci, ciInstanceKlass* klass,
+ ciMethod* callee, const TypeOopPtr* receiver_type);
+
// Report if there were too many traps at a current method and bci.
// Report if a trap was recorded, and/or PerMethodTrapLimit was exceeded.
// If there is no MDO at all, report no trap unless told to assume it.
@@ -765,10 +785,39 @@
WarmCallInfo* pop_warm_call();
// Record this CallGenerator for inlining at the end of parsing.
- void add_late_inline(CallGenerator* cg) { _late_inlines.push(cg); }
+ void add_late_inline(CallGenerator* cg) {
+ _late_inlines.insert_before(_late_inlines_pos, cg);
+ _late_inlines_pos++;
+ }
+
+ void prepend_late_inline(CallGenerator* cg) {
+ _late_inlines.insert_before(0, cg);
+ }
+
+ void add_string_late_inline(CallGenerator* cg) {
+ _string_late_inlines.push(cg);
+ }
+
+ void remove_useless_late_inlines(GrowableArray<CallGenerator*>* inlines, Unique_Node_List &useful);
void dump_inlining();
+ bool over_inlining_cutoff() const {
+ if (!inlining_incrementally()) {
+ return unique() > (uint)NodeCountInliningCutoff;
+ } else {
+ return live_nodes() > (uint)LiveNodeCountInliningCutoff;
+ }
+ }
+
+ void inc_number_of_mh_late_inlines() { _number_of_mh_late_inlines++; }
+ void dec_number_of_mh_late_inlines() { assert(_number_of_mh_late_inlines > 0, "_number_of_mh_late_inlines < 0 !"); _number_of_mh_late_inlines--; }
+ bool has_mh_late_inlines() const { return _number_of_mh_late_inlines > 0; }
+
+ void inline_incrementally_one(PhaseIterGVN& igvn);
+ void inline_incrementally(PhaseIterGVN& igvn);
+ void inline_string_calls(bool parse_time);
+
// Matching, CFG layout, allocation, code generation
PhaseCFG* cfg() { return _cfg; }
bool select_24_bit_instr() const { return _select_24_bit_instr; }
--- a/hotspot/src/share/vm/opto/doCall.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/doCall.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -61,9 +61,9 @@
}
}
-CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool call_is_virtual,
+CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool call_does_dispatch,
JVMState* jvms, bool allow_inline,
- float prof_factor, bool allow_intrinsics) {
+ float prof_factor, bool allow_intrinsics, bool delayed_forbidden) {
ciMethod* caller = jvms->method();
int bci = jvms->bci();
Bytecodes::Code bytecode = caller->java_code_at_bci(bci);
@@ -82,7 +82,7 @@
// See how many times this site has been invoked.
int site_count = profile.count();
int receiver_count = -1;
- if (call_is_virtual && UseTypeProfile && profile.has_receiver(0)) {
+ if (call_does_dispatch && UseTypeProfile && profile.has_receiver(0)) {
// Receivers in the profile structure are ordered by call counts
// so that the most called (major) receiver is profile.receiver(0).
receiver_count = profile.receiver_count(0);
@@ -94,7 +94,7 @@
int r2id = (rid != -1 && profile.has_receiver(1))? log->identify(profile.receiver(1)):-1;
log->begin_elem("call method='%d' count='%d' prof_factor='%g'",
log->identify(callee), site_count, prof_factor);
- if (call_is_virtual) log->print(" virtual='1'");
+ if (call_does_dispatch) log->print(" virtual='1'");
if (allow_inline) log->print(" inline='1'");
if (receiver_count >= 0) {
log->print(" receiver='%d' receiver_count='%d'", rid, receiver_count);
@@ -111,12 +111,12 @@
// We do this before the strict f.p. check below because the
// intrinsics handle strict f.p. correctly.
if (allow_inline && allow_intrinsics) {
- CallGenerator* cg = find_intrinsic(callee, call_is_virtual);
+ CallGenerator* cg = find_intrinsic(callee, call_does_dispatch);
if (cg != NULL) {
if (cg->is_predicted()) {
// Code without intrinsic but, hopefully, inlined.
CallGenerator* inline_cg = this->call_generator(callee,
- vtable_index, call_is_virtual, jvms, allow_inline, prof_factor, false);
+ vtable_index, call_does_dispatch, jvms, allow_inline, prof_factor, false);
if (inline_cg != NULL) {
cg = CallGenerator::for_predicted_intrinsic(cg, inline_cg);
}
@@ -130,7 +130,9 @@
// MethodHandle.invoke* are native methods which obviously don't
// have bytecodes and so normal inlining fails.
if (callee->is_method_handle_intrinsic()) {
- return CallGenerator::for_method_handle_call(jvms, caller, callee);
+ CallGenerator* cg = CallGenerator::for_method_handle_call(jvms, caller, callee, delayed_forbidden);
+ assert(cg == NULL || !delayed_forbidden || !cg->is_late_inline() || cg->is_mh_late_inline(), "unexpected CallGenerator");
+ return cg;
}
// Do not inline strict fp into non-strict code, or the reverse
@@ -147,7 +149,7 @@
float expected_uses = past_uses;
// Try inlining a bytecoded method:
- if (!call_is_virtual) {
+ if (!call_does_dispatch) {
InlineTree* ilt;
if (UseOldInlining) {
ilt = InlineTree::find_subtree_from_root(this->ilt(), jvms->caller(), jvms->method());
@@ -161,32 +163,39 @@
WarmCallInfo scratch_ci;
if (!UseOldInlining)
scratch_ci.init(jvms, callee, profile, prof_factor);
- WarmCallInfo* ci = ilt->ok_to_inline(callee, jvms, profile, &scratch_ci);
+ bool should_delay = false;
+ WarmCallInfo* ci = ilt->ok_to_inline(callee, jvms, profile, &scratch_ci, should_delay);
assert(ci != &scratch_ci, "do not let this pointer escape");
bool allow_inline = (ci != NULL && !ci->is_cold());
bool require_inline = (allow_inline && ci->is_hot());
if (allow_inline) {
CallGenerator* cg = CallGenerator::for_inline(callee, expected_uses);
- if (require_inline && cg != NULL && should_delay_inlining(callee, jvms)) {
+
+ if (require_inline && cg != NULL) {
// Delay the inlining of this method to give us the
// opportunity to perform some high level optimizations
// first.
- return CallGenerator::for_late_inline(callee, cg);
+ if (should_delay_inlining(callee, jvms)) {
+ assert(!delayed_forbidden, "strange");
+ return CallGenerator::for_string_late_inline(callee, cg);
+ } else if ((should_delay || AlwaysIncrementalInline) && !delayed_forbidden) {
+ return CallGenerator::for_late_inline(callee, cg);
+ }
}
- if (cg == NULL) {
+ if (cg == NULL || should_delay) {
// Fall through.
} else if (require_inline || !InlineWarmCalls) {
return cg;
} else {
- CallGenerator* cold_cg = call_generator(callee, vtable_index, call_is_virtual, jvms, false, prof_factor);
+ CallGenerator* cold_cg = call_generator(callee, vtable_index, call_does_dispatch, jvms, false, prof_factor);
return CallGenerator::for_warm_call(ci, cold_cg, cg);
}
}
}
// Try using the type profile.
- if (call_is_virtual && site_count > 0 && receiver_count > 0) {
+ if (call_does_dispatch && site_count > 0 && receiver_count > 0) {
// The major receiver's count >= TypeProfileMajorReceiverPercent of site_count.
bool have_major_receiver = (100.*profile.receiver_prob(0) >= (float)TypeProfileMajorReceiverPercent);
ciMethod* receiver_method = NULL;
@@ -200,7 +209,7 @@
if (receiver_method != NULL) {
// The single majority receiver sufficiently outweighs the minority.
CallGenerator* hit_cg = this->call_generator(receiver_method,
- vtable_index, !call_is_virtual, jvms, allow_inline, prof_factor);
+ vtable_index, !call_does_dispatch, jvms, allow_inline, prof_factor);
if (hit_cg != NULL) {
// Look up second receiver.
CallGenerator* next_hit_cg = NULL;
@@ -210,7 +219,7 @@
profile.receiver(1));
if (next_receiver_method != NULL) {
next_hit_cg = this->call_generator(next_receiver_method,
- vtable_index, !call_is_virtual, jvms,
+ vtable_index, !call_does_dispatch, jvms,
allow_inline, prof_factor);
if (next_hit_cg != NULL && !next_hit_cg->is_inline() &&
have_major_receiver && UseOnlyInlinedBimorphic) {
@@ -256,7 +265,7 @@
// There was no special inlining tactic, or it bailed out.
// Use a more generic tactic, like a simple call.
- if (call_is_virtual) {
+ if (call_does_dispatch) {
return CallGenerator::for_virtual_call(callee, vtable_index);
} else {
// Class Hierarchy Analysis or Type Profile reveals a unique target,
@@ -388,6 +397,7 @@
// orig_callee is the resolved callee which's signature includes the
// appendix argument.
const int nargs = orig_callee->arg_size();
+ const bool is_signature_polymorphic = MethodHandles::is_signature_polymorphic(orig_callee->intrinsic_id());
// Push appendix argument (MethodType, CallSite, etc.), if one.
if (iter().has_appendix()) {
@@ -404,25 +414,18 @@
// Then we may introduce a run-time check and inline on the path where it succeeds.
// The other path may uncommon_trap, check for another receiver, or do a v-call.
- // Choose call strategy.
- bool call_is_virtual = is_virtual_or_interface;
- int vtable_index = Method::invalid_vtable_index;
- ciMethod* callee = orig_callee;
+ // Try to get the most accurate receiver type
+ ciMethod* callee = orig_callee;
+ int vtable_index = Method::invalid_vtable_index;
+ bool call_does_dispatch = false;
- // Try to get the most accurate receiver type
if (is_virtual_or_interface) {
Node* receiver_node = stack(sp() - nargs);
const TypeOopPtr* receiver_type = _gvn.type(receiver_node)->isa_oopptr();
- ciMethod* optimized_virtual_method = optimize_inlining(method(), bci(), klass, orig_callee, receiver_type);
-
- // Have the call been sufficiently improved such that it is no longer a virtual?
- if (optimized_virtual_method != NULL) {
- callee = optimized_virtual_method;
- call_is_virtual = false;
- } else if (!UseInlineCaches && is_virtual && callee->is_loaded()) {
- // We can make a vtable call at this site
- vtable_index = callee->resolve_vtable_index(method()->holder(), klass);
- }
+ // call_does_dispatch and vtable_index are out-parameters. They might be changed.
+ callee = C->optimize_virtual_call(method(), bci(), klass, orig_callee, receiver_type,
+ is_virtual,
+ call_does_dispatch, vtable_index); // out-parameters
}
// Note: It's OK to try to inline a virtual call.
@@ -438,7 +441,7 @@
// Decide call tactic.
// This call checks with CHA, the interpreter profile, intrinsics table, etc.
// It decides whether inlining is desirable or not.
- CallGenerator* cg = C->call_generator(callee, vtable_index, call_is_virtual, jvms, try_inline, prof_factor());
+ CallGenerator* cg = C->call_generator(callee, vtable_index, call_does_dispatch, jvms, try_inline, prof_factor());
// NOTE: Don't use orig_callee and callee after this point! Use cg->method() instead.
orig_callee = callee = NULL;
@@ -478,7 +481,7 @@
// the call site, perhaps because it did not match a pattern the
// intrinsic was expecting to optimize. Should always be possible to
// get a normal java call that may inline in that case
- cg = C->call_generator(cg->method(), vtable_index, call_is_virtual, jvms, try_inline, prof_factor(), /* allow_intrinsics= */ false);
+ cg = C->call_generator(cg->method(), vtable_index, call_does_dispatch, jvms, try_inline, prof_factor(), /* allow_intrinsics= */ false);
if ((new_jvms = cg->generate(jvms)) == NULL) {
guarantee(failing(), "call failed to generate: calls should work");
return;
@@ -513,55 +516,50 @@
round_double_result(cg->method());
ciType* rtype = cg->method()->return_type();
- if (Bytecodes::has_optional_appendix(iter().cur_bc_raw())) {
+ ciType* ctype = declared_signature->return_type();
+
+ if (Bytecodes::has_optional_appendix(iter().cur_bc_raw()) || is_signature_polymorphic) {
// Be careful here with return types.
- ciType* ctype = declared_signature->return_type();
if (ctype != rtype) {
BasicType rt = rtype->basic_type();
BasicType ct = ctype->basic_type();
- Node* retnode = peek();
if (ct == T_VOID) {
// It's OK for a method to return a value that is discarded.
// The discarding does not require any special action from the caller.
// The Java code knows this, at VerifyType.isNullConversion.
pop_node(rt); // whatever it was, pop it
- retnode = top();
} else if (rt == T_INT || is_subword_type(rt)) {
- // FIXME: This logic should be factored out.
- if (ct == T_BOOLEAN) {
- retnode = _gvn.transform( new (C) AndINode(retnode, intcon(0x1)) );
- } else if (ct == T_CHAR) {
- retnode = _gvn.transform( new (C) AndINode(retnode, intcon(0xFFFF)) );
- } else if (ct == T_BYTE) {
- retnode = _gvn.transform( new (C) LShiftINode(retnode, intcon(24)) );
- retnode = _gvn.transform( new (C) RShiftINode(retnode, intcon(24)) );
- } else if (ct == T_SHORT) {
- retnode = _gvn.transform( new (C) LShiftINode(retnode, intcon(16)) );
- retnode = _gvn.transform( new (C) RShiftINode(retnode, intcon(16)) );
- } else {
- assert(ct == T_INT, err_msg_res("rt=%s, ct=%s", type2name(rt), type2name(ct)));
- }
+ // Nothing. These cases are handled in lambda form bytecode.
+ assert(ct == T_INT || is_subword_type(ct), err_msg_res("must match: rt=%s, ct=%s", type2name(rt), type2name(ct)));
} else if (rt == T_OBJECT || rt == T_ARRAY) {
assert(ct == T_OBJECT || ct == T_ARRAY, err_msg_res("rt=%s, ct=%s", type2name(rt), type2name(ct)));
if (ctype->is_loaded()) {
const TypeOopPtr* arg_type = TypeOopPtr::make_from_klass(rtype->as_klass());
const Type* sig_type = TypeOopPtr::make_from_klass(ctype->as_klass());
if (arg_type != NULL && !arg_type->higher_equal(sig_type)) {
+ Node* retnode = pop();
Node* cast_obj = _gvn.transform(new (C) CheckCastPPNode(control(), retnode, sig_type));
- pop();
push(cast_obj);
}
}
} else {
- assert(ct == rt, err_msg("unexpected mismatch rt=%d, ct=%d", rt, ct));
+ assert(rt == ct, err_msg_res("unexpected mismatch: rt=%s, ct=%s", type2name(rt), type2name(ct)));
// push a zero; it's better than getting an oop/int mismatch
- retnode = pop_node(rt);
- retnode = zerocon(ct);
+ pop_node(rt);
+ Node* retnode = zerocon(ct);
push_node(ct, retnode);
}
// Now that the value is well-behaved, continue with the call-site type.
rtype = ctype;
}
+ } else {
+ // Symbolic resolution enforces the types to be the same.
+ // NOTE: We must relax the assert for unloaded types because two
+ // different ciType instances of the same unloaded class type
+ // can appear to be "loaded" by different loaders (depending on
+ // the accessing class).
+ assert(!rtype->is_loaded() || !ctype->is_loaded() || rtype == ctype,
+ err_msg_res("mismatched return types: rtype=%s, ctype=%s", rtype->name(), ctype->name()));
}
// If the return type of the method is not loaded, assert that the
@@ -879,17 +877,39 @@
#endif //PRODUCT
+ciMethod* Compile::optimize_virtual_call(ciMethod* caller, int bci, ciInstanceKlass* klass,
+ ciMethod* callee, const TypeOopPtr* receiver_type,
+ bool is_virtual,
+ bool& call_does_dispatch, int& vtable_index) {
+ // Set default values for out-parameters.
+ call_does_dispatch = true;
+ vtable_index = Method::invalid_vtable_index;
+
+ // Choose call strategy.
+ ciMethod* optimized_virtual_method = optimize_inlining(caller, bci, klass, callee, receiver_type);
+
+ // Have the call been sufficiently improved such that it is no longer a virtual?
+ if (optimized_virtual_method != NULL) {
+ callee = optimized_virtual_method;
+ call_does_dispatch = false;
+ } else if (!UseInlineCaches && is_virtual && callee->is_loaded()) {
+ // We can make a vtable call at this site
+ vtable_index = callee->resolve_vtable_index(caller->holder(), klass);
+ }
+ return callee;
+}
+
// Identify possible target method and inlining style
-ciMethod* Parse::optimize_inlining(ciMethod* caller, int bci, ciInstanceKlass* klass,
- ciMethod *dest_method, const TypeOopPtr* receiver_type) {
+ciMethod* Compile::optimize_inlining(ciMethod* caller, int bci, ciInstanceKlass* klass,
+ ciMethod* callee, const TypeOopPtr* receiver_type) {
// only use for virtual or interface calls
// If it is obviously final, do not bother to call find_monomorphic_target,
// because the class hierarchy checks are not needed, and may fail due to
// incompletely loaded classes. Since we do our own class loading checks
// in this module, we may confidently bind to any method.
- if (dest_method->can_be_statically_bound()) {
- return dest_method;
+ if (callee->can_be_statically_bound()) {
+ return callee;
}
// Attempt to improve the receiver
@@ -898,8 +918,8 @@
if (receiver_type != NULL) {
// Array methods are all inherited from Object, and are monomorphic.
if (receiver_type->isa_aryptr() &&
- dest_method->holder() == env()->Object_klass()) {
- return dest_method;
+ callee->holder() == env()->Object_klass()) {
+ return callee;
}
// All other interesting cases are instance klasses.
@@ -919,7 +939,7 @@
}
ciInstanceKlass* calling_klass = caller->holder();
- ciMethod* cha_monomorphic_target = dest_method->find_monomorphic_target(calling_klass, klass, actual_receiver);
+ ciMethod* cha_monomorphic_target = callee->find_monomorphic_target(calling_klass, klass, actual_receiver);
if (cha_monomorphic_target != NULL) {
assert(!cha_monomorphic_target->is_abstract(), "");
// Look at the method-receiver type. Does it add "too much information"?
@@ -937,10 +957,10 @@
cha_monomorphic_target->print();
tty->cr();
}
- if (C->log() != NULL) {
- C->log()->elem("missed_CHA_opportunity klass='%d' method='%d'",
- C->log()->identify(klass),
- C->log()->identify(cha_monomorphic_target));
+ if (log() != NULL) {
+ log()->elem("missed_CHA_opportunity klass='%d' method='%d'",
+ log()->identify(klass),
+ log()->identify(cha_monomorphic_target));
}
cha_monomorphic_target = NULL;
}
@@ -952,7 +972,7 @@
// by dynamic class loading. Be sure to test the "static" receiver
// dest_method here, as opposed to the actual receiver, which may
// falsely lead us to believe that the receiver is final or private.
- C->dependencies()->assert_unique_concrete_method(actual_receiver, cha_monomorphic_target);
+ dependencies()->assert_unique_concrete_method(actual_receiver, cha_monomorphic_target);
return cha_monomorphic_target;
}
@@ -961,7 +981,7 @@
if (actual_receiver_is_exact) {
// In case of evolution, there is a dependence on every inlined method, since each
// such method can be changed when its class is redefined.
- ciMethod* exact_method = dest_method->resolve_invoke(calling_klass, actual_receiver);
+ ciMethod* exact_method = callee->resolve_invoke(calling_klass, actual_receiver);
if (exact_method != NULL) {
#ifndef PRODUCT
if (PrintOpto) {
--- a/hotspot/src/share/vm/opto/escape.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/escape.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -523,7 +523,8 @@
case Op_AryEq:
case Op_StrComp:
case Op_StrEquals:
- case Op_StrIndexOf: {
+ case Op_StrIndexOf:
+ case Op_EncodeISOArray: {
add_local_var(n, PointsToNode::ArgEscape);
delayed_worklist->push(n); // Process it later.
break;
@@ -701,7 +702,8 @@
case Op_AryEq:
case Op_StrComp:
case Op_StrEquals:
- case Op_StrIndexOf: {
+ case Op_StrIndexOf:
+ case Op_EncodeISOArray: {
// char[] arrays passed to string intrinsic do not escape but
// they are not scalar replaceable. Adjust escape state for them.
// Start from in(2) edge since in(1) is memory edge.
@@ -2581,15 +2583,22 @@
}
// Otherwise skip it (the call updated 'result' value).
} else if (result->Opcode() == Op_SCMemProj) {
- assert(result->in(0)->is_LoadStore(), "sanity");
- const Type *at = igvn->type(result->in(0)->in(MemNode::Address));
+ Node* mem = result->in(0);
+ Node* adr = NULL;
+ if (mem->is_LoadStore()) {
+ adr = mem->in(MemNode::Address);
+ } else {
+ assert(mem->Opcode() == Op_EncodeISOArray, "sanity");
+ adr = mem->in(3); // Memory edge corresponds to destination array
+ }
+ const Type *at = igvn->type(adr);
if (at != Type::TOP) {
assert (at->isa_ptr() != NULL, "pointer type required.");
int idx = C->get_alias_index(at->is_ptr());
assert(idx != alias_idx, "Object is not scalar replaceable if a LoadStore node access its field");
break;
}
- result = result->in(0)->in(MemNode::Memory);
+ result = mem->in(MemNode::Memory);
}
}
if (result->is_Phi()) {
@@ -2927,6 +2936,11 @@
if (m->is_MergeMem()) {
assert(_mergemem_worklist.contains(m->as_MergeMem()), "EA: missing MergeMem node in the worklist");
}
+ } else if (use->Opcode() == Op_EncodeISOArray) {
+ if (use->in(MemNode::Memory) == n || use->in(3) == n) {
+ // EncodeISOArray overwrites destination array
+ memnode_worklist.append_if_missing(use);
+ }
} else {
uint op = use->Opcode();
if (!(op == Op_CmpP || op == Op_Conv2B ||
@@ -2962,6 +2976,16 @@
n = n->as_MemBar()->proj_out(TypeFunc::Memory);
if (n == NULL)
continue;
+ } else if (n->Opcode() == Op_EncodeISOArray) {
+ // get the memory projection
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ Node *use = n->fast_out(i);
+ if (use->Opcode() == Op_SCMemProj) {
+ n = use;
+ break;
+ }
+ }
+ assert(n->Opcode() == Op_SCMemProj, "memory projection required");
} else {
assert(n->is_Mem(), "memory node required.");
Node *addr = n->in(MemNode::Address);
@@ -2999,7 +3023,7 @@
Node *use = n->fast_out(i);
if (use->is_Phi() || use->is_ClearArray()) {
memnode_worklist.append_if_missing(use);
- } else if(use->is_Mem() && use->in(MemNode::Memory) == n) {
+ } else if (use->is_Mem() && use->in(MemNode::Memory) == n) {
if (use->Opcode() == Op_StoreCM) // Ignore cardmark stores
continue;
memnode_worklist.append_if_missing(use);
@@ -3010,6 +3034,11 @@
assert(use->in(MemNode::Memory) != n, "EA: missing memory path");
} else if (use->is_MergeMem()) {
assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist");
+ } else if (use->Opcode() == Op_EncodeISOArray) {
+ if (use->in(MemNode::Memory) == n || use->in(3) == n) {
+ // EncodeISOArray overwrites destination array
+ memnode_worklist.append_if_missing(use);
+ }
} else {
uint op = use->Opcode();
if (!(op == Op_StoreCM ||
--- a/hotspot/src/share/vm/opto/graphKit.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/graphKit.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1794,10 +1794,15 @@
if (ejvms == NULL) {
// No exception edges to simply kill off those paths
- C->gvn_replace_by(callprojs.catchall_catchproj, C->top());
- C->gvn_replace_by(callprojs.catchall_memproj, C->top());
- C->gvn_replace_by(callprojs.catchall_ioproj, C->top());
-
+ if (callprojs.catchall_catchproj != NULL) {
+ C->gvn_replace_by(callprojs.catchall_catchproj, C->top());
+ }
+ if (callprojs.catchall_memproj != NULL) {
+ C->gvn_replace_by(callprojs.catchall_memproj, C->top());
+ }
+ if (callprojs.catchall_ioproj != NULL) {
+ C->gvn_replace_by(callprojs.catchall_ioproj, C->top());
+ }
// Replace the old exception object with top
if (callprojs.exobj != NULL) {
C->gvn_replace_by(callprojs.exobj, C->top());
@@ -1809,10 +1814,15 @@
SafePointNode* ex_map = ekit.combine_and_pop_all_exception_states();
Node* ex_oop = ekit.use_exception_state(ex_map);
-
- C->gvn_replace_by(callprojs.catchall_catchproj, ekit.control());
- C->gvn_replace_by(callprojs.catchall_memproj, ekit.reset_memory());
- C->gvn_replace_by(callprojs.catchall_ioproj, ekit.i_o());
+ if (callprojs.catchall_catchproj != NULL) {
+ C->gvn_replace_by(callprojs.catchall_catchproj, ekit.control());
+ }
+ if (callprojs.catchall_memproj != NULL) {
+ C->gvn_replace_by(callprojs.catchall_memproj, ekit.reset_memory());
+ }
+ if (callprojs.catchall_ioproj != NULL) {
+ C->gvn_replace_by(callprojs.catchall_ioproj, ekit.i_o());
+ }
// Replace the old exception object with the newly created one
if (callprojs.exobj != NULL) {
--- a/hotspot/src/share/vm/opto/idealGraphPrinter.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/idealGraphPrinter.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -547,7 +547,7 @@
// max. 2 chars allowed
if (value >= -9 && value <= 99) {
- sprintf(buffer, INT64_FORMAT, value);
+ sprintf(buffer, JLONG_FORMAT, value);
print_prop(short_name, buffer);
} else {
print_prop(short_name, "L");
--- a/hotspot/src/share/vm/opto/lcm.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/lcm.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -175,6 +175,7 @@
case Op_StrEquals:
case Op_StrIndexOf:
case Op_AryEq:
+ case Op_EncodeISOArray:
// Not a legit memory op for implicit null check regardless of
// embedded loads
continue;
--- a/hotspot/src/share/vm/opto/library_call.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/library_call.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -290,6 +290,7 @@
bool inline_cipherBlockChaining_AESCrypt(vmIntrinsics::ID id);
Node* inline_cipherBlockChaining_AESCrypt_predicate(bool decrypting);
Node* get_key_start_from_aescrypt_object(Node* aescrypt_object);
+ bool inline_encodeISOArray();
};
@@ -381,6 +382,10 @@
// These also use the arraycopy intrinsic mechanism:
if (!InlineArrayCopy) return NULL;
break;
+ case vmIntrinsics::_encodeISOArray:
+ if (!SpecialEncodeISOArray) return NULL;
+ if (!Matcher::match_rule_supported(Op_EncodeISOArray)) return NULL;
+ break;
case vmIntrinsics::_checkIndex:
// We do not intrinsify this. The optimizer does fine with it.
return NULL;
@@ -799,6 +804,9 @@
case vmIntrinsics::_cipherBlockChaining_decryptAESCrypt:
return inline_cipherBlockChaining_AESCrypt(intrinsic_id());
+ case vmIntrinsics::_encodeISOArray:
+ return inline_encodeISOArray();
+
default:
// If you get here, it may be that someone has added a new intrinsic
// to the list in vmSymbols.hpp without implementing it here.
@@ -3559,7 +3567,6 @@
// public static <T,U> T[] java.util.Arrays.copyOf( U[] original, int newLength, Class<? extends T[]> newType);
// public static <T,U> T[] java.util.Arrays.copyOfRange(U[] original, int from, int to, Class<? extends T[]> newType);
bool LibraryCallKit::inline_array_copyOf(bool is_copyOfRange) {
- return false;
if (too_many_traps(Deoptimization::Reason_intrinsic)) return false;
// Get the arguments.
@@ -5369,6 +5376,47 @@
src_start, dest_start, copy_length XTOP);
}
+//-------------inline_encodeISOArray-----------------------------------
+// encode char[] to byte[] in ISO_8859_1
+bool LibraryCallKit::inline_encodeISOArray() {
+ assert(callee()->signature()->size() == 5, "encodeISOArray has 5 parameters");
+ // no receiver since it is static method
+ Node *src = argument(0);
+ Node *src_offset = argument(1);
+ Node *dst = argument(2);
+ Node *dst_offset = argument(3);
+ Node *length = argument(4);
+
+ const Type* src_type = src->Value(&_gvn);
+ const Type* dst_type = dst->Value(&_gvn);
+ const TypeAryPtr* top_src = src_type->isa_aryptr();
+ const TypeAryPtr* top_dest = dst_type->isa_aryptr();
+ if (top_src == NULL || top_src->klass() == NULL ||
+ top_dest == NULL || top_dest->klass() == NULL) {
+ // failed array check
+ return false;
+ }
+
+ // Figure out the size and type of the elements we will be copying.
+ BasicType src_elem = src_type->isa_aryptr()->klass()->as_array_klass()->element_type()->basic_type();
+ BasicType dst_elem = dst_type->isa_aryptr()->klass()->as_array_klass()->element_type()->basic_type();
+ if (src_elem != T_CHAR || dst_elem != T_BYTE) {
+ return false;
+ }
+ Node* src_start = array_element_address(src, src_offset, src_elem);
+ Node* dst_start = array_element_address(dst, dst_offset, dst_elem);
+ // 'src_start' points to src array + scaled offset
+ // 'dst_start' points to dst array + scaled offset
+
+ const TypeAryPtr* mtype = TypeAryPtr::BYTES;
+ Node* enc = new (C) EncodeISOArrayNode(control(), memory(mtype), src_start, dst_start, length);
+ enc = _gvn.transform(enc);
+ Node* res_mem = _gvn.transform(new (C) SCMemProjNode(enc));
+ set_memory(res_mem, mtype);
+ set_result(enc);
+ return true;
+}
+
//----------------------------inline_reference_get----------------------------
// public T java.lang.ref.Reference.get();
bool LibraryCallKit::inline_reference_get() {
--- a/hotspot/src/share/vm/opto/loopTransform.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -613,6 +613,7 @@
case Op_StrComp:
case Op_StrEquals:
case Op_StrIndexOf:
+ case Op_EncodeISOArray:
case Op_AryEq: {
return false;
}
@@ -717,6 +718,7 @@
case Op_StrComp:
case Op_StrEquals:
case Op_StrIndexOf:
+ case Op_EncodeISOArray:
case Op_AryEq: {
// Do not unroll a loop with String intrinsics code.
// String intrinsics are large and have loops.
--- a/hotspot/src/share/vm/opto/machnode.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/machnode.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -506,7 +506,7 @@
#ifndef PRODUCT
void MachNullCheckNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
int reg = ra_->get_reg_first(in(1)->in(_vidx));
- tty->print("%s %s", Name(), Matcher::regName[reg]);
+ st->print("%s %s", Name(), Matcher::regName[reg]);
}
#endif
--- a/hotspot/src/share/vm/opto/macro.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/macro.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -361,14 +361,21 @@
}
// Otherwise skip it (the call updated 'mem' value).
} else if (mem->Opcode() == Op_SCMemProj) {
- assert(mem->in(0)->is_LoadStore(), "sanity");
- const TypePtr* atype = mem->in(0)->in(MemNode::Address)->bottom_type()->is_ptr();
+ mem = mem->in(0);
+ Node* adr = NULL;
+ if (mem->is_LoadStore()) {
+ adr = mem->in(MemNode::Address);
+ } else {
+ assert(mem->Opcode() == Op_EncodeISOArray, "sanity");
+ adr = mem->in(3); // Destination array
+ }
+ const TypePtr* atype = adr->bottom_type()->is_ptr();
int adr_idx = Compile::current()->get_alias_index(atype);
if (adr_idx == alias_idx) {
assert(false, "Object is not scalar replaceable if a LoadStore node access its field");
return NULL;
}
- mem = mem->in(0)->in(MemNode::Memory);
+ mem = mem->in(MemNode::Memory);
} else {
return mem;
}
@@ -445,7 +452,7 @@
}
values.at_put(j, val);
} else if (val->Opcode() == Op_SCMemProj) {
- assert(val->in(0)->is_LoadStore(), "sanity");
+ assert(val->in(0)->is_LoadStore() || val->in(0)->Opcode() == Op_EncodeISOArray, "sanity");
assert(false, "Object is not scalar replaceable if a LoadStore node access its field");
return NULL;
} else {
--- a/hotspot/src/share/vm/opto/matcher.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/matcher.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -919,6 +919,7 @@
case Op_AryEq:
case Op_MemBarVolatile:
case Op_MemBarCPUOrder: // %%% these ideals should have narrower adr_type?
+ case Op_EncodeISOArray:
nidx = Compile::AliasIdxTop;
nat = NULL;
break;
@@ -1982,6 +1983,7 @@
case Op_StrEquals:
case Op_StrIndexOf:
case Op_AryEq:
+ case Op_EncodeISOArray:
set_shared(n); // Force result into register (it will be anyways)
break;
case Op_ConP: { // Convert pointers above the centerline to NUL
@@ -2183,6 +2185,13 @@
n->del_req(4);
break;
}
+ case Op_EncodeISOArray: {
+ // Restructure into a binary tree for Matching.
+ Node* pair = new (C) BinaryNode(n->in(3), n->in(4));
+ n->set_req(3, pair);
+ n->del_req(4);
+ break;
+ }
default:
break;
}
--- a/hotspot/src/share/vm/opto/memnode.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/memnode.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -2725,10 +2725,8 @@
zend = phase->transform( new(C) URShiftXNode(zend, shift) );
}
+ // Bulk clear double-words
Node* zsize = phase->transform( new(C) SubXNode(zend, zbase) );
- Node* zinit = phase->zerocon((unit == BytesPerLong) ? T_LONG : T_INT);
-
- // Bulk clear double-words
Node* adr = phase->transform( new(C) AddPNode(dest, dest, start_offset) );
mem = new (C) ClearArrayNode(ctl, mem, zsize, adr);
return phase->transform(mem);
@@ -2799,6 +2797,26 @@
}
//=============================================================================
+//------------------------------match_edge-------------------------------------
+// Do not match memory edge
+uint EncodeISOArrayNode::match_edge(uint idx) const {
+ return idx == 2 || idx == 3; // EncodeISOArray src (Binary dst len)
+}
+
+//------------------------------Ideal------------------------------------------
+// Return a node which is more "ideal" than the current node. Strip out
+// control copies
+Node *EncodeISOArrayNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+ return remove_dead_region(phase, can_reshape) ? this : NULL;
+}
+
+//------------------------------Value------------------------------------------
+const Type *EncodeISOArrayNode::Value(PhaseTransform *phase) const {
+ if (in(0) && phase->type(in(0)) == Type::TOP) return Type::TOP;
+ return bottom_type();
+}
+
+//=============================================================================
MemBarNode::MemBarNode(Compile* C, int alias_idx, Node* precedent)
: MultiNode(TypeFunc::Parms + (precedent == NULL? 0: 1)),
_adr_type(C->get_adr_type(alias_idx))
--- a/hotspot/src/share/vm/opto/memnode.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/memnode.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -888,6 +888,22 @@
virtual const Type* bottom_type() const { return TypeInt::BOOL; }
};
+
+//------------------------------EncodeISOArray--------------------------------
+// encode char[] to byte[] in ISO_8859_1
+class EncodeISOArrayNode: public Node {
+public:
+ EncodeISOArrayNode(Node *control, Node* arymem, Node* s1, Node* s2, Node* c): Node(control, arymem, s1, s2, c) {};
+ virtual int Opcode() const;
+ virtual bool depends_only_on_test() const { return false; }
+ virtual const Type* bottom_type() const { return TypeInt::INT; }
+ virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
+ virtual uint match_edge(uint idx) const;
+ virtual uint ideal_reg() const { return Op_RegI; }
+ virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual const Type *Value(PhaseTransform *phase) const;
+};
+
//------------------------------MemBar-----------------------------------------
// There are different flavors of Memory Barriers to match the Java Memory
// Model. Monitor-enter and volatile-load act as Aquires: no following ref
--- a/hotspot/src/share/vm/opto/node.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/node.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1476,35 +1476,35 @@
}
#ifdef ASSERT
-static void dump_orig(Node* orig) {
+static void dump_orig(Node* orig, outputStream *st) {
Compile* C = Compile::current();
- if (NotANode(orig)) orig = NULL;
- if (orig != NULL && !C->node_arena()->contains(orig)) orig = NULL;
- if (orig == NULL) return;
- tty->print(" !orig=");
+ if (NotANode(orig)) orig = NULL;
+ if (orig != NULL && !C->node_arena()->contains(orig)) orig = NULL;
+ if (orig == NULL) return;
+ st->print(" !orig=");
Node* fast = orig->debug_orig(); // tortoise & hare algorithm to detect loops
- if (NotANode(fast)) fast = NULL;
+ if (NotANode(fast)) fast = NULL;
while (orig != NULL) {
bool discon = is_disconnected(orig); // if discon, print [123] else 123
- if (discon) tty->print("[");
+ if (discon) st->print("[");
if (!Compile::current()->node_arena()->contains(orig))
- tty->print("o");
- tty->print("%d", orig->_idx);
- if (discon) tty->print("]");
+ st->print("o");
+ st->print("%d", orig->_idx);
+ if (discon) st->print("]");
orig = orig->debug_orig();
- if (NotANode(orig)) orig = NULL;
- if (orig != NULL && !C->node_arena()->contains(orig)) orig = NULL;
- if (orig != NULL) tty->print(",");
+ if (NotANode(orig)) orig = NULL;
+ if (orig != NULL && !C->node_arena()->contains(orig)) orig = NULL;
+ if (orig != NULL) st->print(",");
if (fast != NULL) {
// Step fast twice for each single step of orig:
fast = fast->debug_orig();
- if (NotANode(fast)) fast = NULL;
+ if (NotANode(fast)) fast = NULL;
if (fast != NULL && fast != orig) {
fast = fast->debug_orig();
- if (NotANode(fast)) fast = NULL;
+ if (NotANode(fast)) fast = NULL;
}
if (fast == orig) {
- tty->print("...");
+ st->print("...");
break;
}
}
@@ -1531,35 +1531,34 @@
//------------------------------dump------------------------------------------
// Dump a Node
-void Node::dump() const {
+void Node::dump(const char* suffix, outputStream *st) const {
Compile* C = Compile::current();
bool is_new = C->node_arena()->contains(this);
_in_dump_cnt++;
- tty->print("%c%d\t%s\t=== ",
- is_new ? ' ' : 'o', _idx, Name());
+ st->print("%c%d\t%s\t=== ", is_new ? ' ' : 'o', _idx, Name());
// Dump the required and precedence inputs
- dump_req();
- dump_prec();
+ dump_req(st);
+ dump_prec(st);
// Dump the outputs
- dump_out();
+ dump_out(st);
if (is_disconnected(this)) {
#ifdef ASSERT
- tty->print(" [%d]",debug_idx());
- dump_orig(debug_orig());
+ st->print(" [%d]",debug_idx());
+ dump_orig(debug_orig(), st);
#endif
- tty->cr();
+ st->cr();
_in_dump_cnt--;
return; // don't process dead nodes
}
// Dump node-specific info
- dump_spec(tty);
+ dump_spec(st);
#ifdef ASSERT
// Dump the non-reset _debug_idx
- if( Verbose && WizardMode ) {
- tty->print(" [%d]",debug_idx());
+ if (Verbose && WizardMode) {
+ st->print(" [%d]",debug_idx());
}
#endif
@@ -1569,88 +1568,88 @@
const TypeInstPtr *toop = t->isa_instptr();
const TypeKlassPtr *tkls = t->isa_klassptr();
ciKlass* klass = toop ? toop->klass() : (tkls ? tkls->klass() : NULL );
- if( klass && klass->is_loaded() && klass->is_interface() ) {
- tty->print(" Interface:");
- } else if( toop ) {
- tty->print(" Oop:");
- } else if( tkls ) {
- tty->print(" Klass:");
+ if (klass && klass->is_loaded() && klass->is_interface()) {
+ st->print(" Interface:");
+ } else if (toop) {
+ st->print(" Oop:");
+ } else if (tkls) {
+ st->print(" Klass:");
}
- t->dump();
- } else if( t == Type::MEMORY ) {
- tty->print(" Memory:");
- MemNode::dump_adr_type(this, adr_type(), tty);
- } else if( Verbose || WizardMode ) {
- tty->print(" Type:");
- if( t ) {
- t->dump();
+ t->dump_on(st);
+ } else if (t == Type::MEMORY) {
+ st->print(" Memory:");
+ MemNode::dump_adr_type(this, adr_type(), st);
+ } else if (Verbose || WizardMode) {
+ st->print(" Type:");
+ if (t) {
+ t->dump_on(st);
} else {
- tty->print("no type");
+ st->print("no type");
}
} else if (t->isa_vect() && this->is_MachSpillCopy()) {
// Dump MachSpillcopy vector type.
- t->dump();
+ t->dump_on(st);
}
if (is_new) {
- debug_only(dump_orig(debug_orig()));
+ debug_only(dump_orig(debug_orig(), st));
Node_Notes* nn = C->node_notes_at(_idx);
if (nn != NULL && !nn->is_clear()) {
if (nn->jvms() != NULL) {
- tty->print(" !jvms:");
- nn->jvms()->dump_spec(tty);
+ st->print(" !jvms:");
+ nn->jvms()->dump_spec(st);
}
}
}
- tty->cr();
+ if (suffix) st->print(suffix);
_in_dump_cnt--;
}
//------------------------------dump_req--------------------------------------
-void Node::dump_req() const {
+void Node::dump_req(outputStream *st) const {
// Dump the required input edges
for (uint i = 0; i < req(); i++) { // For all required inputs
Node* d = in(i);
if (d == NULL) {
- tty->print("_ ");
+ st->print("_ ");
} else if (NotANode(d)) {
- tty->print("NotANode "); // uninitialized, sentinel, garbage, etc.
+ st->print("NotANode "); // uninitialized, sentinel, garbage, etc.
} else {
- tty->print("%c%d ", Compile::current()->node_arena()->contains(d) ? ' ' : 'o', d->_idx);
+ st->print("%c%d ", Compile::current()->node_arena()->contains(d) ? ' ' : 'o', d->_idx);
}
}
}
//------------------------------dump_prec-------------------------------------
-void Node::dump_prec() const {
+void Node::dump_prec(outputStream *st) const {
// Dump the precedence edges
int any_prec = 0;
for (uint i = req(); i < len(); i++) { // For all precedence inputs
Node* p = in(i);
if (p != NULL) {
- if( !any_prec++ ) tty->print(" |");
- if (NotANode(p)) { tty->print("NotANode "); continue; }
- tty->print("%c%d ", Compile::current()->node_arena()->contains(in(i)) ? ' ' : 'o', in(i)->_idx);
+ if (!any_prec++) st->print(" |");
+ if (NotANode(p)) { st->print("NotANode "); continue; }
+ st->print("%c%d ", Compile::current()->node_arena()->contains(in(i)) ? ' ' : 'o', in(i)->_idx);
}
}
}
//------------------------------dump_out--------------------------------------
-void Node::dump_out() const {
+void Node::dump_out(outputStream *st) const {
// Delimit the output edges
- tty->print(" [[");
+ st->print(" [[");
// Dump the output edges
for (uint i = 0; i < _outcnt; i++) { // For all outputs
Node* u = _out[i];
if (u == NULL) {
- tty->print("_ ");
+ st->print("_ ");
} else if (NotANode(u)) {
- tty->print("NotANode ");
+ st->print("NotANode ");
} else {
- tty->print("%c%d ", Compile::current()->node_arena()->contains(u) ? ' ' : 'o', u->_idx);
+ st->print("%c%d ", Compile::current()->node_arena()->contains(u) ? ' ' : 'o', u->_idx);
}
}
- tty->print("]] ");
+ st->print("]] ");
}
//------------------------------dump_nodes-------------------------------------
--- a/hotspot/src/share/vm/opto/node.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/node.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -994,12 +994,13 @@
#ifndef PRODUCT
Node* find(int idx) const; // Search the graph for the given idx.
Node* find_ctrl(int idx) const; // Search control ancestors for the given idx.
- void dump() const; // Print this node,
+ void dump() const { dump("\n"); } // Print this node.
+ void dump(const char* suffix, outputStream *st = tty) const;// Print this node.
void dump(int depth) const; // Print this node, recursively to depth d
void dump_ctrl(int depth) const; // Print control nodes, to depth d
- virtual void dump_req() const; // Print required-edge info
- virtual void dump_prec() const; // Print precedence-edge info
- virtual void dump_out() const; // Print the output edge info
+ virtual void dump_req(outputStream *st = tty) const; // Print required-edge info
+ virtual void dump_prec(outputStream *st = tty) const; // Print precedence-edge info
+ virtual void dump_out(outputStream *st = tty) const; // Print the output edge info
virtual void dump_spec(outputStream *st) const {}; // Print per-node info
void verify_edges(Unique_Node_List &visited); // Verify bi-directional edges
void verify() const; // Check Def-Use info for my subgraph
--- a/hotspot/src/share/vm/opto/optoreg.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/optoreg.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -77,7 +77,7 @@
// (We would like to have an operator+ for RegName, but it is not
// a class, so this would be illegal in C++.)
- static void dump( int );
+ static void dump(int, outputStream *st = tty);
// Get the stack slot number of an OptoReg::Name
static unsigned int reg2stack( OptoReg::Name r) {
--- a/hotspot/src/share/vm/opto/parse.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/parse.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -70,7 +70,7 @@
InlineTree *build_inline_tree_for_callee(ciMethod* callee_method,
JVMState* caller_jvms,
int caller_bci);
- const char* try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result);
+ const char* try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result, bool& should_delay);
const char* should_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) const;
const char* should_not_inline(ciMethod* callee_method, ciMethod* caller_method, WarmCallInfo* wci_result) const;
void print_inlining(ciMethod *callee_method, int caller_bci, const char *failure_msg) const;
@@ -107,7 +107,7 @@
// and may be accessed by find_subtree_from_root.
// The call_method is the dest_method for a special or static invocation.
// The call_method is an optimized virtual method candidate otherwise.
- WarmCallInfo* ok_to_inline(ciMethod *call_method, JVMState* caller_jvms, ciCallProfile& profile, WarmCallInfo* wci);
+ WarmCallInfo* ok_to_inline(ciMethod *call_method, JVMState* caller_jvms, ciCallProfile& profile, WarmCallInfo* wci, bool& should_delay);
// Information about inlined method
JVMState* caller_jvms() const { return _caller_jvms; }
@@ -469,10 +469,6 @@
// Helper function to uncommon-trap or bailout for non-compilable call-sites
bool can_not_compile_call_site(ciMethod *dest_method, ciInstanceKlass *klass);
- // Helper function to identify inlining potential at call-site
- ciMethod* optimize_inlining(ciMethod* caller, int bci, ciInstanceKlass* klass,
- ciMethod *dest_method, const TypeOopPtr* receiver_type);
-
// Helper function to setup for type-profile based inlining
bool prepare_type_profile_inline(ciInstanceKlass* prof_klass, ciMethod* prof_method);
--- a/hotspot/src/share/vm/opto/parse1.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/parse1.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1404,7 +1404,8 @@
do_one_bytecode();
- assert(!have_se || stopped() || failing() || (sp() - pre_bc_sp) == depth, "correct depth prediction");
+ assert(!have_se || stopped() || failing() || (sp() - pre_bc_sp) == depth,
+ err_msg_res("incorrect depth prediction: sp=%d, pre_bc_sp=%d, depth=%d", sp(), pre_bc_sp, depth));
do_exceptions();
--- a/hotspot/src/share/vm/opto/phaseX.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/phaseX.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -75,6 +75,13 @@
// nh->_sentinel must be in the current node space
}
+void NodeHash::replace_with(NodeHash *nh) {
+ debug_only(_table = (Node**)badAddress); // interact correctly w/ operator=
+ // just copy in all the fields
+ *this = *nh;
+ // nh->_sentinel must be in the current node space
+}
+
//------------------------------hash_find--------------------------------------
// Find in hash table
Node *NodeHash::hash_find( const Node *n ) {
--- a/hotspot/src/share/vm/opto/phaseX.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/phaseX.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -92,6 +92,7 @@
}
void remove_useless_nodes(VectorSet &useful); // replace with sentinel
+ void replace_with(NodeHash* nh);
Node *sentinel() { return _sentinel; }
@@ -386,6 +387,11 @@
Node *transform( Node *n );
Node *transform_no_reclaim( Node *n );
+ void replace_with(PhaseGVN* gvn) {
+ _table.replace_with(&gvn->_table);
+ _types = gvn->_types;
+ }
+
// Check for a simple dead loop when a data node references itself.
DEBUG_ONLY(void dead_loop_check(Node *n);)
};
--- a/hotspot/src/share/vm/opto/regalloc.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/regalloc.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -40,6 +40,7 @@
Phase(Register_Allocation), _cfg(cfg), _matcher(matcher),
_node_oops(Thread::current()->resource_area()),
_node_regs(0),
+ _node_regs_max_index(0),
_framesize(0xdeadbeef)
{
int i;
--- a/hotspot/src/share/vm/opto/regmask.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/regmask.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -108,13 +108,13 @@
//------------------------------dump-------------------------------------------
#ifndef PRODUCT
-void OptoReg::dump( int r ) {
- switch( r ) {
- case Special: tty->print("r---"); break;
- case Bad: tty->print("rBAD"); break;
+void OptoReg::dump(int r, outputStream *st) {
+ switch (r) {
+ case Special: st->print("r---"); break;
+ case Bad: st->print("rBAD"); break;
default:
- if( r < _last_Mach_Reg ) tty->print(Matcher::regName[r]);
- else tty->print("rS%d",r);
+ if (r < _last_Mach_Reg) st->print(Matcher::regName[r]);
+ else st->print("rS%d",r);
break;
}
}
@@ -404,53 +404,53 @@
#ifndef PRODUCT
//------------------------------print------------------------------------------
-void RegMask::dump( ) const {
- tty->print("[");
+void RegMask::dump(outputStream *st) const {
+ st->print("[");
RegMask rm = *this; // Structure copy into local temp
OptoReg::Name start = rm.find_first_elem(); // Get a register
- if( OptoReg::is_valid(start) ) { // Check for empty mask
+ if (OptoReg::is_valid(start)) { // Check for empty mask
rm.Remove(start); // Yank from mask
- OptoReg::dump(start); // Print register
+ OptoReg::dump(start, st); // Print register
OptoReg::Name last = start;
// Now I have printed an initial register.
// Print adjacent registers as "rX-rZ" instead of "rX,rY,rZ".
// Begin looping over the remaining registers.
- while( 1 ) { //
+ while (1) { //
OptoReg::Name reg = rm.find_first_elem(); // Get a register
- if( !OptoReg::is_valid(reg) )
+ if (!OptoReg::is_valid(reg))
break; // Empty mask, end loop
rm.Remove(reg); // Yank from mask
- if( last+1 == reg ) { // See if they are adjacent
+ if (last+1 == reg) { // See if they are adjacent
// Adjacent registers just collect into long runs, no printing.
last = reg;
} else { // Ending some kind of run
- if( start == last ) { // 1-register run; no special printing
- } else if( start+1 == last ) {
- tty->print(","); // 2-register run; print as "rX,rY"
- OptoReg::dump(last);
+ if (start == last) { // 1-register run; no special printing
+ } else if (start+1 == last) {
+ st->print(","); // 2-register run; print as "rX,rY"
+ OptoReg::dump(last, st);
} else { // Multi-register run; print as "rX-rZ"
- tty->print("-");
- OptoReg::dump(last);
+ st->print("-");
+ OptoReg::dump(last, st);
}
- tty->print(","); // Seperate start of new run
+ st->print(","); // Seperate start of new run
start = last = reg; // Start a new register run
- OptoReg::dump(start); // Print register
+ OptoReg::dump(start, st); // Print register
} // End of if ending a register run or not
} // End of while regmask not empty
- if( start == last ) { // 1-register run; no special printing
- } else if( start+1 == last ) {
- tty->print(","); // 2-register run; print as "rX,rY"
- OptoReg::dump(last);
+ if (start == last) { // 1-register run; no special printing
+ } else if (start+1 == last) {
+ st->print(","); // 2-register run; print as "rX,rY"
+ OptoReg::dump(last, st);
} else { // Multi-register run; print as "rX-rZ"
- tty->print("-");
- OptoReg::dump(last);
+ st->print("-");
+ OptoReg::dump(last, st);
}
- if( rm.is_AllStack() ) tty->print("...");
+ if (rm.is_AllStack()) st->print("...");
}
- tty->print("]");
+ st->print("]");
}
#endif
--- a/hotspot/src/share/vm/opto/regmask.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/regmask.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -310,7 +310,7 @@
#ifndef PRODUCT
void print() const { dump(); }
- void dump() const; // Print a mask
+ void dump(outputStream *st = tty) const; // Print a mask
#endif
static const RegMask Empty; // Common empty mask
--- a/hotspot/src/share/vm/opto/stringopts.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/stringopts.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -265,7 +265,8 @@
} else if (n->is_IfTrue()) {
Compile* C = _stringopts->C;
C->gvn_replace_by(n, n->in(0)->in(0));
- C->gvn_replace_by(n->in(0), C->top());
+ // get rid of the other projection
+ C->gvn_replace_by(n->in(0)->as_If()->proj_out(false), C->top());
}
}
}
@@ -439,7 +440,7 @@
}
// Find the constructor call
Node* result = alloc->result_cast();
- if (result == NULL || !result->is_CheckCastPP()) {
+ if (result == NULL || !result->is_CheckCastPP() || alloc->in(TypeFunc::Memory)->is_top()) {
// strange looking allocation
#ifndef PRODUCT
if (PrintOptimizeStringConcat) {
@@ -834,6 +835,9 @@
ptr->in(1)->in(0) != NULL && ptr->in(1)->in(0)->is_If()) {
// Simple diamond.
// XXX should check for possibly merging stores. simple data merges are ok.
+ // The IGVN will make this simple diamond go away when it
+ // transforms the Region. Make sure it sees it.
+ Compile::current()->record_for_igvn(ptr);
ptr = ptr->in(1)->in(0)->in(0);
continue;
}
--- a/hotspot/src/share/vm/opto/type.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/opto/type.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1542,10 +1542,10 @@
static const char* longnamenear(jlong x, const char* xname, char* buf, jlong n) {
if (n > x) {
if (n >= x + 10000) return NULL;
- sprintf(buf, "%s+" INT64_FORMAT, xname, n - x);
+ sprintf(buf, "%s+" JLONG_FORMAT, xname, n - x);
} else if (n < x) {
if (n <= x - 10000) return NULL;
- sprintf(buf, "%s-" INT64_FORMAT, xname, x - n);
+ sprintf(buf, "%s-" JLONG_FORMAT, xname, x - n);
} else {
return xname;
}
@@ -1557,11 +1557,11 @@
if (n == min_jlong)
return "min";
else if (n < min_jlong + 10000)
- sprintf(buf, "min+" INT64_FORMAT, n - min_jlong);
+ sprintf(buf, "min+" JLONG_FORMAT, n - min_jlong);
else if (n == max_jlong)
return "max";
else if (n > max_jlong - 10000)
- sprintf(buf, "max-" INT64_FORMAT, max_jlong - n);
+ sprintf(buf, "max-" JLONG_FORMAT, max_jlong - n);
else if ((str = longnamenear(max_juint, "maxuint", buf, n)) != NULL)
return str;
else if ((str = longnamenear(max_jint, "maxint", buf, n)) != NULL)
@@ -1569,7 +1569,7 @@
else if ((str = longnamenear(min_jint, "minint", buf, n)) != NULL)
return str;
else
- sprintf(buf, INT64_FORMAT, n);
+ sprintf(buf, JLONG_FORMAT, n);
return buf;
}
--- a/hotspot/src/share/vm/prims/jvm.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/prims/jvm.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -484,15 +484,6 @@
JVM_END
-JVM_ENTRY(void, JVM_PrintStackTrace(JNIEnv *env, jobject receiver, jobject printable))
- JVMWrapper("JVM_PrintStackTrace");
- // Note: This is no longer used in Merlin, but we still support it for compatibility.
- oop exception = JNIHandles::resolve_non_null(receiver);
- oop stream = JNIHandles::resolve_non_null(printable);
- java_lang_Throwable::print_stack_trace(exception, stream);
-JVM_END
-
-
JVM_ENTRY(jint, JVM_GetStackTraceDepth(JNIEnv *env, jobject throwable))
JVMWrapper("JVM_GetStackTraceDepth");
oop exception = JNIHandles::resolve(throwable);
@@ -1515,7 +1506,7 @@
JVM_END
-static Method* jvm_get_method_common(jobject method, TRAPS) {
+static Method* jvm_get_method_common(jobject method) {
// some of this code was adapted from from jni_FromReflectedMethod
oop reflected = JNIHandles::resolve_non_null(method);
@@ -1533,8 +1524,7 @@
}
Klass* k = java_lang_Class::as_Klass(mirror);
- KlassHandle kh(THREAD, k);
- Method* m = InstanceKlass::cast(kh())->method_with_idnum(slot);
+ Method* m = InstanceKlass::cast(k)->method_with_idnum(slot);
if (m == NULL) {
assert(false, "cannot find method");
return NULL; // robustness
@@ -1548,7 +1538,7 @@
JVMWrapper("JVM_GetMethodAnnotations");
// method is a handle to a java.lang.reflect.Method object
- Method* m = jvm_get_method_common(method, CHECK_NULL);
+ Method* m = jvm_get_method_common(method);
return (jbyteArray) JNIHandles::make_local(env,
Annotations::make_java_array(m->annotations(), THREAD));
JVM_END
@@ -1558,7 +1548,7 @@
JVMWrapper("JVM_GetMethodDefaultAnnotationValue");
// method is a handle to a java.lang.reflect.Method object
- Method* m = jvm_get_method_common(method, CHECK_NULL);
+ Method* m = jvm_get_method_common(method);
return (jbyteArray) JNIHandles::make_local(env,
Annotations::make_java_array(m->annotation_default(), THREAD));
JVM_END
@@ -1568,11 +1558,79 @@
JVMWrapper("JVM_GetMethodParameterAnnotations");
// method is a handle to a java.lang.reflect.Method object
- Method* m = jvm_get_method_common(method, CHECK_NULL);
+ Method* m = jvm_get_method_common(method);
return (jbyteArray) JNIHandles::make_local(env,
Annotations::make_java_array(m->parameter_annotations(), THREAD));
JVM_END
+/* Type use annotations support (JDK 1.8) */
+
+JVM_ENTRY(jbyteArray, JVM_GetClassTypeAnnotations(JNIEnv *env, jclass cls))
+ assert (cls != NULL, "illegal class");
+ JVMWrapper("JVM_GetClassTypeAnnotations");
+ ResourceMark rm(THREAD);
+ // Return null for arrays and primitives
+ if (!java_lang_Class::is_primitive(JNIHandles::resolve(cls))) {
+ Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve(cls));
+ if (k->oop_is_instance()) {
+ Annotations* type_annotations = InstanceKlass::cast(k)->type_annotations();
+ if (type_annotations != NULL) {
+ typeArrayOop a = Annotations::make_java_array(type_annotations->class_annotations(), CHECK_NULL);
+ return (jbyteArray) JNIHandles::make_local(env, a);
+ }
+ }
+ }
+ return NULL;
+JVM_END
+
+static void bounds_check(constantPoolHandle cp, jint index, TRAPS) {
+ if (!cp->is_within_bounds(index)) {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "Constant pool index out of bounds");
+ }
+}
+
+JVM_ENTRY(jobjectArray, JVM_GetMethodParameters(JNIEnv *env, jobject method))
+{
+ JVMWrapper("JVM_GetMethodParameters");
+ // method is a handle to a java.lang.reflect.Method object
+ Method* method_ptr = jvm_get_method_common(method);
+ methodHandle mh (THREAD, method_ptr);
+ Handle reflected_method (THREAD, JNIHandles::resolve_non_null(method));
+ const int num_params = mh->method_parameters_length();
+
+ if (0 != num_params) {
+ // make sure all the symbols are properly formatted
+ for (int i = 0; i < num_params; i++) {
+ MethodParametersElement* params = mh->method_parameters_start();
+ int index = params[i].name_cp_index;
+ bounds_check(mh->constants(), index, CHECK_NULL);
+
+ if (0 != index && !mh->constants()->tag_at(index).is_utf8()) {
+ THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
+ "Wrong type at constant pool index");
+ }
+
+ }
+
+ objArrayOop result_oop = oopFactory::new_objArray(SystemDictionary::reflect_Parameter_klass(), num_params, CHECK_NULL);
+ objArrayHandle result (THREAD, result_oop);
+
+ for (int i = 0; i < num_params; i++) {
+ MethodParametersElement* params = mh->method_parameters_start();
+ // For a 0 index, give a NULL symbol
+ Symbol* const sym = 0 != params[i].name_cp_index ?
+ mh->constants()->symbol_at(params[i].name_cp_index) : NULL;
+ int flags = build_int_from_shorts(params[i].flags_lo, params[i].flags_hi);
+ oop param = Reflection::new_parameter(reflected_method, i, sym,
+ flags, CHECK_NULL);
+ result->obj_at_put(i, param);
+ }
+ return (jobjectArray)JNIHandles::make_local(env, result());
+ } else {
+ return (jobjectArray)NULL;
+ }
+}
+JVM_END
// New (JDK 1.4) reflection implementation /////////////////////////////////////
@@ -1788,13 +1846,6 @@
JVM_END
-static void bounds_check(constantPoolHandle cp, jint index, TRAPS) {
- if (!cp->is_within_bounds(index)) {
- THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "Constant pool index out of bounds");
- }
-}
-
-
JVM_ENTRY(jclass, JVM_ConstantPoolGetClassAt(JNIEnv *env, jobject obj, jobject unused, jint index))
{
JVMWrapper("JVM_ConstantPoolGetClassAt");
@@ -1809,7 +1860,6 @@
}
JVM_END
-
JVM_ENTRY(jclass, JVM_ConstantPoolGetClassAtIfLoaded(JNIEnv *env, jobject obj, jobject unused, jint index))
{
JVMWrapper("JVM_ConstantPoolGetClassAtIfLoaded");
--- a/hotspot/src/share/vm/prims/jvm.h Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/prims/jvm.h Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -86,6 +86,8 @@
#define JVM_INTERFACE_VERSION 4
+JNIEXPORT jobjectArray JNICALL
+JVM_GetMethodParameters(JNIEnv *env, jobject method);
JNIEXPORT jint JNICALL
JVM_GetInterfaceVersion(void);
@@ -210,9 +212,6 @@
JNIEXPORT void JNICALL
JVM_FillInStackTrace(JNIEnv *env, jobject throwable);
-JNIEXPORT void JNICALL
-JVM_PrintStackTrace(JNIEnv *env, jobject throwable, jobject printable);
-
JNIEXPORT jint JNICALL
JVM_GetStackTraceDepth(JNIEnv *env, jobject throwable);
@@ -519,6 +518,10 @@
JNIEXPORT jbyteArray JNICALL
JVM_GetMethodParameterAnnotations(JNIEnv *env, jobject method);
+/* Type use annotations support (JDK 1.8) */
+
+JNIEXPORT jbyteArray JNICALL
+JVM_GetClassTypeAnnotations(JNIEnv *env, jclass cls);
/*
* New (JDK 1.4) reflection implementation
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1305,15 +1305,21 @@
vframeStream st(thread);
assert(!st.at_end(), "cannot be at end");
Method* current_method = NULL;
+ // A GC may occur during the Method::fast_exception_handler_bci_for()
+ // call below if it needs to load the constraint class. Using a
+ // methodHandle to keep the 'current_method' from being deallocated
+ // if GC happens.
+ methodHandle current_mh = methodHandle(thread, current_method);
int current_bci = -1;
do {
current_method = st.method();
+ current_mh = methodHandle(thread, current_method);
current_bci = st.bci();
do {
should_repeat = false;
KlassHandle eh_klass(thread, exception_handle()->klass());
- current_bci = current_method->fast_exception_handler_bci_for(
- eh_klass, current_bci, THREAD);
+ current_bci = Method::fast_exception_handler_bci_for(
+ current_mh, eh_klass, current_bci, THREAD);
if (HAS_PENDING_EXCEPTION) {
exception_handle = Handle(thread, PENDING_EXCEPTION);
CLEAR_PENDING_EXCEPTION;
@@ -1328,8 +1334,7 @@
catch_jmethodID = 0;
current_bci = 0;
} else {
- catch_jmethodID = jem.to_jmethodID(
- methodHandle(thread, current_method));
+ catch_jmethodID = jem.to_jmethodID(current_mh);
}
JvmtiJavaThreadEventTransition jet(thread);
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1043,7 +1043,7 @@
Rewriter::rewrite(scratch_class, THREAD);
if (!HAS_PENDING_EXCEPTION) {
- Rewriter::relocate_and_link(scratch_class, THREAD);
+ scratch_class->link_methods(THREAD);
}
if (HAS_PENDING_EXCEPTION) {
Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
@@ -1334,20 +1334,8 @@
return JVMTI_ERROR_INTERNAL;
}
- int orig_length = old_cp->orig_length();
- if (orig_length == 0) {
- // This old_cp is an actual original constant pool. We save
- // the original length in the merged constant pool so that
- // merge_constant_pools() can be more efficient. If a constant
- // pool has a non-zero orig_length() value, then that constant
- // pool was created by a merge operation in RedefineClasses.
- merge_cp->set_orig_length(old_cp->length());
- } else {
- // This old_cp is a merged constant pool from a previous
- // RedefineClasses() calls so just copy the orig_length()
- // value.
- merge_cp->set_orig_length(old_cp->orig_length());
- }
+ // Update the version number of the constant pool
+ merge_cp->increment_and_save_version(old_cp->version());
ResourceMark rm(THREAD);
_index_map_count = 0;
@@ -2417,18 +2405,19 @@
int scratch_cp_length, TRAPS) {
assert(scratch_cp->length() >= scratch_cp_length, "sanity check");
- // scratch_cp is a merged constant pool and has enough space for a
- // worst case merge situation. We want to associate the minimum
- // sized constant pool with the klass to save space.
- constantPoolHandle smaller_cp(THREAD,
- ConstantPool::allocate(loader_data, scratch_cp_length,
- THREAD));
- // preserve orig_length() value in the smaller copy
- int orig_length = scratch_cp->orig_length();
- assert(orig_length != 0, "sanity check");
- smaller_cp->set_orig_length(orig_length);
- scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
- scratch_cp = smaller_cp;
+ // scratch_cp is a merged constant pool and has enough space for a
+ // worst case merge situation. We want to associate the minimum
+ // sized constant pool with the klass to save space.
+ constantPoolHandle smaller_cp(THREAD,
+ ConstantPool::allocate(loader_data, scratch_cp_length, THREAD));
+
+ // preserve version() value in the smaller copy
+ int version = scratch_cp->version();
+ assert(version != 0, "sanity check");
+ smaller_cp->set_version(version);
+
+ scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
+ scratch_cp = smaller_cp;
// attach new constant pool to klass
scratch_cp->set_pool_holder(scratch_class());
@@ -3338,7 +3327,20 @@
the_class->set_access_flags(flags);
}
- // Replace annotation fields value
+ // Since there is currently no rewriting of type annotations indexes
+ // into the CP, we null out type annotations on scratch_class before
+ // we swap annotations with the_class rather than facing the
+ // possibility of shipping annotations with broken indexes to
+ // Java-land.
+ Annotations* new_annotations = scratch_class->annotations();
+ if (new_annotations != NULL) {
+ Annotations* new_type_annotations = new_annotations->type_annotations();
+ if (new_type_annotations != NULL) {
+ MetadataFactory::free_metadata(scratch_class->class_loader_data(), new_type_annotations);
+ new_annotations->set_type_annotations(NULL);
+ }
+ }
+ // Swap annotation fields values
Annotations* old_annotations = the_class->annotations();
the_class->set_annotations(scratch_class->annotations());
scratch_class->set_annotations(old_annotations);
--- a/hotspot/src/share/vm/runtime/aprofiler.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/aprofiler.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -129,7 +129,7 @@
assert(!is_active(), "AllocationProfiler cannot be active while printing profile");
tty->cr();
- tty->print_cr("Allocation profile (sizes in bytes, cutoff = %ld bytes):", cutoff * BytesPerWord);
+ tty->print_cr("Allocation profile (sizes in bytes, cutoff = " SIZE_FORMAT " bytes):", cutoff * BytesPerWord);
tty->cr();
// Print regular instance klasses and basic type array klasses
--- a/hotspot/src/share/vm/runtime/arguments.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -532,7 +532,7 @@
// Parses a memory size specification string.
static bool atomull(const char *s, julong* result) {
julong n = 0;
- int args_read = sscanf(s, os::julong_format_specifier(), &n);
+ int args_read = sscanf(s, JULONG_FORMAT, &n);
if (args_read != 1) {
return false;
}
@@ -1083,10 +1083,6 @@
}
}
-// If the user has chosen ParallelGCThreads > 0, we set UseParNewGC
-// if it's not explictly set or unset. If the user has chosen
-// UseParNewGC and not explicitly set ParallelGCThreads we
-// set it, unless this is a single cpu machine.
void Arguments::set_parnew_gc_flags() {
assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC && !UseG1GC,
"control point invariant");
@@ -1095,42 +1091,41 @@
// Turn off AdaptiveSizePolicy for parnew until it is complete.
disable_adaptive_size_policy("UseParNewGC");
- if (ParallelGCThreads == 0) {
- FLAG_SET_DEFAULT(ParallelGCThreads,
- Abstract_VM_Version::parallel_worker_threads());
- if (ParallelGCThreads == 1) {
- FLAG_SET_DEFAULT(UseParNewGC, false);
- FLAG_SET_DEFAULT(ParallelGCThreads, 0);
- }
+ if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
+ FLAG_SET_DEFAULT(ParallelGCThreads, Abstract_VM_Version::parallel_worker_threads());
+ assert(ParallelGCThreads > 0, "We should always have at least one thread by default");
+ } else if (ParallelGCThreads == 0) {
+ jio_fprintf(defaultStream::error_stream(),
+ "The ParNew GC can not be combined with -XX:ParallelGCThreads=0\n");
+ vm_exit(1);
+ }
+
+ // By default YoungPLABSize and OldPLABSize are set to 4096 and 1024 respectively,
+ // these settings are default for Parallel Scavenger. For ParNew+Tenured configuration
+ // we set them to 1024 and 1024.
+ // See CR 6362902.
+ if (FLAG_IS_DEFAULT(YoungPLABSize)) {
+ FLAG_SET_DEFAULT(YoungPLABSize, (intx)1024);
}
- if (UseParNewGC) {
- // By default YoungPLABSize and OldPLABSize are set to 4096 and 1024 respectively,
- // these settings are default for Parallel Scavenger. For ParNew+Tenured configuration
- // we set them to 1024 and 1024.
- // See CR 6362902.
- if (FLAG_IS_DEFAULT(YoungPLABSize)) {
- FLAG_SET_DEFAULT(YoungPLABSize, (intx)1024);
+ if (FLAG_IS_DEFAULT(OldPLABSize)) {
+ FLAG_SET_DEFAULT(OldPLABSize, (intx)1024);
+ }
+
+ // AlwaysTenure flag should make ParNew promote all at first collection.
+ // See CR 6362902.
+ if (AlwaysTenure) {
+ FLAG_SET_CMDLINE(uintx, MaxTenuringThreshold, 0);
+ }
+ // When using compressed oops, we use local overflow stacks,
+ // rather than using a global overflow list chained through
+ // the klass word of the object's pre-image.
+ if (UseCompressedOops && !ParGCUseLocalOverflow) {
+ if (!FLAG_IS_DEFAULT(ParGCUseLocalOverflow)) {
+ warning("Forcing +ParGCUseLocalOverflow: needed if using compressed references");
}
- if (FLAG_IS_DEFAULT(OldPLABSize)) {
- FLAG_SET_DEFAULT(OldPLABSize, (intx)1024);
- }
-
- // AlwaysTenure flag should make ParNew promote all at first collection.
- // See CR 6362902.
- if (AlwaysTenure) {
- FLAG_SET_CMDLINE(uintx, MaxTenuringThreshold, 0);
- }
- // When using compressed oops, we use local overflow stacks,
- // rather than using a global overflow list chained through
- // the klass word of the object's pre-image.
- if (UseCompressedOops && !ParGCUseLocalOverflow) {
- if (!FLAG_IS_DEFAULT(ParGCUseLocalOverflow)) {
- warning("Forcing +ParGCUseLocalOverflow: needed if using compressed references");
- }
- FLAG_SET_DEFAULT(ParGCUseLocalOverflow, true);
- }
- assert(ParGCUseLocalOverflow || !UseCompressedOops, "Error");
+ FLAG_SET_DEFAULT(ParGCUseLocalOverflow, true);
}
+ assert(ParGCUseLocalOverflow || !UseCompressedOops, "Error");
}
// Adjust some sizes to suit CMS and/or ParNew needs; these work well on
@@ -1331,14 +1326,14 @@
// then a saved space from compressed oops.
if ((int)ObjectAlignmentInBytes > 256) {
jio_fprintf(defaultStream::error_stream(),
- "error: ObjectAlignmentInBytes=%d must not be greater then 256\n",
+ "error: ObjectAlignmentInBytes=%d must not be greater than 256\n",
(int)ObjectAlignmentInBytes);
return false;
}
// In case page size is very small.
if ((int)ObjectAlignmentInBytes >= os::vm_page_size()) {
jio_fprintf(defaultStream::error_stream(),
- "error: ObjectAlignmentInBytes=%d must be less then page size %d\n",
+ "error: ObjectAlignmentInBytes=%d must be less than page size %d\n",
(int)ObjectAlignmentInBytes, os::vm_page_size());
return false;
}
@@ -1459,30 +1454,34 @@
// If no heap maximum was requested explicitly, use some reasonable fraction
// of the physical memory, up to a maximum of 1GB.
- if (UseParallelGC) {
- FLAG_SET_DEFAULT(ParallelGCThreads,
- Abstract_VM_Version::parallel_worker_threads());
-
- // If InitialSurvivorRatio or MinSurvivorRatio were not specified, but the
- // SurvivorRatio has been set, reset their default values to SurvivorRatio +
- // 2. By doing this we make SurvivorRatio also work for Parallel Scavenger.
- // See CR 6362902 for details.
- if (!FLAG_IS_DEFAULT(SurvivorRatio)) {
- if (FLAG_IS_DEFAULT(InitialSurvivorRatio)) {
- FLAG_SET_DEFAULT(InitialSurvivorRatio, SurvivorRatio + 2);
- }
- if (FLAG_IS_DEFAULT(MinSurvivorRatio)) {
- FLAG_SET_DEFAULT(MinSurvivorRatio, SurvivorRatio + 2);
- }
+ FLAG_SET_DEFAULT(ParallelGCThreads,
+ Abstract_VM_Version::parallel_worker_threads());
+ if (ParallelGCThreads == 0) {
+ jio_fprintf(defaultStream::error_stream(),
+ "The Parallel GC can not be combined with -XX:ParallelGCThreads=0\n");
+ vm_exit(1);
+ }
+
+
+ // If InitialSurvivorRatio or MinSurvivorRatio were not specified, but the
+ // SurvivorRatio has been set, reset their default values to SurvivorRatio +
+ // 2. By doing this we make SurvivorRatio also work for Parallel Scavenger.
+ // See CR 6362902 for details.
+ if (!FLAG_IS_DEFAULT(SurvivorRatio)) {
+ if (FLAG_IS_DEFAULT(InitialSurvivorRatio)) {
+ FLAG_SET_DEFAULT(InitialSurvivorRatio, SurvivorRatio + 2);
}
-
- if (UseParallelOldGC) {
- // Par compact uses lower default values since they are treated as
- // minimums. These are different defaults because of the different
- // interpretation and are not ergonomically set.
- if (FLAG_IS_DEFAULT(MarkSweepDeadRatio)) {
- FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1);
- }
+ if (FLAG_IS_DEFAULT(MinSurvivorRatio)) {
+ FLAG_SET_DEFAULT(MinSurvivorRatio, SurvivorRatio + 2);
+ }
+ }
+
+ if (UseParallelOldGC) {
+ // Par compact uses lower default values since they are treated as
+ // minimums. These are different defaults because of the different
+ // interpretation and are not ergonomically set.
+ if (FLAG_IS_DEFAULT(MarkSweepDeadRatio)) {
+ FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1);
}
}
}
@@ -1783,6 +1782,24 @@
return status;
}
+void Arguments::check_deprecated_gcs() {
+ if (UseConcMarkSweepGC && !UseParNewGC) {
+ warning("Using the DefNew young collector with the CMS collector is deprecated "
+ "and will likely be removed in a future release");
+ }
+
+ if (UseParNewGC && !UseConcMarkSweepGC) {
+ // !UseConcMarkSweepGC means that we are using serial old gc. Unfortunately we don't
+ // set up UseSerialGC properly, so that can't be used in the check here.
+ warning("Using the ParNew young collector with the Serial old collector is deprecated "
+ "and will likely be removed in a future release");
+ }
+
+ if (CMSIncrementalMode) {
+ warning("Using incremental CMS is deprecated and will likely be removed in a future release");
+ }
+}
+
// Check stack pages settings
bool Arguments::check_stack_pages()
{
@@ -2997,11 +3014,6 @@
FLAG_SET_DEFAULT(UseLargePages, false);
}
- // Add 2M to any size for SharedReadOnlySize to get around the JPRT setting
- if (DumpSharedSpaces && !FLAG_IS_DEFAULT(SharedReadOnlySize)) {
- SharedReadOnlySize = 14*M;
- }
-
if (DumpSharedSpaces) {
if (RequireSharedSpaces) {
warning("cannot dump shared archive while using shared archive");
@@ -3038,7 +3050,6 @@
strcpy(shared_archive_path, jvm_path);
strcat(shared_archive_path, os::file_separator());
strcat(shared_archive_path, "classes");
- DEBUG_ONLY(strcat(shared_archive_path, "_g");)
strcat(shared_archive_path, ".jsa");
SharedArchivePath = shared_archive_path;
@@ -3247,6 +3258,7 @@
} else if (UseG1GC) {
set_g1_gc_flags();
}
+ check_deprecated_gcs();
#endif // INCLUDE_ALTERNATE_GCS
#ifdef SERIALGC
@@ -3291,6 +3303,18 @@
if (!EliminateLocks) {
EliminateNestedLocks = false;
}
+ if (!Inline) {
+ IncrementalInline = false;
+ }
+#ifndef PRODUCT
+ if (!IncrementalInline) {
+ AlwaysIncrementalInline = false;
+ }
+#endif
+ if (IncrementalInline && FLAG_IS_DEFAULT(MaxNodeLimit)) {
+ // incremental inlining: bump MaxNodeLimit
+ FLAG_SET_DEFAULT(MaxNodeLimit, (intx)75000);
+ }
#endif
if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
--- a/hotspot/src/share/vm/runtime/arguments.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/arguments.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -413,6 +413,7 @@
static jint adjust_after_os();
// Check for consistency in the selection of the garbage collector.
static bool check_gc_consistency();
+ static void check_deprecated_gcs();
// Check consistecy or otherwise of VM argument settings
static bool check_vm_args_consistency();
// Check stack pages settings
--- a/hotspot/src/share/vm/runtime/fieldDescriptor.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/fieldDescriptor.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -65,6 +65,17 @@
return md->at(index());
}
+AnnotationArray* fieldDescriptor::type_annotations() const {
+ InstanceKlass* ik = field_holder();
+ Annotations* type_annos = ik->type_annotations();
+ if (type_annos == NULL)
+ return NULL;
+ Array<AnnotationArray*>* md = type_annos->fields_annotations();
+ if (md == NULL)
+ return NULL;
+ return md->at(index());
+}
+
constantTag fieldDescriptor::initial_value_tag() const {
return constants()->tag_at(initial_value_index());
}
--- a/hotspot/src/share/vm/runtime/fieldDescriptor.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/fieldDescriptor.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -68,6 +68,7 @@
Symbol* generic_signature() const;
int index() const { return _index; }
AnnotationArray* annotations() const;
+ AnnotationArray* type_annotations() const;
// Initial field value
bool has_initial_value() const { return field()->initval_index() != 0; }
--- a/hotspot/src/share/vm/runtime/globals.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/globals.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -929,11 +929,14 @@
"Starts debugger when an implicit OS (e.g., NULL) " \
"exception happens") \
\
- notproduct(bool, PrintCodeCache, false, \
- "Print the compiled_code cache when exiting") \
+ product(bool, PrintCodeCache, false, \
+ "Print the code cache memory usage when exiting") \
\
develop(bool, PrintCodeCache2, false, \
- "Print detailed info on the compiled_code cache when exiting") \
+ "Print detailed usage info on the code cache when exiting") \
+ \
+ product(bool, PrintCodeCacheOnCompilation, false, \
+ "Print the code cache memory usage each time a method is compiled") \
\
diagnostic(bool, PrintStubCode, false, \
"Print generated stub code") \
@@ -969,18 +972,6 @@
notproduct(uintx, WarnOnStalledSpinLock, 0, \
"Prints warnings for stalled SpinLocks") \
\
- develop(bool, InitializeJavaLangSystem, true, \
- "Initialize java.lang.System - turn off for individual " \
- "method debugging") \
- \
- develop(bool, InitializeJavaLangString, true, \
- "Initialize java.lang.String - turn off for individual " \
- "method debugging") \
- \
- develop(bool, InitializeJavaLangExceptionsErrors, true, \
- "Initialize various error and exception classes - turn off for " \
- "individual method debugging") \
- \
product(bool, RegisterFinalizersAtInit, true, \
"Register finalizable objects at end of Object.<init> or " \
"after allocation") \
@@ -1075,7 +1066,7 @@
\
product(intx, ClearFPUAtPark, 0, "(Unsafe,Unstable)" ) \
\
- product(intx, hashCode, 0, \
+ product(intx, hashCode, 5, \
"(Unstable) select hashCode generation algorithm" ) \
\
product(intx, WorkAroundNPTLTimedWaitHang, 1, \
@@ -1101,13 +1092,6 @@
product(bool, ReduceSignalUsage, false, \
"Reduce the use of OS signals in Java and/or the VM") \
\
- notproduct(bool, ValidateMarkSweep, false, \
- "Do extra validation during MarkSweep collection") \
- \
- notproduct(bool, RecordMarkSweepCompaction, false, \
- "Enable GC-to-GC recording and querying of compaction during " \
- "MarkSweep") \
- \
develop_pd(bool, ShareVtableStubs, \
"Share vtable stubs (smaller code but worse branch prediction") \
\
@@ -1173,6 +1157,18 @@
notproduct(bool, PrintCompactFieldsSavings, false, \
"Print how many words were saved with CompactFields") \
\
+ notproduct(bool, PrintFieldLayout, false, \
+ "Print field layout for each class") \
+ \
+ product(intx, ContendedPaddingWidth, 128, \
+ "How many bytes to pad the fields/classes marked @Contended with")\
+ \
+ product(bool, EnableContended, true, \
+ "Enable @Contended annotation support") \
+ \
+ product(bool, RestrictContended, true, \
+ "Restrict @Contended to trusted classes") \
+ \
product(bool, UseBiasedLocking, true, \
"Enable biased locking in JVM") \
\
@@ -1606,7 +1602,7 @@
develop(bool, CMSTraceThreadState, false, \
"Trace the CMS thread state (enable the trace_state() method)") \
\
- product(bool, CMSClassUnloadingEnabled, false, \
+ product(bool, CMSClassUnloadingEnabled, true, \
"Whether class unloading enabled when using CMS GC") \
\
product(uintx, CMSClassUnloadingMaxInterval, 0, \
@@ -1830,7 +1826,7 @@
\
product(intx, CMSIsTooFullPercentage, 98, \
"An absolute ceiling above which CMS will always consider the " \
- "perm gen ripe for collection") \
+ "unloading of classes when class unloading is enabled") \
\
develop(bool, CMSTestInFreeList, false, \
"Check if the coalesced range is already in the " \
@@ -1899,13 +1895,13 @@
"Metadata deallocation alot interval") \
\
develop(bool, TraceMetadataChunkAllocation, false, \
- "Trace humongous metadata allocations") \
+ "Trace chunk metadata allocations") \
\
product(bool, TraceMetadataHumongousAllocation, false, \
"Trace humongous metadata allocations") \
\
develop(bool, TraceMetavirtualspaceAllocation, false, \
- "Trace humongous metadata allocations") \
+ "Trace virtual space metadata allocations") \
\
notproduct(bool, ExecuteInternalVMTests, false, \
"Enable execution of internal VM tests.") \
@@ -2217,7 +2213,8 @@
develop(bool, TraceClassLoaderData, false, \
"Trace class loader loader_data lifetime") \
\
- product(uintx, InitialBootClassLoaderMetaspaceSize, 3*M, \
+ product(uintx, InitialBootClassLoaderMetaspaceSize, \
+ NOT_LP64(2200*K) LP64_ONLY(4*M), \
"Initial size of the boot class loader data metaspace") \
\
product(bool, TraceGen0Time, false, \
@@ -3537,10 +3534,10 @@
/* Shared spaces */ \
\
product(bool, UseSharedSpaces, true, \
- "Use shared spaces in the permanent generation") \
+ "Use shared spaces for metadata") \
\
product(bool, RequireSharedSpaces, false, \
- "Require shared spaces in the permanent generation") \
+ "Require shared spaces for metadata") \
\
product(bool, DumpSharedSpaces, false, \
"Special mode: JVM reads a class list, loads classes, builds " \
@@ -3551,16 +3548,16 @@
"Print usage of shared spaces") \
\
product(uintx, SharedReadWriteSize, NOT_LP64(12*M) LP64_ONLY(16*M), \
- "Size of read-write space in permanent generation (in bytes)") \
+ "Size of read-write space for metadata (in bytes)") \
\
product(uintx, SharedReadOnlySize, NOT_LP64(12*M) LP64_ONLY(16*M), \
- "Size of read-only space in permanent generation (in bytes)") \
+ "Size of read-only space for metadata (in bytes)") \
\
product(uintx, SharedMiscDataSize, NOT_LP64(2*M) LP64_ONLY(4*M), \
- "Size of the shared data area adjacent to the heap (in bytes)") \
+ "Size of the shared miscellaneous data area (in bytes)") \
\
product(uintx, SharedMiscCodeSize, 120*K, \
- "Size of the shared code area adjacent to the heap (in bytes)") \
+ "Size of the shared miscellaneous code area (in bytes)") \
\
product(uintx, SharedDummyBlockSize, 0, \
"Size of dummy block used to shift heap addresses (in bytes)") \
--- a/hotspot/src/share/vm/runtime/handles.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/handles.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -80,6 +80,8 @@
_thread = Thread::current(); \
} \
_thread->metadata_handles()->push((Metadata*)_value); \
+ } else { \
+ _thread = NULL; \
} \
} \
inline name##Handle& name##Handle::operator=(const name##Handle &s) { \
@@ -94,6 +96,8 @@
_thread = Thread::current(); \
} \
_thread->metadata_handles()->push((Metadata*)_value); \
+ } else { \
+ _thread = NULL; \
} \
return *this; \
} \
--- a/hotspot/src/share/vm/runtime/java.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/java.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -368,6 +368,12 @@
if (CITime) {
CompileBroker::print_times();
}
+
+ if (PrintCodeCache) {
+ MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+ CodeCache::print();
+ }
+
#ifdef COMPILER2
if (PrintPreciseBiasedLockingStatistics) {
OptoRuntime::print_named_counters();
@@ -542,6 +548,10 @@
BeforeExit_lock->notify_all();
}
+ // Shutdown NMT before exit. Otherwise,
+ // it will run into trouble when system destroys static variables.
+ MemTracker::shutdown(MemTracker::NMT_normal);
+
#undef BEFORE_EXIT_NOT_RUN
#undef BEFORE_EXIT_RUNNING
#undef BEFORE_EXIT_DONE
--- a/hotspot/src/share/vm/runtime/objectMonitor.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/objectMonitor.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -653,8 +653,7 @@
assert (_succ != Self, "invariant") ;
if (_Responsible == Self) {
_Responsible = NULL ;
- // Dekker pivot-point.
- // Consider OrderAccess::storeload() here
+ OrderAccess::fence(); // Dekker pivot-point
// We may leave threads on cxq|EntryList without a designated
// "Responsible" thread. This is benign. When this thread subsequently
@@ -674,10 +673,6 @@
//
// The MEMBAR, above, prevents the LD of cxq|EntryList in the subsequent
// exit operation from floating above the ST Responsible=null.
- //
- // In *practice* however, EnterI() is always followed by some atomic
- // operation such as the decrement of _count in ::enter(). Those atomics
- // obviate the need for the explicit MEMBAR, above.
}
// We've acquired ownership with CAS().
--- a/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/objectMonitor.inline.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -101,10 +101,12 @@
return _count;
}
+// Do NOT set _count = 0. There is a race such that _count could
+// be set while inflating prior to setting _owner
+// Just use Atomic::inc/dec and assert 0 when monitor put on free list
inline void ObjectMonitor::set_owner(void* owner) {
_owner = owner;
_recursions = 0;
- _count = 0;
}
--- a/hotspot/src/share/vm/runtime/os.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/os.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -641,10 +641,6 @@
static struct hostent* get_host_by_name(char* name);
- // Printing 64 bit integers
- static const char* jlong_format_specifier();
- static const char* julong_format_specifier();
-
// Support for signals (see JVM_RaiseSignal, JVM_RegisterSignal)
static void signal_init();
static void signal_init_pd();
--- a/hotspot/src/share/vm/runtime/perfData.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/perfData.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -192,7 +192,7 @@
}
int PerfLong::format(char* buffer, int length) {
- return jio_snprintf(buffer, length,"%lld", *(jlong*)_valuep);
+ return jio_snprintf(buffer, length, JLONG_FORMAT, *(jlong*)_valuep);
}
PerfLongVariant::PerfLongVariant(CounterNS ns, const char* namep, Units u,
--- a/hotspot/src/share/vm/runtime/reflection.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/reflection.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -771,6 +771,10 @@
typeArrayOop an_oop = Annotations::make_java_array(method->annotation_default(), CHECK_NULL);
java_lang_reflect_Method::set_annotation_default(mh(), an_oop);
}
+ if (java_lang_reflect_Method::has_type_annotations_field()) {
+ typeArrayOop an_oop = Annotations::make_java_array(method->type_annotations(), CHECK_NULL);
+ java_lang_reflect_Method::set_type_annotations(mh(), an_oop);
+ }
return mh();
}
@@ -849,6 +853,29 @@
typeArrayOop an_oop = Annotations::make_java_array(fd->annotations(), CHECK_NULL);
java_lang_reflect_Field::set_annotations(rh(), an_oop);
}
+ if (java_lang_reflect_Field::has_type_annotations_field()) {
+ typeArrayOop an_oop = Annotations::make_java_array(fd->type_annotations(), CHECK_NULL);
+ java_lang_reflect_Field::set_type_annotations(rh(), an_oop);
+ }
+ return rh();
+}
+
+oop Reflection::new_parameter(Handle method, int index, Symbol* sym,
+ int flags, TRAPS) {
+ Handle name;
+
+ // A null symbol here translates to the empty string
+ if(NULL != sym) {
+ name = java_lang_String::create_from_symbol(sym, CHECK_NULL);
+ } else {
+ name = java_lang_String::create_from_str("", CHECK_NULL);
+ }
+
+ Handle rh = java_lang_reflect_Parameter::create(CHECK_NULL);
+ java_lang_reflect_Parameter::set_name(rh(), name());
+ java_lang_reflect_Parameter::set_modifiers(rh(), flags);
+ java_lang_reflect_Parameter::set_executable(rh(), method());
+ java_lang_reflect_Parameter::set_index(rh(), index);
return rh();
}
--- a/hotspot/src/share/vm/runtime/reflection.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/reflection.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -118,6 +118,10 @@
static oop new_constructor(methodHandle method, TRAPS);
// Create a java.lang.reflect.Field object based on a field descriptor
static oop new_field(fieldDescriptor* fd, bool intern_name, TRAPS);
+ // Create a java.lang.reflect.Parameter object based on a
+ // MethodParameterElement
+ static oop new_parameter(Handle method, int index, Symbol* sym,
+ int flags, TRAPS);
private:
// method resolution for invoke
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -643,7 +643,8 @@
bool skip_scope_increment = false;
// exception handler lookup
KlassHandle ek (THREAD, exception->klass());
- handler_bci = sd->method()->fast_exception_handler_bci_for(ek, bci, THREAD);
+ methodHandle mh(THREAD, sd->method());
+ handler_bci = Method::fast_exception_handler_bci_for(mh, ek, bci, THREAD);
if (HAS_PENDING_EXCEPTION) {
recursive_exception = true;
// We threw an exception while trying to find the exception handler.
--- a/hotspot/src/share/vm/runtime/synchronizer.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/synchronizer.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -333,7 +333,9 @@
void ObjectSynchronizer::jni_exit(oop obj, Thread* THREAD) {
TEVENT (jni_exit) ;
if (UseBiasedLocking) {
- BiasedLocking::revoke_and_rebias(obj, false, THREAD);
+ Handle h_obj(THREAD, obj);
+ BiasedLocking::revoke_and_rebias(h_obj, false, THREAD);
+ obj = h_obj();
}
assert(!obj->mark()->has_bias_pattern(), "biases should be revoked by now");
--- a/hotspot/src/share/vm/runtime/thread.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/thread.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1716,7 +1716,6 @@
// cleanup_failed_attach_current_thread as well.
void JavaThread::exit(bool destroy_vm, ExitType exit_type) {
assert(this == JavaThread::current(), "thread consistency check");
- if (!InitializeJavaLangSystem) return;
HandleMark hm(this);
Handle uncaught_exception(this, this->pending_exception());
@@ -3469,11 +3468,7 @@
create_vm_init_libraries();
}
- if (InitializeJavaLangString) {
- initialize_class(vmSymbols::java_lang_String(), CHECK_0);
- } else {
- warning("java.lang.String not initialized");
- }
+ initialize_class(vmSymbols::java_lang_String(), CHECK_0);
if (AggressiveOpts) {
{
@@ -3514,53 +3509,39 @@
}
// Initialize java_lang.System (needed before creating the thread)
- if (InitializeJavaLangSystem) {
- initialize_class(vmSymbols::java_lang_System(), CHECK_0);
- initialize_class(vmSymbols::java_lang_ThreadGroup(), CHECK_0);
- Handle thread_group = create_initial_thread_group(CHECK_0);
- Universe::set_main_thread_group(thread_group());
- initialize_class(vmSymbols::java_lang_Thread(), CHECK_0);
- oop thread_object = create_initial_thread(thread_group, main_thread, CHECK_0);
- main_thread->set_threadObj(thread_object);
- // Set thread status to running since main thread has
- // been started and running.
- java_lang_Thread::set_thread_status(thread_object,
- java_lang_Thread::RUNNABLE);
-
- // The VM creates & returns objects of this class. Make sure it's initialized.
- initialize_class(vmSymbols::java_lang_Class(), CHECK_0);
-
- // The VM preresolves methods to these classes. Make sure that they get initialized
- initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0);
- initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0);
- call_initializeSystemClass(CHECK_0);
-
- // get the Java runtime name after java.lang.System is initialized
- JDK_Version::set_runtime_name(get_java_runtime_name(THREAD));
- JDK_Version::set_runtime_version(get_java_runtime_version(THREAD));
- } else {
- warning("java.lang.System not initialized");
- }
+ initialize_class(vmSymbols::java_lang_System(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_ThreadGroup(), CHECK_0);
+ Handle thread_group = create_initial_thread_group(CHECK_0);
+ Universe::set_main_thread_group(thread_group());
+ initialize_class(vmSymbols::java_lang_Thread(), CHECK_0);
+ oop thread_object = create_initial_thread(thread_group, main_thread, CHECK_0);
+ main_thread->set_threadObj(thread_object);
+ // Set thread status to running since main thread has
+ // been started and running.
+ java_lang_Thread::set_thread_status(thread_object,
+ java_lang_Thread::RUNNABLE);
+
+ // The VM creates & returns objects of this class. Make sure it's initialized.
+ initialize_class(vmSymbols::java_lang_Class(), CHECK_0);
+
+ // The VM preresolves methods to these classes. Make sure that they get initialized
+ initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0);
+ call_initializeSystemClass(CHECK_0);
+
+ // get the Java runtime name after java.lang.System is initialized
+ JDK_Version::set_runtime_name(get_java_runtime_name(THREAD));
+ JDK_Version::set_runtime_version(get_java_runtime_version(THREAD));
// an instance of OutOfMemory exception has been allocated earlier
- if (InitializeJavaLangExceptionsErrors) {
- initialize_class(vmSymbols::java_lang_OutOfMemoryError(), CHECK_0);
- initialize_class(vmSymbols::java_lang_NullPointerException(), CHECK_0);
- initialize_class(vmSymbols::java_lang_ClassCastException(), CHECK_0);
- initialize_class(vmSymbols::java_lang_ArrayStoreException(), CHECK_0);
- initialize_class(vmSymbols::java_lang_ArithmeticException(), CHECK_0);
- initialize_class(vmSymbols::java_lang_StackOverflowError(), CHECK_0);
- initialize_class(vmSymbols::java_lang_IllegalMonitorStateException(), CHECK_0);
- initialize_class(vmSymbols::java_lang_IllegalArgumentException(), CHECK_0);
- } else {
- warning("java.lang.OutOfMemoryError has not been initialized");
- warning("java.lang.NullPointerException has not been initialized");
- warning("java.lang.ClassCastException has not been initialized");
- warning("java.lang.ArrayStoreException has not been initialized");
- warning("java.lang.ArithmeticException has not been initialized");
- warning("java.lang.StackOverflowError has not been initialized");
- warning("java.lang.IllegalArgumentException has not been initialized");
- }
+ initialize_class(vmSymbols::java_lang_OutOfMemoryError(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_NullPointerException(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_ClassCastException(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_ArrayStoreException(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_ArithmeticException(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_StackOverflowError(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_IllegalMonitorStateException(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_IllegalArgumentException(), CHECK_0);
}
// See : bugid 4211085.
@@ -4011,10 +3992,6 @@
Mutex::_as_suspend_equivalent_flag);
}
- // Shutdown NMT before exit. Otherwise,
- // it will run into trouble when system destroys static variables.
- MemTracker::shutdown(MemTracker::NMT_normal);
-
// Hang forever on exit if we are reporting an error.
if (ShowMessageBoxOnError && is_error_reported()) {
os::infinite_sleep();
--- a/hotspot/src/share/vm/runtime/virtualspace.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/virtualspace.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -868,8 +868,8 @@
tty->print ("Virtual space:");
if (special()) tty->print(" (pinned in memory)");
tty->cr();
- tty->print_cr(" - committed: %ld", committed_size());
- tty->print_cr(" - reserved: %ld", reserved_size());
+ tty->print_cr(" - committed: " SIZE_FORMAT, committed_size());
+ tty->print_cr(" - reserved: " SIZE_FORMAT, reserved_size());
tty->print_cr(" - [low, high]: [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", low(), high());
tty->print_cr(" - [low_b, high_b]: [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", low_boundary(), high_boundary());
}
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -257,8 +257,7 @@
c1_nonstatic_field, \
c2_nonstatic_field, \
unchecked_c1_static_field, \
- unchecked_c2_static_field, \
- last_entry) \
+ unchecked_c2_static_field) \
\
/******************************************************************/ \
/* OopDesc and Klass hierarchies (NOTE: MethodData* incomplete) */ \
@@ -718,7 +717,6 @@
nonstatic_field(ClassLoaderData, _next, ClassLoaderData*) \
\
static_field(ClassLoaderDataGraph, _head, ClassLoaderData*) \
- nonstatic_field(ClassLoaderDataGraph, _unloading, ClassLoaderData*) \
\
/*******************/ \
/* GrowableArrays */ \
@@ -1200,7 +1198,6 @@
/*********************************/ \
\
static_field(java_lang_Class, _klass_offset, int) \
- static_field(java_lang_Class, _resolved_constructor_offset, int) \
static_field(java_lang_Class, _array_klass_offset, int) \
static_field(java_lang_Class, _oop_size_offset, int) \
static_field(java_lang_Class, _static_oop_field_count_offset, int) \
@@ -1238,9 +1235,6 @@
nonstatic_field(FreeList<Metablock>, _count, ssize_t) \
nonstatic_field(MetablockTreeDictionary, _total_size, size_t)
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must */
- /* be present there) */
//--------------------------------------------------------------------------------
// VM_TYPES
@@ -1280,8 +1274,7 @@
declare_unsigned_integer_type, \
declare_c1_toplevel_type, \
declare_c2_type, \
- declare_c2_toplevel_type, \
- last_entry) \
+ declare_c2_toplevel_type) \
\
/*************************************************************/ \
/* Java primitive types -- required by the SA implementation */ \
@@ -2098,10 +2091,6 @@
declare_type(MetablockTreeDictionary, FreeBlockDictionary<Metablock>)
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must be */
- /* present there) */
-
//--------------------------------------------------------------------------------
// VM_INT_CONSTANTS
//
@@ -2114,8 +2103,7 @@
declare_preprocessor_constant, \
declare_c1_constant, \
declare_c2_constant, \
- declare_c2_preprocessor_constant, \
- last_entry) \
+ declare_c2_preprocessor_constant) \
\
/******************/ \
/* Useful globals */ \
@@ -2294,10 +2282,18 @@
declare_constant(FieldInfo::name_index_offset) \
declare_constant(FieldInfo::signature_index_offset) \
declare_constant(FieldInfo::initval_index_offset) \
- declare_constant(FieldInfo::low_offset) \
- declare_constant(FieldInfo::high_offset) \
+ declare_constant(FieldInfo::low_packed_offset) \
+ declare_constant(FieldInfo::high_packed_offset) \
declare_constant(FieldInfo::field_slots) \
\
+ /*************************************/ \
+ /* FieldInfo tag constants */ \
+ /*************************************/ \
+ \
+ declare_preprocessor_constant("FIELDINFO_TAG_SIZE", FIELDINFO_TAG_SIZE) \
+ declare_preprocessor_constant("FIELDINFO_TAG_MASK", FIELDINFO_TAG_MASK) \
+ declare_preprocessor_constant("FIELDINFO_TAG_OFFSET", FIELDINFO_TAG_OFFSET) \
+ \
/************************************************/ \
/* InstanceKlass InnerClassAttributeOffset enum */ \
/************************************************/ \
@@ -2483,9 +2479,6 @@
declare_c2_preprocessor_constant("SAVED_ON_ENTRY_REG_COUNT", SAVED_ON_ENTRY_REG_COUNT) \
declare_c2_preprocessor_constant("C_SAVED_ON_ENTRY_REG_COUNT", C_SAVED_ON_ENTRY_REG_COUNT)
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_INT_CONSTANTS_OS_CPU macro (and */
- /* must be present there) */
//--------------------------------------------------------------------------------
// VM_LONG_CONSTANTS
@@ -2495,7 +2488,7 @@
// enums, etc., while "declare_preprocessor_constant" must be used for
// all #defined constants.
-#define VM_LONG_CONSTANTS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+#define VM_LONG_CONSTANTS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
\
/*********************/ \
/* MarkOop constants */ \
@@ -2541,11 +2534,7 @@
/* Constants in markOop used by CMS. */ \
declare_constant(markOopDesc::cms_shift) \
declare_constant(markOopDesc::cms_mask) \
- declare_constant(markOopDesc::size_shift) \
-
- /* NOTE that we do not use the last_entry() macro here; it is used */
- /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and */
- /* must be present there) */
+ declare_constant(markOopDesc::size_shift)
//--------------------------------------------------------------------------------
@@ -2585,7 +2574,8 @@
// This macro checks the type of a VMStructEntry by comparing pointer types
#define CHECK_NONSTATIC_VM_STRUCT_ENTRY(typeName, fieldName, type) \
- {typeName *dummyObj = NULL; type* dummy = &dummyObj->fieldName; }
+ {typeName *dummyObj = NULL; type* dummy = &dummyObj->fieldName; \
+ assert(offset_of(typeName, fieldName) < sizeof(typeName), "Illegal nonstatic struct entry, field offset too large"); }
// This macro checks the type of a volatile VMStructEntry by comparing pointer types
#define CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY(typeName, fieldName, type) \
@@ -2608,9 +2598,6 @@
// This is a no-op macro for unchecked fields
#define CHECK_NO_OP(a, b, c)
-// This is a no-op macro for the sentinel value
-#define CHECK_SENTINEL()
-
//
// Build-specific macros:
//
@@ -2789,48 +2776,47 @@
// as long as class VMStructs is a friend
VMStructEntry VMStructs::localHotSpotVMStructs[] = {
- VM_STRUCTS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_VM_STRUCT_LAST_ENTRY)
+ VM_STRUCTS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_STATIC_VM_STRUCT_ENTRY,
+ GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
+ GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
#ifndef SERIALGC
- VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
+ VM_STRUCTS_PARALLELGC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
GENERATE_STATIC_VM_STRUCT_ENTRY)
- VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
+ VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
GENERATE_STATIC_VM_STRUCT_ENTRY)
- VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
+ VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
GENERATE_STATIC_VM_STRUCT_ENTRY)
#endif // SERIALGC
- VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_VM_STRUCT_LAST_ENTRY)
+ VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_STATIC_VM_STRUCT_ENTRY,
+ GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
+ GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
- VM_STRUCTS_OS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY, \
- GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY, \
- GENERATE_VM_STRUCT_LAST_ENTRY)
+ VM_STRUCTS_OS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_STATIC_VM_STRUCT_ENTRY,
+ GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
+ GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
+ GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
+
+ GENERATE_VM_STRUCT_LAST_ENTRY()
};
VMTypeEntry VMStructs::localHotSpotVMTypes[] = {
@@ -2842,8 +2828,7 @@
GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY,
GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY,
GENERATE_C2_VM_TYPE_ENTRY,
- GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY,
- GENERATE_VM_TYPE_LAST_ENTRY)
+ GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
#ifndef SERIALGC
VM_TYPES_PARALLELGC(GENERATE_VM_TYPE_ENTRY,
@@ -2865,8 +2850,7 @@
GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY,
GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY,
GENERATE_C2_VM_TYPE_ENTRY,
- GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY,
- GENERATE_VM_TYPE_LAST_ENTRY)
+ GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
VM_TYPES_OS_CPU(GENERATE_VM_TYPE_ENTRY,
GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
@@ -2875,8 +2859,9 @@
GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY,
GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY,
GENERATE_C2_VM_TYPE_ENTRY,
- GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY,
- GENERATE_VM_TYPE_LAST_ENTRY)
+ GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
+
+ GENERATE_VM_TYPE_LAST_ENTRY()
};
VMIntConstantEntry VMStructs::localHotSpotVMIntConstants[] = {
@@ -2885,8 +2870,7 @@
GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
GENERATE_C1_VM_INT_CONSTANT_ENTRY,
GENERATE_C2_VM_INT_CONSTANT_ENTRY,
- GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
- GENERATE_VM_INT_CONSTANT_LAST_ENTRY)
+ GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
#ifndef SERIALGC
VM_INT_CONSTANTS_CMS(GENERATE_VM_INT_CONSTANT_ENTRY)
@@ -2898,15 +2882,15 @@
GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
GENERATE_C1_VM_INT_CONSTANT_ENTRY,
GENERATE_C2_VM_INT_CONSTANT_ENTRY,
- GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
- GENERATE_VM_INT_CONSTANT_LAST_ENTRY)
+ GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
VM_INT_CONSTANTS_OS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
GENERATE_C1_VM_INT_CONSTANT_ENTRY,
GENERATE_C2_VM_INT_CONSTANT_ENTRY,
- GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
- GENERATE_VM_INT_CONSTANT_LAST_ENTRY)
+ GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
+
+ GENERATE_VM_INT_CONSTANT_LAST_ENTRY()
};
VMLongConstantEntry VMStructs::localHotSpotVMLongConstants[] = {
@@ -2915,22 +2899,21 @@
GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
- GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
- GENERATE_VM_LONG_CONSTANT_LAST_ENTRY)
+ GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
VM_LONG_CONSTANTS_CPU(GENERATE_VM_LONG_CONSTANT_ENTRY,
GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
- GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
- GENERATE_VM_LONG_CONSTANT_LAST_ENTRY)
+ GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
VM_LONG_CONSTANTS_OS_CPU(GENERATE_VM_LONG_CONSTANT_ENTRY,
GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
- GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
- GENERATE_VM_LONG_CONSTANT_LAST_ENTRY)
+ GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
+
+ GENERATE_VM_LONG_CONSTANT_LAST_ENTRY()
};
// This is used both to check the types of referenced fields and, in
@@ -2945,8 +2928,7 @@
CHECK_C1_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_NO_OP,
- CHECK_NO_OP,
- CHECK_SENTINEL);
+ CHECK_NO_OP);
#ifndef SERIALGC
VM_STRUCTS_PARALLELGC(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
@@ -2967,8 +2949,7 @@
CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_NO_OP,
- CHECK_NO_OP,
- CHECK_SENTINEL);
+ CHECK_NO_OP);
VM_STRUCTS_OS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_STATIC_VM_STRUCT_ENTRY,
@@ -2977,8 +2958,7 @@
CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY,
CHECK_NO_OP,
- CHECK_NO_OP,
- CHECK_SENTINEL);
+ CHECK_NO_OP);
VM_TYPES(CHECK_VM_TYPE_ENTRY,
CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
@@ -2987,8 +2967,7 @@
CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY,
CHECK_C2_VM_TYPE_ENTRY,
- CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY,
- CHECK_SENTINEL);
+ CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY);
#ifndef SERIALGC
VM_TYPES_PARALLELGC(CHECK_VM_TYPE_ENTRY,
@@ -3010,8 +2989,7 @@
CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY,
CHECK_C2_VM_TYPE_ENTRY,
- CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY,
- CHECK_SENTINEL);
+ CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY);
VM_TYPES_OS_CPU(CHECK_VM_TYPE_ENTRY,
CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
@@ -3020,8 +2998,7 @@
CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY,
CHECK_C2_VM_TYPE_ENTRY,
- CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY,
- CHECK_SENTINEL);
+ CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY);
//
// Split VM_STRUCTS() invocation into two parts to allow MS VC++ 6.0
@@ -3040,53 +3017,49 @@
// Solstice NFS setup. If everyone switches to local workspaces on
// Win32, we can put this back in.
#ifndef _WINDOWS
- debug_only(VM_STRUCTS(ENSURE_FIELD_TYPE_PRESENT, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_SENTINEL));
- debug_only(VM_STRUCTS(CHECK_NO_OP, \
- ENSURE_FIELD_TYPE_PRESENT, \
- CHECK_NO_OP, \
- ENSURE_FIELD_TYPE_PRESENT, \
- ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT, \
- ENSURE_C1_FIELD_TYPE_PRESENT, \
- ENSURE_C2_FIELD_TYPE_PRESENT, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_SENTINEL));
+ debug_only(VM_STRUCTS(ENSURE_FIELD_TYPE_PRESENT,
+ CHECK_NO_OP,
+ CHECK_NO_OP,
+ CHECK_NO_OP,
+ CHECK_NO_OP,
+ CHECK_NO_OP,
+ CHECK_NO_OP,
+ CHECK_NO_OP,
+ CHECK_NO_OP));
+ debug_only(VM_STRUCTS(CHECK_NO_OP,
+ ENSURE_FIELD_TYPE_PRESENT,
+ CHECK_NO_OP,
+ ENSURE_FIELD_TYPE_PRESENT,
+ ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT,
+ ENSURE_C1_FIELD_TYPE_PRESENT,
+ ENSURE_C2_FIELD_TYPE_PRESENT,
+ CHECK_NO_OP,
+ CHECK_NO_OP));
#ifndef SERIALGC
- debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT, \
+ debug_only(VM_STRUCTS_PARALLELGC(ENSURE_FIELD_TYPE_PRESENT,
ENSURE_FIELD_TYPE_PRESENT));
- debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \
- ENSURE_FIELD_TYPE_PRESENT, \
+ debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT,
+ ENSURE_FIELD_TYPE_PRESENT,
ENSURE_FIELD_TYPE_PRESENT));
- debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT, \
+ debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT,
ENSURE_FIELD_TYPE_PRESENT));
#endif // SERIALGC
- debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \
- ENSURE_FIELD_TYPE_PRESENT, \
- CHECK_NO_OP, \
- ENSURE_FIELD_TYPE_PRESENT, \
- ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT, \
- ENSURE_C2_FIELD_TYPE_PRESENT, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_SENTINEL));
- debug_only(VM_STRUCTS_OS_CPU(ENSURE_FIELD_TYPE_PRESENT, \
- ENSURE_FIELD_TYPE_PRESENT, \
- CHECK_NO_OP, \
- ENSURE_FIELD_TYPE_PRESENT, \
- ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT, \
- ENSURE_C2_FIELD_TYPE_PRESENT, \
- CHECK_NO_OP, \
- CHECK_NO_OP, \
- CHECK_SENTINEL));
+ debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT,
+ ENSURE_FIELD_TYPE_PRESENT,
+ CHECK_NO_OP,
+ ENSURE_FIELD_TYPE_PRESENT,
+ ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT,
+ ENSURE_C2_FIELD_TYPE_PRESENT,
+ CHECK_NO_OP,
+ CHECK_NO_OP));
+ debug_only(VM_STRUCTS_OS_CPU(ENSURE_FIELD_TYPE_PRESENT,
+ ENSURE_FIELD_TYPE_PRESENT,
+ CHECK_NO_OP,
+ ENSURE_FIELD_TYPE_PRESENT,
+ ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT,
+ ENSURE_C2_FIELD_TYPE_PRESENT,
+ CHECK_NO_OP,
+ CHECK_NO_OP));
#endif
}
@@ -3146,10 +3119,10 @@
s[len-1] = '\0';
// tty->print_cr("checking \"%s\" for \"%s\"", s, typeName);
if (recursiveFindType(origtypes, s, true) == 1) {
- delete s;
+ delete [] s;
return 1;
}
- delete s;
+ delete [] s;
}
const char* start = NULL;
if (strstr(typeName, "GrowableArray<") == typeName) {
@@ -3165,10 +3138,10 @@
s[len-1] = '\0';
// tty->print_cr("checking \"%s\" for \"%s\"", s, typeName);
if (recursiveFindType(origtypes, s, true) == 1) {
- delete s;
+ delete [] s;
return 1;
}
- delete s;
+ delete [] s;
}
if (strstr(typeName, "const ") == typeName) {
const char * s = typeName + strlen("const ");
@@ -3182,8 +3155,10 @@
s[len - 6] = '\0';
// tty->print_cr("checking \"%s\" for \"%s\"", s, typeName);
if (recursiveFindType(origtypes, s, true) == 1) {
+ free(s);
return 1;
}
+ free(s);
}
if (!isRecurse) {
tty->print_cr("type \"%s\" not found", typeName);
@@ -3206,6 +3181,30 @@
#ifndef PRODUCT
void VMStructs::test() {
+ // Make sure last entry in the each array is indeed the correct end marker.
+ // The reason why these are static is to make sure they are zero initialized.
+ // Putting them on the stack will leave some garbage in the padding of some fields.
+ static VMStructEntry struct_last_entry = GENERATE_VM_STRUCT_LAST_ENTRY();
+ assert(memcmp(&localHotSpotVMStructs[(sizeof(localHotSpotVMStructs) / sizeof(VMStructEntry)) - 1],
+ &struct_last_entry,
+ sizeof(VMStructEntry)) == 0, "Incorrect last entry in localHotSpotVMStructs");
+
+ static VMTypeEntry type_last_entry = GENERATE_VM_TYPE_LAST_ENTRY();
+ assert(memcmp(&localHotSpotVMTypes[sizeof(localHotSpotVMTypes) / sizeof(VMTypeEntry) - 1],
+ &type_last_entry,
+ sizeof(VMTypeEntry)) == 0, "Incorrect last entry in localHotSpotVMTypes");
+
+ static VMIntConstantEntry int_last_entry = GENERATE_VM_INT_CONSTANT_LAST_ENTRY();
+ assert(memcmp(&localHotSpotVMIntConstants[sizeof(localHotSpotVMIntConstants) / sizeof(VMIntConstantEntry) - 1],
+ &int_last_entry,
+ sizeof(VMIntConstantEntry)) == 0, "Incorrect last entry in localHotSpotVMIntConstants");
+
+ static VMLongConstantEntry long_last_entry = GENERATE_VM_LONG_CONSTANT_LAST_ENTRY();
+ assert(memcmp(&localHotSpotVMLongConstants[sizeof(localHotSpotVMLongConstants) / sizeof(VMLongConstantEntry) - 1],
+ &long_last_entry,
+ sizeof(VMLongConstantEntry)) == 0, "Incorrect last entry in localHotSpotVMLongConstants");
+
+
// Check for duplicate entries in type array
for (int i = 0; localHotSpotVMTypes[i].typeName != NULL; i++) {
for (int j = i + 1; localHotSpotVMTypes[j].typeName != NULL; j++) {
--- a/hotspot/src/share/vm/runtime/vmThread.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/runtime/vmThread.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -570,7 +570,11 @@
if (!t->is_VM_thread()) {
SkipGCALot sgcalot(t); // avoid re-entrant attempts to gc-a-lot
// JavaThread or WatcherThread
- t->check_for_valid_safepoint_state(true);
+ bool concurrent = op->evaluate_concurrently();
+ // only blocking VM operations need to verify the caller's safepoint state:
+ if (!concurrent) {
+ t->check_for_valid_safepoint_state(true);
+ }
// New request from Java thread, evaluate prologue
if (!op->doit_prologue()) {
@@ -582,7 +586,6 @@
// It does not make sense to execute the epilogue, if the VM operation object is getting
// deallocated by the VM thread.
- bool concurrent = op->evaluate_concurrently();
bool execute_epilog = !op->is_cheap_allocated();
assert(!concurrent || op->is_cheap_allocated(), "concurrent => cheap_allocated");
--- a/hotspot/src/share/vm/services/diagnosticArgument.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/diagnosticArgument.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@
template <> void DCmdArgument<jlong>::parse_value(const char* str,
size_t len, TRAPS) {
- if (str == NULL || sscanf(str, INT64_FORMAT, &_value) != 1) {
+ if (str == NULL || sscanf(str, JLONG_FORMAT, &_value) != 1) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"Integer parsing error in diagnostic command arguments\n");
}
@@ -171,7 +171,7 @@
"Integer parsing error nanotime value: syntax error");
}
- int argc = sscanf(str, INT64_FORMAT , &_value._time);
+ int argc = sscanf(str, JLONG_FORMAT, &_value._time);
if (argc != 1) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"Integer parsing error nanotime value: syntax error");
--- a/hotspot/src/share/vm/services/heapDumper.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/heapDumper.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1866,7 +1866,7 @@
if (error() == NULL) {
char msg[256];
sprintf(msg, "Heap dump file created [%s bytes in %3.3f secs]",
- os::jlong_format_specifier(), timer()->seconds());
+ JLONG_FORMAT, timer()->seconds());
tty->print_cr(msg, writer.bytes_written());
} else {
tty->print_cr("Dump file is incomplete: %s", writer.error());
--- a/hotspot/src/share/vm/services/lowMemoryDetector.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/lowMemoryDetector.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -353,7 +353,7 @@
#ifndef PRODUCT
void SensorInfo::print() {
- tty->print_cr("%s count = %ld pending_triggers = %ld pending_clears = %ld",
+ tty->print_cr("%s count = " SIZE_FORMAT " pending_triggers = %ld pending_clears = %ld",
(_sensor_on ? "on" : "off"),
_sensor_count, _pending_trigger_count, _pending_clear_count);
}
--- a/hotspot/src/share/vm/services/memBaseline.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memBaseline.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -22,7 +22,6 @@
*
*/
#include "precompiled.hpp"
-#include "classfile/systemDictionary.hpp"
#include "memory/allocation.hpp"
#include "services/memBaseline.hpp"
#include "services/memTracker.hpp"
@@ -349,7 +348,7 @@
reset();
_baselined = baseline_malloc_summary(snapshot._alloc_ptrs) &&
baseline_vm_summary(snapshot._vm_ptrs);
- _number_of_classes = SystemDictionary::number_of_classes();
+ _number_of_classes = snapshot.number_of_classes();
if (!summary_only && MemTracker::track_callsite() && _baselined) {
_baselined = baseline_malloc_details(snapshot._alloc_ptrs) &&
--- a/hotspot/src/share/vm/services/memRecorder.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memRecorder.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -84,10 +84,13 @@
}
delete _pointer_records;
}
- if (_next != NULL) {
- delete _next;
+ // delete all linked recorders
+ while (_next != NULL) {
+ MemRecorder* tmp = _next;
+ _next = _next->next();
+ tmp->set_next(NULL);
+ delete tmp;
}
-
Atomic::dec(&_instance_count);
}
--- a/hotspot/src/share/vm/services/memRecorder.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memRecorder.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -203,6 +203,7 @@
friend class MemSnapshot;
friend class MemTracker;
friend class MemTrackWorker;
+ friend class GenerationData;
protected:
// the array that holds memory records
--- a/hotspot/src/share/vm/services/memSnapshot.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memSnapshot.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -384,6 +384,7 @@
_staging_area.init();
_lock = new (std::nothrow) Mutex(Monitor::max_nonleaf - 1, "memSnapshotLock");
NOT_PRODUCT(_untracked_count = 0;)
+ _number_of_classes = 0;
}
MemSnapshot::~MemSnapshot() {
@@ -479,7 +480,7 @@
// promote data to next generation
-bool MemSnapshot::promote() {
+bool MemSnapshot::promote(int number_of_classes) {
assert(_alloc_ptrs != NULL && _vm_ptrs != NULL, "Just check");
assert(_staging_area.malloc_data() != NULL && _staging_area.vm_data() != NULL,
"Just check");
@@ -496,6 +497,7 @@
NOT_PRODUCT(check_malloc_pointers();)
_staging_area.clear();
+ _number_of_classes = number_of_classes;
return promoted;
}
--- a/hotspot/src/share/vm/services/memSnapshot.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memSnapshot.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -355,6 +355,9 @@
// the lock to protect this snapshot
Monitor* _lock;
+ // the number of instance classes
+ int _number_of_classes;
+
NOT_PRODUCT(size_t _untracked_count;)
friend class MemBaseline;
@@ -375,8 +378,9 @@
// merge a per-thread memory recorder into staging area
bool merge(MemRecorder* rec);
// promote staged data to snapshot
- bool promote();
+ bool promote(int number_of_classes);
+ int number_of_classes() const { return _number_of_classes; }
void wait(long timeout) {
assert(_lock != NULL, "Just check");
--- a/hotspot/src/share/vm/services/memTrackWorker.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memTrackWorker.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -29,6 +29,16 @@
#include "utilities/decoder.hpp"
#include "utilities/vmError.hpp"
+
+void GenerationData::reset() {
+ _number_of_classes = 0;
+ while (_recorder_list != NULL) {
+ MemRecorder* tmp = _recorder_list;
+ _recorder_list = _recorder_list->next();
+ MemTracker::release_thread_recorder(tmp);
+ }
+}
+
MemTrackWorker::MemTrackWorker() {
// create thread uses cgc thread type for now. We should revisit
// the option, or create new thread type.
@@ -39,7 +49,7 @@
if (!has_error()) {
_head = _tail = 0;
for(int index = 0; index < MAX_GENERATIONS; index ++) {
- _gen[index] = NULL;
+ ::new ((void*)&_gen[index]) GenerationData();
}
}
NOT_PRODUCT(_sync_point_count = 0;)
@@ -49,10 +59,7 @@
MemTrackWorker::~MemTrackWorker() {
for (int index = 0; index < MAX_GENERATIONS; index ++) {
- MemRecorder* rc = _gen[index];
- if (rc != NULL) {
- delete rc;
- }
+ _gen[index].reset();
}
}
@@ -90,12 +97,7 @@
{
// take a recorder from earliest generation in buffer
ThreadCritical tc;
- rec = _gen[_head];
- if (rec != NULL) {
- _gen[_head] = rec->next();
- }
- assert(count_recorder(_gen[_head]) <= MemRecorder::_instance_count,
- "infinite loop after dequeue");
+ rec = _gen[_head].next_recorder();
}
if (rec != NULL) {
// merge the recorder into staging area
@@ -109,16 +111,20 @@
// no more recorder to merge, promote staging area
// to snapshot
if (_head != _tail) {
+ long number_of_classes;
{
ThreadCritical tc;
- if (_gen[_head] != NULL || _head == _tail) {
+ if (_gen[_head].has_more_recorder() || _head == _tail) {
continue;
}
+ number_of_classes = _gen[_head].number_of_classes();
+ _gen[_head].reset();
+
// done with this generation, increment _head pointer
_head = (_head + 1) % MAX_GENERATIONS;
}
// promote this generation data to snapshot
- if (!snapshot->promote()) {
+ if (!snapshot->promote(number_of_classes)) {
// failed to promote, means out of memory
MemTracker::shutdown(MemTracker::NMT_out_of_memory);
}
@@ -126,8 +132,8 @@
snapshot->wait(1000);
ThreadCritical tc;
// check if more data arrived
- if (_gen[_head] == NULL) {
- _gen[_head] = MemTracker::get_pending_recorders();
+ if (!_gen[_head].has_more_recorder()) {
+ _gen[_head].add_recorders(MemTracker::get_pending_recorders());
}
}
}
@@ -147,7 +153,7 @@
// 1. add all recorders in pending queue to current generation
// 2. increase generation
-void MemTrackWorker::at_sync_point(MemRecorder* rec) {
+void MemTrackWorker::at_sync_point(MemRecorder* rec, int number_of_classes) {
NOT_PRODUCT(_sync_point_count ++;)
assert(count_recorder(rec) <= MemRecorder::_instance_count,
"pending queue has infinite loop");
@@ -155,23 +161,15 @@
bool out_of_generation_buffer = false;
// check shutdown state inside ThreadCritical
if (MemTracker::shutdown_in_progress()) return;
+
+ _gen[_tail].set_number_of_classes(number_of_classes);
// append the recorders to the end of the generation
- if( rec != NULL) {
- MemRecorder* cur_head = _gen[_tail];
- if (cur_head == NULL) {
- _gen[_tail] = rec;
- } else {
- while (cur_head->next() != NULL) {
- cur_head = cur_head->next();
- }
- cur_head->set_next(rec);
- }
- }
- assert(count_recorder(rec) <= MemRecorder::_instance_count,
+ _gen[_tail].add_recorders(rec);
+ assert(count_recorder(_gen[_tail].peek()) <= MemRecorder::_instance_count,
"after add to current generation has infinite loop");
// we have collected all recorders for this generation. If there is data,
// we need to increment _tail to start a new generation.
- if (_gen[_tail] != NULL || _head == _tail) {
+ if (_gen[_tail].has_more_recorder() || _head == _tail) {
_tail = (_tail + 1) % MAX_GENERATIONS;
out_of_generation_buffer = (_tail == _head);
}
@@ -194,7 +192,7 @@
int MemTrackWorker::count_pending_recorders() const {
int count = 0;
for (int index = 0; index < MAX_GENERATIONS; index ++) {
- MemRecorder* head = _gen[index];
+ MemRecorder* head = _gen[index].peek();
if (head != NULL) {
count += count_recorder(head);
}
--- a/hotspot/src/share/vm/services/memTrackWorker.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memTrackWorker.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -32,17 +32,58 @@
// Maximum MAX_GENERATIONS generation data can be tracked.
#define MAX_GENERATIONS 512
+class GenerationData : public _ValueObj {
+ private:
+ int _number_of_classes;
+ MemRecorder* _recorder_list;
+
+ public:
+ GenerationData(): _number_of_classes(0), _recorder_list(NULL) { }
+
+ inline int number_of_classes() const { return _number_of_classes; }
+ inline void set_number_of_classes(long num) { _number_of_classes = num; }
+
+ inline MemRecorder* next_recorder() {
+ if (_recorder_list == NULL) {
+ return NULL;
+ } else {
+ MemRecorder* tmp = _recorder_list;
+ _recorder_list = _recorder_list->next();
+ return tmp;
+ }
+ }
+
+ inline bool has_more_recorder() const {
+ return (_recorder_list != NULL);
+ }
+
+ // add recorders to this generation
+ void add_recorders(MemRecorder* head) {
+ if (head != NULL) {
+ if (_recorder_list == NULL) {
+ _recorder_list = head;
+ } else {
+ MemRecorder* tmp = _recorder_list;
+ for (; tmp->next() != NULL; tmp = tmp->next());
+ tmp->set_next(head);
+ }
+ }
+ }
+
+ void reset();
+
+ NOT_PRODUCT(MemRecorder* peek() const { return _recorder_list; })
+};
class MemTrackWorker : public NamedThread {
private:
- // circular buffer. This buffer contains recorders to be merged into global
+ // circular buffer. This buffer contains generation data to be merged into global
// snaphsot.
- // Each slot holds a linked list of memory recorders, that contains one
- // generation of memory data.
- MemRecorder* _gen[MAX_GENERATIONS];
- int _head, _tail; // head and tail pointers to above circular buffer
+ // Each slot holds a generation
+ GenerationData _gen[MAX_GENERATIONS];
+ int _head, _tail; // head and tail pointers to above circular buffer
- bool _has_error;
+ bool _has_error;
public:
MemTrackWorker();
@@ -56,7 +97,7 @@
inline bool has_error() const { return _has_error; }
// task at synchronization point
- void at_sync_point(MemRecorder* pending_recorders);
+ void at_sync_point(MemRecorder* pending_recorders, int number_of_classes);
// for debugging purpose, they are not thread safe.
NOT_PRODUCT(static int count_recorder(const MemRecorder* head);)
--- a/hotspot/src/share/vm/services/memTracker.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memTracker.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "oops/instanceKlass.hpp"
#include "runtime/atomic.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/mutexLocker.hpp"
@@ -485,7 +486,7 @@
}
// check _worker_thread with lock to avoid racing condition
if (_worker_thread != NULL) {
- _worker_thread->at_sync_point(pending_recorders);
+ _worker_thread->at_sync_point(pending_recorders, InstanceKlass::number_of_instance_classes());
}
assert(SequenceGenerator::peek() == 1, "Should not have memory activities during sync-point");
--- a/hotspot/src/share/vm/services/memTracker.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/services/memTracker.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -142,6 +142,7 @@
* MemTracker is the 'gate' class to native memory tracking runtime.
*/
class MemTracker : AllStatic {
+ friend class GenerationData;
friend class MemTrackWorker;
friend class MemSnapshot;
friend class SyncThreadRecorderClosure;
--- a/hotspot/src/share/vm/shark/sharkBlock.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/shark/sharkBlock.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1032,7 +1032,7 @@
check_null(value);
object = value->generic_value();
}
- if (is_get && field->is_constant()) {
+ if (is_get && field->is_constant() && field->is_static()) {
SharkConstant *constant = SharkConstant::for_field(iter());
if (constant->is_loaded())
value = constant->value(builder());
@@ -1044,10 +1044,17 @@
BasicType basic_type = field->type()->basic_type();
Type *stack_type = SharkType::to_stackType(basic_type);
Type *field_type = SharkType::to_arrayType(basic_type);
-
+ Type *type = field_type;
+ if (field->is_volatile()) {
+ if (field_type == SharkType::jfloat_type()) {
+ type = SharkType::jint_type();
+ } else if (field_type == SharkType::jdouble_type()) {
+ type = SharkType::jlong_type();
+ }
+ }
Value *addr = builder()->CreateAddressOfStructEntry(
object, in_ByteSize(field->offset_in_bytes()),
- PointerType::getUnqual(field_type),
+ PointerType::getUnqual(type),
"addr");
// Do the access
@@ -1055,6 +1062,7 @@
Value* field_value;
if (field->is_volatile()) {
field_value = builder()->CreateAtomicLoad(addr);
+ field_value = builder()->CreateBitCast(field_value, field_type);
} else {
field_value = builder()->CreateLoad(addr);
}
@@ -1074,6 +1082,7 @@
}
if (field->is_volatile()) {
+ field_value = builder()->CreateBitCast(field_value, type);
builder()->CreateAtomicStore(field_value, addr);
} else {
builder()->CreateStore(field_value, addr);
--- a/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -185,6 +185,9 @@
// Build the LLVM IR for the method
Function *function = SharkFunction::build(env, &builder, flow, name);
+ if (env->failing()) {
+ return;
+ }
// Generate native code. It's unpleasant that we have to drop into
// the VM to do this -- it blocks safepoints -- but I can't see any
--- a/hotspot/src/share/vm/shark/sharkCompiler.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/shark/sharkCompiler.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -46,6 +46,9 @@
// Missing feature tests
bool supports_native() { return true; }
bool supports_osr() { return true; }
+ bool can_compile_method(methodHandle method) {
+ return ! (method->is_method_handle_intrinsic() || method->is_compiled_lambda_form());
+ }
// Customization
bool needs_adapters() { return false; }
--- a/hotspot/src/share/vm/shark/sharkConstant.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/shark/sharkConstant.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -37,7 +37,12 @@
ciType *type = NULL;
if (constant.basic_type() == T_OBJECT) {
ciEnv *env = ciEnv::current();
- assert(constant.as_object()->klass() == env->String_klass() || constant.as_object()->klass() == env->Class_klass(), "should be");
+
+ assert(constant.as_object()->klass() == env->String_klass()
+ || constant.as_object()->klass() == env->Class_klass()
+ || constant.as_object()->klass()->is_subtype_of(env->MethodType_klass())
+ || constant.as_object()->klass()->is_subtype_of(env->MethodHandle_klass()), "should be");
+
type = constant.as_object()->klass();
}
return new SharkConstant(constant, type);
--- a/hotspot/src/share/vm/shark/sharkFunction.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/shark/sharkFunction.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -77,6 +77,10 @@
// Walk the tree from the start block to determine which
// blocks are entered and which blocks require phis
SharkTopLevelBlock *start_block = block(flow()->start_block_num());
+ if (is_osr() && start_block->stack_depth_at_entry() != 0) {
+ env()->record_method_not_compilable("can't compile OSR block with incoming stack-depth > 0");
+ return;
+ }
assert(start_block->start() == flow()->start_bci(), "blocks out of order");
start_block->enter();
--- a/hotspot/src/share/vm/shark/sharkInliner.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/shark/sharkInliner.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -725,7 +725,7 @@
// Push the result if necessary
if (is_get) {
bool result_pushed = false;
- if (field->is_constant()) {
+ if (field->is_constant() && field->is_static()) {
SharkConstant *sc = SharkConstant::for_field(iter());
if (sc->is_loaded()) {
push(sc->is_nonzero());
--- a/hotspot/src/share/vm/shark/sharkInvariants.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/shark/sharkInvariants.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -68,7 +68,7 @@
//
// Accessing this directly is kind of ugly, so it's private. Add
// new accessors below if you need something from it.
- private:
+ protected:
ciEnv* env() const {
assert(_env != NULL, "env not available");
return _env;
@@ -99,12 +99,14 @@
DebugInformationRecorder* debug_info() const {
return env()->debug_info();
}
+ SharkCodeBuffer* code_buffer() const {
+ return builder()->code_buffer();
+ }
+
+ public:
Dependencies* dependencies() const {
return env()->dependencies();
}
- SharkCodeBuffer* code_buffer() const {
- return builder()->code_buffer();
- }
// Commonly used classes
protected:
--- a/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -113,7 +113,19 @@
ciSignature* sig;
method = iter()->get_method(will_link, &sig);
assert(will_link, "typeflow responsibility");
-
+ // We can't compile calls to method handle intrinsics, because we use
+ // the interpreter entry points and they expect the top frame to be an
+ // interpreter frame. We need to implement the intrinsics for Shark.
+ if (method->is_method_handle_intrinsic() || method->is_compiled_lambda_form()) {
+ if (SharkPerformanceWarnings) {
+ warning("JSR292 optimization not yet implemented in Shark");
+ }
+ set_trap(
+ Deoptimization::make_trap_request(
+ Deoptimization::Reason_unhandled,
+ Deoptimization::Action_make_not_compilable), bci());
+ return;
+ }
if (!method->holder()->is_linked()) {
set_trap(
Deoptimization::make_trap_request(
@@ -158,6 +170,16 @@
return;
}
break;
+ case Bytecodes::_invokedynamic:
+ case Bytecodes::_invokehandle:
+ if (SharkPerformanceWarnings) {
+ warning("JSR292 optimization not yet implemented in Shark");
+ }
+ set_trap(
+ Deoptimization::make_trap_request(
+ Deoptimization::Reason_unhandled,
+ Deoptimization::Action_make_not_compilable), bci());
+ return;
}
}
@@ -1030,7 +1052,6 @@
dest_method->holder() == java_lang_Object_klass())
return dest_method;
-#ifdef SHARK_CAN_DEOPTIMIZE_ANYWHERE
// This code can replace a virtual call with a direct call if this
// class is the only one in the entire set of loaded classes that
// implements this method. This makes the compiled code dependent
@@ -1064,6 +1085,8 @@
if (monomorphic_target != NULL) {
assert(!monomorphic_target->is_abstract(), "shouldn't be");
+ function()->dependencies()->assert_unique_concrete_method(actual_receiver, monomorphic_target);
+
// Opto has a bunch of type checking here that I don't
// understand. It's to inhibit casting in one direction,
// possibly because objects in Opto can have inexact
@@ -1097,7 +1120,6 @@
// with non-monomorphic targets if the receiver has an exact
// type. We don't mark types this way, so we can't do this.
-#endif // SHARK_CAN_DEOPTIMIZE_ANYWHERE
return NULL;
}
@@ -1298,8 +1320,9 @@
// Try to inline the call
if (!call_is_virtual) {
- if (SharkInliner::attempt_inline(call_method, current_state()))
+ if (SharkInliner::attempt_inline(call_method, current_state())) {
return;
+ }
}
// Find the method we are calling
--- a/hotspot/src/share/vm/utilities/debug.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/utilities/debug.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -612,21 +612,6 @@
Events::print();
}
-// Given a heap address that was valid before the most recent GC, if
-// the oop that used to contain it is still live, prints the new
-// location of the oop and the address. Useful for tracking down
-// certain kinds of naked oop and oop map bugs.
-extern "C" void pnl(intptr_t old_heap_addr) {
- // Print New Location of old heap address
- Command c("pnl");
-#ifndef VALIDATE_MARK_SWEEP
- tty->print_cr("Requires build with VALIDATE_MARK_SWEEP defined (debug build) and RecordMarkSweepCompaction enabled");
-#else
- MarkSweep::print_new_location_of_heap_address((HeapWord*) old_heap_addr);
-#endif
-}
-
-
extern "C" Method* findm(intptr_t pc) {
Command c("findm");
nmethod* nm = CodeCache::find_nmethod((address)pc);
--- a/hotspot/src/share/vm/utilities/exceptions.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/utilities/exceptions.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -267,6 +267,7 @@
#define THROW_WRAPPED_0(name, oop_to_wrap) THROW_WRAPPED_(name, oop_to_wrap, 0)
#define THROW_ARG_0(name, signature, arg) THROW_ARG_(name, signature, arg, 0)
#define THROW_MSG_CAUSE_0(name, message, cause) THROW_MSG_CAUSE_(name, message, cause, 0)
+#define THROW_MSG_CAUSE_NULL(name, message, cause) THROW_MSG_CAUSE_(name, message, cause, NULL)
#define THROW_NULL(name) THROW_(name, NULL)
#define THROW_MSG_NULL(name, message) THROW_MSG_(name, message, NULL)
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1250,6 +1250,14 @@
#define PTR64_FORMAT "0x%016" PRIx64
+// Format jlong, if necessary
+#ifndef JLONG_FORMAT
+#define JLONG_FORMAT INT64_FORMAT
+#endif
+#ifndef JULONG_FORMAT
+#define JULONG_FORMAT UINT64_FORMAT
+#endif
+
// Format pointers which change size between 32- and 64-bit.
#ifdef _LP64
#define INTPTR_FORMAT "0x%016" PRIxPTR
--- a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -306,4 +306,8 @@
#endif
#define offsetof(klass,field) offset_of(klass,field)
+#if defined(_LP64) && defined(__APPLE__)
+#define JLONG_FORMAT "%ld"
+#endif // _LP64 && __APPLE__
+
#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
--- a/hotspot/src/share/vm/utilities/ostream.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/utilities/ostream.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -243,13 +243,11 @@
}
void outputStream::print_jlong(jlong value) {
- // N.B. Same as INT64_FORMAT
- print(os::jlong_format_specifier(), value);
+ print(JLONG_FORMAT, value);
}
void outputStream::print_julong(julong value) {
- // N.B. Same as UINT64_FORMAT
- print(os::julong_format_specifier(), value);
+ print(JULONG_FORMAT, value);
}
/**
--- a/hotspot/src/share/vm/utilities/taskqueue.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/utilities/taskqueue.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -239,8 +239,8 @@
#ifdef TRACESPINNING
void ParallelTaskTerminator::print_termination_counts() {
- gclog_or_tty->print_cr("ParallelTaskTerminator Total yields: %lld "
- "Total spins: %lld Total peeks: %lld",
+ gclog_or_tty->print_cr("ParallelTaskTerminator Total yields: " UINT32_FORMAT
+ " Total spins: " UINT32_FORMAT " Total peeks: " UINT32_FORMAT,
total_yields(),
total_spins(),
total_peeks());
--- a/hotspot/src/share/vm/utilities/vmError.cpp Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/src/share/vm/utilities/vmError.cpp Thu Jan 31 10:22:25 2013 -0800
@@ -702,7 +702,7 @@
if (_verbose && Universe::is_fully_initialized()) {
// print code cache information before vm abort
- CodeCache::print_bounds(st);
+ CodeCache::print_summary(st);
st->cr();
}
--- a/hotspot/test/Makefile Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/test/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -189,9 +189,9 @@
$(JTREG) -a -v:fail,error \
$(JTREG_KEY_OPTION) \
$(EXTRA_JTREG_OPTIONS) \
- -r:$(ABS_TEST_OUTPUT_DIR)/JTreport \
- -w:$(ABS_TEST_OUTPUT_DIR)/JTwork \
- -jdk:$(PRODUCT_HOME) \
+ -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport \
+ -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTwork \
+ -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \
$(JAVA_OPTIONS:%=-vmoption:%) \
$(JTREG_TESTDIRS) \
|| $(BUNDLE_UP_FAILED)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6896617/Test6896617.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6896617
+ * @summary Optimize sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() with SSE instructions on x86
+ * @run main/othervm/timeout=1200 -Xbatch -Xmx256m Test6896617
+ *
+ */
+
+import java.util.*;
+import java.nio.*;
+import java.nio.charset.*;
+
+public class Test6896617 {
+ final static int SIZE = 256;
+
+ public static void main(String[] args) {
+ String csn = "ISO-8859-1";
+ Charset cs = Charset.forName(csn);
+ CharsetEncoder enc = cs.newEncoder();
+ enc.onMalformedInput(CodingErrorAction.REPLACE)
+ .onUnmappableCharacter(CodingErrorAction.REPLACE);
+ CharsetDecoder dec = cs.newDecoder();
+ dec.onMalformedInput(CodingErrorAction.REPLACE)
+ .onUnmappableCharacter(CodingErrorAction.REPLACE);
+
+ byte repl = (byte)'?';
+ enc.replaceWith(new byte[] { repl });
+
+ // Use internal API for tests.
+ sun.nio.cs.ArrayEncoder arrenc = (sun.nio.cs.ArrayEncoder)enc;
+ sun.nio.cs.ArrayDecoder arrdec = (sun.nio.cs.ArrayDecoder)dec;
+
+ // Populate char[] with chars which can be encoded by ISO_8859_1 (<= 0xFF)
+ Random rnd = new Random(0);
+ int maxchar = 0xFF;
+ char[] a = new char[SIZE];
+ byte[] b = new byte[SIZE];
+ char[] at = new char[SIZE];
+ byte[] bt = new byte[SIZE];
+ for (int i = 0; i < SIZE; i++) {
+ char c = (char) rnd.nextInt(maxchar);
+ if (!enc.canEncode(c)) {
+ System.out.printf("Something wrong: can't encode c=%03x\n", (int)c);
+ System.exit(97);
+ }
+ a[i] = c;
+ b[i] = (byte)c;
+ at[i] = (char)-1;
+ bt[i] = (byte)-1;
+ }
+ if (arrenc.encode(a, 0, SIZE, bt) != SIZE || !Arrays.equals(b, bt)) {
+ System.out.println("Something wrong: ArrayEncoder.encode failed");
+ System.exit(97);
+ }
+ if (arrdec.decode(b, 0, SIZE, at) != SIZE || !Arrays.equals(a, at)) {
+ System.out.println("Something wrong: ArrayDecoder.decode failed");
+ System.exit(97);
+ }
+ for (int i = 0; i < SIZE; i++) {
+ at[i] = (char)-1;
+ bt[i] = (byte)-1;
+ }
+
+ ByteBuffer bb = ByteBuffer.wrap(b);
+ CharBuffer ba = CharBuffer.wrap(a);
+ ByteBuffer bbt = ByteBuffer.wrap(bt);
+ CharBuffer bat = CharBuffer.wrap(at);
+ if (!enc.encode(ba, bbt, true).isUnderflow() || !Arrays.equals(b, bt)) {
+ System.out.println("Something wrong: Encoder.encode failed");
+ System.exit(97);
+ }
+ if (!dec.decode(bb, bat, true).isUnderflow() || !Arrays.equals(a, at)) {
+ System.out.println("Something wrong: Decoder.decode failed");
+ System.exit(97);
+ }
+ for (int i = 0; i < SIZE; i++) {
+ at[i] = (char)-1;
+ bt[i] = (byte)-1;
+ }
+
+ // Warm up
+ boolean failed = false;
+ int result = 0;
+ for (int i = 0; i < 10000; i++) {
+ result += arrenc.encode(a, 0, SIZE, bt);
+ result -= arrdec.decode(b, 0, SIZE, at);
+ }
+ for (int i = 0; i < 10000; i++) {
+ result += arrenc.encode(a, 0, SIZE, bt);
+ result -= arrdec.decode(b, 0, SIZE, at);
+ }
+ for (int i = 0; i < 10000; i++) {
+ result += arrenc.encode(a, 0, SIZE, bt);
+ result -= arrdec.decode(b, 0, SIZE, at);
+ }
+ if (result != 0 || !Arrays.equals(b, bt) || !Arrays.equals(a, at)) {
+ failed = true;
+ System.out.println("Failed: ArrayEncoder.encode char[" + SIZE + "] and ArrayDecoder.decode byte[" + SIZE + "]");
+ }
+ for (int i = 0; i < SIZE; i++) {
+ at[i] = (char)-1;
+ bt[i] = (byte)-1;
+ }
+
+ boolean is_underflow = true;
+ for (int i = 0; i < 10000; i++) {
+ ba.clear(); bb.clear(); bat.clear(); bbt.clear();
+ boolean enc_res = enc.encode(ba, bbt, true).isUnderflow();
+ boolean dec_res = dec.decode(bb, bat, true).isUnderflow();
+ is_underflow = is_underflow && enc_res && dec_res;
+ }
+ for (int i = 0; i < SIZE; i++) {
+ at[i] = (char)-1;
+ bt[i] = (byte)-1;
+ }
+ for (int i = 0; i < 10000; i++) {
+ ba.clear(); bb.clear(); bat.clear(); bbt.clear();
+ boolean enc_res = enc.encode(ba, bbt, true).isUnderflow();
+ boolean dec_res = dec.decode(bb, bat, true).isUnderflow();
+ is_underflow = is_underflow && enc_res && dec_res;
+ }
+ for (int i = 0; i < SIZE; i++) {
+ at[i] = (char)-1;
+ bt[i] = (byte)-1;
+ }
+ for (int i = 0; i < 10000; i++) {
+ ba.clear(); bb.clear(); bat.clear(); bbt.clear();
+ boolean enc_res = enc.encode(ba, bbt, true).isUnderflow();
+ boolean dec_res = dec.decode(bb, bat, true).isUnderflow();
+ is_underflow = is_underflow && enc_res && dec_res;
+ }
+ if (!is_underflow || !Arrays.equals(b, bt) || !Arrays.equals(a, at)) {
+ failed = true;
+ System.out.println("Failed: Encoder.encode char[" + SIZE + "] and Decoder.decode byte[" + SIZE + "]");
+ }
+
+ // Test encoder with different source and destination sizes
+ System.out.println("Testing different source and destination sizes");
+ for (int i = 1; i <= SIZE; i++) {
+ for (int j = 1; j <= SIZE; j++) {
+ bt = new byte[j];
+ // very source's SIZE
+ result = arrenc.encode(a, 0, i, bt);
+ int l = Math.min(i, j);
+ if (result != l) {
+ failed = true;
+ System.out.println("Failed: encode char[" + i + "] to byte[" + j + "]: result = " + result + ", expected " + l);
+ }
+ for (int k = 0; k < l; k++) {
+ if (bt[k] != b[k]) {
+ failed = true;
+ System.out.println("Failed: encoded byte[" + k + "] (" + bt[k] + ") != " + b[k]);
+ }
+ }
+ // very source's offset
+ int sz = SIZE - i + 1;
+ result = arrenc.encode(a, i-1, sz, bt);
+ l = Math.min(sz, j);
+ if (result != l) {
+ failed = true;
+ System.out.println("Failed: encode char[" + sz + "] to byte[" + j + "]: result = " + result + ", expected " + l);
+ }
+ for (int k = 0; k < l; k++) {
+ if (bt[k] != b[i+k-1]) {
+ failed = true;
+ System.out.println("Failed: encoded byte[" + k + "] (" + bt[k] + ") != " + b[i+k-1]);
+ }
+ }
+ }
+ }
+
+ // Test encoder with char > 0xFF
+ System.out.println("Testing big char");
+
+ byte orig = (byte)'A';
+ bt = new byte[SIZE];
+ for (int i = 1; i <= SIZE; i++) {
+ for (int j = 0; j < i; j++) {
+ a[j] += 0x100;
+ // make sure to replace a different byte
+ bt[j] = orig;
+ result = arrenc.encode(a, 0, i, bt);
+ if (result != i) {
+ failed = true;
+ System.out.println("Failed: encode char[" + i + "] to byte[" + i + "]: result = " + result + ", expected " + i);
+ }
+ if (bt[j] != repl) {
+ failed = true;
+ System.out.println("Failed: encoded replace byte[" + j + "] (" + bt[j] + ") != " + repl);
+ }
+ bt[j] = b[j]; // Restore to compare whole array
+ for (int k = 0; k < i; k++) {
+ if (bt[k] != b[k]) {
+ failed = true;
+ System.out.println("Failed: encoded byte[" + k + "] (" + bt[k] + ") != " + b[k]);
+ }
+ }
+ a[j] -= 0x100; // Restore
+ }
+ }
+
+ // Test sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() performance.
+
+ int itrs = Integer.getInteger("iterations", 1000000);
+ int size = Integer.getInteger("size", 256);
+ a = new char[size];
+ b = new byte[size];
+ bt = new byte[size];
+ for (int i = 0; i < size; i++) {
+ char c = (char) rnd.nextInt(maxchar);
+ if (!enc.canEncode(c)) {
+ System.out.printf("Something wrong: can't encode c=%03x\n", (int)c);
+ System.exit(97);
+ }
+ a[i] = c;
+ b[i] = (byte)-1;
+ bt[i] = (byte)c;
+ }
+ ba = CharBuffer.wrap(a);
+ bb = ByteBuffer.wrap(b);
+ boolean enc_res = enc.encode(ba, bb, true).isUnderflow();
+ if (!enc_res || !Arrays.equals(b, bt)) {
+ failed = true;
+ System.out.println("Failed 1: Encoder.encode char[" + size + "]");
+ }
+ for (int i = 0; i < size; i++) {
+ b[i] = (byte)-1;
+ }
+
+ // Make sure to recompile method if needed before performance run.
+ for (int i = 0; i < 10000; i++) {
+ ba.clear(); bb.clear();
+ enc_res = enc_res && enc.encode(ba, bb, true).isUnderflow();
+ }
+ for (int i = 0; i < size; i++) {
+ b[i] = (byte)-1;
+ }
+ for (int i = 0; i < 10000; i++) {
+ ba.clear(); bb.clear();
+ enc_res = enc_res && enc.encode(ba, bb, true).isUnderflow();
+ }
+ if (!enc_res || !Arrays.equals(b, bt)) {
+ failed = true;
+ System.out.println("Failed 2: Encoder.encode char[" + size + "]");
+ }
+ for (int i = 0; i < size; i++) {
+ b[i] = (byte)-1;
+ }
+
+ System.out.println("Testing ISO_8859_1$Encode.encodeArrayLoop() performance");
+ long start = System.currentTimeMillis();
+ for (int i = 0; i < itrs; i++) {
+ ba.clear(); bb.clear();
+ enc_res = enc_res && enc.encode(ba, bb, true).isUnderflow();
+ }
+ long end = System.currentTimeMillis();
+ if (!enc_res || !Arrays.equals(b, bt)) {
+ failed = true;
+ System.out.println("Failed 3: Encoder.encode char[" + size + "]");
+ } else {
+ System.out.println("size: " + size + " time: " + (end - start));
+ }
+
+ // Test sun.nio.cs.ISO_8859_1$Encode.encode() performance.
+
+ // Make sure to recompile method if needed before performance run.
+ result = 0;
+ for (int i = 0; i < size; i++) {
+ b[i] = (byte)-1;
+ }
+ for (int i = 0; i < 10000; i++) {
+ result += arrenc.encode(a, 0, size, b);
+ }
+ for (int i = 0; i < size; i++) {
+ b[i] = (byte)-1;
+ }
+ for (int i = 0; i < 10000; i++) {
+ result += arrenc.encode(a, 0, size, b);
+ }
+ if (result != size*20000 || !Arrays.equals(b, bt)) {
+ failed = true;
+ System.out.println("Failed 1: ArrayEncoder.encode char[" + SIZE + "]");
+ }
+ for (int i = 0; i < size; i++) {
+ b[i] = (byte)-1;
+ }
+
+ System.out.println("Testing ISO_8859_1$Encode.encode() performance");
+ result = 0;
+ start = System.currentTimeMillis();
+ for (int i = 0; i < itrs; i++) {
+ result += arrenc.encode(a, 0, size, b);
+ }
+ end = System.currentTimeMillis();
+ if (!Arrays.equals(b, bt)) {
+ failed = true;
+ System.out.println("Failed 2: ArrayEncoder.encode char[" + size + "]");
+ } else {
+ System.out.println("size: " + size + " time: " + (end - start));
+ }
+
+ if (failed) {
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+}
--- a/hotspot/test/compiler/7190310/Test7190310.java Thu Jan 31 10:10:34 2013 +0100
+++ b/hotspot/test/compiler/7190310/Test7190310.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,16 @@
*/
/*
- * Manual test
+ * @test
+ * @bug 7190310
+ * @summary Inlining WeakReference.get(), and hoisting $referent may lead to non-terminating loops
+ * @run main/othervm/timeout=600 -Xbatch Test7190310
+ */
+
+/*
+ * Note bug exhibits as infinite loop, timeout is helpful.
+ * It should normally finish pretty quickly, but on some especially slow machines
+ * it may not. The companion _unsafe test lacks a timeout, but that is okay.
*/
import java.lang.ref.*;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8005419/Test8005419.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005419
+ * @summary Improve intrinsics code performance on x86 by using AVX2
+ * @run main/othervm -Xbatch -Xmx64m Test8005419
+ *
+ */
+
+public class Test8005419 {
+ public static int SIZE = 64;
+
+ public static void main(String[] args) {
+ char[] a = new char[SIZE];
+ char[] b = new char[SIZE];
+
+ for (int i = 16; i < SIZE; i++) {
+ a[i] = (char)i;
+ b[i] = (char)i;
+ }
+ String s1 = new String(a);
+ String s2 = new String(b);
+
+ // Warm up
+ boolean failed = false;
+ int result = 0;
+ for (int i = 0; i < 10000; i++) {
+ result += test(s1, s2);
+ }
+ for (int i = 0; i < 10000; i++) {
+ result += test(s1, s2);
+ }
+ for (int i = 0; i < 10000; i++) {
+ result += test(s1, s2);
+ }
+ if (result != 0) failed = true;
+
+ System.out.println("Start testing");
+ // Compare same string
+ result = test(s1, s1);
+ if (result != 0) {
+ failed = true;
+ System.out.println("Failed same: result = " + result + ", expected 0");
+ }
+ // Compare equal strings
+ for (int i = 1; i <= SIZE; i++) {
+ s1 = new String(a, 0, i);
+ s2 = new String(b, 0, i);
+ result = test(s1, s2);
+ if (result != 0) {
+ failed = true;
+ System.out.println("Failed equals s1[" + i + "], s2[" + i + "]: result = " + result + ", expected 0");
+ }
+ }
+ // Compare equal strings but different sizes
+ for (int i = 1; i <= SIZE; i++) {
+ s1 = new String(a, 0, i);
+ for (int j = 1; j <= SIZE; j++) {
+ s2 = new String(b, 0, j);
+ result = test(s1, s2);
+ if (result != (i-j)) {
+ failed = true;
+ System.out.println("Failed diff size s1[" + i + "], s2[" + j + "]: result = " + result + ", expected " + (i-j));
+ }
+ }
+ }
+ // Compare strings with one char different and different sizes
+ for (int i = 1; i <= SIZE; i++) {
+ s1 = new String(a, 0, i);
+ for (int j = 0; j < i; j++) {
+ b[j] -= 3; // change char
+ s2 = new String(b, 0, i);
+ result = test(s1, s2);
+ int chdiff = a[j] - b[j];
+ if (result != chdiff) {
+ failed = true;
+ System.out.println("Failed diff char s1[" + i + "], s2[" + i + "]: result = " + result + ", expected " + chdiff);
+ }
+ result = test(s2, s1);
+ chdiff = b[j] - a[j];
+ if (result != chdiff) {
+ failed = true;
+ System.out.println("Failed diff char s2[" + i + "], s1[" + i + "]: result = " + result + ", expected " + chdiff);
+ }
+ b[j] += 3; // restore
+ }
+ }
+ if (failed) {
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+ System.out.println("PASSED");
+ }
+
+ private static int test(String str1, String str2) {
+ return str1.compareTo(str2);
+ }
+}
--- a/jaxp/.hgtags Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxp/.hgtags Thu Jan 31 10:22:25 2013 -0800
@@ -194,3 +194,5 @@
6ec9edffc286c9c9ac96c9cd2050b01cb5d514a8 jdk8-b70
499be952a291cec1dc774a84a238941d6faf772d jdk8-b71
bdf2af722a6b54fca47d8c51d17a1b8f41dd7a3e jdk8-b72
+84946404d1e1de003ed2bf218ef8d48906a90e37 jdk8-b73
+2087e24a4357eceb6432e94918e75fdc706a27d6 jdk8-b74
--- a/jaxp/makefiles/BuildJaxp.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxp/makefiles/BuildJaxp.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -47,11 +47,23 @@
$(eval $(call SetupJavaCompilation,BUILD_JAXP,\
SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
SRC:=$(JAXP_TOPDIR)/src,\
- CLEAN:=.properties,\
BIN:=$(JAXP_OUTPUTDIR)/classes,\
SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip))
-$(eval $(call SetupArchive,ARCHIVE_JAXP,$(BUILD_JAXP),\
+# Imitate the property cleaning mechanism in the old build. This will likely be replaced
+# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build
+# for now, even though it actually breaks properties containing # in the value.
+# Using nawk to avoid solaris sed.
+$(JAXP_OUTPUTDIR)/classes/%.properties: $(JAXP_TOPDIR)/src/%.properties
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp
+ $(MV) $@.tmp $@
+
+SRC_PROP_FILES := $(shell $(FIND) $(JAXP_TOPDIR)/src -name "*.properties")
+TARGET_PROP_FILES := $(patsubst $(JAXP_TOPDIR)/src/%,$(JAXP_OUTPUTDIR)/classes/%,$(SRC_PROP_FILES))
+
+$(eval $(call SetupArchive,ARCHIVE_JAXP,$(BUILD_JAXP) $(TARGET_PROP_FILES),\
SRCS:=$(JAXP_OUTPUTDIR)/classes,\
SUFFIXES:=.class .properties,\
JAR:=$(JAXP_OUTPUTDIR)/dist/lib/classes.jar))
--- a/jaxp/src/com/sun/org/apache/bcel/internal/Constants.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/Constants.java Thu Jan 31 10:22:25 2013 -0800
@@ -746,27 +746,29 @@
/** Attributes and their corresponding names.
*/
- public static final byte ATTR_UNKNOWN = -1;
- public static final byte ATTR_SOURCE_FILE = 0;
- public static final byte ATTR_CONSTANT_VALUE = 1;
- public static final byte ATTR_CODE = 2;
- public static final byte ATTR_EXCEPTIONS = 3;
- public static final byte ATTR_LINE_NUMBER_TABLE = 4;
- public static final byte ATTR_LOCAL_VARIABLE_TABLE = 5;
- public static final byte ATTR_INNER_CLASSES = 6;
- public static final byte ATTR_SYNTHETIC = 7;
- public static final byte ATTR_DEPRECATED = 8;
- public static final byte ATTR_PMG = 9;
- public static final byte ATTR_SIGNATURE = 10;
- public static final byte ATTR_STACK_MAP = 11;
+ public static final byte ATTR_UNKNOWN = -1;
+ public static final byte ATTR_SOURCE_FILE = 0;
+ public static final byte ATTR_CONSTANT_VALUE = 1;
+ public static final byte ATTR_CODE = 2;
+ public static final byte ATTR_EXCEPTIONS = 3;
+ public static final byte ATTR_LINE_NUMBER_TABLE = 4;
+ public static final byte ATTR_LOCAL_VARIABLE_TABLE = 5;
+ public static final byte ATTR_INNER_CLASSES = 6;
+ public static final byte ATTR_SYNTHETIC = 7;
+ public static final byte ATTR_DEPRECATED = 8;
+ public static final byte ATTR_PMG = 9;
+ public static final byte ATTR_SIGNATURE = 10;
+ public static final byte ATTR_STACK_MAP = 11;
+ public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE = 12;
- public static final short KNOWN_ATTRIBUTES = 12;
+ public static final short KNOWN_ATTRIBUTES = 13;
public static final String[] ATTRIBUTE_NAMES = {
"SourceFile", "ConstantValue", "Code", "Exceptions",
"LineNumberTable", "LocalVariableTable",
"InnerClasses", "Synthetic", "Deprecated",
- "PMGClass", "Signature", "StackMap"
+ "PMGClass", "Signature", "StackMap",
+ "LocalVariableTypeTable"
};
/** Constants used in the StackMap attribute.
--- a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java Thu Jan 31 10:22:25 2013 -0800
@@ -206,6 +206,9 @@
case Constants.ATTR_LOCAL_VARIABLE_TABLE:
return new LocalVariableTable(name_index, length, file, constant_pool);
+ case Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE:
+ return new LocalVariableTypeTable(name_index, length, file, constant_pool);
+
case Constants.ATTR_INNER_CLASSES:
return new InnerClasses(name_index, length, file, constant_pool);
--- a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -210,6 +210,12 @@
stack.pop();
}
+ public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {
+ stack.push(obj);
+ obj.accept(visitor);
+ stack.pop();
+ }
+
public void visitStackMap(StackMap table) {
stack.push(table);
table.accept(visitor);
--- a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -98,6 +98,7 @@
public void visitLineNumberTable(LineNumberTable obj) {}
public void visitLocalVariable(LocalVariable obj) {}
public void visitLocalVariableTable(LocalVariableTable obj) {}
+ public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {}
public void visitMethod(Method obj) {}
public void visitSignature(Signature obj) {}
public void visitSourceFile(SourceFile obj) {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,146 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+package com.sun.org.apache.bcel.internal.classfile;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.sun.org.apache.bcel.internal.Constants;
+import java.io.*;
+
+// The new table is used when generic types are about...
+
+//LocalVariableTable_attribute {
+// u2 attribute_name_index;
+// u4 attribute_length;
+// u2 local_variable_table_length;
+// { u2 start_pc;
+// u2 length;
+// u2 name_index;
+// u2 descriptor_index;
+// u2 index;
+// } local_variable_table[local_variable_table_length];
+// }
+
+//LocalVariableTypeTable_attribute {
+// u2 attribute_name_index;
+// u4 attribute_length;
+// u2 local_variable_type_table_length;
+// {
+// u2 start_pc;
+// u2 length;
+// u2 name_index;
+// u2 signature_index;
+// u2 index;
+// } local_variable_type_table[local_variable_type_table_length];
+// }
+// J5TODO: Needs some testing !
+public class LocalVariableTypeTable extends Attribute {
+ private static final long serialVersionUID = -1082157891095177114L;
+private int local_variable_type_table_length; // Table of local
+ private LocalVariable[] local_variable_type_table; // variables
+
+ public LocalVariableTypeTable(LocalVariableTypeTable c) {
+ this(c.getNameIndex(), c.getLength(), c.getLocalVariableTypeTable(),
+ c.getConstantPool());
+ }
+
+ public LocalVariableTypeTable(int name_index, int length,
+ LocalVariable[] local_variable_table,
+ ConstantPool constant_pool)
+ {
+ super(Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE, name_index, length, constant_pool);
+ setLocalVariableTable(local_variable_table);
+ }
+
+ LocalVariableTypeTable(int nameIdx, int len, DataInputStream dis,ConstantPool cpool) throws IOException {
+ this(nameIdx, len, (LocalVariable[])null, cpool);
+
+ local_variable_type_table_length = (dis.readUnsignedShort());
+ local_variable_type_table = new LocalVariable[local_variable_type_table_length];
+
+ for(int i=0; i < local_variable_type_table_length; i++)
+ local_variable_type_table[i] = new LocalVariable(dis, cpool);
+ }
+
+ @Override
+public void accept(Visitor v) {
+ v.visitLocalVariableTypeTable(this);
+ }
+
+ @Override
+public final void dump(DataOutputStream file) throws IOException
+ {
+ super.dump(file);
+ file.writeShort(local_variable_type_table_length);
+ for(int i=0; i < local_variable_type_table_length; i++)
+ local_variable_type_table[i].dump(file);
+ }
+
+ public final LocalVariable[] getLocalVariableTypeTable() {
+ return local_variable_type_table;
+ }
+
+ public final LocalVariable getLocalVariable(int index) {
+ for(int i=0; i < local_variable_type_table_length; i++)
+ if(local_variable_type_table[i].getIndex() == index)
+ return local_variable_type_table[i];
+
+ return null;
+ }
+
+ public final void setLocalVariableTable(LocalVariable[] local_variable_table)
+ {
+ this.local_variable_type_table = local_variable_table;
+ local_variable_type_table_length = (local_variable_table == null)? 0 :
+ local_variable_table.length;
+ }
+
+ /**
+ * @return String representation.
+ */
+ @Override
+public final String toString() {
+ StringBuilder buf = new StringBuilder();
+
+ for(int i=0; i < local_variable_type_table_length; i++) {
+ buf.append(local_variable_type_table[i].toString());
+
+ if(i < local_variable_type_table_length - 1) buf.append('\n');
+ }
+
+ return buf.toString();
+ }
+
+ /**
+ * @return deep copy of this attribute
+ */
+ @Override
+public Attribute copy(ConstantPool constant_pool) {
+ LocalVariableTypeTable c = (LocalVariableTypeTable)clone();
+
+ c.local_variable_type_table = new LocalVariable[local_variable_type_table_length];
+ for(int i=0; i < local_variable_type_table_length; i++)
+ c.local_variable_type_table[i] = local_variable_type_table[i].copy();
+
+ c.constant_pool = constant_pool;
+ return c;
+ }
+
+ public final int getTableLength() { return local_variable_type_table_length; }
+}
--- a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -94,6 +94,7 @@
public void visitLineNumberTable(LineNumberTable obj);
public void visitLocalVariable(LocalVariable obj);
public void visitLocalVariableTable(LocalVariableTable obj);
+ public void visitLocalVariableTypeTable(LocalVariableTypeTable obj);
public void visitMethod(Method obj);
public void visitSignature(Signature obj);
public void visitSourceFile(SourceFile obj);
--- a/jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java Thu Jan 31 10:22:25 2013 -0800
@@ -258,6 +258,23 @@
addLocalVariable(l.getName(), Type.getType(l.getSignature()),
l.getIndex(), start, end);
}
+ } else if (a instanceof LocalVariableTypeTable) {
+ LocalVariable[] lv = ((LocalVariableTypeTable) a).getLocalVariableTypeTable();
+ removeLocalVariables();
+ for (int k = 0; k < lv.length; k++) {
+ LocalVariable l = lv[k];
+ InstructionHandle start = il.findHandle(l.getStartPC());
+ InstructionHandle end = il.findHandle(l.getStartPC() + l.getLength());
+ // Repair malformed handles
+ if (null == start) {
+ start = il.getStart();
+ }
+ if (null == end) {
+ end = il.getEnd();
+ }
+ addLocalVariable(l.getName(), Type.getType(l.getSignature()), l
+ .getIndex(), start, end);
+ }
} else
addCodeAttribute(a);
}
--- a/jaxws/.hgtags Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxws/.hgtags Thu Jan 31 10:22:25 2013 -0800
@@ -194,3 +194,5 @@
3b1c2733d47ee9f8c530925df4041c59f9ee5a31 jdk8-b70
f577a39c9fb3d5820248c13c2cc74a192a9313e0 jdk8-b71
d9707230294d54e695e745a90de6112909100f12 jdk8-b72
+c606f644a5d9118c14b5822738bf23c300f14f24 jdk8-b73
+12db3c5a3393b03eeb09ff26f418c4420c21aaab jdk8-b74
--- a/jaxws/makefiles/BuildJaxws.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jaxws/makefiles/BuildJaxws.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -48,14 +48,12 @@
$(eval $(call SetupJavaCompilation,BUILD_JAF,\
SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\
- CLEAN:=.properties,\
COPY:="dummy",\
BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes))
$(eval $(call SetupJavaCompilation,BUILD_JAXWS,\
SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\
- CLEAN:=.properties,\
BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\
COPY:=.xsd,\
COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \
@@ -76,7 +74,31 @@
BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin
-$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF),\
+# Imitate the property cleaning mechanism in the old build. This will likely be replaced
+# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build
+# for now, even though it actually breaks properties containing # in the value.
+# Using nawk to avoid solaris sed.
+$(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_classes/%.properties
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp
+ $(MV) $@.tmp $@
+
+JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties")
+TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%,\
+ $(JAXWS_OUTPUTDIR)/jaxws_classes/%,$(JAXWS_SRC_PROP_FILES))
+
+$(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties
+ $(MKDIR) -p $(@D)
+ $(RM) $@ $@.tmp
+ $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp
+ $(MV) $@.tmp $@
+
+JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties")
+TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%,\
+ $(JAXWS_OUTPUTDIR)/jaf_classes/%,$(JAF_SRC_PROP_FILES))
+
+$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES),\
SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\
SUFFIXES:=.class .properties .xsd .java \
com.sun.mirror.apt.AnnotationProcessorFactory \
--- a/jdk/.hgtags Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/.hgtags Thu Jan 31 10:22:25 2013 -0800
@@ -195,3 +195,4 @@
2a5af0f766d0acd68a81fb08fe11fd66795f86af jdk8-b71
32a57e645e012a1f0665c075969ca598e0dbb948 jdk8-b72
733885f57e14cc27f5a5ff0dffe641d2fa3c704a jdk8-b73
+57d5d954462831ac353a1f40d3bb05ddb4620952 jdk8-b74
--- a/jdk/make/Makefile Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/make/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -237,6 +237,9 @@
ifeq ($(PLATFORM), macosx)
SUBDIRS += apple
endif
+ifeq ($(PLATFORM), windows)
+ SUBDIRS += bridge
+endif
SUBDIRS_tools = launchers
SUBDIRS_misc = org jpda
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/AccessBridgeJava/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,93 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Makefile for building AccessBridge
+#
+BUILDDIR = ../..
+PRODUCT = java
+PACKAGE = com.sun.java.accessibility
+
+include $(BUILDDIR)/common/Defs.gmk
+JARFILE = $(EXTDIR)/access-bridge$(ABSUFFIX).jar
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+ ABPLATFORM = 64bit
+ ABSUFFIX = -64
+else
+ifeq ($(ARCH_DATA_MODEL), 32)
+ifdef ABLEGACY
+ ABSUFFIX =
+ ABPLATFORM = legacy
+else
+ ABPLATFORM = 32bit
+ ABSUFFIX = -32
+endif
+endif
+endif
+
+#
+# Java files to compile.
+#
+FILES_java = com/sun/java/accessibility/AccessBridge.java
+
+#
+# Location for the newly built classfiles.
+#
+CLASSDESTDIR = $(TEMPDIR)/classes
+
+#
+# Rules
+#
+CLASSDESTDIR = $(TEMPDIR)/classes
+
+FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
+
+build: prebuild
+
+prebuild:
+ $(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridge.java \
+ $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility
+
+all : build $(JARFILE)
+
+#
+# JAR file
+#
+$(JARFILE): \
+ $(FILES_class)
+ $(BOOT_JAR_CMD) -cf $(JARFILE) \
+ -C $(CLASSDESTDIR) com \
+ $(BOOT_JAR_JFLAGS)
+ @$(java-vm-cleanup)
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
+
+clean clobber::
+ $(RM) -r $(CLASSDESTDIR) \
+ $(EXTDIR)/$(JARFILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/JAWTAccessBridge/Files_cpp.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Native files to compile.
+FILES_cpp = \
+ JAWTAccessBridge.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/JAWTAccessBridge/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Makefile for building JAWTAccessBridge
+#
+
+BUILDDIR = ../..
+LIBRARY = JAWTAccessBridge$(ABSUFFIX)
+include $(BUILDDIR)/common/Defs.gmk
+
+# Indicate we want the C++ compiler to do the linking.
+CPLUSPLUSLIBRARY=true
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+ ABSUFFIX = -64
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
+ ABRIDGE_MACHINE=X64
+else
+ifeq ($(ARCH_DATA_MODEL), 32)
+ ABRIDGE_MACHINE=I386
+ifdef ABLEGACY
+ ABSUFFIX =
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
+else
+ ABSUFFIX = -32
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
+endif
+endif
+endif
+
+include FILES_cpp.gmk
+
+VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
+
+OTHER_CPPFLAGS += -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
+LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
+ uuid.lib odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
+ /def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/JAWTAccessBridge.DEF /libpath:"$(LIBDIR)"
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Library.gmk
+
+vpath %.cpp $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.RC $(CLOSED_PLATFORM_SRC)/native/sun/bridge
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/Jabswitch/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,63 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Makefile for building jabswitch.exe
+#
+
+BUILDDIR = ../..
+PROGRAM = jabswitch
+include $(BUILDDIR)/common/Defs.gmk
+
+# Indicate we want the C++ compiler to do the linking.
+CPLUSPLUSLIBRARY=true
+
+VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
+VERSIONRES = $(TEMPDIR)/AccessBridgeStatusWindow.res
+
+JAB_EXE= $(TEMPDIR)/jabswitch.exe
+
+JAB_SRC = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.cpp
+
+JAB_MANIFEST_INP = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.manifest
+JAB_MANIFEST_OUT = $(TEMPDIR)/jabswitch.exe.intermediate.manifest
+
+RC_FLAGS += /fo "$(VERSIONRES)"
+OTHER_CPPFLAGS += /MD /Fo"$(TEMPDIR)/" /Fd"$(TEMPDIR)/" /analyze- /Od /Gd /nologo /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /RTC1 /W3 /ZI /Zc:wchar_t /EHsc
+LDDFLAGS += Advapi32.lib Version.lib User32.lib
+
+all: buildexe copyfilejab
+
+buildexe :
+ $(CD) $(TEMPDIR)
+ $(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE)
+ $(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE)
+ $(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)
+
+copyfilejab :
+ $(CP) $(JAB_EXE) $(BINDIR)
+
+vpath %.cpp $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.rc $(CLOSED_PLATFORM_SRC)/native/sun/bridge
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/Jaccess/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,85 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Makefile for building jaccess
+#
+BUILDDIR = ../..
+PRODUCT = java
+PACKAGE = com.sun.java.accessibility.jaccess
+
+include $(BUILDDIR)/common/Defs.gmk
+JARFILE = $(EXTDIR)/jaccess.jar
+
+#
+# Java files to compile.
+#
+#AUTO_FILES_JAVA_DIRS = $(CLOSED_PLATFORM_SRC)/bridge
+FILES_java = \
+ com/sun/java/accessibility/util/AccessibilityEventMonitor.java \
+ com/sun/java/accessibility/util/AccessibilityListenerList.java \
+ com/sun/java/accessibility/util/AWTEventMonitor.java \
+ com/sun/java/accessibility/util/EventID.java \
+ com/sun/java/accessibility/util/EventQueueMonitor.java \
+ com/sun/java/accessibility/util/GUIInitializedListener.java \
+ com/sun/java/accessibility/util/GUIInitializedMulticaster.java \
+ com/sun/java/accessibility/util/SwingEventMonitor.java \
+ com/sun/java/accessibility/util/TopLevelWindowListener.java \
+ com/sun/java/accessibility/util/TopLevelWindowMulticaster.java \
+ com/sun/java/accessibility/util/Translator.java \
+ com/sun/java/accessibility/util/java/awt/ButtonTranslator.java \
+ com/sun/java/accessibility/util/java/awt/CheckboxTranslator.java \
+ com/sun/java/accessibility/util/java/awt/LabelTranslator.java \
+ com/sun/java/accessibility/util/java/awt/ListTranslator.java \
+ com/sun/java/accessibility/util/java/awt/TextComponentTranslator.java
+
+#
+# Rules
+#
+CLASSDESTDIR = $(TEMPDIR)/classes
+
+FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
+
+all : build $(JARFILE)
+
+#
+# JAR file
+#
+$(JARFILE): \
+ $(FILES_class)
+ $(BOOT_JAR_CMD) -cf $(JARFILE) \
+ -C $(CLASSDESTDIR) com \
+ $(BOOT_JAR_JFLAGS)
+ @$(java-vm-cleanup)
+
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
+
+clean clobber::
+ $(RM) -r $(CLASSDESTDIR) \
+ $(EXTDIR)/$(JARFILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/JavaAccessBridge/Files_cpp.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Native files to compile.
+FILES_cpp = \
+ AccessBridgeATInstance.cpp \
+ AccessBridgeDebug.cpp \
+ AccessBridgeJavaEntryPoints.cpp \
+ AccessBridgeMessages.cpp \
+ JavaAccessBridge.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/JavaAccessBridge/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,90 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Makefile for building JavaAccessBridge.DLL
+#
+
+BUILDDIR = ../..
+LIBRARY = JavaAccessBridge$(ABSUFFIX)
+include $(BUILDDIR)/common/Defs.gmk
+
+# Indicate we want the C++ compiler to do the linking.
+CPLUSPLUSLIBRARY=true
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+ ABSUFFIX = -64
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
+ ABRIDGE_MACHINE=X64
+else
+ifeq ($(ARCH_DATA_MODEL), 32)
+ ABRIDGE_MACHINE=I386
+ifdef ABLEGACY
+ ABSUFFIX =
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
+else
+ ABSUFFIX = -32
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
+endif
+endif
+endif
+
+include FILES_cpp.gmk
+
+PLATFORM_INCLUDE_BRIDGE = $(PLATFORM_INCLUDE)/bridge
+
+VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
+
+OTHER_CPPFLAGS += -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
+LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
+ odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
+ /def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/JavaAccessBridge.DEF /libpath:"$(LIBDIR)"
+
+all : build postbuild
+
+postbuild :
+ $(MKDIR) -p $(PLATFORM_INCLUDE_BRIDGE)
+ $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/accessibility.properties $(LIBDIR)
+ $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCallbacks.h $(PLATFORM_INCLUDE_BRIDGE)
+ $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCalls.h $(PLATFORM_INCLUDE_BRIDGE)
+ $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgePackages.h $(PLATFORM_INCLUDE_BRIDGE)
+ $(CP) $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeCalls.c $(PLATFORM_INCLUDE_BRIDGE)
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Library.gmk
+
+vpath %.cpp $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.DEF $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.rc $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.c $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.h $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+
+#
+# Extra clean rule.
+#
+clean clobber::
+ $(RM) $(FILES_h)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,65 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Makefile for building Java Access Bridge
+#
+
+BUILDDIR = ..
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+#
+ifndef OPENJDK
+ifeq ($(PLATFORM), windows)
+include $(BUILDDIR)/common/Subdirs.gmk
+
+#
+# build for 32 and 64 bit (new api)
+#
+SUBDIRS = Jaccess JavaAccessBridge WindowsAccessBridge JAWTAccessBridge AccessBridgeJava Jabswitch
+#
+# build for legacy
+#
+ifeq ($(ARCH_DATA_MODEL), 32)
+OTHERSUBDIRS_MAKEFLAGS += ABLEGACY=true
+OTHERSUBDIRS = JavaAccessBridge WindowsAccessBridge JAWTAccessBridge AccessBridgeJava
+endif
+
+ifeq ($(ARCH_DATA_MODEL), 32)
+all build clean clobber ::
+ $(SUBDIRS-loop)
+ $(OTHERSUBDIRS-loop)
+else
+all build clean clobber ::
+ $(SUBDIRS-loop)
+endif
+
+clean::
+ $(RM) -r $(CLASSBINDIR) $(CLASSBINDIR)
+
+endif # PLATFORM
+endif #OPENJDK
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/WindowsAccessBridge/Files_cpp.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Native files to compile.
+FILES_cpp = \
+ AccessBridgeJavaVMInstance.cpp \
+ AccessBridgeMessageQueue.cpp \
+ AccessBridgeMessages.cpp \
+ AccessBridgeWindowsEntryPoints.cpp \
+ WinAccessBridge.cpp \
+ AccessBridgeDebug.cpp \
+ AccessBridgeEventHandler.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/bridge/WindowsAccessBridge/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,71 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. 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.
+#
+
+#
+# Makefile for building WindowsAccessBridge.dll
+#
+
+BUILDDIR = ../..
+LIBRARY = WindowsAccessBridge$(ABSUFFIX)
+include $(BUILDDIR)/common/Defs.gmk
+
+# Indicate we want the C++ compiler to do the linking.
+CPLUSPLUSLIBRARY=true
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+ ABSUFFIX = -64
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_64
+ ABRIDGE_MACHINE=X64
+else
+ifeq ($(ARCH_DATA_MODEL), 32)
+ ABRIDGE_MACHINE=I386
+ifdef ABLEGACY
+ ABSUFFIX =
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_LEGACY
+else
+ ABSUFFIX = -32
+ ACCESSBRIDGE_ARCH = ACCESSBRIDGE_ARCH_32
+endif
+endif
+endif
+
+include FILES_cpp.gmk
+
+VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc
+
+OTHER_CPPFLAGS += -MT -D$(ACCESSBRIDGE_ARCH) -I "$(INCLUDEDIR)" -I "$(PLATFORM_INCLUDE)"
+LDLIBS += kernel32.lib user32.lib gdi32.lib winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:windows /dll /incremental:no /machine:$(ABRIDGE_MACHINE) \
+ /def:$(CLOSED_PLATFORM_SRC)/native/sun/bridge/WinAccessBridge.DEF /libpath:"$(LIBDIR)"
+
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Library.gmk
+
+vpath %.cpp $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.DEF $(CLOSED_PLATFORM_SRC)/native/sun/bridge
+vpath %.rc $(CLOSED_PLATFORM_SRC)/native/sun/bridge
--- a/jdk/makefiles/Bundles.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/Bundles.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -68,24 +68,25 @@
endif
-JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR) ! -type d)
-JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR) ! -type d)
+JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR))
+JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR))
-JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR),$(JDK_BUNDLE_DIR)/Home,$(JDK_FILE_LIST))
-JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR),$(JRE_BUNDLE_DIR)/Home,$(JRE_FILE_LIST))
+JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR)/,$(JDK_BUNDLE_DIR)/Home/,$(JDK_FILE_LIST))
+JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR)/,$(JRE_BUNDLE_DIR)/Home/,$(JRE_FILE_LIST))
# The old builds implementation of this did not preserve symlinks so
# make sure they are followed and the contents copied instead.
-# To fix this, just replace copy with install-file macro.
+# To fix this, remove -L
+# Copy empty directories (jre/lib/applet).
$(JDK_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/%
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D)
- $(CP) -f -R -L '$<' '$@'
+ if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -L '$<' '$@'; fi
$(JRE_BUNDLE_DIR)/Home/%: $(JRE_IMAGE_DIR)/%
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D)
- $(CP) -f -R -L '$<' '$@'
+ if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -L '$<' '$@'; fi
$(JDK_BUNDLE_DIR)/MacOS/libjli.dylib:
$(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@)
--- a/jdk/makefiles/CompileJavaClasses.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/CompileJavaClasses.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -59,6 +59,12 @@
# This gets built on unix platforms implicitly in the old build even though
# it's excluded in the closed build.
EXCLUDES+=sun/java2d/pisces
+
+ # AccessBridge is compiled separately below.
+ EXFILES += AccessBridge.java \
+ com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java
+ # This seems to never be built
+ EXCLUDES += com/sun/java/accessibility/extensions
endif
endif
@@ -248,10 +254,8 @@
# Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA
ifndef OPENJDK
- CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes
- ifneq ($(OPENJDK_TARGET_OS_API_DIR),windows)
- CLOSED_SRC_DIRS += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
- endif
+ CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes \
+ $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
endif
MACOSX_SRC_DIRS :=
@@ -364,8 +368,44 @@
##########################################################################################
-# copy with -a to preserve timestamps so dependencies down the line aren't messed up
+ifndef OPENJDK
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32,\
+ SETUP:=GENERATE_JDKBYTECODE,\
+ JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
+ SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/32bit,\
+ BIN:=$(JDK_OUTPUTDIR)/classes_ab/32bit))
+
+ $(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK)
+
+ $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_LEGACY,\
+ SETUP:=GENERATE_JDKBYTECODE,\
+ JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
+ SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/legacy,\
+ BIN:=$(JDK_OUTPUTDIR)/classes_ab/legacy))
+
+ $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK)
+
+else
+
+ $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_64,\
+ SETUP:=GENERATE_JDKBYTECODE,\
+ JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
+ SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/64bit,\
+ BIN:=$(JDK_OUTPUTDIR)/classes_ab/64bit))
+
+ $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)
+
+endif
+endif
+endif
+
+##########################################################################################
+
all: $(BUILD_JDK) $(BUILD_ALTCLASSES) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
- $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin
+ $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
+ $(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
+ $(BUILD_ACCESSBRIDGE_LEGACY)
.PHONY: all
--- a/jdk/makefiles/CompileLaunchers.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/CompileLaunchers.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -591,6 +591,34 @@
endif
##########################################################################################
+# jabswitch
+
+ifndef OPENJDK
+ifeq ($(OPENJDK_TARGET_OS),windows)
+
+ $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH,\
+ SRC:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge,\
+ INCLUDE_FILES:=jabswitch.cpp,\
+ LANG:=C++,\
+ CFLAGS:=$(filter-out -Zc:wchar_t-,$(CFLAGS_JDKEXE)) -Zc:wchar_t \
+ -analyze- -Od -Gd -D_WINDOWS \
+ -D_UNICODE -DUNICODE -RTC1 -EHsc,\
+ LDFLAGS:=$(LDFLAGS_JDKEXE) \
+ Advapi32.lib Version.lib User32.lib,\
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jabswitch,\
+ OUTPUT_DIR:=$(JDK_OUTPUTDIR)/bin,\
+ PROGRAM:=jabswitch,\
+ DEBUG_SYMBOLS:=true,\
+ VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc,\
+ RC_FLAGS:=$(RC_FLAGS),\
+ MANIFEST:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest))
+
+ BUILD_LAUNCHERS += $(BUILD_JABSWITCH)
+
+endif
+endif
+
+##########################################################################################
$(BUILD_LAUNCHERS) : $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk
--- a/jdk/makefiles/CompileNativeLibraries.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/CompileNativeLibraries.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -3296,6 +3296,97 @@
##########################################################################################
+ifndef OPENJDK
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ ACCESSBRIDGE_SRCDIR:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
+
+ define SetupAccessBridge
+ # Parameter 1 Suffix
+ # Parameter 2 Machine
+ # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
+
+ $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1,\
+ LIBRARY=JAWTAccessBridge$1,\
+ OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
+ SRC:=$(ACCESSBRIDGE_SRCDIR),\
+ INCLUDE_FILES:=JAWTAccessBridge.cpp,\
+ LANG:=C++,\
+ OPTIMIZATION:=LOW,\
+ CFLAGS:=$(CFLAGS_JDKLIB) \
+ -DACCESSBRIDGE_ARCH_$3,\
+ LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
+ winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
+ -subsystem:windows -machine:$2 \
+ -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF,\
+ VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\
+ RC_FLAGS:=$(RC_FLAGS),\
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1,\
+ DEBUG_SYMBOLS:=true)
+
+ $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
+
+ $(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1,\
+ LIBRARY=JavaAccessBridge$1,\
+ OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
+ SRC:=$(ACCESSBRIDGE_SRCDIR),\
+ INCLUDE_FILES:=AccessBridgeATInstance.cpp AccessBridgeDebug.cpp \
+ AccessBridgeJavaEntryPoints.cpp \
+ AccessBridgeMessages.cpp JavaAccessBridge.cpp,\
+ LANG:=C++,\
+ OPTIMIZATION:=LOW,\
+ CFLAGS:=$(CFLAGS_JDKLIB) \
+ -DACCESSBRIDGE_ARCH_$3,\
+ LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
+ -subsystem:windows -machine:$2 \
+ -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF,\
+ VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\
+ RC_FLAGS:=$(RC_FLAGS),\
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1,\
+ DEBUG_SYMBOLS:=true)
+
+ $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1,\
+ LIBRARY=WindowsAccessBridge$1,\
+ OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
+ SRC:=$(ACCESSBRIDGE_SRCDIR),\
+ INCLUDE_FILES:=AccessBridgeJavaVMInstance.cpp AccessBridgeMessageQueue.cpp \
+ AccessBridgeMessages.cpp AccessBridgeWindowsEntryPoints.cpp \
+ WinAccessBridge.cpp AccessBridgeDebug.cpp \
+ AccessBridgeEventHandler.cpp,\
+ LANG:=C++,\
+ OPTIMIZATION:=LOW,\
+ CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKLIB)) -MT \
+ -DACCESSBRIDGE_ARCH_$3,\
+ LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib \
+ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
+ -subsystem:windows -machine:$2 \
+ -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF,\
+ VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\
+ RC_FLAGS:=$(RC_FLAGS),\
+ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1,\
+ DEBUG_SYMBOLS:=true)
+
+ BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \
+ $$(BUILD_WINDOWSACCESSBRIDGE$1)
+
+ endef
+
+ ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
+ $(eval $(call SetupAccessBridge,-32,I386,32))
+ $(eval $(call SetupAccessBridge,,I386,LEGACY))
+ else
+ $(eval $(call SetupAccessBridge,-64,X64,64))
+ endif
+endif
+endif
+
+
+##########################################################################################
+
all: $(COPY_FILES) $(BUILD_LIBRARIES)
.PHONY: all
--- a/jdk/makefiles/CopyFiles.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/CopyFiles.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -42,7 +42,7 @@
$(INCLUDEDIR)/jvmticmlr.h \
$(INCLUDEDIR)/classfile_constants.h \
$(INCLUDEDIR)/jawt.h \
- $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \
+ $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \
$(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h
$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h
@@ -59,6 +59,27 @@
##########################################################################################
+ifndef OPENJDK
+ifeq ($(OPENJDK_TARGET_OS), windows)
+ COPY_FILES += $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCallbacks.h \
+ $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \
+ $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \
+ $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \
+ $(JDK_OUTPUTDIR)/lib/accessibility.properties
+
+ $(OPENJDK_TARGET_OS_INCLUDE)/bridge/%: \
+ $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/%
+ $(install-file)
+
+ $(JDK_OUTPUTDIR)/lib/accessibility.properties: \
+ $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties
+ $(install-file)
+
+endif
+endif
+
+##########################################################################################
+
LIBDIR = $(JDK_OUTPUTDIR)/lib
SERVICETAG_LIBDIR = $(LIBDIR)/servicetag
@@ -267,10 +288,12 @@
ifeq ($(OPENJDK_TARGET_OS),windows)
MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL))
+ # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
$(MSVCR_TARGET): $(MSVCR_DLL)
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
+ $(CHMOD) a+rx $@
COPY_FILES += $(MSVCR_TARGET)
endif
@@ -317,7 +340,7 @@
$(MKDIR) -p $(@D)
$(RM) $(JVMCFG)
$(PRINTF) "-client KNOWN\n">$(JVMCFG)
- $(PRINTF) "-server IGNORE\n">>$(JVMCFG)
+ $(PRINTF) "-server ALIASED_TO -client\n">>$(JVMCFG)
$(PRINTF) "-hotspot ALIASED_TO -client\n">>$(JVMCFG)
$(PRINTF) "-classic WARN\n">>$(JVMCFG)
$(PRINTF) "-native ERROR\n">>$(JVMCFG)
--- a/jdk/makefiles/CreateJars.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/CreateJars.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -141,6 +141,7 @@
com/sun/crypto/provider \
com/sun/istack/internal/tools \
com/sun/jarsigner \
+ com/sun/java/accessibility \
com/sun/javadoc \
com/sun/jdi \
com/sun/net/ssl/internal/ssl \
@@ -941,6 +942,47 @@
##########################################################################################
+ifndef OPENJDK
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ $(eval $(call SetupArchive,BUILD_JACCESS_JAR,,\
+ SRCS:=$(JDK_OUTPUTDIR)/classes,\
+ INCLUDES:=com/sun/java/accessibility/util,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar,\
+ SKIP_METAINF:=true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
+
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR,,\
+ SRCS:=$(JDK_OUTPUTDIR)/classes_ab/32bit $(JDK_OUTPUTDIR)/classes,\
+ INCLUDES:=com/sun/java/accessibility,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar,\
+ SKIP_METAINF:=true))
+
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR,,\
+ SRCS:=$(JDK_OUTPUTDIR)/classes_ab/legacy $(JDK_OUTPUTDIR)/classes,\
+ INCLUDES:=com/sun/java/accessibility,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar,\
+ SKIP_METAINF:=true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \
+ $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar
+ else
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR,,\
+ SRCS:=$(JDK_OUTPUTDIR)/classes_ab/64bit $(JDK_OUTPUTDIR)/classes,\
+ INCLUDES:=com/sun/java/accessibility,\
+ EXCLUDES:=com/sun/java/accessibility/util/java,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar,\
+ SKIP_METAINF:=true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
+ endif
+endif
+endif
+
+##########################################################################################
+
#
# This is an empty jar (only contains manifest) and fits poorly into framework...
# create simple rule instead
--- a/jdk/makefiles/GensrcMisc.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/GensrcMisc.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -190,3 +190,36 @@
endif
+
+##########################################################################################
+
+ifndef OPENJDK
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ AB_GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc_ab
+ AB_SRC_DIR := $(JDK_TOPDIR)/src/closed/windows/classes/com/sun/java/accessibility
+
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java: \
+ $(AB_SRC_DIR)/32bit/AccessBridge.java
+ $(install-file)
+
+ $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java: \
+ $(AB_SRC_DIR)/legacy/AccessBridge.java
+ $(install-file)
+
+ GENSRC_MISC += $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java \
+ $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java
+
+ else
+ $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \
+ $(AB_SRC_DIR)/64bit/AccessBridge.java
+ $(install-file)
+
+ GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java
+
+ endif
+endif
+endif
+
+##########################################################################################
\ No newline at end of file
--- a/jdk/makefiles/GensrcSwing.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/GensrcSwing.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -68,7 +68,7 @@
# Dummy variable so far, in the old build system it was false by default
SWINGBEAN_DEBUG_FLAG = false
# GenDocletBeanInfo is compiled in Tools.gmk and picks up from $(JDK_OUTPUTDIR)/btclasses
-$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) $(JDK_OUTPUTDIR)/gensrc/javax/swing/SwingBeanInfoBase.java $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS)
+$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS)
$(ECHO) Generating beaninfo
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
$(JAVA) -Djava.awt.headless=true -jar $(JAVADOC_JARS) -doclet GenDocletBeanInfo \
@@ -84,7 +84,7 @@
# This file is the part of dt.jar
# For some reason it is under $(JDK_TOPDIR)/make/tools/swing-beans/javax/swing
# Should it be moved under $(JDK_TOPDIR)/src/share/classes/javax/swing instead?
-$(JDK_OUTPUTDIR)/gensrc/javax/swing/SwingBeanInfoBase.java: $(DOCLETSRC_DIR)/javax/swing/SwingBeanInfoBase.java
+$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java: $(DOCLETSRC_DIR)/javax/swing/SwingBeanInfoBase.java
$(MKDIR) -p $(@D)
$(CP) $< $@
--- a/jdk/makefiles/GensrcX11Wrappers.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/makefiles/GensrcX11Wrappers.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -23,84 +23,95 @@
# questions.
#
+# This file is responsible for extracting the x11 native struct offsets to
+# the xawt Java library. The tool needs to be run on the os/arch that
+# will host the final jvm, thus the tool cannot be used when cross compiling.
-# This file is responsible for extracting the x11 native struct offsets to
-# the xawt Java library. This is done by compiling and running a native
-# binary, which dumps output to a text file. The offsets differ on 32 and 64
-# bit systems, so care must be taken here.
+# To enable cross compiling, the two versions of the generated offset file,
+# sizes.32 and sizes.64 are committed into the source code repository.
+# These are the ones used.
-# Note: Some of the more complex logic here is most likely not needed anymore.
+# However when not cross compiling, the offset generator tool is built and
+# run, to verify that it still generates the same sizes.32 and sizes.64.
GENSRC_X11WRAPPERS :=
+# Put temporary c-code and executable to calculate offsets here.
+# Also put verification offset file here as well.
GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers
-GENSRC_X11WRAPPERS_DST := $(JDK_OUTPUTDIR)/gensrc
+# Put the generated Java classes used to interface X11 from awt here.
+GENSRC_X11WRAPPERS_DST := $(JDK_OUTPUTDIR)/gensrc/sun/awt/X11
-GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
+# The pre-calculated offset file are stored here:
+GENSRC_SIZER_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
-# Normal case is to generate version according to target bits
-GENSRC_SIZES := sizes.$(OPENJDK_TARGET_CPU_BITS)
-
+# Normal case is to generate only according to target bits
+GENSRC_X11_VERSION := $(OPENJDK_TARGET_CPU_BITS)
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
-ifneq ($(OPENJDK_TARGET_OS), linux)
-# On all 64-bit systems except Linux, generate both 32 and 64 bit versions
-GENSRC_SIZES := sizes.32 sizes.64
-endif
+ ifneq ($(OPENJDK_TARGET_OS), linux)
+ # On all 64-bit systems except Linux, generate both 32 and 64 bit versions
+ GENSRC_X11_VERSION := 32 64
+ endif
else
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-# As a special case, solaris 32-bit also generates the 64-bit version
-GENSRC_SIZES := sizes.32 sizes.64
-endif
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+ # As a special case, solaris 32-bit also generates the 64-bit version
+ GENSRC_X11_VERSION := 32 64
+ endif
endif
-##########################################################################################
+GENSRC_X11_SIZES_USED := $(addprefix $(GENSRC_X11WRAPPERS_TMP)/sizes.,$(GENSRC_X11_VERSION))
+
+# Copy only the sizes.* files that are actually needed. WrapperGenerator picks up any it finds from the
+# file prefix it is given so those not needed need to be hidden.
+$(GENSRC_X11WRAPPERS_TMP)/sizes.%: $(GENSRC_SIZER_DIR)/sizes.%
+ $(MKDIR) -p $(@D)
+ $(RM) '$@'
+ $(SORT) $< > $@
-$(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c : $(GENSRC_SIZER_SRC)/xlibtypes.txt $(BUILD_TOOLS)
+# Run the tool on the offset files copied from the source repository to generate several Java classes
+# used in awt.
+$(JDK_OUTPUTDIR)/gensrc/_the.generated.x11 : $(GENSRC_X11_SIZES_USED) $(BUILD_TOOLS)
+ $(MKDIR) -p $(GENSRC_X11WRAPPERS_DST)
+ $(TOOL_WRAPPERGENERATOR) $(GENSRC_X11WRAPPERS_DST) $(GENSRC_SIZER_DIR)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizes
+ $(TOUCH) $@
+
+GENSRC_X11WRAPPERS += $(JDK_OUTPUTDIR)/gensrc/_the.generated.x11
+
+ifneq ($(COMPILE_TYPE),cross)
+ # This is not a cross compile, regenerate the offset file, so that we
+ # can compare it with the version in the source code repository.
+
+ # Generate the C code for the program that will output the offset file.
+ $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c : $(GENSRC_SIZER_DIR)/xlibtypes.txt $(BUILD_TOOLS)
$(ECHO) "Generating X11 wrapper ($*-bit version)"
$(MKDIR) -p $(@D)
- $(RM) $@
- $(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $*
+ $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
-$(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c
+ # Compile the C code into an executable.
+ $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
$(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- (cd $(@D) && $(BUILD_CC) -m$* -o $@.tmp $< \
+ (cd $(@D) && $(CC) -m$* -o $@ $< \
$(X_CFLAGS) \
$(X_LIBS) \
-I$(JDK_OUTPUTDIR)/include \
-I$(JDK_TOPDIR)/src/share/javavm/export \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
- -I$(JDK_TOPDIR)//src/share/native/common \
+ -I$(JDK_TOPDIR)/src/share/native/common \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
-I$(JDK_TOPDIR)/src/solaris/native/sun/awt \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc)
- $(MV) $@.tmp $@
+
+ .PRECIOUS: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
-# Run the generated sizer binary to create the sizes text file
-$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.% : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe
+ # Run the executable create the offset file and check that it is identical
+ # to the offset file in the source code repository.
+ $(GENSRC_X11WRAPPERS_TMP)/sizes.%.verification : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe
$(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- $< > $@.tmp
- $(MV) $@.tmp $@
+ $(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
+ $(ECHO) Verifying $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp to $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
+ $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
+ mv $@.tmp $@
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86)
- # On solaris-x86 we also need to create the 64-bit version, but we can't run a 64-bit binary
- # As a workaround, copy this from a pre-generated file.
-$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator/sizes.64-solaris-i386
- $(MKDIR) -p $(@D)
- $(RM) $@
- $(CP) $< $@
+ GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
endif
-$(GENSRC_X11WRAPPERS_DST)/_the.generated.x11 : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S)) $(BUILD_TOOLS)
- $(RM) $@
- $(MKDIR) -p $(@D)/sun/awt/X11
- $(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86_64)
- # On solaris-x86_64, as a safety measure, compare the generated file with the checked-in version
- $(ECHO) COMPARING $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 and $(GENSRC_SIZER_SRC)/sizes.64-solaris-i386
- $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-solaris-i386
-endif
- $(TOUCH) $@
-
-GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_DST)/_the.generated.x11
--- a/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaKeyBindings.java Thu Jan 31 10:22:25 2013 -0800
@@ -142,6 +142,21 @@
}));
}
+ LateBoundInputMap getPasswordFieldInputMap() {
+ return new LateBoundInputMap(new SimpleBinding(getTextFieldInputMap().getBindings()),
+ // nullify all the bindings that may discover space characters in the text
+ new SimpleBinding(new String[] {
+ "alt LEFT", null,
+ "alt KP_LEFT", null,
+ "alt RIGHT", null,
+ "alt KP_RIGHT", null,
+ "shift alt LEFT", null,
+ "shift alt KP_LEFT", null,
+ "shift alt RIGHT", null,
+ "shift alt KP_RIGHT", null,
+ }));
+ }
+
LateBoundInputMap getMultiLineTextInputMap() {
return new LateBoundInputMap(new SimpleBinding(commonTextEditorBindings), new SimpleBinding(new String[] {
"ENTER", DefaultEditorKit.insertBreakAction,
--- a/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java Thu Jan 31 10:22:25 2013 -0800
@@ -697,7 +697,7 @@
"Panel.foreground", black,
"Panel.opaque", useOpaqueComponents,
- "PasswordField.focusInputMap", aquaKeyBindings.getTextFieldInputMap(),
+ "PasswordField.focusInputMap", aquaKeyBindings.getPasswordFieldInputMap(),
"PasswordField.font", controlFont,
"PasswordField.background", textBackground,
"PasswordField.foreground", textForeground,
--- a/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaPainter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
import sun.java2d.*;
import sun.print.*;
import apple.laf.*;
-import apple.laf.JRSUIConstants.Widget;
import apple.laf.JRSUIUtils.NineSliceMetricsProvider;
abstract class AquaPainter <T extends JRSUIState> {
@@ -63,7 +62,7 @@
}
static <T extends JRSUIState> AquaPainter<T> create(final T state, final NineSliceMetricsProvider metricsProvider) {
- return new AquaNineSlicingImagePainter<T>(state, metricsProvider);
+ return new AquaNineSlicingImagePainter<>(state, metricsProvider);
}
abstract void paint(final Graphics2D g, final T stateToPaint, final Component c);
@@ -71,7 +70,7 @@
final Rectangle boundsRect = new Rectangle();
final JRSUIControl control;
T state;
- public AquaPainter(final JRSUIControl control, final T state) {
+ AquaPainter(final JRSUIControl control, final T state) {
this.control = control;
this.state = state;
}
@@ -94,14 +93,14 @@
protected final HashMap<T, RecyclableJRSUISlicedImageControl> slicedControlImages;
protected final NineSliceMetricsProvider metricsProvider;
- public AquaNineSlicingImagePainter(final T state) {
+ AquaNineSlicingImagePainter(final T state) {
this(state, null);
}
- public AquaNineSlicingImagePainter(final T state, final NineSliceMetricsProvider metricsProvider) {
+ AquaNineSlicingImagePainter(final T state, final NineSliceMetricsProvider metricsProvider) {
super(new JRSUIControl(false), state);
this.metricsProvider = metricsProvider;
- slicedControlImages = new HashMap<T, RecyclableJRSUISlicedImageControl>();
+ slicedControlImages = new HashMap<>();
}
@Override
@@ -127,7 +126,7 @@
}
static class AquaSingleImagePainter<T extends JRSUIState> extends AquaPainter<T> {
- public AquaSingleImagePainter(final T state) {
+ AquaSingleImagePainter(final T state) {
super(new JRSUIControl(false), state);
}
@@ -137,12 +136,12 @@
}
static void paintFromSingleCachedImage(final Graphics2D g, final JRSUIControl control, final JRSUIState controlState, final Component c, final Rectangle boundsRect) {
- Rectangle clipRect = g.getClipBounds();
- Rectangle intersection = boundsRect.intersection(clipRect);
+ final Rectangle clipRect = g.getClipBounds();
+ final Rectangle intersection = boundsRect.intersection(clipRect);
if (intersection.width <= 0 || intersection.height <= 0) return;
- int imgX1 = intersection.x - boundsRect.x;
- int imgY1 = intersection.y - boundsRect.y;
+ final int imgX1 = intersection.x - boundsRect.x;
+ final int imgY1 = intersection.y - boundsRect.y;
final GraphicsConfiguration config = g.getDeviceConfiguration();
final ImageCache cache = ImageCache.getInstance();
@@ -150,19 +149,14 @@
if (image == null) {
image = new BufferedImage(boundsRect.width, boundsRect.height, BufferedImage.TYPE_INT_ARGB_PRE);
cache.setImage(image, config, boundsRect.width, boundsRect.height, controlState);
- } else {
- g.drawImage(image, intersection.x, intersection.y, intersection.x + intersection.width, intersection.y + intersection.height,
- imgX1, imgY1, imgX1 + intersection.width, imgY1 + intersection.height, null);
- return;
- }
+ final WritableRaster raster = image.getRaster();
+ final DataBufferInt buffer = (DataBufferInt)raster.getDataBuffer();
- final WritableRaster raster = image.getRaster();
- final DataBufferInt buffer = (DataBufferInt)raster.getDataBuffer();
-
- control.set(controlState);
- control.paint(SunWritableRaster.stealData(buffer, 0),
- image.getWidth(), image.getHeight(), 0, 0, boundsRect.width, boundsRect.height);
- SunWritableRaster.markDirty(buffer);
+ control.set(controlState);
+ control.paint(SunWritableRaster.stealData(buffer, 0),
+ image.getWidth(), image.getHeight(), 0, 0, boundsRect.width, boundsRect.height);
+ SunWritableRaster.markDirty(buffer);
+ }
g.drawImage(image, intersection.x, intersection.y, intersection.x + intersection.width, intersection.y + intersection.height,
imgX1, imgY1, imgX1 + intersection.width, imgY1 + intersection.height, null);
@@ -173,7 +167,7 @@
final JRSUIControl control;
final JRSUIState state;
- public RecyclableJRSUISlicedImageControl(final JRSUIControl control, final JRSUIState state, final NineSliceMetrics metrics) {
+ RecyclableJRSUISlicedImageControl(final JRSUIControl control, final JRSUIState state, final NineSliceMetrics metrics) {
super(metrics);
this.control = control;
this.state = state;
--- a/jdk/src/macosx/classes/com/apple/laf/ImageCache.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/com/apple/laf/ImageCache.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
import java.util.*;
import java.util.concurrent.locks.*;
+import apple.laf.JRSUIConstants;
import apple.laf.JRSUIState;
import com.apple.laf.AquaUtils.RecyclableSingleton;
@@ -38,9 +39,9 @@
* SoftReferences so they will be dropped by the GC if heap memory gets tight. When our size hits max pixel count least
* recently requested images are removed first.
*/
-class ImageCache {
+final class ImageCache {
// Ordered Map keyed by args hash, ordered by most recent accessed entry.
- private final LinkedHashMap<Integer, PixelCountSoftReference> map = new LinkedHashMap<Integer, PixelCountSoftReference>(16, 0.75f, true);
+ private final LinkedHashMap<Integer, PixelCountSoftReference> map = new LinkedHashMap<>(16, 0.75f, true);
// Maximum number of pixels to cache, this is used if maxCount
private final int maxPixelCount;
@@ -50,7 +51,7 @@
// Lock for concurrent access to map
private final ReadWriteLock lock = new ReentrantReadWriteLock();
// Reference queue for tracking lost softreferences to images in the cache
- private final ReferenceQueue<Image> referenceQueue = new ReferenceQueue<Image>();
+ private final ReferenceQueue<Image> referenceQueue = new ReferenceQueue<>();
// Singleton Instance
private static final RecyclableSingleton<ImageCache> instance = new RecyclableSingleton<ImageCache>() {
@@ -63,11 +64,11 @@
return instance.get();
}
- public ImageCache(final int maxPixelCount) {
+ ImageCache(final int maxPixelCount) {
this.maxPixelCount = maxPixelCount;
}
- public ImageCache() {
+ ImageCache() {
this((8 * 1024 * 1024) / 4); // 8Mb of pixels
}
@@ -99,10 +100,13 @@
* @param config The graphics configuration, needed if cached image is a Volatile Image. Used as part of cache key
* @param w The image width, used as part of cache key
* @param h The image height, used as part of cache key
- * @param args Other arguments to use as part of the cache key
- * @return true if the image could be cached or false if the image is too big
+ * @return true if the image could be cached, false otherwise.
*/
public boolean setImage(final Image image, final GraphicsConfiguration config, final int w, final int h, final JRSUIState state) {
+ if (state.is(JRSUIConstants.Animating.YES)) {
+ return false;
+ }
+
final int hash = hash(config, w, h, state);
lock.writeLock().lock();
@@ -167,7 +171,7 @@
private final int h;
private final JRSUIState state;
- public PixelCountSoftReference(final Image referent, final ReferenceQueue<? super Image> q, final int pixelCount, final int hash, final GraphicsConfiguration config, final int w, final int h, final JRSUIState state) {
+ PixelCountSoftReference(final Image referent, final ReferenceQueue<? super Image> q, final int pixelCount, final int hash, final GraphicsConfiguration config, final int w, final int h, final JRSUIState state) {
super(referent, q);
this.pixelCount = pixelCount;
this.hash = hash;
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java Thu Jan 31 10:22:25 2013 -0800
@@ -30,6 +30,7 @@
import java.awt.Window;
import java.awt.AWTPermission;
import java.awt.DisplayMode;
+import java.util.Objects;
import sun.java2d.opengl.CGLGraphicsConfig;
@@ -122,12 +123,12 @@
boolean fsSupported = isFullScreenSupported();
if (fsSupported && old != null) {
- // enter windowed mode (and restore original display mode)
- exitFullScreenExclusive(old);
+ // restore original display mode and enter windowed mode.
if (originalMode != null) {
setDisplayMode(originalMode);
originalMode = null;
}
+ exitFullScreenExclusive(old);
}
super.setFullScreenWindow(w);
@@ -186,13 +187,20 @@
}
@Override
- public void setDisplayMode(DisplayMode dm) {
+ public void setDisplayMode(final DisplayMode dm) {
if (dm == null) {
throw new IllegalArgumentException("Invalid display mode");
}
- nativeSetDisplayMode(displayID, dm.getWidth(), dm.getHeight(), dm.getBitDepth(), dm.getRefreshRate());
- if (isFullScreenSupported() && getFullScreenWindow() != null) {
- getFullScreenWindow().setSize(dm.getWidth(), dm.getHeight());
+ if (!Objects.equals(dm, getDisplayMode())) {
+ final Window w = getFullScreenWindow();
+ if (w != null) {
+ exitFullScreenExclusive(w);
+ }
+ nativeSetDisplayMode(displayID, dm.getWidth(), dm.getHeight(),
+ dm.getBitDepth(), dm.getRefreshRate());
+ if (isFullScreenSupported() && w != null) {
+ enterFullScreenExclusive(w);
+ }
}
}
--- a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java Thu Jan 31 10:22:25 2013 -0800
@@ -1226,7 +1226,7 @@
sendEventToDelegate(e);
}
- private void sendEventToDelegate(final AWTEvent e) {
+ protected void sendEventToDelegate(final AWTEvent e) {
synchronized (getDelegateLock()) {
if (getDelegate() == null || !isShowing() || !isEnabled()) {
return;
--- a/jdk/src/macosx/classes/sun/lwawt/LWScrollPanePeer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWScrollPanePeer.java Thu Jan 31 10:22:25 2013 -0800
@@ -29,6 +29,7 @@
import javax.swing.event.ChangeListener;
import javax.swing.event.ChangeEvent;
import java.awt.*;
+import java.awt.event.MouseWheelEvent;
import java.awt.peer.ScrollPanePeer;
import java.util.List;
@@ -52,6 +53,21 @@
}
@Override
+ public void handleEvent(AWTEvent e) {
+ if (e instanceof MouseWheelEvent) {
+ MouseWheelEvent wheelEvent = (MouseWheelEvent) e;
+ //java.awt.ScrollPane consumes the event
+ // in case isWheelScrollingEnabled() is true,
+ // forcibly send the consumed event to the delegate
+ if (getTarget().isWheelScrollingEnabled() && wheelEvent.isConsumed()) {
+ sendEventToDelegate(wheelEvent);
+ }
+ } else {
+ super.handleEvent(e);
+ }
+ }
+
+ @Override
public void stateChanged(final ChangeEvent e) {
SwingUtilities.invokeLater(new Runnable() {
@Override
--- a/jdk/src/macosx/classes/sun/lwawt/LWTextFieldPeer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWTextFieldPeer.java Thu Jan 31 10:22:25 2013 -0800
@@ -34,7 +34,7 @@
import java.awt.event.FocusEvent;
import java.awt.peer.TextFieldPeer;
-import javax.swing.JPasswordField;
+import javax.swing.*;
import javax.swing.text.JTextComponent;
final class LWTextFieldPeer
@@ -48,7 +48,7 @@
@Override
protected JPasswordField createDelegate() {
- return new JTextAreaDelegate();
+ return new JPasswordFieldDelegate();
}
@Override
@@ -69,9 +69,18 @@
public void setEchoChar(final char echoChar) {
synchronized (getDelegateLock()) {
getDelegate().setEchoChar(echoChar);
- getDelegate().putClientProperty("JPasswordField.cutCopyAllowed",
- getDelegate().echoCharIsSet()
- ? Boolean.FALSE : Boolean.TRUE);
+ final boolean cutCopyAllowed;
+ final String focusInputMapKey;
+ if (echoChar != 0) {
+ cutCopyAllowed = false;
+ focusInputMapKey = "PasswordField.focusInputMap";
+ } else {
+ cutCopyAllowed = true;
+ focusInputMapKey = "TextField.focusInputMap";
+ }
+ getDelegate().putClientProperty("JPasswordField.cutCopyAllowed", cutCopyAllowed);
+ InputMap inputMap = (InputMap) UIManager.get(focusInputMapKey);
+ SwingUtilities.replaceUIInputMap(getDelegate(), JComponent.WHEN_FOCUSED, inputMap);
}
}
@@ -106,11 +115,11 @@
super.handleJavaFocusEvent(e);
}
- private final class JTextAreaDelegate extends JPasswordField {
+ private final class JPasswordFieldDelegate extends JPasswordField {
// Empty non private constructor was added because access to this
// class shouldn't be emulated by a synthetic accessor method.
- JTextAreaDelegate() {
+ JPasswordFieldDelegate() {
super();
}
--- a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -539,7 +539,7 @@
@Override
public void ungrab(Window w) {
if (w.getPeer() != null) {
- ((LWWindowPeer)w.getPeer()).ungrab();
+ ((LWWindowPeer)w.getPeer()).ungrab(false);
}
}
}
--- a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.lwawt.focus.LWWindowPeer");
- private PlatformWindow platformWindow;
+ private final PlatformWindow platformWindow;
// Window bounds reported by the native system (as opposed to
// regular bounds inherited from LWComponentPeer which are
@@ -554,12 +554,14 @@
/**
* Called by the {@code PlatformWindow} when this window is moved/resized by
- * user. There's no notifyReshape() in LWComponentPeer as the only
- * components which could be resized by user are top-level windows.
+ * user or window insets are changed. There's no notifyReshape() in
+ * LWComponentPeer as the only components which could be resized by user are
+ * top-level windows.
*/
public final void notifyReshape(int x, int y, int w, int h) {
final boolean moved;
final boolean resized;
+ final boolean invalid = updateInsets(platformWindow.getInsets());
synchronized (getStateLock()) {
moved = (x != sysX) || (y != sysY);
resized = (w != sysW) || (h != sysH);
@@ -570,7 +572,7 @@
}
// Check if anything changed
- if (!moved && !resized) {
+ if (!moved && !resized && !invalid) {
return;
}
// First, update peer's bounds
@@ -584,10 +586,10 @@
}
// Third, COMPONENT_MOVED/COMPONENT_RESIZED/PAINT events
- if (moved) {
+ if (moved || invalid) {
handleMove(x, y, true);
}
- if (resized) {
+ if (resized || invalid) {
handleResize(w, h, true);
repaintPeer();
}
@@ -999,27 +1001,21 @@
}
}
- /*
- * Request the window insets from the delegate and compares it
- * with the current one. This method is mostly called by the
- * delegate, e.g. when the window state is changed and insets
- * should be recalculated.
- *
+ /**
+ * Request the window insets from the delegate and compares it with the
+ * current one. This method is mostly called by the delegate, e.g. when the
+ * window state is changed and insets should be recalculated.
+ * <p/>
* This method may be called on the toolkit thread.
*/
- public boolean updateInsets(Insets newInsets) {
- boolean changed = false;
+ public final boolean updateInsets(final Insets newInsets) {
synchronized (getStateLock()) {
- changed = (insets.equals(newInsets));
+ if (insets.equals(newInsets)) {
+ return false;
+ }
insets = newInsets;
}
-
- if (changed) {
- replaceSurfaceData();
- repaintPeer();
- }
-
- return changed;
+ return true;
}
public static LWWindowPeer getWindowUnderCursor() {
@@ -1208,13 +1204,19 @@
grabbingWindow = this;
}
- void ungrab() {
+ final void ungrab(boolean doPost) {
if (isGrabbing()) {
grabbingWindow = null;
- postEvent(new UngrabEvent(getTarget()));
+ if (doPost) {
+ postEvent(new UngrabEvent(getTarget()));
+ }
}
}
+ void ungrab() {
+ ungrab(true);
+ }
+
private boolean isGrabbing() {
return this == grabbingWindow;
}
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java Thu Jan 31 10:22:25 2013 -0800
@@ -273,8 +273,31 @@
@Override
protected ByteArrayOutputStream convertFileListToBytes(ArrayList<String> fileList) throws IOException {
- // TODO Auto-generated method stub
- return null;
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ for (int i = 0; i < fileList.size(); i++)
+ {
+ byte[] bytes = fileList.get(i).getBytes();
+ bos.write(bytes, 0, bytes.length);
+ bos.write(0);
+ }
+ return bos;
+ }
+
+ @Override
+ protected boolean isURIListFormat(long format) {
+ String nat = getNativeForFormat(format);
+ if (nat == null) {
+ return false;
+ }
+ try {
+ DataFlavor df = new DataFlavor(nat);
+ if (df.getPrimaryType().equals("text") && df.getSubType().equals("uri-list")) {
+ return true;
+ }
+ } catch (Exception e) {
+ // Not a MIME format.
+ }
+ return false;
}
}
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Thu Jan 31 10:22:25 2013 -0800
@@ -27,7 +27,6 @@
import java.awt.*;
import java.awt.geom.Rectangle2D;
-import java.awt.image.VolatileImage;
import sun.awt.CGraphicsConfig;
import sun.awt.CGraphicsEnvironment;
@@ -89,29 +88,8 @@
return peer;
}
- public void enterFullScreenMode(final long nsWindowPtr) {
+ public void enterFullScreenMode() {
CWrapper.NSView.enterFullScreenMode(ptr);
-
- // REMIND: CGLSurfaceData expects top-level's size
- // and therefore we need to account insets before
- // recreating the surface data
- Insets insets = peer.getInsets();
-
- Rectangle screenBounds;
- final long screenPtr = CWrapper.NSWindow.screen(nsWindowPtr);
- try {
- screenBounds = CWrapper.NSScreen.frame(screenPtr).getBounds();
- } finally {
- CWrapper.NSObject.release(screenPtr);
- }
-
- // the move/size notification from the underlying system comes
- // but it contains a bounds smaller than the whole screen
- // and therefore we need to create the synthetic notifications
- peer.notifyReshape(screenBounds.x - insets.left,
- screenBounds.y - insets.bottom,
- screenBounds.width + insets.left + insets.right,
- screenBounds.height + insets.top + insets.bottom);
}
public void exitFullScreenMode() {
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Thu Jan 31 10:22:25 2013 -0800
@@ -38,7 +38,6 @@
import sun.java2d.SurfaceData;
import sun.java2d.opengl.CGLSurfaceData;
import sun.lwawt.*;
-import sun.lwawt.LWWindowPeer.PeerType;
import sun.util.logging.PlatformLogger;
import com.apple.laf.*;
@@ -58,7 +57,6 @@
private static native void nativeRevalidateNSWindowShadow(long nsWindowPtr);
private static native void nativeSetNSWindowMinimizedIcon(long nsWindowPtr, long nsImage);
private static native void nativeSetNSWindowRepresentedFilename(long nsWindowPtr, String representedFilename);
- private static native void nativeSetNSWindowSecurityWarningPositioning(long nsWindowPtr, double x, double y, float biasX, float biasY);
private static native void nativeSetEnabled(long nsWindowPtr, boolean isEnabled);
private static native void nativeSynthesizeMouseEnteredExitedEvents();
private static native void nativeDispose(long nsWindowPtr);
@@ -197,7 +195,8 @@
// 1) setting native bounds via nativeSetBounds() call
// 2) getting notification from the native level via deliverMoveResizeEvent()
private Rectangle nativeBounds = new Rectangle(0, 0, 0, 0);
- private volatile boolean isFullScreenMode = false;
+ private volatile boolean isFullScreenMode;
+ private boolean isFullScreenAnimationOn;
private Window target;
private LWWindowPeer peer;
@@ -415,8 +414,10 @@
@Override // PlatformWindow
public Insets getInsets() {
- final Insets insets = nativeGetNSWindowInsets(getNSWindowPtr());
- return insets;
+ if (!isFullScreenMode) {
+ return nativeGetNSWindowInsets(getNSWindowPtr());
+ }
+ return new Insets(0, 0, 0, 0);
}
@Override // PlatformWindow
@@ -728,7 +729,19 @@
@Override
public void enterFullScreenMode() {
isFullScreenMode = true;
- contentView.enterFullScreenMode(getNSWindowPtr());
+ contentView.enterFullScreenMode();
+ // the move/size notification from the underlying system comes
+ // but it contains a bounds smaller than the whole screen
+ // and therefore we need to create the synthetic notifications
+ Rectangle screenBounds;
+ final long screenPtr = CWrapper.NSWindow.screen(getNSWindowPtr());
+ try {
+ screenBounds = CWrapper.NSScreen.frame(screenPtr).getBounds();
+ } finally {
+ CWrapper.NSObject.release(screenPtr);
+ }
+ peer.notifyReshape(screenBounds.x, screenBounds.y, screenBounds.width,
+ screenBounds.height);
}
@Override
@@ -875,11 +888,10 @@
final Rectangle oldB = nativeBounds;
nativeBounds = new Rectangle(x, y, width, height);
peer.notifyReshape(x, y, width, height);
- if (byUser && !oldB.getSize().equals(nativeBounds.getSize())) {
+ if ((byUser && !oldB.getSize().equals(nativeBounds.getSize()))
+ || isFullScreenAnimationOn) {
flushBuffers();
}
- //TODO validateSurface already called from notifyReshape
- validateSurface();
}
private void deliverWindowClosingEvent() {
@@ -924,6 +936,10 @@
return false;
}
+ if (blocker instanceof CPrinterDialogPeer) {
+ return true;
+ }
+
CPlatformWindow pWindow = (CPlatformWindow)blocker.getPlatformWindow();
pWindow.orderAboveSiblings();
@@ -975,27 +991,19 @@
orderAboveSiblings();
}
- private void updateDisplay() {
- EventQueue.invokeLater(new Runnable() {
- public void run() {
- validateSurface();
- }
- });
+ private void windowWillEnterFullScreen() {
+ isFullScreenAnimationOn = true;
+ }
+
+ private void windowDidEnterFullScreen() {
+ isFullScreenAnimationOn = false;
}
- private void updateWindowContent() {
- ComponentEvent resizeEvent = new ComponentEvent(target, ComponentEvent.COMPONENT_RESIZED);
- SunToolkit.postEvent(SunToolkit.targetToAppContext(target), resizeEvent);
+ private void windowWillExitFullScreen() {
+ isFullScreenAnimationOn = true;
}
- private void windowWillEnterFullScreen() {
- updateWindowContent();
- }
- private void windowDidEnterFullScreen() {
- updateDisplay();
+ private void windowDidExitFullScreen() {
+ isFullScreenAnimationOn = false;
}
- private void windowWillExitFullScreen() {
- updateWindowContent();
- }
- private void windowDidExitFullScreen() {}
}
--- a/jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m Thu Jan 31 10:22:25 2013 -0800
@@ -101,8 +101,7 @@
JNF_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+
CALayer *windowLayer = jlong_to_ptr(windowLayerPtr);
surfaceLayers = [[AWTSurfaceLayers alloc] initWithWindowLayer: windowLayer];
CFRetain(surfaceLayers);
@@ -127,7 +126,6 @@
AWTSurfaceLayers *surfaceLayers = OBJC(surfaceLayersPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){
- AWT_ASSERT_APPKIT_THREAD;
CGRect rect = CGRectMake(x, y, width, height);
[surfaceLayers setBounds: rect];
--- a/jdk/src/macosx/native/sun/awt/AWTView.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/AWTView.m Thu Jan 31 10:22:25 2013 -0800
@@ -1243,8 +1243,7 @@
jobject cPlatformView = (*env)->NewGlobalRef(env, obj);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+
CALayer *windowLayer = jlong_to_ptr(windowLayerPtr);
AWTView *view = [[AWTView alloc] initWithRect:rect
platformView:cPlatformView
@@ -1274,8 +1273,7 @@
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+
if (toResize) {
[view setAutoresizingMask: NSViewHeightSizable | NSViewWidthSizable];
} else {
@@ -1308,8 +1306,7 @@
NSWindow *window = [view window];
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+
ret = (jint)[[AWTWindow getNSWindowDisplayID_AppKitThread: window] intValue];
}];
@@ -1336,8 +1333,7 @@
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+
NSRect viewBounds = [view bounds];
NSRect frameInWindow = [view convertRect:viewBounds toView:nil];
rect = [[view window] convertRectToScreen:frameInWindow];
@@ -1366,9 +1362,7 @@
JNF_COCOA_ENTER(env);
NSView *nsView = OBJC(viewPtr);
- [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
NSPoint ptWindowCoords = [[nsView window] mouseLocationOutsideOfEventStream];
NSPoint ptViewCoords = [nsView convertPoint:ptWindowCoords fromView:nil];
underMouse = [nsView hitTest:ptViewCoords] != nil;
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m Thu Jan 31 10:22:25 2013 -0800
@@ -738,14 +738,12 @@
__block AWTWindow *window = nil;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNFWeakJObjectWrapper *platformWindow = [JNFWeakJObjectWrapper wrapperWithJObject:obj withEnv:env];
NSView *contentView = OBJC(contentViewPtr);
NSRect frameRect = NSMakeRect(x, y, w, h);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
window = [[AWTWindow alloc] initWithPlatformWindow:platformWindow
styleBits:styleBits
@@ -770,11 +768,9 @@
(JNIEnv *env, jclass clazz, jlong windowPtr, jint mask, jint bits)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
AWTWindow *window = (AWTWindow*)[nsWindow delegate];
@@ -807,12 +803,10 @@
(JNIEnv *env, jclass clazz, jlong windowPtr, jlong menuBarPtr)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr);
CMenuBar *menuBar = OBJC(menuBarPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
AWTWindow *window = (AWTWindow*)[nsWindow delegate];
@@ -838,14 +832,12 @@
jobject ret = NULL;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr);
__block NSRect contentRect = NSZeroRect;
__block NSRect frame = NSZeroRect;
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
frame = [nsWindow frame];
contentRect = [NSWindow contentRectForFrameRect:frame styleMask:[nsWindow styleMask]];
@@ -873,14 +865,12 @@
(JNIEnv *env, jclass clazz, jlong windowPtr, jdouble originX, jdouble originY, jdouble width, jdouble height)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSRect jrect = NSMakeRect(originX, originY, width, height);
// TODO: not sure we need displayIfNeeded message in our view
NSWindow *nsWindow = OBJC(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
AWTWindow *window = (AWTWindow*)[nsWindow delegate];
@@ -913,7 +903,6 @@
(JNIEnv *env, jclass clazz, jlong windowPtr, jdouble minW, jdouble minH, jdouble maxW, jdouble maxH)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
if (minW < 1) minW = 1;
if (minH < 1) minH = 1;
@@ -921,8 +910,7 @@
if (maxH < 1) maxH = 1;
NSWindow *nsWindow = OBJC(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
AWTWindow *window = (AWTWindow*)[nsWindow delegate];
@@ -949,12 +937,9 @@
(JNIEnv *env, jclass clazz, jlong windowPtr)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[nsWindow orderBack:nil];
}];
@@ -970,11 +955,9 @@
(JNIEnv *env, jclass clazz, jlong windowPtr)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
if (![nsWindow isKeyWindow]) {
[nsWindow makeKeyAndOrderFront:nsWindow];
@@ -995,7 +978,6 @@
(JNIEnv *env, jclass clazz, jlong windowPtr, jstring jtitle)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr);
[nsWindow performSelectorOnMainThread:@selector(setTitle:)
@@ -1016,15 +998,9 @@
JNF_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr);
- if ([NSThread isMainThread]) {
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[nsWindow invalidateShadow];
- } else {
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
- [nsWindow invalidateShadow];
- }];
- }
+ }];
JNF_COCOA_EXIT(env);
}
@@ -1060,13 +1036,10 @@
(JNIEnv *env, jclass clazz, jlong windowPtr, jlong nsImagePtr)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr);
NSImage *image = OBJC(nsImagePtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[nsWindow setMiniwindowImage:image];
}];
@@ -1082,13 +1055,10 @@
(JNIEnv *env, jclass clazz, jlong windowPtr, jstring filename)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr);
NSURL *url = (filename == NULL) ? nil : [NSURL fileURLWithPath:JNFNormalizedNSStringForPath(env, filename)];
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[nsWindow setRepresentedURL:url];
}];
@@ -1097,22 +1067,6 @@
/*
* Class: sun_lwawt_macosx_CPlatformWindow
- * Method: nativeSetNSWindowSecurityWarningPositioning
- * Signature: (JDDFF)V
- */
-JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowSecurityWarningPositioning
-(JNIEnv *env, jclass clazz, jlong windowPtr, jdouble x, jdouble y, jfloat biasX, jfloat biasY)
-{
-JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
-
- [JNFException raise:env as:kRuntimeException reason:"unimplemented"];
-
-JNF_COCOA_EXIT(env);
-}
-
-/*
- * Class: sun_lwawt_macosx_CPlatformWindow
* Method: nativeGetTopmostPlatformWindowUnderMouse
* Signature: (J)V
*/
@@ -1144,10 +1098,8 @@
(JNIEnv *env, jclass clazz)
{
JNF_COCOA_ENTER(env);
- AWT_ASSERT_NOT_APPKIT_THREAD;
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
}];
@@ -1168,7 +1120,7 @@
SEL toggleFullScreenSelector = @selector(toggleFullScreen:);
if (![nsWindow respondsToSelector:toggleFullScreenSelector]) return;
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[nsWindow performSelector:toggleFullScreenSelector withObject:nil];
}];
@@ -1181,7 +1133,7 @@
JNF_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
AWTWindow *window = (AWTWindow*)[nsWindow delegate];
[window setEnabled: isEnabled];
@@ -1196,7 +1148,7 @@
JNF_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
AWTWindow *window = (AWTWindow*)[nsWindow delegate];
if ([AWTWindow lastKeyWindow] == window) {
--- a/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m Thu Jan 31 10:22:25 2013 -0800
@@ -515,10 +515,9 @@
JNIEXPORT void JNICALL Java_com_apple_eawt_Application_nativeInitializeApplicationDelegate
(JNIEnv *env, jclass clz)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
// Force initialization to happen on AppKit thread!
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[ApplicationDelegate sharedDelegate];
}];
JNF_COCOA_EXIT(env);
@@ -532,10 +531,9 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeOpenCocoaAboutWindow
(JNIEnv *env, jclass clz)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[NSApp orderFrontStandardAboutPanel:nil];
}];
@@ -550,10 +548,9 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeReplyToAppShouldTerminate
(JNIEnv *env, jclass clz, jboolean doTerminate)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[NSApp replyToApplicationShouldTerminate:doTerminate];
}];
@@ -568,7 +565,6 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeRegisterForNotification
(JNIEnv *env, jclass clz, jint notificationType)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(_registerForNotification:)
onObject:[ApplicationDelegate class]
@@ -586,13 +582,10 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockMenu
(JNIEnv *env, jclass clz, jlong nsMenuPtr)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
NSMenu *menu = (NSMenu *)jlong_to_ptr(nsMenuPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
[ApplicationDelegate sharedDelegate].fDockMenu = menu;
}];
@@ -607,14 +600,13 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockIconImage
(JNIEnv *env, jclass clz, jlong nsImagePtr)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
NSImage *_image = (NSImage *)jlong_to_ptr(nsImagePtr);
- [JNFRunLoop performOnMainThread:@selector(_setDockIconImage:)
- on:[ApplicationDelegate class]
- withObject:_image
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(_setDockIconImage:)
+ on:[ApplicationDelegate class]
+ withObject:_image
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -629,12 +621,9 @@
{
__block NSImage *image = nil;
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
image = [ApplicationDelegate _dockIconImage];
CFRetain(image);
}];
@@ -652,13 +641,10 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockIconBadge
(JNIEnv *env, jclass clz, jstring badge)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
NSString *badgeString = JNFJavaToNSString(env, badge);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
NSDockTile *dockTile = [NSApp dockTile];
[dockTile setBadgeLabel:badgeString];
[dockTile display];
@@ -675,12 +661,9 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeRequestActivation
(JNIEnv *env, jclass clz, jboolean allWindows)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
NSApplicationActivationOptions options = allWindows ? NSApplicationActivateAllWindows : 0;
options |= NSApplicationActivateIgnoringOtherApps; // without this, nothing happens!
[[NSRunningApplication currentApplication] activateWithOptions:options];
@@ -697,12 +680,9 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeRequestUserAttention
(JNIEnv *env, jclass clz, jboolean critical)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[NSApp requestUserAttention:critical ? NSCriticalRequest : NSInformationalRequest];
}];
@@ -717,13 +697,12 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeOpenHelpViewer
(JNIEnv *env, jclass clz)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThread:@selector(showHelp:)
- on:NSApp
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(showHelp:)
+ on:NSApp
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -736,7 +715,6 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeEnableSuddenTermination
(JNIEnv *env, jclass clz)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
[[NSProcessInfo processInfo] enableSuddenTermination]; // Foundation thread-safe
@@ -752,7 +730,6 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeDisableSuddenTermination
(JNIEnv *env, jclass clz)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
[[NSProcessInfo processInfo] disableSuddenTermination]; // Foundation thread-safe
@@ -768,12 +745,9 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeSetMenuState
(JNIEnv *env, jclass clz, jint menuID, jboolean visible, jboolean enabled)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
ApplicationDelegate *delegate = [ApplicationDelegate sharedDelegate];
switch (menuID) {
case com_apple_eawt__AppMenuBarHandler_MENU_ABOUT:
@@ -796,12 +770,10 @@
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeSetDefaultMenuBar
(JNIEnv *env, jclass clz, jlong cMenuBarPtr)
{
-AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
CMenuBar *menu = (CMenuBar *)jlong_to_ptr(cMenuBarPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[ApplicationDelegate sharedDelegate].fDefaultMenuBar = menu;
}];
--- a/jdk/src/macosx/native/sun/awt/CClipboard.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CClipboard.m Thu Jan 31 10:22:25 2013 -0800
@@ -109,7 +109,6 @@
}
- (void) javaDeclareTypes:(NSArray *)inTypes withOwner:(jobject)inClipboard jniEnv:(JNIEnv *)inEnv {
- AWT_ASSERT_NOT_APPKIT_THREAD;
//NSLog(@"CClipboard javaDeclareTypes %@ withOwner", inTypes);
@@ -134,7 +133,6 @@
- (NSArray *) javaGetTypes {
- AWT_ASSERT_NOT_APPKIT_THREAD;
NSMutableArray *args = [NSMutableArray arrayWithCapacity:1];
[ThreadUtilities performOnMainThread:@selector(_nativeGetTypes:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
@@ -152,7 +150,6 @@
}
- (void) javaSetData:(NSData *)inData forType:(NSString *) inFormat {
- AWT_ASSERT_NOT_APPKIT_THREAD;
CClipboardUpdate *newUpdate = [[CClipboardUpdate alloc] initWithData:inData withFormat:inFormat];
[ThreadUtilities performOnMainThread:@selector(_nativeSetData:) onObject:self withObject:newUpdate waitUntilDone:YES awtMode:YES];
@@ -171,7 +168,6 @@
}
- (NSData *) javaGetDataForType:(NSString *) inFormat {
- AWT_ASSERT_NOT_APPKIT_THREAD;
NSMutableArray *args = [NSMutableArray arrayWithObject:inFormat];
[ThreadUtilities performOnMainThread:@selector(_nativeGetDataForType:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
--- a/jdk/src/macosx/native/sun/awt/CCursorManager.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CCursorManager.m Thu Jan 31 10:22:25 2013 -0800
@@ -74,7 +74,6 @@
(JNIEnv *env, jclass class, jint type, jstring name)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSString *cursorName = JNFJavaToNSString(env, name);
SEL cursorSelector = (type == sun_lwawt_macosx_CCursorManager_NAMED_CURSOR) ? lookupCursorSelectorForName(cursorName) : lookupCursorSelectorForType(type);
@@ -87,9 +86,7 @@
[JNFException raise:env as:kNoSuchMethodException reason:"missing NSCursor selector"];
}
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
setCursorOnAppKitThread([[NSCursor class] performSelector:cursorSelector]);
}];
@@ -101,12 +98,9 @@
(JNIEnv *env, jclass class, jlong imgPtr, jdouble x, jdouble y)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSImage *image = (NSImage *)jlong_to_ptr(imgPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
NSCursor *cursor = [[NSCursor alloc] initWithImage:image
hotSpot:(NSPoint){ x, y }];
setCursorOnAppKitThread(cursor);
@@ -127,8 +121,6 @@
__block NSPoint pt = NSZeroPoint;
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
pt = ConvertNSScreenPoint(env, [NSEvent mouseLocation]);
}];
@@ -144,13 +136,11 @@
Java_sun_lwawt_macosx_CCursorManager_nativeSetAllowsCursorSetInBackground
(JNIEnv *env, jclass class, jboolean allows)
{
-
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
SEL allowsSetInBackground_SEL = @selector(javaSetAllowsCursorSetInBackground:);
if ([[NSCursor class] respondsToSelector:allowsSetInBackground_SEL]) {
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
NSMethodSignature *allowsSetInBackground_sig =
[[NSCursor class] methodSignatureForSelector:allowsSetInBackground_SEL];
NSInvocation *invocation =
--- a/jdk/src/macosx/native/sun/awt/CDesktopPeer.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CDesktopPeer.m Thu Jan 31 10:22:25 2013 -0800
@@ -36,8 +36,6 @@
JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CDesktopPeer__1lsOpenURI
(JNIEnv *env, jclass clz, jstring uri)
{
- // AWT_ASSERT_ANY_THREAD
-
OSStatus status = noErr;
JNF_COCOA_ENTER(env);
@@ -63,8 +61,6 @@
JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CDesktopPeer__1lsOpenFile
(JNIEnv *env, jclass clz, jstring jpath, jboolean print)
{
- // AWT_ASSERT_ANY_THREAD
-
OSStatus status = noErr;
JNF_COCOA_ENTER(env);
--- a/jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m Thu Jan 31 10:22:25 2013 -0800
@@ -46,7 +46,7 @@
__block CDragSource* dragSource = nil;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
dragSource = [[CDragSource alloc] init:jthis component:jcomponent peer:jpeer control:controlObj
transferable:jtransferable triggerEvent:jtrigger dragPosX:jdragposx
dragPosY:jdragposy modifiers:jextmodifiers clickCount:jclickcount timeStamp:jtimestamp
@@ -103,7 +103,7 @@
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CDragSourceContextPeer_setNativeCursor
(JNIEnv *env, jobject jthis, jlong nativeDragSourceVal, jobject jcursor, jint jcursortype)
{
- AWT_ASSERT_NOT_APPKIT_THREAD;
+ //AWT_ASSERT_NOT_APPKIT_THREAD;
//JNF_COCOA_ENTER(env);
// jobject gCursor = JNFNewGlobalRef(env, jcursor);
--- a/jdk/src/macosx/native/sun/awt/CImage.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CImage.m Thu Jan 31 10:22:25 2013 -0800
@@ -108,7 +108,6 @@
jlong result = 0L;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_ANY_THREAD;
NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height);
if (imageRep) {
@@ -139,7 +138,6 @@
jlong result = 0L;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_ANY_THREAD;
jsize num = (*env)->GetArrayLength(env, buffers);
NSMutableArray * reps = [NSMutableArray arrayWithCapacity: num];
@@ -187,7 +185,6 @@
NSImage *image = nil;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_ANY_THREAD;
IconRef iconRef;
if (noErr == GetIconRef(kOnSystemDisk, kSystemIconsCreator, selector, &iconRef)) {
@@ -212,7 +209,6 @@
NSImage *image = nil;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_ANY_THREAD;
NSString *path = JNFNormalizedNSStringForPath(env, file);
image = [[NSImage alloc] initByReferencingFile:path];
@@ -234,10 +230,9 @@
__block NSImage *image = nil;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_ANY_THREAD;
NSString *path = JNFNormalizedNSStringForPath(env, file);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
image = [[NSWorkspace sharedWorkspace] iconForFile:path];
[image setScalesWhenResized:TRUE];
if (image) CFRetain(image); // GC
@@ -259,7 +254,6 @@
NSImage *image = nil;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_ANY_THREAD;
image = [NSImage imageNamed:JNFJavaToNSString(env, name)];
if (image) CFRetain(image); // GC
@@ -278,7 +272,6 @@
(JNIEnv *env, jclass klass, jlong nsImgPtr, jintArray buffer, jint w, jint h)
{
JNF_COCOA_ENTER(env);
-AWT_ASSERT_ANY_THREAD;
NSImage *img = (NSImage *)jlong_to_ptr(nsImgPtr);
jint *dst = (*env)->GetPrimitiveArrayCritical(env, buffer, NULL);
@@ -301,7 +294,6 @@
jobject size = NULL;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_ANY_THREAD;
size = NSToJavaSize(env, [(NSImage *)jlong_to_ptr(nsImgPtr) size]);
--- a/jdk/src/macosx/native/sun/awt/CInputMethod.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CInputMethod.m Thu Jan 31 10:22:25 2013 -0800
@@ -153,7 +153,7 @@
__block NSString *keyboardInfo = NULL;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
keyboardInfo = [inputMethodController performSelector:@selector(currentInputMethodName)];
[keyboardInfo retain];
}];
@@ -177,7 +177,7 @@
JNF_COCOA_ENTER(env);
AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
JNFJObjectWrapper *inputMethodWrapper = [[JNFJObjectWrapper alloc] initWithJObject:inputMethod withEnv:env];
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[CInputMethod _nativeNotifyPeerWithView:view inputMethod:inputMethodWrapper];
}];
@@ -196,7 +196,7 @@
JNF_COCOA_ENTER(env);
AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[CInputMethod _nativeEndComposition:view];
}];
@@ -216,7 +216,7 @@
__block NSString *isoAbbreviation;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
isoAbbreviation = (NSString *) [inputMethodController performSelector:@selector(currentInputMethodLocale)];
[isoAbbreviation retain];
}];
@@ -259,7 +259,7 @@
NSString *localeStr = JNFJavaToNSString(env, locale);
[localeStr retain];
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
[CInputMethod setKeyboardLayout:localeStr];
}];
@@ -293,7 +293,7 @@
__block NSArray *selectableArray = nil;
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
selectableArray = (NSArray *)[inputMethodController performSelector:@selector(availableInputMethodLocales)];
[selectableArray retain];
}];
--- a/jdk/src/macosx/native/sun/awt/CMenu.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CMenu.m Thu Jan 31 10:22:25 2013 -0800
@@ -55,12 +55,10 @@
//- (void)finalize { [super finalize]; }
- (void)addJavaSubmenu:(CMenu *)submenu {
-AWT_ASSERT_NOT_APPKIT_THREAD;
[ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) onObject:self withObject:submenu waitUntilDone:YES awtMode:YES];
}
- (void)addJavaMenuItem:(CMenuItem *)theMenuItem {
-AWT_ASSERT_NOT_APPKIT_THREAD;
[ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) onObject:self withObject:theMenuItem waitUntilDone:YES awtMode:YES];
}
@@ -70,7 +68,6 @@
}
- (void)setJavaMenuTitle:(NSString *)title {
-AWT_ASSERT_NOT_APPKIT_THREAD;
if (title) {
[ThreadUtilities performOnMainThread:@selector(setNativeMenuTitle_OnAppKitThread:) onObject:self withObject:title waitUntilDone:YES awtMode:YES];
@@ -95,7 +92,6 @@
}
- (void)deleteJavaItem:(jint)index {
-AWT_ASSERT_NOT_APPKIT_THREAD;
[ThreadUtilities performOnMainThread:@selector(deleteNativeJavaItem_OnAppKitThread:) onObject:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES awtMode:YES];
}
--- a/jdk/src/macosx/native/sun/awt/CMenuComponent.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CMenuComponent.m Thu Jan 31 10:22:25 2013 -0800
@@ -80,10 +80,10 @@
{
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThread:@selector(disposer)
- on:((id)jlong_to_ptr(menuItemObj))
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(disposer)
+ on:((id)jlong_to_ptr(menuItemObj))
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
--- a/jdk/src/macosx/native/sun/awt/CMenuItem.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CMenuItem.m Thu Jan 31 10:22:25 2013 -0800
@@ -104,7 +104,6 @@
}
- (void) setJavaLabel:(NSString *)theLabel shortcut:(NSString *)theKeyEquivalent modifierMask:(jint)modifiers {
-AWT_ASSERT_NOT_APPKIT_THREAD;
NSUInteger modifierMask = 0;
@@ -126,8 +125,7 @@
modifierMask = JavaModifiersToNsKeyModifiers(modifiers, NO);
}
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
[fMenuItem setKeyEquivalent:theKeyEquivalent];
[fMenuItem setKeyEquivalentModifierMask:modifierMask];
[fMenuItem setTitle:theLabel];
@@ -135,32 +133,23 @@
}
- (void) setJavaImage:(NSImage *)theImage {
-AWT_ASSERT_NOT_APPKIT_THREAD;
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[fMenuItem setImage:theImage];
}];
}
- (void) setJavaToolTipText:(NSString *)theText {
-AWT_ASSERT_NOT_APPKIT_THREAD;
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[fMenuItem setToolTip:theText];
}];
}
- (void)setJavaEnabled:(BOOL) enabled {
-AWT_ASSERT_NOT_APPKIT_THREAD;
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@synchronized(self) {
fIsEnabled = enabled;
@@ -173,7 +162,6 @@
}
- (BOOL)isEnabled {
- // AWT_ASSERT_ANY_THREAD;
BOOL enabled = NO;
@synchronized(self) {
@@ -184,11 +172,8 @@
- (void)setJavaState:(BOOL)newState {
-AWT_ASSERT_NOT_APPKIT_THREAD;
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
-AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[fMenuItem setState:(newState ? NSOnState : NSOffState)];
}];
}
--- a/jdk/src/macosx/native/sun/awt/CPopupMenu.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CPopupMenu.m Thu Jan 31 10:22:25 2013 -0800
@@ -64,7 +64,7 @@
jobject cPeerObjGlobal = JNFNewGlobalRef(env, peer);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
aCPopupMenu = [[CPopupMenu alloc] initWithPeer:cPeerObjGlobal];
CFRetain(aCPopupMenu);
[aCPopupMenu release];
@@ -82,7 +82,7 @@
CPopupMenu* cPopupMenu = (CPopupMenu*)jlong_to_ptr(menuPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
NSPoint loc = ConvertNSScreenPoint(env, NSMakePoint(x, y));
[[cPopupMenu menu] popUpMenuPositioningItem: nil
--- a/jdk/src/macosx/native/sun/awt/CTrayIcon.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CTrayIcon.m Thu Jan 31 10:22:25 2013 -0800
@@ -303,10 +303,9 @@
__block AWTTrayIcon *trayIcon = nil;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
jobject thePeer = JNFNewGlobalRef(env, peer);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
trayIcon = [[AWTTrayIcon alloc] initWithPeer:thePeer];
}];
@@ -334,11 +333,10 @@
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_nativeSetToolTip
(JNIEnv *env, jobject self, jlong model, jstring jtooltip) {
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
AWTTrayIcon *icon = jlong_to_ptr(model);
NSString *tooltip = JNFJavaToNSString(env, jtooltip);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[icon setTooltip:tooltip];
}];
@@ -353,10 +351,9 @@
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_setNativeImage
(JNIEnv *env, jobject self, jlong model, jlong imagePtr, jboolean autosize) {
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
AWTTrayIcon *icon = jlong_to_ptr(model);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
[icon setImage:jlong_to_ptr(imagePtr) sizing:autosize];
}];
@@ -369,13 +366,10 @@
jobject jpt = NULL;
JNF_COCOA_ENTER(env);
-AWT_ASSERT_NOT_APPKIT_THREAD;
__block NSPoint pt = NSZeroPoint;
AWTTrayIcon *icon = jlong_to_ptr(model);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
- AWT_ASSERT_APPKIT_THREAD;
-
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
NSPoint loc = [icon getLocationOnScreen];
pt = ConvertNSScreenPoint(env, loc);
}];
--- a/jdk/src/macosx/native/sun/awt/CWrapper.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CWrapper.m Thu Jan 31 10:22:25 2013 -0800
@@ -46,7 +46,7 @@
JNF_COCOA_ENTER(env);
id obj = (id)jlong_to_ptr(objectPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
CFRelease(obj);
}];
@@ -66,10 +66,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(makeKeyAndOrderFront:)
- on:window
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(makeKeyAndOrderFront:)
+ on:window
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -86,10 +86,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(makeKeyWindow)
- on:window
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(makeKeyWindow)
+ on:window
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -106,10 +106,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(makeMainWindow)
- on:window
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(makeMainWindow)
+ on:window
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -128,7 +128,7 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
canBecomeMainWindow = [window canBecomeMainWindow];
}];
@@ -151,7 +151,7 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
isKeyWindow = [window isKeyWindow];
}];
@@ -172,10 +172,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(orderFront:)
- on:window
- withObject:window
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(orderFront:)
+ on:window
+ withObject:window
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -192,10 +192,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(orderOut:)
- on:window
- withObject:window
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(orderOut:)
+ on:window
+ withObject:window
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -212,10 +212,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(orderFrontRegardless)
- on:window
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(orderFrontRegardless)
+ on:window
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -233,7 +233,7 @@
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
NSWindow *relativeTo = (NSWindow *)jlong_to_ptr(relativeToPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window orderWindow:(NSWindowOrderingMode)order relativeTo:[relativeTo windowNumber]];
}];
@@ -267,7 +267,7 @@
initLevels();
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window setLevel: LEVELS[level]];
}];
} else {
@@ -290,7 +290,7 @@
NSWindow *parent = (NSWindow *)jlong_to_ptr(parentPtr);
NSWindow *child = (NSWindow *)jlong_to_ptr(childPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[parent addChildWindow:child ordered:order];
}];
@@ -310,10 +310,10 @@
AWTWindow *parent = (AWTWindow *)jlong_to_ptr(parentPtr);
AWTWindow *child = (AWTWindow *)jlong_to_ptr(childPtr);
- [JNFRunLoop performOnMainThread:@selector(removeChildWindow:)
- on:parent
- withObject:child
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(removeChildWindow:)
+ on:parent
+ withObject:child
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -331,7 +331,7 @@
AWTWindow *window = (AWTWindow *)jlong_to_ptr(windowPtr);
NSRect frame = NSMakeRect(x, y, w, h);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window setFrame:frame display:display];
}];
@@ -350,7 +350,7 @@
JNF_COCOA_ENTER(env);
AWTWindow *window = (AWTWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window setAlphaValue:(CGFloat)alpha];
}];
@@ -369,7 +369,7 @@
JNF_COCOA_ENTER(env);
AWTWindow *window = (AWTWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window setOpaque:(BOOL)opaque];
}];
@@ -389,7 +389,7 @@
AWTWindow *window = (AWTWindow *)jlong_to_ptr(windowPtr);
NSColor *color = (NSColor *)jlong_to_ptr(colorPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window setBackgroundColor:color];
}];
@@ -410,7 +410,7 @@
JNF_COCOA_ENTER(env);
AWTWindow *window = (AWTWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
const NSScreen *screen = [window screen];
CFRetain(screen); // GC
screenPtr = ptr_to_jlong(screen);
@@ -432,10 +432,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(miniaturize:)
- on:window
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(miniaturize:)
+ on:window
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -452,10 +452,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(deminiaturize:)
- on:window
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(deminiaturize:)
+ on:window
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -472,10 +472,10 @@
JNF_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
- [JNFRunLoop performOnMainThread:@selector(zoom:)
- on:window
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(zoom:)
+ on:window
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -493,10 +493,10 @@
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
NSResponder *responder = (NSResponder *)jlong_to_ptr(responderPtr);
- [JNFRunLoop performOnMainThread:@selector(makeFirstResponder:)
- on:window
- withObject:responder
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(makeFirstResponder:)
+ on:window
+ withObject:responder
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -514,7 +514,7 @@
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
NSView *subview = (NSView *)jlong_to_ptr(subviewPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
[view addSubview:subview];
}];
@@ -533,10 +533,10 @@
JNF_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
- [JNFRunLoop performOnMainThread:@selector(removeFromSuperview)
- on:view
- withObject:nil
- waitUntilDone:NO];
+ [ThreadUtilities performOnMainThread:@selector(removeFromSuperview)
+ on:view
+ withObject:nil
+ waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -553,7 +553,7 @@
JNF_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[view setFrame:NSMakeRect(x, y, w, h)];
}];
@@ -576,7 +576,7 @@
__block NSRect rect = NSZeroRect;
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
rect = [view frame];
}];
@@ -599,7 +599,7 @@
JNF_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
NSScreen *screen = [[view window] screen];
NSDictionary *opts = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], NSFullScreenModeAllScreens, nil];
[view enterFullScreenMode:screen withOptions:opts];
@@ -620,7 +620,7 @@
JNF_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[view exitFullScreenModeWithOptions:nil];
}];
@@ -641,7 +641,7 @@
JNF_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
windowPtr = ptr_to_jlong([view window]);
}];
@@ -655,14 +655,14 @@
* Method: setHidden
* Signature: (JZ)V
*/
-JNIEXPORT jlong JNICALL
+JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSView_setHidden
(JNIEnv *env, jclass cls, jlong viewPtr, jboolean toHide)
{
JNF_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr);
- [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[view setHidden:(BOOL)toHide];
}];
@@ -686,7 +686,7 @@
__block NSRect rect = NSZeroRect;
NSScreen *screen = (NSScreen *)jlong_to_ptr(screenPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
rect = [screen frame];
}];
@@ -713,7 +713,7 @@
__block NSRect rect = NSZeroRect;
NSScreen *screen = (NSScreen *)jlong_to_ptr(screenPtr);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
rect = [screen visibleFrame];
}];
@@ -737,7 +737,7 @@
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
NSArray *screens = [NSScreen screens];
for (NSScreen *screen in screens) {
NSDictionary *screenInfo = [screen deviceDescription];
@@ -768,7 +768,7 @@
JNF_COCOA_ENTER(env);
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
clearColorPtr = ptr_to_jlong([NSColor clearColor]);
}];
--- a/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m Thu Jan 31 10:22:25 2013 -0800
@@ -1147,7 +1147,6 @@
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessibility_focusChanged
(JNIEnv *env, jobject jthis)
{
- AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postFocusChanged:) onObject:[JavaComponentAccessibility class] withObject:nil waitUntilDone:NO awtMode:NO];
@@ -1164,7 +1163,6 @@
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_valueChanged
(JNIEnv *env, jclass jklass, jlong element)
{
- AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postValueChanged) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
JNF_COCOA_EXIT(env);
@@ -1178,7 +1176,6 @@
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_selectionChanged
(JNIEnv *env, jclass jklass, jlong element)
{
- AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postSelectionChanged) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
JNF_COCOA_EXIT(env);
@@ -1193,7 +1190,6 @@
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_unregisterFromCocoaAXSystem
(JNIEnv *env, jclass jklass, jlong element)
{
- AWT_ASSERT_NOT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(unregisterFromCocoaAXSystem) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
JNF_COCOA_EXIT(env);
--- a/jdk/src/macosx/native/sun/awt/LWCToolkit.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/LWCToolkit.m Thu Jan 31 10:22:25 2013 -0800
@@ -415,13 +415,9 @@
JNF_COCOA_ENTER(env);
- if ([NSThread isMainThread]) {
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^() {
active = (jboolean)[NSRunningApplication currentApplication].active;
- } else {
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^() {
- active = (jboolean)[NSRunningApplication currentApplication].active;
- }];
- }
+ }];
JNF_COCOA_EXIT(env);
--- a/jdk/src/macosx/native/sun/awt/awt.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/awt.m Thu Jan 31 10:22:25 2013 -0800
@@ -42,6 +42,15 @@
// The symbol is defined in libosxapp.dylib (ThreadUtilities.m)
extern JavaVM *jvm;
+// Indicates if AWT is running embedded (in SWT, FX, elsewhere)
+static BOOL isEmbedded = NO;
+
+// Indicates that the app has been started with -XstartOnFirstThread
+// (directly or via WebStart settings), and AWT should not run its
+// own event loop in this mode. Even if a loop isn't running yet,
+// we expect an embedder (e.g. SWT) to start it some time later.
+static BOOL forceEmbeddedMode = NO;
+
static bool ShouldPrintVerboseDebugging() {
static int debug = -1;
if (debug == -1) {
@@ -63,31 +72,29 @@
static CFRunLoopObserverRef busyObserver = NULL;
static CFRunLoopObserverRef notBusyObserver = NULL;
-static void setUpAWTAppKit(BOOL swt_mode, BOOL headless) {
-AWT_ASSERT_APPKIT_THREAD;
+static void setUpAWTAppKit()
+{
BOOL verbose = ShouldPrintVerboseDebugging();
if (verbose) AWT_DEBUG_LOG(@"setting up busy observers");
- JNIEnv *env = [ThreadUtilities getJNIEnv];
-
// Add CFRunLoopObservers to call into AWT so that AWT knows that the
// AWT thread (which is the AppKit main thread) is alive. This way AWT
// will not automatically shutdown.
busyObserver = CFRunLoopObserverCreate(
- NULL, // CFAllocator
- kCFRunLoopAfterWaiting, // CFOptionFlags
- true, // repeats
- NSIntegerMax, // order
- &BusyObserver, // CFRunLoopObserverCallBack
- NULL); // CFRunLoopObserverContext
+ NULL, // CFAllocator
+ kCFRunLoopAfterWaiting, // CFOptionFlags
+ true, // repeats
+ NSIntegerMax, // order
+ &BusyObserver, // CFRunLoopObserverCallBack
+ NULL); // CFRunLoopObserverContext
notBusyObserver = CFRunLoopObserverCreate(
- NULL, // CFAllocator
- kCFRunLoopBeforeWaiting, // CFOptionFlags
- true, // repeats
- NSIntegerMin, // order
- &NotBusyObserver, // CFRunLoopObserverCallBack
- NULL); // CFRunLoopObserverContext
+ NULL, // CFAllocator
+ kCFRunLoopBeforeWaiting, // CFOptionFlags
+ true, // repeats
+ NSIntegerMin, // order
+ &NotBusyObserver, // CFRunLoopObserverCallBack
+ NULL); // CFRunLoopObserverContext
CFRunLoopRef runLoop = [[NSRunLoop currentRunLoop] getCFRunLoop];
CFRunLoopAddObserver(runLoop, busyObserver, kCFRunLoopDefaultMode);
@@ -95,29 +102,33 @@
CFRelease(busyObserver);
CFRelease(notBusyObserver);
-
- if (!headless) setBusy(YES);
+
+ setBusy(YES);
+}
+
+static void setUpAppKitThreadName()
+{
+ BOOL verbose = ShouldPrintVerboseDebugging();
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
// Set the java name of the AppKit main thread appropriately.
jclass threadClass = NULL;
jstring name = NULL;
jobject curThread = NULL;
- if (!swt_mode) {
- threadClass = (*env)->FindClass(env, "java/lang/Thread");
- if (threadClass == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
- jmethodID currentThreadID = (*env)->GetStaticMethodID(env, threadClass, "currentThread", "()Ljava/lang/Thread;");
- if (currentThreadID == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
- jmethodID setName = (*env)->GetMethodID(env, threadClass, "setName", "(Ljava/lang/String;)V");
- if (setName == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
+ threadClass = (*env)->FindClass(env, "java/lang/Thread");
+ if (threadClass == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
+ jmethodID currentThreadID = (*env)->GetStaticMethodID(env, threadClass, "currentThread", "()Ljava/lang/Thread;");
+ if (currentThreadID == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
+ jmethodID setName = (*env)->GetMethodID(env, threadClass, "setName", "(Ljava/lang/String;)V");
+ if (setName == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
- curThread = (*env)->CallStaticObjectMethod(env, threadClass, currentThreadID); // AWT_THREADING Safe (known object)
- if (curThread == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
- name = (*env)->NewStringUTF(env, "AWT-AppKit");
- if (name == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
- (*env)->CallVoidMethod(env, curThread, setName, name); // AWT_THREADING Safe (known object)
- if ((*env)->ExceptionCheck(env)) goto cleanup;
- }
+ curThread = (*env)->CallStaticObjectMethod(env, threadClass, currentThreadID); // AWT_THREADING Safe (known object)
+ if (curThread == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
+ name = (*env)->NewStringUTF(env, "AWT-AppKit");
+ if (name == NULL || (*env)->ExceptionCheck(env)) goto cleanup;
+ (*env)->CallVoidMethod(env, curThread, setName, name); // AWT_THREADING Safe (known object)
+ if ((*env)->ExceptionCheck(env)) goto cleanup;
cleanup:
if (threadClass != NULL) {
@@ -134,14 +145,10 @@
(*env)->ExceptionClear(env);
}
- // Add the exception handler of last resort
- NSSetUncaughtExceptionHandler(AWT_NSUncaughtExceptionHandler);
-
if (verbose) AWT_DEBUG_LOG(@"finished setting thread name");
}
-
// Returns true if java believes it is running headless
BOOL isHeadless(JNIEnv *env) {
// Just access the property directly, instead of using GraphicsEnvironment.isHeadless.
@@ -200,7 +207,7 @@
// This is an empty Obj-C object just so that -peformSelectorOnMainThread can be used.
@interface AWTStarter : NSObject { }
-+ (void)start:(BOOL)headless swtMode:(BOOL)swtMode swtModeForWebStart:(BOOL)swtModeForWebStart;
++ (void)start:(BOOL)headless;
- (void)starter:(NSArray*)args;
+ (void)appKitIsRunning:(id)arg;
@end
@@ -242,7 +249,7 @@
if (verbose) AWT_DEBUG_LOG(@"finished messaging AppKit started");
}
-+ (void)start:(BOOL)headless swtMode:(BOOL)swtMode swtModeForWebStart:(BOOL)swtModeForWebStart
++ (void)start:(BOOL)headless
{
BOOL verbose = ShouldPrintVerboseDebugging();
@@ -258,7 +265,7 @@
BOOL onMainThread = (pthread_main_np() != 0);
if (verbose) {
- NSString *msg = [NSString stringWithFormat:@"+[AWTStarter start headless:%d swtMode:%d swtModeForWebStart:%d] { onMainThread:%d }", headless, swtMode, swtModeForWebStart, onMainThread];
+ NSString *msg = [NSString stringWithFormat:@"+[AWTStarter start headless:%d] { onMainThread:%d }", headless, onMainThread];
AWT_DEBUG_LOG(msg);
}
@@ -280,9 +287,7 @@
NSArray * args = [NSArray arrayWithObjects:
[NSNumber numberWithBool: onMainThread],
- [NSNumber numberWithBool: swtMode],
[NSNumber numberWithBool: headless],
- [NSNumber numberWithBool: swtModeForWebStart],
[NSNumber numberWithBool: verbose],
nil];
@@ -310,39 +315,38 @@
// Don't set the delegate until the NSApplication has been created and
// its finishLaunching has initialized it.
// ApplicationDelegate is the support code for com.apple.eawt.
- void (^setDelegateBlock)() = ^(){
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]);
- };
- if (onMainThread) {
- setDelegateBlock();
- } else {
- [JNFRunLoop performOnMainThreadWaiting:YES withBlock:setDelegateBlock];
- }
+ }];
}
- (void)starter:(NSArray*)args {
NSAutoreleasePool *pool = [NSAutoreleasePool new];
BOOL onMainThread = [[args objectAtIndex:0] boolValue];
- BOOL swtMode = [[args objectAtIndex:1] boolValue];
- BOOL headless = [[args objectAtIndex:2] boolValue];
- BOOL swtModeForWebStart = [[args objectAtIndex:3] boolValue];
- BOOL verbose = [[args objectAtIndex:4] boolValue];
+ BOOL headless = [[args objectAtIndex:1] boolValue];
+ BOOL verbose = [[args objectAtIndex:2] boolValue];
BOOL wasOnMainThread = onMainThread;
- setUpAWTAppKit(swtMode, headless);
+ // Add the exception handler of last resort
+ NSSetUncaughtExceptionHandler(AWT_NSUncaughtExceptionHandler);
// Headless mode trumps either ordinary AWT or SWT-in-AWT mode. Declare us a daemon and return.
if (headless) {
- BOOL didBecomeDaemon = [AWTStarter markAppAsDaemon];
+ if (!forceEmbeddedMode) {
+ setUpAppKitThreadName();
+ }
+ [AWTStarter markAppAsDaemon];
return;
}
- if (swtMode || swtModeForWebStart) {
+ if (forceEmbeddedMode) {
if (verbose) NSLog(@"in SWT or SWT/WebStart mode");
- // The SWT should call NSApplicationLoad, but they don't know a priori that they will be using the AWT, so they don't.
+ // Init a default NSApplication instance instead of the NSApplicationAWT.
+ // Note that [NSApp isRunning] will return YES after that, though
+ // this behavior isn't specified anywhere. We rely on that.
NSApplicationLoad();
}
@@ -351,6 +355,13 @@
// and -[NSApplication isRunning] returns YES, AWT is embedded inside another
// AppKit Application.
NSApplication *app = [NSApplicationAWT sharedApplication];
+ isEmbedded = ![NSApp isKindOfClass:[NSApplicationAWT class]];
+
+ if (!isEmbedded) {
+ // Install run loop observers and set the AppKit Java thread name
+ setUpAWTAppKit();
+ setUpAppKitThreadName();
+ }
// AWT gets to this point BEFORE NSApplicationDidFinishLaunchingNotification is sent.
if (![app isRunning]) {
@@ -360,17 +371,11 @@
[NSApplicationAWT runAWTLoopWithApp: app];
} else {
// We're either embedded, or showing a splash screen
- if (![NSApp isKindOfClass:[NSApplicationAWT class]]) {
+ if (isEmbedded) {
if (verbose) AWT_DEBUG_LOG(@"running embedded");
- // Since we're embedded, no need to be swamping the runloop with the observers.
- CFRunLoopRef runLoop = [[NSRunLoop currentRunLoop] getCFRunLoop];
- CFRunLoopRemoveObserver(runLoop, busyObserver, kCFRunLoopDefaultMode);
- CFRunLoopRemoveObserver(runLoop, notBusyObserver, kCFRunLoopDefaultMode);
// We don't track if the runloop is busy, so set it free to let AWT finish when it needs
setBusy(NO);
- busyObserver = NULL;
- notBusyObserver = NULL;
} else {
if (verbose) AWT_DEBUG_LOG(@"running after showing a splash screen");
}
@@ -408,49 +413,28 @@
return JNI_VERSION_1_4;
}
- // The following is true when AWT is attempting to connect to the window server
- // when it isn't set up properly to do so.
- // BOOL AWTLoadFailure = YES; For now we are skipping this check so i'm commenting out this variable as unused
JNF_COCOA_ENTER(env);
- // If -XstartOnFirstThread was used at invocation time, an environment variable will be set.
- // (See java_md.c for the matching setenv call.) When that happens, we assume the SWT will be in use.
- BOOL swt_compatible_mode = NO;
-
+ // Launcher sets this env variable if -XstartOnFirstThread is specified
char envVar[80];
snprintf(envVar, sizeof(envVar), "JAVA_STARTED_ON_FIRST_THREAD_%d", getpid());
if (getenv(envVar) != NULL) {
- swt_compatible_mode = YES;
+ forceEmbeddedMode = YES;
unsetenv(envVar);
}
- BOOL swt_in_webstart = isSWTInWebStart(env);
- BOOL headless = isHeadless(env);
+ if (isSWTInWebStart(env)) {
+ forceEmbeddedMode = YES;
+ }
- // Make sure we're on the right thread. If not, we still need the JNIEnv to throw an exception.
- if (pthread_main_np() != 0 && !swt_compatible_mode && !headless) {
- AWT_DEBUG_LOG(@"Apple AWT Java VM was loaded on first thread -- can't start AWT.");
- [JNFException raise:env as:kInternalError reason:"Can't start the AWT because Java was started on the first thread. Make sure StartOnFirstThread is "
- "not specified in your application's Info.plist or on the command line"];
- return JNI_VERSION_1_4;
- }
+ BOOL headless = isHeadless(env);
// We need to let Foundation know that this is a multithreaded application, if it isn't already.
if (![NSThread isMultiThreaded]) {
[NSThread detachNewThreadSelector:nil toTarget:nil withObject:nil];
}
-// if (swt_compatible_mode || headless || [AWTStarter isConnectedToWindowServer] || [AWTStarter isRemoteSession]) {
-// No need in this check - we will try to launch AWTStarter anyways - to be able to run GUI application remotely
-// AWTLoadFailure = NO;
-
- [AWTStarter start:headless swtMode:swt_compatible_mode swtModeForWebStart:swt_in_webstart];
-
-// }
-
-/* if (AWTLoadFailure) { // We will not reach this code anyways
- [JNFException raise:env as:kInternalError reason:"Can't connect to window server - not enough permissions."];
- } */
+ [AWTStarter start:headless];
JNF_COCOA_EXIT(env);
--- a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h Thu Jan 31 10:22:25 2013 -0800
@@ -98,8 +98,6 @@
} \
} while (0)
-#define AWT_ASSERT_ANY_THREAD
-
#endif /* AWT_THREAD_ASSERTS_MESSAGES */
#ifdef AWT_THREAD_ASSERTS_WAIT
@@ -114,15 +112,12 @@
while (pthread_main_np() != 0) {} \
} while (0)
-#define AWT_ASSERT_ANY_THREAD
-
#endif /* AWT_THREAD_ASSERTS_WAIT */
#else /* AWT_THREAD_ASSERTS */
#define AWT_ASSERT_APPKIT_THREAD do {} while (0)
#define AWT_ASSERT_NOT_APPKIT_THREAD do {} while (0)
-#define AWT_ASSERT_ANY_THREAD
#endif /* AWT_THREAD_ASSERTS */
// --------------------------------------------------------------------------
@@ -139,7 +134,10 @@
+ (JNIEnv*)getJNIEnvUncached;
+ (void)performOnMainThread:(SEL)aSelector onObject:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait awtMode:(BOOL)inAWT;
+
+//Wrappers for the corresponding JNFRunLoop methods with a check for main thread
+ (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block;
++ (void)performOnMainThread:(SEL)aSelector on:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait;
@end
void OSXAPP_SetJavaVM(JavaVM *vm);
--- a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m Thu Jan 31 10:22:25 2013 -0800
@@ -37,27 +37,13 @@
static NSArray *sPerformModes = nil;
static NSArray *sAWTPerformModes = nil;
-static BOOL sCocoaComponentCompatibility = NO;
-static NSTimeInterval sCocoaComponentCompatibilityTimeout = 0.5;
static BOOL sLoggingEnabled = YES;
#ifdef AWT_THREAD_ASSERTS_ENV_ASSERT
int sAWTThreadAsserts = 0;
#endif /* AWT_THREAD_ASSERTS_ENV_ASSERT */
-
-// This is for backward compatibility for those people using CocoaComponent
-// Since we've flipped the AWT threading model for Tiger (10.4), all the rules
-// for CocoaComponent are wrong.
-// So for existing CocoaComponent users, we can't be synchronous.
-// Making things totally asynchronous breaks a _lot_, so we try to be
-// synchronous and time out after a little bit.
-#define NOT_READY 0
-#define READY 1
-#define IN_PROGRESS 2
-
BOOL sInPerformFromJava = NO;
-NSUInteger sPerformCount = 0;
// This class is used so that performSelectorOnMainThread can be
// controlled a little more easily by us. It has 2 roles.
@@ -73,8 +59,6 @@
- (id) initWithTarget:(id)target selector:(SEL)selector arg:(id)arg wait:(BOOL)wait;
- (void) perform;
-- (void) performCompatible;
-- (void) _performCompatible:(NSConditionLock *)resultLock;
@end
@@ -113,8 +97,6 @@
sInPerformFromJava = YES;
}
- sPerformCount++;
-
// Actually do the work (cheat to avoid a method call)
@try {
objc_msgSend(fTarget, fSelector, fArg);
@@ -128,69 +110,6 @@
}
}
}
-
-- (void) performCompatible {
- // We check if we are on the AppKit thread because frequently, apps
- // using CocoaComponent are doing things on the wrong thread!
- if (pthread_main_np()) {
- [fTarget performSelector:fSelector withObject:fArg];
- } else {
- // Setup the lock
- NSConditionLock *resultLock =
- [[NSConditionLock alloc] initWithCondition:NOT_READY];
-
- // Make sure that if we return early, nothing gets released out
- // from under us
- [resultLock retain];
- [fTarget retain];
- [fArg retain];
- [self retain];
- // Do an asynchronous perform to the main thread.
- [self performSelectorOnMainThread:@selector(_performCompatible:)
- withObject:resultLock waitUntilDone:NO modes:sAWTPerformModes];
-
- // Wait for a little bit for it to finish
- [resultLock lockWhenCondition:READY beforeDate:[NSDate dateWithTimeIntervalSinceNow:sCocoaComponentCompatibilityTimeout]];
-
- // If the _performCompatible is actually in progress,
- // we should let it finish
- if ([resultLock condition] == IN_PROGRESS) {
- [resultLock lockWhenCondition:READY];
- }
-
- if ([resultLock condition] == NOT_READY && sLoggingEnabled) {
- NSLog(@"[Java CocoaComponent compatibility mode]: Operation timed out due to possible deadlock: selector '%@' on target '%@' with args '%@'", NSStringFromSelector(fSelector), fTarget, fArg);
- }
-
- [resultLock unlock];
- [resultLock autorelease];
- }
-}
-
-- (void) _performCompatible:(NSConditionLock *)resultLock {
- // notify that the perform is in progress!
- [resultLock lock];
- [resultLock unlockWithCondition:IN_PROGRESS];
-
- sPerformCount++;
-
- // Actually do the work.
- @try {
- [fTarget performSelector:fSelector withObject:fArg];
- } @catch (NSException *e) {
- NSLog(@"*** CPerformer: ignoring exception '%@' raised during performCompatible of selector '%@' on target '%@' with args '%@'", e, NSStringFromSelector(fSelector), fTarget, fArg);
- } @finally {
- // notify done!
- [resultLock lock];
- [resultLock unlockWithCondition:READY];
-
- // Clean up after ourselves
- [resultLock autorelease];
- [fTarget autorelease];
- [fArg autorelease];
- [self autorelease];
- }
-}
@end
@@ -236,13 +155,8 @@
// java event thread without deadlocking. See CToolkit.invokeAndWait.
+ (void)performOnMainThread:(SEL)aSelector onObject:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait awtMode:(BOOL)inAWT {
CPerformer *performer = [[CPerformer alloc] initWithTarget:target selector:aSelector arg:arg wait:wait];
- if (sCocoaComponentCompatibility && wait && inAWT) {
- [performer performCompatible];
- [performer autorelease];
- } else {
- [performer performSelectorOnMainThread:@selector(perform) withObject:nil waitUntilDone:wait modes:((inAWT) ? sAWTPerformModes : sPerformModes)]; // AWT_THREADING Safe (cover method)
- [performer release];
- }
+ [performer performSelectorOnMainThread:@selector(perform) withObject:nil waitUntilDone:wait modes:((inAWT) ? sAWTPerformModes : sPerformModes)]; // AWT_THREADING Safe (cover method)
+ [performer release];
}
+ (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block {
@@ -253,6 +167,14 @@
}
}
++ (void)performOnMainThread:(SEL)aSelector on:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait {
+ if ([NSThread isMainThread] && wait == YES) {
+ [target performSelector:aSelector withObject:arg];
+ } else {
+ [JNFRunLoop performOnMainThread:aSelector on:target withObject:arg waitUntilDone:wait];
+ }
+}
+
@end
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Thu Jan 31 10:22:25 2013 -0800
@@ -787,7 +787,6 @@
"List.font", new FontLazyValue(Region.LIST),
"List.rendererUseUIBorder", Boolean.FALSE,
- "Menu.shortcutKeys", new int[] {KeyEvent.ALT_MASK},
"Menu.arrowIcon", new GTKStyle.GTKLazyValue(
"com.sun.java.swing.plaf.gtk.GTKIconFactory",
"getMenuArrowIcon"),
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Thu Jan 31 10:22:25 2013 -0800
@@ -630,8 +630,10 @@
"Menu.menuPopupOffsetY", new Integer(0),
"Menu.submenuPopupOffsetX", new Integer(-2),
"Menu.submenuPopupOffsetY", new Integer(3),
- "Menu.shortcutKeys", new int[] {KeyEvent.ALT_MASK,
- KeyEvent.META_MASK},
+ "Menu.shortcutKeys", new int[]{
+ SwingUtilities2.getSystemMnemonicKeyMask(),
+ KeyEvent.META_MASK
+ },
"Menu.cancelMode", "hideMenuTree",
"MenuBar.border", menuBarBorder,
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Thu Jan 31 10:22:25 2013 -0800
@@ -2619,13 +2619,15 @@
private static class FocusColorProperty extends DesktopProperty {
public FocusColorProperty () {
- // Fallback value is never used bacause of the configureValue method doesn't return null
+ // Fallback value is never used because of the configureValue method doesn't return null
super("win.3d.backgroundColor", Color.BLACK);
}
@Override
protected Object configureValue(Object value) {
- if (! ((Boolean)Toolkit.getDefaultToolkit().getDesktopProperty("win.highContrast.on")).booleanValue()){
+ Object highContrastOn = Toolkit.getDefaultToolkit().
+ getDesktopProperty("win.highContrast.on");
+ if (highContrastOn == null || !((Boolean) highContrastOn).booleanValue()) {
return Color.BLACK;
}
return Color.BLACK.equals(value) ? Color.WHITE : Color.BLACK;
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java Thu Jan 31 10:22:25 2013 -0800
@@ -93,6 +93,11 @@
counter = endRow;
}
}
+
+ if (testRect == null) {
+ return;
+ }
+
tree.scrollRectToVisible(new Rectangle(visRect.x, beginY, 1,
testRect.y + testRect.height-
beginY));
--- a/jdk/src/share/classes/java/awt/Button.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Button.java Thu Jan 31 10:22:25 2013 -0800
@@ -300,7 +300,7 @@
* @since 1.4
*/
public synchronized ActionListener[] getActionListeners() {
- return (ActionListener[]) (getListeners(ActionListener.class));
+ return getListeners(ActionListener.class);
}
/**
--- a/jdk/src/share/classes/java/awt/Checkbox.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Checkbox.java Thu Jan 31 10:22:25 2013 -0800
@@ -470,7 +470,7 @@
* @since 1.4
*/
public synchronized ItemListener[] getItemListeners() {
- return (ItemListener[]) (getListeners(ItemListener.class));
+ return getListeners(ItemListener.class);
}
/**
--- a/jdk/src/share/classes/java/awt/Choice.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Choice.java Thu Jan 31 10:22:25 2013 -0800
@@ -85,7 +85,7 @@
* @see #insert(String, int)
* @see #remove(String)
*/
- Vector pItems;
+ Vector<String> pItems;
/**
* The index of the current choice for this <code>Choice</code>
@@ -129,7 +129,7 @@
*/
public Choice() throws HeadlessException {
GraphicsEnvironment.checkHeadless();
- pItems = new Vector();
+ pItems = new Vector<>();
}
/**
@@ -191,7 +191,7 @@
* be called on the toolkit thread.
*/
final String getItemImpl(int index) {
- return (String)pItems.elementAt(index);
+ return pItems.elementAt(index);
}
/**
@@ -524,7 +524,7 @@
* @since 1.4
*/
public synchronized ItemListener[] getItemListeners() {
- return (ItemListener[])(getListeners(ItemListener.class));
+ return getListeners(ItemListener.class);
}
/**
--- a/jdk/src/share/classes/java/awt/Component.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Component.java Thu Jan 31 10:22:25 2013 -0800
@@ -7287,6 +7287,7 @@
}
final Set<AWTKeyStroke> getFocusTraversalKeys_NoIDCheck(int id) {
// Okay to return Set directly because it is an unmodifiable view
+ @SuppressWarnings("unchecked")
Set<AWTKeyStroke> keystrokes = (focusTraversalKeys != null)
? focusTraversalKeys[id]
: null;
--- a/jdk/src/share/classes/java/awt/Container.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Container.java Thu Jan 31 10:22:25 2013 -0800
@@ -161,7 +161,7 @@
private boolean focusTraversalPolicyProvider;
// keeps track of the threads that are printing this component
- private transient Set printingThreads;
+ private transient Set<Thread> printingThreads;
// True if there is at least one thread that's printing this component
private transient boolean printing = false;
@@ -275,7 +275,7 @@
*/
public Container() {
}
-
+ @SuppressWarnings({"unchecked","rawtypes"})
void initializeFocusTraversalKeys() {
focusTraversalKeys = new Set[4];
}
@@ -2006,7 +2006,7 @@
try {
synchronized (getObjectLock()) {
if (printingThreads == null) {
- printingThreads = new HashSet();
+ printingThreads = new HashSet<>();
}
printingThreads.add(t);
printing = true;
@@ -2148,7 +2148,7 @@
* @since 1.4
*/
public synchronized ContainerListener[] getContainerListeners() {
- return (ContainerListener[]) (getListeners(ContainerListener.class));
+ return getListeners(ContainerListener.class);
}
/**
@@ -2599,9 +2599,9 @@
if (GraphicsEnvironment.isHeadless()) {
throw new HeadlessException();
}
- PointerInfo pi = (PointerInfo)java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
+ PointerInfo pi = java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<PointerInfo>() {
+ public PointerInfo run() {
return MouseInfo.getPointerInfo();
}
}
@@ -2682,7 +2682,7 @@
y - comp.y,
ignoreEnabled);
} else {
- comp = comp.locate(x - comp.x, y - comp.y);
+ comp = comp.getComponentAt(x - comp.x, y - comp.y);
}
if (comp != null && comp.visible &&
(ignoreEnabled || comp.enabled))
@@ -2700,7 +2700,7 @@
y - comp.y,
ignoreEnabled);
} else {
- comp = comp.locate(x - comp.x, y - comp.y);
+ comp = comp.getComponentAt(x - comp.x, y - comp.y);
}
if (comp != null && comp.visible &&
(ignoreEnabled || comp.enabled))
@@ -4637,7 +4637,7 @@
private void startListeningForOtherDrags() {
//System.out.println("Adding AWTEventListener");
java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
+ new java.security.PrivilegedAction<Object>() {
public Object run() {
nativeContainer.getToolkit().addAWTEventListener(
LightweightDispatcher.this,
@@ -4652,7 +4652,7 @@
private void stopListeningForOtherDrags() {
//System.out.println("Removing AWTEventListener");
java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
+ new java.security.PrivilegedAction<Object>() {
public Object run() {
nativeContainer.getToolkit().removeAWTEventListener(LightweightDispatcher.this);
return null;
--- a/jdk/src/share/classes/java/awt/Dialog.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Dialog.java Thu Jan 31 10:22:25 2013 -0800
@@ -1047,9 +1047,9 @@
// if this dialog is toolkit-modal, the filter should be added
// to all EDTs (for all AppContexts)
if (modalityType == ModalityType.TOOLKIT_MODAL) {
- Iterator it = AppContext.getAppContexts().iterator();
+ Iterator<AppContext> it = AppContext.getAppContexts().iterator();
while (it.hasNext()) {
- AppContext appContext = (AppContext)it.next();
+ AppContext appContext = it.next();
if (appContext == showAppContext) {
continue;
}
@@ -1084,9 +1084,9 @@
// if this dialog is toolkit-modal, its filter must be removed
// from all EDTs (for all AppContexts)
if (modalityType == ModalityType.TOOLKIT_MODAL) {
- Iterator it = AppContext.getAppContexts().iterator();
+ Iterator<AppContext> it = AppContext.getAppContexts().iterator();
while (it.hasNext()) {
- AppContext appContext = (AppContext)it.next();
+ AppContext appContext = it.next();
if (appContext == showAppContext) {
continue;
}
@@ -1396,7 +1396,7 @@
if (d.shouldBlock(this)) {
Window w = d;
while ((w != null) && (w != this)) {
- w = (Window)(w.getOwner_NoClientCode());
+ w = w.getOwner_NoClientCode();
}
if ((w == this) || !shouldBlock(d) || (modalityType.compareTo(d.getModalityType()) < 0)) {
blockers.add(d);
@@ -1611,7 +1611,7 @@
setModal(modal);
}
- blockedWindows = new IdentityArrayList();
+ blockedWindows = new IdentityArrayList<>();
}
/*
--- a/jdk/src/share/classes/java/awt/Frame.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Frame.java Thu Jan 31 10:22:25 2013 -0800
@@ -353,7 +353,7 @@
* @serial
* @see java.awt.Window#ownedWindowList
*/
- Vector ownedWindows;
+ Vector<Window> ownedWindows;
private static final String base = "frame";
private static int nameCounter = 0;
@@ -1242,7 +1242,7 @@
//
if (ownedWindows != null) {
for (int i = 0; i < ownedWindows.size(); i++) {
- connectOwnedWindow((Window) ownedWindows.elementAt(i));
+ connectOwnedWindow(ownedWindows.elementAt(i));
}
ownedWindows = null;
}
--- a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java Thu Jan 31 10:22:25 2013 -0800
@@ -416,7 +416,7 @@
}
}
- static Set initFocusTraversalKeysSet(String value, Set targetSet) {
+ static Set<AWTKeyStroke> initFocusTraversalKeysSet(String value, Set<AWTKeyStroke> targetSet) {
StringTokenizer tokens = new StringTokenizer(value, ",");
while (tokens.hasMoreTokens()) {
targetSet.add(AWTKeyStroke.getAWTKeyStroke(tokens.nextToken()));
--- a/jdk/src/share/classes/java/awt/Scrollbar.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Scrollbar.java Thu Jan 31 10:22:25 2013 -0800
@@ -1012,7 +1012,7 @@
* @since 1.4
*/
public synchronized AdjustmentListener[] getAdjustmentListeners() {
- return (AdjustmentListener[])(getListeners(AdjustmentListener.class));
+ return getListeners(AdjustmentListener.class);
}
/**
--- a/jdk/src/share/classes/java/awt/TextArea.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/TextArea.java Thu Jan 31 10:22:25 2013 -0800
@@ -123,7 +123,7 @@
* Cache the Sets of forward and backward traversal keys so we need not
* look them up each time.
*/
- private static Set forwardTraversalKeys, backwardTraversalKeys;
+ private static Set<AWTKeyStroke> forwardTraversalKeys, backwardTraversalKeys;
/*
* JDK 1.1 serialVersionUID
@@ -143,10 +143,10 @@
}
forwardTraversalKeys = KeyboardFocusManager.initFocusTraversalKeysSet(
"ctrl TAB",
- new HashSet());
+ new HashSet<AWTKeyStroke>());
backwardTraversalKeys = KeyboardFocusManager.initFocusTraversalKeysSet(
"ctrl shift TAB",
- new HashSet());
+ new HashSet<AWTKeyStroke>());
}
/**
--- a/jdk/src/share/classes/java/awt/TextComponent.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/TextComponent.java Thu Jan 31 10:22:25 2013 -0800
@@ -606,7 +606,7 @@
* @since 1.4
*/
public synchronized TextListener[] getTextListeners() {
- return (TextListener[])(getListeners(TextListener.class));
+ return getListeners(TextListener.class);
}
/**
--- a/jdk/src/share/classes/java/awt/TextField.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/TextField.java Thu Jan 31 10:22:25 2013 -0800
@@ -507,7 +507,7 @@
* @since 1.4
*/
public synchronized ActionListener[] getActionListeners() {
- return (ActionListener[])(getListeners(ActionListener.class));
+ return getListeners(ActionListener.class);
}
/**
--- a/jdk/src/share/classes/java/awt/Toolkit.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Toolkit.java Thu Jan 31 10:22:25 2013 -0800
@@ -863,7 +863,7 @@
new java.security.PrivilegedAction<Void>() {
public Void run() {
String nm = null;
- Class cls = null;
+ Class<?> cls = null;
try {
nm = System.getProperty("awt.toolkit");
try {
--- a/jdk/src/share/classes/java/awt/Window.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Window.java Thu Jan 31 10:22:25 2013 -0800
@@ -441,7 +441,7 @@
transient Object anchor = new Object();
static class WindowDisposerRecord implements sun.java2d.DisposerRecord {
final WeakReference<Window> owner;
- final WeakReference weakThis;
+ final WeakReference<Window> weakThis;
final WeakReference<AppContext> context;
WindowDisposerRecord(AppContext context, Window victim) {
owner = new WeakReference<Window>(victim.getOwner());
@@ -1542,6 +1542,7 @@
private static Window[] getWindows(AppContext appContext) {
synchronized (Window.class) {
Window realCopy[];
+ @SuppressWarnings("unchecked")
Vector<WeakReference<Window>> windowList =
(Vector<WeakReference<Window>>)appContext.get(Window.class);
if (windowList != null) {
@@ -1866,7 +1867,7 @@
* @since 1.4
*/
public synchronized WindowListener[] getWindowListeners() {
- return (WindowListener[])(getListeners(WindowListener.class));
+ return getListeners(WindowListener.class);
}
/**
@@ -1882,7 +1883,7 @@
* @since 1.4
*/
public synchronized WindowFocusListener[] getWindowFocusListeners() {
- return (WindowFocusListener[])(getListeners(WindowFocusListener.class));
+ return getListeners(WindowFocusListener.class);
}
/**
@@ -1898,7 +1899,7 @@
* @since 1.4
*/
public synchronized WindowStateListener[] getWindowStateListeners() {
- return (WindowStateListener[])(getListeners(WindowStateListener.class));
+ return getListeners(WindowStateListener.class);
}
@@ -2014,7 +2015,6 @@
break;
case WindowEvent.WINDOW_STATE_CHANGED:
processWindowStateEvent((WindowEvent)e);
- default:
break;
}
return;
@@ -2382,12 +2382,14 @@
* KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS
* @since 1.4
*/
+ @SuppressWarnings("unchecked")
public Set<AWTKeyStroke> getFocusTraversalKeys(int id) {
if (id < 0 || id >= KeyboardFocusManager.TRAVERSAL_KEY_LENGTH) {
throw new IllegalArgumentException("invalid focus traversal key identifier");
}
// Okay to return Set directly because it is an unmodifiable view
+ @SuppressWarnings("rawtypes")
Set keystrokes = (focusTraversalKeys != null)
? focusTraversalKeys[id]
: null;
@@ -2765,7 +2767,7 @@
/*
* Support for tracking all windows owned by this window
*/
- void addOwnedWindow(WeakReference weakWindow) {
+ void addOwnedWindow(WeakReference<Window> weakWindow) {
if (weakWindow != null) {
synchronized(ownedWindowList) {
// this if statement should really be an assert, but we don't
@@ -2777,7 +2779,7 @@
}
}
- void removeOwnedWindow(WeakReference weakWindow) {
+ void removeOwnedWindow(WeakReference<Window> weakWindow) {
if (weakWindow != null) {
// synchronized block not required since removeElement is
// already synchronized
@@ -2792,6 +2794,7 @@
private void addToWindowList() {
synchronized (Window.class) {
+ @SuppressWarnings("unchecked")
Vector<WeakReference<Window>> windowList = (Vector<WeakReference<Window>>)appContext.get(Window.class);
if (windowList == null) {
windowList = new Vector<WeakReference<Window>>();
@@ -2801,8 +2804,9 @@
}
}
- private static void removeFromWindowList(AppContext context, WeakReference weakThis) {
+ private static void removeFromWindowList(AppContext context, WeakReference<Window> weakThis) {
synchronized (Window.class) {
+ @SuppressWarnings("unchecked")
Vector<WeakReference<Window>> windowList = (Vector<WeakReference<Window>>)context.get(Window.class);
if (windowList != null) {
windowList.remove(weakThis);
@@ -2945,7 +2949,7 @@
// Deserialized Windows are not yet visible.
visible = false;
- weakThis = new WeakReference(this);
+ weakThis = new WeakReference<>(this);
anchor = new Object();
sun.java2d.Disposer.addRecord(anchor, new WindowDisposerRecord(appContext, this));
@@ -2956,7 +2960,7 @@
private void deserializeResources(ObjectInputStream s)
throws ClassNotFoundException, IOException, HeadlessException {
- ownedWindowList = new Vector();
+ ownedWindowList = new Vector<>();
if (windowSerializedDataVersion < 2) {
// Translate old-style focus tracking to new model. For 1.4 and
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Thu Jan 31 10:22:25 2013 -0800
@@ -1153,7 +1153,9 @@
"Menu.menuPopupOffsetY", new Integer(0),
"Menu.submenuPopupOffsetX", new Integer(0),
"Menu.submenuPopupOffsetY", new Integer(0),
- "Menu.shortcutKeys", new int[] {KeyEvent.ALT_MASK},
+ "Menu.shortcutKeys", new int[]{
+ SwingUtilities2.getSystemMnemonicKeyMask()
+ },
"Menu.crossMenuMnemonic", Boolean.TRUE,
// Menu.cancelMode affects the cancel menu action behaviour;
// currently supports:
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Thu Jan 31 10:22:25 2013 -0800
@@ -1879,6 +1879,20 @@
visRect.x -= i.left;
visRect.y -= i.top;
}
+ // we should consider a non-visible area above
+ Component component = SwingUtilities.getUnwrappedParent(tree);
+ if (component instanceof JViewport) {
+ component = component.getParent();
+ if (component instanceof JScrollPane) {
+ JScrollPane pane = (JScrollPane) component;
+ JScrollBar bar = pane.getHorizontalScrollBar();
+ if ((bar != null) && bar.isVisible()) {
+ int height = bar.getHeight();
+ visRect.y -= height;
+ visRect.height += height;
+ }
+ }
+ }
preferredSize.width = treeState.getPreferredWidth(visRect);
}
else {
@@ -4504,7 +4518,7 @@
}
}
- private void home(JTree tree, BasicTreeUI ui, int direction,
+ private void home(JTree tree, final BasicTreeUI ui, int direction,
boolean addToSelection, boolean changeSelection) {
// disable moving of lead unless in discontiguous mode
@@ -4514,7 +4528,7 @@
changeSelection = true;
}
- int rowCount = ui.getRowCount(tree);
+ final int rowCount = ui.getRowCount(tree);
if (rowCount > 0) {
if(direction == -1) {
@@ -4566,6 +4580,13 @@
ui.setLeadSelectionPath(ui.getPathForRow(tree,
rowCount - 1), true);
}
+ if (ui.isLargeModel()){
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ ui.ensureRowsAreVisible(rowCount - 1, rowCount - 1);
+ }
+ });
+ }
}
}
}
--- a/jdk/src/share/classes/sun/awt/image/SurfaceManager.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/image/SurfaceManager.java Thu Jan 31 10:22:25 2013 -0800
@@ -88,7 +88,7 @@
imgaccessor.setSurfaceManager(img, mgr);
}
- private ConcurrentHashMap cacheMap;
+ private ConcurrentHashMap<Object,Object> cacheMap;
/**
* Return an arbitrary cached object for an arbitrary cache key.
@@ -123,7 +123,7 @@
if (cacheMap == null) {
synchronized (this) {
if (cacheMap == null) {
- cacheMap = new ConcurrentHashMap(2);
+ cacheMap = new ConcurrentHashMap<>(2);
}
}
}
@@ -245,7 +245,7 @@
synchronized void flush(boolean deaccelerate) {
if (cacheMap != null) {
- Iterator i = cacheMap.values().iterator();
+ Iterator<Object> i = cacheMap.values().iterator();
while (i.hasNext()) {
Object o = i.next();
if (o instanceof FlushableCacheData) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/misc/Contended.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.misc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation marks classes and fields as considered to be contended.
+ * @since 1.8
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.TYPE})
+public @interface Contended {
+
+ /**
+ Defines the contention group tag.
+ */
+ String value() default "";
+}
--- a/jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -147,37 +147,53 @@
private final Surrogate.Parser sgp = new Surrogate.Parser();
+ // JVM may replace this method with intrinsic code.
+ private static int encodeISOArray(char[] sa, int sp,
+ byte[] da, int dp, int len)
+ {
+ int i = 0;
+ for (; i < len; i++) {
+ char c = sa[sp++];
+ if (c > '\u00FF')
+ break;
+ da[dp++] = (byte)c;
+ }
+ return i;
+ }
+
private CoderResult encodeArrayLoop(CharBuffer src,
ByteBuffer dst)
{
char[] sa = src.array();
- int sp = src.arrayOffset() + src.position();
- int sl = src.arrayOffset() + src.limit();
+ int soff = src.arrayOffset();
+ int sp = soff + src.position();
+ int sl = soff + src.limit();
assert (sp <= sl);
sp = (sp <= sl ? sp : sl);
byte[] da = dst.array();
- int dp = dst.arrayOffset() + dst.position();
- int dl = dst.arrayOffset() + dst.limit();
+ int doff = dst.arrayOffset();
+ int dp = doff + dst.position();
+ int dl = doff + dst.limit();
assert (dp <= dl);
dp = (dp <= dl ? dp : dl);
+ int dlen = dl - dp;
+ int slen = sl - sp;
+ int len = (dlen < slen) ? dlen : slen;
try {
- while (sp < sl) {
- char c = sa[sp];
- if (c <= '\u00FF') {
- if (dp >= dl)
- return CoderResult.OVERFLOW;
- da[dp++] = (byte)c;
- sp++;
- continue;
- }
- if (sgp.parse(c, sa, sp, sl) < 0)
+ int ret = encodeISOArray(sa, sp, da, dp, len);
+ sp = sp + ret;
+ dp = dp + ret;
+ if (ret != len) {
+ if (sgp.parse(sa[sp], sa, sp, sl) < 0)
return sgp.error();
return sgp.unmappableResult();
}
+ if (len < slen)
+ return CoderResult.OVERFLOW;
return CoderResult.UNDERFLOW;
} finally {
- src.position(sp - src.arrayOffset());
- dst.position(dp - dst.arrayOffset());
+ src.position(sp - soff);
+ dst.position(dp - doff);
}
}
@@ -221,22 +237,25 @@
public int encode(char[] src, int sp, int len, byte[] dst) {
int dp = 0;
- int sl = sp + Math.min(len, dst.length);
+ int slen = Math.min(len, dst.length);
+ int sl = sp + slen;
while (sp < sl) {
- char c = src[sp++];
- if (c <= '\u00FF') {
- dst[dp++] = (byte)c;
- continue;
+ int ret = encodeISOArray(src, sp, dst, dp, slen);
+ sp = sp + ret;
+ dp = dp + ret;
+ if (ret != slen) {
+ char c = src[sp++];
+ if (Character.isHighSurrogate(c) && sp < sl &&
+ Character.isLowSurrogate(src[sp])) {
+ if (len > dst.length) {
+ sl++;
+ len--;
+ }
+ sp++;
+ }
+ dst[dp++] = repl;
+ slen = Math.min((sl - sp), (dst.length - dp));
}
- if (Character.isHighSurrogate(c) && sp < sl &&
- Character.isLowSurrogate(src[sp])) {
- if (len > dst.length) {
- sl++;
- len--;
- }
- sp++;
- }
- dst[dp++] = repl;
}
return dp;
}
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java Thu Jan 31 10:22:25 2013 -0800
@@ -1879,4 +1879,12 @@
}
return -1;
}
+
+ public static int getSystemMnemonicKeyMask() {
+ Toolkit toolkit = Toolkit.getDefaultToolkit();
+ if (toolkit instanceof SunToolkit) {
+ return ((SunToolkit) toolkit).getFocusAcceleratorKeyMask();
+ }
+ return InputEvent.ALT_MASK;
+ }
}
--- a/jdk/src/share/classes/sun/swing/WindowsPlacesBar.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/sun/swing/WindowsPlacesBar.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -116,9 +116,6 @@
icon = fsv.getSystemIcon(files[i]);
}
buttons[i] = new JToggleButton(folderName, icon);
- if (isXPPlatform) {
- buttons[i].setText("<html><center>"+folderName+"</center></html>");
- }
if (isXPStyle) {
buttons[i].putClientProperty("XPStyle.subAppName", "placesbar");
} else {
--- a/jdk/src/share/classes/sun/util/resources/sq/LocaleNames_sq.properties Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/src/share/classes/sun/util/resources/sq/LocaleNames_sq.properties Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
# language names
# key is ISO 639 language code
-sq=shqipe
+sq=shqip
# country names
# key is ISO 3166 country code
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/classes/sun/awt/X11/generator/sizes.32 Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,1016 @@
+long 4
+int 4
+short 2
+ptr 4
+Bool 4
+Atom 4
+Window 4
+XExtData.number 0
+XExtData.next 4
+XExtData.free_private 8
+XExtData.private_data 12
+XExtData 16
+XIMStringConversionCallbackStruct.position 0
+XIMStringConversionCallbackStruct.direction 4
+XIMStringConversionCallbackStruct.operation 8
+XIMStringConversionCallbackStruct.factor 10
+XIMStringConversionCallbackStruct.text 12
+XIMStringConversionCallbackStruct 16
+XkbNewKeyboardNotifyEvent.type 0
+XkbNewKeyboardNotifyEvent.serial 4
+XkbNewKeyboardNotifyEvent.send_event 8
+XkbNewKeyboardNotifyEvent.display 12
+XkbNewKeyboardNotifyEvent.time 16
+XkbNewKeyboardNotifyEvent.xkb_type 20
+XkbNewKeyboardNotifyEvent.device 24
+XkbNewKeyboardNotifyEvent.old_device 28
+XkbNewKeyboardNotifyEvent.min_key_code 32
+XkbNewKeyboardNotifyEvent.max_key_code 36
+XkbNewKeyboardNotifyEvent.old_min_key_code 40
+XkbNewKeyboardNotifyEvent.old_max_key_code 44
+XkbNewKeyboardNotifyEvent.changed 48
+XkbNewKeyboardNotifyEvent.req_major 52
+XkbNewKeyboardNotifyEvent.req_minor 53
+XkbNewKeyboardNotifyEvent 56
+XTimeCoord.time 0
+XTimeCoord.x 4
+XTimeCoord.y 6
+XTimeCoord 8
+XkbCompatMapNotifyEvent.type 0
+XkbCompatMapNotifyEvent.serial 4
+XkbCompatMapNotifyEvent.send_event 8
+XkbCompatMapNotifyEvent.display 12
+XkbCompatMapNotifyEvent.time 16
+XkbCompatMapNotifyEvent.xkb_type 20
+XkbCompatMapNotifyEvent.device 24
+XkbCompatMapNotifyEvent.changed_groups 28
+XkbCompatMapNotifyEvent.first_si 32
+XkbCompatMapNotifyEvent.num_si 36
+XkbCompatMapNotifyEvent.num_total_si 40
+XkbCompatMapNotifyEvent 44
+XIMStatusDrawCallbackStruct.type 0
+XIMStatusDrawCallbackStruct.data 4
+XIMStatusDrawCallbackStruct 8
+XKeyboardControl.key_click_percent 0
+XKeyboardControl.bell_percent 4
+XKeyboardControl.bell_pitch 8
+XKeyboardControl.bell_duration 12
+XKeyboardControl.led 16
+XKeyboardControl.led_mode 20
+XKeyboardControl.key 24
+XKeyboardControl.auto_repeat_mode 28
+XKeyboardControl 32
+XSelectionClearEvent.type 0
+XSelectionClearEvent.serial 4
+XSelectionClearEvent.send_event 8
+XSelectionClearEvent.display 12
+XSelectionClearEvent.window 16
+XSelectionClearEvent.selection 20
+XSelectionClearEvent.time 24
+XSelectionClearEvent 28
+XWindowChanges.x 0
+XWindowChanges.y 4
+XWindowChanges.width 8
+XWindowChanges.height 12
+XWindowChanges.border_width 16
+XWindowChanges.sibling 20
+XWindowChanges.stack_mode 24
+XWindowChanges 28
+XIMPreeditCaretCallbackStruct.position 0
+XIMPreeditCaretCallbackStruct.direction 4
+XIMPreeditCaretCallbackStruct.style 8
+XIMPreeditCaretCallbackStruct 12
+XOMCharSetList.charset_count 0
+XOMCharSetList.charset_list 4
+XOMCharSetList 8
+XOMFontInfo.num_font 0
+XOMFontInfo.font_struct_list 4
+XOMFontInfo.font_name_list 8
+XOMFontInfo 12
+AwtScreenData.numConfigs 0
+AwtScreenData.root 4
+AwtScreenData.whitepixel 8
+AwtScreenData.blackpixel 12
+AwtScreenData.defaultConfig 16
+AwtScreenData.configs 20
+AwtScreenData 24
+XIMHotKeyTrigger.keysym 0
+XIMHotKeyTrigger.modifier 4
+XIMHotKeyTrigger.modifier_mask 8
+XIMHotKeyTrigger 12
+XCirculateEvent.type 0
+XCirculateEvent.serial 4
+XCirculateEvent.send_event 8
+XCirculateEvent.display 12
+XCirculateEvent.event 16
+XCirculateEvent.window 20
+XCirculateEvent.place 24
+XCirculateEvent 28
+Screen.ext_data 0
+Screen.display 4
+Screen.root 8
+Screen.width 12
+Screen.height 16
+Screen.mwidth 20
+Screen.mheight 24
+Screen.ndepths 28
+Screen.depths 32
+Screen.root_depth 36
+Screen.root_visual 40
+Screen.default_gc 44
+Screen.cmap 48
+Screen.white_pixel 52
+Screen.black_pixel 56
+Screen.max_maps 60
+Screen.min_maps 64
+Screen.backing_store 68
+Screen.save_unders 72
+Screen.root_input_mask 76
+Screen 80
+XMapRequestEvent.type 0
+XMapRequestEvent.serial 4
+XMapRequestEvent.send_event 8
+XMapRequestEvent.display 12
+XMapRequestEvent.parent 16
+XMapRequestEvent.window 20
+XMapRequestEvent 24
+XIMText.length 0
+XIMText.feedback 4
+XIMText.encoding_is_wchar 8
+XIMText.string 12
+XIMText 16
+XGraphicsExposeEvent.type 0
+XGraphicsExposeEvent.serial 4
+XGraphicsExposeEvent.send_event 8
+XGraphicsExposeEvent.display 12
+XGraphicsExposeEvent.drawable 16
+XGraphicsExposeEvent.x 20
+XGraphicsExposeEvent.y 24
+XGraphicsExposeEvent.width 28
+XGraphicsExposeEvent.height 32
+XGraphicsExposeEvent.count 36
+XGraphicsExposeEvent.major_code 40
+XGraphicsExposeEvent.minor_code 44
+XGraphicsExposeEvent 48
+XEvent.type 0
+XEvent.xany 0
+XEvent.xkey 0
+XEvent.xbutton 0
+XEvent.xmotion 0
+XEvent.xcrossing 0
+XEvent.xfocus 0
+XEvent.xexpose 0
+XEvent.xgraphicsexpose 0
+XEvent.xnoexpose 0
+XEvent.xvisibility 0
+XEvent.xcreatewindow 0
+XEvent.xdestroywindow 0
+XEvent.xunmap 0
+XEvent.xmap 0
+XEvent.xmaprequest 0
+XEvent.xreparent 0
+XEvent.xconfigure 0
+XEvent.xgravity 0
+XEvent.xresizerequest 0
+XEvent.xconfigurerequest 0
+XEvent.xcirculate 0
+XEvent.xcirculaterequest 0
+XEvent.xproperty 0
+XEvent.xselectionclear 0
+XEvent.xselectionrequest 0
+XEvent.xselection 0
+XEvent.xcolormap 0
+XEvent.xclient 0
+XEvent.xmapping 0
+XEvent.xerror 0
+XEvent.xkeymap 0
+XEvent.pad 0
+XEvent 96
+XRenderDirectFormat.red 0
+XRenderDirectFormat.redMask 2
+XRenderDirectFormat.green 4
+XRenderDirectFormat.greenMask 6
+XRenderDirectFormat.blue 8
+XRenderDirectFormat.blueMask 10
+XRenderDirectFormat.alpha 12
+XRenderDirectFormat.alphaMask 14
+XRenderDirectFormat 16
+ColorData.awt_Colors 0
+ColorData.awt_numICMcolors 4
+ColorData.awt_icmLUT 8
+ColorData.awt_icmLUT2Colors 12
+ColorData.img_grays 16
+ColorData.img_clr_tbl 20
+ColorData.img_oda_red 24
+ColorData.img_oda_green 28
+ColorData.img_oda_blue 32
+ColorData.pGrayInverseLutData 36
+ColorData.screendata 40
+ColorData 44
+XFontStruct.ext_data 0
+XFontStruct.fid 4
+XFontStruct.direction 8
+XFontStruct.min_char_or_byte2 12
+XFontStruct.max_char_or_byte2 16
+XFontStruct.min_byte1 20
+XFontStruct.max_byte1 24
+XFontStruct.all_chars_exist 28
+XFontStruct.n_properties 36
+XFontStruct.properties 40
+XFontStruct.min_bounds 44
+XFontStruct.max_bounds 56
+XFontStruct.per_char 68
+XFontStruct.ascent 72
+XFontStruct.descent 76
+XFontStruct 80
+XExtCodes.extension 0
+XExtCodes.major_opcode 4
+XExtCodes.first_event 8
+XExtCodes.first_error 12
+XExtCodes 16
+XFontSetExtents.max_ink_extent 0
+XFontSetExtents.max_logical_extent 8
+XFontSetExtents 16
+XSelectionEvent.type 0
+XSelectionEvent.serial 4
+XSelectionEvent.send_event 8
+XSelectionEvent.display 12
+XSelectionEvent.requestor 16
+XSelectionEvent.selection 20
+XSelectionEvent.target 24
+XSelectionEvent.property 28
+XSelectionEvent.time 32
+XSelectionEvent 36
+XArc.x 0
+XArc.y 2
+XArc.width 4
+XArc.height 6
+XArc.angle1 8
+XArc.angle2 10
+XArc 12
+XErrorEvent.type 0
+XErrorEvent.display 4
+XErrorEvent.resourceid 8
+XErrorEvent.serial 12
+XErrorEvent.error_code 16
+XErrorEvent.request_code 17
+XErrorEvent.minor_code 18
+XErrorEvent 20
+XConfigureRequestEvent.type 0
+XConfigureRequestEvent.serial 4
+XConfigureRequestEvent.send_event 8
+XConfigureRequestEvent.display 12
+XConfigureRequestEvent.parent 16
+XConfigureRequestEvent.window 20
+XConfigureRequestEvent.x 24
+XConfigureRequestEvent.y 28
+XConfigureRequestEvent.width 32
+XConfigureRequestEvent.height 36
+XConfigureRequestEvent.border_width 40
+XConfigureRequestEvent.above 44
+XConfigureRequestEvent.detail 48
+XConfigureRequestEvent.value_mask 52
+XConfigureRequestEvent 56
+ScreenFormat.ext_data 0
+ScreenFormat.depth 4
+ScreenFormat.bits_per_pixel 8
+ScreenFormat.scanline_pad 12
+ScreenFormat 16
+XButtonEvent.type 0
+XButtonEvent.serial 4
+XButtonEvent.send_event 8
+XButtonEvent.display 12
+XButtonEvent.window 16
+XButtonEvent.root 20
+XButtonEvent.subwindow 24
+XButtonEvent.time 28
+XButtonEvent.x 32
+XButtonEvent.y 36
+XButtonEvent.x_root 40
+XButtonEvent.y_root 44
+XButtonEvent.state 48
+XButtonEvent.button 52
+XButtonEvent.same_screen 56
+XButtonEvent 60
+XFontProp.name 0
+XFontProp.card32 4
+XFontProp 8
+XIMValuesList.count_values 0
+XIMValuesList.supported_values 4
+XIMValuesList 8
+XKeymapEvent.type 0
+XKeymapEvent.serial 4
+XKeymapEvent.send_event 8
+XKeymapEvent.display 12
+XKeymapEvent.window 16
+XKeymapEvent.key_vector 20
+XKeymapEvent 52
+XTextItem16.chars 0
+XTextItem16.nchars 4
+XTextItem16.delta 8
+XTextItem16.font 12
+XTextItem16 16
+XIMPreeditDrawCallbackStruct.caret 0
+XIMPreeditDrawCallbackStruct.chg_first 4
+XIMPreeditDrawCallbackStruct.chg_length 8
+XIMPreeditDrawCallbackStruct.text 12
+XIMPreeditDrawCallbackStruct 16
+XVisualInfo.visual 0
+XVisualInfo.visualid 4
+XVisualInfo.screen 8
+XVisualInfo.depth 12
+XVisualInfo.class 16
+XVisualInfo.red_mask 20
+XVisualInfo.green_mask 24
+XVisualInfo.blue_mask 28
+XVisualInfo.colormap_size 32
+XVisualInfo.bits_per_rgb 36
+XVisualInfo 40
+XkbControlsNotifyEvent.type 0
+XkbControlsNotifyEvent.serial 4
+XkbControlsNotifyEvent.send_event 8
+XkbControlsNotifyEvent.display 12
+XkbControlsNotifyEvent.time 16
+XkbControlsNotifyEvent.xkb_type 20
+XkbControlsNotifyEvent.device 24
+XkbControlsNotifyEvent.changed_ctrls 28
+XkbControlsNotifyEvent.enabled_ctrls 32
+XkbControlsNotifyEvent.enabled_ctrl_changes 36
+XkbControlsNotifyEvent.num_groups 40
+XkbControlsNotifyEvent.keycode 44
+XkbControlsNotifyEvent.event_type 45
+XkbControlsNotifyEvent.req_major 46
+XkbControlsNotifyEvent.req_minor 47
+XkbControlsNotifyEvent 48
+PropMwmHints.flags 0
+PropMwmHints.functions 4
+PropMwmHints.decorations 8
+PropMwmHints.inputMode 12
+PropMwmHints.status 16
+PropMwmHints 20
+XClientMessageEvent.type 0
+XClientMessageEvent.serial 4
+XClientMessageEvent.send_event 8
+XClientMessageEvent.display 12
+XClientMessageEvent.window 16
+XClientMessageEvent.message_type 20
+XClientMessageEvent.format 24
+XClientMessageEvent.data 28
+XClientMessageEvent 48
+XAnyEvent.type 0
+XAnyEvent.serial 4
+XAnyEvent.send_event 8
+XAnyEvent.display 12
+XAnyEvent.window 16
+XAnyEvent 20
+XkbIndicatorNotifyEvent.type 0
+XkbIndicatorNotifyEvent.serial 4
+XkbIndicatorNotifyEvent.send_event 8
+XkbIndicatorNotifyEvent.display 12
+XkbIndicatorNotifyEvent.time 16
+XkbIndicatorNotifyEvent.xkb_type 20
+XkbIndicatorNotifyEvent.device 24
+XkbIndicatorNotifyEvent.changed 28
+XkbIndicatorNotifyEvent.state 32
+XkbIndicatorNotifyEvent 36
+XIMPreeditStateNotifyCallbackStruct.state 0
+XIMPreeditStateNotifyCallbackStruct 4
+XkbAnyEvent.type 0
+XkbAnyEvent.serial 4
+XkbAnyEvent.send_event 8
+XkbAnyEvent.display 12
+XkbAnyEvent.time 16
+XkbAnyEvent.xkb_type 20
+XkbAnyEvent.device 24
+XkbAnyEvent 28
+XMotionEvent.type 0
+XMotionEvent.serial 4
+XMotionEvent.send_event 8
+XMotionEvent.display 12
+XMotionEvent.window 16
+XMotionEvent.root 20
+XMotionEvent.subwindow 24
+XMotionEvent.time 28
+XMotionEvent.x 32
+XMotionEvent.y 36
+XMotionEvent.x_root 40
+XMotionEvent.y_root 44
+XMotionEvent.state 48
+XMotionEvent.is_hint 52
+XMotionEvent.same_screen 56
+XMotionEvent 60
+XIMHotKeyTriggers.num_hot_key 0
+XIMHotKeyTriggers.key 4
+XIMHotKeyTriggers 8
+XIMStyles.count_styles 0
+XIMStyles.supported_styles 4
+XIMStyles 8
+XkbExtensionDeviceNotifyEvent.type 0
+XkbExtensionDeviceNotifyEvent.serial 4
+XkbExtensionDeviceNotifyEvent.send_event 8
+XkbExtensionDeviceNotifyEvent.display 12
+XkbExtensionDeviceNotifyEvent.time 16
+XkbExtensionDeviceNotifyEvent.xkb_type 20
+XkbExtensionDeviceNotifyEvent.device 24
+XkbExtensionDeviceNotifyEvent.reason 28
+XkbExtensionDeviceNotifyEvent.supported 32
+XkbExtensionDeviceNotifyEvent.unsupported 36
+XkbExtensionDeviceNotifyEvent.first_btn 40
+XkbExtensionDeviceNotifyEvent.num_btns 44
+XkbExtensionDeviceNotifyEvent.leds_defined 48
+XkbExtensionDeviceNotifyEvent.led_state 52
+XkbExtensionDeviceNotifyEvent.led_class 56
+XkbExtensionDeviceNotifyEvent.led_id 60
+XkbExtensionDeviceNotifyEvent 64
+XwcTextItem.chars 0
+XwcTextItem.nchars 4
+XwcTextItem.delta 8
+XwcTextItem.font_set 12
+XwcTextItem 16
+XClassHint.res_name 0
+XClassHint.res_class 4
+XClassHint 8
+XChar2b.byte1 0
+XChar2b.byte2 1
+XChar2b 2
+XSetWindowAttributes.background_pixmap 0
+XSetWindowAttributes.background_pixel 4
+XSetWindowAttributes.border_pixmap 8
+XSetWindowAttributes.border_pixel 12
+XSetWindowAttributes.bit_gravity 16
+XSetWindowAttributes.win_gravity 20
+XSetWindowAttributes.backing_store 24
+XSetWindowAttributes.backing_planes 28
+XSetWindowAttributes.backing_pixel 32
+XSetWindowAttributes.save_under 36
+XSetWindowAttributes.event_mask 40
+XSetWindowAttributes.do_not_propagate_mask 44
+XSetWindowAttributes.override_redirect 48
+XSetWindowAttributes.colormap 52
+XSetWindowAttributes.cursor 56
+XSetWindowAttributes 60
+XRenderPictFormat.id 0
+XRenderPictFormat.type 4
+XRenderPictFormat.depth 8
+XRenderPictFormat.direct 12
+XRenderPictFormat.colormap 28
+XRenderPictFormat 32
+XReparentEvent.type 0
+XReparentEvent.serial 4
+XReparentEvent.send_event 8
+XReparentEvent.display 12
+XReparentEvent.event 16
+XReparentEvent.window 20
+XReparentEvent.parent 24
+XReparentEvent.x 28
+XReparentEvent.y 32
+XReparentEvent.override_redirect 36
+XReparentEvent 40
+XCirculateRequestEvent.type 0
+XCirculateRequestEvent.serial 4
+XCirculateRequestEvent.send_event 8
+XCirculateRequestEvent.display 12
+XCirculateRequestEvent.parent 16
+XCirculateRequestEvent.window 20
+XCirculateRequestEvent.place 24
+XCirculateRequestEvent 28
+XImage.width 0
+XImage.height 4
+XImage.xoffset 8
+XImage.format 12
+XImage.data 16
+XImage.byte_order 20
+XImage.bitmap_unit 24
+XImage.bitmap_bit_order 28
+XImage.bitmap_pad 32
+XImage.depth 36
+XImage.bytes_per_line 40
+XImage.bits_per_pixel 44
+XImage.red_mask 48
+XImage.green_mask 52
+XImage.blue_mask 56
+XImage.obdata 60
+XImage.f.create_image 64
+XImage.f.destroy_image 68
+XImage.f.get_pixel 72
+XImage.f.put_pixel 76
+XImage.f.sub_image 80
+XImage.f.add_pixel 84
+XImage 88
+XKeyEvent.type 0
+XKeyEvent.serial 4
+XKeyEvent.send_event 8
+XKeyEvent.display 12
+XKeyEvent.window 16
+XKeyEvent.root 20
+XKeyEvent.subwindow 24
+XKeyEvent.time 28
+XKeyEvent.x 32
+XKeyEvent.y 36
+XKeyEvent.x_root 40
+XKeyEvent.y_root 44
+XKeyEvent.state 48
+XKeyEvent.keycode 52
+XKeyEvent.same_screen 56
+XKeyEvent 60
+XkbActionMessageEvent.type 0
+XkbActionMessageEvent.serial 4
+XkbActionMessageEvent.send_event 8
+XkbActionMessageEvent.display 12
+XkbActionMessageEvent.time 16
+XkbActionMessageEvent.xkb_type 20
+XkbActionMessageEvent.device 24
+XkbActionMessageEvent.keycode 28
+XkbActionMessageEvent.press 32
+XkbActionMessageEvent.key_event_follows 36
+XkbActionMessageEvent.group 40
+XkbActionMessageEvent.mods 44
+XkbActionMessageEvent.message 48
+XkbActionMessageEvent 56
+XdbeSwapInfo.swap_window 0
+XdbeSwapInfo.swap_action 4
+XdbeSwapInfo 8
+XTextItem.chars 0
+XTextItem.nchars 4
+XTextItem.delta 8
+XTextItem.font 12
+XTextItem 16
+XModifierKeymap.max_keypermod 0
+XModifierKeymap.modifiermap 4
+XModifierKeymap 8
+XCharStruct.lbearing 0
+XCharStruct.rbearing 2
+XCharStruct.width 4
+XCharStruct.ascent 6
+XCharStruct.descent 8
+XCharStruct.attributes 10
+XCharStruct 12
+XGravityEvent.type 0
+XGravityEvent.serial 4
+XGravityEvent.send_event 8
+XGravityEvent.display 12
+XGravityEvent.event 16
+XGravityEvent.window 20
+XGravityEvent.x 24
+XGravityEvent.y 28
+XGravityEvent 32
+Visual.ext_data 0
+Visual.visualid 4
+Visual.class 8
+Visual.red_mask 12
+Visual.green_mask 16
+Visual.blue_mask 20
+Visual.bits_per_rgb 24
+Visual.map_entries 28
+Visual 32
+XOMOrientation.num_orientation 0
+XOMOrientation.orientation 4
+XOMOrientation 8
+XkbAccessXNotifyEvent.type 0
+XkbAccessXNotifyEvent.serial 4
+XkbAccessXNotifyEvent.send_event 8
+XkbAccessXNotifyEvent.display 12
+XkbAccessXNotifyEvent.time 16
+XkbAccessXNotifyEvent.xkb_type 20
+XkbAccessXNotifyEvent.device 24
+XkbAccessXNotifyEvent.detail 28
+XkbAccessXNotifyEvent.keycode 32
+XkbAccessXNotifyEvent.sk_delay 36
+XkbAccessXNotifyEvent.debounce_delay 40
+XkbAccessXNotifyEvent 44
+XWindowAttributes.x 0
+XWindowAttributes.y 4
+XWindowAttributes.width 8
+XWindowAttributes.height 12
+XWindowAttributes.border_width 16
+XWindowAttributes.depth 20
+XWindowAttributes.visual 24
+XWindowAttributes.root 28
+XWindowAttributes.class 32
+XWindowAttributes.bit_gravity 36
+XWindowAttributes.win_gravity 40
+XWindowAttributes.backing_store 44
+XWindowAttributes.backing_planes 48
+XWindowAttributes.backing_pixel 52
+XWindowAttributes.save_under 56
+XWindowAttributes.colormap 60
+XWindowAttributes.map_installed 64
+XWindowAttributes.map_state 68
+XWindowAttributes.all_event_masks 72
+XWindowAttributes.your_event_mask 76
+XWindowAttributes.do_not_propagate_mask 80
+XWindowAttributes.override_redirect 84
+XWindowAttributes.screen 88
+XWindowAttributes 92
+XmbTextItem.chars 0
+XmbTextItem.nchars 4
+XmbTextItem.delta 8
+XmbTextItem.font_set 12
+XmbTextItem 16
+XMappingEvent.type 0
+XMappingEvent.serial 4
+XMappingEvent.send_event 8
+XMappingEvent.display 12
+XMappingEvent.window 16
+XMappingEvent.request 20
+XMappingEvent.first_keycode 24
+XMappingEvent.count 28
+XMappingEvent 32
+XSizeHints.flags 0
+XSizeHints.x 4
+XSizeHints.y 8
+XSizeHints.width 12
+XSizeHints.height 16
+XSizeHints.min_width 20
+XSizeHints.min_height 24
+XSizeHints.max_width 28
+XSizeHints.max_height 32
+XSizeHints.width_inc 36
+XSizeHints.height_inc 40
+XSizeHints.min_aspect.x 44
+XSizeHints.min_aspect.y 48
+XSizeHints.max_aspect.x 52
+XSizeHints.max_aspect.y 56
+XSizeHints.base_width 60
+XSizeHints.base_height 64
+XSizeHints.win_gravity 68
+XSizeHints 72
+XUnmapEvent.type 0
+XUnmapEvent.serial 4
+XUnmapEvent.send_event 8
+XUnmapEvent.display 12
+XUnmapEvent.event 16
+XUnmapEvent.window 20
+XUnmapEvent.from_configure 24
+XUnmapEvent 28
+awtImageData.Depth 0
+awtImageData.wsImageFormat 4
+awtImageData.clrdata 16
+awtImageData.convert 48
+awtImageData 304
+XkbStateNotifyEvent.type 0
+XkbStateNotifyEvent.serial 4
+XkbStateNotifyEvent.send_event 8
+XkbStateNotifyEvent.display 12
+XkbStateNotifyEvent.time 16
+XkbStateNotifyEvent.xkb_type 20
+XkbStateNotifyEvent.device 24
+XkbStateNotifyEvent.changed 28
+XkbStateNotifyEvent.group 32
+XkbStateNotifyEvent.base_group 36
+XkbStateNotifyEvent.latched_group 40
+XkbStateNotifyEvent.locked_group 44
+XkbStateNotifyEvent.mods 48
+XkbStateNotifyEvent.base_mods 52
+XkbStateNotifyEvent.latched_mods 56
+XkbStateNotifyEvent.locked_mods 60
+XkbStateNotifyEvent.compat_state 64
+XkbStateNotifyEvent.grab_mods 68
+XkbStateNotifyEvent.compat_grab_mods 69
+XkbStateNotifyEvent.lookup_mods 70
+XkbStateNotifyEvent.compat_lookup_mods 71
+XkbStateNotifyEvent.ptr_buttons 72
+XkbStateNotifyEvent.keycode 76
+XkbStateNotifyEvent.event_type 77
+XkbStateNotifyEvent.req_major 78
+XkbStateNotifyEvent.req_minor 79
+XkbStateNotifyEvent 80
+XExposeEvent.type 0
+XExposeEvent.serial 4
+XExposeEvent.send_event 8
+XExposeEvent.display 12
+XExposeEvent.window 16
+XExposeEvent.x 20
+XExposeEvent.y 24
+XExposeEvent.width 28
+XExposeEvent.height 32
+XExposeEvent.count 36
+XExposeEvent 40
+XkbMapNotifyEvent.type 0
+XkbMapNotifyEvent.serial 4
+XkbMapNotifyEvent.send_event 8
+XkbMapNotifyEvent.display 12
+XkbMapNotifyEvent.time 16
+XkbMapNotifyEvent.xkb_type 20
+XkbMapNotifyEvent.device 24
+XkbMapNotifyEvent.changed 28
+XkbMapNotifyEvent.flags 32
+XkbMapNotifyEvent.first_type 36
+XkbMapNotifyEvent.num_types 40
+XkbMapNotifyEvent.min_key_code 44
+XkbMapNotifyEvent.max_key_code 45
+XkbMapNotifyEvent.first_key_sym 46
+XkbMapNotifyEvent.first_key_act 47
+XkbMapNotifyEvent.first_key_behavior 48
+XkbMapNotifyEvent.first_key_explicit 49
+XkbMapNotifyEvent.first_modmap_key 50
+XkbMapNotifyEvent.first_vmodmap_key 51
+XkbMapNotifyEvent.num_key_syms 52
+XkbMapNotifyEvent.num_key_acts 56
+XkbMapNotifyEvent.num_key_behaviors 60
+XkbMapNotifyEvent.num_key_explicit 64
+XkbMapNotifyEvent.num_modmap_keys 68
+XkbMapNotifyEvent.num_vmodmap_keys 72
+XkbMapNotifyEvent.vmods 76
+XkbMapNotifyEvent 80
+XGCValues.function 0
+XGCValues.plane_mask 4
+XGCValues.foreground 8
+XGCValues.background 12
+XGCValues.line_width 16
+XGCValues.line_style 20
+XGCValues.cap_style 24
+XGCValues.join_style 28
+XGCValues.fill_style 32
+XGCValues.fill_rule 36
+XGCValues.arc_mode 40
+XGCValues.tile 44
+XGCValues.stipple 48
+XGCValues.ts_x_origin 52
+XGCValues.ts_y_origin 56
+XGCValues.font 60
+XGCValues.subwindow_mode 64
+XGCValues.graphics_exposures 68
+XGCValues.clip_x_origin 72
+XGCValues.clip_y_origin 76
+XGCValues.clip_mask 80
+XGCValues.dash_offset 84
+XGCValues.dashes 88
+XGCValues 92
+XFocusChangeEvent.type 0
+XFocusChangeEvent.serial 4
+XFocusChangeEvent.send_event 8
+XFocusChangeEvent.display 12
+XFocusChangeEvent.window 16
+XFocusChangeEvent.mode 20
+XFocusChangeEvent.detail 24
+XFocusChangeEvent 28
+XPixmapFormatValues.depth 0
+XPixmapFormatValues.bits_per_pixel 4
+XPixmapFormatValues.scanline_pad 8
+XPixmapFormatValues 12
+XMapEvent.type 0
+XMapEvent.serial 4
+XMapEvent.send_event 8
+XMapEvent.display 12
+XMapEvent.event 16
+XMapEvent.window 20
+XMapEvent.override_redirect 24
+XMapEvent 28
+XkbBellNotifyEvent.type 0
+XkbBellNotifyEvent.serial 4
+XkbBellNotifyEvent.send_event 8
+XkbBellNotifyEvent.display 12
+XkbBellNotifyEvent.time 16
+XkbBellNotifyEvent.xkb_type 20
+XkbBellNotifyEvent.device 24
+XkbBellNotifyEvent.percent 28
+XkbBellNotifyEvent.pitch 32
+XkbBellNotifyEvent.duration 36
+XkbBellNotifyEvent.bell_class 40
+XkbBellNotifyEvent.bell_id 44
+XkbBellNotifyEvent.name 48
+XkbBellNotifyEvent.window 52
+XkbBellNotifyEvent.event_only 56
+XkbBellNotifyEvent 60
+XIMStringConversionText.length 0
+XIMStringConversionText.feedback 4
+XIMStringConversionText.encoding_is_wchar 8
+XIMStringConversionText.string 12
+XIMStringConversionText 16
+XKeyboardState.key_click_percent 0
+XKeyboardState.bell_percent 4
+XKeyboardState.bell_pitch 8
+XKeyboardState.bell_duration 12
+XKeyboardState.led_mask 16
+XKeyboardState.global_auto_repeat 20
+XKeyboardState.auto_repeats 24
+XKeyboardState 56
+XkbEvent.type 0
+XkbEvent.any 0
+XkbEvent.new_kbd 0
+XkbEvent.map 0
+XkbEvent.state 0
+XkbEvent.ctrls 0
+XkbEvent.indicators 0
+XkbEvent.names 0
+XkbEvent.compat 0
+XkbEvent.bell 0
+XkbEvent.message 0
+XkbEvent.accessx 0
+XkbEvent.device 0
+XkbEvent.core 0
+XkbEvent 96
+XPoint.x 0
+XPoint.y 2
+XPoint 4
+XSegment.x1 0
+XSegment.y1 2
+XSegment.x2 4
+XSegment.y2 6
+XSegment 8
+XIconSize.min_width 0
+XIconSize.min_height 4
+XIconSize.max_width 8
+XIconSize.max_height 12
+XIconSize.width_inc 16
+XIconSize.height_inc 20
+XIconSize 24
+XIMCallback.client_data 0
+XIMCallback.callback 4
+XIMCallback 8
+XConfigureEvent.type 0
+XConfigureEvent.serial 4
+XConfigureEvent.send_event 8
+XConfigureEvent.display 12
+XConfigureEvent.event 16
+XConfigureEvent.window 20
+XConfigureEvent.x 24
+XConfigureEvent.y 28
+XConfigureEvent.width 32
+XConfigureEvent.height 36
+XConfigureEvent.border_width 40
+XConfigureEvent.above 44
+XConfigureEvent.override_redirect 48
+XConfigureEvent 52
+XRectangle.x 0
+XRectangle.y 2
+XRectangle.width 4
+XRectangle.height 6
+XRectangle 8
+XkbNamesNotifyEvent.type 0
+XkbNamesNotifyEvent.serial 4
+XkbNamesNotifyEvent.send_event 8
+XkbNamesNotifyEvent.display 12
+XkbNamesNotifyEvent.time 16
+XkbNamesNotifyEvent.xkb_type 20
+XkbNamesNotifyEvent.device 24
+XkbNamesNotifyEvent.changed 28
+XkbNamesNotifyEvent.first_type 32
+XkbNamesNotifyEvent.num_types 36
+XkbNamesNotifyEvent.first_lvl 40
+XkbNamesNotifyEvent.num_lvls 44
+XkbNamesNotifyEvent.num_aliases 48
+XkbNamesNotifyEvent.num_radio_groups 52
+XkbNamesNotifyEvent.changed_vmods 56
+XkbNamesNotifyEvent.changed_groups 60
+XkbNamesNotifyEvent.changed_indicators 64
+XkbNamesNotifyEvent.first_key 68
+XkbNamesNotifyEvent.num_keys 72
+XkbNamesNotifyEvent 76
+XCreateWindowEvent.type 0
+XCreateWindowEvent.serial 4
+XCreateWindowEvent.send_event 8
+XCreateWindowEvent.display 12
+XCreateWindowEvent.parent 16
+XCreateWindowEvent.window 20
+XCreateWindowEvent.x 24
+XCreateWindowEvent.y 28
+XCreateWindowEvent.width 32
+XCreateWindowEvent.height 36
+XCreateWindowEvent.border_width 40
+XCreateWindowEvent.override_redirect 44
+XCreateWindowEvent 48
+XVisibilityEvent.type 0
+XVisibilityEvent.serial 4
+XVisibilityEvent.send_event 8
+XVisibilityEvent.display 12
+XVisibilityEvent.window 16
+XVisibilityEvent.state 20
+XVisibilityEvent 24
+XWMHints.flags 0
+XWMHints.initial_state 8
+XWMHints.icon_pixmap 12
+XWMHints.icon_window 16
+XWMHints.icon_x 20
+XWMHints.icon_y 24
+XWMHints.icon_mask 28
+XWMHints.input 4
+XWMHints.window_group 32
+XWMHints 36
+XCrossingEvent.type 0
+XCrossingEvent.serial 4
+XCrossingEvent.send_event 8
+XCrossingEvent.display 12
+XCrossingEvent.window 16
+XCrossingEvent.root 20
+XCrossingEvent.subwindow 24
+XCrossingEvent.time 28
+XCrossingEvent.x 32
+XCrossingEvent.y 36
+XCrossingEvent.x_root 40
+XCrossingEvent.y_root 44
+XCrossingEvent.mode 48
+XCrossingEvent.detail 52
+XCrossingEvent.same_screen 56
+XCrossingEvent.focus 60
+XCrossingEvent.state 64
+XCrossingEvent 68
+XSelectionRequestEvent.type 0
+XSelectionRequestEvent.serial 4
+XSelectionRequestEvent.send_event 8
+XSelectionRequestEvent.display 12
+XSelectionRequestEvent.owner 16
+XSelectionRequestEvent.requestor 20
+XSelectionRequestEvent.selection 24
+XSelectionRequestEvent.target 28
+XSelectionRequestEvent.property 32
+XSelectionRequestEvent.time 36
+XSelectionRequestEvent 40
+XNoExposeEvent.type 0
+XNoExposeEvent.serial 4
+XNoExposeEvent.send_event 8
+XNoExposeEvent.display 12
+XNoExposeEvent.drawable 16
+XNoExposeEvent.major_code 20
+XNoExposeEvent.minor_code 24
+XNoExposeEvent 28
+XHostAddress.family 0
+XHostAddress.length 4
+XHostAddress.address 8
+XHostAddress 12
+XColormapEvent.type 0
+XColormapEvent.serial 4
+XColormapEvent.send_event 8
+XColormapEvent.display 12
+XColormapEvent.window 16
+XColormapEvent.colormap 20
+XColormapEvent.new 24
+XColormapEvent.state 28
+XColormapEvent 32
+ColorEntry.r 0
+ColorEntry.g 1
+ColorEntry.b 2
+ColorEntry.flags 3
+ColorEntry 4
+XResizeRequestEvent.type 0
+XResizeRequestEvent.serial 4
+XResizeRequestEvent.send_event 8
+XResizeRequestEvent.display 12
+XResizeRequestEvent.window 16
+XResizeRequestEvent.width 20
+XResizeRequestEvent.height 24
+XResizeRequestEvent 28
+Depth.depth 0
+Depth.nvisuals 4
+Depth.visuals 8
+Depth 12
+XPropertyEvent.type 0
+XPropertyEvent.serial 4
+XPropertyEvent.send_event 8
+XPropertyEvent.display 12
+XPropertyEvent.window 16
+XPropertyEvent.atom 20
+XPropertyEvent.time 24
+XPropertyEvent.state 28
+XPropertyEvent 32
+XDestroyWindowEvent.type 0
+XDestroyWindowEvent.serial 4
+XDestroyWindowEvent.send_event 8
+XDestroyWindowEvent.display 12
+XDestroyWindowEvent.event 16
+XDestroyWindowEvent.window 20
+XDestroyWindowEvent 24
+XStandardColormap.colormap 0
+XStandardColormap.red_max 4
+XStandardColormap.red_mult 8
+XStandardColormap.green_max 12
+XStandardColormap.green_mult 16
+XStandardColormap.blue_max 20
+XStandardColormap.blue_mult 24
+XStandardColormap.base_pixel 28
+XStandardColormap.visualid 32
+XStandardColormap.killid 36
+XStandardColormap 40
+XComposeStatus.compose_ptr 0
+XComposeStatus.chars_matched 4
+XComposeStatus 8
+AwtGraphicsConfigData.awt_depth 0
+AwtGraphicsConfigData.awt_cmap 4
+AwtGraphicsConfigData.awt_visInfo 8
+AwtGraphicsConfigData.awt_num_colors 48
+AwtGraphicsConfigData.awtImage 52
+AwtGraphicsConfigData.AwtColorMatch 56
+AwtGraphicsConfigData.monoImage 60
+AwtGraphicsConfigData.monoPixmap 64
+AwtGraphicsConfigData.monoPixmapWidth 68
+AwtGraphicsConfigData.monoPixmapHeight 72
+AwtGraphicsConfigData.monoPixmapGC 76
+AwtGraphicsConfigData.pixelStride 80
+AwtGraphicsConfigData.color_data 84
+AwtGraphicsConfigData.glxInfo 88
+AwtGraphicsConfigData.isTranslucencySupported 92
+AwtGraphicsConfigData.renderPictFormat 96
+AwtGraphicsConfigData 128
+XColor.pixel 0
+XColor.red 4
+XColor.green 6
+XColor.blue 8
+XColor.flags 10
+XColor.pad 11
+XColor 12
+XTextProperty.value 0
+XTextProperty.encoding 4
+XTextProperty.format 8
+XTextProperty.nitems 12
+XTextProperty 16
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/classes/sun/awt/X11/generator/sizes.64 Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,1016 @@
+long 8
+int 4
+short 2
+ptr 8
+Bool 4
+Atom 8
+Window 8
+XExtData.number 0
+XExtData.next 8
+XExtData.free_private 16
+XExtData.private_data 24
+XExtData 32
+XIMStringConversionCallbackStruct.position 0
+XIMStringConversionCallbackStruct.direction 4
+XIMStringConversionCallbackStruct.operation 8
+XIMStringConversionCallbackStruct.factor 10
+XIMStringConversionCallbackStruct.text 16
+XIMStringConversionCallbackStruct 24
+XkbNewKeyboardNotifyEvent.type 0
+XkbNewKeyboardNotifyEvent.serial 8
+XkbNewKeyboardNotifyEvent.send_event 16
+XkbNewKeyboardNotifyEvent.display 24
+XkbNewKeyboardNotifyEvent.time 32
+XkbNewKeyboardNotifyEvent.xkb_type 40
+XkbNewKeyboardNotifyEvent.device 44
+XkbNewKeyboardNotifyEvent.old_device 48
+XkbNewKeyboardNotifyEvent.min_key_code 52
+XkbNewKeyboardNotifyEvent.max_key_code 56
+XkbNewKeyboardNotifyEvent.old_min_key_code 60
+XkbNewKeyboardNotifyEvent.old_max_key_code 64
+XkbNewKeyboardNotifyEvent.changed 68
+XkbNewKeyboardNotifyEvent.req_major 72
+XkbNewKeyboardNotifyEvent.req_minor 73
+XkbNewKeyboardNotifyEvent 80
+XTimeCoord.time 0
+XTimeCoord.x 8
+XTimeCoord.y 10
+XTimeCoord 16
+XkbCompatMapNotifyEvent.type 0
+XkbCompatMapNotifyEvent.serial 8
+XkbCompatMapNotifyEvent.send_event 16
+XkbCompatMapNotifyEvent.display 24
+XkbCompatMapNotifyEvent.time 32
+XkbCompatMapNotifyEvent.xkb_type 40
+XkbCompatMapNotifyEvent.device 44
+XkbCompatMapNotifyEvent.changed_groups 48
+XkbCompatMapNotifyEvent.first_si 52
+XkbCompatMapNotifyEvent.num_si 56
+XkbCompatMapNotifyEvent.num_total_si 60
+XkbCompatMapNotifyEvent 64
+XIMStatusDrawCallbackStruct.type 0
+XIMStatusDrawCallbackStruct.data 8
+XIMStatusDrawCallbackStruct 16
+XKeyboardControl.key_click_percent 0
+XKeyboardControl.bell_percent 4
+XKeyboardControl.bell_pitch 8
+XKeyboardControl.bell_duration 12
+XKeyboardControl.led 16
+XKeyboardControl.led_mode 20
+XKeyboardControl.key 24
+XKeyboardControl.auto_repeat_mode 28
+XKeyboardControl 32
+XSelectionClearEvent.type 0
+XSelectionClearEvent.serial 8
+XSelectionClearEvent.send_event 16
+XSelectionClearEvent.display 24
+XSelectionClearEvent.window 32
+XSelectionClearEvent.selection 40
+XSelectionClearEvent.time 48
+XSelectionClearEvent 56
+XWindowChanges.x 0
+XWindowChanges.y 4
+XWindowChanges.width 8
+XWindowChanges.height 12
+XWindowChanges.border_width 16
+XWindowChanges.sibling 24
+XWindowChanges.stack_mode 32
+XWindowChanges 40
+XIMPreeditCaretCallbackStruct.position 0
+XIMPreeditCaretCallbackStruct.direction 4
+XIMPreeditCaretCallbackStruct.style 8
+XIMPreeditCaretCallbackStruct 12
+XOMCharSetList.charset_count 0
+XOMCharSetList.charset_list 8
+XOMCharSetList 16
+XOMFontInfo.num_font 0
+XOMFontInfo.font_struct_list 8
+XOMFontInfo.font_name_list 16
+XOMFontInfo 24
+AwtScreenData.numConfigs 0
+AwtScreenData.root 8
+AwtScreenData.whitepixel 16
+AwtScreenData.blackpixel 24
+AwtScreenData.defaultConfig 32
+AwtScreenData.configs 40
+AwtScreenData 48
+XIMHotKeyTrigger.keysym 0
+XIMHotKeyTrigger.modifier 8
+XIMHotKeyTrigger.modifier_mask 12
+XIMHotKeyTrigger 16
+XCirculateEvent.type 0
+XCirculateEvent.serial 8
+XCirculateEvent.send_event 16
+XCirculateEvent.display 24
+XCirculateEvent.event 32
+XCirculateEvent.window 40
+XCirculateEvent.place 48
+XCirculateEvent 56
+Screen.ext_data 0
+Screen.display 8
+Screen.root 16
+Screen.width 24
+Screen.height 28
+Screen.mwidth 32
+Screen.mheight 36
+Screen.ndepths 40
+Screen.depths 48
+Screen.root_depth 56
+Screen.root_visual 64
+Screen.default_gc 72
+Screen.cmap 80
+Screen.white_pixel 88
+Screen.black_pixel 96
+Screen.max_maps 104
+Screen.min_maps 108
+Screen.backing_store 112
+Screen.save_unders 116
+Screen.root_input_mask 120
+Screen 128
+XMapRequestEvent.type 0
+XMapRequestEvent.serial 8
+XMapRequestEvent.send_event 16
+XMapRequestEvent.display 24
+XMapRequestEvent.parent 32
+XMapRequestEvent.window 40
+XMapRequestEvent 48
+XIMText.length 0
+XIMText.feedback 8
+XIMText.encoding_is_wchar 16
+XIMText.string 24
+XIMText 32
+XGraphicsExposeEvent.type 0
+XGraphicsExposeEvent.serial 8
+XGraphicsExposeEvent.send_event 16
+XGraphicsExposeEvent.display 24
+XGraphicsExposeEvent.drawable 32
+XGraphicsExposeEvent.x 40
+XGraphicsExposeEvent.y 44
+XGraphicsExposeEvent.width 48
+XGraphicsExposeEvent.height 52
+XGraphicsExposeEvent.count 56
+XGraphicsExposeEvent.major_code 60
+XGraphicsExposeEvent.minor_code 64
+XGraphicsExposeEvent 72
+XEvent.type 0
+XEvent.xany 0
+XEvent.xkey 0
+XEvent.xbutton 0
+XEvent.xmotion 0
+XEvent.xcrossing 0
+XEvent.xfocus 0
+XEvent.xexpose 0
+XEvent.xgraphicsexpose 0
+XEvent.xnoexpose 0
+XEvent.xvisibility 0
+XEvent.xcreatewindow 0
+XEvent.xdestroywindow 0
+XEvent.xunmap 0
+XEvent.xmap 0
+XEvent.xmaprequest 0
+XEvent.xreparent 0
+XEvent.xconfigure 0
+XEvent.xgravity 0
+XEvent.xresizerequest 0
+XEvent.xconfigurerequest 0
+XEvent.xcirculate 0
+XEvent.xcirculaterequest 0
+XEvent.xproperty 0
+XEvent.xselectionclear 0
+XEvent.xselectionrequest 0
+XEvent.xselection 0
+XEvent.xcolormap 0
+XEvent.xclient 0
+XEvent.xmapping 0
+XEvent.xerror 0
+XEvent.xkeymap 0
+XEvent.pad 0
+XEvent 192
+XRenderDirectFormat.red 0
+XRenderDirectFormat.redMask 2
+XRenderDirectFormat.green 4
+XRenderDirectFormat.greenMask 6
+XRenderDirectFormat.blue 8
+XRenderDirectFormat.blueMask 10
+XRenderDirectFormat.alpha 12
+XRenderDirectFormat.alphaMask 14
+XRenderDirectFormat 16
+ColorData.awt_Colors 0
+ColorData.awt_numICMcolors 8
+ColorData.awt_icmLUT 16
+ColorData.awt_icmLUT2Colors 24
+ColorData.img_grays 32
+ColorData.img_clr_tbl 40
+ColorData.img_oda_red 48
+ColorData.img_oda_green 56
+ColorData.img_oda_blue 64
+ColorData.pGrayInverseLutData 72
+ColorData.screendata 80
+ColorData 88
+XFontStruct.ext_data 0
+XFontStruct.fid 8
+XFontStruct.direction 16
+XFontStruct.min_char_or_byte2 20
+XFontStruct.max_char_or_byte2 24
+XFontStruct.min_byte1 28
+XFontStruct.max_byte1 32
+XFontStruct.all_chars_exist 36
+XFontStruct.n_properties 44
+XFontStruct.properties 48
+XFontStruct.min_bounds 56
+XFontStruct.max_bounds 68
+XFontStruct.per_char 80
+XFontStruct.ascent 88
+XFontStruct.descent 92
+XFontStruct 96
+XExtCodes.extension 0
+XExtCodes.major_opcode 4
+XExtCodes.first_event 8
+XExtCodes.first_error 12
+XExtCodes 16
+XFontSetExtents.max_ink_extent 0
+XFontSetExtents.max_logical_extent 8
+XFontSetExtents 16
+XSelectionEvent.type 0
+XSelectionEvent.serial 8
+XSelectionEvent.send_event 16
+XSelectionEvent.display 24
+XSelectionEvent.requestor 32
+XSelectionEvent.selection 40
+XSelectionEvent.target 48
+XSelectionEvent.property 56
+XSelectionEvent.time 64
+XSelectionEvent 72
+XArc.x 0
+XArc.y 2
+XArc.width 4
+XArc.height 6
+XArc.angle1 8
+XArc.angle2 10
+XArc 12
+XErrorEvent.type 0
+XErrorEvent.display 8
+XErrorEvent.resourceid 16
+XErrorEvent.serial 24
+XErrorEvent.error_code 32
+XErrorEvent.request_code 33
+XErrorEvent.minor_code 34
+XErrorEvent 40
+XConfigureRequestEvent.type 0
+XConfigureRequestEvent.serial 8
+XConfigureRequestEvent.send_event 16
+XConfigureRequestEvent.display 24
+XConfigureRequestEvent.parent 32
+XConfigureRequestEvent.window 40
+XConfigureRequestEvent.x 48
+XConfigureRequestEvent.y 52
+XConfigureRequestEvent.width 56
+XConfigureRequestEvent.height 60
+XConfigureRequestEvent.border_width 64
+XConfigureRequestEvent.above 72
+XConfigureRequestEvent.detail 80
+XConfigureRequestEvent.value_mask 88
+XConfigureRequestEvent 96
+ScreenFormat.ext_data 0
+ScreenFormat.depth 8
+ScreenFormat.bits_per_pixel 12
+ScreenFormat.scanline_pad 16
+ScreenFormat 24
+XButtonEvent.type 0
+XButtonEvent.serial 8
+XButtonEvent.send_event 16
+XButtonEvent.display 24
+XButtonEvent.window 32
+XButtonEvent.root 40
+XButtonEvent.subwindow 48
+XButtonEvent.time 56
+XButtonEvent.x 64
+XButtonEvent.y 68
+XButtonEvent.x_root 72
+XButtonEvent.y_root 76
+XButtonEvent.state 80
+XButtonEvent.button 84
+XButtonEvent.same_screen 88
+XButtonEvent 96
+XFontProp.name 0
+XFontProp.card32 8
+XFontProp 16
+XIMValuesList.count_values 0
+XIMValuesList.supported_values 8
+XIMValuesList 16
+XKeymapEvent.type 0
+XKeymapEvent.serial 8
+XKeymapEvent.send_event 16
+XKeymapEvent.display 24
+XKeymapEvent.window 32
+XKeymapEvent.key_vector 40
+XKeymapEvent 72
+XTextItem16.chars 0
+XTextItem16.nchars 8
+XTextItem16.delta 12
+XTextItem16.font 16
+XTextItem16 24
+XIMPreeditDrawCallbackStruct.caret 0
+XIMPreeditDrawCallbackStruct.chg_first 4
+XIMPreeditDrawCallbackStruct.chg_length 8
+XIMPreeditDrawCallbackStruct.text 16
+XIMPreeditDrawCallbackStruct 24
+XVisualInfo.visual 0
+XVisualInfo.visualid 8
+XVisualInfo.screen 16
+XVisualInfo.depth 20
+XVisualInfo.class 24
+XVisualInfo.red_mask 32
+XVisualInfo.green_mask 40
+XVisualInfo.blue_mask 48
+XVisualInfo.colormap_size 56
+XVisualInfo.bits_per_rgb 60
+XVisualInfo 64
+XkbControlsNotifyEvent.type 0
+XkbControlsNotifyEvent.serial 8
+XkbControlsNotifyEvent.send_event 16
+XkbControlsNotifyEvent.display 24
+XkbControlsNotifyEvent.time 32
+XkbControlsNotifyEvent.xkb_type 40
+XkbControlsNotifyEvent.device 44
+XkbControlsNotifyEvent.changed_ctrls 48
+XkbControlsNotifyEvent.enabled_ctrls 52
+XkbControlsNotifyEvent.enabled_ctrl_changes 56
+XkbControlsNotifyEvent.num_groups 60
+XkbControlsNotifyEvent.keycode 64
+XkbControlsNotifyEvent.event_type 65
+XkbControlsNotifyEvent.req_major 66
+XkbControlsNotifyEvent.req_minor 67
+XkbControlsNotifyEvent 72
+PropMwmHints.flags 0
+PropMwmHints.functions 8
+PropMwmHints.decorations 16
+PropMwmHints.inputMode 24
+PropMwmHints.status 32
+PropMwmHints 40
+XClientMessageEvent.type 0
+XClientMessageEvent.serial 8
+XClientMessageEvent.send_event 16
+XClientMessageEvent.display 24
+XClientMessageEvent.window 32
+XClientMessageEvent.message_type 40
+XClientMessageEvent.format 48
+XClientMessageEvent.data 56
+XClientMessageEvent 96
+XAnyEvent.type 0
+XAnyEvent.serial 8
+XAnyEvent.send_event 16
+XAnyEvent.display 24
+XAnyEvent.window 32
+XAnyEvent 40
+XkbIndicatorNotifyEvent.type 0
+XkbIndicatorNotifyEvent.serial 8
+XkbIndicatorNotifyEvent.send_event 16
+XkbIndicatorNotifyEvent.display 24
+XkbIndicatorNotifyEvent.time 32
+XkbIndicatorNotifyEvent.xkb_type 40
+XkbIndicatorNotifyEvent.device 44
+XkbIndicatorNotifyEvent.changed 48
+XkbIndicatorNotifyEvent.state 52
+XkbIndicatorNotifyEvent 56
+XIMPreeditStateNotifyCallbackStruct.state 0
+XIMPreeditStateNotifyCallbackStruct 8
+XkbAnyEvent.type 0
+XkbAnyEvent.serial 8
+XkbAnyEvent.send_event 16
+XkbAnyEvent.display 24
+XkbAnyEvent.time 32
+XkbAnyEvent.xkb_type 40
+XkbAnyEvent.device 44
+XkbAnyEvent 48
+XMotionEvent.type 0
+XMotionEvent.serial 8
+XMotionEvent.send_event 16
+XMotionEvent.display 24
+XMotionEvent.window 32
+XMotionEvent.root 40
+XMotionEvent.subwindow 48
+XMotionEvent.time 56
+XMotionEvent.x 64
+XMotionEvent.y 68
+XMotionEvent.x_root 72
+XMotionEvent.y_root 76
+XMotionEvent.state 80
+XMotionEvent.is_hint 84
+XMotionEvent.same_screen 88
+XMotionEvent 96
+XIMHotKeyTriggers.num_hot_key 0
+XIMHotKeyTriggers.key 8
+XIMHotKeyTriggers 16
+XIMStyles.count_styles 0
+XIMStyles.supported_styles 8
+XIMStyles 16
+XkbExtensionDeviceNotifyEvent.type 0
+XkbExtensionDeviceNotifyEvent.serial 8
+XkbExtensionDeviceNotifyEvent.send_event 16
+XkbExtensionDeviceNotifyEvent.display 24
+XkbExtensionDeviceNotifyEvent.time 32
+XkbExtensionDeviceNotifyEvent.xkb_type 40
+XkbExtensionDeviceNotifyEvent.device 44
+XkbExtensionDeviceNotifyEvent.reason 48
+XkbExtensionDeviceNotifyEvent.supported 52
+XkbExtensionDeviceNotifyEvent.unsupported 56
+XkbExtensionDeviceNotifyEvent.first_btn 60
+XkbExtensionDeviceNotifyEvent.num_btns 64
+XkbExtensionDeviceNotifyEvent.leds_defined 68
+XkbExtensionDeviceNotifyEvent.led_state 72
+XkbExtensionDeviceNotifyEvent.led_class 76
+XkbExtensionDeviceNotifyEvent.led_id 80
+XkbExtensionDeviceNotifyEvent 88
+XwcTextItem.chars 0
+XwcTextItem.nchars 8
+XwcTextItem.delta 12
+XwcTextItem.font_set 16
+XwcTextItem 24
+XClassHint.res_name 0
+XClassHint.res_class 8
+XClassHint 16
+XChar2b.byte1 0
+XChar2b.byte2 1
+XChar2b 2
+XSetWindowAttributes.background_pixmap 0
+XSetWindowAttributes.background_pixel 8
+XSetWindowAttributes.border_pixmap 16
+XSetWindowAttributes.border_pixel 24
+XSetWindowAttributes.bit_gravity 32
+XSetWindowAttributes.win_gravity 36
+XSetWindowAttributes.backing_store 40
+XSetWindowAttributes.backing_planes 48
+XSetWindowAttributes.backing_pixel 56
+XSetWindowAttributes.save_under 64
+XSetWindowAttributes.event_mask 72
+XSetWindowAttributes.do_not_propagate_mask 80
+XSetWindowAttributes.override_redirect 88
+XSetWindowAttributes.colormap 96
+XSetWindowAttributes.cursor 104
+XSetWindowAttributes 112
+XRenderPictFormat.id 0
+XRenderPictFormat.type 8
+XRenderPictFormat.depth 12
+XRenderPictFormat.direct 16
+XRenderPictFormat.colormap 32
+XRenderPictFormat 40
+XReparentEvent.type 0
+XReparentEvent.serial 8
+XReparentEvent.send_event 16
+XReparentEvent.display 24
+XReparentEvent.event 32
+XReparentEvent.window 40
+XReparentEvent.parent 48
+XReparentEvent.x 56
+XReparentEvent.y 60
+XReparentEvent.override_redirect 64
+XReparentEvent 72
+XCirculateRequestEvent.type 0
+XCirculateRequestEvent.serial 8
+XCirculateRequestEvent.send_event 16
+XCirculateRequestEvent.display 24
+XCirculateRequestEvent.parent 32
+XCirculateRequestEvent.window 40
+XCirculateRequestEvent.place 48
+XCirculateRequestEvent 56
+XImage.width 0
+XImage.height 4
+XImage.xoffset 8
+XImage.format 12
+XImage.data 16
+XImage.byte_order 24
+XImage.bitmap_unit 28
+XImage.bitmap_bit_order 32
+XImage.bitmap_pad 36
+XImage.depth 40
+XImage.bytes_per_line 44
+XImage.bits_per_pixel 48
+XImage.red_mask 56
+XImage.green_mask 64
+XImage.blue_mask 72
+XImage.obdata 80
+XImage.f.create_image 88
+XImage.f.destroy_image 96
+XImage.f.get_pixel 104
+XImage.f.put_pixel 112
+XImage.f.sub_image 120
+XImage.f.add_pixel 128
+XImage 136
+XKeyEvent.type 0
+XKeyEvent.serial 8
+XKeyEvent.send_event 16
+XKeyEvent.display 24
+XKeyEvent.window 32
+XKeyEvent.root 40
+XKeyEvent.subwindow 48
+XKeyEvent.time 56
+XKeyEvent.x 64
+XKeyEvent.y 68
+XKeyEvent.x_root 72
+XKeyEvent.y_root 76
+XKeyEvent.state 80
+XKeyEvent.keycode 84
+XKeyEvent.same_screen 88
+XKeyEvent 96
+XkbActionMessageEvent.type 0
+XkbActionMessageEvent.serial 8
+XkbActionMessageEvent.send_event 16
+XkbActionMessageEvent.display 24
+XkbActionMessageEvent.time 32
+XkbActionMessageEvent.xkb_type 40
+XkbActionMessageEvent.device 44
+XkbActionMessageEvent.keycode 48
+XkbActionMessageEvent.press 52
+XkbActionMessageEvent.key_event_follows 56
+XkbActionMessageEvent.group 60
+XkbActionMessageEvent.mods 64
+XkbActionMessageEvent.message 68
+XkbActionMessageEvent 80
+XdbeSwapInfo.swap_window 0
+XdbeSwapInfo.swap_action 8
+XdbeSwapInfo 16
+XTextItem.chars 0
+XTextItem.nchars 8
+XTextItem.delta 12
+XTextItem.font 16
+XTextItem 24
+XModifierKeymap.max_keypermod 0
+XModifierKeymap.modifiermap 8
+XModifierKeymap 16
+XCharStruct.lbearing 0
+XCharStruct.rbearing 2
+XCharStruct.width 4
+XCharStruct.ascent 6
+XCharStruct.descent 8
+XCharStruct.attributes 10
+XCharStruct 12
+XGravityEvent.type 0
+XGravityEvent.serial 8
+XGravityEvent.send_event 16
+XGravityEvent.display 24
+XGravityEvent.event 32
+XGravityEvent.window 40
+XGravityEvent.x 48
+XGravityEvent.y 52
+XGravityEvent 56
+Visual.ext_data 0
+Visual.visualid 8
+Visual.class 16
+Visual.red_mask 24
+Visual.green_mask 32
+Visual.blue_mask 40
+Visual.bits_per_rgb 48
+Visual.map_entries 52
+Visual 56
+XOMOrientation.num_orientation 0
+XOMOrientation.orientation 8
+XOMOrientation 16
+XkbAccessXNotifyEvent.type 0
+XkbAccessXNotifyEvent.serial 8
+XkbAccessXNotifyEvent.send_event 16
+XkbAccessXNotifyEvent.display 24
+XkbAccessXNotifyEvent.time 32
+XkbAccessXNotifyEvent.xkb_type 40
+XkbAccessXNotifyEvent.device 44
+XkbAccessXNotifyEvent.detail 48
+XkbAccessXNotifyEvent.keycode 52
+XkbAccessXNotifyEvent.sk_delay 56
+XkbAccessXNotifyEvent.debounce_delay 60
+XkbAccessXNotifyEvent 64
+XWindowAttributes.x 0
+XWindowAttributes.y 4
+XWindowAttributes.width 8
+XWindowAttributes.height 12
+XWindowAttributes.border_width 16
+XWindowAttributes.depth 20
+XWindowAttributes.visual 24
+XWindowAttributes.root 32
+XWindowAttributes.class 40
+XWindowAttributes.bit_gravity 44
+XWindowAttributes.win_gravity 48
+XWindowAttributes.backing_store 52
+XWindowAttributes.backing_planes 56
+XWindowAttributes.backing_pixel 64
+XWindowAttributes.save_under 72
+XWindowAttributes.colormap 80
+XWindowAttributes.map_installed 88
+XWindowAttributes.map_state 92
+XWindowAttributes.all_event_masks 96
+XWindowAttributes.your_event_mask 104
+XWindowAttributes.do_not_propagate_mask 112
+XWindowAttributes.override_redirect 120
+XWindowAttributes.screen 128
+XWindowAttributes 136
+XmbTextItem.chars 0
+XmbTextItem.nchars 8
+XmbTextItem.delta 12
+XmbTextItem.font_set 16
+XmbTextItem 24
+XMappingEvent.type 0
+XMappingEvent.serial 8
+XMappingEvent.send_event 16
+XMappingEvent.display 24
+XMappingEvent.window 32
+XMappingEvent.request 40
+XMappingEvent.first_keycode 44
+XMappingEvent.count 48
+XMappingEvent 56
+XSizeHints.flags 0
+XSizeHints.x 8
+XSizeHints.y 12
+XSizeHints.width 16
+XSizeHints.height 20
+XSizeHints.min_width 24
+XSizeHints.min_height 28
+XSizeHints.max_width 32
+XSizeHints.max_height 36
+XSizeHints.width_inc 40
+XSizeHints.height_inc 44
+XSizeHints.min_aspect.x 48
+XSizeHints.min_aspect.y 52
+XSizeHints.max_aspect.x 56
+XSizeHints.max_aspect.y 60
+XSizeHints.base_width 64
+XSizeHints.base_height 68
+XSizeHints.win_gravity 72
+XSizeHints 80
+XUnmapEvent.type 0
+XUnmapEvent.serial 8
+XUnmapEvent.send_event 16
+XUnmapEvent.display 24
+XUnmapEvent.event 32
+XUnmapEvent.window 40
+XUnmapEvent.from_configure 48
+XUnmapEvent 56
+awtImageData.Depth 0
+awtImageData.wsImageFormat 4
+awtImageData.clrdata 16
+awtImageData.convert 48
+awtImageData 560
+XkbStateNotifyEvent.type 0
+XkbStateNotifyEvent.serial 8
+XkbStateNotifyEvent.send_event 16
+XkbStateNotifyEvent.display 24
+XkbStateNotifyEvent.time 32
+XkbStateNotifyEvent.xkb_type 40
+XkbStateNotifyEvent.device 44
+XkbStateNotifyEvent.changed 48
+XkbStateNotifyEvent.group 52
+XkbStateNotifyEvent.base_group 56
+XkbStateNotifyEvent.latched_group 60
+XkbStateNotifyEvent.locked_group 64
+XkbStateNotifyEvent.mods 68
+XkbStateNotifyEvent.base_mods 72
+XkbStateNotifyEvent.latched_mods 76
+XkbStateNotifyEvent.locked_mods 80
+XkbStateNotifyEvent.compat_state 84
+XkbStateNotifyEvent.grab_mods 88
+XkbStateNotifyEvent.compat_grab_mods 89
+XkbStateNotifyEvent.lookup_mods 90
+XkbStateNotifyEvent.compat_lookup_mods 91
+XkbStateNotifyEvent.ptr_buttons 92
+XkbStateNotifyEvent.keycode 96
+XkbStateNotifyEvent.event_type 97
+XkbStateNotifyEvent.req_major 98
+XkbStateNotifyEvent.req_minor 99
+XkbStateNotifyEvent 104
+XExposeEvent.type 0
+XExposeEvent.serial 8
+XExposeEvent.send_event 16
+XExposeEvent.display 24
+XExposeEvent.window 32
+XExposeEvent.x 40
+XExposeEvent.y 44
+XExposeEvent.width 48
+XExposeEvent.height 52
+XExposeEvent.count 56
+XExposeEvent 64
+XkbMapNotifyEvent.type 0
+XkbMapNotifyEvent.serial 8
+XkbMapNotifyEvent.send_event 16
+XkbMapNotifyEvent.display 24
+XkbMapNotifyEvent.time 32
+XkbMapNotifyEvent.xkb_type 40
+XkbMapNotifyEvent.device 44
+XkbMapNotifyEvent.changed 48
+XkbMapNotifyEvent.flags 52
+XkbMapNotifyEvent.first_type 56
+XkbMapNotifyEvent.num_types 60
+XkbMapNotifyEvent.min_key_code 64
+XkbMapNotifyEvent.max_key_code 65
+XkbMapNotifyEvent.first_key_sym 66
+XkbMapNotifyEvent.first_key_act 67
+XkbMapNotifyEvent.first_key_behavior 68
+XkbMapNotifyEvent.first_key_explicit 69
+XkbMapNotifyEvent.first_modmap_key 70
+XkbMapNotifyEvent.first_vmodmap_key 71
+XkbMapNotifyEvent.num_key_syms 72
+XkbMapNotifyEvent.num_key_acts 76
+XkbMapNotifyEvent.num_key_behaviors 80
+XkbMapNotifyEvent.num_key_explicit 84
+XkbMapNotifyEvent.num_modmap_keys 88
+XkbMapNotifyEvent.num_vmodmap_keys 92
+XkbMapNotifyEvent.vmods 96
+XkbMapNotifyEvent 104
+XGCValues.function 0
+XGCValues.plane_mask 8
+XGCValues.foreground 16
+XGCValues.background 24
+XGCValues.line_width 32
+XGCValues.line_style 36
+XGCValues.cap_style 40
+XGCValues.join_style 44
+XGCValues.fill_style 48
+XGCValues.fill_rule 52
+XGCValues.arc_mode 56
+XGCValues.tile 64
+XGCValues.stipple 72
+XGCValues.ts_x_origin 80
+XGCValues.ts_y_origin 84
+XGCValues.font 88
+XGCValues.subwindow_mode 96
+XGCValues.graphics_exposures 100
+XGCValues.clip_x_origin 104
+XGCValues.clip_y_origin 108
+XGCValues.clip_mask 112
+XGCValues.dash_offset 120
+XGCValues.dashes 124
+XGCValues 128
+XFocusChangeEvent.type 0
+XFocusChangeEvent.serial 8
+XFocusChangeEvent.send_event 16
+XFocusChangeEvent.display 24
+XFocusChangeEvent.window 32
+XFocusChangeEvent.mode 40
+XFocusChangeEvent.detail 44
+XFocusChangeEvent 48
+XPixmapFormatValues.depth 0
+XPixmapFormatValues.bits_per_pixel 4
+XPixmapFormatValues.scanline_pad 8
+XPixmapFormatValues 12
+XMapEvent.type 0
+XMapEvent.serial 8
+XMapEvent.send_event 16
+XMapEvent.display 24
+XMapEvent.event 32
+XMapEvent.window 40
+XMapEvent.override_redirect 48
+XMapEvent 56
+XkbBellNotifyEvent.type 0
+XkbBellNotifyEvent.serial 8
+XkbBellNotifyEvent.send_event 16
+XkbBellNotifyEvent.display 24
+XkbBellNotifyEvent.time 32
+XkbBellNotifyEvent.xkb_type 40
+XkbBellNotifyEvent.device 44
+XkbBellNotifyEvent.percent 48
+XkbBellNotifyEvent.pitch 52
+XkbBellNotifyEvent.duration 56
+XkbBellNotifyEvent.bell_class 60
+XkbBellNotifyEvent.bell_id 64
+XkbBellNotifyEvent.name 72
+XkbBellNotifyEvent.window 80
+XkbBellNotifyEvent.event_only 88
+XkbBellNotifyEvent 96
+XIMStringConversionText.length 0
+XIMStringConversionText.feedback 8
+XIMStringConversionText.encoding_is_wchar 16
+XIMStringConversionText.string 24
+XIMStringConversionText 32
+XKeyboardState.key_click_percent 0
+XKeyboardState.bell_percent 4
+XKeyboardState.bell_pitch 8
+XKeyboardState.bell_duration 12
+XKeyboardState.led_mask 16
+XKeyboardState.global_auto_repeat 24
+XKeyboardState.auto_repeats 28
+XKeyboardState 64
+XkbEvent.type 0
+XkbEvent.any 0
+XkbEvent.new_kbd 0
+XkbEvent.map 0
+XkbEvent.state 0
+XkbEvent.ctrls 0
+XkbEvent.indicators 0
+XkbEvent.names 0
+XkbEvent.compat 0
+XkbEvent.bell 0
+XkbEvent.message 0
+XkbEvent.accessx 0
+XkbEvent.device 0
+XkbEvent.core 0
+XkbEvent 192
+XPoint.x 0
+XPoint.y 2
+XPoint 4
+XSegment.x1 0
+XSegment.y1 2
+XSegment.x2 4
+XSegment.y2 6
+XSegment 8
+XIconSize.min_width 0
+XIconSize.min_height 4
+XIconSize.max_width 8
+XIconSize.max_height 12
+XIconSize.width_inc 16
+XIconSize.height_inc 20
+XIconSize 24
+XIMCallback.client_data 0
+XIMCallback.callback 8
+XIMCallback 16
+XConfigureEvent.type 0
+XConfigureEvent.serial 8
+XConfigureEvent.send_event 16
+XConfigureEvent.display 24
+XConfigureEvent.event 32
+XConfigureEvent.window 40
+XConfigureEvent.x 48
+XConfigureEvent.y 52
+XConfigureEvent.width 56
+XConfigureEvent.height 60
+XConfigureEvent.border_width 64
+XConfigureEvent.above 72
+XConfigureEvent.override_redirect 80
+XConfigureEvent 88
+XRectangle.x 0
+XRectangle.y 2
+XRectangle.width 4
+XRectangle.height 6
+XRectangle 8
+XkbNamesNotifyEvent.type 0
+XkbNamesNotifyEvent.serial 8
+XkbNamesNotifyEvent.send_event 16
+XkbNamesNotifyEvent.display 24
+XkbNamesNotifyEvent.time 32
+XkbNamesNotifyEvent.xkb_type 40
+XkbNamesNotifyEvent.device 44
+XkbNamesNotifyEvent.changed 48
+XkbNamesNotifyEvent.first_type 52
+XkbNamesNotifyEvent.num_types 56
+XkbNamesNotifyEvent.first_lvl 60
+XkbNamesNotifyEvent.num_lvls 64
+XkbNamesNotifyEvent.num_aliases 68
+XkbNamesNotifyEvent.num_radio_groups 72
+XkbNamesNotifyEvent.changed_vmods 76
+XkbNamesNotifyEvent.changed_groups 80
+XkbNamesNotifyEvent.changed_indicators 84
+XkbNamesNotifyEvent.first_key 88
+XkbNamesNotifyEvent.num_keys 92
+XkbNamesNotifyEvent 96
+XCreateWindowEvent.type 0
+XCreateWindowEvent.serial 8
+XCreateWindowEvent.send_event 16
+XCreateWindowEvent.display 24
+XCreateWindowEvent.parent 32
+XCreateWindowEvent.window 40
+XCreateWindowEvent.x 48
+XCreateWindowEvent.y 52
+XCreateWindowEvent.width 56
+XCreateWindowEvent.height 60
+XCreateWindowEvent.border_width 64
+XCreateWindowEvent.override_redirect 68
+XCreateWindowEvent 72
+XVisibilityEvent.type 0
+XVisibilityEvent.serial 8
+XVisibilityEvent.send_event 16
+XVisibilityEvent.display 24
+XVisibilityEvent.window 32
+XVisibilityEvent.state 40
+XVisibilityEvent 48
+XWMHints.flags 0
+XWMHints.initial_state 12
+XWMHints.icon_pixmap 16
+XWMHints.icon_window 24
+XWMHints.icon_x 32
+XWMHints.icon_y 36
+XWMHints.icon_mask 40
+XWMHints.input 8
+XWMHints.window_group 48
+XWMHints 56
+XCrossingEvent.type 0
+XCrossingEvent.serial 8
+XCrossingEvent.send_event 16
+XCrossingEvent.display 24
+XCrossingEvent.window 32
+XCrossingEvent.root 40
+XCrossingEvent.subwindow 48
+XCrossingEvent.time 56
+XCrossingEvent.x 64
+XCrossingEvent.y 68
+XCrossingEvent.x_root 72
+XCrossingEvent.y_root 76
+XCrossingEvent.mode 80
+XCrossingEvent.detail 84
+XCrossingEvent.same_screen 88
+XCrossingEvent.focus 92
+XCrossingEvent.state 96
+XCrossingEvent 104
+XSelectionRequestEvent.type 0
+XSelectionRequestEvent.serial 8
+XSelectionRequestEvent.send_event 16
+XSelectionRequestEvent.display 24
+XSelectionRequestEvent.owner 32
+XSelectionRequestEvent.requestor 40
+XSelectionRequestEvent.selection 48
+XSelectionRequestEvent.target 56
+XSelectionRequestEvent.property 64
+XSelectionRequestEvent.time 72
+XSelectionRequestEvent 80
+XNoExposeEvent.type 0
+XNoExposeEvent.serial 8
+XNoExposeEvent.send_event 16
+XNoExposeEvent.display 24
+XNoExposeEvent.drawable 32
+XNoExposeEvent.major_code 40
+XNoExposeEvent.minor_code 44
+XNoExposeEvent 48
+XHostAddress.family 0
+XHostAddress.length 4
+XHostAddress.address 8
+XHostAddress 16
+XColormapEvent.type 0
+XColormapEvent.serial 8
+XColormapEvent.send_event 16
+XColormapEvent.display 24
+XColormapEvent.window 32
+XColormapEvent.colormap 40
+XColormapEvent.new 48
+XColormapEvent.state 52
+XColormapEvent 56
+ColorEntry.r 0
+ColorEntry.g 1
+ColorEntry.b 2
+ColorEntry.flags 3
+ColorEntry 4
+XResizeRequestEvent.type 0
+XResizeRequestEvent.serial 8
+XResizeRequestEvent.send_event 16
+XResizeRequestEvent.display 24
+XResizeRequestEvent.window 32
+XResizeRequestEvent.width 40
+XResizeRequestEvent.height 44
+XResizeRequestEvent 48
+Depth.depth 0
+Depth.nvisuals 4
+Depth.visuals 8
+Depth 16
+XPropertyEvent.type 0
+XPropertyEvent.serial 8
+XPropertyEvent.send_event 16
+XPropertyEvent.display 24
+XPropertyEvent.window 32
+XPropertyEvent.atom 40
+XPropertyEvent.time 48
+XPropertyEvent.state 56
+XPropertyEvent 64
+XDestroyWindowEvent.type 0
+XDestroyWindowEvent.serial 8
+XDestroyWindowEvent.send_event 16
+XDestroyWindowEvent.display 24
+XDestroyWindowEvent.event 32
+XDestroyWindowEvent.window 40
+XDestroyWindowEvent 48
+XStandardColormap.colormap 0
+XStandardColormap.red_max 8
+XStandardColormap.red_mult 16
+XStandardColormap.green_max 24
+XStandardColormap.green_mult 32
+XStandardColormap.blue_max 40
+XStandardColormap.blue_mult 48
+XStandardColormap.base_pixel 56
+XStandardColormap.visualid 64
+XStandardColormap.killid 72
+XStandardColormap 80
+XComposeStatus.compose_ptr 0
+XComposeStatus.chars_matched 8
+XComposeStatus 16
+AwtGraphicsConfigData.awt_depth 0
+AwtGraphicsConfigData.awt_cmap 8
+AwtGraphicsConfigData.awt_visInfo 16
+AwtGraphicsConfigData.awt_num_colors 80
+AwtGraphicsConfigData.awtImage 88
+AwtGraphicsConfigData.AwtColorMatch 96
+AwtGraphicsConfigData.monoImage 104
+AwtGraphicsConfigData.monoPixmap 112
+AwtGraphicsConfigData.monoPixmapWidth 120
+AwtGraphicsConfigData.monoPixmapHeight 124
+AwtGraphicsConfigData.monoPixmapGC 128
+AwtGraphicsConfigData.pixelStride 136
+AwtGraphicsConfigData.color_data 144
+AwtGraphicsConfigData.glxInfo 152
+AwtGraphicsConfigData.isTranslucencySupported 160
+AwtGraphicsConfigData.renderPictFormat 168
+AwtGraphicsConfigData 208
+XColor.pixel 0
+XColor.red 8
+XColor.green 10
+XColor.blue 12
+XColor.flags 14
+XColor.pad 15
+XColor 16
+XTextProperty.value 0
+XTextProperty.encoding 8
+XTextProperty.format 16
+XTextProperty.nitems 24
+XTextProperty 32
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.AWTException;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.DisplayMode;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Insets;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.image.BufferedImage;
+
+import sun.awt.SunToolkit;
+
+/**
+ * @test
+ * @bug 8003173 7019055
+ * @summary Full-screen windows should have the proper insets.
+ * @author Sergey Bylokhov
+ */
+public final class FullScreenInsets {
+
+ private static boolean passed = true;
+
+ public static void main(final String[] args) {
+ final GraphicsEnvironment ge = GraphicsEnvironment
+ .getLocalGraphicsEnvironment();
+ final GraphicsDevice[] devices = ge.getScreenDevices();
+
+ final Window wGreen = new Frame();
+ wGreen.setBackground(Color.GREEN);
+ wGreen.setSize(300, 300);
+ wGreen.setVisible(true);
+ sleep();
+ final Insets iGreen = wGreen.getInsets();
+ final Dimension sGreen = wGreen.getSize();
+
+ final Window wRed = new Frame();
+ wRed.setBackground(Color.RED);
+ wRed.setSize(300, 300);
+ wRed.setVisible(true);
+ sleep();
+ final Insets iRed = wGreen.getInsets();
+ final Dimension sRed = wGreen.getSize();
+
+ for (final GraphicsDevice device : devices) {
+ if (!device.isFullScreenSupported()) {
+ continue;
+ }
+ device.setFullScreenWindow(wGreen);
+ sleep();
+ testWindowBounds(device.getDisplayMode(), wGreen);
+ testColor(wGreen, Color.GREEN);
+
+ device.setFullScreenWindow(wRed);
+ sleep();
+ testWindowBounds(device.getDisplayMode(), wRed);
+ testColor(wRed, Color.RED);
+
+ device.setFullScreenWindow(null);
+ sleep();
+ testInsets(wGreen.getInsets(), iGreen);
+ testInsets(wRed.getInsets(), iRed);
+ testSize(wGreen.getSize(), sGreen);
+ testSize(wRed.getSize(), sRed);
+ }
+ wGreen.dispose();
+ wRed.dispose();
+ if (!passed) {
+ throw new RuntimeException("Test failed");
+ }
+ }
+
+ private static void testSize(final Dimension actual, final Dimension exp) {
+ if (!exp.equals(actual)) {
+ System.err.println(" Wrong window size:" +
+ " Expected: " + exp + " Actual: " + actual);
+ passed = false;
+ }
+ }
+
+ private static void testInsets(final Insets actual, final Insets exp) {
+ if (!actual.equals(exp)) {
+ System.err.println(" Wrong window insets:" +
+ " Expected: " + exp + " Actual: " + actual);
+ passed = false;
+ }
+ }
+
+ private static void testWindowBounds(final DisplayMode dm, final Window w) {
+ if (w.getWidth() != dm.getWidth() || w.getHeight() != dm.getHeight()) {
+ System.err.println(" Wrong window bounds:" +
+ " Expected: width = " + dm.getWidth()
+ + ", height = " + dm.getHeight() + " Actual: "
+ + w.getSize());
+ passed = false;
+ }
+ }
+
+ private static void testColor(final Window w, final Color color) {
+ final Robot r;
+ try {
+ r = new Robot(w.getGraphicsConfiguration().getDevice());
+ } catch (AWTException e) {
+ e.printStackTrace();
+ passed = false;
+ return;
+ }
+ final BufferedImage bi = r.createScreenCapture(w.getBounds());
+ for (int y = 0; y < bi.getHeight(); y++) {
+ for (int x = 0; x < bi.getWidth(); x++) {
+ if (bi.getRGB(x, y) != color.getRGB()) {
+ System.err.println(
+ "Incorrect pixel at " + x + "x" + y + " : " +
+ Integer.toHexString(bi.getRGB(x, y)) +
+ " ,expected : " + Integer.toHexString(
+ color.getRGB()));
+ passed = false;
+ return;
+ }
+ }
+ }
+ }
+
+ private static void sleep() {
+ ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException ignored) {
+ }
+ }
+}
--- a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -36,6 +36,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.lang.reflect.InvocationTargetException;
import test.java.awt.regtesthelpers.Util;
+import sun.awt.OSInfo;
public class SubMenuShowTest extends Applet {
Robot robot;
@@ -86,6 +87,11 @@
frame.setVisible(true);
Util.waitForIdle(robot);
+ boolean isMacOSX = (OSInfo.getOSType() == OSInfo.OSType.MACOSX);
+ if (isMacOSX) {
+ robot.keyPress(KeyEvent.VK_CONTROL);
+ robot.delay(20);
+ }
robot.keyPress(KeyEvent.VK_ALT);
robot.delay(20);
robot.keyPress(KeyEvent.VK_F);
@@ -93,6 +99,10 @@
robot.keyRelease(KeyEvent.VK_F);
robot.delay(20);
robot.keyRelease(KeyEvent.VK_ALT);
+ if (isMacOSX) {
+ robot.keyRelease(KeyEvent.VK_CONTROL);
+ robot.delay(20);
+ }
Util.waitForIdle(robot);
robot.keyPress(KeyEvent.VK_M);
--- a/jdk/test/java/beans/Introspector/TestTypeResolver.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/test/java/beans/Introspector/TestTypeResolver.java Thu Jan 31 10:22:25 2013 -0800
@@ -180,10 +180,22 @@
return null; // not used
}
+ public <T extends Annotation> T[] getAnnotations(Class<T> annotationClass) {
+ return null; // not used
+ }
+
public Annotation[] getAnnotations() {
return null; // not used
}
+ public <T extends Annotation> T getDeclaredAnnotation(Class<T> annotationClass) {
+ return null; // not used
+ }
+
+ public <T extends Annotation> T[] getDeclaredAnnotations(Class<T> annotationClass) {
+ return null; // not used
+ }
+
public Annotation[] getDeclaredAnnotations() {
return null; // not used
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ @bug 8006417
+ @summary JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
+ @author Anton Litvinov
+*/
+
+import java.awt.*;
+
+import javax.swing.*;
+import javax.swing.plaf.metal.*;
+
+import sun.awt.SunToolkit;
+
+public class ShowPopupAfterHidePopupTest {
+ private static JFrame frame = null;
+ private static JComboBox comboBox = null;
+ private static boolean popupIsVisible = false;
+
+ public static void main(String[] args) throws Exception {
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ frame = new JFrame("Popup Menu of JComboBox");
+ comboBox = new JComboBox(new String[]{"Item1", "Item2", "Item3"});
+ frame.getContentPane().add(comboBox);
+ frame.pack();
+ frame.setVisible(true);
+ }
+ });
+ final SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
+ toolkit.realSync();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ comboBox.showPopup();
+ comboBox.hidePopup();
+ comboBox.showPopup();
+ }
+ });
+ toolkit.realSync();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ popupIsVisible = comboBox.isPopupVisible();
+ frame.dispose();
+ }
+ });
+ if (!popupIsVisible) {
+ throw new RuntimeException("Calling hidePopup() affected the next call to showPopup().");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6817933
+ * @summary Tests that HTMLEditorKit does not affect JFileChooser
+ * @author Sergey Malenkov
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JToggleButton;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.StyleSheet;
+
+import sun.awt.SunToolkit;
+import sun.swing.WindowsPlacesBar;
+
+public class Test6817933 {
+
+ private static final String STYLE = "BODY {background:red}";
+ private static final Color COLOR = Color.RED;
+ private static JFileChooser chooser;
+
+ public static void main(String[] args) throws Exception {
+ try {
+ UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+ }
+ catch (Exception exception) {
+ exception.printStackTrace();
+ return; // ignore test on non-Windows machines
+ }
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ StyleSheet css = new StyleSheet();
+ css.addRule(STYLE);
+
+ HTMLEditorKit kit = new HTMLEditorKit();
+ kit.setStyleSheet(css);
+
+ JFrame frame = new JFrame(STYLE);
+ frame.add(chooser = new JFileChooser());
+ frame.setSize(640, 480);
+ frame.setVisible(true);
+ }
+ });
+
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ toolkit.realSync(500);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ try {
+ JToggleButton button = get(JToggleButton.class,
+ get(WindowsPlacesBar.class, chooser));
+
+ int width = button.getWidth();
+ int height = button.getHeight() / 3;
+ Point point = new Point(0, height * 2);
+ SwingUtilities.convertPointToScreen(point, button);
+ width += point.x;
+ height += point.y;
+
+ int count = 0;
+ Robot robot = new Robot();
+ for (int x = point.x; x < width; x++) {
+ for (int y = point.y; y < height; y++) {
+ count += COLOR.equals(robot.getPixelColor(x, y)) ? -2 : 1;
+ }
+ }
+ if (count < 0) {
+ throw new Exception("TEST ERROR: a lot of red pixels");
+ }
+ }
+ catch (Exception exception) {
+ throw new Error(exception);
+ }
+ finally {
+ SwingUtilities.getWindowAncestor(chooser).dispose();
+ }
+ }
+ });
+ }
+
+ private static <T> T get(Class<? extends T> type, Container container) {
+ Component component = container.getComponent(0);
+ if (!type.isAssignableFrom(component.getClass())) {
+ throw new IllegalStateException("expected " + type + "; expected " + component.getClass());
+ }
+ return (T) component;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JTree/8003400/Test8003400.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8003400
+ * @summary Tests that JTree shows the last row
+ * @author Sergey Malenkov
+ * @run main/othervm Test8003400
+ * @run main/othervm Test8003400 reverse
+ * @run main/othervm Test8003400 system
+ * @run main/othervm Test8003400 system reverse
+ */
+
+import sun.awt.SunToolkit;
+
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.event.KeyEvent;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public class Test8003400 {
+
+ private static final String TITLE = "Test JTree with a large model";
+ private static List<String> OBJECTS = Arrays.asList(TITLE, "x", "y", "z");
+ private static JScrollPane pane;
+
+ public static void main(String[] args) throws Exception {
+ for (String arg : args) {
+ if (arg.equals("reverse")) {
+ Collections.reverse(OBJECTS);
+ }
+ if (arg.equals("system")) {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ }
+ }
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ DefaultMutableTreeNode root = new DefaultMutableTreeNode();
+
+ JTree tree = new JTree(root);
+ tree.setLargeModel(true);
+ tree.setRowHeight(16);
+
+ JFrame frame = new JFrame(TITLE);
+ frame.add(pane = new JScrollPane(tree));
+ frame.setSize(200, 100);
+ frame.setLocationRelativeTo(null);
+ frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ frame.setVisible(true);
+
+ for (String object : OBJECTS) {
+ root.add(new DefaultMutableTreeNode(object));
+ }
+ tree.expandRow(0);
+ }
+ });
+
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ toolkit.realSync(500);
+ new Robot().keyPress(KeyEvent.VK_END);
+ toolkit.realSync(500);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ JTree tree = (JTree) pane.getViewport().getView();
+ Rectangle inner = tree.getRowBounds(tree.getRowCount() - 1);
+ Rectangle outer = SwingUtilities.convertRectangle(tree, inner, pane);
+ outer.y += tree.getRowHeight() - 1 - pane.getVerticalScrollBar().getHeight();
+ // error reporting only for automatic testing
+ if (null != System.getProperty("test.src", null)) {
+ SwingUtilities.getWindowAncestor(pane).dispose();
+ if (outer.y != 0) {
+ throw new Error("TEST FAILED: " + outer.y);
+ }
+ }
+ }
+ });
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JTree/8004298/bug8004298.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8004298
+ * @summary NPE in WindowsTreeUI.ensureRowsAreVisible
+ * @author Alexander Scherbatiy
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main bug8004298
+ */
+
+import java.awt.*;
+import java.awt.event.InputEvent;
+import javax.swing.*;
+import javax.swing.tree.*;
+import java.util.concurrent.Callable;
+import sun.awt.SunToolkit;
+import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
+import com.sun.java.swing.plaf.windows.WindowsTreeUI;
+
+public class bug8004298 {
+
+ private static JTree tree;
+
+ public static void main(String[] args) throws Exception {
+ Robot robot = new Robot();
+ robot.setAutoDelay(50);
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ UIManager.setLookAndFeel(new WindowsLookAndFeel());
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+
+ @Override
+ public void run() {
+ createAndShowGUI();
+ }
+ });
+
+ toolkit.realSync();
+
+ Point point = Util.invokeOnEDT(new Callable<Point>() {
+
+ @Override
+ public Point call() throws Exception {
+ Rectangle rect = tree.getRowBounds(2);
+ Point p = new Point(rect.x + rect.width / 2, rect.y + rect.height / 2);
+ SwingUtilities.convertPointToScreen(p, tree);
+ return p;
+ }
+ });
+
+ robot.mouseMove(point.x, point.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ toolkit.realSync();
+
+ }
+
+ private static void createAndShowGUI() {
+ JFrame frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
+ root.add(new DefaultMutableTreeNode("colors"));
+ DefaultMutableTreeNode sports = new DefaultMutableTreeNode("sports");
+ sports.add(new DefaultMutableTreeNode("basketball"));
+ sports.add(new DefaultMutableTreeNode("football"));
+ root.add(sports);
+
+ tree = new JTree(root);
+ tree.setUI(new NullReturningTreeUI());
+
+ frame.getContentPane().add(tree);
+ frame.pack();
+ frame.setVisible(true);
+
+ }
+
+ private static final class NullReturningTreeUI extends WindowsTreeUI {
+
+ @Override
+ public Rectangle getPathBounds(JTree tree, TreePath path) {
+ // the method can return null and callers have to be ready for
+ // that. Simulate the case by returning null for unknown reason.
+ if (path != null && path.toString().contains("football")) {
+ return null;
+ }
+
+ return super.getPathBounds(tree, path);
+ }
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/SpringLayout/4726194/bug4726194.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4726194 7124209
+ * @summary Tests for 4726194
+ * @author Phil Milne
+ */
+import java.awt.*;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+import java.util.List;
+import javax.swing.*;
+
+public class bug4726194 {
+
+ private static String[] hConstraints = {SpringLayout.WEST, "Width", SpringLayout.EAST, SpringLayout.HORIZONTAL_CENTER};
+ private static String[] vConstraints = {SpringLayout.NORTH, "Height", SpringLayout.SOUTH, SpringLayout.VERTICAL_CENTER, SpringLayout.BASELINE};
+ private static int[] FAIL = new int[3];
+ private static boolean TEST_DUPLICATES = false;
+
+ public static void main(String[] args) {
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ int minLevel = 2;
+ int maxLevel = 2;
+ for (int i = minLevel; i <= maxLevel; i++) {
+ test(i, true);
+ test(i, false);
+ }
+ }
+ });
+ } catch (InterruptedException | InvocationTargetException ex) {
+ ex.printStackTrace();
+ throw new RuntimeException("FAILED: SwingUtilities.invokeAndWait method failed!");
+ }
+ }
+
+ public static void test(int level, boolean horizontal) {
+ List result = new ArrayList();
+ String[] constraints = horizontal ? hConstraints : vConstraints;
+ test(level, constraints, result, Arrays.asList(new Object[level]));
+ JTextField tf = new JTextField("");
+ tf.setFont(new Font("Dialog", Font.PLAIN, 6));
+ System.out.print("\t\t");
+ for (int j = 0; j < constraints.length; j++) {
+ String constraint = constraints[j];
+ System.out.print(constraint + " ".substring(constraint.length()));
+ }
+ System.out.println("");
+ for (int i = 0; i < result.size(); i++) {
+ SpringLayout.Constraints c = new SpringLayout.Constraints(tf);
+ List cc = (List) result.get(i);
+ for (int j = 0; j < cc.size(); j++) {
+ String constraint = (String) cc.get(j);
+ c.setConstraint(constraint, Spring.constant((j + 1) * 10));
+ }
+ System.out.print(" Input:\t\t");
+ for (int j = 0; j < constraints.length; j++) {
+ String constraint = constraints[j];
+ int jj = cc.indexOf(constraint);
+ String val = cc.contains(constraint) ? Integer.toString((jj + 1) * 10) : "?";
+ System.out.print(val + "\t\t");
+ }
+ System.out.println("");
+ System.out.print("Output:\t\t");
+ for (int j = 0; j < constraints.length; j++) {
+ String constraint = constraints[j];
+ Spring spring = c.getConstraint(constraint);
+ String springVal = (spring == null) ? "?" : Integer.toString(spring.getValue());
+ System.out.print(springVal);
+ System.out.print("\t\t");
+ }
+ for (int j = 0; j < cc.size(); j++) {
+ String constraint = (String) cc.get(j);
+ Spring con = c.getConstraint(constraint);
+ if (con == null || con.getValue() != (j + 1) * 10) {
+ throw new RuntimeException("Values are wrong!!! ");
+ }
+ }
+ if (horizontal) {
+ int[] a1 = getValues(c, new String[]{SpringLayout.WEST, SpringLayout.WIDTH, SpringLayout.EAST});
+ if (a1[0] + a1[1] != a1[2]) {
+ throw new RuntimeException("WEST + WIDTH != EAST!!! ");
+ }
+ int[] a2 = getValues(c, new String[]{SpringLayout.WEST, SpringLayout.WIDTH, SpringLayout.HORIZONTAL_CENTER});
+ if (a2[0] + a2[1] / 2 != a2[2]) {
+ throw new RuntimeException("WEST + WIDTH/2 != HORIZONTAL_CENTER!!! ");
+ }
+ } else {
+ int[] a3 = getValues(c, new String[]{SpringLayout.NORTH, SpringLayout.HEIGHT, SpringLayout.SOUTH});
+ if (a3[0] + a3[1] != a3[2]) {
+ throw new RuntimeException("NORTH + HEIGHT != SOUTH!!! ");
+ }
+ int[] a4 = getValues(c, new String[]{SpringLayout.NORTH, SpringLayout.HEIGHT, SpringLayout.VERTICAL_CENTER});
+ int vcDiff = Math.abs(a4[0] + a4[1] / 2 - a4[2]);
+ if (vcDiff > 1) {
+ throw new RuntimeException("NORTH + HEIGHT/2 != VERTICAL_CENTER!!! ");
+ }
+ int[] a5 = getValues(c, new String[]{SpringLayout.NORTH, SpringLayout.BASELINE, SpringLayout.SOUTH});
+ if (a5[0] > a5[1] != a5[1] > a5[2]) {
+ throw new RuntimeException("BASELINE is not in the range: [NORTH, SOUTH]!!!");
+ }
+ }
+ System.out.println("");
+ }
+ System.out.println("");
+ }
+
+ private static int[] getValues(SpringLayout.Constraints con, String[] cNames) {
+ int[] result = new int[cNames.length];
+ for (int i = 0; i < cNames.length; i++) {
+ String name = cNames[i];
+ Spring s = con.getConstraint(name);
+ if (s == null) {
+ System.out.print("Warning: " + name + " is undefined. ");
+ return FAIL;
+ }
+ result[i] = s.getValue();
+ }
+ return result;
+ }
+
+ public static void test(int level, String[] constraints, List result, List soFar) {
+ if (level == 0) {
+ result.add(soFar);
+ return;
+ }
+ for (int i = 0; i < constraints.length; i++) {
+ if (soFar.contains(constraints[i]) && !TEST_DUPLICATES) {
+ continue;
+ }
+ List child = new ArrayList(soFar);
+ child.set(level - 1, constraints[i]);
+ test(level - 1, constraints, result, child);
+ }
+ }
+}
--- a/jdk/test/sun/text/resources/LocaleData Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/test/sun/text/resources/LocaleData Thu Jan 31 10:22:25 2013 -0800
@@ -8794,3 +8794,6 @@
FormatData/zh_TW/islamic.DatePatterns/1=GGGGy\u5e74M\u6708d\u65e5
FormatData/zh_TW/islamic.DatePatterns/2=GGGGy/M/d
FormatData/zh_TW/islamic.DatePatterns/3=GGGGy/M/d
+
+# bug 7114053
+LocaleNames/sq/sq=shqip
--- a/jdk/test/sun/text/resources/LocaleDataTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -35,6 +35,7 @@
* 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
* 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
* 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
+ * 7114053
* @summary Verify locale data
*
*/
--- a/langtools/.hgtags Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/.hgtags Thu Jan 31 10:22:25 2013 -0800
@@ -194,3 +194,5 @@
47f71d7c124f24c2fe2dfc49865b332345b458ed jdk8-b70
467e4d9281bcf119eaec42af1423c96bd401871c jdk8-b71
6f0986ed9b7e11d6eb06618f27e20b18f19fb797 jdk8-b72
+8d0baee36c7184d55c80354b45704c37d6b7ac79 jdk8-b73
+56c97aff46bb577b8668874154c24115a7e8a3e8 jdk8-b74
--- a/langtools/make/build.properties Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/make/build.properties Thu Jan 31 10:22:25 2013 -0800
@@ -29,18 +29,18 @@
# Override this path as needed, either on the command line or in
# one of the standard user build.properties files (see build.xml)
-# boot.java.home = /opt/jdk/1.6.0
+# boot.java.home = /opt/jdk/1.7.0
boot.java = ${boot.java.home}/bin/java
boot.javac = ${boot.java.home}/bin/javac
-boot.javac.source = 6
-boot.javac.target = 6
+boot.javac.source = 7
+boot.javac.target = 7
# This is the JDK used to run the product version of the tools,
# for example, for testing. If you're building a complete JDK, specify that.
# Override this path as needed, either on the command line or in
# one of the standard user build.properties files (see build.xml)
-# target.java.home = /opt/jdk/1.7.0
+# target.java.home = /opt/jdk/1.8.0
target.java = ${target.java.home}/bin/java
# Version info -- override as needed
@@ -161,6 +161,14 @@
#
+sjavac.includes = \
+ com/sun/tools/sjavac/
+
+sjavac.tests = \
+ tools/sjavac
+
+#
+
# The following files require the latest JDK to be available.
# The API can be provided by using a suitable boot.java.home
# or by setting import.jdk
--- a/langtools/make/build.xml Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/make/build.xml Thu Jan 31 10:22:25 2013 -0800
@@ -241,15 +241,15 @@
</target>
<target name="build-bootstrap-tools"
- depends="build-bootstrap-javac,build-bootstrap-javadoc,build-bootstrap-doclets,build-bootstrap-javah"
+ depends="build-bootstrap-javac,build-bootstrap-javadoc,build-bootstrap-doclets,build-bootstrap-javah,build-bootstrap-sjavac"
/>
<target name="build-all-tools"
- depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap"
+ depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap,build-sjavac"
/>
<target name="build-all-classes" depends="build-bootstrap-javac,-create-import-jdk-stubs">
- <build-classes includes="${javac.includes} ${javadoc.includes} ${doclets.includes} ${javah.includes} ${javap.includes}"/>
+ <build-classes includes="${javac.includes} ${javadoc.includes} ${doclets.includes} ${javah.includes} ${javap.includes} ${sjavac.includes}"/>
</target>
<!-- clean -->
@@ -656,6 +656,40 @@
<target name="javap" depends="build-javap,jtreg-javap,findbugs-javap"/>
+ <!--
+ **** sjavac targets.
+ -->
+
+ <target name="build-bootstrap-sjavac"
+ depends="-def-build-bootstrap-classes,-def-build-bootstrap-jar,-def-build-bootstrap-tool">
+ <build-bootstrap-classes includes="${sjavac.includes}"/>
+ <build-bootstrap-jar name="sjavac" includes="${sjavac.includes}"
+ jarmainclass="com.sun.tools.sjavac.Main"/>
+ <build-bootstrap-tool name="sjavac"/>
+ </target>
+
+ <target name="build-classes-sjavac" depends="build-classes-javac">
+ <build-classes includes="${sjavac.includes}"/>
+ </target>
+
+ <target name="build-sjavac" depends="build-classes-sjavac">
+ <build-jar name="sjavac" includes="${sjavac.includes}"
+ jarmainclass="com.sun.tools.sjavac.Main"
+ jarclasspath="sjavac.jar"/>
+ <build-tool name="sjavac"/>
+ </target>
+
+ <!-- (no javadoc for javap) -->
+
+ <target name="jtreg-sjavac" depends="build-sjavac,-def-jtreg">
+ <jtreg-tool name="sjavac" tests="${sjavac.tests}"/>
+ </target>
+
+ <target name="findbugs-sjavac" depends="build-sjavac,-def-findbugs">
+ <findbugs-tool name="sjavac"/>
+ </target>
+
+ <target name="sjavac" depends="build-sjavac,jtreg-sjavac,findbugs-sjavac"/>
<!--
**** Create import JDK stubs.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/javadoc/AnnotatedType.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javadoc;
+
+
+/**
+ * Represents an annotated type.
+ * For example:
+ * <pre>
+ * {@code @NonNull String}
+ * {@code @Positive int}
+ * </pre>
+ *
+ * @author Mahmood Ali
+ * @since 1.8
+ */
+public interface AnnotatedType extends Type {
+
+ AnnotationDesc[] annotations();
+
+ Type underlyingType();
+}
--- a/langtools/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,15 @@
Parameter[] parameters();
/**
+ * Get the receiver annotations of this executable element.
+ * Return an empty array if there are none.
+ *
+ * @return the receiver annotations of this executable element.
+ * @since 1.8
+ */
+ AnnotationDesc[] receiverAnnotations();
+
+ /**
* Return the throws tags in this method.
*
* @return an array of ThrowTag containing all <code>@exception</code>
--- a/langtools/src/share/classes/com/sun/javadoc/Type.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/javadoc/Type.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -142,6 +142,16 @@
WildcardType asWildcardType();
/**
+ * Returns this type as a <code>AnnotatedType</code> if it represents
+ * an annotated type.
+ *
+ * @return a <code>AnnotatedType</code> if the type if an annotated type,
+ * or null if it is not
+ * @since 1.8
+ */
+ AnnotatedType asAnnotatedType();
+
+ /**
* Return this type as an <code>AnnotationTypeDoc</code> if it represents
* an annotation type. Array dimensions are ignored.
*
--- a/langtools/src/share/classes/com/sun/javadoc/TypeVariable.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/javadoc/TypeVariable.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -55,4 +55,11 @@
* which this type variable is declared.
*/
ProgramElementDoc owner();
+
+ /**
+ * Get the annotations of this program element.
+ * Return an empty array if there are none.
+ */
+ public AnnotationDesc[] annotations();
+
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.source.tree;
+
+import java.util.List;
+
+/**
+ * A tree node for an annotated type
+ *
+ * For example:
+ * <pre>
+ * {@code @}<em>annotationType String</em>
+ * {@code @}<em>annotationType</em> ( <em>arguments</em> ) <em>Date</em>
+ * </pre>
+ *
+ * @see "JSR 308: Annotations on Java Types"
+ *
+ * @author Mahmood Ali
+ * @since 1.8
+ */
+public interface AnnotatedTypeTree extends ExpressionTree {
+ List<? extends AnnotationTree> getAnnotations();
+ ExpressionTree getUnderlyingType();
+}
--- a/langtools/src/share/classes/com/sun/source/tree/MethodTree.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/source/tree/MethodTree.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@
Tree getReturnType();
List<? extends TypeParameterTree> getTypeParameters();
List<? extends VariableTree> getParameters();
+ VariableTree getReceiverParameter();
List<? extends ExpressionTree> getThrows();
BlockTree getBody();
Tree getDefaultValue(); // for annotation types
--- a/langtools/src/share/classes/com/sun/source/tree/Tree.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/source/tree/Tree.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,12 +46,21 @@
*/
public enum Kind {
+ ANNOTATED_TYPE(AnnotatedTypeTree.class),
+
/**
- * Used for instances of {@link AnnotationTree}.
+ * Used for instances of {@link AnnotationTree}
+ * representing declaration annotations.
*/
ANNOTATION(AnnotationTree.class),
/**
+ * Used for instances of {@link AnnotationTree}
+ * representing type annotations.
+ */
+ TYPE_ANNOTATION(AnnotationTree.class),
+
+ /**
* Used for instances of {@link ArrayAccessTree}.
*/
ARRAY_ACCESS(ArrayAccessTree.class),
--- a/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,7 @@
* @since 1.6
*/
public interface TreeVisitor<R,P> {
+ R visitAnnotatedType(AnnotatedTypeTree node, P p);
R visitAnnotation(AnnotationTree node, P p);
R visitMethodInvocation(MethodInvocationTree node, P p);
R visitAssert(AssertTree node, P p);
--- a/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,4 +47,5 @@
public interface TypeParameterTree extends Tree {
Name getName();
List<? extends Tree> getBounds();
+ List<? extends AnnotationTree> getAnnotations();
}
--- a/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -260,6 +260,10 @@
return defaultAction(node, p);
}
+ public R visitAnnotatedType(AnnotatedTypeTree node, P p) {
+ return defaultAction(node, p);
+ }
+
public R visitErroneous(ErroneousTree node, P p) {
return defaultAction(node, p);
}
--- a/langtools/src/share/classes/com/sun/source/util/TaskEvent.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/source/util/TaskEvent.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@
**/
GENERATE,
/**
- * For events relating to overall annotaion processing.
+ * For events relating to overall annotation processing.
**/
ANNOTATION_PROCESSING,
/**
--- a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -138,6 +138,7 @@
r = scanAndReduce(node.getReturnType(), p, r);
r = scanAndReduce(node.getTypeParameters(), p, r);
r = scanAndReduce(node.getParameters(), p, r);
+ r = scanAndReduce(node.getReceiverParameter(), p, r);
r = scanAndReduce(node.getThrows(), p, r);
r = scanAndReduce(node.getBody(), p, r);
r = scanAndReduce(node.getDefaultValue(), p, r);
@@ -376,7 +377,8 @@
}
public R visitTypeParameter(TypeParameterTree node, P p) {
- R r = scan(node.getBounds(), p);
+ R r = scan(node.getAnnotations(), p);
+ r = scanAndReduce(node.getBounds(), p, r);
return r;
}
@@ -394,6 +396,12 @@
return r;
}
+ public R visitAnnotatedType(AnnotatedTypeTree node, P p) {
+ R r = scan(node.getAnnotations(), p);
+ r = scanAndReduce(node.getUnderlyingType(), p, r);
+ return r;
+ }
+
public R visitOther(Tree node, P p) {
return null;
}
--- a/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,8 @@
public static final String RuntimeInvisibleAnnotations = "RuntimeInvisibleAnnotations";
public static final String RuntimeVisibleParameterAnnotations = "RuntimeVisibleParameterAnnotations";
public static final String RuntimeInvisibleParameterAnnotations = "RuntimeInvisibleParameterAnnotations";
+ public static final String RuntimeVisibleTypeAnnotations = "RuntimeVisibleTypeAnnotations";
+ public static final String RuntimeInvisibleTypeAnnotations = "RuntimeInvisibleTypeAnnotations";
public static final String Signature = "Signature";
public static final String SourceDebugExtension = "SourceDebugExtension";
public static final String SourceFile = "SourceFile";
@@ -120,6 +122,8 @@
standardAttributes.put(RuntimeInvisibleParameterAnnotations, RuntimeInvisibleParameterAnnotations_attribute.class);
standardAttributes.put(RuntimeVisibleAnnotations, RuntimeVisibleAnnotations_attribute.class);
standardAttributes.put(RuntimeVisibleParameterAnnotations, RuntimeVisibleParameterAnnotations_attribute.class);
+ standardAttributes.put(RuntimeVisibleTypeAnnotations, RuntimeVisibleTypeAnnotations_attribute.class);
+ standardAttributes.put(RuntimeInvisibleTypeAnnotations, RuntimeInvisibleTypeAnnotations_attribute.class);
standardAttributes.put(Signature, Signature_attribute.class);
standardAttributes.put(SourceID, SourceID_attribute.class);
}
@@ -178,6 +182,8 @@
R visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, P p);
R visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, P p);
R visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, P p);
+ R visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, P p);
+ R visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, P p);
R visitSignature(Signature_attribute attr, P p);
R visitSourceDebugExtension(SourceDebugExtension_attribute attr, P p);
R visitSourceFile(SourceFile_attribute attr, P p);
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -498,6 +498,16 @@
return null;
}
+ public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, ClassOutputStream out) {
+ annotationWriter.write(attr.annotations, out);
+ return null;
+ }
+
+ public Void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, ClassOutputStream out) {
+ annotationWriter.write(attr.annotations, out);
+ return null;
+ }
+
public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, ClassOutputStream out) {
out.writeByte(attr.parameter_annotations.length);
for (Annotation[] annos: attr.parameter_annotations)
@@ -657,6 +667,12 @@
write(anno, out);
}
+ public void write(TypeAnnotation[] annos, ClassOutputStream out) {
+ out.writeShort(annos.length);
+ for (TypeAnnotation anno: annos)
+ write(anno, out);
+ }
+
public void write(Annotation anno, ClassOutputStream out) {
out.writeShort(anno.type_index);
out.writeShort(anno.element_value_pairs.length);
@@ -664,6 +680,11 @@
write(p, out);
}
+ public void write(TypeAnnotation anno, ClassOutputStream out) {
+ write(anno.position, out);
+ write(anno.annotation, out);
+ }
+
public void write(element_value_pair pair, ClassOutputStream out) {
out.writeShort(pair.element_name_index);
write(pair.value, out);
@@ -702,5 +723,89 @@
return null;
}
+ // TODO: Move this to TypeAnnotation to be closer with similar logic?
+ private void write(TypeAnnotation.Position p, ClassOutputStream out) {
+ out.writeByte(p.type.targetTypeValue());
+ switch (p.type) {
+ // type cast
+ case CAST:
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ out.writeShort(p.offset);
+ break;
+ // local variable
+ case LOCAL_VARIABLE:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ int table_length = p.lvarOffset.length;
+ out.writeShort(table_length);
+ for (int i = 0; i < table_length; ++i) {
+ out.writeShort(1); // for table length
+ out.writeShort(p.lvarOffset[i]);
+ out.writeShort(p.lvarLength[i]);
+ out.writeShort(p.lvarIndex[i]);
+ }
+ break;
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ out.writeByte(p.exception_index);
+ break;
+ // method receiver
+ case METHOD_RECEIVER:
+ // Do nothing
+ break;
+ // type parameters
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ out.writeByte(p.parameter_index);
+ break;
+ // type parameters bounds
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ out.writeByte(p.parameter_index);
+ out.writeByte(p.bound_index);
+ break;
+ // class extends or implements clause
+ case CLASS_EXTENDS:
+ out.writeByte(p.type_index);
+ break;
+ // throws
+ case THROWS:
+ out.writeByte(p.type_index);
+ break;
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ out.writeByte(p.parameter_index);
+ break;
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
+ out.writeShort(p.offset);
+ out.writeByte(p.type_index);
+ break;
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ // lambda formal parameter
+ case LAMBDA_FORMAL_PARAMETER:
+ out.writeByte(p.parameter_index);
+ break;
+ case UNKNOWN:
+ throw new AssertionError("ClassWriter: UNKNOWN target type should never occur!");
+ default:
+ throw new AssertionError("ClassWriter: Unknown target type for position: " + p);
+ }
+
+ { // Append location data for generics/arrays.
+ // TODO: check for overrun?
+ out.writeByte((byte)p.location.size());
+ for (int i : TypeAnnotation.Position.getBinaryFromTypePath(p.location))
+ out.writeByte((byte)i);
+ }
+ }
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+/**
+ * See JSR 308 specification, Section 3.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class RuntimeInvisibleTypeAnnotations_attribute extends RuntimeTypeAnnotations_attribute {
+ RuntimeInvisibleTypeAnnotations_attribute(ClassReader cr, int name_index, int length)
+ throws IOException, Annotation.InvalidAnnotation {
+ super(cr, name_index, length);
+ }
+
+ public RuntimeInvisibleTypeAnnotations_attribute(ConstantPool cp, TypeAnnotation[] annotations)
+ throws ConstantPoolException {
+ this(cp.getUTF8Index(Attribute.RuntimeInvisibleTypeAnnotations), annotations);
+ }
+
+ public RuntimeInvisibleTypeAnnotations_attribute(int name_index, TypeAnnotation[] annotations) {
+ super(name_index, annotations);
+ }
+
+ public <R, P> R accept(Visitor<R, P> visitor, P p) {
+ return visitor.visitRuntimeInvisibleTypeAnnotations(this, p);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+/**
+ * See JSR 308 specification, Section 3.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public abstract class RuntimeTypeAnnotations_attribute extends Attribute {
+ protected RuntimeTypeAnnotations_attribute(ClassReader cr, int name_index, int length)
+ throws IOException, Annotation.InvalidAnnotation {
+ super(name_index, length);
+ int num_annotations = cr.readUnsignedShort();
+ annotations = new TypeAnnotation[num_annotations];
+ for (int i = 0; i < annotations.length; i++)
+ annotations[i] = new TypeAnnotation(cr);
+ }
+
+ protected RuntimeTypeAnnotations_attribute(int name_index, TypeAnnotation[] annotations) {
+ super(name_index, length(annotations));
+ this.annotations = annotations;
+ }
+
+ private static int length(TypeAnnotation[] annos) {
+ int n = 2;
+ for (TypeAnnotation anno: annos)
+ n += anno.length();
+ return n;
+ }
+
+ public final TypeAnnotation[] annotations;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+
+/**
+ * See JSR 308 specification, Section 3.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class RuntimeVisibleTypeAnnotations_attribute extends RuntimeTypeAnnotations_attribute {
+ RuntimeVisibleTypeAnnotations_attribute(ClassReader cr, int name_index, int length)
+ throws IOException, Annotation.InvalidAnnotation {
+ super(cr, name_index, length);
+ }
+
+ public RuntimeVisibleTypeAnnotations_attribute(ConstantPool cp, TypeAnnotation[] annotations)
+ throws ConstantPoolException {
+ this(cp.getUTF8Index(Attribute.RuntimeVisibleTypeAnnotations), annotations);
+ }
+
+ public RuntimeVisibleTypeAnnotations_attribute(int name_index, TypeAnnotation[] annotations) {
+ super(name_index, annotations);
+ }
+
+ public <R, P> R accept(Visitor<R, P> visitor, P p) {
+ return visitor.visitRuntimeVisibleTypeAnnotations(this, p);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,656 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.classfile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.tools.classfile.TypeAnnotation.Position.TypePathEntry;
+
+/**
+ * See JSR 308 specification, Section 3.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class TypeAnnotation {
+ TypeAnnotation(ClassReader cr) throws IOException, Annotation.InvalidAnnotation {
+ constant_pool = cr.getConstantPool();
+ position = read_position(cr);
+ annotation = new Annotation(cr);
+ }
+
+ public TypeAnnotation(ConstantPool constant_pool,
+ Annotation annotation, Position position) {
+ this.constant_pool = constant_pool;
+ this.position = position;
+ this.annotation = annotation;
+ }
+
+ public int length() {
+ int n = annotation.length();
+ n += position_length(position);
+ return n;
+ }
+
+ @Override
+ public String toString() {
+ try {
+ return "@" + constant_pool.getUTF8Value(annotation.type_index).toString().substring(1) +
+ " pos: " + position.toString();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return e.toString();
+ }
+ }
+
+ public final ConstantPool constant_pool;
+ public final Position position;
+ public final Annotation annotation;
+
+ private static Position read_position(ClassReader cr) throws IOException, Annotation.InvalidAnnotation {
+ // Copied from ClassReader
+ int tag = cr.readUnsignedByte(); // TargetType tag is a byte
+ if (!TargetType.isValidTargetTypeValue(tag))
+ throw new Annotation.InvalidAnnotation("TypeAnnotation: Invalid type annotation target type value: " + String.format("0x%02X", tag));
+
+ TargetType type = TargetType.fromTargetTypeValue(tag);
+
+ Position position = new Position();
+ position.type = type;
+
+ switch (type) {
+ // type cast
+ case CAST:
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ position.offset = cr.readUnsignedShort();
+ break;
+ // local variable
+ case LOCAL_VARIABLE:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ int table_length = cr.readUnsignedShort();
+ position.lvarOffset = new int[table_length];
+ position.lvarLength = new int[table_length];
+ position.lvarIndex = new int[table_length];
+ for (int i = 0; i < table_length; ++i) {
+ position.lvarOffset[i] = cr.readUnsignedShort();
+ position.lvarLength[i] = cr.readUnsignedShort();
+ position.lvarIndex[i] = cr.readUnsignedShort();
+ }
+ break;
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ position.exception_index = cr.readUnsignedByte();
+ break;
+ // method receiver
+ case METHOD_RECEIVER:
+ // Do nothing
+ break;
+ // type parameter
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ position.parameter_index = cr.readUnsignedByte();
+ break;
+ // type parameter bound
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ position.parameter_index = cr.readUnsignedByte();
+ position.bound_index = cr.readUnsignedByte();
+ break;
+ // class extends or implements clause
+ case CLASS_EXTENDS:
+ int in = cr.readUnsignedShort();
+ if (in == 0xFFFF)
+ in = -1;
+ position.type_index = in;
+ break;
+ // throws
+ case THROWS:
+ position.type_index = cr.readUnsignedShort();
+ break;
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ position.parameter_index = cr.readUnsignedByte();
+ break;
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
+ position.offset = cr.readUnsignedShort();
+ position.type_index = cr.readUnsignedByte();
+ break;
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ // lambda formal parameter
+ case LAMBDA_FORMAL_PARAMETER:
+ position.parameter_index = cr.readUnsignedByte();
+ break;
+ case UNKNOWN:
+ throw new AssertionError("TypeAnnotation: UNKNOWN target type should never occur!");
+ default:
+ throw new AssertionError("TypeAnnotation: Unknown target type: " + type);
+ }
+
+ { // Write type path
+ int len = cr.readUnsignedByte();
+ List<Integer> loc = new ArrayList<Integer>(len);
+ for (int i = 0; i < len * TypePathEntry.bytesPerEntry; ++i)
+ loc.add(cr.readUnsignedByte());
+ position.location = Position.getTypePathFromBinary(loc);
+ }
+ return position;
+ }
+
+ private static int position_length(Position pos) {
+ int n = 0;
+ n += 1; // TargetType tag is a byte
+ switch (pos.type) {
+ // type cast
+ case CAST:
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ n += 2;
+ break;
+ // local variable
+ case LOCAL_VARIABLE:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ n += 2; // table_length;
+ int table_length = pos.lvarOffset.length;
+ n += 2 * table_length; // offset
+ n += 2 * table_length; // length;
+ n += 2 * table_length; // index
+ break;
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ n += 1; // exception_index
+ break;
+ // method receiver
+ case METHOD_RECEIVER:
+ // Do nothing
+ break;
+ // type parameter
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ n += 1; // parameter_index;
+ break;
+ // type parameter bound
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ n += 1; // parameter_index
+ n += 1; // bound_index
+ break;
+ // class extends or implements clause
+ case CLASS_EXTENDS:
+ n += 2; // type_index
+ break;
+ // throws
+ case THROWS:
+ n += 2; // type_index
+ break;
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ n += 1; // parameter_index
+ break;
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
+ n += 2; // offset
+ n += 1; // type index
+ break;
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ // lambda formal parameter
+ case LAMBDA_FORMAL_PARAMETER:
+ n += 1; // parameter_index
+ break;
+ case UNKNOWN:
+ throw new AssertionError("TypeAnnotation: UNKNOWN target type should never occur!");
+ default:
+ throw new AssertionError("TypeAnnotation: Unknown target type: " + pos.type);
+ }
+
+ {
+ n += 1; // length
+ n += TypePathEntry.bytesPerEntry * pos.location.size(); // bytes for actual array
+ }
+
+ return n;
+ }
+
+ // Code duplicated from com.sun.tools.javac.code.TypeAnnotationPosition
+ public static class Position {
+ public enum TypePathEntryKind {
+ ARRAY(0),
+ INNER_TYPE(1),
+ WILDCARD(2),
+ TYPE_ARGUMENT(3);
+
+ public final int tag;
+
+ private TypePathEntryKind(int tag) {
+ this.tag = tag;
+ }
+ }
+
+ public static class TypePathEntry {
+ /** The fixed number of bytes per TypePathEntry. */
+ public static final int bytesPerEntry = 2;
+
+ public final TypePathEntryKind tag;
+ public final int arg;
+
+ public static final TypePathEntry ARRAY = new TypePathEntry(TypePathEntryKind.ARRAY);
+ public static final TypePathEntry INNER_TYPE = new TypePathEntry(TypePathEntryKind.INNER_TYPE);
+ public static final TypePathEntry WILDCARD = new TypePathEntry(TypePathEntryKind.WILDCARD);
+
+ private TypePathEntry(TypePathEntryKind tag) {
+ if (!(tag == TypePathEntryKind.ARRAY ||
+ tag == TypePathEntryKind.INNER_TYPE ||
+ tag == TypePathEntryKind.WILDCARD)) {
+ throw new AssertionError("Invalid TypePathEntryKind: " + tag);
+ }
+ this.tag = tag;
+ this.arg = 0;
+ }
+
+ public TypePathEntry(TypePathEntryKind tag, int arg) {
+ if (tag != TypePathEntryKind.TYPE_ARGUMENT) {
+ throw new AssertionError("Invalid TypePathEntryKind: " + tag);
+ }
+ this.tag = tag;
+ this.arg = arg;
+ }
+
+ public static TypePathEntry fromBinary(int tag, int arg) {
+ if (arg != 0 && tag != TypePathEntryKind.TYPE_ARGUMENT.tag) {
+ throw new AssertionError("Invalid TypePathEntry tag/arg: " + tag + "/" + arg);
+ }
+ switch (tag) {
+ case 0:
+ return ARRAY;
+ case 1:
+ return INNER_TYPE;
+ case 2:
+ return WILDCARD;
+ case 3:
+ return new TypePathEntry(TypePathEntryKind.TYPE_ARGUMENT, arg);
+ default:
+ throw new AssertionError("Invalid TypePathEntryKind tag: " + tag);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return tag.toString() +
+ (tag == TypePathEntryKind.TYPE_ARGUMENT ? ("(" + arg + ")") : "");
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (! (other instanceof TypePathEntry)) {
+ return false;
+ }
+ TypePathEntry tpe = (TypePathEntry) other;
+ return this.tag == tpe.tag && this.arg == tpe.arg;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.tag.hashCode() * 17 + this.arg;
+ }
+ }
+
+ public TargetType type = TargetType.UNKNOWN;
+
+ // For generic/array types.
+ // TODO: or should we use null? Noone will use this object.
+ public List<TypePathEntry> location = new ArrayList<TypePathEntry>(0);
+
+ // Tree position.
+ public int pos = -1;
+
+ // For typecasts, type tests, new (and locals, as start_pc).
+ public boolean isValidOffset = false;
+ public int offset = -1;
+
+ // For locals. arrays same length
+ public int[] lvarOffset = null;
+ public int[] lvarLength = null;
+ public int[] lvarIndex = null;
+
+ // For type parameter bound
+ public int bound_index = Integer.MIN_VALUE;
+
+ // For type parameter and method parameter
+ public int parameter_index = Integer.MIN_VALUE;
+
+ // For class extends, implements, and throws clauses
+ public int type_index = Integer.MIN_VALUE;
+
+ // For exception parameters, index into exception table
+ public int exception_index = Integer.MIN_VALUE;
+
+ public Position() {}
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append('[');
+ sb.append(type);
+
+ switch (type) {
+ // type cast
+ case CAST:
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ sb.append(", offset = ");
+ sb.append(offset);
+ break;
+ // local variable
+ case LOCAL_VARIABLE:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ if (lvarOffset == null) {
+ sb.append(", lvarOffset is null!");
+ break;
+ }
+ sb.append(", {");
+ for (int i = 0; i < lvarOffset.length; ++i) {
+ if (i != 0) sb.append("; ");
+ sb.append("start_pc = ");
+ sb.append(lvarOffset[i]);
+ sb.append(", length = ");
+ sb.append(lvarLength[i]);
+ sb.append(", index = ");
+ sb.append(lvarIndex[i]);
+ }
+ sb.append("}");
+ break;
+ // method receiver
+ case METHOD_RECEIVER:
+ // Do nothing
+ break;
+ // type parameter
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ sb.append(", param_index = ");
+ sb.append(parameter_index);
+ break;
+ // type parameter bound
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ sb.append(", param_index = ");
+ sb.append(parameter_index);
+ sb.append(", bound_index = ");
+ sb.append(bound_index);
+ break;
+ // class extends or implements clause
+ case CLASS_EXTENDS:
+ sb.append(", type_index = ");
+ sb.append(type_index);
+ break;
+ // throws
+ case THROWS:
+ sb.append(", type_index = ");
+ sb.append(type_index);
+ break;
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ sb.append(", exception_index = ");
+ sb.append(exception_index);
+ break;
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ sb.append(", param_index = ");
+ sb.append(parameter_index);
+ break;
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
+ sb.append(", offset = ");
+ sb.append(offset);
+ sb.append(", type_index = ");
+ sb.append(type_index);
+ break;
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ // lambda formal parameter
+ case LAMBDA_FORMAL_PARAMETER:
+ // TODO: also needs an offset?
+ sb.append(", param_index = ");
+ sb.append(parameter_index);
+ break;
+ case UNKNOWN:
+ sb.append(", position UNKNOWN!");
+ break;
+ default:
+ throw new AssertionError("Unknown target type: " + type);
+ }
+
+ // Append location data for generics/arrays.
+ if (!location.isEmpty()) {
+ sb.append(", location = (");
+ sb.append(location);
+ sb.append(")");
+ }
+
+ sb.append(", pos = ");
+ sb.append(pos);
+
+ sb.append(']');
+ return sb.toString();
+ }
+
+ /**
+ * Indicates whether the target tree of the annotation has been optimized
+ * away from classfile or not.
+ * @return true if the target has not been optimized away
+ */
+ public boolean emitToClassfile() {
+ return !type.isLocal() || isValidOffset;
+ }
+
+ /**
+ * Decode the binary representation for a type path and set
+ * the {@code location} field.
+ *
+ * @param list The bytecode representation of the type path.
+ */
+ public static List<TypePathEntry> getTypePathFromBinary(List<Integer> list) {
+ List<TypePathEntry> loc = new ArrayList<TypePathEntry>(list.size() / TypePathEntry.bytesPerEntry);
+ int idx = 0;
+ while (idx < list.size()) {
+ if (idx + 1 == list.size()) {
+ throw new AssertionError("Could not decode type path: " + list);
+ }
+ loc.add(TypePathEntry.fromBinary(list.get(idx), list.get(idx + 1)));
+ idx += 2;
+ }
+ return loc;
+ }
+
+ public static List<Integer> getBinaryFromTypePath(List<TypePathEntry> locs) {
+ List<Integer> loc = new ArrayList<Integer>(locs.size() * TypePathEntry.bytesPerEntry);
+ for (TypePathEntry tpe : locs) {
+ loc.add(tpe.tag.tag);
+ loc.add(tpe.arg);
+ }
+ return loc;
+ }
+ }
+
+ // Code duplicated from com.sun.tools.javac.code.TargetType
+ // The IsLocal flag could be removed here.
+ public enum TargetType {
+ /** For annotations on a class type parameter declaration. */
+ CLASS_TYPE_PARAMETER(0x00),
+
+ /** For annotations on a method type parameter declaration. */
+ METHOD_TYPE_PARAMETER(0x01),
+
+ /** For annotations on the type of an "extends" or "implements" clause. */
+ CLASS_EXTENDS(0x10),
+
+ /** For annotations on a bound of a type parameter of a class. */
+ CLASS_TYPE_PARAMETER_BOUND(0x11),
+
+ /** For annotations on a bound of a type parameter of a method. */
+ METHOD_TYPE_PARAMETER_BOUND(0x12),
+
+ /** For annotations on a field. */
+ FIELD(0x13),
+
+ /** For annotations on a method return type. */
+ METHOD_RETURN(0x14),
+
+ /** For annotations on the method receiver. */
+ METHOD_RECEIVER(0x15),
+
+ /** For annotations on a method parameter. */
+ METHOD_FORMAL_PARAMETER(0x16),
+
+ /** For annotations on a throws clause in a method declaration. */
+ THROWS(0x17),
+
+ /** For annotations on a local variable. */
+ LOCAL_VARIABLE(0x40, true),
+
+ /** For annotations on a resource variable. */
+ RESOURCE_VARIABLE(0x41, true),
+
+ /** For annotations on an exception parameter. */
+ EXCEPTION_PARAMETER(0x42, true),
+
+ /** For annotations on a typecast. */
+ CAST(0x43, true),
+
+ /** For annotations on a type test. */
+ INSTANCEOF(0x44, true),
+
+ /** For annotations on an object creation expression. */
+ NEW(0x45, true),
+
+ /** For annotations on a type argument of an object creation expression. */
+ CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT(0x46, true),
+
+ /** For annotations on a type argument of a method call. */
+ METHOD_INVOCATION_TYPE_ARGUMENT(0x47, true),
+
+ /** For annotations on a lambda parameter type. */
+ LAMBDA_FORMAL_PARAMETER(0x48, true),
+
+ /** For annotations on a method reference. */
+ METHOD_REFERENCE(0x49, true),
+
+ /** For annotations on a type argument of a method reference. */
+ METHOD_REFERENCE_TYPE_ARGUMENT(0x50, true),
+
+ /** For annotations with an unknown target. */
+ UNKNOWN(0xFF);
+
+ private static final int MAXIMUM_TARGET_TYPE_VALUE = 0x50;
+
+ private final int targetTypeValue;
+ private final boolean isLocal;
+
+ private TargetType(int targetTypeValue) {
+ this(targetTypeValue, false);
+ }
+
+ private TargetType(int targetTypeValue, boolean isLocal) {
+ if (targetTypeValue < 0
+ || targetTypeValue > 255)
+ throw new AssertionError("Attribute type value needs to be an unsigned byte: " + String.format("0x%02X", targetTypeValue));
+ this.targetTypeValue = targetTypeValue;
+ this.isLocal = isLocal;
+ }
+
+ /**
+ * Returns whether or not this TargetType represents an annotation whose
+ * target is exclusively a tree in a method body
+ *
+ * Note: wildcard bound targets could target a local tree and a class
+ * member declaration signature tree
+ */
+ public boolean isLocal() {
+ return isLocal;
+ }
+
+ public int targetTypeValue() {
+ return this.targetTypeValue;
+ }
+
+ private static final TargetType[] targets;
+
+ static {
+ targets = new TargetType[MAXIMUM_TARGET_TYPE_VALUE + 1];
+ TargetType[] alltargets = values();
+ for (TargetType target : alltargets) {
+ if (target.targetTypeValue != UNKNOWN.targetTypeValue)
+ targets[target.targetTypeValue] = target;
+ }
+ for (int i = 0; i <= MAXIMUM_TARGET_TYPE_VALUE; ++i) {
+ if (targets[i] == null)
+ targets[i] = UNKNOWN;
+ }
+ }
+
+ public static boolean isValidTargetTypeValue(int tag) {
+ if (tag == UNKNOWN.targetTypeValue)
+ return true;
+ return (tag >= 0 && tag < targets.length);
+ }
+
+ public static TargetType fromTargetTypeValue(int tag) {
+ if (tag == UNKNOWN.targetTypeValue)
+ return UNKNOWN;
+
+ if (tag < 0 || tag >= targets.length)
+ throw new AssertionError("Unknown TargetType: " + tag);
+ return targets[tag];
+ }
+ }
+}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -139,6 +139,15 @@
}
}
+ protected void addReceiverAnnotations(ExecutableMemberDoc member,
+ Content tree) {
+ if (member.receiverAnnotations().length > 0) {
+ tree.addContent(writer.getSpace());
+ writer.addReceiverAnnotationInfo(member, tree);
+ }
+ }
+
+
/**
* Add all the parameters for the executable member.
*
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,10 @@
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
+import com.sun.tools.doclint.DocLint;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javadoc.RootDocImpl;
/**
* Configure the output based on the command line options.
@@ -172,6 +174,11 @@
public boolean createoverview = false;
/**
+ * Collected set of doclint options
+ */
+ public Set<String> doclintOpts = new LinkedHashSet<String>();
+
+ /**
* Unique Resource Handler for this package.
*/
public final MessageRetriever standardmessage;
@@ -255,6 +262,10 @@
nooverview = true;
} else if (opt.equals("-overview")) {
overview = true;
+ } else if (opt.equals("-xdoclint")) {
+ doclintOpts.add(null);
+ } else if (opt.startsWith("-xdoclint:")) {
+ doclintOpts.add(opt.substring(opt.indexOf(":") + 1));
}
}
if (root.specifiedClasses().length > 0) {
@@ -270,6 +281,10 @@
}
setCreateOverview();
setTopFile(root);
+
+ if (root instanceof RootDocImpl) {
+ ((RootDocImpl) root).initDocLint(doclintOpts);
+ }
}
/**
@@ -303,7 +318,9 @@
option.equals("-serialwarn") ||
option.equals("-use") ||
option.equals("-nonavbar") ||
- option.equals("-nooverview")) {
+ option.equals("-nooverview") ||
+ option.equals("-xdoclint") ||
+ option.startsWith("-xdoclint:")) {
return 1;
} else if (option.equals("-help")) {
System.out.println(getText("doclet.usage"));
@@ -410,6 +427,16 @@
return false;
}
noindex = true;
+ } else if (opt.startsWith("-xdoclint:")) {
+ if (opt.contains("/")) {
+ reporter.printError(getText("doclet.Option_doclint_no_qualifiers"));
+ return false;
+ }
+ if (!DocLint.isValidOption(
+ opt.replace("-xdoclint:", DocLint.XMSGS_CUSTOM_PREFIX))) {
+ reporter.printError(getText("doclet.Option_doclint_invalid_arg"));
+ return false;
+ }
}
}
return true;
@@ -506,8 +533,8 @@
*/
@Override
public Locale getLocale() {
- if (root instanceof com.sun.tools.javadoc.RootDocImpl)
- return ((com.sun.tools.javadoc.RootDocImpl)root).getLocale();
+ if (root instanceof RootDocImpl)
+ return ((RootDocImpl)root).getLocale();
else
return Locale.getDefault();
}
@@ -518,8 +545,8 @@
@Override
public JavaFileManager getFileManager() {
if (fileManager == null) {
- if (root instanceof com.sun.tools.javadoc.RootDocImpl)
- fileManager = ((com.sun.tools.javadoc.RootDocImpl)root).getFileManager();
+ if (root instanceof RootDocImpl)
+ fileManager = ((RootDocImpl) root).getFileManager();
else
fileManager = new JavacFileManager(new Context(), false, null);
}
@@ -527,4 +554,12 @@
}
private JavaFileManager fileManager;
+
+ @Override
+ public boolean showMessage(SourcePosition pos, String key) {
+ if (root instanceof RootDocImpl) {
+ return pos == null || ((RootDocImpl) root).showTagMessages();
+ }
+ return true;
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -137,6 +137,7 @@
addName(constructor.name(), pre);
}
addParameters(constructor, pre);
+ writer.addReceiverAnnotationInfo(constructor, pre);
addExceptions(constructor, pre);
return pre;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1730,6 +1730,17 @@
}
/**
+ * Add the annotation types of the executable receiver.
+ *
+ * @param method the executable to write the receiver annotations for.
+ * @param htmltree the documentation tree to which the annotation info will be
+ * added
+ */
+ public void addReceiverAnnotationInfo(ExecutableMemberDoc method, Content htmltree) {
+ addAnnotationInfo(method, method.receiverAnnotations(), htmltree);
+ }
+
+ /**
* Adds the annotatation types for the given doc.
*
* @param doc the package to write annotations for
@@ -1799,6 +1810,26 @@
* documented.
*/
private List<String> getAnnotations(int indent, AnnotationDesc[] descList, boolean linkBreak) {
+ return getAnnotations(indent, descList, linkBreak, true);
+ }
+
+ /**
+ * Return the string representations of the annotation types for
+ * the given doc.
+ *
+ * A {@code null} {@code elementType} indicates that all the
+ * annotations should be returned without any filtering.
+ *
+ * @param indent the number of extra spaces to indent the annotations.
+ * @param descList the array of {@link AnnotationDesc}.
+ * @param linkBreak if true, add new line between each member value.
+ * @param elementType the type of targeted element (used for filtering
+ * type annotations from declaration annotations)
+ * @return an array of strings representing the annotations being
+ * documented.
+ */
+ public List<String> getAnnotations(int indent, AnnotationDesc[] descList, boolean linkBreak,
+ boolean isJava5DeclarationLocation) {
List<String> results = new ArrayList<String>();
StringBuilder annotation;
for (int i = 0; i < descList.length; i++) {
@@ -1812,6 +1843,11 @@
(!isAnnotationDocumented && !isContainerDocumented)) {
continue;
}
+ /* TODO: check logic here to correctly handle declaration
+ * and type annotations.
+ if (Util.isDeclarationAnnotation(annotationDoc, isJava5DeclarationLocation)) {
+ continue;
+ }*/
annotation = new StringBuilder();
isAnnotationDocumented = false;
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package com.sun.tools.doclets.formats.html;
+import java.util.List;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
@@ -123,11 +125,50 @@
typeLinkInfo.excludeTypeBounds = linkInfo.excludeTypeBounds;
typeLinkInfo.excludeTypeParameterLinks = linkInfo.excludeTypeParameterLinks;
typeLinkInfo.linkToSelf = linkInfo.linkToSelf;
+ typeLinkInfo.isJava5DeclarationLocation = false;
LinkOutput output = getLinkOutput(typeLinkInfo);
((LinkInfoImpl) linkInfo).displayLength += typeLinkInfo.displayLength;
return output;
}
+ protected LinkOutput getTypeAnnotationLink(LinkInfo linkInfo,
+ AnnotationDesc annotation) {
+ throw new RuntimeException("Not implemented yet!");
+ }
+
+ public LinkOutput getTypeAnnotationLinks(LinkInfo linkInfo) {
+ LinkOutput output = getOutputInstance();
+ AnnotationDesc[] annotations;
+ if (linkInfo.type instanceof AnnotatedType) {
+ annotations = linkInfo.type.asAnnotatedType().annotations();
+ } else if (linkInfo.type instanceof TypeVariable) {
+ annotations = linkInfo.type.asTypeVariable().annotations();
+ } else {
+ return output;
+ }
+
+ if (annotations.length == 0)
+ return output;
+
+ List<String> annos = m_writer.getAnnotations(0, annotations, false, linkInfo.isJava5DeclarationLocation);
+
+ boolean isFirst = true;
+ for (String anno : annos) {
+ if (!isFirst) {
+ linkInfo.displayLength += 1;
+ output.append(" ");
+ isFirst = false;
+ }
+ output.append(anno);
+ }
+ if (!annos.isEmpty()) {
+ linkInfo.displayLength += 1;
+ output.append(" ");
+ }
+
+ return output;
+ }
+
/**
* Given a class, return the appropriate tool tip.
*
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -459,6 +459,8 @@
case CONTEXT_RETURN_TYPE:
case CONTEXT_SUMMARY_RETURN_TYPE:
+ excludeTypeBounds = true;
+ break;
case CONTEXT_EXECUTABLE_MEMBER_PARAM:
excludeTypeBounds = true;
break;
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -130,6 +130,7 @@
addName(method.name(), pre);
}
addParameters(method, pre);
+ addReceiverAnnotations(method, pre);
addExceptions(method, pre);
return pre;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -781,4 +781,6 @@
sourcetab = n;
tabSpaces = String.format("%" + n + "s", "");
}
+
+ public abstract boolean showMessage(SourcePosition pos, String key);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Thu Jan 31 10:22:25 2013 -0800
@@ -11,6 +11,8 @@
doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable
doclet.Option_conflict=Option {0} conflicts with {1}
doclet.Option_reuse=Option reused: {0}
+doclet.Option_doclint_no_qualifiers=Access qualifiers not permitted for -Xdoclint arguments
+doclet.Option_doclint_invalid_arg=Invalid argument for -Xdoclint option
doclet.exception_encountered= {0} encountered \n\
\twhile attempting to create file: {1}
doclet.perform_copy_exception_encountered= {0} encountered while \n\
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,9 +60,9 @@
private ResourceBundle messageRB;
/**
- * Initilize the ResourceBundle with the given resource.
+ * Initialize the ResourceBundle with the given resource.
*
- * @param rb the esource bundle to read.
+ * @param rb the resource bundle to read.
*/
public MessageRetriever(ResourceBundle rb) {
this.configuration = null;
@@ -71,7 +71,7 @@
}
/**
- * Initilize the ResourceBundle with the given resource.
+ * Initialize the ResourceBundle with the given resource.
*
* @param configuration the configuration
* @param resourcelocation Resource.
@@ -189,7 +189,8 @@
* @param args arguments to be replaced in the message.
*/
public void warning(SourcePosition pos, String key, Object... args) {
- printWarning(pos, getText(key, args));
+ if (configuration.showMessage(pos, key))
+ printWarning(pos, getText(key, args));
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,11 @@
package com.sun.tools.doclets.internal.toolkit.util;
import java.io.*;
+import java.lang.annotation.ElementType;
import java.util.*;
import com.sun.javadoc.*;
+import com.sun.javadoc.AnnotationDesc.ElementValuePair;
import com.sun.tools.doclets.internal.toolkit.*;
import javax.tools.StandardLocation;
@@ -304,9 +306,7 @@
//Try walking the tree.
addAllInterfaceTypes(results,
superType,
- superType instanceof ClassDoc ?
- ((ClassDoc) superType).interfaceTypes() :
- ((ParameterizedType) superType).interfaceTypes(),
+ interfaceTypesOf(superType),
false, configuration);
List<Type> resultsList = new ArrayList<Type>(results.values());
if (sort) {
@@ -315,6 +315,14 @@
return resultsList;
}
+ private static Type[] interfaceTypesOf(Type type) {
+ if (type instanceof AnnotatedType)
+ type = ((AnnotatedType)type).underlyingType();
+ return type instanceof ClassDoc ?
+ ((ClassDoc)type).interfaceTypes() :
+ ((ParameterizedType)type).interfaceTypes();
+ }
+
public static List<Type> getAllInterfaces(Type type, Configuration configuration) {
return getAllInterfaces(type, configuration, true);
}
@@ -325,9 +333,7 @@
if (superType == null)
return;
addAllInterfaceTypes(results, superType,
- superType instanceof ClassDoc ?
- ((ClassDoc) superType).interfaceTypes() :
- ((ParameterizedType) superType).interfaceTypes(),
+ interfaceTypesOf(superType),
raw, configuration);
}
@@ -337,9 +343,7 @@
if (superType == null)
return;
addAllInterfaceTypes(results, superType,
- superType instanceof ClassDoc ?
- ((ClassDoc) superType).interfaceTypes() :
- ((ParameterizedType) superType).interfaceTypes(),
+ interfaceTypesOf(superType),
false, configuration);
}
@@ -363,6 +367,9 @@
results.put(superInterface.asClassDoc(), superInterface);
}
}
+ if (type instanceof AnnotatedType)
+ type = ((AnnotatedType)type).underlyingType();
+
if (type instanceof ParameterizedType)
findAllInterfaceTypes(results, (ParameterizedType) type, configuration);
else if (((ClassDoc) type).typeParameters().length == 0)
@@ -494,6 +501,57 @@
return false;
}
+ private static boolean isDeclarationTarget(AnnotationDesc targetAnno) {
+ // The error recovery steps here are analogous to TypeAnnotations
+ ElementValuePair[] elems = targetAnno.elementValues();
+ if (elems == null
+ || elems.length != 1
+ || !"value".equals(elems[0].element().name())
+ || !(elems[0].value().value() instanceof AnnotationValue[]))
+ return true; // error recovery
+
+ AnnotationValue[] values = (AnnotationValue[])elems[0].value().value();
+ for (int i = 0; i < values.length; i++) {
+ Object value = values[i].value();
+ if (!(value instanceof FieldDoc))
+ return true; // error recovery
+
+ FieldDoc eValue = (FieldDoc)value;
+ if (Util.isJava5DeclarationElementType(eValue)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Returns true if the {@code annotationDoc} is to be treated
+ * as a declaration annotation, when targeting the
+ * {@code elemType} element type.
+ *
+ * @param annotationDoc the annotationDoc to check
+ * @param elemType the targeted elemType
+ * @return true if annotationDoc is a declaration annotation
+ */
+ public static boolean isDeclarationAnnotation(AnnotationTypeDoc annotationDoc,
+ boolean isJava5DeclarationLocation) {
+ if (!isJava5DeclarationLocation)
+ return false;
+ AnnotationDesc[] annotationDescList = annotationDoc.annotations();
+ // Annotations with no target are treated as declaration as well
+ if (annotationDescList.length==0)
+ return true;
+ for (int i = 0; i < annotationDescList.length; i++) {
+ if (annotationDescList[i].annotationType().qualifiedName().equals(
+ java.lang.annotation.Target.class.getName())) {
+ if (isDeclarationTarget(annotationDescList[i]))
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Return true if this class is linkable and false if we can't link to the
* desired class.
@@ -662,4 +720,25 @@
}
return false;
}
+
+ /**
+ * Test whether the given FieldDoc is one of the declaration annotation ElementTypes
+ * defined in Java 5.
+ * Instead of testing for one of the new enum constants added in Java 8, test for
+ * the old constants. This prevents bootstrapping problems.
+ *
+ * @param elt The FieldDoc to test
+ * @return true, iff the given ElementType is one of the constants defined in Java 5
+ * @since 1.8
+ */
+ public static boolean isJava5DeclarationElementType(FieldDoc elt) {
+ return elt.name().contentEquals(ElementType.ANNOTATION_TYPE.name()) ||
+ elt.name().contentEquals(ElementType.CONSTRUCTOR.name()) ||
+ elt.name().contentEquals(ElementType.FIELD.name()) ||
+ elt.name().contentEquals(ElementType.LOCAL_VARIABLE.name()) ||
+ elt.name().contentEquals(ElementType.METHOD.name()) ||
+ elt.name().contentEquals(ElementType.PACKAGE.name()) ||
+ elt.name().contentEquals(ElementType.PARAMETER.name()) ||
+ elt.name().contentEquals(ElementType.TYPE.name());
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,11 @@
//Just a primitive.
linkInfo.displayLength += type.typeName().length();
linkOutput.append(type.typeName());
+ } else if (type.asAnnotatedType() != null) {
+ linkOutput.append(getTypeAnnotationLinks(linkInfo));
+ linkInfo.type = type.asAnnotatedType().underlyingType();
+ linkOutput.append(getLinkOutput(linkInfo));
+ return linkOutput;
} else if (type.asWildcardType() != null) {
//Wildcard type.
linkInfo.isTypeBound = true;
@@ -82,6 +87,7 @@
linkOutput.append(getLinkOutput(linkInfo));
}
} else if (type.asTypeVariable()!= null) {
+ linkOutput.append(getTypeAnnotationLinks(linkInfo));
linkInfo.isTypeBound = true;
//A type variable.
Doc owner = type.asTypeVariable().owner();
@@ -175,6 +181,9 @@
protected abstract LinkOutput getTypeParameterLink(LinkInfo linkInfo,
Type typeParam);
+ protected abstract LinkOutput getTypeAnnotationLink(LinkInfo linkInfo,
+ AnnotationDesc annotation);
+
/**
* Return the links to the type parameters.
*
@@ -226,6 +235,24 @@
return output;
}
+ public LinkOutput getTypeAnnotationLinks(LinkInfo linkInfo) {
+ LinkOutput output = getOutputInstance();
+ if (linkInfo.type.asAnnotatedType() == null)
+ return output;
+ AnnotationDesc[] annotations = linkInfo.type.asAnnotatedType().annotations();
+ for (int i = 0; i < annotations.length; i++) {
+ if (i > 0) {
+ linkInfo.displayLength += 1;
+ output.append(" ");
+ }
+ output.append(getTypeAnnotationLink(linkInfo, annotations[i]));
+ }
+
+ linkInfo.displayLength += 1;
+ output.append(" ");
+ return output;
+ }
+
/**
* Return &lt;, which is used in type parameters. Override this
* if your doclet uses something different.
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,6 +69,12 @@
public boolean isTypeBound = false;
/**
+ * Whether the document element is in a Java 5 declaration
+ * location or not.
+ */
+ public boolean isJava5DeclarationLocation = true;
+
+ /**
* The label for the link.
*/
public String label;
--- a/langtools/src/share/classes/com/sun/tools/doclint/Checker.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclint/Checker.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
package com.sun.tools.doclint;
+import com.sun.source.doctree.LiteralTree;
import java.util.regex.Matcher;
import com.sun.source.doctree.LinkTree;
import java.net.URI;
@@ -91,10 +92,11 @@
boolean foundInheritDoc = false;
boolean foundReturn = false;
- enum Flag {
+ public enum Flag {
TABLE_HAS_CAPTION,
HAS_ELEMENT,
- HAS_TEXT
+ HAS_TEXT,
+ REPORTED_BAD_INLINE
}
static class TagStackItem {
@@ -194,7 +196,8 @@
@Override
public Void visitText(TextTree tree, Void ignore) {
- if (!tree.getBody().trim().isEmpty()) {
+ if (hasNonWhitespace(tree)) {
+ checkAllowsText(tree);
markEnclosingTag(Flag.HAS_TEXT);
}
return null;
@@ -202,6 +205,7 @@
@Override
public Void visitEntity(EntityTree tree, Void ignore) {
+ checkAllowsText(tree);
markEnclosingTag(Flag.HAS_TEXT);
String name = tree.getName().toString();
if (name.startsWith("#")) {
@@ -217,6 +221,18 @@
return null;
}
+ void checkAllowsText(DocTree tree) {
+ TagStackItem top = tagStack.peek();
+ if (top != null
+ && top.tree.getKind() == DocTree.Kind.START_ELEMENT
+ && !top.tag.acceptsText()) {
+ if (top.flags.add(Flag.REPORTED_BAD_INLINE)) {
+ env.messages.error(HTML, tree, "dc.text.not.allowed",
+ ((StartElementTree) top.tree).getName());
+ }
+ }
+ }
+
// </editor-fold>
// <editor-fold defaultstate="collapsed" desc="HTML elements">
@@ -229,53 +245,22 @@
if (t == null) {
env.messages.error(HTML, tree, "dc.tag.unknown", treeName);
} else {
+ for (TagStackItem tsi: tagStack) {
+ if (tsi.tag.accepts(t)) {
+ while (tagStack.peek() != tsi) tagStack.pop();
+ break;
+ } else if (tsi.tag.endKind != HtmlTag.EndKind.OPTIONAL)
+ break;
+ }
+
+ checkStructure(tree, t);
+
// tag specific checks
switch (t) {
// check for out of sequence headers, such as <h1>...</h1> <h3>...</h3>
case H1: case H2: case H3: case H4: case H5: case H6:
checkHeader(tree, t);
break;
- // <p> inside <pre>
- case P:
- TagStackItem top = tagStack.peek();
- if (top != null && top.tag == HtmlTag.PRE)
- env.messages.warning(HTML, tree, "dc.tag.p.in.pre");
- break;
- }
-
- // check that only block tags and inline tags are used,
- // and that blocks tags are not used within inline tags
- switch (t.blockType) {
- case INLINE:
- break;
- case BLOCK:
- TagStackItem top = tagStack.peek();
- if (top != null && top.tag != null && top.tag.blockType == HtmlTag.BlockType.INLINE) {
- switch (top.tree.getKind()) {
- case START_ELEMENT: {
- Name name = ((StartElementTree) top.tree).getName();
- env.messages.error(HTML, tree, "dc.tag.not.allowed.inline.element",
- treeName, name);
- break;
- }
- case LINK:
- case LINK_PLAIN: {
- String name = top.tree.getKind().tagName;
- env.messages.error(HTML, tree, "dc.tag.not.allowed.inline.tag",
- treeName, name);
- break;
- }
- default:
- env.messages.error(HTML, tree, "dc.tag.not.allowed.inline.other",
- treeName);
- }
- }
- break;
- case OTHER:
- env.messages.error(HTML, tree, "dc.tag.not.allowed", treeName);
- break;
- default:
- throw new AssertionError();
}
if (t.flags.contains(HtmlTag.Flag.NO_NEST)) {
@@ -323,6 +308,58 @@
}
}
+ private void checkStructure(StartElementTree tree, HtmlTag t) {
+ Name treeName = tree.getName();
+ TagStackItem top = tagStack.peek();
+ switch (t.blockType) {
+ case BLOCK:
+ if (top == null || top.tag.accepts(t))
+ return;
+
+ switch (top.tree.getKind()) {
+ case START_ELEMENT: {
+ if (top.tag.blockType == HtmlTag.BlockType.INLINE) {
+ Name name = ((StartElementTree) top.tree).getName();
+ env.messages.error(HTML, tree, "dc.tag.not.allowed.inline.element",
+ treeName, name);
+ return;
+ }
+ }
+ break;
+
+ case LINK:
+ case LINK_PLAIN: {
+ String name = top.tree.getKind().tagName;
+ env.messages.error(HTML, tree, "dc.tag.not.allowed.inline.tag",
+ treeName, name);
+ return;
+ }
+ }
+ break;
+
+ case INLINE:
+ if (top == null || top.tag.accepts(t))
+ return;
+ break;
+
+ case LIST_ITEM:
+ case TABLE_ITEM:
+ if (top != null) {
+ // reset this flag so subsequent bad inline content gets reported
+ top.flags.remove(Flag.REPORTED_BAD_INLINE);
+ if (top.tag.accepts(t))
+ return;
+ }
+ break;
+
+ case OTHER:
+ env.messages.error(HTML, tree, "dc.tag.not.allowed", treeName);
+ return;
+ }
+
+ env.messages.error(HTML, tree, "dc.tag.not.allowed.here", treeName);
+ }
+
private void checkHeader(StartElementTree tree, HtmlTag tag) {
// verify the new tag
if (getHeaderLevel(tag) > getHeaderLevel(currHeaderTag) + 1) {
@@ -359,9 +396,8 @@
env.messages.error(HTML, tree, "dc.tag.unknown", treeName);
} else if (t.endKind == HtmlTag.EndKind.NONE) {
env.messages.error(HTML, tree, "dc.tag.end.not.permitted", treeName);
- } else if (tagStack.isEmpty()) {
- env.messages.error(HTML, tree, "dc.tag.end.unexpected", treeName);
} else {
+ boolean done = false;
while (!tagStack.isEmpty()) {
TagStackItem top = tagStack.peek();
if (t == top.tag) {
@@ -378,11 +414,8 @@
&& !top.flags.contains(Flag.HAS_ELEMENT)) {
env.messages.warning(HTML, tree, "dc.tag.empty", treeName);
}
- if (t.flags.contains(HtmlTag.Flag.NO_TEXT)
- && top.flags.contains(Flag.HAS_TEXT)) {
- env.messages.error(HTML, tree, "dc.text.not.allowed", treeName);
- }
tagStack.pop();
+ done = true;
break;
} else if (top.tag == null || top.tag.endKind != HtmlTag.EndKind.REQUIRED) {
tagStack.pop();
@@ -400,10 +433,15 @@
tagStack.pop();
} else {
env.messages.error(HTML, tree, "dc.tag.end.unexpected", treeName);
+ done = true;
break;
}
}
}
+
+ if (!done && tagStack.isEmpty()) {
+ env.messages.error(HTML, tree, "dc.tag.end.unexpected", treeName);
+ }
}
return super.visitEndElement(tree, ignore);
@@ -447,14 +485,18 @@
if (currTag != HtmlTag.A) {
break;
}
- // fallthrough
+ // fallthrough
case ID:
String value = getAttrValue(tree);
- if (!validName.matcher(value).matches()) {
- env.messages.error(HTML, tree, "dc.invalid.anchor", value);
- }
- if (!foundAnchors.add(value)) {
- env.messages.error(HTML, tree, "dc.anchor.already.defined", value);
+ if (value == null) {
+ env.messages.error(HTML, tree, "dc.anchor.value.missing");
+ } else {
+ if (!validName.matcher(value).matches()) {
+ env.messages.error(HTML, tree, "dc.invalid.anchor", value);
+ }
+ if (!foundAnchors.add(value)) {
+ env.messages.error(HTML, tree, "dc.anchor.already.defined", value);
+ }
}
break;
@@ -542,6 +584,19 @@
}
@Override
+ public Void visitLiteral(LiteralTree tree, Void ignore) {
+ if (tree.getKind() == DocTree.Kind.CODE) {
+ for (TagStackItem tsi: tagStack) {
+ if (tsi.tag == HtmlTag.CODE) {
+ env.messages.warning(HTML, tree, "dc.tag.code.within.code");
+ break;
+ }
+ }
+ }
+ return super.visitLiteral(tree, ignore);
+ }
+
+ @Override
public Void visitParam(ParamTree tree, Void ignore) {
boolean typaram = tree.isTypeParameter();
IdentifierTree nameTree = tree.getName();
@@ -740,7 +795,7 @@
for (DocTree d: list) {
switch (d.getKind()) {
case TEXT:
- if (!((TextTree) d).getBody().trim().isEmpty())
+ if (hasNonWhitespace((TextTree) d))
return;
break;
default:
@@ -749,6 +804,16 @@
}
env.messages.warning(SYNTAX, tree, "dc.empty", tree.getKind().tagName);
}
+
+ boolean hasNonWhitespace(TextTree tree) {
+ String s = tree.getBody();
+ for (int i = 0; i < s.length(); i++) {
+ if (!Character.isWhitespace(s.charAt(i)))
+ return true;
+ }
+ return false;
+ }
+
// </editor-fold>
}
--- a/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -122,7 +122,7 @@
if (javacFiles.isEmpty()) {
if (!needHelp)
- System.out.println("no files given");
+ out.println("no files given");
}
JavacTool tool = JavacTool.create();
@@ -179,11 +179,11 @@
}
} else if (arg.equals(STATS)) {
env.messages.setStatsEnabled(true);
- } else if (arg.matches("-bootclasspath") && i + 1 < args.length) {
+ } else if (arg.equals("-bootclasspath") && i + 1 < args.length) {
javacBootClassPath = splitPath(args[++i]);
- } else if (arg.matches("-classpath") && i + 1 < args.length) {
+ } else if (arg.equals("-classpath") && i + 1 < args.length) {
javacClassPath = splitPath(args[++i]);
- } else if (arg.matches("-sourcepath") && i + 1 < args.length) {
+ } else if (arg.equals("-sourcepath") && i + 1 < args.length) {
javacSourcePath = splitPath(args[++i]);
} else if (arg.equals(XMSGS_OPTION)) {
env.messages.setOptions(null);
@@ -234,6 +234,8 @@
out.println(" equivalent to -Xmsgs:all/protected, meaning that");
out.println(" all messages are reported for protected and public");
out.println(" declarations only. ");
+ out.println(" -stats");
+ out.println(" Report statistics on the reported issues.");
out.println(" -h -help --help -usage -?");
out.println(" Show this message.");
out.println("");
@@ -247,7 +249,7 @@
List<File> splitPath(String path) {
List<File> files = new ArrayList<File>();
- for (String f: path.split(File.separator)) {
+ for (String f: path.split(File.pathSeparator)) {
if (f.length() > 0)
files.add(new File(f));
}
--- a/langtools/src/share/classes/com/sun/tools/doclint/Entity.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclint/Entity.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
* risk. This code and its internal interfaces are subject to change
* or deletion without notice.</b></p>
*/
-enum Entity {
+public enum Entity {
nbsp(160),
iexcl(161),
cent(162),
--- a/langtools/src/share/classes/com/sun/tools/doclint/HtmlTag.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclint/HtmlTag.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -57,16 +57,22 @@
B(BlockType.INLINE, EndKind.REQUIRED,
EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
- BLOCKQUOTE,
+ BIG(BlockType.INLINE, EndKind.REQUIRED,
+ EnumSet.of(Flag.EXPECT_CONTENT)),
+
+ BLOCKQUOTE(BlockType.BLOCK, EndKind.REQUIRED,
+ EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
BODY(BlockType.OTHER, EndKind.REQUIRED),
BR(BlockType.INLINE, EndKind.NONE,
attrs(AttrKind.USE_CSS, CLEAR)),
- CAPTION(EnumSet.of(Flag.EXPECT_CONTENT)),
+ CAPTION(BlockType.TABLE_ITEM, EndKind.REQUIRED,
+ EnumSet.of(Flag.ACCEPTS_INLINE, Flag.EXPECT_CONTENT)),
- CENTER,
+ CENTER(BlockType.BLOCK, EndKind.REQUIRED,
+ EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
CITE(BlockType.INLINE, EndKind.REQUIRED,
EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
@@ -74,17 +80,23 @@
CODE(BlockType.INLINE, EndKind.REQUIRED,
EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
- DD(BlockType.BLOCK, EndKind.OPTIONAL,
- EnumSet.of(Flag.EXPECT_CONTENT)),
+ DD(BlockType.LIST_ITEM, EndKind.OPTIONAL,
+ EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE, Flag.EXPECT_CONTENT)),
- DIV,
+ DIV(BlockType.BLOCK, EndKind.REQUIRED,
+ EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
DL(BlockType.BLOCK, EndKind.REQUIRED,
- EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_TEXT),
- attrs(AttrKind.USE_CSS, COMPACT)),
+ EnumSet.of(Flag.EXPECT_CONTENT),
+ attrs(AttrKind.USE_CSS, COMPACT)) {
+ @Override
+ public boolean accepts(HtmlTag t) {
+ return (t == DT) || (t == DD);
+ }
+ },
- DT(BlockType.BLOCK, EndKind.OPTIONAL,
- EnumSet.of(Flag.EXPECT_CONTENT)),
+ DT(BlockType.LIST_ITEM, EndKind.OPTIONAL,
+ EnumSet.of(Flag.ACCEPTS_INLINE, Flag.EXPECT_CONTENT)),
EM(BlockType.INLINE, EndKind.REQUIRED,
EnumSet.of(Flag.NO_NEST)),
@@ -97,12 +109,12 @@
FRAMESET(BlockType.OTHER, EndKind.REQUIRED),
- H1,
- H2,
- H3,
- H4,
- H5,
- H6,
+ H1(BlockType.BLOCK, EndKind.REQUIRED),
+ H2(BlockType.BLOCK, EndKind.REQUIRED),
+ H3(BlockType.BLOCK, EndKind.REQUIRED),
+ H4(BlockType.BLOCK, EndKind.REQUIRED),
+ H5(BlockType.BLOCK, EndKind.REQUIRED),
+ H6(BlockType.BLOCK, EndKind.REQUIRED),
HEAD(BlockType.OTHER, EndKind.REQUIRED),
@@ -118,31 +130,54 @@
attrs(AttrKind.OBSOLETE, NAME),
attrs(AttrKind.USE_CSS, ALIGN, HSPACE, VSPACE, BORDER)),
- LI(BlockType.BLOCK, EndKind.OPTIONAL),
+ LI(BlockType.LIST_ITEM, EndKind.OPTIONAL,
+ EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
LINK(BlockType.OTHER, EndKind.NONE),
- MENU,
+ MENU(BlockType.BLOCK, EndKind.REQUIRED) {
+ @Override
+ public boolean accepts(HtmlTag t) {
+ return (t == LI);
+ }
+ },
META(BlockType.OTHER, EndKind.NONE),
NOFRAMES(BlockType.OTHER, EndKind.REQUIRED),
- NOSCRIPT(BlockType.OTHER, EndKind.REQUIRED),
+ NOSCRIPT(BlockType.BLOCK, EndKind.REQUIRED),
OL(BlockType.BLOCK, EndKind.REQUIRED,
- EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_TEXT),
- attrs(AttrKind.USE_CSS, START, TYPE)),
+ EnumSet.of(Flag.EXPECT_CONTENT),
+ attrs(AttrKind.USE_CSS, START, TYPE)){
+ @Override
+ public boolean accepts(HtmlTag t) {
+ return (t == LI);
+ }
+ },
P(BlockType.BLOCK, EndKind.OPTIONAL,
EnumSet.of(Flag.EXPECT_CONTENT),
attrs(AttrKind.USE_CSS, ALIGN)),
- PRE(EnumSet.of(Flag.EXPECT_CONTENT)),
+ PRE(BlockType.BLOCK, EndKind.REQUIRED,
+ EnumSet.of(Flag.EXPECT_CONTENT)) {
+ @Override
+ public boolean accepts(HtmlTag t) {
+ switch (t) {
+ case IMG: case BIG: case SMALL: case SUB: case SUP:
+ return false;
+ default:
+ return (t.blockType == BlockType.INLINE);
+ }
+ }
+ },
SCRIPT(BlockType.OTHER, EndKind.REQUIRED),
- SMALL(BlockType.INLINE, EndKind.REQUIRED),
+ SMALL(BlockType.INLINE, EndKind.REQUIRED,
+ EnumSet.of(Flag.EXPECT_CONTENT)),
SPAN(BlockType.INLINE, EndKind.REQUIRED,
EnumSet.of(Flag.EXPECT_CONTENT)),
@@ -157,37 +192,70 @@
EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
TABLE(BlockType.BLOCK, EndKind.REQUIRED,
- EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_TEXT),
+ EnumSet.of(Flag.EXPECT_CONTENT),
attrs(AttrKind.OK, SUMMARY, Attr.FRAME, RULES, BORDER,
CELLPADDING, CELLSPACING),
- attrs(AttrKind.USE_CSS, ALIGN, WIDTH, BGCOLOR)),
+ attrs(AttrKind.USE_CSS, ALIGN, WIDTH, BGCOLOR)) {
+ @Override
+ public boolean accepts(HtmlTag t) {
+ switch (t) {
+ case CAPTION:
+ case THEAD: case TBODY: case TFOOT:
+ case TR: // HTML 3.2
+ return true;
+ default:
+ return false;
+ }
+ }
+ },
- TBODY(BlockType.BLOCK, EndKind.REQUIRED,
- EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_TEXT),
- attrs(AttrKind.OK, ALIGN, CHAR, CHAROFF, VALIGN)),
+ TBODY(BlockType.TABLE_ITEM, EndKind.REQUIRED,
+ EnumSet.of(Flag.EXPECT_CONTENT),
+ attrs(AttrKind.OK, ALIGN, CHAR, CHAROFF, VALIGN)) {
+ @Override
+ public boolean accepts(HtmlTag t) {
+ return (t == TR);
+ }
+ },
- TD(BlockType.BLOCK, EndKind.OPTIONAL,
+ TD(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
+ EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
attrs(AttrKind.OK, COLSPAN, ROWSPAN, HEADERS, SCOPE, ABBR, AXIS,
ALIGN, CHAR, CHAROFF, VALIGN),
attrs(AttrKind.USE_CSS, WIDTH, BGCOLOR, HEIGHT, NOWRAP)),
- TFOOT(BlockType.BLOCK, EndKind.REQUIRED,
- attrs(AttrKind.OK, ALIGN, CHAR, CHAROFF, VALIGN)),
+ TFOOT(BlockType.TABLE_ITEM, EndKind.REQUIRED,
+ attrs(AttrKind.OK, ALIGN, CHAR, CHAROFF, VALIGN)) {
+ @Override
+ public boolean accepts(HtmlTag t) {
+ return (t == TR);
+ }
+ },
- TH(BlockType.BLOCK, EndKind.OPTIONAL,
+ TH(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
+ EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
attrs(AttrKind.OK, COLSPAN, ROWSPAN, HEADERS, SCOPE, ABBR, AXIS,
ALIGN, CHAR, CHAROFF, VALIGN),
attrs(AttrKind.USE_CSS, WIDTH, BGCOLOR, HEIGHT, NOWRAP)),
- THEAD(BlockType.BLOCK, EndKind.REQUIRED,
- attrs(AttrKind.OK, ALIGN, CHAR, CHAROFF, VALIGN)),
+ THEAD(BlockType.TABLE_ITEM, EndKind.REQUIRED,
+ attrs(AttrKind.OK, ALIGN, CHAR, CHAROFF, VALIGN)) {
+ @Override
+ public boolean accepts(HtmlTag t) {
+ return (t == TR);
+ }
+ },
TITLE(BlockType.OTHER, EndKind.REQUIRED),
- TR(BlockType.BLOCK, EndKind.OPTIONAL,
- EnumSet.of(Flag.NO_TEXT),
+ TR(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
attrs(AttrKind.OK, ALIGN, CHAR, CHAROFF, VALIGN),
- attrs(AttrKind.USE_CSS, BGCOLOR)),
+ attrs(AttrKind.USE_CSS, BGCOLOR)) {
+ @Override
+ public boolean accepts(HtmlTag t) {
+ return (t == TH) || (t == TD);
+ }
+ },
TT(BlockType.INLINE, EndKind.REQUIRED,
EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
@@ -196,8 +264,13 @@
EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
UL(BlockType.BLOCK, EndKind.REQUIRED,
- EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_TEXT),
- attrs(AttrKind.USE_CSS, COMPACT, TYPE)),
+ EnumSet.of(Flag.EXPECT_CONTENT),
+ attrs(AttrKind.USE_CSS, COMPACT, TYPE)){
+ @Override
+ public boolean accepts(HtmlTag t) {
+ return (t == LI);
+ }
+ },
VAR(BlockType.INLINE, EndKind.REQUIRED);
@@ -207,6 +280,8 @@
public static enum BlockType {
BLOCK,
INLINE,
+ LIST_ITEM,
+ TABLE_ITEM,
OTHER;
}
@@ -220,9 +295,10 @@
}
public static enum Flag {
+ ACCEPTS_BLOCK,
+ ACCEPTS_INLINE,
EXPECT_CONTENT,
- NO_NEST,
- NO_TEXT
+ NO_NEST
}
public static enum Attr {
@@ -273,7 +349,7 @@
static final Map<String,Attr> index = new HashMap<String,Attr>();
static {
for (Attr t: values()) {
- index.put(t.name().toLowerCase(), t);
+ index.put(t.getText(), t);
}
}
}
@@ -300,22 +376,14 @@
public final Set<Flag> flags;
private final Map<Attr,AttrKind> attrs;
-
- HtmlTag() {
- this(BlockType.BLOCK, EndKind.REQUIRED);
- }
-
- HtmlTag(Set<Flag> flags) {
- this(BlockType.BLOCK, EndKind.REQUIRED, flags);
- }
-
HtmlTag(BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
this(blockType, endKind, Collections.<Flag>emptySet(), attrMaps);
}
HtmlTag(BlockType blockType, EndKind endKind, Set<Flag> flags, AttrMap... attrMaps) {
this.blockType = blockType;
- this.endKind = endKind;this.flags = flags;
+ this.endKind = endKind;
+ this.flags = flags;
this.attrs = new EnumMap<Attr,AttrKind>(Attr.class);
for (Map<Attr,AttrKind> m: attrMaps)
this.attrs.putAll(m);
@@ -324,6 +392,35 @@
attrs.put(Attr.STYLE, AttrKind.OK);
}
+ public boolean accepts(HtmlTag t) {
+ if (flags.contains(Flag.ACCEPTS_BLOCK) && flags.contains(Flag.ACCEPTS_INLINE)) {
+ return (t.blockType == BlockType.BLOCK) || (t.blockType == BlockType.INLINE);
+ } else if (flags.contains(Flag.ACCEPTS_BLOCK)) {
+ return (t.blockType == BlockType.BLOCK);
+ } else if (flags.contains(Flag.ACCEPTS_INLINE)) {
+ return (t.blockType == BlockType.INLINE);
+ } else
+ switch (blockType) {
+ case BLOCK:
+ case INLINE:
+ return (t.blockType == BlockType.INLINE);
+ case OTHER:
+ // OTHER tags are invalid in doc comments, and will be
+ // reported separately, so silently accept/ignore any content
+ return true;
+ default:
+ // any combination which could otherwise arrive here
+ // ought to have been handled in an overriding method
+ throw new AssertionError(this + ":" + t);
+ }
+ }
+
+ public boolean acceptsText() {
+ // generally, anywhere we can put text we can also put inline tag
+ // so check if a typical inline tag is allowed
+ return accepts(B);
+ }
+
public String getText() {
return name().toLowerCase();
}
@@ -346,7 +443,7 @@
private static final Map<String,HtmlTag> index = new HashMap<String,HtmlTag>();
static {
for (HtmlTag t: values()) {
- index.put(t.name().toLowerCase(), t);
+ index.put(t.getText(), t);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint.properties Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint.properties Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
#
dc.anchor.already.defined = anchor already defined: {0}
+dc.anchor.value.missing = no value given for anchor
dc.attr.lacks.value = attribute lacks value
dc.attr.obsolete = attribute obsolete: {0}
dc.attr.obsolete.use.css = attribute obsolete, use CSS instead: {0}
@@ -47,12 +48,14 @@
dc.no.summary.or.caption.for.table=no summary or caption for table
dc.param.name.not.found = @param name not found
dc.ref.not.found = reference not found
+dc.tag.code.within.code = '{@code'} within <code>
dc.tag.empty = empty <{0}> tag
dc.tag.end.not.permitted = invalid end tag: </{0}>
dc.tag.end.unexpected = unexpected end tag: </{0}>
dc.tag.header.sequence.1 = header used out of sequence: <{0}>
dc.tag.header.sequence.2 = header used out of sequence: <{0}>
dc.tag.nested.not.allowed=nested tag not allowed: <{0}>
+dc.tag.not.allowed.here = tag not allowed here: <{0}>
dc.tag.not.allowed = element not allowed in documentation comments: <{0}>
dc.tag.not.allowed.inline.element = block element not allowed within inline element <{1}>: {0}
dc.tag.not.allowed.inline.tag = block element not allowed within @{1}: {0}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
*
* An instance of this class can be in one of three states:
*
- * NOT_STARTED indicates that the Symbol this instance belongs to have not been
+ * NOT_STARTED indicates that the Symbol this instance belongs to has not been
* annotated (yet). Specifically if the declaration is not annotated this
* instance will never move past NOT_STARTED. You can never go back to
* NOT_STARTED.
@@ -59,7 +59,7 @@
*
* "unnamed" this Annotations contains some attributes, possibly the final set.
* While in this state you can only prepend or append to the attributes not set
- * it directly. You can also move back to the IN_PROGRESS sate using reset().
+ * it directly. You can also move back to the IN_PROGRESS state using reset().
*
* <p><b>This is NOT part of any supported API. If you write code that depends
* on this, you do so at your own risk. This code and its internal interfaces
@@ -67,14 +67,21 @@
*/
public class Annotations {
- private static final List<Attribute.Compound> NOT_STARTED = List.of(null);
- private static final List<Attribute.Compound> IN_PROGRESS = List.of(null);
+ private static final List<Attribute.Compound> DECL_NOT_STARTED = List.of(null);
+ private static final List<Attribute.Compound> DECL_IN_PROGRESS = List.of(null);
+
/*
* This field should never be null
*/
- private List<Attribute.Compound> attributes = NOT_STARTED;
+ private List<Attribute.Compound> attributes = DECL_NOT_STARTED;
+
/*
- * The Symbol this Annotations belong to
+ * This field should never be null
+ */
+ private List<Attribute.TypeCompound> type_attributes = List.<Attribute.TypeCompound>nil();
+
+ /*
+ * The Symbol this Annotations instance belongs to
*/
private final Symbol sym;
@@ -82,11 +89,15 @@
this.sym = sym;
}
- public List<Attribute.Compound> getAttributes() {
- return filterSentinels(attributes);
+ public List<Attribute.Compound> getDeclarationAttributes() {
+ return filterDeclSentinels(attributes);
}
- public void setAttributes(List<Attribute.Compound> a) {
+ public List<Attribute.TypeCompound> getTypeAttributes() {
+ return type_attributes;
+ }
+
+ public void setDeclarationAttributes(List<Attribute.Compound> a) {
Assert.check(pendingCompletion() || !isStarted());
if (a == null) {
throw new NullPointerException();
@@ -94,31 +105,51 @@
attributes = a;
}
+ public void setTypeAttributes(List<Attribute.TypeCompound> a) {
+ if (a == null) {
+ throw new NullPointerException();
+ }
+ type_attributes = a;
+ }
+
public void setAttributes(Annotations other) {
if (other == null) {
throw new NullPointerException();
}
- setAttributes(other.getAttributes());
+ setDeclarationAttributes(other.getDeclarationAttributes());
+ setTypeAttributes(other.getTypeAttributes());
+ }
+
+ public void setDeclarationAttributesWithCompletion(final Annotate.AnnotateRepeatedContext<Attribute.Compound> ctx) {
+ Assert.check(pendingCompletion() || (!isStarted() && sym.kind == PCK));
+ this.setDeclarationAttributes(getAttributesForCompletion(ctx));
}
- public void setAttributesWithCompletion(final Annotate.AnnotateRepeatedContext ctx) {
- Assert.check(pendingCompletion() || (!isStarted() && sym.kind == PCK));
+ public void appendTypeAttributesWithCompletion(final Annotate.AnnotateRepeatedContext<Attribute.TypeCompound> ctx) {
+ this.appendUniqueTypes(getAttributesForCompletion(ctx));
+ }
- Map<Symbol.TypeSymbol, ListBuffer<Attribute.Compound>> annotated = ctx.annotated;
+ private <T extends Attribute.Compound> List<T> getAttributesForCompletion(
+ final Annotate.AnnotateRepeatedContext<T> ctx) {
+
+ Map<Symbol.TypeSymbol, ListBuffer<T>> annotated = ctx.annotated;
boolean atLeastOneRepeated = false;
- List<Attribute.Compound> buf = List.<Attribute.Compound>nil();
- for (ListBuffer<Attribute.Compound> lb : annotated.values()) {
+ List<T> buf = List.<T>nil();
+ for (ListBuffer<T> lb : annotated.values()) {
if (lb.size() == 1) {
buf = buf.prepend(lb.first());
} else { // repeated
- buf = buf.prepend(new Placeholder(lb.toList(), sym));
+ // This will break when other subtypes of Attributs.Compound
+ // are introduced, because PlaceHolder is a subtype of TypeCompound.
+ T res;
+ @SuppressWarnings("unchecked")
+ T ph = (T) new Placeholder<T>(ctx, lb.toList(), sym);
+ res = ph;
+ buf = buf.prepend(res);
atLeastOneRepeated = true;
}
}
- // Add non-repeating attributes
- setAttributes(buf.reverse());
-
if (atLeastOneRepeated) {
// The Symbol s is now annotated with a combination of
// finished non-repeating annotations and placeholders for
@@ -126,19 +157,18 @@
//
// We need to do this in two passes because when creating
// a container for a repeating annotation we must
- // guarantee that the @ContainedBy on the
+ // guarantee that the @Repeatable on the
// contained annotation is fully annotated
//
// The way we force this order is to do all repeating
// annotations in a pass after all non-repeating are
- // finished. This will work because @ContainedBy
+ // finished. This will work because @Repeatable
// is non-repeating and therefore will be annotated in the
// fist pass.
// Queue a pass that will replace Attribute.Placeholders
// with Attribute.Compound (made from synthesized containers).
ctx.annotateRepeated(new Annotate.Annotator() {
-
@Override
public String toString() {
return "repeated annotation pass of: " + sym + " in: " + sym.owner;
@@ -150,10 +180,12 @@
}
});
}
+ // Add non-repeating attributes
+ return buf.reverse();
}
public Annotations reset() {
- attributes = IN_PROGRESS;
+ attributes = DECL_IN_PROGRESS;
return this;
}
@@ -163,12 +195,16 @@
|| attributes.isEmpty();
}
+ public boolean isTypesEmpty() {
+ return type_attributes.isEmpty();
+ }
+
public boolean pendingCompletion() {
- return attributes == IN_PROGRESS;
+ return attributes == DECL_IN_PROGRESS;
}
public Annotations append(List<Attribute.Compound> l) {
- attributes = filterSentinels(attributes);
+ attributes = filterDeclSentinels(attributes);
if (l.isEmpty()) {
; // no-op
@@ -180,8 +216,24 @@
return this;
}
+ public Annotations appendUniqueTypes(List<Attribute.TypeCompound> l) {
+ if (l.isEmpty()) {
+ ; // no-op
+ } else if (type_attributes.isEmpty()) {
+ type_attributes = l;
+ } else {
+ // TODO: in case we expect a large number of annotations, this
+ // might be inefficient.
+ for (Attribute.TypeCompound tc : l) {
+ if (!type_attributes.contains(tc))
+ type_attributes = type_attributes.append(tc);
+ }
+ }
+ return this;
+ }
+
public Annotations prepend(List<Attribute.Compound> l) {
- attributes = filterSentinels(attributes);
+ attributes = filterDeclSentinels(attributes);
if (l.isEmpty()) {
; // no-op
@@ -193,19 +245,29 @@
return this;
}
- private List<Attribute.Compound> filterSentinels(List<Attribute.Compound> a) {
- return (a == IN_PROGRESS || a == NOT_STARTED)
+ private List<Attribute.Compound> filterDeclSentinels(List<Attribute.Compound> a) {
+ return (a == DECL_IN_PROGRESS || a == DECL_NOT_STARTED)
? List.<Attribute.Compound>nil()
: a;
}
private boolean isStarted() {
- return attributes != NOT_STARTED;
+ return attributes != DECL_NOT_STARTED;
}
private List<Attribute.Compound> getPlaceholders() {
List<Attribute.Compound> res = List.<Attribute.Compound>nil();
- for (Attribute.Compound a : filterSentinels(attributes)) {
+ for (Attribute.Compound a : filterDeclSentinels(attributes)) {
+ if (a instanceof Placeholder) {
+ res = res.prepend(a);
+ }
+ }
+ return res.reverse();
+ }
+
+ private List<Attribute.TypeCompound> getTypePlaceholders() {
+ List<Attribute.TypeCompound> res = List.<Attribute.TypeCompound>nil();
+ for (Attribute.TypeCompound a : type_attributes) {
if (a instanceof Placeholder) {
res = res.prepend(a);
}
@@ -216,68 +278,100 @@
/*
* Replace Placeholders for repeating annotations with their containers
*/
- private void complete(Annotate.AnnotateRepeatedContext ctx) {
- Assert.check(!pendingCompletion());
+ private <T extends Attribute.Compound> void complete(Annotate.AnnotateRepeatedContext<T> ctx) {
Log log = ctx.log;
Env<AttrContext> env = ctx.env;
JavaFileObject oldSource = log.useSource(env.toplevel.sourcefile);
try {
+ // TODO: can we reduce duplication in the following branches?
+ if (ctx.isTypeCompound) {
+ Assert.check(!isTypesEmpty());
- if (isEmpty()) {
- return;
- }
+ if (isTypesEmpty()) {
+ return;
+ }
- List<Attribute.Compound> result = List.nil();
- for (Attribute.Compound a : getAttributes()) {
- if (a instanceof Placeholder) {
- Attribute.Compound replacement = replaceOne((Placeholder) a, ctx);
+ List<Attribute.TypeCompound> result = List.nil();
+ for (Attribute.TypeCompound a : getTypeAttributes()) {
+ if (a instanceof Placeholder) {
+ @SuppressWarnings("unchecked")
+ Placeholder<Attribute.TypeCompound> ph = (Placeholder<Attribute.TypeCompound>) a;
+ Attribute.TypeCompound replacement = replaceOne(ph, ph.getRepeatedContext());
+
+ if (null != replacement) {
+ result = result.prepend(replacement);
+ }
+ } else {
+ result = result.prepend(a);
+ }
+ }
+
+ type_attributes = result.reverse();
- if (null != replacement) {
- result = result.prepend(replacement);
- }
- } else {
- result = result.prepend(a);
+ Assert.check(Annotations.this.getTypePlaceholders().isEmpty());
+ } else {
+ Assert.check(!pendingCompletion());
+
+ if (isEmpty()) {
+ return;
}
- }
+
+ List<Attribute.Compound> result = List.nil();
+ for (Attribute.Compound a : getDeclarationAttributes()) {
+ if (a instanceof Placeholder) {
+ @SuppressWarnings("unchecked")
+ Attribute.Compound replacement = replaceOne((Placeholder<T>) a, ctx);
- attributes = result.reverse();
+ if (null != replacement) {
+ result = result.prepend(replacement);
+ }
+ } else {
+ result = result.prepend(a);
+ }
+ }
- Assert.check(Annotations.this.getPlaceholders().isEmpty());
+ attributes = result.reverse();
+
+ Assert.check(Annotations.this.getPlaceholders().isEmpty());
+ }
} finally {
log.useSource(oldSource);
}
}
- private Attribute.Compound replaceOne(Placeholder placeholder, Annotate.AnnotateRepeatedContext ctx) {
+ private <T extends Attribute.Compound> T replaceOne(Placeholder<T> placeholder, Annotate.AnnotateRepeatedContext<T> ctx) {
Log log = ctx.log;
// Process repeated annotations
- Attribute.Compound validRepeated =
- ctx.processRepeatedAnnotations(placeholder.getPlaceholderFor(), sym);
+ T validRepeated = ctx.processRepeatedAnnotations(placeholder.getPlaceholderFor(), sym);
if (validRepeated != null) {
// Check that the container isn't manually
// present along with repeated instances of
// its contained annotation.
- ListBuffer<Attribute.Compound> manualContainer = ctx.annotated.get(validRepeated.type.tsym);
+ ListBuffer<T> manualContainer = ctx.annotated.get(validRepeated.type.tsym);
if (manualContainer != null) {
- log.error(ctx.pos.get(manualContainer.first()), "invalid.containedby.annotation.repeated.and.container.present",
+ log.error(ctx.pos.get(manualContainer.first()), "invalid.repeatable.annotation.repeated.and.container.present",
manualContainer.first().type.tsym);
}
}
// A null return will delete the Placeholder
return validRepeated;
-
}
- private static class Placeholder extends Attribute.Compound {
+ private static class Placeholder<T extends Attribute.Compound> extends Attribute.TypeCompound {
+
+ private final Annotate.AnnotateRepeatedContext<T> ctx;
+ private final List<T> placeholderFor;
+ private final Symbol on;
- private List<Attribute.Compound> placeholderFor;
- private Symbol on;
-
- public Placeholder(List<Attribute.Compound> placeholderFor, Symbol on) {
- super(Type.noType, List.<Pair<Symbol.MethodSymbol, Attribute>>nil());
+ public Placeholder(Annotate.AnnotateRepeatedContext<T> ctx, List<T> placeholderFor, Symbol on) {
+ super(on.type, List.<Pair<Symbol.MethodSymbol, Attribute>>nil(),
+ ctx.isTypeCompound ?
+ ((Attribute.TypeCompound)placeholderFor.head).position :
+ null);
+ this.ctx = ctx;
this.placeholderFor = placeholderFor;
this.on = on;
}
@@ -287,8 +381,12 @@
return "<placeholder: " + placeholderFor + " on: " + on + ">";
}
- public List<Attribute.Compound> getPlaceholderFor() {
+ public List<T> getPlaceholderFor() {
return placeholderFor;
}
+
+ public Annotate.AnnotateRepeatedContext<T> getRepeatedContext() {
+ return ctx;
+ }
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -217,6 +217,21 @@
}
}
+ public static class TypeCompound extends Compound {
+ public TypeAnnotationPosition position;
+ public TypeCompound(Compound compound,
+ TypeAnnotationPosition position) {
+ this(compound.type, compound.values, position);
+ }
+ public TypeCompound(Type type,
+ List<Pair<MethodSymbol, Attribute>> values,
+ TypeAnnotationPosition position) {
+ super(type, values);
+ this.position = position;
+ }
+
+ }
+
/** The value for an annotation element of an array type.
*/
public static class Array extends Attribute {
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -233,23 +233,23 @@
public static final long PROPRIETARY = 1L<<38;
/**
- * Flag that marks a a multi-catch parameter
+ * Flag that marks a multi-catch parameter.
*/
public static final long UNION = 1L<<39;
/**
- * Flag that marks a special kind of bridge methods (the ones that
- * come from restricted supertype bounds)
+ * Flag that marks a special kind of bridge method (the ones that
+ * come from restricted supertype bounds).
*/
public static final long OVERRIDE_BRIDGE = 1L<<40;
/**
- * Flag that marks an 'effectively final' local variable
+ * Flag that marks an 'effectively final' local variable.
*/
public static final long EFFECTIVELY_FINAL = 1L<<41;
/**
- * Flag that marks non-override equivalent methods with the same signature
+ * Flag that marks non-override equivalent methods with the same signature.
*/
public static final long CLASH = 1L<<42;
@@ -280,7 +280,7 @@
SYNCHRONIZED | FINAL | STRICTFP;
public static final long
ExtendedStandardFlags = (long)StandardFlags | DEFAULT,
- InterfaceDefaultMethodMask = ABSTRACT | PUBLIC | STRICTFP | SYNCHRONIZED | DEFAULT,
+ InterfaceMethodMask = ABSTRACT | STATIC | PUBLIC | STRICTFP | DEFAULT,
LocalVarFlags = FINAL | PARAMETER;
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,7 +74,7 @@
* the given annotations.
*/
public Lint augment(Annotations annots) {
- return augmentor.augment(this, annots.getAttributes());
+ return augmentor.augment(this, annots.getDeclarationAttributes());
}
/**
@@ -82,7 +82,7 @@
* the given annotations and flags.
*/
public Lint augment(Annotations annots, long flags) {
- Lint l = augmentor.augment(this, annots.getAttributes());
+ Lint l = augmentor.augment(this, annots.getDeclarationAttributes());
if ((flags & DEPRECATED) != 0) {
if (l == this)
l = new Lint(this);
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,10 @@
import java.util.Locale;
+import javax.lang.model.type.TypeKind;
+
import com.sun.tools.javac.api.Messages;
+import com.sun.tools.javac.code.Type.AnnotatedType;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.util.List;
@@ -35,7 +38,6 @@
import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.code.Flags.*;
-import static com.sun.tools.javac.code.TypeTag.ARRAY;
import static com.sun.tools.javac.code.TypeTag.CLASS;
import static com.sun.tools.javac.code.TypeTag.FORALL;
@@ -188,7 +190,7 @@
StringBuilder buf = new StringBuilder();
if (t.getEnclosingType().tag == CLASS && t.tsym.owner.kind == Kinds.TYP) {
buf.append(visit(t.getEnclosingType(), locale));
- buf.append(".");
+ buf.append('.');
buf.append(className(t, false, locale));
} else {
buf.append(className(t, true, locale));
@@ -196,7 +198,7 @@
if (t.getTypeArguments().nonEmpty()) {
buf.append('<');
buf.append(visitTypes(t.getTypeArguments(), locale));
- buf.append(">");
+ buf.append('>');
}
return buf.toString();
}
@@ -231,6 +233,17 @@
return visitType(t, locale);
}
+ @Override
+ public String visitAnnotatedType(AnnotatedType t, Locale locale) {
+ if (t.typeAnnotations != null &&
+ t.typeAnnotations.nonEmpty()) {
+ // TODO: better logic for arrays, ...
+ return "(" + t.typeAnnotations + " :: " + visit(t.underlyingType, locale) + ")";
+ } else {
+ return "({} :: " + visit(t.underlyingType, locale) + ")";
+ }
+ }
+
public String visitType(Type t, Locale locale) {
String s = (t.tsym == null || t.tsym.name == null)
? localize(locale, "compiler.misc.type.none")
@@ -296,8 +309,13 @@
args = args.tail;
buf.append(',');
}
- if (args.head.tag == ARRAY) {
- buf.append(visit(((ArrayType) args.head).elemtype, locale));
+ if (args.head.unannotatedType().getKind() == TypeKind.ARRAY) {
+ buf.append(visit(((ArrayType) args.head.unannotatedType()).elemtype, locale));
+ if (args.head.getAnnotations().nonEmpty()) {
+ buf.append(' ');
+ buf.append(args.head.getAnnotations());
+ buf.append(' ');
+ }
buf.append("...");
} else {
buf.append(visit(args.head, locale));
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -176,9 +176,6 @@
public boolean allowTryWithResources() {
return compareTo(JDK1_7) >= 0;
}
- public boolean allowTypeAnnotations() {
- return compareTo(JDK1_7) >= 0;
- }
public boolean allowBinaryLiterals() {
return compareTo(JDK1_7) >= 0;
}
@@ -206,18 +203,30 @@
public boolean allowDefaultMethods() {
return compareTo(JDK1_8) >= 0;
}
+ public boolean allowStaticInterfaceMethods() {
+ return compareTo(JDK1_8) >= 0;
+ }
public boolean allowStrictMethodClashCheck() {
return compareTo(JDK1_8) >= 0;
}
public boolean allowEffectivelyFinalInInnerClasses() {
return compareTo(JDK1_8) >= 0;
}
+ public boolean allowTypeAnnotations() {
+ return compareTo(JDK1_8) >= 0;
+ }
public boolean allowRepeatedAnnotations() {
return compareTo(JDK1_8) >= 0;
}
public boolean allowIntersectionTypesInCast() {
return compareTo(JDK1_8) >= 0;
}
+ public boolean allowEarlyReturnConstraints() {
+ return compareTo(JDK1_8) >= 0;
+ }
+ public boolean allowStructuralMostSpecific() {
+ return compareTo(JDK1_8) >= 0;
+ }
public static SourceVersion toSourceVersion(Source source) {
switch(source) {
case JDK1_2:
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -84,7 +84,15 @@
* method to make sure that the class symbol is loaded.
*/
public List<Attribute.Compound> getRawAttributes() {
- return annotations.getAttributes();
+ return annotations.getDeclarationAttributes();
+ }
+
+ /** An accessor method for the type attributes of this symbol.
+ * Attributes of class symbols should be accessed through the accessor
+ * method to make sure that the class symbol is loaded.
+ */
+ public List<Attribute.TypeCompound> getRawTypeAttributes() {
+ return annotations.getTypeAttributes();
}
/** Fetch a particular annotation from a symbol. */
@@ -450,11 +458,19 @@
* This is the implementation for {@code
* javax.lang.model.element.Element.getAnnotationMirrors()}.
*/
- public final List<Attribute.Compound> getAnnotationMirrors() {
+ public final List<? extends AnnotationMirror> getAnnotationMirrors() {
return getRawAttributes();
}
/**
+ * TODO: Should there be a {@code
+ * javax.lang.model.element.Element.getTypeAnnotationMirrors()}.
+ */
+ public final List<Attribute.TypeCompound> getTypeAnnotationMirrors() {
+ return getRawTypeAttributes();
+ }
+
+ /**
* @deprecated this method should never be used by javac internally.
*/
@Deprecated
@@ -462,6 +478,11 @@
return JavacElements.getAnnotation(this, annoType);
}
+ // This method is part of the javax.lang.model API, do not use this in javac code.
+ public <A extends java.lang.annotation.Annotation> A[] getAnnotations(Class<A> annoType) {
+ return JavacElements.getAnnotations(this, annoType);
+ }
+
// TODO: getEnclosedElements should return a javac List, fix in FilteredMemberList
public java.util.List<Symbol> getEnclosedElements() {
return List.nil();
@@ -790,6 +811,12 @@
return super.getRawAttributes();
}
+ @Override
+ public List<Attribute.TypeCompound> getRawTypeAttributes() {
+ if (completer != null) complete();
+ return super.getRawTypeAttributes();
+ }
+
public Type erasure(Types types) {
if (erasure_field == null)
erasure_field = new ClassType(types.erasure(type.getEnclosingType()),
@@ -1228,7 +1255,8 @@
case Flags.PRIVATE:
return false;
case Flags.PUBLIC:
- return true;
+ return !this.owner.isInterface() ||
+ (flags_field & STATIC) == 0;
case Flags.PROTECTED:
return (origin.flags() & INTERFACE) == 0;
case 0:
@@ -1242,6 +1270,18 @@
}
}
+ @Override
+ public boolean isInheritedIn(Symbol clazz, Types types) {
+ switch ((int)(flags_field & Flags.AccessFlags)) {
+ case PUBLIC:
+ return !this.owner.isInterface() ||
+ clazz == owner ||
+ (flags_field & STATIC) == 0;
+ default:
+ return super.isInheritedIn(clazz, types);
+ }
+ }
+
/** The implementation of this (abstract) symbol in class origin;
* null if none exists. Synthetic methods are not considered
* as possible implementations.
@@ -1369,7 +1409,7 @@
return defaultValue;
}
- public List<VarSymbol> getParameters() {
+ public List<VarSymbol> getParameters() {
return params();
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -161,10 +161,10 @@
public final Type autoCloseableType;
public final Type trustMeType;
public final Type lambdaMetafactory;
- public final Type containedByType;
- public final Type containerForType;
+ public final Type repeatableType;
public final Type documentedType;
public final Type elementTypeType;
+ public final Type functionalInterfaceType;
/** The symbol representing the length field of an array.
*/
@@ -494,8 +494,7 @@
deprecatedType = enterClass("java.lang.Deprecated");
suppressWarningsType = enterClass("java.lang.SuppressWarnings");
inheritedType = enterClass("java.lang.annotation.Inherited");
- containedByType = enterClass("java.lang.annotation.ContainedBy");
- containerForType = enterClass("java.lang.annotation.ContainerFor");
+ repeatableType = enterClass("java.lang.annotation.Repeatable");
documentedType = enterClass("java.lang.annotation.Documented");
elementTypeType = enterClass("java.lang.annotation.ElementType");
systemType = enterClass("java.lang.System");
@@ -509,6 +508,7 @@
nativeHeaderType = enterClass("java.lang.annotation.Native");
nativeHeaderType_old = enterClass("javax.tools.annotation.GenerateNativeHeader");
lambdaMetafactory = enterClass("java.lang.invoke.LambdaMetafactory");
+ functionalInterfaceType = enterClass("java.lang.FunctionalInterface");
synthesizeEmptyInterfaceIfMissing(autoCloseableType);
synthesizeEmptyInterfaceIfMissing(cloneableType);
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
package com.sun.tools.javac.code;
-import java.util.EnumSet;
-import java.util.Set;
-
-import static com.sun.tools.javac.code.TargetType.TargetAttribute.*;
+import com.sun.tools.javac.util.Assert;
/**
* Describes the type of program element an extended annotation (or extended
@@ -44,178 +41,89 @@
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/
+// Code duplicated in com.sun.tools.classfile.TypeAnnotation.TargetType
public enum TargetType {
-
- //
- // Some target types are commented out, because Java doesn't permit such
- // targets. They are included here to confirm that their omission is
- // intentional omission not an accidental omission.
- //
-
- /** For annotations on typecasts. */
- TYPECAST(0x00, IsLocal),
-
- /** For annotations on a type argument or nested array of a typecast. */
- TYPECAST_GENERIC_OR_ARRAY(0x01, HasLocation, IsLocal),
-
- /** For annotations on type tests. */
- INSTANCEOF(0x02, IsLocal),
-
- /** For annotations on a type argument or nested array of a type test. */
- INSTANCEOF_GENERIC_OR_ARRAY(0x03, HasLocation, IsLocal),
-
- /** For annotations on object creation expressions. */
- NEW(0x04, IsLocal),
-
- /**
- * For annotations on a type argument or nested array of an object creation
- * expression.
- */
- NEW_GENERIC_OR_ARRAY(0x05, HasLocation, IsLocal),
-
-
- /** For annotations on the method receiver. */
- METHOD_RECEIVER(0x06),
-
- // invalid location
- //@Deprecated METHOD_RECEIVER_GENERIC_OR_ARRAY(0x07, HasLocation),
-
- /** For annotations on local variables. */
- LOCAL_VARIABLE(0x08, IsLocal),
+ /** For annotations on a class type parameter declaration. */
+ CLASS_TYPE_PARAMETER(0x00),
- /** For annotations on a type argument or nested array of a local. */
- LOCAL_VARIABLE_GENERIC_OR_ARRAY(0x09, HasLocation, IsLocal),
-
- // handled by regular annotations
- //@Deprecated METHOD_RETURN(0x0A),
-
- /**
- * For annotations on a type argument or nested array of a method return
- * type.
- */
- METHOD_RETURN_GENERIC_OR_ARRAY(0x0B, HasLocation),
-
- // handled by regular annotations
- //@Deprecated METHOD_PARAMETER(0x0C),
-
- /** For annotations on a type argument or nested array of a method parameter. */
- METHOD_PARAMETER_GENERIC_OR_ARRAY(0x0D, HasLocation),
-
- // handled by regular annotations
- //@Deprecated FIELD(0x0E),
-
- /** For annotations on a type argument or nested array of a field. */
- FIELD_GENERIC_OR_ARRAY(0x0F, HasLocation),
-
- /** For annotations on a bound of a type parameter of a class. */
- CLASS_TYPE_PARAMETER_BOUND(0x10, HasBound, HasParameter),
-
- /**
- * For annotations on a type argument or nested array of a bound of a type
- * parameter of a class.
- */
- CLASS_TYPE_PARAMETER_BOUND_GENERIC_OR_ARRAY(0x11, HasBound, HasLocation, HasParameter),
-
- /** For annotations on a bound of a type parameter of a method. */
- METHOD_TYPE_PARAMETER_BOUND(0x12, HasBound, HasParameter),
-
- /**
- * For annotations on a type argument or nested array of a bound of a type
- * parameter of a method.
- */
- METHOD_TYPE_PARAMETER_BOUND_GENERIC_OR_ARRAY(0x13, HasBound, HasLocation, HasParameter),
+ /** For annotations on a method type parameter declaration. */
+ METHOD_TYPE_PARAMETER(0x01),
/** For annotations on the type of an "extends" or "implements" clause. */
- CLASS_EXTENDS(0x14),
+ CLASS_EXTENDS(0x10),
+
+ /** For annotations on a bound of a type parameter of a class. */
+ CLASS_TYPE_PARAMETER_BOUND(0x11),
+
+ /** For annotations on a bound of a type parameter of a method. */
+ METHOD_TYPE_PARAMETER_BOUND(0x12),
- /** For annotations on the inner type of an "extends" or "implements" clause. */
- CLASS_EXTENDS_GENERIC_OR_ARRAY(0x15, HasLocation),
+ /** For annotations on a field. */
+ FIELD(0x13),
+
+ /** For annotations on a method return type. */
+ METHOD_RETURN(0x14),
+
+ /** For annotations on the method receiver. */
+ METHOD_RECEIVER(0x15),
+
+ /** For annotations on a method parameter. */
+ METHOD_FORMAL_PARAMETER(0x16),
/** For annotations on a throws clause in a method declaration. */
- THROWS(0x16),
+ THROWS(0x17),
- // invalid location
- //@Deprecated THROWS_GENERIC_OR_ARRAY(0x17, HasLocation),
+ /** For annotations on a local variable. */
+ LOCAL_VARIABLE(0x40, true),
+
+ /** For annotations on a resource variable. */
+ RESOURCE_VARIABLE(0x41, true),
- /** For annotations in type arguments of object creation expressions. */
- NEW_TYPE_ARGUMENT(0x18, IsLocal),
- NEW_TYPE_ARGUMENT_GENERIC_OR_ARRAY(0x19, HasLocation, IsLocal),
+ /** For annotations on an exception parameter. */
+ EXCEPTION_PARAMETER(0x42, true),
- METHOD_TYPE_ARGUMENT(0x1A, IsLocal),
- METHOD_TYPE_ARGUMENT_GENERIC_OR_ARRAY(0x1B, HasLocation, IsLocal),
+ /** For annotations on a typecast. */
+ CAST(0x43, true),
+
+ /** For annotations on a type test. */
+ INSTANCEOF(0x44, true),
- WILDCARD_BOUND(0x1C, HasBound),
- WILDCARD_BOUND_GENERIC_OR_ARRAY(0x1D, HasBound, HasLocation),
+ /** For annotations on an object creation expression. */
+ NEW(0x45, true),
- CLASS_LITERAL(0x1E, IsLocal),
- CLASS_LITERAL_GENERIC_OR_ARRAY(0x1F, HasLocation, IsLocal),
+ /** For annotations on a type argument of an object creation expression. */
+ CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT(0x46, true),
- METHOD_TYPE_PARAMETER(0x20, HasParameter),
+ /** For annotations on a type argument of a method call. */
+ METHOD_INVOCATION_TYPE_ARGUMENT(0x47, true),
- // invalid location
- //@Deprecated METHOD_TYPE_PARAMETER_GENERIC_OR_ARRAY(0x21, HasLocation, HasParameter),
+ /** For annotations on a lambda parameter type. */
+ LAMBDA_FORMAL_PARAMETER(0x48, true),
- CLASS_TYPE_PARAMETER(0x22, HasParameter),
+ /** For annotations on a method reference. */
+ METHOD_REFERENCE(0x49, true),
- // invalid location
- //@Deprecated CLASS_TYPE_PARAMETER_GENERIC_OR_ARRAY(0x23, HasLocation, HasParameter),
+ /** For annotations on a type argument of a method reference. */
+ METHOD_REFERENCE_TYPE_ARGUMENT(0x50, true),
/** For annotations with an unknown target. */
- UNKNOWN(-1);
+ UNKNOWN(0xFF);
- static final int MAXIMUM_TARGET_TYPE_VALUE = 0x22;
+ private static final int MAXIMUM_TARGET_TYPE_VALUE = 0x92;
private final int targetTypeValue;
- private final Set<TargetAttribute> flags;
+ private final boolean isLocal;
- TargetType(int targetTypeValue, TargetAttribute... attributes) {
- if (targetTypeValue < Byte.MIN_VALUE
- || targetTypeValue > Byte.MAX_VALUE)
- throw new AssertionError("attribute type value needs to be a byte: " + targetTypeValue);
- this.targetTypeValue = (byte)targetTypeValue;
- flags = EnumSet.noneOf(TargetAttribute.class);
- for (TargetAttribute attr : attributes)
- flags.add(attr);
- }
-
- /**
- * Returns whether or not this TargetType represents an annotation whose
- * target is an inner type of a generic or array type.
- *
- * @return true if this TargetType represents an annotation on an inner
- * type, false otherwise
- */
- public boolean hasLocation() {
- return flags.contains(HasLocation);
+ private TargetType(int targetTypeValue) {
+ this(targetTypeValue, false);
}
- public TargetType getGenericComplement() {
- if (hasLocation())
- return this;
- else
- return fromTargetTypeValue(targetTypeValue() + 1);
- }
-
- /**
- * Returns whether or not this TargetType represents an annotation whose
- * target has a parameter index.
- *
- * @return true if this TargetType has a parameter index,
- * false otherwise
- */
- public boolean hasParameter() {
- return flags.contains(HasParameter);
- }
-
- /**
- * Returns whether or not this TargetType represents an annotation whose
- * target is a type parameter bound.
- *
- * @return true if this TargetType represents an type parameter bound
- * annotation, false otherwise
- */
- public boolean hasBound() {
- return flags.contains(HasBound);
+ private TargetType(int targetTypeValue, boolean isLocal) {
+ if (targetTypeValue < 0
+ || targetTypeValue > 255)
+ Assert.error("Attribute type value needs to be an unsigned byte: " + String.format("0x%02X", targetTypeValue));
+ this.targetTypeValue = targetTypeValue;
+ this.isLocal = isLocal;
}
/**
@@ -226,7 +134,7 @@
* member declaration signature tree
*/
public boolean isLocal() {
- return flags.contains(IsLocal);
+ return isLocal;
}
public int targetTypeValue() {
@@ -239,7 +147,7 @@
targets = new TargetType[MAXIMUM_TARGET_TYPE_VALUE + 1];
TargetType[] alltargets = values();
for (TargetType target : alltargets) {
- if (target.targetTypeValue >= 0)
+ if (target.targetTypeValue != UNKNOWN.targetTypeValue)
targets[target.targetTypeValue] = target;
}
for (int i = 0; i <= MAXIMUM_TARGET_TYPE_VALUE; ++i) {
@@ -249,22 +157,18 @@
}
public static boolean isValidTargetTypeValue(int tag) {
- if (((byte)tag) == ((byte)UNKNOWN.targetTypeValue))
+ if (tag == UNKNOWN.targetTypeValue)
return true;
return (tag >= 0 && tag < targets.length);
}
public static TargetType fromTargetTypeValue(int tag) {
- if (((byte)tag) == ((byte)UNKNOWN.targetTypeValue))
+ if (tag == UNKNOWN.targetTypeValue)
return UNKNOWN;
if (tag < 0 || tag >= targets.length)
- throw new IllegalArgumentException("Unknown TargetType: " + tag);
+ Assert.error("Unknown TargetType: " + tag);
return targets[tag];
}
-
- static enum TargetAttribute {
- HasLocation, HasParameter, HasBound, IsLocal;
- }
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
import java.util.Map;
import java.util.Set;
+import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.type.*;
import com.sun.tools.javac.code.Symbol.*;
@@ -87,7 +88,7 @@
*/
protected TypeTag tag;
- /** The defining class / interface / package / type variable
+ /** The defining class / interface / package / type variable.
*/
public TypeSymbol tsym;
@@ -166,7 +167,7 @@
/**
* Get the representation of this type used for modelling purposes.
* By default, this is itself. For ErrorType, a different value
- * may be provided,
+ * may be provided.
*/
public Type getModelType() {
return this;
@@ -245,6 +246,14 @@
return this;
}
+ /**
+ * If this is an annotated type, return the underlying type.
+ * Otherwise, return the type itself.
+ */
+ public Type unannotatedType() {
+ return this;
+ }
+
/** Return the base types of a list of types.
*/
public static List<Type> baseTypes(List<Type> ts) {
@@ -339,8 +348,11 @@
args = args.tail;
buf.append(',');
}
- if (args.head.tag == ARRAY) {
- buf.append(((ArrayType)args.head).elemtype);
+ if (args.head.unannotatedType().tag == ARRAY) {
+ buf.append(((ArrayType)args.head.unannotatedType()).elemtype);
+ if (args.head.getAnnotations().nonEmpty()) {
+ buf.append(args.head.getAnnotations());
+ }
buf.append("...");
} else {
buf.append(args.head);
@@ -350,10 +362,12 @@
/** Access methods.
*/
+ public List<? extends AnnotationMirror> getAnnotations() { return List.nil(); }
public List<Type> getTypeArguments() { return List.nil(); }
- public Type getEnclosingType() { return null; }
+ public Type getEnclosingType() { return null; }
public List<Type> getParameterTypes() { return List.nil(); }
public Type getReturnType() { return null; }
+ public Type getReceiverType() { return null; }
public List<Type> getThrownTypes() { return List.nil(); }
public Type getUpperBound() { return null; }
public Type getLowerBound() { return null; }
@@ -600,7 +614,7 @@
/** The enclosing type of this type. If this is the type of an inner
* class, outer_field refers to the type of its enclosing
- * instance class, in all other cases it referes to noType.
+ * instance class, in all other cases it refers to noType.
*/
private Type outer_field;
@@ -974,6 +988,10 @@
public Type restype;
public List<Type> thrown;
+ /** The type annotations on the method receiver.
+ */
+ public Type recvtype;
+
public MethodType(List<Type> argtypes,
Type restype,
List<Type> thrown,
@@ -1000,6 +1018,7 @@
public List<Type> getParameterTypes() { return argtypes; }
public Type getReturnType() { return restype; }
+ public Type getReceiverType() { return recvtype; }
public List<Type> getThrownTypes() { return thrown; }
public boolean isErroneous() {
@@ -1028,6 +1047,7 @@
for (List<Type> l = argtypes; l.nonEmpty(); l = l.tail)
l.head.complete();
restype.complete();
+ recvtype.complete();
for (List<Type> l = thrown; l.nonEmpty(); l = l.tail)
l.head.complete();
}
@@ -1112,7 +1132,11 @@
}
@Override
- public Type getUpperBound() { return bound; }
+ public Type getUpperBound() {
+ if ((bound == null || bound.tag == NONE) && this != tsym.type)
+ bound = tsym.type.getUpperBound();
+ return bound;
+ }
int rank_field = -1;
@@ -1183,6 +1207,7 @@
public Type getEnclosingType() { return qtype.getEnclosingType(); }
public List<Type> getParameterTypes() { return qtype.getParameterTypes(); }
public Type getReturnType() { return qtype.getReturnType(); }
+ public Type getReceiverType() { return qtype.getReceiverType(); }
public List<Type> getThrownTypes() { return qtype.getThrownTypes(); }
public List<Type> allparams() { return qtype.allparams(); }
public Type getUpperBound() { return qtype.getUpperBound(); }
@@ -1435,7 +1460,7 @@
}
public Type constType(Object constValue) { return this; }
- public Type getEnclosingType() { return this; }
+ public Type getEnclosingType() { return this; }
public Type getReturnType() { return this; }
public Type asSub(Symbol sym) { return this; }
public Type map(Mapping f) { return this; }
@@ -1461,11 +1486,165 @@
}
}
+ public static class AnnotatedType extends Type
+ implements javax.lang.model.type.AnnotatedType {
+ /** The type annotations on this type.
+ */
+ public List<Attribute.TypeCompound> typeAnnotations;
+
+ /** The underlying type that is annotated.
+ */
+ public Type underlyingType;
+
+ public AnnotatedType(Type underlyingType) {
+ super(underlyingType.tag, underlyingType.tsym);
+ this.typeAnnotations = List.nil();
+ this.underlyingType = underlyingType;
+ Assert.check(underlyingType.getKind() != TypeKind.ANNOTATED,
+ "Can't annotate already annotated type: " + underlyingType);
+ }
+
+ public AnnotatedType(List<Attribute.TypeCompound> typeAnnotations,
+ Type underlyingType) {
+ super(underlyingType.tag, underlyingType.tsym);
+ this.typeAnnotations = typeAnnotations;
+ this.underlyingType = underlyingType;
+ Assert.check(underlyingType.getKind() != TypeKind.ANNOTATED,
+ "Can't annotate already annotated type: " + underlyingType +
+ "; adding: " + typeAnnotations);
+ }
+
+ @Override
+ public TypeKind getKind() {
+ return TypeKind.ANNOTATED;
+ }
+
+ @Override
+ public List<? extends AnnotationMirror> getAnnotations() {
+ return typeAnnotations;
+ }
+
+ @Override
+ public TypeMirror getUnderlyingType() {
+ return underlyingType;
+ }
+
+ @Override
+ public Type unannotatedType() {
+ return underlyingType;
+ }
+
+ @Override
+ public <R,S> R accept(Type.Visitor<R,S> v, S s) {
+ return v.visitAnnotatedType(this, s);
+ }
+
+ @Override
+ public <R, P> R accept(TypeVisitor<R, P> v, P p) {
+ return v.visitAnnotated(this, p);
+ }
+
+ @Override
+ public Type map(Mapping f) {
+ underlyingType.map(f);
+ return this;
+ }
+
+ @Override
+ public Type constType(Object constValue) { return underlyingType.constType(constValue); }
+ @Override
+ public Type getEnclosingType() { return underlyingType.getEnclosingType(); }
+
+ @Override
+ public Type getReturnType() { return underlyingType.getReturnType(); }
+ @Override
+ public List<Type> getTypeArguments() { return underlyingType.getTypeArguments(); }
+ @Override
+ public List<Type> getParameterTypes() { return underlyingType.getParameterTypes(); }
+ @Override
+ public Type getReceiverType() { return underlyingType.getReceiverType(); }
+ @Override
+ public List<Type> getThrownTypes() { return underlyingType.getThrownTypes(); }
+ @Override
+ public Type getUpperBound() { return underlyingType.getUpperBound(); }
+ @Override
+ public Type getLowerBound() { return underlyingType.getLowerBound(); }
+
+ @Override
+ public boolean isErroneous() { return underlyingType.isErroneous(); }
+ @Override
+ public boolean isCompound() { return underlyingType.isCompound(); }
+ @Override
+ public boolean isInterface() { return underlyingType.isInterface(); }
+ @Override
+ public List<Type> allparams() { return underlyingType.allparams(); }
+ @Override
+ public boolean isNumeric() { return underlyingType.isNumeric(); }
+ @Override
+ public boolean isReference() { return underlyingType.isReference(); }
+ @Override
+ public boolean isParameterized() { return underlyingType.isParameterized(); }
+ @Override
+ public boolean isRaw() { return underlyingType.isRaw(); }
+ @Override
+ public boolean isFinal() { return underlyingType.isFinal(); }
+ @Override
+ public boolean isSuperBound() { return underlyingType.isSuperBound(); }
+ @Override
+ public boolean isExtendsBound() { return underlyingType.isExtendsBound(); }
+ @Override
+ public boolean isUnbound() { return underlyingType.isUnbound(); }
+
+ @Override
+ public String toString() {
+ // TODO more logic for arrays, etc.
+ if (typeAnnotations != null &&
+ !typeAnnotations.isEmpty()) {
+ return "(" + typeAnnotations.toString() + " :: " + underlyingType.toString() + ")";
+ } else {
+ return "({} :: " + underlyingType.toString() +")";
+ }
+ }
+
+ @Override
+ public boolean contains(Type t) { return underlyingType.contains(t); }
+
+ // TODO: attach annotations?
+ @Override
+ public Type withTypeVar(Type t) { return underlyingType.withTypeVar(t); }
+
+ // TODO: attach annotations?
+ @Override
+ public TypeSymbol asElement() { return underlyingType.asElement(); }
+
+ // TODO: attach annotations?
+ @Override
+ public MethodType asMethodType() { return underlyingType.asMethodType(); }
+
+ @Override
+ public void complete() { underlyingType.complete(); }
+
+ @Override
+ public TypeMirror getComponentType() { return ((ArrayType)underlyingType).getComponentType(); }
+
+ // The result is an ArrayType, but only in the model sense, not the Type sense.
+ public AnnotatedType makeVarargs() {
+ AnnotatedType atype = new AnnotatedType(((ArrayType)underlyingType).makeVarargs());
+ atype.typeAnnotations = this.typeAnnotations;
+ return atype;
+ }
+
+ @Override
+ public TypeMirror getExtendsBound() { return ((WildcardType)underlyingType).getExtendsBound(); }
+ @Override
+ public TypeMirror getSuperBound() { return ((WildcardType)underlyingType).getSuperBound(); }
+ }
+
/**
* A visitor for types. A visitor is used to implement operations
* (or relations) on types. Most common operations on types are
* binary relations and this interface is designed for binary
- * relations, that is, operations on the form
+ * relations, that is, operations of the form
* Type × S → R.
* <!-- In plain text: Type x S -> R -->
*
@@ -1486,6 +1665,7 @@
R visitForAll(ForAll t, S s);
R visitUndetVar(UndetVar t, S s);
R visitErrorType(ErrorType t, S s);
+ R visitAnnotatedType(AnnotatedType t, S s);
R visitType(Type t, S s);
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package com.sun.tools.javac.code;
+import java.util.Iterator;
+
import com.sun.tools.javac.util.*;
/** A type annotation position.
@@ -34,12 +36,92 @@
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/
+// Code duplicated in com.sun.tools.classfile.TypeAnnotation.Position
public class TypeAnnotationPosition {
+ public enum TypePathEntryKind {
+ ARRAY(0),
+ INNER_TYPE(1),
+ WILDCARD(2),
+ TYPE_ARGUMENT(3);
+
+ public final int tag;
+
+ private TypePathEntryKind(int tag) {
+ this.tag = tag;
+ }
+ }
+
+ public static class TypePathEntry {
+ /** The fixed number of bytes per TypePathEntry. */
+ public static final int bytesPerEntry = 2;
+
+ public final TypePathEntryKind tag;
+ public final int arg;
+
+ public static final TypePathEntry ARRAY = new TypePathEntry(TypePathEntryKind.ARRAY);
+ public static final TypePathEntry INNER_TYPE = new TypePathEntry(TypePathEntryKind.INNER_TYPE);
+ public static final TypePathEntry WILDCARD = new TypePathEntry(TypePathEntryKind.WILDCARD);
+
+ private TypePathEntry(TypePathEntryKind tag) {
+ Assert.check(tag == TypePathEntryKind.ARRAY ||
+ tag == TypePathEntryKind.INNER_TYPE ||
+ tag == TypePathEntryKind.WILDCARD,
+ "Invalid TypePathEntryKind: " + tag);
+ this.tag = tag;
+ this.arg = 0;
+ }
+
+ public TypePathEntry(TypePathEntryKind tag, int arg) {
+ Assert.check(tag == TypePathEntryKind.TYPE_ARGUMENT,
+ "Invalid TypePathEntryKind: " + tag);
+ this.tag = tag;
+ this.arg = arg;
+ }
+
+ public static TypePathEntry fromBinary(int tag, int arg) {
+ Assert.check(arg == 0 || tag == TypePathEntryKind.TYPE_ARGUMENT.tag,
+ "Invalid TypePathEntry tag/arg: " + tag + "/" + arg);
+ switch (tag) {
+ case 0:
+ return ARRAY;
+ case 1:
+ return INNER_TYPE;
+ case 2:
+ return WILDCARD;
+ case 3:
+ return new TypePathEntry(TypePathEntryKind.TYPE_ARGUMENT, arg);
+ default:
+ Assert.error("Invalid TypePathEntryKind tag: " + tag);
+ return null;
+ }
+ }
+
+ @Override
+ public String toString() {
+ return tag.toString() +
+ (tag == TypePathEntryKind.TYPE_ARGUMENT ? ("(" + arg + ")") : "");
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (! (other instanceof TypePathEntry)) {
+ return false;
+ }
+ TypePathEntry tpe = (TypePathEntry) other;
+ return this.tag == tpe.tag && this.arg == tpe.arg;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.tag.hashCode() * 17 + this.arg;
+ }
+ }
+
public TargetType type = TargetType.UNKNOWN;
// For generic/array types.
- public List<Integer> location = List.nil();
+ public List<TypePathEntry> location = List.nil();
// Tree position.
public int pos = -1;
@@ -59,11 +141,13 @@
// For type parameter and method parameter
public int parameter_index = Integer.MIN_VALUE;
- // For class extends, implements, and throws classes
+ // For class extends, implements, and throws clauses
public int type_index = Integer.MIN_VALUE;
- // For wildcards
- public TypeAnnotationPosition wildcard_position = null;
+ // For exception parameters, index into exception table
+ public int exception_index = Integer.MIN_VALUE;
+
+ public TypeAnnotationPosition() {}
@Override
public String toString() {
@@ -72,27 +156,27 @@
sb.append(type);
switch (type) {
- // type case
- case TYPECAST:
- case TYPECAST_GENERIC_OR_ARRAY:
- // object creation
+ // type cast
+ case CAST:
+ // instanceof
case INSTANCEOF:
- case INSTANCEOF_GENERIC_OR_ARRAY:
- // new expression
+ // new expression
case NEW:
- case NEW_GENERIC_OR_ARRAY:
- case NEW_TYPE_ARGUMENT:
- case NEW_TYPE_ARGUMENT_GENERIC_OR_ARRAY:
sb.append(", offset = ");
sb.append(offset);
break;
- // local variable
+ // local variable
case LOCAL_VARIABLE:
- case LOCAL_VARIABLE_GENERIC_OR_ARRAY:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ if (lvarOffset == null) {
+ sb.append(", lvarOffset is null!");
+ break;
+ }
sb.append(", {");
for (int i = 0; i < lvarOffset.length; ++i) {
if (i != 0) sb.append("; ");
- sb.append(", start_pc = ");
+ sb.append("start_pc = ");
sb.append(lvarOffset[i]);
sb.append(", length = ");
sb.append(lvarLength[i]);
@@ -101,73 +185,72 @@
}
sb.append("}");
break;
- // method receiver
+ // method receiver
case METHOD_RECEIVER:
// Do nothing
break;
- // type parameters
+ // type parameter
case CLASS_TYPE_PARAMETER:
case METHOD_TYPE_PARAMETER:
sb.append(", param_index = ");
sb.append(parameter_index);
break;
- // type parameters bound
+ // type parameter bound
case CLASS_TYPE_PARAMETER_BOUND:
- case CLASS_TYPE_PARAMETER_BOUND_GENERIC_OR_ARRAY:
case METHOD_TYPE_PARAMETER_BOUND:
- case METHOD_TYPE_PARAMETER_BOUND_GENERIC_OR_ARRAY:
sb.append(", param_index = ");
sb.append(parameter_index);
sb.append(", bound_index = ");
sb.append(bound_index);
break;
- // wildcard
- case WILDCARD_BOUND:
- case WILDCARD_BOUND_GENERIC_OR_ARRAY:
- sb.append(", wild_card = ");
- sb.append(wildcard_position);
- break;
- // Class extends and implements clauses
+ // class extends or implements clause
case CLASS_EXTENDS:
- case CLASS_EXTENDS_GENERIC_OR_ARRAY:
sb.append(", type_index = ");
sb.append(type_index);
break;
- // throws
+ // throws
case THROWS:
sb.append(", type_index = ");
sb.append(type_index);
break;
- case CLASS_LITERAL:
- case CLASS_LITERAL_GENERIC_OR_ARRAY:
- sb.append(", offset = ");
- sb.append(offset);
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ sb.append(", exception_index = ");
+ sb.append(exception_index);
break;
- // method parameter: not specified
- case METHOD_PARAMETER_GENERIC_OR_ARRAY:
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
sb.append(", param_index = ");
sb.append(parameter_index);
break;
- // method type argument: wasn't specified
- case METHOD_TYPE_ARGUMENT:
- case METHOD_TYPE_ARGUMENT_GENERIC_OR_ARRAY:
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
sb.append(", offset = ");
sb.append(offset);
sb.append(", type_index = ");
sb.append(type_index);
break;
- // We don't need to worry abut these
- case METHOD_RETURN_GENERIC_OR_ARRAY:
- case FIELD_GENERIC_OR_ARRAY:
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ // lambda formal parameter
+ case LAMBDA_FORMAL_PARAMETER:
+ // TODO: also needs an offset?
+ sb.append(", param_index = ");
+ sb.append(parameter_index);
break;
case UNKNOWN:
+ sb.append(", position UNKNOWN!");
break;
default:
- // throw new AssertionError("unknown type: " + type);
+ Assert.error("Unknown target type: " + type);
}
// Append location data for generics/arrays.
- if (type.hasLocation()) {
+ if (!location.isEmpty()) {
sb.append(", location = (");
sb.append(location);
sb.append(")");
@@ -186,10 +269,33 @@
* @return true if the target has not been optimized away
*/
public boolean emitToClassfile() {
- if (type == TargetType.WILDCARD_BOUND
- || type == TargetType.WILDCARD_BOUND_GENERIC_OR_ARRAY)
- return wildcard_position.isValidOffset;
- else
- return !type.isLocal() || isValidOffset;
+ return !type.isLocal() || isValidOffset;
+ }
+
+ /**
+ * Decode the binary representation for a type path and set
+ * the {@code location} field.
+ *
+ * @param list The bytecode representation of the type path.
+ */
+ public static List<TypePathEntry> getTypePathFromBinary(java.util.List<Integer> list) {
+ ListBuffer<TypePathEntry> loc = ListBuffer.lb();
+ Iterator<Integer> iter = list.iterator();
+ while (iter.hasNext()) {
+ Integer fst = iter.next();
+ Assert.check(iter.hasNext(), "Could not decode type path: " + list);
+ Integer snd = iter.next();
+ loc = loc.append(TypePathEntry.fromBinary(fst, snd));
+ }
+ return loc.toList();
+ }
+
+ public static List<Integer> getBinaryFromTypePath(java.util.List<TypePathEntry> locs) {
+ ListBuffer<Integer> loc = ListBuffer.lb();
+ for (TypePathEntry tpe : locs) {
+ loc = loc.append(tpe.tag.tag);
+ loc = loc.append(tpe.arg);
+ }
+ return loc.toList();
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,1037 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.javac.code;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.type.TypeKind;
+
+import com.sun.tools.javac.code.Attribute;
+import com.sun.tools.javac.code.Attribute.TypeCompound;
+import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Kinds;
+import com.sun.tools.javac.code.Type.AnnotatedType;
+import com.sun.tools.javac.code.Type.ArrayType;
+import com.sun.tools.javac.code.Type.CapturedType;
+import com.sun.tools.javac.code.Type.ClassType;
+import com.sun.tools.javac.code.Type.ErrorType;
+import com.sun.tools.javac.code.Type.ForAll;
+import com.sun.tools.javac.code.Type.MethodType;
+import com.sun.tools.javac.code.Type.PackageType;
+import com.sun.tools.javac.code.Type.TypeVar;
+import com.sun.tools.javac.code.Type.UndetVar;
+import com.sun.tools.javac.code.Type.Visitor;
+import com.sun.tools.javac.code.Type.WildcardType;
+import com.sun.tools.javac.code.TypeAnnotationPosition.TypePathEntry;
+import com.sun.tools.javac.code.TypeAnnotationPosition.TypePathEntryKind;
+import com.sun.tools.javac.code.TypeTag;
+import com.sun.tools.javac.code.Symbol.VarSymbol;
+import com.sun.tools.javac.comp.Annotate.Annotator;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.JCTree.JCBlock;
+import com.sun.tools.javac.tree.JCTree.JCClassDecl;
+import com.sun.tools.javac.tree.JCTree.JCExpression;
+import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
+import com.sun.tools.javac.tree.JCTree.JCTypeApply;
+import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
+import com.sun.tools.javac.tree.TreeScanner;
+import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.util.Assert;
+import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Names;
+
+/**
+ * Contains operations specific to processing type annotations.
+ * This class has two functions:
+ * separate declaration from type annotations and insert the type
+ * annotations to their types;
+ * and determine the TypeAnnotationPositions for all type annotations.
+ */
+public class TypeAnnotations {
+ // Class cannot be instantiated.
+ private TypeAnnotations() {}
+
+ /**
+ * Separate type annotations from declaration annotations and
+ * determine the correct positions for type annotations.
+ * This version only visits types in signatures and should be
+ * called from MemberEnter.
+ * The method returns the Annotator object that should be added
+ * to the correct Annotate queue for later processing.
+ */
+ public static Annotator organizeTypeAnnotationsSignatures(final Symtab syms, final Names names,
+ final Log log, final JCClassDecl tree) {
+ return new Annotator() {
+ @Override
+ public void enterAnnotation() {
+ new TypeAnnotationPositions(syms, names, log, true).scan(tree);
+ }
+ };
+ }
+
+ /**
+ * This version only visits types in bodies, that is, field initializers,
+ * top-level blocks, and method bodies, and should be called from Attr.
+ */
+ public static void organizeTypeAnnotationsBodies(Symtab syms, Names names, Log log, JCClassDecl tree) {
+ new TypeAnnotationPositions(syms, names, log, false).scan(tree);
+ }
+
+ private static class TypeAnnotationPositions extends TreeScanner {
+
+ private enum AnnotationType { DECLARATION, TYPE, BOTH };
+
+ private final Symtab syms;
+ private final Names names;
+ private final Log log;
+ private final boolean sigOnly;
+
+ private TypeAnnotationPositions(Symtab syms, Names names, Log log, boolean sigOnly) {
+ this.syms = syms;
+ this.names = names;
+ this.log = log;
+ this.sigOnly = sigOnly;
+ }
+
+ /*
+ * When traversing the AST we keep the "frames" of visited
+ * trees in order to determine the position of annotations.
+ */
+ private ListBuffer<JCTree> frames = ListBuffer.lb();
+
+ protected void push(JCTree t) { frames = frames.prepend(t); }
+ protected JCTree pop() { return frames.next(); }
+ // could this be frames.elems.tail.head?
+ private JCTree peek2() { return frames.toList().tail.head; }
+
+ @Override
+ public void scan(JCTree tree) {
+ push(tree);
+ super.scan(tree);
+ pop();
+ }
+
+ /**
+ * Separates type annotations from declaration annotations.
+ * This step is needed because in certain locations (where declaration
+ * and type annotations can be mixed, e.g. the type of a field)
+ * we never build an JCAnnotatedType. This step finds these
+ * annotations and marks them as if they were part of the type.
+ */
+ private void separateAnnotationsKinds(JCTree typetree, Type type, Symbol sym,
+ TypeAnnotationPosition pos) {
+ /*
+ System.out.printf("separateAnnotationsKinds(typetree: %s, type: %s, symbol: %s, pos: %s%n",
+ typetree, type, sym, pos);
+ */
+ List<Attribute.Compound> annotations = sym.getRawAttributes();
+ ListBuffer<Attribute.Compound> declAnnos = new ListBuffer<Attribute.Compound>();
+ ListBuffer<Attribute.TypeCompound> typeAnnos = new ListBuffer<Attribute.TypeCompound>();
+
+ for (Attribute.Compound a : annotations) {
+ switch (annotationType(a, sym)) {
+ case DECLARATION:
+ declAnnos.append(a);
+ break;
+ case BOTH: {
+ declAnnos.append(a);
+ Attribute.TypeCompound ta = toTypeCompound(a, pos);
+ typeAnnos.append(ta);
+ break;
+ }
+ case TYPE: {
+ Attribute.TypeCompound ta = toTypeCompound(a, pos);
+ typeAnnos.append(ta);
+ break;
+ }
+ }
+ }
+
+ sym.annotations.reset();
+ sym.annotations.setDeclarationAttributes(declAnnos.toList());
+
+ List<Attribute.TypeCompound> typeAnnotations = typeAnnos.toList();
+
+ if (type == null) {
+ // When type is null, put the type annotations to the symbol.
+ // This is used for constructor return annotations, for which
+ // no appropriate type exists.
+ sym.annotations.appendUniqueTypes(typeAnnotations);
+ return;
+ }
+
+ // type is non-null and annotations are added to that type
+ type = typeWithAnnotations(typetree, type, typeAnnotations, log);
+
+ if (sym.getKind() == ElementKind.METHOD) {
+ sym.type.asMethodType().restype = type;
+ } else {
+ sym.type = type;
+ }
+
+ sym.annotations.appendUniqueTypes(typeAnnotations);
+ if (sym.getKind() == ElementKind.PARAMETER &&
+ sym.getQualifiedName().equals(names._this)) {
+ sym.owner.type.asMethodType().recvtype = type;
+ // note that the typeAnnotations will also be added to the owner below.
+ }
+ if (sym.getKind() == ElementKind.PARAMETER ||
+ sym.getKind() == ElementKind.LOCAL_VARIABLE ||
+ sym.getKind() == ElementKind.RESOURCE_VARIABLE ||
+ sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
+ // Make sure all type annotations from the symbol are also
+ // on the owner.
+ sym.owner.annotations.appendUniqueTypes(sym.getTypeAnnotationMirrors());
+ }
+ }
+
+ // This method has a similar purpose as
+ // {@link com.sun.tools.javac.parser.JavacParser.insertAnnotationsToMostInner(JCExpression, List<JCTypeAnnotation>, boolean)}
+ // We found a type annotation in a declaration annotation position,
+ // for example, on the return type.
+ // Such an annotation is _not_ part of an JCAnnotatedType tree and we therefore
+ // need to set its position explicitly.
+ // The method returns a copy of type that contains these annotations.
+ private static Type typeWithAnnotations(final JCTree typetree, final Type type,
+ final List<Attribute.TypeCompound> annotations, Log log) {
+ // System.out.printf("typeWithAnnotations(typetree: %s, type: %s, annotations: %s)%n",
+ // typetree, type, annotations);
+ if (annotations.isEmpty()) {
+ return type;
+ }
+ if (type.hasTag(TypeTag.ARRAY)) {
+ Type toreturn;
+ Type.ArrayType tomodify;
+ Type.ArrayType arType;
+ {
+ Type touse = type;
+ if (type.getKind() == TypeKind.ANNOTATED) {
+ Type.AnnotatedType atype = (Type.AnnotatedType)type;
+ toreturn = new Type.AnnotatedType(atype.underlyingType);
+ ((Type.AnnotatedType)toreturn).typeAnnotations = atype.typeAnnotations;
+ touse = atype.underlyingType;
+ arType = (Type.ArrayType) touse;
+ tomodify = new Type.ArrayType(null, arType.tsym);
+ ((Type.AnnotatedType)toreturn).underlyingType = tomodify;
+ } else {
+ arType = (Type.ArrayType) touse;
+ tomodify = new Type.ArrayType(null, arType.tsym);
+ toreturn = tomodify;
+ }
+ }
+ JCArrayTypeTree arTree = arrayTypeTree(typetree);
+
+ ListBuffer<TypePathEntry> depth = ListBuffer.lb();
+ depth = depth.append(TypePathEntry.ARRAY);
+ while (arType.elemtype.hasTag(TypeTag.ARRAY)) {
+ if (arType.elemtype.getKind() == TypeKind.ANNOTATED) {
+ Type.AnnotatedType aelemtype = (Type.AnnotatedType) arType.elemtype;
+ Type.AnnotatedType newAT = new Type.AnnotatedType(aelemtype.underlyingType);
+ tomodify.elemtype = newAT;
+ newAT.typeAnnotations = aelemtype.typeAnnotations;
+ arType = (Type.ArrayType) aelemtype.underlyingType;
+ tomodify = new Type.ArrayType(null, arType.tsym);
+ newAT.underlyingType = tomodify;
+ } else {
+ arType = (Type.ArrayType) arType.elemtype;
+ tomodify.elemtype = new Type.ArrayType(null, arType.tsym);
+ tomodify = (Type.ArrayType) tomodify.elemtype;
+ }
+ arTree = arrayTypeTree(arTree.elemtype);
+ depth = depth.append(TypePathEntry.ARRAY);
+ }
+ Type arelemType = typeWithAnnotations(arTree.elemtype, arType.elemtype, annotations, log);
+ tomodify.elemtype = arelemType;
+ for (Attribute.TypeCompound a : annotations) {
+ TypeAnnotationPosition p = a.position;
+ p.location = p.location.prependList(depth.toList());
+ }
+ return toreturn;
+ } else if (type.hasTag(TypeTag.TYPEVAR)) {
+ // Nothing to do for type variables.
+ return type;
+ } else {
+ Type enclTy = type;
+ Element enclEl = type.asElement();
+ JCTree enclTr = typetree;
+
+ while (enclEl != null &&
+ enclEl.getKind() != ElementKind.PACKAGE &&
+ enclTy != null &&
+ enclTy.getKind() != TypeKind.NONE &&
+ enclTy.getKind() != TypeKind.ERROR &&
+ (enclTr.getKind() == JCTree.Kind.MEMBER_SELECT ||
+ enclTr.getKind() == JCTree.Kind.PARAMETERIZED_TYPE ||
+ enclTr.getKind() == JCTree.Kind.ANNOTATED_TYPE)) {
+ // Iterate also over the type tree, not just the type: the type is already
+ // completely resolved and we cannot distinguish where the annotation
+ // belongs for a nested type.
+ if (enclTr.getKind() == JCTree.Kind.MEMBER_SELECT) {
+ // only change encl in this case.
+ enclTy = enclTy.getEnclosingType();
+ enclEl = enclEl.getEnclosingElement();
+ enclTr = ((JCFieldAccess)enclTr).getExpression();
+ } else if (enclTr.getKind() == JCTree.Kind.PARAMETERIZED_TYPE) {
+ enclTr = ((JCTypeApply)enclTr).getType();
+ } else {
+ // only other option because of while condition
+ enclTr = ((JCAnnotatedType)enclTr).getUnderlyingType();
+ }
+ }
+
+ /** We are trying to annotate some enclosing type,
+ * but nothing more exists.
+ */
+ if (enclTy != null &&
+ enclTy.getKind() == TypeKind.NONE &&
+ (enclTr.getKind() == JCTree.Kind.IDENTIFIER ||
+ enclTr.getKind() == JCTree.Kind.MEMBER_SELECT ||
+ enclTr.getKind() == JCTree.Kind.PARAMETERIZED_TYPE ||
+ enclTr.getKind() == JCTree.Kind.ANNOTATED_TYPE)) {
+ // TODO: also if it's "java. @A lang.Object", that is,
+ // if it's on a package?
+ log.error(enclTr.pos(), "cant.annotate.nested.type", enclTr.toString());
+ return type;
+ }
+
+ // At this point we have visited the part of the nested
+ // type that is written in the source code.
+ // Now count from here to the actual top-level class to determine
+ // the correct nesting.
+
+ // The genericLocation for the annotation.
+ ListBuffer<TypePathEntry> depth = ListBuffer.lb();
+
+ Type topTy = enclTy;
+ while (enclEl != null &&
+ enclEl.getKind() != ElementKind.PACKAGE &&
+ topTy != null &&
+ topTy.getKind() != TypeKind.NONE &&
+ topTy.getKind() != TypeKind.ERROR) {
+ topTy = topTy.getEnclosingType();
+ enclEl = enclEl.getEnclosingElement();
+
+ if (topTy != null && topTy.getKind() != TypeKind.NONE) {
+ // Only count enclosing types.
+ depth = depth.append(TypePathEntry.INNER_TYPE);
+ }
+ }
+
+ if (depth.nonEmpty()) {
+ // Only need to change the annotation positions
+ // if they are on an enclosed type.
+ for (Attribute.TypeCompound a : annotations) {
+ TypeAnnotationPosition p = a.position;
+ p.location = p.location.appendList(depth.toList());
+ }
+ }
+
+ Type ret = typeWithAnnotations(type, enclTy, annotations);
+ return ret;
+ }
+ }
+
+ private static JCArrayTypeTree arrayTypeTree(JCTree typetree) {
+ if (typetree.getKind() == JCTree.Kind.ARRAY_TYPE) {
+ return (JCArrayTypeTree) typetree;
+ } else if (typetree.getKind() == JCTree.Kind.ANNOTATED_TYPE) {
+ return (JCArrayTypeTree) ((JCAnnotatedType)typetree).underlyingType;
+ } else {
+ Assert.error("Could not determine array type from type tree: " + typetree);
+ return null;
+ }
+ }
+
+ /** Return a copy of the first type that only differs by
+ * inserting the annotations to the left-most/inner-most type
+ * or the type given by stopAt.
+ *
+ * We need the stopAt parameter to know where on a type to
+ * put the annotations.
+ * If we have nested classes Outer > Middle > Inner, and we
+ * have the source type "@A Middle.Inner", we will invoke
+ * this method with type = Outer.Middle.Inner,
+ * stopAt = Middle.Inner, and annotations = @A.
+ *
+ * @param type The type to copy.
+ * @param stopAt The type to stop at.
+ * @param annotations The annotations to insert.
+ * @return A copy of type that contains the annotations.
+ */
+ private static Type typeWithAnnotations(final Type type,
+ final Type stopAt,
+ final List<Attribute.TypeCompound> annotations) {
+ Visitor<Type, List<TypeCompound>> visitor =
+ new Type.Visitor<Type, List<Attribute.TypeCompound>>() {
+ @Override
+ public Type visitClassType(ClassType t, List<TypeCompound> s) {
+ // assert that t.constValue() == null?
+ if (t == stopAt ||
+ t.getEnclosingType() == Type.noType) {
+ return new AnnotatedType(s, t);
+ } else {
+ ClassType ret = new ClassType(t.getEnclosingType().accept(this, s),
+ t.typarams_field, t.tsym);
+ ret.all_interfaces_field = t.all_interfaces_field;
+ ret.allparams_field = t.allparams_field;
+ ret.interfaces_field = t.interfaces_field;
+ ret.rank_field = t.rank_field;
+ ret.supertype_field = t.supertype_field;
+ return ret;
+ }
+ }
+
+ @Override
+ public Type visitAnnotatedType(AnnotatedType t, List<TypeCompound> s) {
+ return new AnnotatedType(t.typeAnnotations, t.underlyingType.accept(this, s));
+ }
+
+ @Override
+ public Type visitWildcardType(WildcardType t, List<TypeCompound> s) {
+ return new AnnotatedType(s, t);
+ }
+
+ @Override
+ public Type visitArrayType(ArrayType t, List<TypeCompound> s) {
+ ArrayType ret = new ArrayType(t.elemtype.accept(this, s), t.tsym);
+ return ret;
+ }
+
+ @Override
+ public Type visitMethodType(MethodType t, List<TypeCompound> s) {
+ // Impossible?
+ return t;
+ }
+
+ @Override
+ public Type visitPackageType(PackageType t, List<TypeCompound> s) {
+ // Impossible?
+ return t;
+ }
+
+ @Override
+ public Type visitTypeVar(TypeVar t, List<TypeCompound> s) {
+ return new AnnotatedType(s, t);
+ }
+
+ @Override
+ public Type visitCapturedType(CapturedType t, List<TypeCompound> s) {
+ return new AnnotatedType(s, t);
+ }
+
+ @Override
+ public Type visitForAll(ForAll t, List<TypeCompound> s) {
+ // Impossible?
+ return t;
+ }
+
+ @Override
+ public Type visitUndetVar(UndetVar t, List<TypeCompound> s) {
+ // Impossible?
+ return t;
+ }
+
+ @Override
+ public Type visitErrorType(ErrorType t, List<TypeCompound> s) {
+ return new AnnotatedType(s, t);
+ }
+
+ @Override
+ public Type visitType(Type t, List<TypeCompound> s) {
+ // Error?
+ return t;
+ }
+ };
+
+ return type.accept(visitor, annotations);
+ }
+
+ private static Attribute.TypeCompound toTypeCompound(Attribute.Compound a, TypeAnnotationPosition p) {
+ // It is safe to alias the position.
+ return new Attribute.TypeCompound(a, p);
+ }
+
+ private AnnotationType annotationType(Attribute.Compound a, Symbol s) {
+ Attribute.Compound atTarget =
+ a.type.tsym.attribute(syms.annotationTargetType.tsym);
+ if (atTarget == null) {
+ return inferTargetMetaInfo(a, s);
+ }
+ Attribute atValue = atTarget.member(names.value);
+ if (!(atValue instanceof Attribute.Array)) {
+ Assert.error("annotationType(): bad @Target argument " + atValue +
+ " (" + atValue.getClass() + ")");
+ return AnnotationType.DECLARATION; // error recovery
+ }
+ Attribute.Array arr = (Attribute.Array) atValue;
+ boolean isDecl = false, isType = false;
+ for (Attribute app : arr.values) {
+ if (!(app instanceof Attribute.Enum)) {
+ Assert.error("annotationType(): unrecognized Attribute kind " + app +
+ " (" + app.getClass() + ")");
+ isDecl = true;
+ continue;
+ }
+ Attribute.Enum e = (Attribute.Enum) app;
+ if (e.value.name == names.TYPE) {
+ if (s.kind == Kinds.TYP)
+ isDecl = true;
+ } else if (e.value.name == names.FIELD) {
+ if (s.kind == Kinds.VAR &&
+ s.owner.kind != Kinds.MTH)
+ isDecl = true;
+ } else if (e.value.name == names.METHOD) {
+ if (s.kind == Kinds.MTH &&
+ !s.isConstructor())
+ isDecl = true;
+ } else if (e.value.name == names.PARAMETER) {
+ if (s.kind == Kinds.VAR &&
+ s.owner.kind == Kinds.MTH &&
+ (s.flags() & Flags.PARAMETER) != 0)
+ isDecl = true;
+ } else if (e.value.name == names.CONSTRUCTOR) {
+ if (s.kind == Kinds.MTH &&
+ s.isConstructor())
+ isDecl = true;
+ } else if (e.value.name == names.LOCAL_VARIABLE) {
+ if (s.kind == Kinds.VAR &&
+ s.owner.kind == Kinds.MTH &&
+ (s.flags() & Flags.PARAMETER) == 0)
+ isDecl = true;
+ } else if (e.value.name == names.ANNOTATION_TYPE) {
+ if (s.kind == Kinds.TYP &&
+ (s.flags() & Flags.ANNOTATION) != 0)
+ isDecl = true;
+ } else if (e.value.name == names.PACKAGE) {
+ if (s.kind == Kinds.PCK)
+ isDecl = true;
+ } else if (e.value.name == names.TYPE_USE) {
+ if (s.kind == Kinds.TYP ||
+ s.kind == Kinds.VAR ||
+ (s.kind == Kinds.MTH && !s.isConstructor() &&
+ !s.type.getReturnType().hasTag(TypeTag.VOID)) ||
+ (s.kind == Kinds.MTH && s.isConstructor()))
+ isType = true;
+ } else if (e.value.name == names.TYPE_PARAMETER) {
+ /* Irrelevant in this case */
+ // TYPE_PARAMETER doesn't aid in distinguishing between
+ // Type annotations and declaration annotations on an
+ // Element
+ } else {
+ Assert.error("annotationType(): unrecognized Attribute name " + e.value.name +
+ " (" + e.value.name.getClass() + ")");
+ isDecl = true;
+ }
+ }
+ if (isDecl && isType) {
+ return AnnotationType.BOTH;
+ } else if (isType) {
+ return AnnotationType.TYPE;
+ } else {
+ return AnnotationType.DECLARATION;
+ }
+ }
+
+ /** Infer the target annotation kind, if none is give.
+ * We only infer declaration annotations.
+ */
+ private static AnnotationType inferTargetMetaInfo(Attribute.Compound a, Symbol s) {
+ return AnnotationType.DECLARATION;
+ }
+
+
+ /* This is the beginning of the second part of organizing
+ * type annotations: determine the type annotation positions.
+ */
+
+ private void resolveFrame(JCTree tree, JCTree frame,
+ List<JCTree> path, TypeAnnotationPosition p) {
+ /*
+ System.out.println("Resolving tree: " + tree + " kind: " + tree.getKind());
+ System.out.println(" Framing tree: " + frame + " kind: " + frame.getKind());
+ */
+ switch (frame.getKind()) {
+ case TYPE_CAST:
+ p.type = TargetType.CAST;
+ p.pos = frame.pos;
+ return;
+
+ case INSTANCE_OF:
+ p.type = TargetType.INSTANCEOF;
+ p.pos = frame.pos;
+ return;
+
+ case NEW_CLASS:
+ JCNewClass frameNewClass = (JCNewClass)frame;
+ if (frameNewClass.typeargs.contains(tree)) {
+ p.type = TargetType.CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT;
+ p.type_index = frameNewClass.typeargs.indexOf(tree);
+ } else {
+ p.type = TargetType.NEW;
+ }
+ p.pos = frame.pos;
+ return;
+
+ case NEW_ARRAY:
+ p.type = TargetType.NEW;
+ p.pos = frame.pos;
+ return;
+
+ case ANNOTATION_TYPE:
+ case CLASS:
+ case ENUM:
+ case INTERFACE:
+ p.pos = frame.pos;
+ if (((JCClassDecl)frame).extending == tree) {
+ p.type = TargetType.CLASS_EXTENDS;
+ p.type_index = -1;
+ } else if (((JCClassDecl)frame).implementing.contains(tree)) {
+ p.type = TargetType.CLASS_EXTENDS;
+ p.type_index = ((JCClassDecl)frame).implementing.indexOf(tree);
+ } else if (((JCClassDecl)frame).typarams.contains(tree)) {
+ p.type = TargetType.CLASS_TYPE_PARAMETER;
+ p.parameter_index = ((JCClassDecl)frame).typarams.indexOf(tree);
+ } else {
+ Assert.error("Could not determine position of tree " + tree +
+ " within frame " + frame);
+ }
+ return;
+
+ case METHOD: {
+ JCMethodDecl frameMethod = (JCMethodDecl) frame;
+ p.pos = frame.pos;
+ if (frameMethod.thrown.contains(tree)) {
+ p.type = TargetType.THROWS;
+ p.type_index = frameMethod.thrown.indexOf(tree);
+ } else if (frameMethod.restype == tree) {
+ p.type = TargetType.METHOD_RETURN;
+ } else if (frameMethod.typarams.contains(tree)) {
+ p.type = TargetType.METHOD_TYPE_PARAMETER;
+ p.parameter_index = frameMethod.typarams.indexOf(tree);
+ } else {
+ Assert.error("Could not determine position of tree " + tree +
+ " within frame " + frame);
+ }
+ return;
+ }
+
+ case PARAMETERIZED_TYPE: {
+ if (((JCTypeApply)frame).clazz == tree) {
+ // generic: RAW; noop
+ } else if (((JCTypeApply)frame).arguments.contains(tree)) {
+ JCTypeApply taframe = (JCTypeApply) frame;
+ int arg = taframe.arguments.indexOf(tree);
+ p.location = p.location.prepend(new TypePathEntry(TypePathEntryKind.TYPE_ARGUMENT, arg));
+
+ locateNestedTypes(taframe.type, p);
+ } else {
+ Assert.error("Could not determine type argument position of tree " + tree +
+ " within frame " + frame);
+ }
+
+ List<JCTree> newPath = path.tail;
+ resolveFrame(newPath.head, newPath.tail.head, newPath, p);
+ return;
+ }
+
+ case ARRAY_TYPE: {
+ ListBuffer<TypePathEntry> index = ListBuffer.lb();
+ index = index.append(TypePathEntry.ARRAY);
+ List<JCTree> newPath = path.tail;
+ while (true) {
+ JCTree npHead = newPath.tail.head;
+ if (npHead.hasTag(JCTree.Tag.TYPEARRAY)) {
+ newPath = newPath.tail;
+ index = index.append(TypePathEntry.ARRAY);
+ } else if (npHead.hasTag(JCTree.Tag.ANNOTATED_TYPE)) {
+ newPath = newPath.tail;
+ } else {
+ break;
+ }
+ }
+ p.location = p.location.prependList(index.toList());
+ resolveFrame(newPath.head, newPath.tail.head, newPath, p);
+ return;
+ }
+
+ case TYPE_PARAMETER:
+ if (path.tail.tail.head.hasTag(JCTree.Tag.CLASSDEF)) {
+ JCClassDecl clazz = (JCClassDecl)path.tail.tail.head;
+ p.type = TargetType.CLASS_TYPE_PARAMETER_BOUND;
+ p.parameter_index = clazz.typarams.indexOf(path.tail.head);
+ p.bound_index = ((JCTypeParameter)frame).bounds.indexOf(tree);
+ if (((JCTypeParameter)frame).bounds.get(0).type.isInterface()) {
+ // Account for an implicit Object as bound 0
+ p.bound_index += 1;
+ }
+ } else if (path.tail.tail.head.hasTag(JCTree.Tag.METHODDEF)) {
+ JCMethodDecl method = (JCMethodDecl)path.tail.tail.head;
+ p.type = TargetType.METHOD_TYPE_PARAMETER_BOUND;
+ p.parameter_index = method.typarams.indexOf(path.tail.head);
+ p.bound_index = ((JCTypeParameter)frame).bounds.indexOf(tree);
+ if (((JCTypeParameter)frame).bounds.get(0).type.isInterface()) {
+ // Account for an implicit Object as bound 0
+ p.bound_index += 1;
+ }
+ } else {
+ Assert.error("Could not determine position of tree " + tree +
+ " within frame " + frame);
+ }
+ p.pos = frame.pos;
+ return;
+
+ case VARIABLE:
+ VarSymbol v = ((JCVariableDecl)frame).sym;
+ p.pos = frame.pos;
+ switch (v.getKind()) {
+ case LOCAL_VARIABLE:
+ p.type = TargetType.LOCAL_VARIABLE;
+ break;
+ case FIELD:
+ p.type = TargetType.FIELD;
+ break;
+ case PARAMETER:
+ if (v.getQualifiedName().equals(names._this)) {
+ // TODO: Intro a separate ElementKind?
+ p.type = TargetType.METHOD_RECEIVER;
+ } else {
+ p.type = TargetType.METHOD_FORMAL_PARAMETER;
+ p.parameter_index = methodParamIndex(path, frame);
+ }
+ break;
+ case EXCEPTION_PARAMETER:
+ p.type = TargetType.EXCEPTION_PARAMETER;
+ break;
+ case RESOURCE_VARIABLE:
+ p.type = TargetType.RESOURCE_VARIABLE;
+ break;
+ default:
+ Assert.error("Found unexpected type annotation for variable: " + v + " with kind: " + v.getKind());
+ }
+ return;
+
+ case ANNOTATED_TYPE: {
+ if (frame == tree) {
+ // This is only true for the first annotated type we see.
+ // For any other annotated types along the path, we do
+ // not care about inner types.
+ JCAnnotatedType atypetree = (JCAnnotatedType) frame;
+ final Type utype = atypetree.underlyingType.type;
+ Symbol tsym = utype.tsym;
+ if (tsym.getKind().equals(ElementKind.TYPE_PARAMETER) ||
+ utype.getKind().equals(TypeKind.WILDCARD) ||
+ utype.getKind().equals(TypeKind.ARRAY)) {
+ // Type parameters, wildcards, and arrays have the declaring
+ // class/method as enclosing elements.
+ // There is actually nothing to do for them.
+ } else {
+ locateNestedTypes(utype, p);
+ }
+ }
+ List<JCTree> newPath = path.tail;
+ resolveFrame(newPath.head, newPath.tail.head, newPath, p);
+ return;
+ }
+
+ case UNION_TYPE: {
+ // TODO: can we store any information here to help in
+ // determining the final position?
+ List<JCTree> newPath = path.tail;
+ resolveFrame(newPath.head, newPath.tail.head, newPath, p);
+ return;
+ }
+
+ case METHOD_INVOCATION: {
+ JCMethodInvocation invocation = (JCMethodInvocation)frame;
+ if (!invocation.typeargs.contains(tree)) {
+ Assert.error("{" + tree + "} is not an argument in the invocation: " + invocation);
+ }
+ p.type = TargetType.METHOD_INVOCATION_TYPE_ARGUMENT;
+ p.pos = invocation.pos;
+ p.type_index = invocation.typeargs.indexOf(tree);
+ return;
+ }
+
+ case EXTENDS_WILDCARD:
+ case SUPER_WILDCARD: {
+ // Annotations in wildcard bounds
+ p.location = p.location.prepend(TypePathEntry.WILDCARD);
+ List<JCTree> newPath = path.tail;
+ resolveFrame(newPath.head, newPath.tail.head, newPath, p);
+ return;
+ }
+
+ case MEMBER_SELECT: {
+ List<JCTree> newPath = path.tail;
+ resolveFrame(newPath.head, newPath.tail.head, newPath, p);
+ return;
+ }
+
+ default:
+ Assert.error("Unresolved frame: " + frame + " of kind: " + frame.getKind() +
+ "\n Looking for tree: " + tree);
+ return;
+ }
+ }
+
+ private static void locateNestedTypes(Type type, TypeAnnotationPosition p) {
+ // The number of "steps" to get from the full type to the
+ // left-most outer type.
+ ListBuffer<TypePathEntry> depth = ListBuffer.lb();
+
+ Type encl = type.getEnclosingType();
+ while (encl != null &&
+ encl.getKind() != TypeKind.NONE &&
+ encl.getKind() != TypeKind.ERROR) {
+ depth = depth.append(TypePathEntry.INNER_TYPE);
+ encl = encl.getEnclosingType();
+ }
+ if (depth.nonEmpty()) {
+ p.location = p.location.prependList(depth.toList());
+ }
+ }
+
+ private static int methodParamIndex(List<JCTree> path, JCTree param) {
+ List<JCTree> curr = path;
+ while (curr.head.getTag() != Tag.METHODDEF) {
+ curr = curr.tail;
+ }
+ JCMethodDecl method = (JCMethodDecl)curr.head;
+ return method.params.indexOf(param);
+ }
+
+ // Each class (including enclosed inner classes) is visited separately.
+ // This flag is used to prevent from visiting inner classes.
+ private boolean isInClass = false;
+
+ @Override
+ public void visitClassDef(JCClassDecl tree) {
+ if (isInClass)
+ return;
+ isInClass = true;
+ if (sigOnly) {
+ scan(tree.mods);
+ scan(tree.typarams);
+ scan(tree.extending);
+ scan(tree.implementing);
+ }
+ scan(tree.defs);
+ }
+
+ /**
+ * Resolve declaration vs. type annotations in methods and
+ * then determine the positions.
+ */
+ @Override
+ public void visitMethodDef(final JCMethodDecl tree) {
+ if (tree.sym == null) {
+ // Something most be wrong, e.g. a class not found.
+ // Quietly ignore. (See test FailOver15.java)
+ return;
+ }
+ if (sigOnly) {
+ {
+ TypeAnnotationPosition pos = new TypeAnnotationPosition();
+ pos.type = TargetType.METHOD_RETURN;
+ if (tree.sym.isConstructor()) {
+ pos.pos = tree.pos;
+ // Use null to mark that the annotations go with the symbol.
+ separateAnnotationsKinds(tree, null, tree.sym, pos);
+ } else {
+ pos.pos = tree.restype.pos;
+ separateAnnotationsKinds(tree.restype, tree.sym.type.getReturnType(),
+ tree.sym, pos);
+ }
+ }
+ if (tree.recvparam != null && tree.recvparam.sym != null) {
+ // TODO: make sure there are no declaration annotations.
+ TypeAnnotationPosition pos = new TypeAnnotationPosition();
+ pos.type = TargetType.METHOD_RECEIVER;
+ pos.pos = tree.recvparam.vartype.pos;
+ separateAnnotationsKinds(tree.recvparam.vartype, tree.recvparam.sym.type,
+ tree.recvparam.sym, pos);
+ }
+ int i = 0;
+ for (JCVariableDecl param : tree.params) {
+ TypeAnnotationPosition pos = new TypeAnnotationPosition();
+ pos.type = TargetType.METHOD_FORMAL_PARAMETER;
+ pos.parameter_index = i;
+ pos.pos = param.vartype.pos;
+ separateAnnotationsKinds(param.vartype, param.sym.type, param.sym, pos);
+ ++i;
+ }
+ }
+
+ push(tree);
+ // super.visitMethodDef(tree);
+ if (sigOnly) {
+ scan(tree.mods);
+ scan(tree.restype);
+ scan(tree.typarams);
+ scan(tree.recvparam);
+ scan(tree.params);
+ scan(tree.thrown);
+ } else {
+ scan(tree.defaultValue);
+ scan(tree.body);
+ }
+ pop();
+ }
+
+ /**
+ * Resolve declaration vs. type annotations in variable declarations and
+ * then determine the positions.
+ */
+ @Override
+ public void visitVarDef(final JCVariableDecl tree) {
+ if (tree.sym == null) {
+ // Something is wrong already. Quietly ignore.
+ } else if (tree.sym.getKind() == ElementKind.FIELD) {
+ if (sigOnly) {
+ TypeAnnotationPosition pos = new TypeAnnotationPosition();
+ pos.type = TargetType.FIELD;
+ pos.pos = tree.pos;
+ separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
+ }
+ } else if (tree.sym.getKind() == ElementKind.LOCAL_VARIABLE) {
+ TypeAnnotationPosition pos = new TypeAnnotationPosition();
+ pos.type = TargetType.LOCAL_VARIABLE;
+ pos.pos = tree.pos;
+ separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
+ } else if (tree.sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
+ // System.out.println("Found exception param: " + tree);
+ TypeAnnotationPosition pos = new TypeAnnotationPosition();
+ pos.type = TargetType.EXCEPTION_PARAMETER;
+ pos.pos = tree.pos;
+ separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
+ } else if (tree.sym.getKind() == ElementKind.RESOURCE_VARIABLE) {
+ TypeAnnotationPosition pos = new TypeAnnotationPosition();
+ pos.type = TargetType.RESOURCE_VARIABLE;
+ pos.pos = tree.pos;
+ separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
+ } else {
+ // There is nothing else in a variable declaration that needs separation.
+ // System.out.println("We found a: " + tree);
+ }
+
+ push(tree);
+ // super.visitVarDef(tree);
+ scan(tree.mods);
+ scan(tree.vartype);
+ if (!sigOnly) {
+ scan(tree.init);
+ }
+ pop();
+ }
+
+ @Override
+ public void visitBlock(JCBlock tree) {
+ // Do not descend into top-level blocks when only interested
+ // in the signature.
+ if (!sigOnly) {
+ scan(tree.stats);
+ }
+ }
+
+ @Override
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ push(tree);
+ findPosition(tree, tree, tree.annotations);
+ pop();
+ super.visitAnnotatedType(tree);
+ }
+
+ @Override
+ public void visitTypeParameter(JCTypeParameter tree) {
+ findPosition(tree, peek2(), tree.annotations);
+ super.visitTypeParameter(tree);
+ }
+
+ @Override
+ public void visitNewArray(JCNewArray tree) {
+ findPosition(tree, tree, tree.annotations);
+ int dimAnnosCount = tree.dimAnnotations.size();
+ ListBuffer<TypePathEntry> depth = ListBuffer.lb();
+
+ // handle annotations associated with dimensions
+ for (int i = 0; i < dimAnnosCount; ++i) {
+ TypeAnnotationPosition p = new TypeAnnotationPosition();
+ p.pos = tree.pos;
+ p.type = TargetType.NEW;
+ if (i != 0) {
+ depth = depth.append(TypePathEntry.ARRAY);
+ p.location = p.location.appendList(depth.toList());
+ }
+
+ setTypeAnnotationPos(tree.dimAnnotations.get(i), p);
+ }
+
+ // handle "free" annotations
+ // int i = dimAnnosCount == 0 ? 0 : dimAnnosCount - 1;
+ // TODO: is depth.size == i here?
+ JCExpression elemType = tree.elemtype;
+ while (elemType != null) {
+ if (elemType.hasTag(JCTree.Tag.ANNOTATED_TYPE)) {
+ JCAnnotatedType at = (JCAnnotatedType)elemType;
+ TypeAnnotationPosition p = new TypeAnnotationPosition();
+ p.type = TargetType.NEW;
+ p.pos = tree.pos;
+ p.location = p.location.appendList(depth.toList());
+ setTypeAnnotationPos(at.annotations, p);
+ elemType = at.underlyingType;
+ } else if (elemType.hasTag(JCTree.Tag.TYPEARRAY)) {
+ depth = depth.append(TypePathEntry.ARRAY);
+ elemType = ((JCArrayTypeTree)elemType).elemtype;
+ } else {
+ break;
+ }
+ }
+ scan(tree.elems);
+ }
+
+ private void findPosition(JCTree tree, JCTree frame, List<JCAnnotation> annotations) {
+ if (!annotations.isEmpty()) {
+ /*
+ System.out.println("Finding pos for: " + annotations);
+ System.out.println(" tree: " + tree);
+ System.out.println(" frame: " + frame);
+ */
+ TypeAnnotationPosition p = new TypeAnnotationPosition();
+ resolveFrame(tree, frame, frames.toList(), p);
+ setTypeAnnotationPos(annotations, p);
+ }
+ }
+
+ private static void setTypeAnnotationPos(List<JCAnnotation> annotations,
+ TypeAnnotationPosition position) {
+ for (JCAnnotation anno : annotations) {
+ ((Attribute.TypeCompound) anno.attribute).position = position;
+ }
+ }
+ }
+}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,13 +34,14 @@
import java.util.Set;
import java.util.WeakHashMap;
+import javax.lang.model.type.TypeKind;
+
import com.sun.tools.javac.code.Attribute.RetentionPolicy;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.Type.UndetVar.InferenceBound;
import com.sun.tools.javac.comp.Check;
import com.sun.tools.javac.jvm.ClassReader;
import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.List;
import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Scope.*;
@@ -354,8 +355,29 @@
return descSym;
}
- public Type getType(Type origin) {
- return memberType(origin, descSym);
+ public Type getType(Type site) {
+ if (capture(site) != site) {
+ Type formalInterface = site.tsym.type;
+ ListBuffer<Type> typeargs = ListBuffer.lb();
+ List<Type> actualTypeargs = site.getTypeArguments();
+ //simply replace the wildcards with its bound
+ for (Type t : formalInterface.getTypeArguments()) {
+ if (actualTypeargs.head.hasTag(WILDCARD)) {
+ WildcardType wt = (WildcardType)actualTypeargs.head;
+ typeargs.append(wt.type);
+ } else {
+ typeargs.append(actualTypeargs.head);
+ }
+ actualTypeargs = actualTypeargs.tail;
+ }
+ site = subst(formalInterface, formalInterface.getTypeArguments(), typeargs.toList());
+ if (!chk.checkValidGenericType(site)) {
+ //if the inferred functional interface type is not well-formed,
+ //or if it's not a subtype of the original target, issue an error
+ throw failure(diags.fragment("no.suitable.functional.intf.inst", site));
+ }
+ }
+ return memberType(site, descSym);
}
}
@@ -392,9 +414,9 @@
* Compute the function descriptor associated with a given functional interface
*/
public FunctionDescriptor findDescriptorInternal(TypeSymbol origin, CompoundScope membersCache) throws FunctionDescriptorLookupError {
- if (!origin.isInterface()) {
+ if (!origin.isInterface() || (origin.flags() & ANNOTATION) != 0) {
//t must be an interface
- throw failure("not.a.functional.intf");
+ throw failure("not.a.functional.intf", origin);
}
final ListBuffer<Symbol> abstracts = ListBuffer.lb();
@@ -406,13 +428,13 @@
abstracts.append(sym);
} else {
//the target method(s) should be the only abstract members of t
- throw failure("not.a.functional.intf.1",
+ throw failure("not.a.functional.intf.1", origin,
diags.fragment("incompatible.abstracts", Kinds.kindName(origin), origin));
}
}
if (abstracts.isEmpty()) {
//t must define a suitable non-generic method
- throw failure("not.a.functional.intf.1",
+ throw failure("not.a.functional.intf.1", origin,
diags.fragment("no.abstracts", Kinds.kindName(origin), origin));
} else if (abstracts.size() == 1) {
return new FunctionDescriptor(abstracts.first());
@@ -553,6 +575,15 @@
return false;
}
}
+
+ public boolean isFunctionalInterface(Type site) {
+ try {
+ findDescriptorType(site);
+ return true;
+ } catch (FunctionDescriptorLookupError ex) {
+ return false;
+ }
+ }
// </editor-fold>
/**
@@ -654,6 +685,8 @@
//where
private boolean isSubtypeUncheckedInternal(Type t, Type s, Warner warn) {
if (t.hasTag(ARRAY) && s.hasTag(ARRAY)) {
+ t = t.unannotatedType();
+ s = s.unannotatedType();
if (((ArrayType)t).elemtype.isPrimitive()) {
return isSameType(elemtype(t), elemtype(s));
} else {
@@ -679,7 +712,10 @@
}
private void checkUnsafeVarargsConversion(Type t, Type s, Warner warn) {
- if (t.tag != ARRAY || isReifiable(t)) return;
+ if (t.tag != ARRAY || isReifiable(t))
+ return;
+ t = t.unannotatedType();
+ s = s.unannotatedType();
ArrayType from = (ArrayType)t;
boolean shouldWarn = false;
switch (s.tag) {
@@ -712,6 +748,12 @@
if (t == s)
return true;
+ t = t.unannotatedType();
+ s = s.unannotatedType();
+
+ if (t == s)
+ return true;
+
if (s.isPartial())
return isSuperType(s, t);
@@ -1653,6 +1695,7 @@
case WILDCARD:
return elemtype(upperBound(t));
case ARRAY:
+ t = t.unannotatedType();
return ((ArrayType)t).elemtype;
case FORALL:
return elemtype(((ForAll)t).qtype);
@@ -1981,6 +2024,11 @@
public Type visitErrorType(ErrorType t, Boolean recurse) {
return t;
}
+
+ @Override
+ public Type visitAnnotatedType(AnnotatedType t, Boolean recurse) {
+ return new AnnotatedType(t.typeAnnotations, erasure(t.underlyingType, recurse));
+ }
};
private Mapping erasureFun = new Mapping ("erasure") {
@@ -2923,6 +2971,7 @@
* graph. Undefined for all but reference types.
*/
public int rank(Type t) {
+ t = t.unannotatedType();
switch(t.tag) {
case CLASS: {
ClassType cls = (ClassType)t;
@@ -3624,6 +3673,7 @@
t = subst(type1, t.tsym.type.getTypeArguments(), t.getTypeArguments());
}
}
+ t = t.unannotatedType();
ClassType cls = (ClassType)t;
if (cls.isRaw() || !cls.isParameterized())
return cls;
@@ -4142,6 +4192,8 @@
public R visitForAll(ForAll t, S s) { return visitType(t, s); }
public R visitUndetVar(UndetVar t, S s) { return visitType(t, s); }
public R visitErrorType(ErrorType t, S s) { return visitType(t, s); }
+ // Pretend annotations don't exist
+ public R visitAnnotatedType(AnnotatedType t, S s) { return visit(t.underlyingType, s); }
}
/**
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
package com.sun.tools.javac.comp;
import java.util.Map;
+
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.code.*;
@@ -87,20 +88,30 @@
private int enterCount = 0;
ListBuffer<Annotator> q = new ListBuffer<Annotator>();
+ ListBuffer<Annotator> typesQ = new ListBuffer<Annotator>();
ListBuffer<Annotator> repeatedQ = new ListBuffer<Annotator>();
+ ListBuffer<Annotator> afterRepeatedQ = new ListBuffer<Annotator>();
+
+ public void earlier(Annotator a) {
+ q.prepend(a);
+ }
public void normal(Annotator a) {
q.append(a);
}
- public void earlier(Annotator a) {
- q.prepend(a);
+ public void typeAnnotation(Annotator a) {
+ typesQ.append(a);
}
public void repeated(Annotator a) {
repeatedQ.append(a);
}
+ public void afterRepeated(Annotator a) {
+ afterRepeatedQ.append(a);
+ }
+
/** Called when the Enter phase starts. */
public void enterStart() {
enterCount++;
@@ -116,12 +127,18 @@
if (enterCount != 0) return;
enterCount++;
try {
- while (q.nonEmpty())
+ while (q.nonEmpty()) {
q.next().enterAnnotation();
-
+ }
+ while (typesQ.nonEmpty()) {
+ typesQ.next().enterAnnotation();
+ }
while (repeatedQ.nonEmpty()) {
repeatedQ.next().enterAnnotation();
}
+ while (afterRepeatedQ.nonEmpty()) {
+ afterRepeatedQ.next().enterAnnotation();
+ }
} finally {
enterCount--;
}
@@ -141,16 +158,18 @@
* This context contains all the information needed to synthesize new
* annotations trees by the completer for repeating annotations.
*/
- public class AnnotateRepeatedContext {
+ public class AnnotateRepeatedContext<T extends Attribute.Compound> {
public final Env<AttrContext> env;
- public final Map<Symbol.TypeSymbol, ListBuffer<Attribute.Compound>> annotated;
- public final Map<Attribute.Compound, JCDiagnostic.DiagnosticPosition> pos;
+ public final Map<Symbol.TypeSymbol, ListBuffer<T>> annotated;
+ public final Map<T, JCDiagnostic.DiagnosticPosition> pos;
public final Log log;
+ public final boolean isTypeCompound;
public AnnotateRepeatedContext(Env<AttrContext> env,
- Map<Symbol.TypeSymbol, ListBuffer<Attribute.Compound>> annotated,
- Map<Attribute.Compound, JCDiagnostic.DiagnosticPosition> pos,
- Log log) {
+ Map<Symbol.TypeSymbol, ListBuffer<T>> annotated,
+ Map<T, JCDiagnostic.DiagnosticPosition> pos,
+ Log log,
+ boolean isTypeCompound) {
Assert.checkNonNull(env);
Assert.checkNonNull(annotated);
Assert.checkNonNull(pos);
@@ -160,6 +179,7 @@
this.annotated = annotated;
this.pos = pos;
this.log = log;
+ this.isTypeCompound = isTypeCompound;
}
/**
@@ -170,7 +190,7 @@
* @param repeatingAnnotations a List of repeating annotations
* @return a new Attribute.Compound that is the container for the repeatingAnnotations
*/
- public Attribute.Compound processRepeatedAnnotations(List<Attribute.Compound> repeatingAnnotations, Symbol sym) {
+ public T processRepeatedAnnotations(List<T> repeatingAnnotations, Symbol sym) {
return Annotate.this.processRepeatedAnnotations(repeatingAnnotations, this, sym);
}
@@ -246,7 +266,12 @@
((MethodSymbol)method, value));
t.type = result;
}
- return new Attribute.Compound(a.type, buf.toList());
+ // TODO: this should be a TypeCompound if "a" is a JCTypeAnnotation.
+ // However, how do we find the correct position?
+ Attribute.Compound ac = new Attribute.Compound(a.type, buf.toList());
+ // TODO: is this something we want? Who would use it?
+ // a.attribute = ac;
+ return ac;
}
Attribute enterAttributeValue(Type expected,
@@ -329,6 +354,15 @@
return new Attribute.Error(attr.attribExpr(tree, env, expected));
}
+ Attribute.TypeCompound enterTypeAnnotation(JCAnnotation a,
+ Type expected,
+ Env<AttrContext> env) {
+ Attribute.Compound c = enterAnnotation(a, expected, env);
+ Attribute.TypeCompound tc = new Attribute.TypeCompound(c.type, c.values, new TypeAnnotationPosition());
+ a.attribute = tc;
+ return tc;
+ }
+
/* *********************************
* Support for repeating annotations
***********************************/
@@ -337,10 +371,10 @@
* synthesized container annotation or null IFF all repeating
* annotation are invalid. This method reports errors/warnings.
*/
- private Attribute.Compound processRepeatedAnnotations(List<Attribute.Compound> annotations,
- AnnotateRepeatedContext ctx,
- Symbol on) {
- Attribute.Compound firstOccurrence = annotations.head;
+ private <T extends Attribute.Compound> T processRepeatedAnnotations(List<T> annotations,
+ AnnotateRepeatedContext<T> ctx,
+ Symbol on) {
+ T firstOccurrence = annotations.head;
List<Attribute> repeated = List.nil();
Type origAnnoType = null;
Type arrayOfOrigAnnoType = null;
@@ -350,16 +384,16 @@
Assert.check(!annotations.isEmpty() &&
!annotations.tail.isEmpty()); // i.e. size() > 1
- for (List<Attribute.Compound> al = annotations;
+ for (List<T> al = annotations;
!al.isEmpty();
al = al.tail)
{
- Attribute.Compound currentAnno = al.head;
+ T currentAnno = al.head;
origAnnoType = currentAnno.type;
if (arrayOfOrigAnnoType == null) {
arrayOfOrigAnnoType = types.makeArrayType(origAnnoType);
-}
+ }
Type currentContainerType = getContainingType(currentAnno, ctx.pos.get(currentAnno));
if (currentContainerType == null) {
@@ -383,25 +417,46 @@
if (!repeated.isEmpty()) {
repeated = repeated.reverse();
- JCAnnotation annoTree;
TreeMaker m = make.at(ctx.pos.get(firstOccurrence));
Pair<MethodSymbol, Attribute> p =
new Pair<MethodSymbol, Attribute>(containerValueSymbol,
new Attribute.Array(arrayOfOrigAnnoType, repeated));
- annoTree = m.Annotation(new Attribute.Compound(targetContainerType,
- List.of(p)));
+ if (ctx.isTypeCompound) {
+ /* TODO: the following code would be cleaner:
+ Attribute.TypeCompound at = new Attribute.TypeCompound(targetContainerType, List.of(p),
+ ((Attribute.TypeCompound)annotations.head).position);
+ JCTypeAnnotation annoTree = m.TypeAnnotation(at);
+ at = enterTypeAnnotation(annoTree, targetContainerType, ctx.env);
+ */
+ // However, we directly construct the TypeCompound to keep the
+ // direct relation to the contained TypeCompounds.
+ Attribute.TypeCompound at = new Attribute.TypeCompound(targetContainerType, List.of(p),
+ ((Attribute.TypeCompound)annotations.head).position);
- if (!chk.annotationApplicable(annoTree, on))
- log.error(annoTree.pos(), "invalid.containedby.annotation.incompatible.target", targetContainerType, origAnnoType);
+ // TODO: annotation applicability checks from below?
+
+ at.setSynthesized(true);
- if (!chk.validateAnnotationDeferErrors(annoTree))
- log.error(annoTree.pos(), "duplicate.annotation.invalid.repeated", origAnnoType);
+ @SuppressWarnings("unchecked")
+ T x = (T) at;
+ return x;
+ } else {
+ Attribute.Compound c = new Attribute.Compound(targetContainerType, List.of(p));
+ JCAnnotation annoTree = m.Annotation(c);
+
+ if (!chk.annotationApplicable(annoTree, on))
+ log.error(annoTree.pos(), "invalid.repeatable.annotation.incompatible.target", targetContainerType, origAnnoType);
- Attribute.Compound c = enterAnnotation(annoTree,
- targetContainerType,
- ctx.env);
- c.setSynthesized(true);
- return c;
+ if (!chk.validateAnnotationDeferErrors(annoTree))
+ log.error(annoTree.pos(), "duplicate.annotation.invalid.repeated", origAnnoType);
+
+ c = enterAnnotation(annoTree, targetContainerType, ctx.env);
+ c.setSynthesized(true);
+
+ @SuppressWarnings("unchecked")
+ T x = (T) c;
+ return x;
+ }
} else {
return null; // errors should have been reported elsewhere
}
@@ -414,11 +469,11 @@
Type origAnnoType = currentAnno.type;
TypeSymbol origAnnoDecl = origAnnoType.tsym;
- // Fetch the ContainedBy annotation from the current
+ // Fetch the Repeatable annotation from the current
// annotation's declaration, or null if it has none
- Attribute.Compound ca = origAnnoDecl.attribute(syms.containedByType.tsym);
- if (ca == null) { // has no ContainedBy annotation
- log.error(pos, "duplicate.annotation.missing.container", origAnnoType, syms.containedByType);
+ Attribute.Compound ca = origAnnoDecl.attribute(syms.repeatableType.tsym);
+ if (ca == null) { // has no Repeatable annotation
+ log.error(pos, "duplicate.annotation.missing.container", origAnnoType, syms.repeatableType);
return null;
}
@@ -440,23 +495,23 @@
DiagnosticPosition pos,
TypeSymbol annoDecl)
{
- // The next three checks check that the ContainedBy annotation
+ // The next three checks check that the Repeatable annotation
// on the declaration of the annotation type that is repeating is
// valid.
- // ContainedBy must have at least one element
+ // Repeatable must have at least one element
if (ca.values.isEmpty()) {
- log.error(pos, "invalid.containedby.annotation", annoDecl);
+ log.error(pos, "invalid.repeatable.annotation", annoDecl);
return null;
}
Pair<MethodSymbol,Attribute> p = ca.values.head;
Name name = p.fst.name;
if (name != names.value) { // should contain only one element, named "value"
- log.error(pos, "invalid.containedby.annotation", annoDecl);
+ log.error(pos, "invalid.repeatable.annotation", annoDecl);
return null;
}
if (!(p.snd instanceof Attribute.Class)) { // check that the value of "value" is an Attribute.Class
- log.error(pos, "invalid.containedby.annotation", annoDecl);
+ log.error(pos, "invalid.repeatable.annotation", annoDecl);
return null;
}
@@ -491,13 +546,13 @@
}
if (error) {
log.error(pos,
- "invalid.containedby.annotation.multiple.values",
+ "invalid.repeatable.annotation.multiple.values",
targetContainerType,
nr_value_elems);
return null;
} else if (nr_value_elems == 0) {
log.error(pos,
- "invalid.containedby.annotation.no.value",
+ "invalid.repeatable.annotation.no.value",
targetContainerType);
return null;
}
@@ -506,7 +561,7 @@
// probably "impossible" to fail this
if (containerValueSymbol.kind != Kinds.MTH) {
log.error(pos,
- "invalid.containedby.annotation.invalid.value",
+ "invalid.repeatable.annotation.invalid.value",
targetContainerType);
fatalError = true;
}
@@ -518,7 +573,7 @@
if (!(types.isArray(valueRetType) &&
types.isSameType(expectedType, valueRetType))) {
log.error(pos,
- "invalid.containedby.annotation.value.return",
+ "invalid.repeatable.annotation.value.return",
targetContainerType,
valueRetType,
expectedType);
@@ -528,10 +583,7 @@
fatalError = true;
}
- // Explicitly no check for/validity of @ContainerFor. That is
- // done on declaration of the container, and at reflect time.
-
- // The rest of the conditions for a valid containing annotation are made
+ // The conditions for a valid containing annotation are made
// in Check.validateRepeatedAnnotaton();
return fatalError ? null : containerValueSymbol;
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
package com.sun.tools.javac.comp;
import java.util.*;
-import java.util.Set;
import javax.lang.model.element.ElementKind;
+import javax.lang.model.type.TypeKind;
import javax.tools.JavaFileObject;
import com.sun.source.tree.IdentifierTree;
@@ -45,9 +45,9 @@
import com.sun.tools.javac.comp.Infer.InferenceContext;
import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.jvm.Target;
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.List;
@@ -879,6 +879,7 @@
deferredLintHandler.flush(tree.pos());
chk.checkDeprecatedAnnotation(tree.pos(), m);
+
// Create a new environment with local scope
// for attributing the method.
Env<AttrContext> localEnv = memberEnter.methodEnv(tree, env);
@@ -922,6 +923,21 @@
// Check that result type is well-formed.
chk.validate(tree.restype, localEnv);
+ // Check that receiver type is well-formed.
+ if (tree.recvparam != null) {
+ // Use a new environment to check the receiver parameter.
+ // Otherwise I get "might not have been initialized" errors.
+ // Is there a better way?
+ Env<AttrContext> newEnv = memberEnter.methodEnv(tree, env);
+ attribType(tree.recvparam, newEnv);
+ chk.validate(tree.recvparam, newEnv);
+ if (!(tree.recvparam.type == m.owner.type || types.isSameType(tree.recvparam.type, m.owner.type))) {
+ // The == covers the common non-generic case, but for generic classes we need isSameType;
+ // note that equals didn't work.
+ log.error(tree.recvparam.pos(), "incorrect.receiver.type");
+ }
+ }
+
// annotation method checks
if ((owner.flags() & ANNOTATION) != 0) {
// annotation method cannot have throws clause
@@ -953,8 +969,7 @@
// Empty bodies are only allowed for
// abstract, native, or interface methods, or for methods
// in a retrofit signature class.
- if (isDefaultMethod || ((owner.flags() & INTERFACE) == 0 &&
- (tree.mods.flags & (ABSTRACT | NATIVE)) == 0) &&
+ if (isDefaultMethod || (tree.sym.flags() & (ABSTRACT | NATIVE)) == 0 &&
!relax)
log.error(tree.pos(), "missing.meth.body.or.decl.abstract");
if (tree.defaultValue != null) {
@@ -996,9 +1011,14 @@
}
}
+ // Attribute all type annotations in the body
+ memberEnter.typeAnnotate(tree.body, localEnv, m);
+ annotate.flush();
+
// Attribute method body.
attribStat(tree.body, localEnv);
}
+
localEnv.info.scope.leave();
result = tree.type = m.type;
chk.validateAnnotations(tree.mods.annotations, m);
@@ -1019,6 +1039,12 @@
memberEnter.memberEnter(tree, env);
annotate.flush();
}
+ } else {
+ if (tree.init != null) {
+ // Field initializer expression need to be entered.
+ memberEnter.typeAnnotate(tree.init, env, tree.sym);
+ annotate.flush();
+ }
}
VarSymbol v = tree.sym;
@@ -1076,6 +1102,11 @@
new MethodSymbol(tree.flags | BLOCK, names.empty, null,
env.info.scope.owner);
if ((tree.flags & STATIC) != 0) localEnv.info.staticLevel++;
+
+ // Attribute all type annotations in the block
+ memberEnter.typeAnnotate(tree, localEnv, localEnv.info.scope.owner);
+ annotate.flush();
+
attribStats(tree.stats, localEnv);
} else {
// Create a new local environment with a local scope.
@@ -1376,18 +1407,19 @@
public void visitConditional(JCConditional tree) {
Type condtype = attribExpr(tree.cond, env, syms.booleanType);
- boolean standaloneConditional = !allowPoly ||
+ tree.polyKind = (!allowPoly ||
pt().hasTag(NONE) && pt() != Type.recoveryType ||
- isBooleanOrNumeric(env, tree);
-
- if (!standaloneConditional && resultInfo.pt.hasTag(VOID)) {
+ isBooleanOrNumeric(env, tree)) ?
+ PolyKind.STANDALONE : PolyKind.POLY;
+
+ if (tree.polyKind == PolyKind.POLY && resultInfo.pt.hasTag(VOID)) {
//cannot get here (i.e. it means we are returning from void method - which is already an error)
resultInfo.checkContext.report(tree, diags.fragment("conditional.target.cant.be.void"));
result = tree.type = types.createErrorType(resultInfo.pt);
return;
}
- ResultInfo condInfo = standaloneConditional ?
+ ResultInfo condInfo = tree.polyKind == PolyKind.STANDALONE ?
unknownExprInfo :
resultInfo.dup(new Check.NestedCheckContext(resultInfo.checkContext) {
//this will use enclosing check context to check compatibility of
@@ -1402,7 +1434,7 @@
Type truetype = attribTree(tree.truepart, env, condInfo);
Type falsetype = attribTree(tree.falsepart, env, condInfo);
- Type owntype = standaloneConditional ? condType(tree, truetype, falsetype) : pt();
+ Type owntype = (tree.polyKind == PolyKind.STANDALONE) ? condType(tree, truetype, falsetype) : pt();
if (condtype.constValue() != null &&
truetype.constValue() != null &&
falsetype.constValue() != null &&
@@ -1424,12 +1456,30 @@
JCConditional condTree = (JCConditional)tree;
return isBooleanOrNumeric(env, condTree.truepart) &&
isBooleanOrNumeric(env, condTree.falsepart);
+ case APPLY:
+ JCMethodInvocation speculativeMethodTree =
+ (JCMethodInvocation)deferredAttr.attribSpeculative(tree, env, unknownExprInfo);
+ Type owntype = TreeInfo.symbol(speculativeMethodTree.meth).type.getReturnType();
+ return types.unboxedTypeOrType(owntype).isPrimitive();
+ case NEWCLASS:
+ JCExpression className =
+ removeClassParams.translate(((JCNewClass)tree).clazz);
+ JCExpression speculativeNewClassTree =
+ (JCExpression)deferredAttr.attribSpeculative(className, env, unknownTypeInfo);
+ return types.unboxedTypeOrType(speculativeNewClassTree.type).isPrimitive();
default:
Type speculativeType = deferredAttr.attribSpeculative(tree, env, unknownExprInfo).type;
speculativeType = types.unboxedTypeOrType(speculativeType);
return speculativeType.isPrimitive();
}
}
+ //where
+ TreeTranslator removeClassParams = new TreeTranslator() {
+ @Override
+ public void visitTypeApply(JCTypeApply tree) {
+ result = translate(tree.clazz);
+ }
+ };
/** Compute the type of a conditional expression, after
* checking that it exists. See JLS 15.25. Does not take into
@@ -1828,10 +1878,24 @@
// If enclosing class is given, attribute it, and
// complete class name to be fully qualified
JCExpression clazz = tree.clazz; // Class field following new
- JCExpression clazzid = // Identifier in class field
- (clazz.hasTag(TYPEAPPLY))
- ? ((JCTypeApply) clazz).clazz
- : clazz;
+ JCExpression clazzid; // Identifier in class field
+ JCAnnotatedType annoclazzid; // Annotated type enclosing clazzid
+ annoclazzid = null;
+
+ if (clazz.hasTag(TYPEAPPLY)) {
+ clazzid = ((JCTypeApply) clazz).clazz;
+ if (clazzid.hasTag(ANNOTATED_TYPE)) {
+ annoclazzid = (JCAnnotatedType) clazzid;
+ clazzid = annoclazzid.underlyingType;
+ }
+ } else {
+ if (clazz.hasTag(ANNOTATED_TYPE)) {
+ annoclazzid = (JCAnnotatedType) clazz;
+ clazzid = annoclazzid.underlyingType;
+ } else {
+ clazzid = clazz;
+ }
+ }
JCExpression clazzid1 = clazzid; // The same in fully qualified form
@@ -1846,14 +1910,30 @@
// yields a clazz T.C.
Type encltype = chk.checkRefType(tree.encl.pos(),
attribExpr(tree.encl, env));
+ // TODO 308: in <expr>.new C, do we also want to add the type annotations
+ // from expr to the combined type, or not? Yes, do this.
clazzid1 = make.at(clazz.pos).Select(make.Type(encltype),
((JCIdent) clazzid).name);
- if (clazz.hasTag(TYPEAPPLY))
- clazz = make.at(tree.pos).
+
+ if (clazz.hasTag(ANNOTATED_TYPE)) {
+ JCAnnotatedType annoType = (JCAnnotatedType) clazz;
+ List<JCAnnotation> annos = annoType.annotations;
+
+ if (annoType.underlyingType.hasTag(TYPEAPPLY)) {
+ clazzid1 = make.at(tree.pos).
+ TypeApply(clazzid1,
+ ((JCTypeApply) clazz).arguments);
+ }
+
+ clazzid1 = make.at(tree.pos).
+ AnnotatedType(annos, clazzid1);
+ } else if (clazz.hasTag(TYPEAPPLY)) {
+ clazzid1 = make.at(tree.pos).
TypeApply(clazzid1,
((JCTypeApply) clazz).arguments);
- else
- clazz = clazzid1;
+ }
+
+ clazz = clazzid1;
}
// Attribute clazz expression and store
@@ -1870,6 +1950,9 @@
tree.clazz.type = clazztype;
TreeInfo.setSymbol(clazzid, TreeInfo.symbol(clazzid1));
clazzid.type = ((JCIdent) clazzid).sym.type;
+ if (annoclazzid != null) {
+ annoclazzid.type = clazzid.type;
+ }
if (!clazztype.isErroneous()) {
if (cdef != null && clazztype.tsym.isInterface()) {
log.error(tree.encl.pos(), "anon.class.impl.intf.no.qual.for.new");
@@ -2173,17 +2256,18 @@
boolean needsRecovery =
resultInfo.checkContext.deferredAttrContext().mode == DeferredAttr.AttrMode.CHECK;
try {
+ Type target = pt();
List<Type> explicitParamTypes = null;
- if (TreeInfo.isExplicitLambda(that)) {
+ if (that.paramKind == JCLambda.ParameterKind.EXPLICIT) {
//attribute lambda parameters
attribStats(that.params, localEnv);
explicitParamTypes = TreeInfo.types(that.params);
+ target = infer.instantiateFunctionalInterface(that, target, explicitParamTypes, resultInfo.checkContext);
}
- Type target;
Type lambdaType;
if (pt() != Type.recoveryType) {
- target = infer.instantiateFunctionalInterface(that, checkIntersectionTarget(that, resultInfo), explicitParamTypes, resultInfo.checkContext);
+ target = checkIntersectionTarget(that, target, resultInfo.checkContext);
lambdaType = types.findDescriptorType(target);
chk.checkFunctionalInterface(that, target);
} else {
@@ -2191,6 +2275,8 @@
lambdaType = fallbackDescriptorType(that);
}
+ setFunctionalInfo(that, pt(), lambdaType, resultInfo.checkContext.inferenceContext());
+
if (lambdaType.hasTag(FORALL)) {
//lambda expression target desc cannot be a generic method
resultInfo.checkContext.report(that, diags.fragment("invalid.generic.lambda.target",
@@ -2199,7 +2285,7 @@
return;
}
- if (!TreeInfo.isExplicitLambda(that)) {
+ if (that.paramKind == JCLambda.ParameterKind.IMPLICIT) {
//add param type info in the AST
List<Type> actuals = lambdaType.getParameterTypes();
List<JCVariableDecl> params = that.params;
@@ -2282,8 +2368,7 @@
}
}
- private Type checkIntersectionTarget(DiagnosticPosition pos, ResultInfo resultInfo) {
- Type pt = resultInfo.pt;
+ private Type checkIntersectionTarget(DiagnosticPosition pos, Type pt, CheckContext checkContext) {
if (pt != Type.recoveryType && pt.isCompound()) {
IntersectionClassType ict = (IntersectionClassType)pt;
List<Type> bounds = ict.allInterfaces ?
@@ -2292,7 +2377,7 @@
types.findDescriptorType(bounds.head); //propagate exception outwards!
for (Type bound : bounds.tail) {
if (!types.isMarkerInterface(bound)) {
- resultInfo.checkContext.report(pos, diags.fragment("secondary.bound.must.be.marker.intf", bound));
+ checkContext.report(pos, diags.fragment("secondary.bound.must.be.marker.intf", bound));
}
}
//for now (translation doesn't support intersection types)
@@ -2355,9 +2440,9 @@
@Override
public boolean compatible(Type found, Type req, Warner warn) {
//return type must be compatible in both current context and assignment context
- return types.isAssignable(found, inferenceContext().asFree(req, types), warn) &&
- super.compatible(found, req, warn);
+ return chk.basicHandler.compatible(found, inferenceContext().asFree(req, types), warn);
}
+
@Override
public void report(DiagnosticPosition pos, JCDiagnostic details) {
enclosingContext.report(pos, diags.fragment("incompatible.ret.type.in.lambda", details));
@@ -2473,7 +2558,7 @@
Type target;
Type desc;
if (pt() != Type.recoveryType) {
- target = infer.instantiateFunctionalInterface(that, checkIntersectionTarget(that, resultInfo), null, resultInfo.checkContext);
+ target = checkIntersectionTarget(that, pt(), resultInfo.checkContext);
desc = types.findDescriptorType(target);
chk.checkFunctionalInterface(that, target);
} else {
@@ -2481,12 +2566,11 @@
desc = fallbackDescriptorType(that);
}
+ setFunctionalInfo(that, pt(), desc, resultInfo.checkContext.inferenceContext());
List<Type> argtypes = desc.getParameterTypes();
- boolean allowBoxing =
- resultInfo.checkContext.deferredAttrContext().phase.isBoxingRequired();
Pair<Symbol, Resolve.ReferenceLookupHelper> refResult = rs.resolveMemberReference(that.pos(), localEnv, that,
- that.expr.type, that.name, argtypes, typeargtypes, allowBoxing);
+ that.expr.type, that.name, argtypes, typeargtypes, true);
Symbol refSym = refResult.fst;
Resolve.ReferenceLookupHelper lookupHelper = refResult.snd;
@@ -2635,6 +2719,34 @@
}
}
+ /**
+ * Set functional type info on the underlying AST. Note: as the target descriptor
+ * might contain inference variables, we might need to register an hook in the
+ * current inference context.
+ */
+ private void setFunctionalInfo(final JCFunctionalExpression fExpr, final Type pt, final Type descriptorType, InferenceContext inferenceContext) {
+ if (inferenceContext.free(descriptorType)) {
+ inferenceContext.addFreeTypeListener(List.of(pt, descriptorType), new FreeTypeListener() {
+ public void typesInferred(InferenceContext inferenceContext) {
+ setFunctionalInfo(fExpr, pt, inferenceContext.asInstType(descriptorType, types), inferenceContext);
+ }
+ });
+ } else {
+ ListBuffer<TypeSymbol> targets = ListBuffer.lb();
+ if (pt.hasTag(CLASS)) {
+ if (pt.isCompound()) {
+ for (Type t : ((IntersectionClassType)pt()).interfaces_field) {
+ targets.append(t.tsym);
+ }
+ } else {
+ targets.append(pt.tsym);
+ }
+ }
+ fExpr.targets = targets.toList();
+ fExpr.descriptorType = descriptorType;
+ }
+ }
+
public void visitParens(JCParens tree) {
Type owntype = attribTree(tree.expr, env, resultInfo);
result = check(tree, owntype, pkind(), resultInfo);
@@ -3207,8 +3319,18 @@
// Tree<Point>.Visitor.
else if (ownOuter.hasTag(CLASS) && site != ownOuter) {
Type normOuter = site;
- if (normOuter.hasTag(CLASS))
+ if (normOuter.hasTag(CLASS)) {
normOuter = types.asEnclosingSuper(site, ownOuter.tsym);
+ if (site.getKind() == TypeKind.ANNOTATED) {
+ // Propagate any type annotations.
+ // TODO: should asEnclosingSuper do this?
+ // Note that the type annotations in site will be updated
+ // by annotateType. Therefore, modify site instead
+ // of creating a new AnnotatedType.
+ ((AnnotatedType)site).underlyingType = normOuter;
+ normOuter = site;
+ }
+ }
if (normOuter == null) // perhaps from an import
normOuter = types.erasure(ownOuter);
if (normOuter != ownOuter)
@@ -3432,6 +3554,15 @@
env.info.defaultSuperCallSite = null;
}
+ if (sym.isStatic() && site.isInterface()) {
+ Assert.check(env.tree.hasTag(APPLY));
+ JCMethodInvocation app = (JCMethodInvocation)env.tree;
+ if (app.meth.hasTag(SELECT) &&
+ !TreeInfo.isStaticSelector(((JCFieldAccess)app.meth).selected, names)) {
+ log.error(env.tree.pos(), "illegal.static.intf.meth.call", site);
+ }
+ }
+
// Compute the identifier's instantiated type.
// For methods, we need to compute the instance type by
// Resolve.instantiate from the symbol's type as well as
@@ -3587,8 +3718,15 @@
tree.type = result = checkIntersection(tree, tree.bounds);
}
- public void visitTypeParameter(JCTypeParameter tree) {
- TypeVar typeVar = (TypeVar)tree.type;
+ public void visitTypeParameter(JCTypeParameter tree) {
+ TypeVar typeVar = (TypeVar) tree.type;
+
+ if (tree.annotations != null && tree.annotations.nonEmpty()) {
+ AnnotatedType antype = new AnnotatedType(typeVar);
+ annotateType(antype, tree.annotations);
+ tree.type = antype;
+ }
+
if (!typeVar.bound.isErroneous()) {
//fixup type-parameter bound computed in 'attribTypeVariables'
typeVar.bound = checkIntersection(tree, tree.bounds);
@@ -3684,6 +3822,44 @@
result = tree.type = syms.errType;
}
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ Type underlyingType = attribType(tree.getUnderlyingType(), env);
+ this.attribAnnotationTypes(tree.annotations, env);
+ AnnotatedType antype = new AnnotatedType(underlyingType);
+ annotateType(antype, tree.annotations);
+ result = tree.type = antype;
+ }
+
+ /**
+ * Apply the annotations to the particular type.
+ */
+ public void annotateType(final AnnotatedType type, final List<JCAnnotation> annotations) {
+ if (annotations.isEmpty())
+ return;
+ annotate.typeAnnotation(new Annotate.Annotator() {
+ @Override
+ public String toString() {
+ return "annotate " + annotations + " onto " + type;
+ }
+ @Override
+ public void enterAnnotation() {
+ List<Attribute.TypeCompound> compounds = fromAnnotations(annotations);
+ type.typeAnnotations = compounds;
+ }
+ });
+ }
+
+ private static List<Attribute.TypeCompound> fromAnnotations(List<JCAnnotation> annotations) {
+ if (annotations.isEmpty())
+ return List.nil();
+
+ ListBuffer<Attribute.TypeCompound> buf = ListBuffer.lb();
+ for (JCAnnotation anno : annotations) {
+ buf.append((Attribute.TypeCompound) anno.attribute);
+ }
+ return buf.toList();
+ }
+
public void visitErroneous(JCErroneous tree) {
if (tree.errs != null)
for (JCTree err : tree.errs)
@@ -3844,24 +4020,14 @@
log.error(tree.typarams.head.pos(),
"intf.annotation.cant.have.type.params");
- // If this annotation has a @ContainedBy, validate
- Attribute.Compound containedBy = c.attribute(syms.containedByType.tsym);
- if (containedBy != null) {
- // get diagnositc position for error reporting
- DiagnosticPosition cbPos = getDiagnosticPosition(tree, containedBy.type);
+ // If this annotation has a @Repeatable, validate
+ Attribute.Compound repeatable = c.attribute(syms.repeatableType.tsym);
+ if (repeatable != null) {
+ // get diagnostic position for error reporting
+ DiagnosticPosition cbPos = getDiagnosticPosition(tree, repeatable.type);
Assert.checkNonNull(cbPos);
- chk.validateContainedBy(c, containedBy, cbPos);
- }
-
- // If this annotation has a @ContainerFor, validate
- Attribute.Compound containerFor = c.attribute(syms.containerForType.tsym);
- if (containerFor != null) {
- // get diagnositc position for error reporting
- DiagnosticPosition cfPos = getDiagnosticPosition(tree, containerFor.type);
- Assert.checkNonNull(cfPos);
-
- chk.validateContainerFor(c, containerFor, cfPos);
+ chk.validateRepeatable(c, repeatable, cbPos);
}
} else {
// Check that all extended classes and interfaces
@@ -3925,6 +4091,12 @@
(c.flags() & ABSTRACT) == 0) {
checkSerialVersionUID(tree, c);
}
+
+ // Correctly organize the postions of the type annotations
+ TypeAnnotations.organizeTypeAnnotationsBodies(this.syms, this.names, this.log, tree);
+
+ // Check type annotations applicability rules
+ validateTypeAnnotations(tree);
}
// where
/** get a diagnostic position for an attribute of Type t, or null if attribute missing */
@@ -3982,6 +4154,94 @@
return types.capture(type);
}
+ private void validateTypeAnnotations(JCTree tree) {
+ tree.accept(typeAnnotationsValidator);
+ }
+ //where
+ private final JCTree.Visitor typeAnnotationsValidator =
+ new TreeScanner() {
+ public void visitAnnotation(JCAnnotation tree) {
+ if (tree.hasTag(TYPE_ANNOTATION)) {
+ // TODO: It seems to WMD as if the annotation in
+ // parameters, in particular also the recvparam, are never
+ // of type JCTypeAnnotation and therefore never checked!
+ // Luckily this check doesn't really do anything that isn't
+ // also done elsewhere.
+ chk.validateTypeAnnotation(tree, false);
+ }
+ super.visitAnnotation(tree);
+ }
+ public void visitTypeParameter(JCTypeParameter tree) {
+ chk.validateTypeAnnotations(tree.annotations, true);
+ scan(tree.bounds);
+ // Don't call super.
+ // This is needed because above we call validateTypeAnnotation with
+ // false, which would forbid annotations on type parameters.
+ // super.visitTypeParameter(tree);
+ }
+ public void visitMethodDef(JCMethodDecl tree) {
+ // Static methods cannot have receiver type annotations.
+ // In test case FailOver15.java, the nested method getString has
+ // a null sym, because an unknown class is instantiated.
+ // I would say it's safe to skip.
+ if (tree.sym != null && (tree.sym.flags() & Flags.STATIC) != 0) {
+ if (tree.recvparam != null) {
+ // TODO: better error message. Is the pos good?
+ log.error(tree.recvparam.pos(), "annotation.type.not.applicable");
+ }
+ }
+ if (tree.restype != null && tree.restype.type != null) {
+ validateAnnotatedType(tree.restype, tree.restype.type);
+ }
+ super.visitMethodDef(tree);
+ }
+ public void visitVarDef(final JCVariableDecl tree) {
+ if (tree.sym != null && tree.sym.type != null)
+ validateAnnotatedType(tree, tree.sym.type);
+ super.visitVarDef(tree);
+ }
+ public void visitTypeCast(JCTypeCast tree) {
+ if (tree.clazz != null && tree.clazz.type != null)
+ validateAnnotatedType(tree.clazz, tree.clazz.type);
+ super.visitTypeCast(tree);
+ }
+ public void visitTypeTest(JCInstanceOf tree) {
+ if (tree.clazz != null && tree.clazz.type != null)
+ validateAnnotatedType(tree.clazz, tree.clazz.type);
+ super.visitTypeTest(tree);
+ }
+ // TODO: what else do we need?
+ // public void visitNewClass(JCNewClass tree) {
+ // public void visitNewArray(JCNewArray tree) {
+
+ /* I would want to model this after
+ * com.sun.tools.javac.comp.Check.Validator.visitSelectInternal(JCFieldAccess)
+ * and override visitSelect and visitTypeApply.
+ * However, we only set the annotated type in the top-level type
+ * of the symbol.
+ * Therefore, we need to override each individual location where a type
+ * can occur.
+ */
+ private void validateAnnotatedType(final JCTree errtree, final Type type) {
+ if (type.getEnclosingType() != null &&
+ type != type.getEnclosingType()) {
+ validateEnclosingAnnotatedType(errtree, type.getEnclosingType());
+ }
+ for (Type targ : type.getTypeArguments()) {
+ validateAnnotatedType(errtree, targ);
+ }
+ }
+ private void validateEnclosingAnnotatedType(final JCTree errtree, final Type type) {
+ validateAnnotatedType(errtree, type);
+ if (type.tsym != null &&
+ type.tsym.isStatic() &&
+ type.getAnnotations().nonEmpty()) {
+ // Enclosing static classes cannot have type annotations.
+ log.error(errtree.pos(), "cant.annotate.static.class");
+ }
+ }
+ };
+
// <editor-fold desc="post-attribution visitor">
/**
@@ -4088,11 +4348,28 @@
}
@Override
+ public void visitLambda(JCLambda that) {
+ super.visitLambda(that);
+ if (that.descriptorType == null) {
+ that.descriptorType = syms.unknownType;
+ }
+ if (that.targets == null) {
+ that.targets = List.nil();
+ }
+ }
+
+ @Override
public void visitReference(JCMemberReference that) {
super.visitReference(that);
if (that.sym == null) {
that.sym = new MethodSymbol(0, names.empty, syms.unknownType, syms.noSymbol);
}
+ if (that.descriptorType == null) {
+ that.descriptorType = syms.unknownType;
+ }
+ if (that.targets == null) {
+ that.targets = List.nil();
+ }
}
}
// </editor-fold>
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
package com.sun.tools.javac.comp;
import java.util.*;
-import java.util.Set;
+
import javax.tools.JavaFileManager;
import com.sun.tools.javac.code.*;
@@ -36,7 +36,6 @@
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.code.Lint;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.Type.*;
@@ -44,6 +43,8 @@
import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext;
import com.sun.tools.javac.comp.Infer.InferenceContext;
import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
+import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Flags.ANNOTATION;
@@ -100,6 +101,9 @@
context.put(checkKey, this);
names = Names.instance(context);
+ dfltTargetMeta = new Name[] { names.PACKAGE, names.TYPE,
+ names.FIELD, names.METHOD, names.CONSTRUCTOR,
+ names.ANNOTATION_TYPE, names.LOCAL_VARIABLE, names.PARAMETER};
log = Log.instance(context);
rs = Resolve.instance(context);
syms = Symtab.instance(context);
@@ -571,34 +575,27 @@
if (!tree.type.isErroneous() &&
(env.info.lint == null || env.info.lint.isEnabled(Lint.LintCategory.CAST))
&& types.isSameType(tree.expr.type, tree.clazz.type)
+ && !(ignoreAnnotatedCasts && TreeInfo.containsTypeAnnotation(tree.clazz))
&& !is292targetTypeCast(tree)) {
log.warning(Lint.LintCategory.CAST,
tree.pos(), "redundant.cast", tree.expr.type);
}
}
//where
- private boolean is292targetTypeCast(JCTypeCast tree) {
- boolean is292targetTypeCast = false;
- JCExpression expr = TreeInfo.skipParens(tree.expr);
- if (expr.hasTag(APPLY)) {
- JCMethodInvocation apply = (JCMethodInvocation)expr;
- Symbol sym = TreeInfo.symbol(apply.meth);
- is292targetTypeCast = sym != null &&
- sym.kind == MTH &&
- (sym.flags() & HYPOTHETICAL) != 0;
- }
- return is292targetTypeCast;
+ private boolean is292targetTypeCast(JCTypeCast tree) {
+ boolean is292targetTypeCast = false;
+ JCExpression expr = TreeInfo.skipParens(tree.expr);
+ if (expr.hasTag(APPLY)) {
+ JCMethodInvocation apply = (JCMethodInvocation)expr;
+ Symbol sym = TreeInfo.symbol(apply.meth);
+ is292targetTypeCast = sym != null &&
+ sym.kind == MTH &&
+ (sym.flags() & HYPOTHETICAL) != 0;
}
-
-
+ return is292targetTypeCast;
+ }
-//where
- /** Is type a type variable, or a (possibly multi-dimensional) array of
- * type variables?
- */
- boolean isTypeVar(Type t) {
- return t.hasTag(TYPEVAR) || t.hasTag(ARRAY) && isTypeVar(types.elemtype(t));
- }
+ private static final boolean ignoreAnnotatedCasts = true;
/** Check that a type is within some bounds.
*
@@ -634,25 +631,40 @@
}
}
+ Type checkClassOrArrayType(DiagnosticPosition pos, Type t) {
+ if (!t.hasTag(CLASS) && !t.hasTag(ARRAY) && !t.hasTag(ERROR)) {
+ return typeTagError(pos,
+ diags.fragment("type.req.class.array"),
+ asTypeParam(t));
+ } else {
+ return t;
+ }
+ }
+
/** Check that type is a class or interface type.
* @param pos Position to be used for error reporting.
* @param t The type to be checked.
*/
Type checkClassType(DiagnosticPosition pos, Type t) {
- if (!t.hasTag(CLASS) && !t.hasTag(ERROR))
+ if (!t.hasTag(CLASS) && !t.hasTag(ERROR)) {
return typeTagError(pos,
diags.fragment("type.req.class"),
- (t.hasTag(TYPEVAR))
- ? diags.fragment("type.parameter", t)
- : t);
- else
+ asTypeParam(t));
+ } else {
return t;
+ }
}
+ //where
+ private Object asTypeParam(Type t) {
+ return (t.hasTag(TYPEVAR))
+ ? diags.fragment("type.parameter", t)
+ : t;
+ }
/** Check that type is a valid qualifier for a constructor reference expression
*/
Type checkConstructorRefType(DiagnosticPosition pos, Type t) {
- t = checkClassType(pos, t);
+ t = checkClassOrArrayType(pos, t);
if (t.hasTag(CLASS)) {
if ((t.tsym.flags() & (ABSTRACT | INTERFACE)) != 0) {
log.error(pos, "abstract.cant.be.instantiated");
@@ -690,11 +702,8 @@
* @param t The type to be checked.
*/
Type checkReifiableReferenceType(DiagnosticPosition pos, Type t) {
- if (!t.hasTag(CLASS) && !t.hasTag(ARRAY) && !t.hasTag(ERROR)) {
- return typeTagError(pos,
- diags.fragment("type.req.class.array"),
- t);
- } else if (!types.isReifiable(t)) {
+ t = checkClassOrArrayType(pos, t);
+ if (!t.isErroneous() && !types.isReifiable(t)) {
log.error(pos, "illegal.generic.type.for.instof");
return types.createErrorType(t);
} else {
@@ -840,7 +849,7 @@
// System.out.println("actuals: " + argtypes);
List<Type> formals = owntype.getParameterTypes();
Type last = useVarargs ? formals.last() : null;
- if (sym.name==names.init &&
+ if (sym.name == names.init &&
sym.owner == syms.enumSym)
formals = formals.tail.tail;
List<JCExpression> args = argtrees;
@@ -888,7 +897,6 @@
syms.methodClass);
}
if (useVarargs) {
- JCTree tree = env.tree;
Type argtype = owntype.getParameterTypes().last();
if (!types.isReifiable(argtype) &&
(!allowSimplifiedVarargs ||
@@ -899,22 +907,13 @@
argtype);
}
if (!((MethodSymbol)sym.baseSymbol()).isSignaturePolymorphic(types)) {
- Type elemtype = types.elemtype(argtype);
- switch (tree.getTag()) {
- case APPLY:
- ((JCMethodInvocation) tree).varargsElement = elemtype;
- break;
- case NEWCLASS:
- ((JCNewClass) tree).varargsElement = elemtype;
- break;
- case REFERENCE:
- ((JCMemberReference) tree).varargsElement = elemtype;
- break;
- default:
- throw new AssertionError(""+tree);
- }
+ TreeInfo.setVarargsElement(env.tree, types.elemtype(argtype));
}
}
+ PolyKind pkind = (sym.type.hasTag(FORALL) &&
+ sym.type.getReturnType().containsAny(((ForAll)sym.type).tvars)) ?
+ PolyKind.POLY : PolyKind.STANDALONE;
+ TreeInfo.setPolyKind(env.tree, pkind);
return owntype;
}
//where
@@ -1055,9 +1054,12 @@
} else
mask = ConstructorFlags;
} else if ((sym.owner.flags_field & INTERFACE) != 0) {
- if ((flags & DEFAULT) != 0) {
- mask = InterfaceDefaultMethodMask;
- implicit = PUBLIC | ABSTRACT;
+ if ((flags & (DEFAULT | STATIC)) != 0) {
+ mask = InterfaceMethodMask;
+ implicit = PUBLIC;
+ if ((flags & DEFAULT) != 0) {
+ implicit |= ABSTRACT;
+ }
} else {
mask = implicit = InterfaceMethodFlags;
}
@@ -1127,6 +1129,10 @@
PRIVATE | STATIC | DEFAULT))
&&
checkDisjoint(pos, flags,
+ STATIC,
+ DEFAULT)
+ &&
+ checkDisjoint(pos, flags,
ABSTRACT | INTERFACE,
FINAL | NATIVE | SYNCHRONIZED)
&&
@@ -1316,6 +1322,11 @@
}
}
+ @Override
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ tree.underlyingType.accept(this);
+ }
+
/** Default visitor method: do nothing.
*/
@Override
@@ -2236,7 +2247,7 @@
void checkImplementations(JCClassDecl tree) {
checkImplementations(tree, tree.sym, tree.sym);
}
-//where
+ //where
/** Check that all methods which implement some
* method in `ic' conform to the method they implement.
*/
@@ -2577,6 +2588,13 @@
validateAnnotation(a, s);
}
+ /** Check the type annotations.
+ */
+ public void validateTypeAnnotations(List<JCAnnotation> annotations, boolean isTypeParameter) {
+ for (JCAnnotation a : annotations)
+ validateTypeAnnotation(a, isTypeParameter);
+ }
+
/** Check an annotation of a symbol.
*/
private void validateAnnotation(JCAnnotation a, Symbol s) {
@@ -2589,33 +2607,53 @@
if (!isOverrider(s))
log.error(a.pos(), "method.does.not.override.superclass");
}
+
+ if (a.annotationType.type.tsym == syms.functionalInterfaceType.tsym) {
+ if (s.kind != TYP) {
+ log.error(a.pos(), "bad.functional.intf.anno");
+ } else {
+ try {
+ types.findDescriptorSymbol((TypeSymbol)s);
+ } catch (Types.FunctionDescriptorLookupError ex) {
+ log.error(a.pos(), "bad.functional.intf.anno.1", ex.getDiagnostic());
+ }
+ }
+ }
+ }
+
+ public void validateTypeAnnotation(JCAnnotation a, boolean isTypeParameter) {
+ Assert.checkNonNull(a.type, "annotation tree hasn't been attributed yet: " + a);
+ validateAnnotationTree(a);
+
+ if (!isTypeAnnotation(a, isTypeParameter))
+ log.error(a.pos(), "annotation.type.not.applicable");
}
/**
- * Validate the proposed container 'containedBy' on the
+ * Validate the proposed container 'repeatable' on the
* annotation type symbol 's'. Report errors at position
* 'pos'.
*
- * @param s The (annotation)type declaration annotated with a @ContainedBy
- * @param containedBy the @ContainedBy on 's'
+ * @param s The (annotation)type declaration annotated with a @Repeatable
+ * @param repeatable the @Repeatable on 's'
* @param pos where to report errors
*/
- public void validateContainedBy(TypeSymbol s, Attribute.Compound containedBy, DiagnosticPosition pos) {
- Assert.check(types.isSameType(containedBy.type, syms.containedByType));
+ public void validateRepeatable(TypeSymbol s, Attribute.Compound repeatable, DiagnosticPosition pos) {
+ Assert.check(types.isSameType(repeatable.type, syms.repeatableType));
Type t = null;
- List<Pair<MethodSymbol,Attribute>> l = containedBy.values;
+ List<Pair<MethodSymbol,Attribute>> l = repeatable.values;
if (!l.isEmpty()) {
Assert.check(l.head.fst.name == names.value);
t = ((Attribute.Class)l.head.snd).getValue();
}
if (t == null) {
- log.error(pos, "invalid.container.wrong.containedby", s, containedBy);
+ // errors should already have been reported during Annotate
return;
}
- validateHasContainerFor(t.tsym, s, pos);
+ validateValue(t.tsym, s, pos);
validateRetention(t.tsym, s, pos);
validateDocumented(t.tsym, s, pos);
validateInherited(t.tsym, s, pos);
@@ -2623,79 +2661,18 @@
validateDefault(t.tsym, s, pos);
}
- /**
- * Validate the proposed container 'containerFor' on the
- * annotation type symbol 's'. Report errors at position
- * 'pos'.
- *
- * @param s The (annotation)type declaration annotated with a @ContainerFor
- * @param containerFor the @ContainedFor on 's'
- * @param pos where to report errors
- */
- public void validateContainerFor(TypeSymbol s, Attribute.Compound containerFor, DiagnosticPosition pos) {
- Assert.check(types.isSameType(containerFor.type, syms.containerForType));
-
- Type t = null;
- List<Pair<MethodSymbol,Attribute>> l = containerFor.values;
- if (!l.isEmpty()) {
- Assert.check(l.head.fst.name == names.value);
- t = ((Attribute.Class)l.head.snd).getValue();
- }
-
- if (t == null) {
- log.error(pos, "invalid.container.wrong.containerfor", s, containerFor);
- return;
- }
-
- validateHasContainedBy(t.tsym, s, pos);
- }
-
- private void validateHasContainedBy(TypeSymbol container, TypeSymbol contained, DiagnosticPosition pos) {
- Attribute.Compound containedBy = container.attribute(syms.containedByType.tsym);
-
- if (containedBy == null) {
- log.error(pos, "invalid.container.no.containedby", container, syms.containedByType.tsym);
- return;
+ private void validateValue(TypeSymbol container, TypeSymbol contained, DiagnosticPosition pos) {
+ Scope.Entry e = container.members().lookup(names.value);
+ if (e.scope != null && e.sym.kind == MTH) {
+ MethodSymbol m = (MethodSymbol) e.sym;
+ Type ret = m.getReturnType();
+ if (!(ret.hasTag(ARRAY) && types.isSameType(((ArrayType)ret).elemtype, contained.type))) {
+ log.error(pos, "invalid.repeatable.annotation.value.return",
+ container, ret, types.makeArrayType(contained.type));
+ }
+ } else {
+ log.error(pos, "invalid.repeatable.annotation.no.value", container);
}
-
- Type t = null;
- List<Pair<MethodSymbol,Attribute>> l = containedBy.values;
- if (!l.isEmpty()) {
- Assert.check(l.head.fst.name == names.value);
- t = ((Attribute.Class)l.head.snd).getValue();
- }
-
- if (t == null) {
- log.error(pos, "invalid.container.wrong.containedby", container, contained);
- return;
- }
-
- if (!types.isSameType(t, contained.type))
- log.error(pos, "invalid.container.wrong.containedby", t.tsym, contained);
- }
-
- private void validateHasContainerFor(TypeSymbol container, TypeSymbol contained, DiagnosticPosition pos) {
- Attribute.Compound containerFor = container.attribute(syms.containerForType.tsym);
-
- if (containerFor == null) {
- log.error(pos, "invalid.container.no.containerfor", container, syms.containerForType.tsym);
- return;
- }
-
- Type t = null;
- List<Pair<MethodSymbol,Attribute>> l = containerFor.values;
- if (!l.isEmpty()) {
- Assert.check(l.head.fst.name == names.value);
- t = ((Attribute.Class)l.head.snd).getValue();
- }
-
- if (t == null) {
- log.error(pos, "invalid.container.wrong.containerfor", container, contained);
- return;
- }
-
- if (!types.isSameType(t, contained.type))
- log.error(pos, "invalid.container.wrong.containerfor", t.tsym, contained);
}
private void validateRetention(Symbol container, Symbol contained, DiagnosticPosition pos) {
@@ -2715,7 +2692,7 @@
}
}
if (error ) {
- log.error(pos, "invalid.containedby.annotation.retention",
+ log.error(pos, "invalid.repeatable.annotation.retention",
container, containerRetention,
contained, containedRetention);
}
@@ -2724,7 +2701,7 @@
private void validateDocumented(Symbol container, Symbol contained, DiagnosticPosition pos) {
if (contained.attribute(syms.documentedType.tsym) != null) {
if (container.attribute(syms.documentedType.tsym) == null) {
- log.error(pos, "invalid.containedby.annotation.not.documented", container, contained);
+ log.error(pos, "invalid.repeatable.annotation.not.documented", container, contained);
}
}
}
@@ -2732,7 +2709,7 @@
private void validateInherited(Symbol container, Symbol contained, DiagnosticPosition pos) {
if (contained.attribute(syms.inheritedType.tsym) != null) {
if (container.attribute(syms.inheritedType.tsym) == null) {
- log.error(pos, "invalid.containedby.annotation.not.inherited", container, contained);
+ log.error(pos, "invalid.repeatable.annotation.not.inherited", container, contained);
}
}
}
@@ -2752,7 +2729,7 @@
// contained has target, but container has not, error
Attribute.Array containerTarget = getAttributeTargetAttribute(container);
if (containerTarget == null) {
- log.error(pos, "invalid.containedby.annotation.incompatible.target", container, contained);
+ log.error(pos, "invalid.repeatable.annotation.incompatible.target", container, contained);
return;
}
@@ -2775,7 +2752,7 @@
}
if (!isTargetSubset(containedTargets, containerTargets)) {
- log.error(pos, "invalid.containedby.annotation.incompatible.target", container, contained);
+ log.error(pos, "invalid.repeatable.annotation.incompatible.target", container, contained);
}
}
@@ -2809,7 +2786,7 @@
elm.kind == Kinds.MTH &&
((MethodSymbol)elm).defaultValue == null) {
log.error(pos,
- "invalid.containedby.annotation.elem.nondefault",
+ "invalid.repeatable.annotation.elem.nondefault",
container,
elm);
}
@@ -2834,45 +2811,90 @@
return false;
}
+ /** Is the annotation applicable to type annotations? */
+ protected boolean isTypeAnnotation(JCAnnotation a, boolean isTypeParameter) {
+ Attribute.Compound atTarget =
+ a.annotationType.type.tsym.attribute(syms.annotationTargetType.tsym);
+ if (atTarget == null) {
+ // An annotation without @Target is not a type annotation.
+ return false;
+ }
+
+ Attribute atValue = atTarget.member(names.value);
+ if (!(atValue instanceof Attribute.Array)) {
+ return false; // error recovery
+ }
+
+ Attribute.Array arr = (Attribute.Array) atValue;
+ for (Attribute app : arr.values) {
+ if (!(app instanceof Attribute.Enum)) {
+ return false; // recovery
+ }
+ Attribute.Enum e = (Attribute.Enum) app;
+
+ if (e.value.name == names.TYPE_USE)
+ return true;
+ else if (isTypeParameter && e.value.name == names.TYPE_PARAMETER)
+ return true;
+ }
+ return false;
+ }
+
/** Is the annotation applicable to the symbol? */
boolean annotationApplicable(JCAnnotation a, Symbol s) {
Attribute.Array arr = getAttributeTargetAttribute(a.annotationType.type.tsym);
+ Name[] targets;
+
if (arr == null) {
- return true;
+ targets = defaultTargetMetaInfo(a, s);
+ } else {
+ // TODO: can we optimize this?
+ targets = new Name[arr.values.length];
+ for (int i=0; i<arr.values.length; ++i) {
+ Attribute app = arr.values[i];
+ if (!(app instanceof Attribute.Enum)) {
+ return true; // recovery
+ }
+ Attribute.Enum e = (Attribute.Enum) app;
+ targets[i] = e.value.name;
+ }
}
- for (Attribute app : arr.values) {
- if (!(app instanceof Attribute.Enum)) return true; // recovery
- Attribute.Enum e = (Attribute.Enum) app;
- if (e.value.name == names.TYPE)
+ for (Name target : targets) {
+ if (target == names.TYPE)
{ if (s.kind == TYP) return true; }
- else if (e.value.name == names.FIELD)
+ else if (target == names.FIELD)
{ if (s.kind == VAR && s.owner.kind != MTH) return true; }
- else if (e.value.name == names.METHOD)
+ else if (target == names.METHOD)
{ if (s.kind == MTH && !s.isConstructor()) return true; }
- else if (e.value.name == names.PARAMETER)
+ else if (target == names.PARAMETER)
{ if (s.kind == VAR &&
s.owner.kind == MTH &&
(s.flags() & PARAMETER) != 0)
return true;
}
- else if (e.value.name == names.CONSTRUCTOR)
+ else if (target == names.CONSTRUCTOR)
{ if (s.kind == MTH && s.isConstructor()) return true; }
- else if (e.value.name == names.LOCAL_VARIABLE)
+ else if (target == names.LOCAL_VARIABLE)
{ if (s.kind == VAR && s.owner.kind == MTH &&
(s.flags() & PARAMETER) == 0)
return true;
}
- else if (e.value.name == names.ANNOTATION_TYPE)
+ else if (target == names.ANNOTATION_TYPE)
{ if (s.kind == TYP && (s.flags() & ANNOTATION) != 0)
return true;
}
- else if (e.value.name == names.PACKAGE)
+ else if (target == names.PACKAGE)
{ if (s.kind == PCK) return true; }
- else if (e.value.name == names.TYPE_USE)
+ else if (target == names.TYPE_USE)
{ if (s.kind == TYP ||
s.kind == VAR ||
(s.kind == MTH && !s.isConstructor() &&
- !s.type.getReturnType().hasTag(VOID)))
+ !s.type.getReturnType().hasTag(VOID)) ||
+ (s.kind == MTH && s.isConstructor()))
+ return true;
+ }
+ else if (target == names.TYPE_PARAMETER)
+ { if (s.kind == TYP && s.type.hasTag(TYPEVAR))
return true;
}
else
@@ -2891,6 +2913,11 @@
return (Attribute.Array) atValue;
}
+ private final Name[] dfltTargetMeta;
+ private Name[] defaultTargetMetaInfo(JCAnnotation a, Symbol s) {
+ return dfltTargetMeta;
+ }
+
/** Check an annotation value.
*
* @param a The annotation tree to check
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,6 @@
import com.sun.tools.javac.jvm.*;
import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.code.Type.*;
-
import static com.sun.tools.javac.code.TypeTag.BOOLEAN;
import static com.sun.tools.javac.jvm.ByteCodes.*;
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Thu Jan 31 10:22:25 2013 -0800
@@ -65,6 +65,7 @@
final Attr attr;
final Check chk;
+ final JCDiagnostic.Factory diags;
final Enter enter;
final Infer infer;
final Log log;
@@ -83,14 +84,20 @@
context.put(deferredAttrKey, this);
attr = Attr.instance(context);
chk = Check.instance(context);
+ diags = JCDiagnostic.Factory.instance(context);
enter = Enter.instance(context);
infer = Infer.instance(context);
log = Log.instance(context);
syms = Symtab.instance(context);
make = TreeMaker.instance(context);
types = Types.instance(context);
+ Names names = Names.instance(context);
+ stuckTree = make.Ident(names.empty).setType(Type.noType);
}
+ /** shared tree for stuck expressions */
+ final JCTree stuckTree;
+
/**
* This type represents a deferred type. A deferred type starts off with
* no information on the underlying expression type. Such info needs to be
@@ -356,12 +363,11 @@
//scan a defensive copy of the node list - this is because a deferred
//attribution round can add new nodes to the list
for (DeferredAttrNode deferredAttrNode : List.from(deferredAttrNodes)) {
- if (!deferredAttrNode.isStuck()) {
- deferredAttrNode.process();
+ if (!deferredAttrNode.process()) {
+ stuckVars.addAll(deferredAttrNode.stuckVars);
+ } else {
deferredAttrNodes.remove(deferredAttrNode);
progress = true;
- } else {
- stuckVars.addAll(deferredAttrNode.stuckVars);
}
}
if (!progress) {
@@ -404,21 +410,88 @@
}
/**
- * is this node stuck?
+ * Process a deferred attribution node.
+ * Invariant: a stuck node cannot be processed.
*/
- boolean isStuck() {
- return stuckVars.nonEmpty();
+ @SuppressWarnings("fallthrough")
+ boolean process() {
+ switch (mode) {
+ case SPECULATIVE:
+ dt.check(resultInfo, List.<Type>nil(), new StructuralStuckChecker());
+ return true;
+ case CHECK:
+ if (stuckVars.nonEmpty()) {
+ return false;
+ } else {
+ dt.check(resultInfo, stuckVars, basicCompleter);
+ return true;
+ }
+ default:
+ throw new AssertionError("Bad mode");
+ }
}
/**
- * Process a deferred attribution node.
- * Invariant: a stuck node cannot be processed.
+ * Structural checker for stuck expressions
*/
- void process() {
- if (isStuck()) {
- throw new IllegalStateException("Cannot process a stuck deferred node");
+ class StructuralStuckChecker extends TreeScanner implements DeferredTypeCompleter {
+
+ ResultInfo resultInfo;
+
+ public Type complete(DeferredType dt, ResultInfo resultInfo, DeferredAttrContext deferredAttrContext) {
+ this.resultInfo = resultInfo;
+ dt.tree.accept(this);
+ dt.speculativeCache.put(msym, stuckTree, phase);
+ return Type.noType;
}
- dt.check(resultInfo);
+
+ @Override
+ public void visitLambda(JCLambda tree) {
+ Check.CheckContext checkContext = resultInfo.checkContext;
+ Type pt = resultInfo.pt;
+ if (inferenceContext.inferencevars.contains(pt)) {
+ //ok
+ return;
+ } else {
+ //must be a functional descriptor
+ try {
+ Type desc = types.findDescriptorType(pt);
+ if (desc.getParameterTypes().length() != tree.params.length()) {
+ checkContext.report(tree, diags.fragment("incompatible.arg.types.in.lambda"));
+ }
+ } catch (Types.FunctionDescriptorLookupError ex) {
+ checkContext.report(null, ex.getDiagnostic());
+ }
+ }
+ }
+
+ @Override
+ public void visitNewClass(JCNewClass tree) {
+ //do nothing
+ }
+
+ @Override
+ public void visitApply(JCMethodInvocation tree) {
+ //do nothing
+ }
+
+ @Override
+ public void visitReference(JCMemberReference tree) {
+ Check.CheckContext checkContext = resultInfo.checkContext;
+ Type pt = resultInfo.pt;
+ if (inferenceContext.inferencevars.contains(pt)) {
+ //ok
+ return;
+ } else {
+ try {
+ //TODO: we should speculative determine if there's a match
+ //based on arity - if yes, method is applicable.
+ types.findDescriptorType(pt);
+ } catch (Types.FunctionDescriptorLookupError ex) {
+ checkContext.report(null, ex.getDiagnostic());
+ }
+ }
+ }
}
}
}
@@ -624,12 +697,12 @@
if (inferenceContext.inferenceVars().contains(pt)) {
stuckVars.add(pt);
}
- if (!types.isFunctionalInterface(pt.tsym)) {
+ if (!types.isFunctionalInterface(pt)) {
return;
}
Type descType = types.findDescriptorType(pt);
List<Type> freeArgVars = inferenceContext.freeVarsIn(descType.getParameterTypes());
- if (!TreeInfo.isExplicitLambda(tree) &&
+ if (tree.paramKind == JCLambda.ParameterKind.IMPLICIT &&
freeArgVars.nonEmpty()) {
stuckVars.addAll(freeArgVars);
}
@@ -643,7 +716,7 @@
stuckVars.add(pt);
return;
}
- if (!types.isFunctionalInterface(pt.tsym)) {
+ if (!types.isFunctionalInterface(pt)) {
return;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -131,7 +131,11 @@
predefClassDef = make.ClassDef(
make.Modifiers(PUBLIC),
- syms.predefClass.name, null, null, null, null);
+ syms.predefClass.name,
+ List.<JCTypeParameter>nil(),
+ null,
+ List.<JCExpression>nil(),
+ List.<JCTree>nil());
predefClassDef.sym = syms.predefClass;
todo = Todo.instance(context);
fileManager = context.get(JavaFileManager.class);
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.comp.Resolve;
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
@@ -2175,6 +2176,11 @@
unrefdResources.remove(sym);
}
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ // annotations don't get scanned
+ tree.underlyingType.accept(this);
+ }
+
public void visitTopLevel(JCCompilationUnit tree) {
// Do nothing for TopLevel since each class is visited individually
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Thu Jan 31 10:22:25 2013 -0800
@@ -66,6 +66,9 @@
Log log;
JCDiagnostic.Factory diags;
+ /** Should we inject return-type constraints earlier? */
+ boolean allowEarlyReturnConstraints;
+
public static Infer instance(Context context) {
Infer instance = context.get(inferKey);
if (instance == null)
@@ -83,6 +86,7 @@
chk = Check.instance(context);
diags = JCDiagnostic.Factory.instance(context);
inferenceException = new InferenceException(diags);
+ allowEarlyReturnConstraints = Source.instance(context).allowEarlyReturnConstraints();
}
/**
@@ -188,19 +192,6 @@
MethodType mtype,
Attr.ResultInfo resultInfo,
Warner warn) throws InferenceException {
- Type to = resultInfo.pt;
- if (to.hasTag(NONE) || resultInfo.checkContext.inferenceContext().free(resultInfo.pt)) {
- to = mtype.getReturnType().isPrimitiveOrVoid() ?
- mtype.getReturnType() : syms.objectType;
- }
- Type qtype1 = inferenceContext.asFree(mtype.getReturnType(), types);
- if (!types.isSubtype(qtype1,
- qtype1.hasTag(UNDETVAR) ? types.boxedTypeOrType(to) : to)) {
- throw inferenceException
- .setMessage("infer.no.conforming.instance.exists",
- inferenceContext.restvars(), mtype.getReturnType(), to);
- }
-
while (true) {
boolean stuck = true;
for (Type t : inferenceContext.undetvars) {
@@ -283,6 +274,11 @@
try {
methodCheck.argumentsAcceptable(env, deferredAttrContext, argtypes, mt.getParameterTypes(), warn);
+ if (resultInfo != null && allowEarlyReturnConstraints &&
+ !warn.hasNonSilentLint(Lint.LintCategory.UNCHECKED)) {
+ generateReturnConstraints(mt, inferenceContext, resultInfo);
+ }
+
deferredAttrContext.complete();
// minimize as yet undetermined type variables
@@ -298,6 +294,9 @@
if (!restvars.isEmpty()) {
if (resultInfo != null && !warn.hasNonSilentLint(Lint.LintCategory.UNCHECKED)) {
+ if (!allowEarlyReturnConstraints) {
+ generateReturnConstraints(mt, inferenceContext, resultInfo);
+ }
instantiateUninferred(env.tree.pos(), inferenceContext, mt, resultInfo, warn);
checkWithinBounds(inferenceContext, warn);
mt = (MethodType)inferenceContext.asInstType(mt, types);
@@ -313,6 +312,25 @@
inferenceContext.notifyChange(types);
}
}
+ //where
+ void generateReturnConstraints(Type mt, InferenceContext inferenceContext, Attr.ResultInfo resultInfo) {
+ if (resultInfo != null) {
+ Type to = resultInfo.pt;
+ if (to.hasTag(NONE) || resultInfo.checkContext.inferenceContext().free(resultInfo.pt)) {
+ to = mt.getReturnType().isPrimitiveOrVoid() ?
+ mt.getReturnType() : syms.objectType;
+ }
+ Type qtype1 = inferenceContext.asFree(mt.getReturnType(), types);
+ Warner retWarn = new Warner();
+ if (!resultInfo.checkContext.compatible(qtype1, qtype1.hasTag(UNDETVAR) ? types.boxedTypeOrType(to) : to, retWarn) ||
+ //unchecked conversion is not allowed
+ retWarn.hasLint(Lint.LintCategory.UNCHECKED)) {
+ throw inferenceException
+ .setMessage("infer.no.conforming.instance.exists",
+ inferenceContext.restvars(), mt.getReturnType(), to);
+ }
+ }
+ }
/** check that type parameters are within their bounds.
*/
@@ -461,52 +479,40 @@
Type formalInterface = funcInterface.tsym.type;
InferenceContext funcInterfaceContext =
new InferenceContext(funcInterface.tsym.type.getTypeArguments(), this, false);
- if (paramTypes != null) {
- //get constraints from explicit params (this is done by
- //checking that explicit param types are equal to the ones
- //in the functional interface descriptors)
- List<Type> descParameterTypes = types.findDescriptorType(formalInterface).getParameterTypes();
- if (descParameterTypes.size() != paramTypes.size()) {
- checkContext.report(pos, diags.fragment("incompatible.arg.types.in.lambda"));
+ Assert.check(paramTypes != null);
+ //get constraints from explicit params (this is done by
+ //checking that explicit param types are equal to the ones
+ //in the functional interface descriptors)
+ List<Type> descParameterTypes = types.findDescriptorType(formalInterface).getParameterTypes();
+ if (descParameterTypes.size() != paramTypes.size()) {
+ checkContext.report(pos, diags.fragment("incompatible.arg.types.in.lambda"));
+ return types.createErrorType(funcInterface);
+ }
+ for (Type p : descParameterTypes) {
+ if (!types.isSameType(funcInterfaceContext.asFree(p, types), paramTypes.head)) {
+ checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface));
return types.createErrorType(funcInterface);
}
- for (Type p : descParameterTypes) {
- if (!types.isSameType(funcInterfaceContext.asFree(p, types), paramTypes.head)) {
- checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface));
- return types.createErrorType(funcInterface);
- }
- paramTypes = paramTypes.tail;
+ paramTypes = paramTypes.tail;
+ }
+ List<Type> actualTypeargs = funcInterface.getTypeArguments();
+ for (Type t : funcInterfaceContext.undetvars) {
+ UndetVar uv = (UndetVar)t;
+ minimizeInst(uv, types.noWarnings);
+ if (uv.inst == null &&
+ Type.filter(uv.getBounds(InferenceBound.UPPER), boundFilter).nonEmpty()) {
+ maximizeInst(uv, types.noWarnings);
}
- for (Type t : funcInterfaceContext.undetvars) {
- UndetVar uv = (UndetVar)t;
- minimizeInst(uv, types.noWarnings);
- if (uv.inst == null &&
- Type.filter(uv.getBounds(InferenceBound.UPPER), boundFilter).nonEmpty()) {
- maximizeInst(uv, types.noWarnings);
- }
- }
-
- formalInterface = funcInterfaceContext.asInstType(formalInterface, types);
- }
- ListBuffer<Type> typeargs = ListBuffer.lb();
- List<Type> actualTypeargs = funcInterface.getTypeArguments();
- //for remaining uninferred type-vars in the functional interface type,
- //simply replace the wildcards with its bound
- for (Type t : formalInterface.getTypeArguments()) {
- if (actualTypeargs.head.hasTag(WILDCARD)) {
- WildcardType wt = (WildcardType)actualTypeargs.head;
- typeargs.append(wt.type);
- } else {
- typeargs.append(actualTypeargs.head);
+ if (uv.inst == null) {
+ uv.inst = actualTypeargs.head;
}
actualTypeargs = actualTypeargs.tail;
}
- Type owntype = types.subst(formalInterface, funcInterfaceContext.inferenceVars(), typeargs.toList());
+ Type owntype = funcInterfaceContext.asInstType(formalInterface, types);
if (!chk.checkValidGenericType(owntype)) {
//if the inferred functional interface type is not well-formed,
//or if it's not a subtype of the original target, issue an error
checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface));
- return types.createErrorType(funcInterface);
}
return owntype;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Thu Jan 31 10:22:25 2013 -0800
@@ -253,7 +253,7 @@
int refKind = referenceKind(sym);
//convert to an invokedynamic call
- result = makeMetaFactoryIndyCall(tree, tree.targetType, refKind, sym, indy_args);
+ result = makeMetaFactoryIndyCall(tree, refKind, sym, indy_args);
}
private JCIdent makeThis(Type type, Symbol owner) {
@@ -302,6 +302,7 @@
case UNBOUND: /** Type :: instMethod */
case STATIC: /** Type :: staticMethod */
case TOPLEVEL: /** Top level :: new */
+ case ARRAY_CTOR: /** ArrayType :: new */
init = null;
break;
@@ -313,7 +314,7 @@
//build a sam instance using an indy call to the meta-factory
- result = makeMetaFactoryIndyCall(tree, tree.targetType, localContext.referenceKind(), refSym, indy_args);
+ result = makeMetaFactoryIndyCall(tree, localContext.referenceKind(), refSym, indy_args);
}
/**
@@ -502,19 +503,6 @@
// </editor-fold>
- private MethodSymbol makeSamDescriptor(Type targetType) {
- return (MethodSymbol)types.findDescriptorSymbol(targetType.tsym);
- }
-
- private Type makeFunctionalDescriptorType(Type targetType, MethodSymbol samDescriptor, boolean erased) {
- Type descType = types.memberType(targetType, samDescriptor);
- return erased ? types.erasure(descType) : descType;
- }
-
- private Type makeFunctionalDescriptorType(Type targetType, boolean erased) {
- return makeFunctionalDescriptorType(targetType, makeSamDescriptor(targetType), erased);
- }
-
/**
* Generate an adapter method "bridge" for a method reference which cannot
* be used directly.
@@ -645,24 +633,33 @@
* to the first bridge synthetic parameter
*/
private JCExpression bridgeExpressionNew() {
- JCExpression encl = null;
- switch (tree.kind) {
- case UNBOUND:
- case IMPLICIT_INNER:
- encl = make.Ident(params.first());
- }
+ if (tree.kind == ReferenceKind.ARRAY_CTOR) {
+ //create the array creation expression
+ JCNewArray newArr = make.NewArray(make.Type(types.elemtype(tree.getQualifierExpression().type)),
+ List.of(make.Ident(params.first())),
+ null);
+ newArr.type = tree.getQualifierExpression().type;
+ return newArr;
+ } else {
+ JCExpression encl = null;
+ switch (tree.kind) {
+ case UNBOUND:
+ case IMPLICIT_INNER:
+ encl = make.Ident(params.first());
+ }
- //create the instance creation expression
- JCNewClass newClass = make.NewClass(encl,
- List.<JCExpression>nil(),
- make.Type(tree.getQualifierExpression().type),
- convertArgs(tree.sym, args.toList(), tree.varargsElement),
- null);
- newClass.constructor = tree.sym;
- newClass.constructorType = tree.sym.erasure(types);
- newClass.type = tree.getQualifierExpression().type;
- setVarargsIfNeeded(newClass, tree.varargsElement);
- return newClass;
+ //create the instance creation expression
+ JCNewClass newClass = make.NewClass(encl,
+ List.<JCExpression>nil(),
+ make.Type(tree.getQualifierExpression().type),
+ convertArgs(tree.sym, args.toList(), tree.varargsElement),
+ null);
+ newClass.constructor = tree.sym;
+ newClass.constructorType = tree.sym.erasure(types);
+ newClass.type = tree.getQualifierExpression().type;
+ setVarargsIfNeeded(newClass, tree.varargsElement);
+ return newClass;
+ }
}
private VarSymbol addParameter(String name, Type p, boolean genArg) {
@@ -688,12 +685,12 @@
/**
* Generate an indy method call to the meta factory
*/
- private JCExpression makeMetaFactoryIndyCall(JCExpression tree, Type targetType, int refKind, Symbol refSym, List<JCExpression> indy_args) {
+ private JCExpression makeMetaFactoryIndyCall(JCFunctionalExpression tree, int refKind, Symbol refSym, List<JCExpression> indy_args) {
//determine the static bsm args
- Type mtype = makeFunctionalDescriptorType(targetType, true);
+ Type mtype = types.erasure(tree.descriptorType);
+ MethodSymbol samSym = (MethodSymbol) types.findDescriptorSymbol(tree.type.tsym);
List<Object> staticArgs = List.<Object>of(
- new Pool.MethodHandle(ClassFile.REF_invokeInterface,
- types.findDescriptorSymbol(targetType.tsym), types),
+ new Pool.MethodHandle(ClassFile.REF_invokeInterface, types.findDescriptorSymbol(tree.type.tsym), types),
new Pool.MethodHandle(refKind, refSym, types),
new MethodType(mtype.getParameterTypes(),
mtype.getReturnType(),
@@ -862,8 +859,8 @@
finally {
frameStack = prevStack;
}
- if (frameStack.nonEmpty() && enclosingLambda() != null) {
- // Any class defined within a lambda is an implicit 'this' reference
+ if (!tree.sym.isStatic() && frameStack.nonEmpty() && enclosingLambda() != null) {
+ // Any (non-static) class defined within a lambda is an implicit 'this' reference
// because its constructor will reference the enclosing class
((LambdaTranslationContext) context()).addSymbol(tree.sym.type.getEnclosingType().tsym, CAPTURED_THIS);
}
@@ -997,6 +994,11 @@
* (required to skip synthetic lambda symbols)
*/
private Symbol owner() {
+ return owner(false);
+ }
+
+ @SuppressWarnings("fallthrough")
+ private Symbol owner(boolean skipLambda) {
List<Frame> frameStack2 = frameStack;
while (frameStack2.nonEmpty()) {
switch (frameStack2.head.tree.getTag()) {
@@ -1015,7 +1017,8 @@
case METHODDEF:
return ((JCMethodDecl)frameStack2.head.tree).sym;
case LAMBDA:
- return ((LambdaTranslationContext)contextMap.get(frameStack2.head.tree)).translatedSym;
+ if (!skipLambda)
+ return ((LambdaTranslationContext)contextMap.get(frameStack2.head.tree)).translatedSym;
default:
frameStack2 = frameStack2.tail;
}
@@ -1155,7 +1158,7 @@
* This class is used to store important information regarding translation of
* lambda expression/method references (see subclasses).
*/
- private abstract class TranslationContext<T extends JCTree> {
+ private abstract class TranslationContext<T extends JCFunctionalExpression> {
/** the underlying (untranslated) tree */
T tree;
@@ -1314,12 +1317,13 @@
}
Type enclosingType() {
- //local inner classes defined inside a lambda are always non-static
- return owner.enclClass().type;
+ return owner.isStatic() ?
+ Type.noType :
+ owner.enclClass().type;
}
Type generatedLambdaSig() {
- return types.erasure(types.findDescriptorType(tree.targetType));
+ return types.erasure(tree.descriptorType);
}
}
@@ -1375,7 +1379,7 @@
}
Type bridgedRefSig() {
- return types.erasure(types.findDescriptorSymbol(tree.targetType.tsym).type);
+ return types.erasure(types.findDescriptorSymbol(tree.targets.head).type);
}
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2288,7 +2288,7 @@
return tree.packageAnnotations.nonEmpty();
case NONEMPTY:
for (Attribute.Compound a :
- tree.packge.annotations.getAttributes()) {
+ tree.packge.annotations.getDeclarationAttributes()) {
Attribute.RetentionPolicy p = types.getRetention(a);
if (p != Attribute.RetentionPolicy.SOURCE)
return true;
@@ -2685,6 +2685,13 @@
result = tree;
}
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ // No need to retain type annotations any longer.
+ // tree.annotations = translate(tree.annotations);
+ tree.underlyingType = translate(tree.underlyingType);
+ result = tree.underlyingType;
+ }
+
public void visitTypeCast(JCTypeCast tree) {
tree.clazz = translate(tree.clazz);
if (tree.type.isPrimitive() != tree.expr.type.isPrimitive())
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,19 @@
package com.sun.tools.javac.comp;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Set;
+
+import javax.lang.model.type.TypeKind;
import javax.tools.JavaFileObject;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.jvm.*;
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.List;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.code.Symbol.*;
@@ -345,12 +349,15 @@
* @param params The method's value parameters.
* @param res The method's result type,
* null if it is a constructor.
+ * @param recvparam The method's receiver parameter,
+ * null if none given; TODO: or already set here?
* @param thrown The method's thrown exceptions.
* @param env The method's (local) environment.
*/
Type signature(List<JCTypeParameter> typarams,
List<JCVariableDecl> params,
JCTree res,
+ JCVariableDecl recvparam,
List<JCExpression> thrown,
Env<AttrContext> env) {
@@ -368,6 +375,15 @@
// Attribute result type, if one is given.
Type restype = res == null ? syms.voidType : attr.attribType(res, env);
+ // Attribute receiver type, if one is given.
+ Type recvtype;
+ if (recvparam!=null) {
+ memberEnter(recvparam, env);
+ recvtype = recvparam.vartype.type;
+ } else {
+ recvtype = null;
+ }
+
// Attribute thrown exceptions.
ListBuffer<Type> thrownbuf = new ListBuffer<Type>();
for (List<JCExpression> l = thrown; l.nonEmpty(); l = l.tail) {
@@ -376,10 +392,12 @@
exc = chk.checkClassType(l.head.pos(), exc);
thrownbuf.append(exc);
}
- Type mtype = new MethodType(argbuf.toList(),
+ MethodType mtype = new MethodType(argbuf.toList(),
restype,
thrownbuf.toList(),
syms.methodClass);
+ mtype.recvtype = recvtype;
+
return tvars.isEmpty() ? mtype : new ForAll(tvars, mtype);
}
@@ -573,7 +591,8 @@
try {
// Compute the method type
m.type = signature(tree.typarams, tree.params,
- tree.restype, tree.thrown,
+ tree.restype, tree.recvparam,
+ tree.thrown,
localEnv);
} finally {
chk.setDeferredLintHandler(prevLintHandler);
@@ -597,6 +616,10 @@
enclScope.enter(m);
}
annotateLater(tree.mods.annotations, localEnv, m);
+ // Visit the signature of the method. Note that
+ // TypeAnnotate doesn't descend into the body.
+ typeAnnotate(tree, localEnv, m);
+
if (tree.defaultValue != null)
annotateDefaultValueLater(tree.defaultValue, localEnv, m);
}
@@ -642,7 +665,7 @@
//(a plain array type) with the more precise VarargsType --- we need
//to do it this way because varargs is represented in the tree as a modifier
//on the parameter declaration, and not as a distinct type of array node.
- ArrayType atype = (ArrayType)tree.vartype.type;
+ ArrayType atype = (ArrayType)tree.vartype.type.unannotatedType();
tree.vartype.type = atype.makeVarargs();
}
Scope enclScope = enter.enterScope(env);
@@ -665,6 +688,8 @@
enclScope.enter(v);
}
annotateLater(tree.mods.annotations, localEnv, v);
+ typeAnnotate(tree.vartype, env, tree.sym);
+ annotate.flush();
v.pos = tree.pos;
}
@@ -759,7 +784,7 @@
log.error(annotations.head.pos,
"already.annotated",
kindName(s), s);
- enterAnnotations(annotations, localEnv, s);
+ actualEnterAnnotations(annotations, localEnv, s);
} finally {
log.useSource(prev);
}
@@ -781,7 +806,7 @@
}
/** Enter a set of annotations. */
- private void enterAnnotations(List<JCAnnotation> annotations,
+ private void actualEnterAnnotations(List<JCAnnotation> annotations,
Env<AttrContext> env,
Symbol s) {
Map<TypeSymbol, ListBuffer<Attribute.Compound>> annotated =
@@ -817,11 +842,11 @@
&& s.owner.kind != MTH
&& types.isSameType(c.type, syms.deprecatedType)) {
s.flags_field |= Flags.DEPRECATED;
- }
+ }
}
- s.annotations.setAttributesWithCompletion(
- annotate.new AnnotateRepeatedContext(env, annotated, pos, log));
+ s.annotations.setDeclarationAttributesWithCompletion(
+ annotate.new AnnotateRepeatedContext<Attribute.Compound>(env, annotated, pos, log, false));
}
/** Queue processing of an attribute default value. */
@@ -900,6 +925,12 @@
// create an environment for evaluating the base clauses
Env<AttrContext> baseEnv = baseEnv(tree, env);
+ if (tree.extending != null)
+ typeAnnotate(tree.extending, baseEnv, sym);
+ for (JCExpression impl : tree.implementing)
+ typeAnnotate(impl, baseEnv, sym);
+ annotate.flush();
+
// Determine supertype.
Type supertype =
(tree.extending != null)
@@ -969,10 +1000,15 @@
if (hasDeprecatedAnnotation(tree.mods.annotations))
c.flags_field |= DEPRECATED;
annotateLater(tree.mods.annotations, baseEnv, c);
+ // class type parameters use baseEnv but everything uses env
chk.checkNonCyclicDecl(tree);
attr.attribTypeVariables(tree.typarams, baseEnv);
+ // Do this here, where we have the symbol.
+ for (JCTypeParameter tp : tree.typarams)
+ typeAnnotate(tp, baseEnv, sym);
+ annotate.flush();
// Add default constructor if needed.
if ((c.flags() & INTERFACE) == 0 &&
@@ -1050,12 +1086,120 @@
} finally {
isFirst = true;
}
+ }
+ annotate.afterRepeated(TypeAnnotations.organizeTypeAnnotationsSignatures(syms, names, log, tree));
+ }
- // commit pending annotations
- annotate.flush();
+ private void actualEnterTypeAnnotations(final List<JCAnnotation> annotations,
+ final Env<AttrContext> env,
+ final Symbol s) {
+ Map<TypeSymbol, ListBuffer<Attribute.TypeCompound>> annotated =
+ new LinkedHashMap<TypeSymbol, ListBuffer<Attribute.TypeCompound>>();
+ Map<Attribute.TypeCompound, DiagnosticPosition> pos =
+ new HashMap<Attribute.TypeCompound, DiagnosticPosition>();
+
+ for (List<JCAnnotation> al = annotations; !al.isEmpty(); al = al.tail) {
+ JCAnnotation a = al.head;
+ Attribute.TypeCompound tc = annotate.enterTypeAnnotation(a,
+ syms.annotationType,
+ env);
+ if (tc == null) {
+ continue;
+ }
+
+ if (annotated.containsKey(a.type.tsym)) {
+ if (source.allowRepeatedAnnotations()) {
+ ListBuffer<Attribute.TypeCompound> l = annotated.get(a.type.tsym);
+ l = l.append(tc);
+ annotated.put(a.type.tsym, l);
+ pos.put(tc, a.pos());
+ } else {
+ log.error(a.pos(), "duplicate.annotation");
+ }
+ } else {
+ annotated.put(a.type.tsym, ListBuffer.of(tc));
+ pos.put(tc, a.pos());
+ }
+ }
+
+ s.annotations.appendTypeAttributesWithCompletion(
+ annotate.new AnnotateRepeatedContext<Attribute.TypeCompound>(env, annotated, pos, log, true));
+ }
+
+ public void typeAnnotate(final JCTree tree, final Env<AttrContext> env, final Symbol sym) {
+ tree.accept(new TypeAnnotate(env, sym));
+ }
+
+ /**
+ * We need to use a TreeScanner, because it is not enough to visit the top-level
+ * annotations. We also need to visit type arguments, etc.
+ */
+ private class TypeAnnotate extends TreeScanner {
+ private Env<AttrContext> env;
+ private Symbol sym;
+
+ public TypeAnnotate(final Env<AttrContext> env, final Symbol sym) {
+ this.env = env;
+ this.sym = sym;
+ }
+
+ void annotateTypeLater(final List<JCAnnotation> annotations) {
+ if (annotations.isEmpty()) {
+ return;
+ }
+
+ annotate.normal(new Annotate.Annotator() {
+ @Override
+ public String toString() {
+ return "type annotate " + annotations + " onto " + sym + " in " + sym.owner;
+ }
+ @Override
+ public void enterAnnotation() {
+ JavaFileObject prev = log.useSource(env.toplevel.sourcefile);
+ try {
+ actualEnterTypeAnnotations(annotations, env, sym);
+ } finally {
+ log.useSource(prev);
+ }
+ }
+ });
+ }
+
+ @Override
+ public void visitAnnotatedType(final JCAnnotatedType tree) {
+ annotateTypeLater(tree.annotations);
+ super.visitAnnotatedType(tree);
+ }
+
+ @Override
+ public void visitTypeParameter(final JCTypeParameter tree) {
+ annotateTypeLater(tree.annotations);
+ super.visitTypeParameter(tree);
+ }
+
+ @Override
+ public void visitNewArray(final JCNewArray tree) {
+ annotateTypeLater(tree.annotations);
+ for (List<JCAnnotation> dimAnnos : tree.dimAnnotations)
+ annotateTypeLater(dimAnnos);
+ super.visitNewArray(tree);
+ }
+
+ @Override
+ public void visitMethodDef(final JCMethodDecl tree) {
+ scan(tree.mods);
+ scan(tree.restype);
+ scan(tree.typarams);
+ scan(tree.recvparam);
+ scan(tree.params);
+ scan(tree.thrown);
+ scan(tree.defaultValue);
+ // Do not annotate the body, just the signature.
+ // scan(tree.body);
}
}
+
private Env<AttrContext> baseEnv(JCClassDecl tree, Env<AttrContext> env) {
Scope baseScope = new Scope(tree.sym);
//import already entered local classes into base scope
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind;
+import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
@@ -54,7 +55,6 @@
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Set;
import javax.lang.model.element.ElementVisitor;
@@ -92,6 +92,7 @@
public final boolean varargsEnabled; // = source.allowVarargs();
public final boolean allowMethodHandles;
public final boolean allowDefaultMethods;
+ public final boolean allowStructuralMostSpecific;
private final boolean debugResolve;
final EnumSet<VerboseResolutionMode> verboseResolutionMode;
@@ -127,6 +128,7 @@
Target target = Target.instance(context);
allowMethodHandles = target.hasMethodHandles();
allowDefaultMethods = source.allowDefaultMethods();
+ allowStructuralMostSpecific = source.allowStructuralMostSpecific();
polymorphicSignatureScope = new Scope(syms.noSymbol);
inapplicableMethodException = new InapplicableMethodException(diags);
@@ -693,7 +695,7 @@
if (varargsFormal == null &&
argtypes.size() != formals.size()) {
- report(MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
+ reportMC(MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
}
while (argtypes.nonEmpty() && formals.head != varargsFormal) {
@@ -704,7 +706,7 @@
}
if (formals.head != varargsFormal) {
- report(MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
+ reportMC(MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
}
if (useVarargs) {
@@ -721,7 +723,7 @@
}
}
- private void report(MethodCheckDiag diag, InferenceContext inferenceContext, Object... args) {
+ private void reportMC(MethodCheckDiag diag, InferenceContext inferenceContext, Object... args) {
boolean inferDiag = inferenceContext != infer.emptyContext;
InapplicableMethodException ex = inferDiag ?
infer.inferenceException : inapplicableMethodException;
@@ -745,7 +747,7 @@
} else {
if (!isAccessible(env, t)) {
Symbol location = env.enclClass.sym;
- report(MethodCheckDiag.INACCESSIBLE_VARARGS, inferenceContext, t, Kinds.kindName(location), location);
+ reportMC(MethodCheckDiag.INACCESSIBLE_VARARGS, inferenceContext, t, Kinds.kindName(location), location);
}
}
}
@@ -758,7 +760,7 @@
@Override
public void report(DiagnosticPosition pos, JCDiagnostic details) {
- report(methodDiag, deferredAttrContext.inferenceContext, details);
+ reportMC(methodDiag, deferredAttrContext.inferenceContext, details);
}
};
return new MethodResultInfo(to, checkContext);
@@ -835,6 +837,213 @@
}
}
+ /**
+ * Most specific method applicability routine. Given a list of actual types A,
+ * a list of formal types F1, and a list of formal types F2, the routine determines
+ * as to whether the types in F1 can be considered more specific than those in F2 w.r.t.
+ * argument types A.
+ */
+ class MostSpecificCheck implements MethodCheck {
+
+ boolean strict;
+ List<Type> actuals;
+
+ MostSpecificCheck(boolean strict, List<Type> actuals) {
+ this.strict = strict;
+ this.actuals = actuals;
+ }
+
+ @Override
+ public void argumentsAcceptable(final Env<AttrContext> env,
+ DeferredAttrContext deferredAttrContext,
+ List<Type> formals1,
+ List<Type> formals2,
+ Warner warn) {
+ formals2 = adjustArgs(formals2, deferredAttrContext.msym, formals1.length(), deferredAttrContext.phase.isVarargsRequired());
+ while (formals2.nonEmpty()) {
+ ResultInfo mresult = methodCheckResult(formals2.head, deferredAttrContext, warn, actuals.head);
+ mresult.check(null, formals1.head);
+ formals1 = formals1.tail;
+ formals2 = formals2.tail;
+ actuals = actuals.isEmpty() ? actuals : actuals.tail;
+ }
+ }
+
+ /**
+ * Create a method check context to be used during the most specific applicability check
+ */
+ ResultInfo methodCheckResult(Type to, DeferredAttr.DeferredAttrContext deferredAttrContext,
+ Warner rsWarner, Type actual) {
+ return attr.new ResultInfo(Kinds.VAL, to,
+ new MostSpecificCheckContext(strict, deferredAttrContext, rsWarner, actual));
+ }
+
+ /**
+ * Subclass of method check context class that implements most specific
+ * method conversion. If the actual type under analysis is a deferred type
+ * a full blown structural analysis is carried out.
+ */
+ class MostSpecificCheckContext extends MethodCheckContext {
+
+ Type actual;
+
+ public MostSpecificCheckContext(boolean strict, DeferredAttrContext deferredAttrContext, Warner rsWarner, Type actual) {
+ super(strict, deferredAttrContext, rsWarner);
+ this.actual = actual;
+ }
+
+ public boolean compatible(Type found, Type req, Warner warn) {
+ if (!allowStructuralMostSpecific || actual == null) {
+ return super.compatible(found, req, warn);
+ } else {
+ switch (actual.getTag()) {
+ case DEFERRED:
+ DeferredType dt = (DeferredType) actual;
+ DeferredType.SpeculativeCache.Entry e = dt.speculativeCache.get(deferredAttrContext.msym, deferredAttrContext.phase);
+ return (e == null || e.speculativeTree == deferredAttr.stuckTree)
+ ? false : mostSpecific(found, req, e.speculativeTree, warn);
+ default:
+ return standaloneMostSpecific(found, req, actual, warn);
+ }
+ }
+ }
+
+ private boolean mostSpecific(Type t, Type s, JCTree tree, Warner warn) {
+ MostSpecificChecker msc = new MostSpecificChecker(t, s, warn);
+ msc.scan(tree);
+ return msc.result;
+ }
+
+ boolean polyMostSpecific(Type t1, Type t2, Warner warn) {
+ return (!t1.isPrimitive() && t2.isPrimitive())
+ ? true : super.compatible(t1, t2, warn);
+ }
+
+ boolean standaloneMostSpecific(Type t1, Type t2, Type exprType, Warner warn) {
+ return (exprType.isPrimitive() == t1.isPrimitive()
+ && exprType.isPrimitive() != t2.isPrimitive())
+ ? true : super.compatible(t1, t2, warn);
+ }
+
+ /**
+ * Structural checker for most specific.
+ */
+ class MostSpecificChecker extends DeferredAttr.PolyScanner {
+
+ final Type t;
+ final Type s;
+ final Warner warn;
+ boolean result;
+
+ MostSpecificChecker(Type t, Type s, Warner warn) {
+ this.t = t;
+ this.s = s;
+ this.warn = warn;
+ result = true;
+ }
+
+ @Override
+ void skip(JCTree tree) {
+ result &= standaloneMostSpecific(t, s, tree.type, warn);
+ }
+
+ @Override
+ public void visitConditional(JCConditional tree) {
+ if (tree.polyKind == PolyKind.STANDALONE) {
+ result &= standaloneMostSpecific(t, s, tree.type, warn);
+ } else {
+ super.visitConditional(tree);
+ }
+ }
+
+ @Override
+ public void visitApply(JCMethodInvocation tree) {
+ result &= (tree.polyKind == PolyKind.STANDALONE)
+ ? standaloneMostSpecific(t, s, tree.type, warn)
+ : polyMostSpecific(t, s, warn);
+ }
+
+ @Override
+ public void visitNewClass(JCNewClass tree) {
+ result &= (tree.polyKind == PolyKind.STANDALONE)
+ ? standaloneMostSpecific(t, s, tree.type, warn)
+ : polyMostSpecific(t, s, warn);
+ }
+
+ @Override
+ public void visitReference(JCMemberReference tree) {
+ if (types.isFunctionalInterface(t.tsym) &&
+ types.isFunctionalInterface(s.tsym) &&
+ types.asSuper(t, s.tsym) == null &&
+ types.asSuper(s, t.tsym) == null) {
+ Type desc_t = types.findDescriptorType(t);
+ Type desc_s = types.findDescriptorType(s);
+ if (types.isSameTypes(desc_t.getParameterTypes(), desc_s.getParameterTypes())) {
+ if (!desc_s.getReturnType().hasTag(VOID)) {
+ //perform structural comparison
+ Type ret_t = desc_t.getReturnType();
+ Type ret_s = desc_s.getReturnType();
+ result &= ((tree.refPolyKind == PolyKind.STANDALONE)
+ ? standaloneMostSpecific(ret_t, ret_s, tree.type, warn)
+ : polyMostSpecific(ret_t, ret_s, warn));
+ } else {
+ return;
+ }
+ } else {
+ result &= false;
+ }
+ } else {
+ result &= MostSpecificCheckContext.super.compatible(t, s, warn);
+ }
+ }
+
+ @Override
+ public void visitLambda(JCLambda tree) {
+ if (types.isFunctionalInterface(t.tsym) &&
+ types.isFunctionalInterface(s.tsym) &&
+ types.asSuper(t, s.tsym) == null &&
+ types.asSuper(s, t.tsym) == null) {
+ Type desc_t = types.findDescriptorType(t);
+ Type desc_s = types.findDescriptorType(s);
+ if (tree.paramKind == JCLambda.ParameterKind.EXPLICIT
+ || types.isSameTypes(desc_t.getParameterTypes(), desc_s.getParameterTypes())) {
+ if (!desc_s.getReturnType().hasTag(VOID)) {
+ //perform structural comparison
+ Type ret_t = desc_t.getReturnType();
+ Type ret_s = desc_s.getReturnType();
+ scanLambdaBody(tree, ret_t, ret_s);
+ } else {
+ return;
+ }
+ } else {
+ result &= false;
+ }
+ } else {
+ result &= MostSpecificCheckContext.super.compatible(t, s, warn);
+ }
+ }
+ //where
+
+ void scanLambdaBody(JCLambda lambda, final Type t, final Type s) {
+ if (lambda.getBodyKind() == JCTree.JCLambda.BodyKind.EXPRESSION) {
+ result &= MostSpecificCheckContext.this.mostSpecific(t, s, lambda.body, warn);
+ } else {
+ DeferredAttr.LambdaReturnScanner lambdaScanner =
+ new DeferredAttr.LambdaReturnScanner() {
+ @Override
+ public void visitReturn(JCReturn tree) {
+ if (tree.expr != null) {
+ result &= MostSpecificCheckContext.this.mostSpecific(t, s, tree.expr, warn);
+ }
+ }
+ };
+ lambdaScanner.scan(lambda.body);
+ }
+ }
+ }
+ }
+ }
+
public static class InapplicableMethodException extends RuntimeException {
private static final long serialVersionUID = 0;
@@ -1142,153 +1351,32 @@
}
//where
private boolean signatureMoreSpecific(List<Type> actuals, Env<AttrContext> env, Type site, Symbol m1, Symbol m2, boolean allowBoxing, boolean useVarargs) {
- Symbol m12 = adjustVarargs(m1, m2, useVarargs);
- Symbol m22 = adjustVarargs(m2, m1, useVarargs);
- Type mtype1 = types.memberType(site, m12);
- Type mtype2 = types.memberType(site, m22);
-
- //check if invocation is more specific
- if (invocationMoreSpecific(env, site, m22, mtype1.getParameterTypes(), allowBoxing, useVarargs)) {
- return true;
- }
-
- //perform structural check
-
- List<Type> formals1 = mtype1.getParameterTypes();
- Type lastFormal1 = formals1.last();
- List<Type> formals2 = mtype2.getParameterTypes();
- Type lastFormal2 = formals2.last();
- ListBuffer<Type> newFormals = ListBuffer.lb();
-
- boolean hasStructuralPoly = false;
- for (Type actual : actuals) {
- //perform formal argument adaptation in case actuals > formals (varargs)
- Type f1 = formals1.isEmpty() ?
- lastFormal1 : formals1.head;
- Type f2 = formals2.isEmpty() ?
- lastFormal2 : formals2.head;
-
- //is this a structural actual argument?
- boolean isStructuralPoly = actual.hasTag(DEFERRED) &&
- (((DeferredType)actual).tree.hasTag(LAMBDA) ||
- ((DeferredType)actual).tree.hasTag(REFERENCE));
-
- Type newFormal = f1;
-
- if (isStructuralPoly) {
- //for structural arguments only - check that corresponding formals
- //are related - if so replace formal with <null>
- hasStructuralPoly = true;
- DeferredType dt = (DeferredType)actual;
- Type t1 = deferredAttr.new DeferredTypeMap(AttrMode.SPECULATIVE, m1, currentResolutionContext.step).apply(dt);
- Type t2 = deferredAttr.new DeferredTypeMap(AttrMode.SPECULATIVE, m2, currentResolutionContext.step).apply(dt);
- if (t1.isErroneous() || t2.isErroneous() || !isStructuralSubtype(t1, t2)) {
- //not structural subtypes - simply fail
- return false;
- } else {
- newFormal = syms.botType;
- }
- }
-
- newFormals.append(newFormal);
- if (newFormals.length() > mtype2.getParameterTypes().length()) {
- //expand m2's type so as to fit the new formal arity (varargs)
- m22.type = types.createMethodTypeWithParameters(m22.type, m22.type.getParameterTypes().append(f2));
- }
-
- formals1 = formals1.isEmpty() ? formals1 : formals1.tail;
- formals2 = formals2.isEmpty() ? formals2 : formals2.tail;
- }
-
- if (!hasStructuralPoly) {
- //if no structural actual was found, we're done
- return false;
- }
- //perform additional adaptation if actuals < formals (varargs)
- for (Type t : formals1) {
- newFormals.append(t);
- }
- //check if invocation (with tweaked args) is more specific
- return invocationMoreSpecific(env, site, m22, newFormals.toList(), allowBoxing, useVarargs);
+ noteWarner.clear();
+ int maxLength = Math.max(
+ Math.max(m1.type.getParameterTypes().length(), actuals.length()),
+ m2.type.getParameterTypes().length());
+ Type mst = instantiate(env, site, m2, null,
+ adjustArgs(types.lowerBounds(types.memberType(site, m1).getParameterTypes()), m1, maxLength, useVarargs), null,
+ allowBoxing, useVarargs, new MostSpecificCheck(!allowBoxing, actuals), noteWarner);
+ return mst != null &&
+ !noteWarner.hasLint(Lint.LintCategory.UNCHECKED);
}
- //where
- private boolean invocationMoreSpecific(Env<AttrContext> env, Type site, Symbol m2, List<Type> argtypes1, boolean allowBoxing, boolean useVarargs) {
- MethodResolutionContext prevContext = currentResolutionContext;
- try {
- currentResolutionContext = new MethodResolutionContext();
- currentResolutionContext.step = allowBoxing ? BOX : BASIC;
- noteWarner.clear();
- Type mst = instantiate(env, site, m2, null,
- types.lowerBounds(argtypes1), null,
- allowBoxing, false, resolveMethodCheck, noteWarner);
- return mst != null &&
- !noteWarner.hasLint(Lint.LintCategory.UNCHECKED);
- } finally {
- currentResolutionContext = prevContext;
+ private List<Type> adjustArgs(List<Type> args, Symbol msym, int length, boolean allowVarargs) {
+ if ((msym.flags() & VARARGS) != 0 && allowVarargs) {
+ Type varargsElem = types.elemtype(args.last());
+ if (varargsElem == null) {
+ Assert.error("Bad varargs = " + args.last() + " " + msym);
+ }
+ List<Type> newArgs = args.reverse().tail.prepend(varargsElem).reverse();
+ while (newArgs.length() < length) {
+ newArgs = newArgs.append(newArgs.last());
+ }
+ return newArgs;
+ } else {
+ return args;
}
}
//where
- private Symbol adjustVarargs(Symbol to, Symbol from, boolean useVarargs) {
- List<Type> fromArgs = from.type.getParameterTypes();
- List<Type> toArgs = to.type.getParameterTypes();
- if (useVarargs &&
- (from.flags() & VARARGS) != 0 &&
- (to.flags() & VARARGS) != 0) {
- Type varargsTypeFrom = fromArgs.last();
- Type varargsTypeTo = toArgs.last();
- ListBuffer<Type> args = ListBuffer.lb();
- if (toArgs.length() < fromArgs.length()) {
- //if we are checking a varargs method 'from' against another varargs
- //method 'to' (where arity of 'to' < arity of 'from') then expand signature
- //of 'to' to 'fit' arity of 'from' (this means adding fake formals to 'to'
- //until 'to' signature has the same arity as 'from')
- while (fromArgs.head != varargsTypeFrom) {
- args.append(toArgs.head == varargsTypeTo ? types.elemtype(varargsTypeTo) : toArgs.head);
- fromArgs = fromArgs.tail;
- toArgs = toArgs.head == varargsTypeTo ?
- toArgs :
- toArgs.tail;
- }
- } else {
- //formal argument list is same as original list where last
- //argument (array type) is removed
- args.appendList(toArgs.reverse().tail.reverse());
- }
- //append varargs element type as last synthetic formal
- args.append(types.elemtype(varargsTypeTo));
- Type mtype = types.createMethodTypeWithParameters(to.type, args.toList());
- return new MethodSymbol(to.flags_field & ~VARARGS, to.name, mtype, to.owner);
- } else {
- return to;
- }
- }
- //where
- boolean isStructuralSubtype(Type s, Type t) {
-
- Type ret_s = types.findDescriptorType(s).getReturnType();
- Type ret_t = types.findDescriptorType(t).getReturnType();
-
- //covariant most specific check for function descriptor return type
- if (!types.isSubtype(ret_s, ret_t)) {
- return false;
- }
-
- List<Type> args_s = types.findDescriptorType(s).getParameterTypes();
- List<Type> args_t = types.findDescriptorType(t).getParameterTypes();
-
- //arity must be identical
- if (args_s.length() != args_t.length()) {
- return false;
- }
-
- //invariant most specific check for function descriptor parameter types
- if (!types.isSameTypes(args_t, args_s)) {
- return false;
- }
-
- return true;
- }
- //where
Type mostSpecificReturnType(Type mt1, Type mt2) {
Type rt1 = mt1.getReturnType();
Type rt2 = mt2.getReturnType();
@@ -2386,10 +2474,23 @@
List<Type> typeargtypes,
boolean boxingAllowed) {
MethodResolutionPhase maxPhase = boxingAllowed ? VARARITY : BASIC;
+
+ ReferenceLookupHelper boundLookupHelper;
+ if (!name.equals(names.init)) {
+ //method reference
+ boundLookupHelper =
+ new MethodReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase);
+ } else if (site.hasTag(ARRAY)) {
+ //array constructor reference
+ boundLookupHelper =
+ new ArrayConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase);
+ } else {
+ //class constructor reference
+ boundLookupHelper =
+ new ConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase);
+ }
+
//step 1 - bound lookup
- ReferenceLookupHelper boundLookupHelper = name.equals(names.init) ?
- new ConstructorReferenceLookupHelper(referenceTree, site, argtypes, typeargtypes, maxPhase) :
- new MethodReferenceLookupHelper(referenceTree, name, site, argtypes, typeargtypes, maxPhase);
Env<AttrContext> boundEnv = env.dup(env.tree, env.info.dup());
Symbol boundSym = lookupMethod(boundEnv, env.tree.pos(), site.tsym, boundLookupHelper);
@@ -2627,6 +2728,33 @@
}
/**
+ * Helper class for array constructor lookup; an array constructor lookup
+ * is simulated by looking up a method that returns the array type specified
+ * as qualifier, and that accepts a single int parameter (size of the array).
+ */
+ class ArrayConstructorReferenceLookupHelper extends ReferenceLookupHelper {
+
+ ArrayConstructorReferenceLookupHelper(JCMemberReference referenceTree, Type site, List<Type> argtypes,
+ List<Type> typeargtypes, MethodResolutionPhase maxPhase) {
+ super(referenceTree, names.init, site, argtypes, typeargtypes, maxPhase);
+ }
+
+ @Override
+ protected Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
+ Scope sc = new Scope(syms.arrayClass);
+ MethodSymbol arrayConstr = new MethodSymbol(PUBLIC, name, null, site.tsym);
+ arrayConstr.type = new MethodType(List.of(syms.intType), site, List.<Type>nil(), syms.methodClass);
+ sc.enter(arrayConstr);
+ return findMethodInScope(env, site, name, argtypes, typeargtypes, sc, methodNotFound, phase.isBoxingRequired(), phase.isVarargsRequired(), false, false);
+ }
+
+ @Override
+ ReferenceKind referenceKind(Symbol sym) {
+ return ReferenceKind.ARRAY_CTOR;
+ }
+ }
+
+ /**
* Helper class for constructor reference lookup. The lookup logic is based
* upon either Resolve.findMethod or Resolve.findDiamond - depending on
* whether the constructor reference needs diamond inference (this is the case
@@ -3381,7 +3509,10 @@
@Override
protected Symbol access(Name name, TypeSymbol location) {
- return ambiguousSyms.last();
+ Symbol firstAmbiguity = ambiguousSyms.last();
+ return firstAmbiguity.kind == TYP ?
+ types.createErrorType(name, location, firstAmbiguity.type).tsym :
+ firstAmbiguity;
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -483,6 +483,7 @@
tree.restype = translate(tree.restype, null);
tree.typarams = List.nil();
tree.params = translateVarDefs(tree.params);
+ tree.recvparam = translate(tree.recvparam, null);
tree.thrown = translate(tree.thrown, null);
tree.body = translate(tree.body, tree.sym.erasure(types).getReturnType());
tree.type = erasure(tree.type);
@@ -549,9 +550,6 @@
currentMethod = null;
tree.params = translate(tree.params);
tree.body = translate(tree.body, null);
- //save non-erased target
- tree.targetType = tree.type;
- Assert.check(!tree.targetType.isCompound(), "Intersection-type targets not supported yet!");
tree.type = erasure(tree.type);
result = tree;
}
@@ -785,9 +783,6 @@
public void visitReference(JCMemberReference tree) {
tree.expr = translate(tree.expr, null);
- //save non-erased target
- tree.targetType = tree.type;
- Assert.check(!tree.targetType.isCompound(), "Intersection-type targets not supported yet!");
tree.type = erasure(tree.type);
result = tree;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -351,8 +351,8 @@
/** Read a byte.
*/
- byte nextByte() {
- return buf[bp++];
+ int nextByte() {
+ return buf[bp++] & 0xFF;
}
/** Read an integer.
@@ -1172,6 +1172,19 @@
}
},
+ new AttributeReader(names.RuntimeVisibleTypeAnnotations, V52, CLASS_OR_MEMBER_ATTRIBUTE) {
+ protected void read(Symbol sym, int attrLen) {
+ attachTypeAnnotations(sym);
+ }
+ },
+
+ new AttributeReader(names.RuntimeInvisibleTypeAnnotations, V52, CLASS_OR_MEMBER_ATTRIBUTE) {
+ protected void read(Symbol sym, int attrLen) {
+ attachTypeAnnotations(sym);
+ }
+ },
+
+
// The following attributes for a Code attribute are not currently handled
// StackMapTable
// SourceDebugExtension
@@ -1381,6 +1394,17 @@
}
}
+ void attachTypeAnnotations(final Symbol sym) {
+ int numAttributes = nextChar();
+ if (numAttributes != 0) {
+ ListBuffer<TypeAnnotationProxy> proxies =
+ ListBuffer.lb();
+ for (int i = 0; i < numAttributes; i++)
+ proxies.append(readTypeAnnotation());
+ annotate.normal(new TypeAnnotationCompleter(sym, proxies.toList()));
+ }
+ }
+
/** Attach the default value for an annotation element.
*/
void attachAnnotationDefault(final Symbol sym) {
@@ -1427,6 +1451,111 @@
return new CompoundAnnotationProxy(t, pairs.toList());
}
+ TypeAnnotationProxy readTypeAnnotation() {
+ TypeAnnotationPosition position = readPosition();
+ CompoundAnnotationProxy proxy = readCompoundAnnotation();
+
+ return new TypeAnnotationProxy(proxy, position);
+ }
+
+ TypeAnnotationPosition readPosition() {
+ int tag = nextByte(); // TargetType tag is a byte
+
+ if (!TargetType.isValidTargetTypeValue(tag))
+ throw this.badClassFile("bad.type.annotation.value", String.format("0x%02X", tag));
+
+ TypeAnnotationPosition position = new TypeAnnotationPosition();
+ TargetType type = TargetType.fromTargetTypeValue(tag);
+
+ position.type = type;
+
+ switch (type) {
+ // type cast
+ case CAST:
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ position.offset = nextChar();
+ break;
+ // local variable
+ case LOCAL_VARIABLE:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ int table_length = nextChar();
+ position.lvarOffset = new int[table_length];
+ position.lvarLength = new int[table_length];
+ position.lvarIndex = new int[table_length];
+
+ for (int i = 0; i < table_length; ++i) {
+ position.lvarOffset[i] = nextChar();
+ position.lvarLength[i] = nextChar();
+ position.lvarIndex[i] = nextChar();
+ }
+ break;
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ position.exception_index = nextByte();
+ break;
+ // method receiver
+ case METHOD_RECEIVER:
+ // Do nothing
+ break;
+ // type parameter
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ position.parameter_index = nextByte();
+ break;
+ // type parameter bound
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ position.parameter_index = nextByte();
+ position.bound_index = nextByte();
+ break;
+ // class extends or implements clause
+ case CLASS_EXTENDS:
+ position.type_index = nextChar();
+ break;
+ // throws
+ case THROWS:
+ position.type_index = nextChar();
+ break;
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ position.parameter_index = nextByte();
+ break;
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
+ position.offset = nextChar();
+ position.type_index = nextByte();
+ break;
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ // lambda formal parameter
+ case LAMBDA_FORMAL_PARAMETER:
+ position.parameter_index = nextByte();
+ break;
+ case UNKNOWN:
+ throw new AssertionError("jvm.ClassReader: UNKNOWN target type should never occur!");
+ default:
+ throw new AssertionError("jvm.ClassReader: Unknown target type for position: " + position);
+ }
+
+ { // See whether there is location info and read it
+ int len = nextByte();
+ ListBuffer<Integer> loc = ListBuffer.lb();
+ for (int i = 0; i < len * TypeAnnotationPosition.TypePathEntry.bytesPerEntry; ++i)
+ loc = loc.append(nextByte());
+ position.location = TypeAnnotationPosition.getTypePathFromBinary(loc.toList());
+ }
+
+ return position;
+ }
+
Attribute readAttributeValue() {
char c = (char) buf[bp++];
switch (c) {
@@ -1748,7 +1877,7 @@
Annotations annotations = sym.annotations;
List<Attribute.Compound> newList = deproxyCompoundList(l);
if (annotations.pendingCompletion()) {
- annotations.setAttributes(newList);
+ annotations.setDeclarationAttributes(newList);
} else {
annotations.append(newList);
}
@@ -1758,6 +1887,39 @@
}
}
+ class TypeAnnotationCompleter extends AnnotationCompleter {
+
+ List<TypeAnnotationProxy> proxies;
+
+ TypeAnnotationCompleter(Symbol sym,
+ List<TypeAnnotationProxy> proxies) {
+ super(sym, List.<CompoundAnnotationProxy>nil());
+ this.proxies = proxies;
+ }
+
+ List<Attribute.TypeCompound> deproxyTypeCompoundList(List<TypeAnnotationProxy> proxies) {
+ ListBuffer<Attribute.TypeCompound> buf = ListBuffer.lb();
+ for (TypeAnnotationProxy proxy: proxies) {
+ Attribute.Compound compound = deproxyCompound(proxy.compound);
+ Attribute.TypeCompound typeCompound = new Attribute.TypeCompound(compound, proxy.position);
+ buf.add(typeCompound);
+ }
+ return buf.toList();
+ }
+
+ @Override
+ public void enterAnnotation() {
+ JavaFileObject previousClassFile = currentClassFile;
+ try {
+ currentClassFile = classFile;
+ List<Attribute.TypeCompound> newList = deproxyTypeCompoundList(proxies);
+ sym.annotations.setTypeAttributes(newList.prependList(sym.getRawTypeAttributes()));
+ } finally {
+ currentClassFile = previousClassFile;
+ }
+ }
+ }
+
/************************************************************************
* Reading Symbols
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,12 +31,14 @@
import java.util.Set;
import java.util.HashSet;
+import javax.lang.model.type.TypeKind;
import javax.tools.JavaFileManager;
import javax.tools.FileObject;
import javax.tools.JavaFileObject;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Attribute.RetentionPolicy;
+import com.sun.tools.javac.code.Attribute.TypeCompound;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.code.Types.UniqueType;
@@ -47,7 +49,6 @@
import com.sun.tools.javac.jvm.Pool.Variable;
import com.sun.tools.javac.util.*;
-import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTag.*;
@@ -68,19 +69,17 @@
protected static final Context.Key<ClassWriter> classWriterKey =
new Context.Key<ClassWriter>();
- private final Symtab syms;
-
private final Options options;
/** Switch: verbose output.
*/
private boolean verbose;
- /** Switch: scramble private names.
+ /** Switch: scramble private field names.
*/
private boolean scramble;
- /** Switch: scramble private names.
+ /** Switch: scramble all field names.
*/
private boolean scrambleAll;
@@ -96,7 +95,7 @@
*/
private boolean genCrt;
- /** Switch: describe the generated stackmap
+ /** Switch: describe the generated stackmap.
*/
boolean debugstackmap;
@@ -114,7 +113,7 @@
private Types types;
/** The initial sizes of the data and constant pool buffers.
- * sizes are increased when buffers get full.
+ * Sizes are increased when buffers get full.
*/
static final int DATA_BUF_SIZE = 0x0fff0;
static final int POOL_BUF_SIZE = 0x1fff0;
@@ -181,7 +180,6 @@
log = Log.instance(context);
names = Names.instance(context);
- syms = Symtab.instance(context);
options = Options.instance(context);
target = Target.instance(context);
source = Source.instance(context);
@@ -279,6 +277,7 @@
/** Assemble signature of given type in string buffer.
*/
void assembleSig(Type type) {
+ type = type.unannotatedType();
switch (type.getTag()) {
case BYTE:
sigbuf.appendByte('B');
@@ -379,6 +378,7 @@
}
void assembleClassSig(Type type) {
+ type = type.unannotatedType();
ClassType ct = (ClassType)type;
ClassSymbol c = (ClassSymbol)ct.tsym;
enterInner(c);
@@ -722,6 +722,7 @@
acount++;
}
acount += writeJavaAnnotations(sym.getRawAttributes());
+ acount += writeTypeAnnotations(sym.getRawTypeAttributes());
return acount;
}
@@ -838,6 +839,76 @@
return attrCount;
}
+ int writeTypeAnnotations(List<Attribute.TypeCompound> typeAnnos) {
+ if (typeAnnos.isEmpty()) return 0;
+
+ ListBuffer<Attribute.TypeCompound> visibles = ListBuffer.lb();
+ ListBuffer<Attribute.TypeCompound> invisibles = ListBuffer.lb();
+
+ for (Attribute.TypeCompound tc : typeAnnos) {
+ if (tc.position == null || tc.position.type == TargetType.UNKNOWN) {
+ boolean found = false;
+ // TODO: the position for the container annotation of a
+ // repeating type annotation has to be set.
+ // This cannot be done when the container is created, because
+ // then the position is not determined yet.
+ // How can we link these pieces better together?
+ if (tc.values.size() == 1) {
+ Pair<MethodSymbol, Attribute> val = tc.values.get(0);
+ if (val.fst.getSimpleName().contentEquals("value") &&
+ val.snd instanceof Attribute.Array) {
+ Attribute.Array arr = (Attribute.Array) val.snd;
+ if (arr.values.length != 0 &&
+ arr.values[0] instanceof Attribute.TypeCompound) {
+ TypeCompound atycomp = (Attribute.TypeCompound) arr.values[0];
+ if (atycomp.position.type != TargetType.UNKNOWN) {
+ tc.position = atycomp.position;
+ found = true;
+ }
+ }
+ }
+ }
+ if (!found) {
+ // This happens for nested types like @A Outer. @B Inner.
+ // For method parameters we get the annotation twice! Once with
+ // a valid position, once unknown.
+ // TODO: find a cleaner solution.
+ // System.err.println("ClassWriter: Position UNKNOWN in type annotation: " + tc);
+ continue;
+ }
+ }
+ if (!tc.position.emitToClassfile())
+ continue;
+ switch (types.getRetention(tc)) {
+ case SOURCE: break;
+ case CLASS: invisibles.append(tc); break;
+ case RUNTIME: visibles.append(tc); break;
+ default: ;// /* fail soft */ throw new AssertionError(vis);
+ }
+ }
+
+ int attrCount = 0;
+ if (visibles.length() != 0) {
+ int attrIndex = writeAttr(names.RuntimeVisibleTypeAnnotations);
+ databuf.appendChar(visibles.length());
+ for (Attribute.TypeCompound p : visibles)
+ writeTypeAnnotation(p);
+ endAttr(attrIndex);
+ attrCount++;
+ }
+
+ if (invisibles.length() != 0) {
+ int attrIndex = writeAttr(names.RuntimeInvisibleTypeAnnotations);
+ databuf.appendChar(invisibles.length());
+ for (Attribute.TypeCompound p : invisibles)
+ writeTypeAnnotation(p);
+ endAttr(attrIndex);
+ attrCount++;
+ }
+
+ return attrCount;
+ }
+
/** A visitor to write an attribute including its leading
* single-character marker.
*/
@@ -914,6 +985,94 @@
p.snd.accept(awriter);
}
}
+
+ void writeTypeAnnotation(Attribute.TypeCompound c) {
+ writePosition(c.position);
+ writeCompoundAttribute(c);
+ }
+
+ void writePosition(TypeAnnotationPosition p) {
+ databuf.appendByte(p.type.targetTypeValue()); // TargetType tag is a byte
+ switch (p.type) {
+ // type cast
+ case CAST:
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ databuf.appendChar(p.offset);
+ break;
+ // local variable
+ case LOCAL_VARIABLE:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ databuf.appendChar(p.lvarOffset.length); // for table length
+ for (int i = 0; i < p.lvarOffset.length; ++i) {
+ databuf.appendChar(p.lvarOffset[i]);
+ databuf.appendChar(p.lvarLength[i]);
+ databuf.appendChar(p.lvarIndex[i]);
+ }
+ break;
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ databuf.appendByte(p.exception_index);
+ break;
+ // method receiver
+ case METHOD_RECEIVER:
+ // Do nothing
+ break;
+ // type parameter
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ databuf.appendByte(p.parameter_index);
+ break;
+ // type parameter bound
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ databuf.appendByte(p.parameter_index);
+ databuf.appendByte(p.bound_index);
+ break;
+ // class extends or implements clause
+ case CLASS_EXTENDS:
+ databuf.appendChar(p.type_index);
+ break;
+ // throws
+ case THROWS:
+ databuf.appendChar(p.type_index);
+ break;
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ databuf.appendByte(p.parameter_index);
+ break;
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
+ databuf.appendChar(p.offset);
+ databuf.appendByte(p.type_index);
+ break;
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ // lambda formal parameter
+ case LAMBDA_FORMAL_PARAMETER:
+ databuf.appendByte(p.parameter_index);
+ break;
+ case UNKNOWN:
+ throw new AssertionError("jvm.ClassWriter: UNKNOWN target type should never occur!");
+ default:
+ throw new AssertionError("jvm.ClassWriter: Unknown target type for position: " + p);
+ }
+
+ { // Append location data for generics/arrays.
+ databuf.appendByte(p.location.size());
+ java.util.List<Integer> loc = TypeAnnotationPosition.getBinaryFromTypePath(p.location);
+ for (int i : loc)
+ databuf.appendByte((byte)i);
+ }
+ }
+
/**********************************************************************
* Writing Objects
**********************************************************************/
@@ -1661,6 +1820,7 @@
acount += writeFlagAttrs(c.flags());
acount += writeJavaAnnotations(c.getRawAttributes());
+ acount += writeTypeAnnotations(c.getRawTypeAttributes());
acount += writeEnclosingMethodAttribute(c);
acount += writeExtraClassAttributes(c);
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1924,17 +1924,70 @@
if (length < Character.MAX_VALUE) {
v.length = length;
putVar(v);
+ fillLocalVarPosition(v);
}
}
}
state.defined.excl(adr);
}
+ private void fillLocalVarPosition(LocalVar lv) {
+ if (lv == null || lv.sym == null
+ || lv.sym.annotations.isTypesEmpty())
+ return;
+ for (Attribute.TypeCompound ta : lv.sym.getRawTypeAttributes()) {
+ TypeAnnotationPosition p = ta.position;
+ p.lvarOffset = new int[] { (int)lv.start_pc };
+ p.lvarLength = new int[] { (int)lv.length };
+ p.lvarIndex = new int[] { (int)lv.reg };
+ p.isValidOffset = true;
+ }
+ }
+
+ // Method to be called after compressCatchTable to
+ // fill in the exception table index for type
+ // annotations on exception parameters.
+ public void fillExceptionParameterPositions() {
+ for (int i = 0; i < varBufferSize; ++i) {
+ LocalVar lv = varBuffer[i];
+ if (lv == null || lv.sym == null
+ || lv.sym.annotations.isTypesEmpty()
+ || !lv.sym.isExceptionParameter())
+ return;
+
+ int exidx = findExceptionIndex(lv);
+
+ for (Attribute.TypeCompound ta : lv.sym.getRawTypeAttributes()) {
+ TypeAnnotationPosition p = ta.position;
+ p.exception_index = exidx;
+ }
+ }
+ }
+
+ private int findExceptionIndex(LocalVar lv) {
+ List<char[]> iter = catchInfo.toList();
+ int len = catchInfo.length();
+ for (int i = 0; i < len; ++i) {
+ char[] catchEntry = iter.head;
+ iter = iter.tail;
+ char handlerpc = catchEntry[2];
+ if (lv.start_pc == handlerpc + 1) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
/** Put a live variable range into the buffer to be output to the
* class file.
*/
void putVar(LocalVar var) {
- if (!varDebugInfo) return;
+ // Keep local variables if
+ // 1) we need them for debug information
+ // 2) it is an exception type and it contains type annotations
+ if (!varDebugInfo &&
+ (!var.sym.isExceptionParameter() ||
+ var.sym.annotations.isTypesEmpty())) return;
if ((var.sym.flags() & Flags.SYNTHETIC) != 0) return;
if (varBuffer == null)
varBuffer = new LocalVar[20];
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1016,8 +1016,11 @@
code.frameBeforeLast = null;
}
- //compress exception table
+ // Compress exception table
code.compressCatchTable();
+
+ // Fill in type annotation positions for exception parameters
+ code.fillExceptionParameterPositions();
}
}
@@ -1738,6 +1741,7 @@
*************************************************************************/
public void visitApply(JCMethodInvocation tree) {
+ setTypeAnnotationPositions(tree.pos);
// Generate code for method.
Item m = genExpr(tree.meth, methodType);
// Generate code for all arguments, where the expected types are
@@ -1775,10 +1779,48 @@
result = items.makeStackItem(pt);
}
+ private void setTypeAnnotationPositions(int treePos) {
+ MethodSymbol meth = code.meth;
+
+ for (Attribute.TypeCompound ta : meth.getRawTypeAttributes()) {
+ if (ta.position.pos == treePos) {
+ ta.position.offset = code.cp;
+ ta.position.lvarOffset = new int[] { code.cp };
+ ta.position.isValidOffset = true;
+ }
+ }
+
+ if (code.meth.getKind() != javax.lang.model.element.ElementKind.CONSTRUCTOR
+ && code.meth.getKind() != javax.lang.model.element.ElementKind.STATIC_INIT)
+ return;
+
+ for (Attribute.TypeCompound ta : meth.owner.getRawTypeAttributes()) {
+ if (ta.position.pos == treePos) {
+ ta.position.offset = code.cp;
+ ta.position.lvarOffset = new int[] { code.cp };
+ ta.position.isValidOffset = true;
+ }
+ }
+
+ ClassSymbol clazz = meth.enclClass();
+ for (Symbol s : new com.sun.tools.javac.model.FilteredMemberList(clazz.members())) {
+ if (!s.getKind().isField())
+ continue;
+ for (Attribute.TypeCompound ta : s.getRawTypeAttributes()) {
+ if (ta.position.pos == treePos) {
+ ta.position.offset = code.cp;
+ ta.position.lvarOffset = new int[] { code.cp };
+ ta.position.isValidOffset = true;
+ }
+ }
+ }
+ }
+
public void visitNewClass(JCNewClass tree) {
// Enclosing instances or anonymous classes should have been eliminated
// by now.
Assert.check(tree.encl == null && tree.def == null);
+ setTypeAnnotationPositions(tree.pos);
code.emitop2(new_, makeRef(tree.pos(), tree.type));
code.emitop0(dup);
@@ -1793,6 +1835,7 @@
}
public void visitNewArray(JCNewArray tree) {
+ setTypeAnnotationPositions(tree.pos);
if (tree.elems != null) {
Type elemtype = types.elemtype(tree.type);
@@ -2122,6 +2165,7 @@
}
public void visitTypeCast(JCTypeCast tree) {
+ setTypeAnnotationPositions(tree.pos);
result = genExpr(tree.expr, tree.clazz.type).load();
// Additional code is only needed if we cast to a reference type
// which is not statically a supertype of the expression's type.
@@ -2138,6 +2182,7 @@
}
public void visitTypeTest(JCInstanceOf tree) {
+ setTypeAnnotationPositions(tree.pos);
genExpr(tree.expr, tree.expr.type).load();
code.emitop2(instanceof_, makeRef(tree.pos(), tree.clazz.type));
result = items.makeStackItem(syms.booleanType);
@@ -2184,7 +2229,7 @@
code.emitop2(ldc2, makeRef(tree.pos(), tree.selected.type));
result = items.makeStackItem(pt);
return;
- }
+ }
Symbol ssym = TreeInfo.symbol(tree.selected);
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/JNIWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/JNIWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -158,7 +158,7 @@
return false;
/* temporary code for backwards compatibility */
- for (Attribute.Compound a: c.annotations.getAttributes()) {
+ for (Attribute.Compound a: c.annotations.getDeclarationAttributes()) {
if (a.type.tsym == syms.nativeHeaderType_old.tsym)
return true;
}
@@ -167,7 +167,7 @@
for (Scope.Entry i = c.members_field.elems; i != null; i = i.sibling) {
if (i.sym.kind == Kinds.MTH && (i.sym.flags() & Flags.NATIVE) != 0)
return true;
- for (Attribute.Compound a: i.sym.annotations.getAttributes()) {
+ for (Attribute.Compound a: i.sym.annotations.getDeclarationAttributes()) {
if (a.type.tsym == syms.nativeHeaderType.tsym)
return true;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -513,7 +513,7 @@
*/
public CompileState shouldStopPolicyIfNoError;
- /** A queue of all as yet unattributed classes.oLo
+ /** A queue of all as yet unattributed classes.
*/
public Todo todo;
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
import java.lang.annotation.Annotation;
import java.lang.annotation.Inherited;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.Map;
import javax.lang.model.SourceVersion;
@@ -96,32 +98,43 @@
enter = Enter.instance(context);
}
-
/**
- * An internal-use utility that creates a reified annotation.
+ * An internal-use utility that creates a runtime view of an
+ * annotation. This is the implementation of
+ * Element.getAnnotation(Class).
*/
public static <A extends Annotation> A getAnnotation(Symbol annotated,
Class<A> annoType) {
if (!annoType.isAnnotation())
throw new IllegalArgumentException("Not an annotation type: "
+ annoType);
- String name = annoType.getName();
- for (Attribute.Compound anno : annotated.getAnnotationMirrors())
- if (name.equals(anno.type.tsym.flatName().toString()))
- return AnnotationProxyMaker.generateAnnotation(anno, annoType);
- return null;
+ Attribute.Compound c;
+ if (annotated.kind == Kinds.TYP && annotated instanceof ClassSymbol) {
+ c = getAttributeOnClass((ClassSymbol)annotated, annoType);
+ } else {
+ c = getAttribute(annotated, annoType);
+ }
+ return c == null ? null : AnnotationProxyMaker.generateAnnotation(c, annoType);
}
- /**
- * An internal-use utility that creates a reified annotation.
- * This overloaded version take annotation inheritance into account.
- */
- public static <A extends Annotation> A getAnnotation(ClassSymbol annotated,
- Class<A> annoType) {
+ // Helper to getAnnotation[s]
+ private static <A extends Annotation> Attribute.Compound getAttribute(Symbol annotated,
+ Class<A> annoType) {
+ String name = annoType.getName();
+
+ for (Attribute.Compound anno : annotated.getRawAttributes())
+ if (name.equals(anno.type.tsym.flatName().toString()))
+ return anno;
+
+ return null;
+ }
+ // Helper to getAnnotation[s]
+ private static <A extends Annotation> Attribute.Compound getAttributeOnClass(ClassSymbol annotated,
+ Class<A> annoType) {
boolean inherited = annoType.isAnnotationPresent(Inherited.class);
- A result = null;
+ Attribute.Compound result = null;
while (annotated.name != annotated.name.table.names.java_lang_Object) {
- result = getAnnotation((Symbol)annotated, annoType);
+ result = getAttribute(annotated, annoType);
if (result != null || !inherited)
break;
Type sup = annotated.getSuperclass();
@@ -132,6 +145,189 @@
return result;
}
+ /**
+ * An internal-use utility that creates a runtime view of
+ * annotations. This is the implementation of
+ * Element.getAnnotations(Class).
+ */
+ public static <A extends Annotation> A[] getAnnotations(Symbol annotated,
+ Class<A> annoType) {
+ if (!annoType.isAnnotation())
+ throw new IllegalArgumentException("Not an annotation type: "
+ + annoType);
+ // If annoType does not declare a container this is equivalent to wrapping
+ // getAnnotation(...) in an array.
+ Class <? extends Annotation> containerType = getContainer(annoType);
+ if (containerType == null) {
+ A res = getAnnotation(annotated, annoType);
+ int size;
+ if (res == null) {
+ size = 0;
+ } else {
+ size = 1;
+ }
+ @SuppressWarnings("unchecked") // annoType is the Class for A
+ A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size);
+ if (res != null)
+ arr[0] = res;
+ return arr;
+ }
+
+ // So we have a containing type
+ String name = annoType.getName();
+ String annoTypeName = annoType.getSimpleName();
+ String containerTypeName = containerType.getSimpleName();
+ int directIndex = -1, containerIndex = -1;
+ Attribute.Compound direct = null, container = null;
+ Attribute.Compound[] rawAttributes = annotated.getRawAttributes().toArray(new Attribute.Compound[0]);
+
+ // Find directly present annotations
+ for (int i = 0; i < rawAttributes.length; i++) {
+ if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
+ directIndex = i;
+ direct = rawAttributes[i];
+ } else if(containerTypeName != null &&
+ containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
+ containerIndex = i;
+ container = rawAttributes[i];
+ }
+ }
+ // Deal with inherited annotations
+ if (annotated.kind == Kinds.TYP &&
+ (annotated instanceof ClassSymbol)) {
+ ClassSymbol s = (ClassSymbol)annotated;
+ if (direct == null && container == null) {
+ direct = getAttributeOnClass(s, annoType);
+ container = getAttributeOnClass(s, containerType);
+
+ // both are inherited and found, put container last
+ if (direct != null && container != null) {
+ directIndex = 0;
+ containerIndex = 1;
+ } else if (direct != null) {
+ directIndex = 0;
+ } else {
+ containerIndex = 0;
+ }
+ } else if (direct == null) {
+ direct = getAttributeOnClass(s, annoType);
+ if (direct != null)
+ directIndex = containerIndex + 1;
+ } else if (container == null) {
+ container = getAttributeOnClass(s, containerType);
+ if (container != null)
+ containerIndex = directIndex + 1;
+ }
+ }
+
+ // Pack them in an array
+ Attribute[] contained0 = new Attribute[0];
+ if (container != null)
+ contained0 = unpackAttributes(container);
+ ListBuffer<Attribute.Compound> compounds = ListBuffer.lb();
+ for (Attribute a : contained0)
+ if (a instanceof Attribute.Compound)
+ compounds = compounds.append((Attribute.Compound)a);
+ Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]);
+
+ int size = (direct == null ? 0 : 1) + contained.length;
+ @SuppressWarnings("unchecked") // annoType is the Class for A
+ A[] arr = (A[])java.lang.reflect.Array.newInstance(annoType, size);
+
+ // if direct && container, which is first?
+ int insert = -1;
+ int length = arr.length;
+ if (directIndex >= 0 && containerIndex >= 0) {
+ if (directIndex < containerIndex) {
+ arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
+ insert = 1;
+ } else {
+ arr[arr.length - 1] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
+ insert = 0;
+ length--;
+ }
+ } else if (directIndex >= 0) {
+ arr[0] = AnnotationProxyMaker.generateAnnotation(direct, annoType);
+ return arr;
+ } else {
+ // Only container
+ insert = 0;
+ }
+
+ for (int i = 0; i + insert < length; i++)
+ arr[insert + i] = AnnotationProxyMaker.generateAnnotation(contained[i], annoType);
+
+ return arr;
+ }
+
+ // Needed to unpack the runtime view of containing annotations
+ private static final Class<? extends Annotation> REPEATABLE_CLASS = initRepeatable();
+ private static final Method VALUE_ELEMENT_METHOD = initValueElementMethod();
+
+ private static Class<? extends Annotation> initRepeatable() {
+ try {
+ // Repeatable will not be available when bootstrapping on
+ // JDK 7 so use a reflective lookup instead of a class
+ // literal for Repeatable.class.
+ return Class.forName("java.lang.annotation.Repeatable").asSubclass(Annotation.class);
+ } catch (ClassNotFoundException e) {
+ return null;
+ } catch (SecurityException e) {
+ return null;
+ }
+ }
+ private static Method initValueElementMethod() {
+ if (REPEATABLE_CLASS == null)
+ return null;
+
+ Method m = null;
+ try {
+ m = REPEATABLE_CLASS.getMethod("value");
+ if (m != null)
+ m.setAccessible(true);
+ return m;
+ } catch (NoSuchMethodException e) {
+ return null;
+ }
+ }
+
+ // Helper to getAnnotations
+ private static Class<? extends Annotation> getContainer(Class<? extends Annotation> annoType) {
+ // Since we can not refer to java.lang.annotation.Repeatable until we are
+ // bootstrapping with java 8 we need to get the Repeatable annotation using
+ // reflective invocations instead of just using its type and element method.
+ if (REPEATABLE_CLASS != null &&
+ VALUE_ELEMENT_METHOD != null) {
+ // Get the Repeatable instance on the annotations declaration
+ Annotation repeatable = (Annotation)annoType.getAnnotation(REPEATABLE_CLASS);
+ if (repeatable != null) {
+ try {
+ // Get the value element, it should be a class
+ // indicating the containing annotation type
+ @SuppressWarnings("unchecked")
+ Class<? extends Annotation> containerType = (Class)VALUE_ELEMENT_METHOD.invoke(repeatable);
+ if (containerType == null)
+ return null;
+
+ return containerType;
+ } catch (ClassCastException e) {
+ return null;
+ } catch (IllegalAccessException e) {
+ return null;
+ } catch (InvocationTargetException e ) {
+ return null;
+ }
+ }
+ }
+ return null;
+ }
+ // Helper to getAnnotations
+ private static Attribute[] unpackAttributes(Attribute.Compound container) {
+ // We now have an instance of the container,
+ // unpack it returning an instance of the
+ // contained type or null
+ return ((Attribute.Array)container.member(container.type.tsym.name.table.names.value)).values;
+ }
public PackageSymbol getPackageElement(CharSequence name) {
String strName = name.toString();
@@ -238,8 +434,10 @@
tree.accept(vis);
if (vis.result == null)
return null;
+
+ List<Attribute.Compound> annos = sym.getRawAttributes();
return matchAnnoToTree(cast(Attribute.Compound.class, findme),
- sym.getAnnotationMirrors(),
+ annos,
vis.result);
}
@@ -442,7 +640,7 @@
*/
public List<Attribute.Compound> getAllAnnotationMirrors(Element e) {
Symbol sym = cast(Symbol.class, e);
- List<Attribute.Compound> annos = sym.getAnnotationMirrors();
+ List<Attribute.Compound> annos = sym.getRawAttributes();
while (sym.getKind() == ElementKind.CLASS) {
Type sup = ((ClassSymbol) sym).getSuperclass();
if (!sup.hasTag(CLASS) || sup.isErroneous() ||
@@ -451,7 +649,8 @@
}
sym = sup.tsym;
List<Attribute.Compound> oldAnnos = annos;
- for (Attribute.Compound anno : sym.getAnnotationMirrors()) {
+ List<Attribute.Compound> newAnnos = sym.getRawAttributes();
+ for (Attribute.Compound anno : newAnnos) {
if (isInherited(anno.type) &&
!containsAnnoOfType(oldAnnos, anno.type)) {
annos = annos.prepend(anno);
@@ -465,11 +664,7 @@
* Tests whether an annotation type is @Inherited.
*/
private boolean isInherited(Type annotype) {
- for (Attribute.Compound anno : annotype.tsym.getAnnotationMirrors()) {
- if (anno.type.tsym == syms.inheritedType.tsym)
- return true;
- }
- return false;
+ return annotype.tsym.attribute(syms.inheritedType.tsym) != null;
}
/**
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
package com.sun.tools.javac.model;
+import java.lang.annotation.Annotation;
import java.util.Collections;
import java.util.EnumSet;
-import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -333,4 +333,28 @@
return results;
}
+
+ public List<? extends AnnotationMirror> typeAnnotationsOf(TypeMirror type) {
+ // TODO: these methods can be removed.
+ return null; // ((Type)type).typeAnnotations;
+ }
+
+ public <A extends Annotation> A typeAnnotationOf(TypeMirror type,
+ Class<A> annotationType) {
+ // TODO: these methods can be removed.
+ return null; // JavacElements.getAnnotation(((Type)type).typeAnnotations, annotationType);
+ }
+
+ public TypeMirror receiverTypeOf(ExecutableType type) {
+ return ((Type)type).asMethodType().recvtype;
+ }
+
+ /*
+ public <A extends Annotation> A receiverTypeAnnotationOf(
+ ExecutableType type, Class<A> annotationType) {
+ return JavacElements.getAnnotation(
+ ((Type)type).asMethodType().receiverTypeAnnotations,
+ annotationType);
+ }*/
+
}
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,41 @@
/** End position mappings container */
private final AbstractEndPosTable endPosTable;
+ // Because of javac's limited lookahead, some contexts are ambiguous in
+ // the presence of type annotations even though they are not ambiguous
+ // in the absence of type annotations. Consider this code:
+ // void m(String [] m) { }
+ // void m(String ... m) { }
+ // After parsing "String", javac calls bracketsOpt which immediately
+ // returns if the next character is not '['. Similarly, javac can see
+ // if the next token is ... and in that case parse an ellipsis. But in
+ // the presence of type annotations:
+ // void m(String @A [] m) { }
+ // void m(String @A ... m) { }
+ // no finite lookahead is enough to determine whether to read array
+ // levels or an ellipsis. Furthermore, if you call bracketsOpt, then
+ // bracketsOpt first reads all the leading annotations and only then
+ // discovers that it needs to fail. bracketsOpt needs a way to push
+ // back the extra annotations that it read. (But, bracketsOpt should
+ // not *always* be allowed to push back extra annotations that it finds
+ // -- in most contexts, any such extra annotation is an error.
+ //
+ // The following two variables permit type annotations that have
+ // already been read to be stored for later use. Alternate
+ // implementations are possible but would cause much larger changes to
+ // the parser.
+
+ /** Type annotations that have already been read but have not yet been used. **/
+ private List<JCAnnotation> typeAnnotationsPushedBack = List.nil();
+
+ /**
+ * If the parser notices extra annotations, then it either immediately
+ * issues an error (if this variable is false) or places the extra
+ * annotations in variable typeAnnotationsPushedBack (if this variable
+ * is true).
+ */
+ private boolean permitTypeAnnotationsPushBack = false;
+
interface ErrorRecoveryAction {
JCTree doRecover(JavacParser parser);
}
@@ -124,9 +159,9 @@
this.allowLambda = source.allowLambda();
this.allowMethodReferences = source.allowMethodReferences();
this.allowDefaultMethods = source.allowDefaultMethods();
- this.allowIntersectionTypesInCast =
- source.allowIntersectionTypesInCast() &&
- fac.options.isSet("allowIntersectionTypes");
+ this.allowStaticInterfaceMethods = source.allowStaticInterfaceMethods();
+ this.allowIntersectionTypesInCast = source.allowIntersectionTypesInCast();
+ this.allowTypeAnnotations = source.allowTypeAnnotations();
this.keepDocComments = keepDocComments;
docComments = newDocCommentTable(keepDocComments, fac);
this.keepLineMap = keepLineMap;
@@ -200,6 +235,10 @@
*/
boolean allowDefaultMethods;
+ /** Switch: should we allow static methods in interfaces?
+ */
+ boolean allowStaticInterfaceMethods;
+
/** Switch: should we allow intersection types in cast?
*/
boolean allowIntersectionTypesInCast;
@@ -212,6 +251,20 @@
*/
boolean keepLineMap;
+ /** Switch: should we recognize type annotations?
+ */
+ boolean allowTypeAnnotations;
+
+ /** Switch: is "this" allowed as an identifier?
+ * This is needed to parse receiver types.
+ */
+ boolean allowThisIdent;
+
+ /** The type of the method receiver, as specified by a first "this" parameter.
+ */
+ JCVariableDecl receiverParam;
+
+
/** When terms are parsed, the mode determines which is expected:
* mode = EXPR : an expression
* mode = TYPE : a type
@@ -245,40 +298,42 @@
token = S.token();
}
- protected boolean peekToken(TokenKind tk) {
+ protected boolean peekToken(Filter<TokenKind> tk) {
return peekToken(0, tk);
}
- protected boolean peekToken(int lookahead, TokenKind tk) {
- return S.token(lookahead + 1).kind == tk;
+ protected boolean peekToken(int lookahead, Filter<TokenKind> tk) {
+ return tk.accepts(S.token(lookahead + 1).kind);
}
- protected boolean peekToken(TokenKind tk1, TokenKind tk2) {
+ protected boolean peekToken(Filter<TokenKind> tk1, Filter<TokenKind> tk2) {
return peekToken(0, tk1, tk2);
}
- protected boolean peekToken(int lookahead, TokenKind tk1, TokenKind tk2) {
- return S.token(lookahead + 1).kind == tk1 &&
- S.token(lookahead + 2).kind == tk2;
+ protected boolean peekToken(int lookahead, Filter<TokenKind> tk1, Filter<TokenKind> tk2) {
+ return tk1.accepts(S.token(lookahead + 1).kind) &&
+ tk2.accepts(S.token(lookahead + 2).kind);
}
- protected boolean peekToken(TokenKind tk1, TokenKind tk2, TokenKind tk3) {
+ protected boolean peekToken(Filter<TokenKind> tk1, Filter<TokenKind> tk2, Filter<TokenKind> tk3) {
return peekToken(0, tk1, tk2, tk3);
}
- protected boolean peekToken(int lookahead, TokenKind tk1, TokenKind tk2, TokenKind tk3) {
- return S.token(lookahead + 1).kind == tk1 &&
- S.token(lookahead + 2).kind == tk2 &&
- S.token(lookahead + 3).kind == tk3;
+ protected boolean peekToken(int lookahead, Filter<TokenKind> tk1, Filter<TokenKind> tk2, Filter<TokenKind> tk3) {
+ return tk1.accepts(S.token(lookahead + 1).kind) &&
+ tk2.accepts(S.token(lookahead + 2).kind) &&
+ tk3.accepts(S.token(lookahead + 3).kind);
}
- protected boolean peekToken(TokenKind... kinds) {
+ @SuppressWarnings("unchecked")
+ protected boolean peekToken(Filter<TokenKind>... kinds) {
return peekToken(0, kinds);
}
- protected boolean peekToken(int lookahead, TokenKind... kinds) {
+ @SuppressWarnings("unchecked")
+ protected boolean peekToken(int lookahead, Filter<TokenKind>... kinds) {
for (; lookahead < kinds.length ; lookahead++) {
- if (S.token(lookahead + 1).kind != kinds[lookahead]) {
+ if (!kinds[lookahead].accepts(S.token(lookahead + 1).kind)) {
return false;
}
}
@@ -333,6 +388,7 @@
if (stopAtMemberDecl)
return;
break;
+ case UNDERSCORE:
case IDENTIFIER:
if (stopAtIdentifier)
return;
@@ -552,21 +608,45 @@
nextToken();
return name;
}
+ } else if (token.kind == THIS) {
+ if (allowThisIdent) {
+ // Make sure we're using a supported source version.
+ checkTypeAnnotations();
+ Name name = token.name();
+ nextToken();
+ return name;
+ } else {
+ error(token.pos, "this.as.identifier");
+ nextToken();
+ return names.error;
+ }
+ } else if (token.kind == UNDERSCORE) {
+ warning(token.pos, "underscore.as.identifier");
+ Name name = token.name();
+ nextToken();
+ return name;
} else {
accept(IDENTIFIER);
return names.error;
}
-}
+ }
/**
- * Qualident = Ident { DOT Ident }
+ * Qualident = Ident { DOT [Annotations] Ident }
*/
- public JCExpression qualident() {
+ public JCExpression qualident(boolean allowAnnos) {
JCExpression t = toP(F.at(token.pos).Ident(ident()));
while (token.kind == DOT) {
int pos = token.pos;
nextToken();
+ List<JCAnnotation> tyannos = null;
+ if (allowAnnos) {
+ tyannos = typeAnnotationsOpt();
+ }
t = toP(F.at(pos).Select(t, ident()));
+ if (tyannos != null && tyannos.nonEmpty()) {
+ t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
+ }
}
return t;
}
@@ -675,7 +755,7 @@
nextToken();
return t;
}
-//where
+ //where
boolean isZero(String s) {
char[] cs = s.toCharArray();
int base = ((cs.length > 1 && Character.toLowerCase(cs[1]) == 'x') ? 16 : 10);
@@ -695,7 +775,34 @@
return term(EXPR);
}
+ /**
+ * parses (optional) type annotations followed by a type. If the
+ * annotations are present before the type and are not consumed during array
+ * parsing, this method returns a {@link JCAnnotatedType} consisting of
+ * these annotations and the underlying type. Otherwise, it returns the
+ * underlying type.
+ *
+ * <p>
+ *
+ * Note that this method sets {@code mode} to {@code TYPE} first, before
+ * parsing annotations.
+ */
public JCExpression parseType() {
+ List<JCAnnotation> annotations = typeAnnotationsOpt();
+ return parseType(annotations);
+ }
+
+ public JCExpression parseType(List<JCAnnotation> annotations) {
+ JCExpression result = unannotatedType();
+
+ if (annotations.nonEmpty()) {
+ result = insertAnnotationsToMostInner(result, annotations, false);
+ }
+
+ return result;
+ }
+
+ public JCExpression unannotatedType() {
return term(TYPE);
}
@@ -853,7 +960,7 @@
opStackSupply.add(opStack);
return t;
}
-//where
+ //where
/** Construct a binary or type test node.
*/
private JCExpression makeOp(int pos,
@@ -932,9 +1039,9 @@
* | NEW [TypeArguments] Creator
* | "(" Arguments ")" "->" ( Expression | Block )
* | Ident "->" ( Expression | Block )
- * | Ident { "." Ident }
+ * | [Annotations] Ident { "." [Annotations] Ident }
* | Expression3 MemberReferenceSuffix
- * [ "[" ( "]" BracketsOpt "." CLASS | Expression "]" )
+ * [ [Annotations] "[" ( "]" BracketsOpt "." CLASS | Expression "]" )
* | Arguments
* | "." ( CLASS | THIS | [TypeArguments] SUPER Arguments | NEW [TypeArguments] InnerCreator )
* ]
@@ -1056,7 +1163,35 @@
typeArgs = null;
} else return illegal();
break;
- case IDENTIFIER: case ASSERT: case ENUM:
+ case MONKEYS_AT:
+ // Only annotated cast types are valid
+ List<JCAnnotation> typeAnnos = typeAnnotationsOpt();
+ if (typeAnnos.isEmpty()) {
+ // else there would be no '@'
+ throw new AssertionError("Expected type annotations, but found none!");
+ }
+
+ JCExpression expr = term3();
+
+ if ((mode & TYPE) == 0) {
+ // Type annotations on class literals no longer legal
+ if (!expr.hasTag(Tag.SELECT)) {
+ return illegal(typeAnnos.head.pos);
+ }
+ JCFieldAccess sel = (JCFieldAccess)expr;
+
+ if (sel.name != names._class) {
+ return illegal();
+ } else {
+ log.error(token.pos, "no.annotations.on.dot.class");
+ return expr;
+ }
+ } else {
+ // Type annotations targeting a cast
+ t = insertAnnotationsToMostInner(expr, typeAnnos, false);
+ }
+ break;
+ case UNDERSCORE: case IDENTIFIER: case ASSERT: case ENUM:
if (typeArgs != null) return illegal();
if ((mode & EXPR) != 0 && peekToken(ARROW)) {
t = lambdaExpressionOrStatement(false, false, pos);
@@ -1064,6 +1199,13 @@
t = toP(F.at(token.pos).Ident(ident()));
loop: while (true) {
pos = token.pos;
+ final List<JCAnnotation> annos = typeAnnotationsOpt();
+
+ // need to report an error later if LBRACKET is for array
+ // index access rather than array creation level
+ if (!annos.isEmpty() && token.kind != LBRACKET && token.kind != ELLIPSIS)
+ return illegal(annos.head.pos);
+
switch (token.kind) {
case LBRACKET:
nextToken();
@@ -1071,11 +1213,23 @@
nextToken();
t = bracketsOpt(t);
t = toP(F.at(pos).TypeArray(t));
- t = bracketsSuffix(t);
+ if (annos.nonEmpty()) {
+ t = toP(F.at(pos).AnnotatedType(annos, t));
+ }
+ // .class is only allowed if there were no annotations
+ JCExpression nt = bracketsSuffix(t);
+ if (nt != t && (annos.nonEmpty() || TreeInfo.containsTypeAnnotation(t))) {
+ // t and nt are different if bracketsSuffix parsed a .class.
+ // The check for nonEmpty covers the case when the whole array is annotated.
+ // Helper method isAnnotated looks for annos deeply within t.
+ syntaxError("no.annotations.on.dot.class");
+ }
+ t = nt;
} else {
if ((mode & EXPR) != 0) {
mode = EXPR;
JCExpression t1 = term();
+ if (!annos.isEmpty()) t = illegal(annos.head.pos);
t = to(F.at(pos).Indexed(t, t1));
}
accept(RBRACKET);
@@ -1085,6 +1239,7 @@
if ((mode & EXPR) != 0) {
mode = EXPR;
t = arguments(typeArgs, t);
+ if (!annos.isEmpty()) t = illegal(annos.head.pos);
typeArgs = null;
}
break loop;
@@ -1125,9 +1280,25 @@
break loop;
}
}
+
+ List<JCAnnotation> tyannos = null;
+ if ((mode & TYPE) != 0 && token.kind == MONKEYS_AT) {
+ tyannos = typeAnnotationsOpt();
+ }
// typeArgs saved for next loop iteration.
t = toP(F.at(pos).Select(t, ident()));
+ if (tyannos != null && tyannos.nonEmpty()) {
+ t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
+ }
break;
+ case ELLIPSIS:
+ if (this.permitTypeAnnotationsPushBack) {
+ this.typeAnnotationsPushedBack = annos;
+ } else if (annos.nonEmpty()) {
+ // Don't return here -- error recovery attempt
+ illegal(annos.head.pos);
+ }
+ break loop;
case LT:
if ((mode & TYPE) == 0 && isUnboundMemberRef()) {
//this is an unbound method reference whose qualifier
@@ -1201,6 +1372,8 @@
if (typeArgs != null) illegal();
while (true) {
int pos1 = token.pos;
+ final List<JCAnnotation> annos = typeAnnotationsOpt();
+
if (token.kind == LBRACKET) {
nextToken();
if ((mode & TYPE) != 0) {
@@ -1214,6 +1387,9 @@
mode = EXPR;
continue;
}
+ if (annos.nonEmpty()) {
+ t = toP(F.at(pos1).AnnotatedType(annos, t));
+ }
return t;
}
mode = oldmode;
@@ -1242,7 +1418,15 @@
t = innerCreator(pos2, typeArgs, t);
typeArgs = null;
} else {
+ List<JCAnnotation> tyannos = null;
+ if ((mode & TYPE) != 0 && token.kind == MONKEYS_AT) {
+ // is the mode check needed?
+ tyannos = typeAnnotationsOpt();
+ }
t = toP(F.at(pos1).Select(t, ident()));
+ if (tyannos != null && tyannos.nonEmpty()) {
+ t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
+ }
t = argumentsOpt(typeArgs, typeArgumentsOpt(t));
typeArgs = null;
}
@@ -1252,6 +1436,12 @@
accept(COLCOL);
t = memberReferenceSuffix(pos1, t);
} else {
+ if (!annos.isEmpty()) {
+ if (permitTypeAnnotationsPushBack)
+ typeAnnotationsPushedBack = annos;
+ else
+ return illegal(annos.head.pos);
+ }
break;
}
}
@@ -1274,7 +1464,7 @@
int pos = 0, depth = 0;
for (Token t = S.token(pos) ; ; t = S.token(++pos)) {
switch (t.kind) {
- case IDENTIFIER: case QUES: case EXTENDS: case SUPER:
+ case IDENTIFIER: case UNDERSCORE: case QUES: case EXTENDS: case SUPER:
case DOT: case RBRACKET: case LBRACKET: case COMMA:
case BYTE: case SHORT: case INT: case LONG: case FLOAT:
case DOUBLE: case BOOLEAN: case CHAR:
@@ -1310,7 +1500,7 @@
ParensResult analyzeParens() {
int depth = 0;
boolean type = false;
- for (int lookahead = 0 ; ; lookahead++) {
+ outer: for (int lookahead = 0 ; ; lookahead++) {
TokenKind tk = S.token(lookahead).kind;
switch (tk) {
case EXTENDS: case SUPER: case COMMA:
@@ -1323,8 +1513,8 @@
if (peekToken(lookahead, RPAREN)) {
//Type, ')' -> cast
return ParensResult.CAST;
- } else if (peekToken(lookahead, IDENTIFIER)) {
- //Type, 'Identifier -> explicit lambda
+ } else if (peekToken(lookahead, LAX_IDENTIFIER)) {
+ //Type, Identifier/'_'/'assert'/'enum' -> explicit lambda
return ParensResult.EXPLICIT_LAMBDA;
}
break;
@@ -1350,16 +1540,19 @@
case INTLITERAL: case LONGLITERAL: case FLOATLITERAL:
case DOUBLELITERAL: case CHARLITERAL: case STRINGLITERAL:
case TRUE: case FALSE: case NULL:
- case NEW: case IDENTIFIER: case ASSERT: case ENUM:
+ case NEW: case IDENTIFIER: case ASSERT: case ENUM: case UNDERSCORE:
case BYTE: case SHORT: case CHAR: case INT:
case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID:
return ParensResult.CAST;
default:
return ParensResult.PARENS;
}
+ case UNDERSCORE:
+ case ASSERT:
+ case ENUM:
case IDENTIFIER:
- if (peekToken(lookahead, IDENTIFIER)) {
- // Identifier, Identifier -> explicit lambda
+ if (peekToken(lookahead, LAX_IDENTIFIER)) {
+ // Identifier, Identifier/'_'/'assert'/'enum' -> explicit lambda
return ParensResult.EXPLICIT_LAMBDA;
} else if (peekToken(lookahead, RPAREN, ARROW)) {
// Identifier, ')' '->' -> implicit lambda
@@ -1368,12 +1561,39 @@
break;
case FINAL:
case ELLIPSIS:
- case MONKEYS_AT:
//those can only appear in explicit lambdas
return ParensResult.EXPLICIT_LAMBDA;
+ case MONKEYS_AT:
+ type = true;
+ lookahead += 1; //skip '@'
+ while (peekToken(lookahead, DOT)) {
+ lookahead += 2;
+ }
+ if (peekToken(lookahead, LPAREN)) {
+ lookahead++;
+ //skip annotation values
+ int nesting = 0;
+ for (; ; lookahead++) {
+ TokenKind tk2 = S.token(lookahead).kind;
+ switch (tk2) {
+ case EOF:
+ return ParensResult.PARENS;
+ case LPAREN:
+ nesting++;
+ break;
+ case RPAREN:
+ nesting--;
+ if (nesting == 0) {
+ continue outer;
+ }
+ break;
+ }
+ }
+ }
+ break;
case LBRACKET:
- if (peekToken(lookahead, RBRACKET, IDENTIFIER)) {
- // '[', ']', Identifier -> explicit lambda
+ if (peekToken(lookahead, RBRACKET, LAX_IDENTIFIER)) {
+ // '[', ']', Identifier/'_'/'assert'/'enum' -> explicit lambda
return ParensResult.EXPLICIT_LAMBDA;
} else if (peekToken(lookahead, RBRACKET, RPAREN) ||
peekToken(lookahead, RBRACKET, AMP)) {
@@ -1402,11 +1622,11 @@
// '>', ')' -> cast
// '>', '&' -> cast
return ParensResult.CAST;
- } else if (peekToken(lookahead, IDENTIFIER, COMMA) ||
- peekToken(lookahead, IDENTIFIER, RPAREN, ARROW) ||
+ } else if (peekToken(lookahead, LAX_IDENTIFIER, COMMA) ||
+ peekToken(lookahead, LAX_IDENTIFIER, RPAREN, ARROW) ||
peekToken(lookahead, ELLIPSIS)) {
- // '>', Identifier, ',' -> explicit lambda
- // '>', Identifier, ')', '->' -> explicit lambda
+ // '>', Identifier/'_'/'assert'/'enum', ',' -> explicit lambda
+ // '>', Identifier/'_'/'assert'/'enum', ')', '->' -> explicit lambda
// '>', '...' -> explicit lambda
return ParensResult.EXPLICIT_LAMBDA;
}
@@ -1426,6 +1646,13 @@
}
}
+ /** Accepts all identifier-like tokens */
+ Filter<TokenKind> LAX_IDENTIFIER = new Filter<TokenKind>() {
+ public boolean accepts(TokenKind t) {
+ return t == IDENTIFIER || t == UNDERSCORE || t == ASSERT || t == ENUM;
+ }
+ };
+
enum ParensResult {
CAST,
EXPLICIT_LAMBDA,
@@ -1433,21 +1660,9 @@
PARENS;
}
- JCExpression lambdaExpressionOrStatement(JCVariableDecl firstParam, int pos) {
- ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();
- params.append(firstParam);
- JCVariableDecl lastParam = firstParam;
- while ((lastParam.mods.flags & Flags.VARARGS) == 0 && token.kind == COMMA) {
- nextToken();
- params.append(lastParam = formalParameter());
- }
- accept(RPAREN);
- return lambdaExpressionOrStatementRest(params.toList(), pos);
- }
-
JCExpression lambdaExpressionOrStatement(boolean hasParens, boolean explicitParams, int pos) {
List<JCVariableDecl> params = explicitParams ?
- formalParameters() :
+ formalParameters(true) :
implicitParameters(hasParens);
return lambdaExpressionOrStatementRest(params, pos);
@@ -1609,37 +1824,43 @@
/**
* {@literal
* TypeArgument = Type
- * | "?"
- * | "?" EXTENDS Type {"&" Type}
- * | "?" SUPER Type
+ * | [Annotations] "?"
+ * | [Annotations] "?" EXTENDS Type {"&" Type}
+ * | [Annotations] "?" SUPER Type
* }
*/
JCExpression typeArgument() {
- if (token.kind != QUES) return parseType();
+ List<JCAnnotation> annotations = typeAnnotationsOpt();
+ if (token.kind != QUES) return parseType(annotations);
int pos = token.pos;
nextToken();
+ JCExpression result;
if (token.kind == EXTENDS) {
TypeBoundKind t = to(F.at(pos).TypeBoundKind(BoundKind.EXTENDS));
nextToken();
JCExpression bound = parseType();
- return F.at(pos).Wildcard(t, bound);
+ result = F.at(pos).Wildcard(t, bound);
} else if (token.kind == SUPER) {
TypeBoundKind t = to(F.at(pos).TypeBoundKind(BoundKind.SUPER));
nextToken();
JCExpression bound = parseType();
- return F.at(pos).Wildcard(t, bound);
- } else if (token.kind == IDENTIFIER) {
+ result = F.at(pos).Wildcard(t, bound);
+ } else if (LAX_IDENTIFIER.accepts(token.kind)) {
//error recovery
TypeBoundKind t = F.at(Position.NOPOS).TypeBoundKind(BoundKind.UNBOUND);
JCExpression wc = toP(F.at(pos).Wildcard(t, null));
JCIdent id = toP(F.at(token.pos).Ident(ident()));
JCErroneous err = F.at(pos).Erroneous(List.<JCTree>of(wc, id));
reportSyntaxError(err, "expected3", GT, EXTENDS, SUPER);
- return err;
+ result = err;
} else {
TypeBoundKind t = toP(F.at(pos).TypeBoundKind(BoundKind.UNBOUND));
- return toP(F.at(pos).Wildcard(t, null));
+ result = toP(F.at(pos).Wildcard(t, null));
}
+ if (!annotations.isEmpty()) {
+ result = toP(F.at(annotations.head.pos).AnnotatedType(annotations,result));
+ }
+ return result;
}
JCTypeApply typeArguments(JCExpression t, boolean diamondAllowed) {
@@ -1648,22 +1869,51 @@
return toP(F.at(pos).TypeApply(t, args));
}
- /** BracketsOpt = {"[" "]"}
+ /**
+ * BracketsOpt = { [Annotations] "[" "]" }*
+ *
+ * <p>
+ *
+ * <code>annotations</code> is the list of annotations targeting
+ * the expression <code>t</code>.
*/
- private JCExpression bracketsOpt(JCExpression t) {
+ private JCExpression bracketsOpt(JCExpression t,
+ List<JCAnnotation> annotations) {
+ List<JCAnnotation> nextLevelAnnotations = typeAnnotationsOpt();
+
if (token.kind == LBRACKET) {
int pos = token.pos;
nextToken();
- t = bracketsOptCont(t, pos);
- F.at(pos);
+ t = bracketsOptCont(t, pos, nextLevelAnnotations);
+ } else if (!nextLevelAnnotations.isEmpty()) {
+ if (permitTypeAnnotationsPushBack) {
+ this.typeAnnotationsPushedBack = nextLevelAnnotations;
+ } else {
+ return illegal(nextLevelAnnotations.head.pos);
+ }
+ }
+
+ if (!annotations.isEmpty()) {
+ t = toP(F.at(token.pos).AnnotatedType(annotations, t));
}
return t;
}
- private JCArrayTypeTree bracketsOptCont(JCExpression t, int pos) {
+ /** BracketsOpt = [ "[" "]" { [Annotations] "[" "]"} ]
+ */
+ private JCExpression bracketsOpt(JCExpression t) {
+ return bracketsOpt(t, List.<JCAnnotation>nil());
+ }
+
+ private JCExpression bracketsOptCont(JCExpression t, int pos,
+ List<JCAnnotation> annotations) {
accept(RBRACKET);
t = bracketsOpt(t);
- return toP(F.at(pos).TypeArray(t));
+ t = toP(F.at(pos).TypeArray(t));
+ if (annotations.nonEmpty()) {
+ t = toP(F.at(pos).AnnotatedType(annotations, t));
+ }
+ return t;
}
/** BracketsSuffixExpr = "." CLASS
@@ -1677,8 +1927,8 @@
accept(CLASS);
if (token.pos == endPosTable.errorEndPos) {
// error recovery
- Name name = null;
- if (token.kind == IDENTIFIER) {
+ Name name;
+ if (LAX_IDENTIFIER.accepts(token.kind)) {
name = token.name();
nextToken();
} else {
@@ -1715,8 +1965,8 @@
if (token.kind == LT) {
typeArgs = typeArguments(false);
}
- Name refName = null;
- ReferenceMode refMode = null;
+ Name refName;
+ ReferenceMode refMode;
if (token.kind == NEW) {
refMode = ReferenceMode.NEW;
refName = names.init;
@@ -1728,18 +1978,31 @@
return toP(F.at(t.getStartPosition()).Reference(refMode, refName, t, typeArgs));
}
- /** Creator = Qualident [TypeArguments] ( ArrayCreatorRest | ClassCreatorRest )
+ /** Creator = [Annotations] Qualident [TypeArguments] ( ArrayCreatorRest | ClassCreatorRest )
*/
JCExpression creator(int newpos, List<JCExpression> typeArgs) {
+ List<JCAnnotation> newAnnotations = typeAnnotationsOpt();
+
switch (token.kind) {
case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT:
case DOUBLE: case BOOLEAN:
- if (typeArgs == null)
- return arrayCreatorRest(newpos, basicType());
+ if (typeArgs == null) {
+ if (newAnnotations.isEmpty()) {
+ return arrayCreatorRest(newpos, basicType());
+ } else {
+ return arrayCreatorRest(newpos, toP(F.at(newAnnotations.head.pos).AnnotatedType(newAnnotations, basicType())));
+ }
+ }
break;
default:
}
- JCExpression t = qualident();
+ JCExpression t = qualident(true);
+
+ // handle type annotations for non primitive arrays
+ if (newAnnotations.nonEmpty()) {
+ t = insertAnnotationsToMostInner(t, newAnnotations, false);
+ }
+
int oldmode = mode;
mode = TYPE;
boolean diamondFound = false;
@@ -1757,7 +2020,13 @@
}
int pos = token.pos;
nextToken();
+ List<JCAnnotation> tyannos = typeAnnotationsOpt();
t = toP(F.at(pos).Select(t, ident()));
+
+ if (tyannos != null && tyannos.nonEmpty()) {
+ t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
+ }
+
if (token.kind == LT) {
lastTypeargsPos = token.pos;
checkGenerics();
@@ -1766,7 +2035,7 @@
}
}
mode = oldmode;
- if (token.kind == LBRACKET) {
+ if (token.kind == LBRACKET || token.kind == MONKEYS_AT) {
JCExpression e = arrayCreatorRest(newpos, t);
if (diamondFound) {
reportSyntaxError(lastTypeargsPos, "cannot.create.array.with.diamond");
@@ -1787,7 +2056,15 @@
}
return e;
} else if (token.kind == LPAREN) {
- return classCreatorRest(newpos, null, typeArgs, t);
+ JCNewClass newClass = classCreatorRest(newpos, null, typeArgs, t);
+ if (newClass.def != null) {
+ assert newClass.def.mods.annotations.isEmpty();
+ if (newAnnotations.nonEmpty()) {
+ newClass.def.mods.pos = earlier(newClass.def.mods.pos, newAnnotations.head.pos);
+ newClass.def.mods.annotations = List.convert(JCAnnotation.class, newAnnotations);
+ }
+ }
+ return newClass;
} else {
setErrorEndPos(token.pos);
reportSyntaxError(token.pos, "expected2", LPAREN, LBRACKET);
@@ -1796,10 +2073,17 @@
}
}
- /** InnerCreator = Ident [TypeArguments] ClassCreatorRest
+ /** InnerCreator = [Annotations] Ident [TypeArguments] ClassCreatorRest
*/
JCExpression innerCreator(int newpos, List<JCExpression> typeArgs, JCExpression encl) {
+ List<JCAnnotation> newAnnotations = typeAnnotationsOpt();
+
JCExpression t = toP(F.at(token.pos).Ident(ident()));
+
+ if (newAnnotations.nonEmpty()) {
+ t = toP(F.at(newAnnotations.head.pos).AnnotatedType(newAnnotations, t));
+ }
+
if (token.kind == LT) {
int oldmode = mode;
checkGenerics();
@@ -1809,35 +2093,65 @@
return classCreatorRest(newpos, encl, typeArgs, t);
}
- /** ArrayCreatorRest = "[" ( "]" BracketsOpt ArrayInitializer
- * | Expression "]" {"[" Expression "]"} BracketsOpt )
+ /** ArrayCreatorRest = [Annotations] "[" ( "]" BracketsOpt ArrayInitializer
+ * | Expression "]" {[Annotations] "[" Expression "]"} BracketsOpt )
*/
JCExpression arrayCreatorRest(int newpos, JCExpression elemtype) {
+ List<JCAnnotation> annos = typeAnnotationsOpt();
+
accept(LBRACKET);
if (token.kind == RBRACKET) {
accept(RBRACKET);
- elemtype = bracketsOpt(elemtype);
+ elemtype = bracketsOpt(elemtype, annos);
if (token.kind == LBRACE) {
- return arrayInitializer(newpos, elemtype);
+ JCNewArray na = (JCNewArray)arrayInitializer(newpos, elemtype);
+ if (annos.nonEmpty()) {
+ // when an array initializer is present then
+ // the parsed annotations should target the
+ // new array tree
+ // bracketsOpt inserts the annotation in
+ // elemtype, and it needs to be corrected
+ //
+ JCAnnotatedType annotated = (JCAnnotatedType)elemtype;
+ assert annotated.annotations == annos;
+ na.annotations = annotated.annotations;
+ na.elemtype = annotated.underlyingType;
+ }
+ return na;
} else {
JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.<JCExpression>nil(), null));
return syntaxError(token.pos, List.<JCTree>of(t), "array.dimension.missing");
}
} else {
ListBuffer<JCExpression> dims = new ListBuffer<JCExpression>();
+
+ // maintain array dimension type annotations
+ ListBuffer<List<JCAnnotation>> dimAnnotations = ListBuffer.lb();
+ dimAnnotations.append(annos);
+
dims.append(parseExpression());
accept(RBRACKET);
- while (token.kind == LBRACKET) {
+ while (token.kind == LBRACKET
+ || token.kind == MONKEYS_AT) {
+ List<JCAnnotation> maybeDimAnnos = typeAnnotationsOpt();
int pos = token.pos;
nextToken();
if (token.kind == RBRACKET) {
- elemtype = bracketsOptCont(elemtype, pos);
+ elemtype = bracketsOptCont(elemtype, pos, maybeDimAnnos);
} else {
- dims.append(parseExpression());
- accept(RBRACKET);
+ if (token.kind == RBRACKET) { // no dimension
+ elemtype = bracketsOptCont(elemtype, pos, maybeDimAnnos);
+ } else {
+ dimAnnotations.append(maybeDimAnnos);
+ dims.append(parseExpression());
+ accept(RBRACKET);
+ }
}
}
- return toP(F.at(newpos).NewArray(elemtype, dims.toList(), null));
+
+ JCNewArray na = toP(F.at(newpos).NewArray(elemtype, dims.toList(), null));
+ na.dimAnnotations = dimAnnotations.toList();
+ return na;
}
}
@@ -2026,10 +2340,7 @@
nextToken();
JCStatement stat = parseStatement();
return List.<JCStatement>of(F.at(pos).Labelled(prevToken.name(), stat));
- } else if ((lastmode & TYPE) != 0 &&
- (token.kind == IDENTIFIER ||
- token.kind == ASSERT ||
- token.kind == ENUM)) {
+ } else if ((lastmode & TYPE) != 0 && LAX_IDENTIFIER.accepts(token.kind)) {
pos = token.pos;
JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
F.at(pos);
@@ -2183,14 +2494,14 @@
}
case BREAK: {
nextToken();
- Name label = (token.kind == IDENTIFIER || token.kind == ASSERT || token.kind == ENUM) ? ident() : null;
+ Name label = LAX_IDENTIFIER.accepts(token.kind) ? ident() : null;
JCBreak t = to(F.at(pos).Break(label));
accept(SEMI);
return t;
}
case CONTINUE: {
nextToken();
- Name label = (token.kind == IDENTIFIER || token.kind == ASSERT || token.kind == ENUM) ? ident() : null;
+ Name label = LAX_IDENTIFIER.accepts(token.kind) ? ident() : null;
JCContinue t = to(F.at(pos).Continue(label));
accept(SEMI);
return t;
@@ -2248,6 +2559,7 @@
}
/** CatchClause = CATCH "(" FormalParameter ")" Block
+ * TODO: the "FormalParameter" is not correct, it uses the special "catchTypes" rule below.
*/
protected JCCatch catchClause() {
int pos = token.pos;
@@ -2270,7 +2582,9 @@
while (token.kind == BAR) {
checkMulticatch();
nextToken();
- catchTypes.add(qualident());
+ // Instead of qualident this is now parseType.
+ // But would that allow too much, e.g. arrays or generics?
+ catchTypes.add(parseType());
}
return catchTypes.toList();
}
@@ -2351,9 +2665,7 @@
return variableDeclarators(optFinal(0), parseType(), stats).toList();
} else {
JCExpression t = term(EXPR | TYPE);
- if ((lastmode & TYPE) != 0 &&
- (token.kind == IDENTIFIER || token.kind == ASSERT ||
- token.kind == ENUM)) {
+ if ((lastmode & TYPE) != 0 && LAX_IDENTIFIER.accepts(token.kind)) {
return variableDeclarators(modifiersOpt(), t, stats).toList();
} else if ((lastmode & TYPE) != 0 && token.kind == COLON) {
error(pos, "bad.initializer", "for-loop");
@@ -2373,16 +2685,28 @@
}
/** AnnotationsOpt = { '@' Annotation }
+ *
+ * @param kind Whether to parse an ANNOTATION or TYPE_ANNOTATION
*/
- List<JCAnnotation> annotationsOpt() {
+ List<JCAnnotation> annotationsOpt(Tag kind) {
if (token.kind != MONKEYS_AT) return List.nil(); // optimization
ListBuffer<JCAnnotation> buf = new ListBuffer<JCAnnotation>();
+ int prevmode = mode;
while (token.kind == MONKEYS_AT) {
int pos = token.pos;
nextToken();
- buf.append(annotation(pos));
+ buf.append(annotation(pos, kind));
}
- return buf.toList();
+ lastmode = mode;
+ mode = prevmode;
+ List<JCAnnotation> annotations = buf.toList();
+
+ return annotations;
+ }
+
+ List<JCAnnotation> typeAnnotationsOpt() {
+ List<JCAnnotation> annotations = annotationsOpt(Tag.TYPE_ANNOTATION);
+ return annotations;
}
/** ModifiersOpt = { Modifier }
@@ -2408,7 +2732,7 @@
if (token.deprecatedFlag()) {
flags |= Flags.DEPRECATED;
}
- int lastPos = Position.NOPOS;
+ int lastPos;
loop:
while (true) {
long flag;
@@ -2435,12 +2759,11 @@
if (flag == Flags.ANNOTATION) {
checkAnnotations();
if (token.kind != INTERFACE) {
- JCAnnotation ann = annotation(lastPos);
+ JCAnnotation ann = annotation(lastPos, Tag.ANNOTATION);
// if first modifier is an annotation, set pos to annotation's.
if (flags == 0 && annotations.isEmpty())
pos = ann.pos;
annotations.append(ann);
- lastPos = ann.pos;
flag = 0;
}
}
@@ -2464,14 +2787,27 @@
}
/** Annotation = "@" Qualident [ "(" AnnotationFieldValues ")" ]
+ *
* @param pos position of "@" token
+ * @param kind Whether to parse an ANNOTATION or TYPE_ANNOTATION
*/
- JCAnnotation annotation(int pos) {
+ JCAnnotation annotation(int pos, Tag kind) {
// accept(AT); // AT consumed by caller
checkAnnotations();
- JCTree ident = qualident();
+ if (kind == Tag.TYPE_ANNOTATION) {
+ checkTypeAnnotations();
+ }
+ JCTree ident = qualident(false);
List<JCExpression> fieldValues = annotationFieldValuesOpt();
- JCAnnotation ann = F.at(pos).Annotation(ident, fieldValues);
+ JCAnnotation ann;
+ if (kind == Tag.ANNOTATION) {
+ ann = F.at(pos).Annotation(ident, fieldValues);
+ } else if (kind == Tag.TYPE_ANNOTATION) {
+ ann = F.at(pos).TypeAnnotation(ident, fieldValues);
+ } else {
+ throw new AssertionError("Unhandled annotation kind: " + kind);
+ }
+
storeEnd(ann, S.prevToken().endPos);
return ann;
}
@@ -2524,7 +2860,7 @@
case MONKEYS_AT:
pos = token.pos;
nextToken();
- return annotation(pos);
+ return annotation(pos, Tag.ANNOTATION);
case LBRACE:
pos = token.pos;
accept(LBRACE);
@@ -2609,8 +2945,18 @@
/** VariableDeclaratorId = Ident BracketsOpt
*/
JCVariableDecl variableDeclaratorId(JCModifiers mods, JCExpression type) {
+ return variableDeclaratorId(mods, type, false);
+ }
+ //where
+ JCVariableDecl variableDeclaratorId(JCModifiers mods, JCExpression type, boolean lambdaParameter) {
int pos = token.pos;
- Name name = ident();
+ Name name;
+ if (lambdaParameter && token.kind == UNDERSCORE) {
+ syntaxError(pos, "expected", IDENTIFIER);
+ name = token.name();
+ } else {
+ name = ident();
+ }
if ((mods.flags & Flags.VARARGS) != 0 &&
token.kind == LBRACKET) {
log.error(token.pos, "varargs.and.old.array.syntax");
@@ -2669,7 +3015,7 @@
mods = null;
}
nextToken();
- pid = qualident();
+ pid = qualident(false);
accept(SEMI);
}
ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
@@ -2770,7 +3116,7 @@
} else {
int pos = token.pos;
List<JCTree> errs;
- if (token.kind == IDENTIFIER) {
+ if (LAX_IDENTIFIER.accepts(token.kind)) {
errs = List.<JCTree>of(mods, toP(F.at(pos).Ident(ident())));
setErrorEndPos(token.pos);
} else {
@@ -2787,7 +3133,7 @@
}
int pos = token.pos;
List<JCTree> errs;
- if (token.kind == IDENTIFIER) {
+ if (LAX_IDENTIFIER.accepts(token.kind)) {
errs = List.<JCTree>of(mods, toP(F.at(pos).Ident(ident())));
setErrorEndPos(token.pos);
} else {
@@ -2920,7 +3266,7 @@
flags |= Flags.DEPRECATED;
}
int pos = token.pos;
- List<JCAnnotation> annotations = annotationsOpt();
+ List<JCAnnotation> annotations = annotationsOpt(Tag.ANNOTATION);
JCModifiers mods = F.at(annotations.isEmpty() ? Position.NOPOS : pos).Modifiers(flags, annotations);
List<JCExpression> typeArgs = typeArgumentsOpt();
int identPos = token.pos;
@@ -3023,15 +3369,25 @@
mods.pos = pos;
storeEnd(mods, pos);
}
+ List<JCAnnotation> annosAfterParams = annotationsOpt(Tag.ANNOTATION);
+
Token tk = token;
pos = token.pos;
JCExpression type;
boolean isVoid = token.kind == VOID;
if (isVoid) {
+ if (annosAfterParams.nonEmpty())
+ illegal(annosAfterParams.head.pos);
type = to(F.at(pos).TypeIdent(TypeTag.VOID));
nextToken();
} else {
- type = parseType();
+ if (annosAfterParams.nonEmpty()) {
+ mods.annotations = mods.annotations.appendList(annosAfterParams);
+ if (mods.pos == Position.NOPOS)
+ mods.pos = mods.annotations.head.pos;
+ }
+ // method returns types are un-annotated types
+ type = unannotatedType();
}
if (token.kind == LPAREN && !isInterface && type.hasTag(IDENT)) {
if (isInterface || tk.name() != className)
@@ -3084,51 +3440,71 @@
List<JCTypeParameter> typarams,
boolean isInterface, boolean isVoid,
Comment dc) {
- List<JCVariableDecl> params = formalParameters();
- if (!isVoid) type = bracketsOpt(type);
- List<JCExpression> thrown = List.nil();
- if (token.kind == THROWS) {
- nextToken();
- thrown = qualidentList();
+ if (isInterface && (mods.flags & Flags.STATIC) != 0) {
+ checkStaticInterfaceMethods();
}
- JCBlock body = null;
- JCExpression defaultValue;
- if (token.kind == LBRACE) {
- body = block();
- defaultValue = null;
- } else {
- if (token.kind == DEFAULT) {
- accept(DEFAULT);
- defaultValue = annotationValue();
+ JCVariableDecl prevReceiverParam = this.receiverParam;
+ try {
+ this.receiverParam = null;
+ // Parsing formalParameters sets the receiverParam, if present
+ List<JCVariableDecl> params = formalParameters();
+ if (!isVoid) type = bracketsOpt(type);
+ List<JCExpression> thrown = List.nil();
+ if (token.kind == THROWS) {
+ nextToken();
+ thrown = qualidentList();
+ }
+ JCBlock body = null;
+ JCExpression defaultValue;
+ if (token.kind == LBRACE) {
+ body = block();
+ defaultValue = null;
} else {
- defaultValue = null;
- }
- accept(SEMI);
- if (token.pos <= endPosTable.errorEndPos) {
- // error recovery
- skip(false, true, false, false);
- if (token.kind == LBRACE) {
- body = block();
+ if (token.kind == DEFAULT) {
+ accept(DEFAULT);
+ defaultValue = annotationValue();
+ } else {
+ defaultValue = null;
+ }
+ accept(SEMI);
+ if (token.pos <= endPosTable.errorEndPos) {
+ // error recovery
+ skip(false, true, false, false);
+ if (token.kind == LBRACE) {
+ body = block();
+ }
}
}
+
+ JCMethodDecl result =
+ toP(F.at(pos).MethodDef(mods, name, type, typarams,
+ receiverParam, params, thrown,
+ body, defaultValue));
+ attach(result, dc);
+ return result;
+ } finally {
+ this.receiverParam = prevReceiverParam;
}
-
- JCMethodDecl result =
- toP(F.at(pos).MethodDef(mods, name, type, typarams,
- params, thrown,
- body, defaultValue));
- attach(result, dc);
- return result;
}
- /** QualidentList = Qualident {"," Qualident}
+ /** QualidentList = [Annotations] Qualident {"," [Annotations] Qualident}
*/
List<JCExpression> qualidentList() {
ListBuffer<JCExpression> ts = new ListBuffer<JCExpression>();
- ts.append(qualident());
+
+ List<JCAnnotation> typeAnnos = typeAnnotationsOpt();
+ if (!typeAnnos.isEmpty())
+ ts.append(toP(F.at(typeAnnos.head.pos).AnnotatedType(typeAnnos, qualident(true))));
+ else
+ ts.append(qualident(true));
while (token.kind == COMMA) {
nextToken();
- ts.append(qualident());
+
+ typeAnnos = typeAnnotationsOpt();
+ if (!typeAnnos.isEmpty())
+ ts.append(toP(F.at(typeAnnos.head.pos).AnnotatedType(typeAnnos, qualident(true))));
+ else
+ ts.append(qualident(true));
}
return ts.toList();
}
@@ -3157,13 +3533,14 @@
/**
* {@literal
- * TypeParameter = TypeVariable [TypeParameterBound]
+ * TypeParameter = [Annotations] TypeVariable [TypeParameterBound]
* TypeParameterBound = EXTENDS Type {"&" Type}
* TypeVariable = Ident
* }
*/
JCTypeParameter typeParameter() {
int pos = token.pos;
+ List<JCAnnotation> annos = typeAnnotationsOpt();
Name name = ident();
ListBuffer<JCExpression> bounds = new ListBuffer<JCExpression>();
if (token.kind == EXTENDS) {
@@ -3174,7 +3551,7 @@
bounds.append(parseType());
}
}
- return toP(F.at(pos).TypeParameter(name, bounds.toList()));
+ return toP(F.at(pos).TypeParameter(name, bounds.toList(), annos));
}
/** FormalParameters = "(" [ FormalParameterList ] ")"
@@ -3182,14 +3559,24 @@
* FormalParameterListNovarargs = [ FormalParameterListNovarargs , ] FormalParameter
*/
List<JCVariableDecl> formalParameters() {
+ return formalParameters(false);
+ }
+ List<JCVariableDecl> formalParameters(boolean lambdaParameters) {
ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();
- JCVariableDecl lastParam = null;
+ JCVariableDecl lastParam;
accept(LPAREN);
if (token.kind != RPAREN) {
- params.append(lastParam = formalParameter());
+ this.allowThisIdent = true;
+ lastParam = formalParameter(lambdaParameters);
+ if (lastParam.name.contentEquals(TokenKind.THIS.name)) {
+ this.receiverParam = lastParam;
+ } else {
+ params.append(lastParam);
+ }
+ this.allowThisIdent = false;
while ((lastParam.mods.flags & Flags.VARARGS) == 0 && token.kind == COMMA) {
nextToken();
- params.append(lastParam = formalParameter());
+ params.append(lastParam = formalParameter(lambdaParameters));
}
}
accept(RPAREN);
@@ -3221,24 +3608,113 @@
return mods;
}
+ /**
+ * Inserts the annotations (and possibly a new array level)
+ * to the left-most type in an array or nested type.
+ *
+ * When parsing a type like {@code @B Outer.Inner @A []}, the
+ * {@code @A} annotation should target the array itself, while
+ * {@code @B} targets the nested type {@code Outer}.
+ *
+ * Currently the parser parses the annotation first, then
+ * the array, and then inserts the annotation to the left-most
+ * nested type.
+ *
+ * When {@code createNewLevel} is true, then a new array
+ * level is inserted as the most inner type, and have the
+ * annotations target it. This is useful in the case of
+ * varargs, e.g. {@code String @A [] @B ...}, as the parser
+ * first parses the type {@code String @A []} then inserts
+ * a new array level with {@code @B} annotation.
+ */
+ private JCExpression insertAnnotationsToMostInner(
+ JCExpression type, List<JCAnnotation> annos,
+ boolean createNewLevel) {
+ int origEndPos = getEndPos(type);
+ JCExpression mostInnerType = type;
+ JCArrayTypeTree mostInnerArrayType = null;
+ while (TreeInfo.typeIn(mostInnerType).hasTag(TYPEARRAY)) {
+ mostInnerArrayType = (JCArrayTypeTree) TreeInfo.typeIn(mostInnerType);
+ mostInnerType = mostInnerArrayType.elemtype;
+ }
+
+ if (createNewLevel) {
+ mostInnerType = to(F.at(token.pos).TypeArray(mostInnerType));
+ }
+
+ JCExpression mostInnerTypeToReturn = mostInnerType;
+ if (annos.nonEmpty()) {
+ JCExpression lastToModify = mostInnerType;
+
+ while (TreeInfo.typeIn(mostInnerType).hasTag(SELECT) ||
+ TreeInfo.typeIn(mostInnerType).hasTag(TYPEAPPLY)) {
+ while (TreeInfo.typeIn(mostInnerType).hasTag(SELECT)) {
+ lastToModify = mostInnerType;
+ mostInnerType = ((JCFieldAccess) TreeInfo.typeIn(mostInnerType)).getExpression();
+ }
+ while (TreeInfo.typeIn(mostInnerType).hasTag(TYPEAPPLY)) {
+ lastToModify = mostInnerType;
+ mostInnerType = ((JCTypeApply) TreeInfo.typeIn(mostInnerType)).clazz;
+ }
+ }
+
+ mostInnerType = F.at(annos.head.pos).AnnotatedType(annos, mostInnerType);
+
+ if (TreeInfo.typeIn(lastToModify).hasTag(TYPEAPPLY)) {
+ ((JCTypeApply) TreeInfo.typeIn(lastToModify)).clazz = mostInnerType;
+ } else if (TreeInfo.typeIn(lastToModify).hasTag(SELECT)) {
+ ((JCFieldAccess) TreeInfo.typeIn(lastToModify)).selected = mostInnerType;
+ } else {
+ // We never saw a SELECT or TYPEAPPLY, return the annotated type.
+ mostInnerTypeToReturn = mostInnerType;
+ }
+ }
+
+ if (mostInnerArrayType == null) {
+ return mostInnerTypeToReturn;
+ } else {
+ mostInnerArrayType.elemtype = mostInnerTypeToReturn;
+ storeEnd(type, origEndPos);
+ return type;
+ }
+ }
+
/** FormalParameter = { FINAL | '@' Annotation } Type VariableDeclaratorId
* LastFormalParameter = { FINAL | '@' Annotation } Type '...' Ident | FormalParameter
*/
protected JCVariableDecl formalParameter() {
+ return formalParameter(false);
+ }
+ protected JCVariableDecl formalParameter(boolean lambdaParameter) {
JCModifiers mods = optFinal(Flags.PARAMETER);
+ // need to distinguish between vararg annos and array annos
+ // look at typeAnnotationsPushedBack comment
+ this.permitTypeAnnotationsPushBack = true;
JCExpression type = parseType();
+ this.permitTypeAnnotationsPushBack = false;
+
if (token.kind == ELLIPSIS) {
+ List<JCAnnotation> varargsAnnos = typeAnnotationsPushedBack;
+ typeAnnotationsPushedBack = List.nil();
checkVarargs();
mods.flags |= Flags.VARARGS;
- type = to(F.at(token.pos).TypeArray(type));
+ // insert var arg type annotations
+ type = insertAnnotationsToMostInner(type, varargsAnnos, true);
nextToken();
+ } else {
+ // if not a var arg, then typeAnnotationsPushedBack should be null
+ if (typeAnnotationsPushedBack.nonEmpty()) {
+ reportSyntaxError(typeAnnotationsPushedBack.head.pos,
+ "illegal.start.of.type");
+ }
+ typeAnnotationsPushedBack = List.nil();
}
- return variableDeclaratorId(mods, type);
+ return variableDeclaratorId(mods, type, lambdaParameter);
}
protected JCVariableDecl implicitParameter() {
JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER);
- return variableDeclaratorId(mods, null);
+ return variableDeclaratorId(mods, null, true);
}
/* ---------- auxiliary methods -------------- */
@@ -3479,6 +3955,18 @@
allowIntersectionTypesInCast = true;
}
}
+ void checkStaticInterfaceMethods() {
+ if (!allowStaticInterfaceMethods) {
+ log.error(token.pos, "static.intf.methods.not.supported.in.source", source.name);
+ allowStaticInterfaceMethods = true;
+ }
+ }
+ void checkTypeAnnotations() {
+ if (!allowTypeAnnotations) {
+ log.error(token.pos, "type.annotations.not.supported.in.source", source.name);
+ allowTypeAnnotations = true;
+ }
+ }
/*
* a functional source tree and end position mappings
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,7 @@
private List<Token> savedTokens = new ArrayList<Token>();
private JavaTokenizer tokenizer;
+
/**
* Create a scanner from the input array. This method might
* modify the array. To avoid copying the input array, ensure
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java Thu Jan 31 10:22:25 2013 -0800
@@ -33,6 +33,7 @@
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Filter;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Names;
@@ -74,7 +75,6 @@
protected Tokens(Context context) {
context.put(tokensKey, this);
names = Names.instance(context);
-
for (TokenKind t : TokenKind.values()) {
if (t.name != null)
enterKeyword(t.name, t);
@@ -113,7 +113,7 @@
* This enum defines all tokens used by the javac scanner. A token is
* optionally associated with a name.
*/
- public enum TokenKind implements Formattable {
+ public enum TokenKind implements Formattable, Filter<TokenKind> {
EOF(),
ERROR(),
IDENTIFIER(Tag.NAMED),
@@ -176,6 +176,7 @@
TRUE("true", Tag.NAMED),
FALSE("false", Tag.NAMED),
NULL("null", Tag.NAMED),
+ UNDERSCORE("_", Tag.NAMED),
ARROW("->"),
COLCOL("::"),
LPAREN("("),
@@ -283,6 +284,11 @@
public String toString(Locale locale, Messages messages) {
return name != null ? toString() : messages.getLocalizedString(locale, "compiler.misc." + toString());
}
+
+ @Override
+ public boolean accepts(TokenKind that) {
+ return this == that;
+ }
}
public interface Comment {
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
/** The char reader used by the javac lexer/tokenizer. Returns the sequence of
* characters contained in the input stream, handling unicode escape accordingly.
- * Additionally, it provide features for saving chars into a buffer and to retrieve
+ * Additionally, it provides features for saving chars into a buffer and to retrieve
* them at a later stage.
*
* <p><b>This is NOT part of any supported API.
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -817,9 +817,6 @@
/** The set of package-info files to be processed this round. */
List<PackageSymbol> packageInfoFiles;
- /** The number of Messager errors generated in this round. */
- int nMessagerErrors;
-
/** Create a round (common code). */
private Round(Context context, int number, int priorErrors, int priorWarnings,
Log.DeferredDiagnosticHandler deferredDiagnosticHandler) {
@@ -829,7 +826,7 @@
compiler = JavaCompiler.instance(context);
log = Log.instance(context);
log.nerrors = priorErrors;
- log.nwarnings += priorWarnings;
+ log.nwarnings = priorWarnings;
if (number == 1) {
Assert.checkNonNull(deferredDiagnosticHandler);
this.deferredDiagnosticHandler = deferredDiagnosticHandler;
@@ -870,7 +867,7 @@
Set<JavaFileObject> newSourceFiles, Map<String,JavaFileObject> newClassFiles) {
this(prev.nextContext(),
prev.number+1,
- prev.nMessagerErrors,
+ prev.compiler.log.nerrors,
prev.compiler.log.nwarnings,
null);
this.genClassFiles = prev.genClassFiles;
@@ -911,15 +908,12 @@
}
/** Create the compiler to be used for the final compilation. */
- JavaCompiler finalCompiler(boolean errorStatus) {
+ JavaCompiler finalCompiler() {
try {
Context nextCtx = nextContext();
JavacProcessingEnvironment.this.context = nextCtx;
JavaCompiler c = JavaCompiler.instance(nextCtx);
- c.log.nwarnings += compiler.log.nwarnings;
- if (errorStatus) {
- c.log.nerrors += compiler.log.nerrors;
- }
+ c.log.initRound(compiler.log);
return c;
} finally {
compiler.close(false);
@@ -1027,8 +1021,6 @@
if (!taskListener.isEmpty())
taskListener.finished(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING_ROUND));
}
-
- nMessagerErrors = messager.errorCount();
}
void showDiagnostics(boolean showAll) {
@@ -1107,9 +1099,7 @@
next.put(Tokens.tokensKey, tokens);
Log nextLog = Log.instance(next);
- // propogate the log's writers directly, instead of going through context
- nextLog.setWriters(log);
- nextLog.setSourceMap(log);
+ nextLog.initRound(log);
JavaCompiler oldCompiler = JavaCompiler.instance(context);
JavaCompiler nextCompiler = JavaCompiler.instance(next);
@@ -1206,7 +1196,7 @@
new LinkedHashSet<JavaFileObject>(filer.getGeneratedSourceFileObjects());
roots = cleanTrees(round.roots);
- JavaCompiler compiler = round.finalCompiler(errorStatus);
+ JavaCompiler compiler = round.finalCompiler();
if (newSourceFiles.size() > 0)
roots = roots.appendList(compiler.parseFiles(newSourceFiles));
@@ -1311,7 +1301,6 @@
if (procNames != null)
return true;
- String procPath;
URL[] urls = new URL[1];
for(File pathElement : workingpath) {
try {
@@ -1382,6 +1371,10 @@
node.sym = null;
super.visitIdent(node);
}
+ public void visitAnnotation(JCAnnotation node) {
+ node.attribute = null;
+ super.visitAnnotation(node);
+ }
};
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -178,13 +178,22 @@
compiler.misc.incompatible.abstracts=\
multiple non-overriding abstract methods found in {0} {1}
-compiler.misc.not.a.functional.intf=\
- the target type must be a functional interface
+compiler.err.bad.functional.intf.anno=\
+ Unexpected @FunctionalInterface annotation
# 0: message segment
+compiler.err.bad.functional.intf.anno.1=\
+ Unexpected @FunctionalInterface annotation\n\
+ {0}
+
+# 0: symbol
+compiler.misc.not.a.functional.intf=\
+ {0} is not a functional interface
+
+# 0: symbol, 1: message segment
compiler.misc.not.a.functional.intf.1=\
- the target type must be a functional interface\n\
- {0}
+ {0} is not a functional interface\n\
+ {1}
# 0: symbol, 1: symbol kind, 2: symbol
compiler.misc.invalid.generic.lambda.target=\
@@ -319,64 +328,48 @@
compiler.err.duplicate.annotation.missing.container=\
duplicate annotation, the declaration of {0} does not have a valid {1} annotation
-# 0: type, 1: type
-compiler.err.invalid.container.no.containedby=\
- invalid contained repeatable annotation, {0} is not annotated with {1}
-
-# 0: type, 1: type
-compiler.err.invalid.container.wrong.containedby=\
- invalid contained repeatable annotation, {0} does not match {1}
-
-# 0: type, 1: type
-compiler.err.invalid.container.no.containerfor=\
- invalid container for repeating annotations, {0} is not annotated with {1}
-
-# 0: type, 1: type
-compiler.err.invalid.container.wrong.containerfor=\
- invalid container for repeating annotations, {0} does not match {1}
+# 0: type
+compiler.err.invalid.repeatable.annotation=\
+ duplicate annotation, {0} is annotated with an invalid Repeatable annotation
# 0: type
-compiler.err.invalid.containedby.annotation=\
- duplicate annotation, {0} is annotated with an invalid ContainedBy annotation
-
-# 0: type
-compiler.err.invalid.containedby.annotation.no.value=\
- duplicate annotation, {0} is not a valid ContainedBy, no value element method declared
+compiler.err.invalid.repeatable.annotation.no.value=\
+ duplicate annotation, {0} is not a valid Repeatable, no value element method declared
# 0: type, 1: number
-compiler.err.invalid.containedby.annotation.multiple.values=\
- duplicate annotation, {0} is not a valid ContainedBy, {1} value element methods declared
+compiler.err.invalid.repeatable.annotation.multiple.values=\
+ duplicate annotation, {0} is not a valid Repeatable, {1} value element methods declared
# 0: type
-compiler.err.invalid.containedby.annotation.invalid.value=\
- duplicate annotation, {0} is not a valid ContainedBy, invalid value element, need a method
+compiler.err.invalid.repeatable.annotation.invalid.value=\
+ duplicate annotation, {0} is not a valid Repeatable, invalid value element, need a method
# 0: type, 1: type, 2: type
-compiler.err.invalid.containedby.annotation.value.return=\
+compiler.err.invalid.repeatable.annotation.value.return=\
duplicate annotation, value element of containing annotation {0} should have type {2}, found {1}
# 0: type, 1: symbol
-compiler.err.invalid.containedby.annotation.elem.nondefault=\
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\
containing annotation {0} does not have a default value for element {1}
# 0: symbol, 1: type, 2: symbol, 3: type
-compiler.err.invalid.containedby.annotation.retention=\
+compiler.err.invalid.repeatable.annotation.retention=\
containing annotation {0} has shorter retention ({1}) than the contained annotation {2} with retention {3}
# 0: symbol, 1: symbol
-compiler.err.invalid.containedby.annotation.not.documented=\
+compiler.err.invalid.repeatable.annotation.not.documented=\
containing annotation type, {0}, is not @Documented while repeated annotation type, {1}, is
# 0: symbol, 1: symbol
-compiler.err.invalid.containedby.annotation.not.inherited=\
+compiler.err.invalid.repeatable.annotation.not.inherited=\
containing annotation type, {0}, is not @Inherited while repeated annotation type, {1}, is
# 0: symbol, 1: symbol
-compiler.err.invalid.containedby.annotation.incompatible.target=\
+compiler.err.invalid.repeatable.annotation.incompatible.target=\
target of container annotation {0} is not a subset of target of repeated annotation {1}
# 0: symbol
-compiler.err.invalid.containedby.annotation.repeated.and.container.present=\
+compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\
container {0} must not be present at the same time as the element it contains
# 0: name
@@ -955,6 +948,11 @@
compiler.err.default.overrides.object.member=\
default method {0} in {1} {2} overrides a member of java.lang.Object
+# 0: type
+compiler.err.illegal.static.intf.meth.call=\
+ illegal static interface method call\n\
+ the receiver expression should be replaced with the type qualifier ''{0}''
+
# 0: type, 1: message segment
compiler.err.illegal.default.super.call=\
bad type qualifier {0} in default super call\n\
@@ -1668,6 +1666,9 @@
compiler.misc.bad.signature=\
bad signature: {0}
+compiler.misc.bad.type.annotation.value=\
+ bad type annotation target type value: {0}
+
compiler.misc.class.file.wrong.class=\
class file contains wrong class: {0}
@@ -2139,6 +2140,10 @@
as of release 1.4, ''assert'' is a keyword, and may not be used as an identifier\n\
(use -source 1.4 or higher to use ''assert'' as a keyword)
+compiler.warn.underscore.as.identifier=\
+ ''_'' used as an identifier\n\
+ (use of ''_'' as an identifier might not be supported in future releases)
+
compiler.err.enum.as.identifier=\
as of release 5, ''enum'' is a keyword, and may not be used as an identifier\n\
(use -source 1.4 or lower to use ''enum'' as an identifier)
@@ -2147,6 +2152,23 @@
as of release 1.4, ''assert'' is a keyword, and may not be used as an identifier\n\
(use -source 1.3 or lower to use ''assert'' as an identifier)
+# TODO 308: make a better error message
+compiler.err.this.as.identifier=\
+ as of release 8, ''this'' is allowed as the parameter name for the receiver type only, which has to be the first parameter
+
+# TODO 308: make a better error message
+compiler.err.cant.annotate.static.class=\
+ enclosing static nested class cannot be annotated
+# TODO 308: make a better error message
+compiler.err.cant.annotate.nested.type=\
+ nested type cannot be annotated
+
+compiler.err.incorrect.receiver.type=\
+ the receiver type does not match the enclosing class type
+
+compiler.err.no.annotations.on.dot.class=\
+ no annotations are allowed in the type of a class literal
+
# 0: string
compiler.err.generics.not.supported.in.source=\
generics are not supported in -source {0}\n\
@@ -2162,9 +2184,10 @@
annotations are not supported in -source {0}\n\
(use -source 5 or higher to enable annotations)
-#308 compiler.err.type.annotations.not.supported.in.source=\
-#308 type annotations are not supported in -source {0}\n\
-#308 (use -source 7 or higher to enable type annotations)
+# 0: string
+compiler.err.type.annotations.not.supported.in.source=\
+ type annotations are not supported in -source {0}\n\
+(use -source 8 or higher to enable type annotations)
# 0: string
compiler.err.foreach.not.supported.in.source=\
@@ -2216,6 +2239,11 @@
intersection types in cast are not supported in -source {0}\n\
(use -source 8 or higher to enable default methods)
+# 0: string
+compiler.err.static.intf.methods.not.supported.in.source=\
+ static interface methods are not supported in -source {0}\n\
+ (use -source 8 or higher to enable static interface methods)
+
########################################
# Diagnostics for verbose resolution
# used by Resolve (debug only)
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -1340,6 +1340,10 @@
compiler.err.assert.as.identifier=\u30EA\u30EA\u30FC\u30B91.4\u304B\u3089''assert''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u3001\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n(''assert''\u3092\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001-source 1.3\u4EE5\u524D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
+# TODO 308: make a better error message
+# compiler.err.this.as.identifier=\
+# as of release 8, ''this'' is allowed as the parameter name for the receiver type only, which has to be the first parameter
+
# 0: string
compiler.err.generics.not.supported.in.source=\u7DCF\u79F0\u578B\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(\u7DCF\u79F0\u578B\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
@@ -1351,7 +1355,7 @@
#308 compiler.err.type.annotations.not.supported.in.source=\
#308 type annotations are not supported in -source {0}\n\
-#308 (use -source 7 or higher to enable type annotations)
+#308 (use -source 8 or higher to enable type annotations)
# 0: string
compiler.err.foreach.not.supported.in.source=for-each\u30EB\u30FC\u30D7\u306F-source {0}\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n(for-each\u30EB\u30FC\u30D7\u3092\u4F7F\u7528\u53EF\u80FD\u306B\u3059\u308B\u306B\u306F\u3001-source 5\u4EE5\u964D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -1340,6 +1340,10 @@
compiler.err.assert.as.identifier=\u4ECE\u53D1\u884C\u7248 1.4 \u5F00\u59CB, ''assert'' \u662F\u4E00\u4E2A\u5173\u952E\u5B57, \u4F46\u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26\n(\u8BF7\u4F7F\u7528 -source 1.3 \u6216\u66F4\u4F4E\u7248\u672C\u4EE5\u5C06 ''assert'' \u7528\u4F5C\u6807\u8BC6\u7B26)
+# TODO 308: make a better error message
+# compiler.err.this.as.identifier=\
+# as of release 8, ''this'' is allowed as the parameter name for the receiver type only, which has to be the first parameter
+
# 0: string
compiler.err.generics.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301\u6CDB\u578B\n(\u8BF7\u4F7F\u7528 -source 5 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528\u6CDB\u578B)
@@ -1351,7 +1355,7 @@
#308 compiler.err.type.annotations.not.supported.in.source=\
#308 type annotations are not supported in -source {0}\n\
-#308 (use -source 7 or higher to enable type annotations)
+#308 (use -source 8 or higher to enable type annotations)
# 0: string
compiler.err.foreach.not.supported.in.source=-source {0} \u4E2D\u4E0D\u652F\u6301 for-each \u5FAA\u73AF\n(\u8BF7\u4F7F\u7528 -source 5 \u6216\u66F4\u9AD8\u7248\u672C\u4EE5\u542F\u7528 for-each \u5FAA\u73AF)
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -250,11 +250,11 @@
*/
TYPEAPPLY,
- /** Union types, of type TypeUnion
+ /** Union types, of type TypeUnion.
*/
TYPEUNION,
- /** Intersection types, of type TypeIntersection
+ /** Intersection types, of type TypeIntersection.
*/
TYPEINTERSECTION,
@@ -274,10 +274,16 @@
*/
ANNOTATION,
+ /** metadata: Type annotation.
+ */
+ TYPE_ANNOTATION,
+
/** metadata: Modifiers
*/
MODIFIERS,
+ /** An annotated type tree.
+ */
ANNOTATED_TYPE,
/** Error trees, of type Erroneous.
@@ -607,6 +613,42 @@
}
/**
+ * Common supertype for all poly expression trees (lambda, method references,
+ * conditionals, method and constructor calls)
+ */
+ public static abstract class JCPolyExpression extends JCExpression {
+
+ /**
+ * A poly expression can only be truly 'poly' in certain contexts
+ */
+ public enum PolyKind {
+ /** poly expression to be treated as a standalone expression */
+ STANDALONE,
+ /** true poly expression */
+ POLY;
+ }
+
+ /** is this poly expression a 'true' poly expression? */
+ public PolyKind polyKind;
+ }
+
+ /**
+ * Common supertype for all functional expression trees (lambda and method references)
+ */
+ public static abstract class JCFunctionalExpression extends JCPolyExpression {
+
+ public JCFunctionalExpression() {
+ //a functional expression is always a 'true' poly
+ polyKind = PolyKind.POLY;
+ }
+
+ /** target descriptor inferred for this functional expression. */
+ public Type descriptorType;
+ /** list of target types inferred for this functional expression. */
+ public List<TypeSymbol> targets;
+ }
+
+ /**
* A class definition.
*/
public static class JCClassDecl extends JCStatement implements ClassTree {
@@ -689,6 +731,8 @@
public JCExpression restype;
/** type parameters */
public List<JCTypeParameter> typarams;
+ /** receiver parameter */
+ public JCVariableDecl recvparam;
/** value parameters */
public List<JCVariableDecl> params;
/** exceptions thrown by this method */
@@ -703,6 +747,7 @@
Name name,
JCExpression restype,
List<JCTypeParameter> typarams,
+ JCVariableDecl recvparam,
List<JCVariableDecl> params,
List<JCExpression> thrown,
JCBlock body,
@@ -714,6 +759,9 @@
this.restype = restype;
this.typarams = typarams;
this.params = params;
+ this.recvparam = recvparam;
+ // TODO: do something special if the given type is null?
+ // receiver != null ? receiver : List.<JCTypeAnnotation>nil());
this.thrown = thrown;
this.body = body;
this.defaultValue = defaultValue;
@@ -732,6 +780,7 @@
public List<JCVariableDecl> getParameters() {
return params;
}
+ public JCVariableDecl getReceiverParameter() { return recvparam; }
public List<JCExpression> getThrows() {
return thrown;
}
@@ -1147,7 +1196,7 @@
/**
* A ( ) ? ( ) : ( ) conditional expression
*/
- public static class JCConditional extends JCExpression implements ConditionalExpressionTree {
+ public static class JCConditional extends JCPolyExpression implements ConditionalExpressionTree {
public JCExpression cond;
public JCExpression truepart;
public JCExpression falsepart;
@@ -1373,7 +1422,7 @@
/**
* A method invocation
*/
- public static class JCMethodInvocation extends JCExpression implements MethodInvocationTree {
+ public static class JCMethodInvocation extends JCPolyExpression implements MethodInvocationTree {
public List<JCExpression> typeargs;
public JCExpression meth;
public List<JCExpression> args;
@@ -1416,7 +1465,7 @@
/**
* A new(...) operation.
*/
- public static class JCNewClass extends JCExpression implements NewClassTree {
+ public static class JCNewClass extends JCPolyExpression implements NewClassTree {
public JCExpression encl;
public List<JCExpression> typeargs;
public JCExpression clazz;
@@ -1469,6 +1518,10 @@
public static class JCNewArray extends JCExpression implements NewArrayTree {
public JCExpression elemtype;
public List<JCExpression> dims;
+ // type annotations on inner-most component
+ public List<JCAnnotation> annotations;
+ // type annotations on dimensions
+ public List<List<JCAnnotation>> dimAnnotations;
public List<JCExpression> elems;
protected JCNewArray(JCExpression elemtype,
List<JCExpression> dims,
@@ -1476,6 +1529,8 @@
{
this.elemtype = elemtype;
this.dims = dims;
+ this.annotations = List.nil();
+ this.dimAnnotations = List.nil();
this.elems = elems;
}
@Override
@@ -1502,18 +1557,29 @@
/**
* A lambda expression.
*/
- public static class JCLambda extends JCExpression implements LambdaExpressionTree {
+ public static class JCLambda extends JCFunctionalExpression implements LambdaExpressionTree {
+
+ public enum ParameterKind {
+ IMPLICIT,
+ EXPLICIT;
+ }
public List<JCVariableDecl> params;
public JCTree body;
- public Type targetType;
public boolean canCompleteNormally = true;
public List<Type> inferredThrownTypes;
+ public ParameterKind paramKind;
public JCLambda(List<JCVariableDecl> params,
JCTree body) {
this.params = params;
this.body = body;
+ if (params.isEmpty() ||
+ params.head.vartype != null) {
+ paramKind = ParameterKind.EXPLICIT;
+ } else {
+ paramKind = ParameterKind.IMPLICIT;
+ }
}
@Override
public Tag getTag() {
@@ -1812,15 +1878,15 @@
/**
* Selects a member expression.
*/
- public static class JCMemberReference extends JCExpression implements MemberReferenceTree {
+ public static class JCMemberReference extends JCFunctionalExpression implements MemberReferenceTree {
public ReferenceMode mode;
public ReferenceKind kind;
public Name name;
public JCExpression expr;
public List<JCExpression> typeargs;
- public Type targetType;
public Symbol sym;
public Type varargsElement;
+ public PolyKind refPolyKind;
/**
* Javac-dependent classification for member references, based
@@ -1838,7 +1904,9 @@
/** Inner # new */
IMPLICIT_INNER(ReferenceMode.NEW, false),
/** Toplevel # new */
- TOPLEVEL(ReferenceMode.NEW, false);
+ TOPLEVEL(ReferenceMode.NEW, false),
+ /** ArrayType # new */
+ ARRAY_CTOR(ReferenceMode.NEW, false);
final ReferenceMode mode;
final boolean unbound;
@@ -2103,9 +2171,12 @@
public Name name;
/** bounds */
public List<JCExpression> bounds;
- protected JCTypeParameter(Name name, List<JCExpression> bounds) {
+ /** type annotations on type parameter */
+ public List<JCAnnotation> annotations;
+ protected JCTypeParameter(Name name, List<JCExpression> bounds, List<JCAnnotation> annotations) {
this.name = name;
this.bounds = bounds;
+ this.annotations = annotations;
}
@Override
public void accept(Visitor v) { v.visitTypeParameter(this); }
@@ -2115,6 +2186,9 @@
public List<JCExpression> getBounds() {
return bounds;
}
+ public List<JCAnnotation> getAnnotations() {
+ return annotations;
+ }
@Override
public <R,D> R accept(TreeVisitor<R,D> v, D d) {
return v.visitTypeParameter(this, d);
@@ -2181,16 +2255,27 @@
}
public static class JCAnnotation extends JCExpression implements AnnotationTree {
+ // Either Tag.ANNOTATION or Tag.TYPE_ANNOTATION
+ private Tag tag;
+
public JCTree annotationType;
public List<JCExpression> args;
- protected JCAnnotation(JCTree annotationType, List<JCExpression> args) {
+
+ // Attribute.Compound if tag is ANNOTATION
+ // Attribute.TypeCompound if tag is TYPE_ANNOTATION
+ public Attribute.Compound attribute;
+
+ protected JCAnnotation(Tag tag, JCTree annotationType, List<JCExpression> args) {
+ this.tag = tag;
this.annotationType = annotationType;
this.args = args;
}
+
@Override
public void accept(Visitor v) { v.visitAnnotation(this); }
- public Kind getKind() { return Kind.ANNOTATION; }
+ public Kind getKind() { return TreeInfo.tagToKind(getTag()); }
+
public JCTree getAnnotationType() { return annotationType; }
public List<JCExpression> getArguments() {
return args;
@@ -2201,7 +2286,7 @@
}
@Override
public Tag getTag() {
- return ANNOTATION;
+ return tag;
}
}
@@ -2232,6 +2317,35 @@
}
}
+ public static class JCAnnotatedType extends JCExpression implements com.sun.source.tree.AnnotatedTypeTree {
+ // type annotations
+ public List<JCAnnotation> annotations;
+ public JCExpression underlyingType;
+
+ protected JCAnnotatedType(List<JCAnnotation> annotations, JCExpression underlyingType) {
+ this.annotations = annotations;
+ this.underlyingType = underlyingType;
+ }
+ @Override
+ public void accept(Visitor v) { v.visitAnnotatedType(this); }
+
+ public Kind getKind() { return Kind.ANNOTATED_TYPE; }
+ public List<JCAnnotation> getAnnotations() {
+ return annotations;
+ }
+ public JCExpression getUnderlyingType() {
+ return underlyingType;
+ }
+ @Override
+ public <R,D> R accept(TreeVisitor<R,D> v, D d) {
+ return v.visitAnnotatedType(this, d);
+ }
+ @Override
+ public Tag getTag() {
+ return ANNOTATED_TYPE;
+ }
+ }
+
public static class JCErroneous extends JCExpression
implements com.sun.source.tree.ErroneousTree {
public List<? extends JCTree> errs;
@@ -2298,6 +2412,7 @@
Name name,
JCExpression restype,
List<JCTypeParameter> typarams,
+ JCVariableDecl recvparam,
List<JCVariableDecl> params,
List<JCExpression> thrown,
JCBlock body,
@@ -2423,6 +2538,7 @@
public void visitTypeBoundKind(TypeBoundKind that) { visitTree(that); }
public void visitAnnotation(JCAnnotation that) { visitTree(that); }
public void visitModifiers(JCModifiers that) { visitTree(that); }
+ public void visitAnnotatedType(JCAnnotatedType that) { visitTree(that); }
public void visitErroneous(JCErroneous that) { visitTree(that); }
public void visitLetExpr(LetExpr that) { visitTree(that); }
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Thu Jan 31 10:22:25 2013 -0800
@@ -29,7 +29,6 @@
import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.List;
@@ -261,6 +260,15 @@
}
}
+ public void printTypeAnnotations(List<JCAnnotation> trees) throws IOException {
+ if (trees.nonEmpty())
+ print(" ");
+ for (List<JCAnnotation> l = trees; l.nonEmpty(); l = l.tail) {
+ printExpr(l.head);
+ print(" ");
+ }
+ }
+
/** Print documentation comment, if it exists
* @param tree The tree for which a documentation comment should be printed.
*/
@@ -491,6 +499,12 @@
print(" " + tree.name);
}
print("(");
+ if (tree.recvparam!=null) {
+ printExpr(tree.recvparam);
+ if (tree.params.size() > 0) {
+ print(", ");
+ }
+ }
printExprs(tree.params);
print(")");
if (tree.thrown.nonEmpty()) {
@@ -543,7 +557,15 @@
} else {
printExpr(tree.mods);
if ((tree.mods.flags & VARARGS) != 0) {
- printExpr(((JCArrayTypeTree) tree.vartype).elemtype);
+ JCTree vartype = tree.vartype;
+ List<JCAnnotation> tas = null;
+ if (vartype instanceof JCAnnotatedType) {
+ tas = ((JCAnnotatedType)vartype).annotations;
+ vartype = ((JCAnnotatedType)vartype).underlyingType;
+ }
+ printExpr(((JCArrayTypeTree) vartype).elemtype);
+ if (tas != null)
+ printTypeAnnotations(tas);
print("... " + tree.name);
} else {
printExpr(tree.vartype);
@@ -919,16 +941,29 @@
try {
if (tree.elemtype != null) {
print("new ");
+ printTypeAnnotations(tree.annotations);
JCTree elem = tree.elemtype;
- if (elem.hasTag(TYPEARRAY))
- printBaseElementType((JCArrayTypeTree) elem);
- else
- printExpr(elem);
+ printBaseElementType(elem);
+ boolean isElemAnnoType = elem instanceof JCAnnotatedType;
+ int i = 0;
+ List<List<JCAnnotation>> da = tree.dimAnnotations;
for (List<JCExpression> l = tree.dims; l.nonEmpty(); l = l.tail) {
+ if (da.size() > i) {
+ printTypeAnnotations(da.get(i));
+ }
print("[");
+ i++;
printExpr(l.head);
print("]");
}
+ if (tree.elems != null) {
+ if (isElemAnnoType) {
+ printTypeAnnotations(((JCAnnotatedType)tree.elemtype).annotations);
+ }
+ print("[]");
+ }
+ if (isElemAnnoType)
+ elem = ((JCAnnotatedType)elem).underlyingType;
if (elem instanceof JCArrayTypeTree)
printBrackets((JCArrayTypeTree) elem);
}
@@ -946,7 +981,7 @@
public void visitLambda(JCLambda tree) {
try {
print("(");
- if (TreeInfo.isExplicitLambda(tree)) {
+ if (tree.paramKind == JCLambda.ParameterKind.EXPLICIT) {
printExprs(tree.params);
} else {
String sep = "";
@@ -1225,6 +1260,12 @@
JCTree elem;
while (true) {
elem = tree.elemtype;
+ if (elem.hasTag(ANNOTATED_TYPE)) {
+ JCAnnotatedType atype = (JCAnnotatedType) elem;
+ elem = atype.underlyingType;
+ if (!elem.hasTag(TYPEARRAY)) break;
+ printTypeAnnotations(atype.annotations);
+ }
print("[]");
if (!elem.hasTag(TYPEARRAY)) break;
tree = (JCArrayTypeTree) elem;
@@ -1327,6 +1368,32 @@
}
}
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ try {
+ if (tree.underlyingType.getKind() == JCTree.Kind.MEMBER_SELECT) {
+ JCFieldAccess access = (JCFieldAccess) tree.underlyingType;
+ printExpr(access.selected, TreeInfo.postfixPrec);
+ print(".");
+ printTypeAnnotations(tree.annotations);
+ print(access.name);
+ } else if (tree.underlyingType.getKind() == JCTree.Kind.ARRAY_TYPE) {
+ JCArrayTypeTree array = (JCArrayTypeTree) tree.underlyingType;
+ printBaseElementType(tree);
+ printTypeAnnotations(tree.annotations);
+ print("[]");
+ JCExpression elem = array.elemtype;
+ if (elem.hasTag(TYPEARRAY)) {
+ printBrackets((JCArrayTypeTree) elem);
+ }
+ } else {
+ printTypeAnnotations(tree.annotations);
+ printExpr(tree.underlyingType);
+ }
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
public void visitTree(JCTree tree) {
try {
print("(UNKNOWN: " + tree + ")");
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -71,11 +71,26 @@
return lb.toList();
}
+ public JCTree visitAnnotatedType(AnnotatedTypeTree node, P p) {
+ JCAnnotatedType t = (JCAnnotatedType) node;
+ List<JCAnnotation> annotations = copy(t.annotations, p);
+ JCExpression underlyingType = copy(t.underlyingType, p);
+ return M.at(t.pos).AnnotatedType(annotations, underlyingType);
+ }
+
public JCTree visitAnnotation(AnnotationTree node, P p) {
JCAnnotation t = (JCAnnotation) node;
JCTree annotationType = copy(t.annotationType, p);
List<JCExpression> args = copy(t.args, p);
- return M.at(t.pos).Annotation(annotationType, args);
+ if (t.getKind() == Tree.Kind.TYPE_ANNOTATION) {
+ JCAnnotation newTA = M.at(t.pos).TypeAnnotation(annotationType, args);
+ newTA.attribute = t.attribute;
+ return newTA;
+ } else {
+ JCAnnotation newT = M.at(t.pos).Annotation(annotationType, args);
+ newT.attribute = t.attribute;
+ return newT;
+ }
}
public JCTree visitAssert(AssertTree node, P p) {
@@ -233,10 +248,11 @@
JCExpression restype = copy(t.restype, p);
List<JCTypeParameter> typarams = copy(t.typarams, p);
List<JCVariableDecl> params = copy(t.params, p);
+ JCVariableDecl recvparam = copy(t.recvparam, p);
List<JCExpression> thrown = copy(t.thrown, p);
JCBlock body = copy(t.body, p);
JCExpression defaultValue = copy(t.defaultValue, p);
- return M.at(t.pos).MethodDef(mods, t.name, restype, typarams, params, thrown, body, defaultValue);
+ return M.at(t.pos).MethodDef(mods, t.name, restype, typarams, recvparam, params, thrown, body, defaultValue);
}
public JCTree visitMethodInvocation(MethodInvocationTree node, P p) {
@@ -384,8 +400,9 @@
public JCTree visitTypeParameter(TypeParameterTree node, P p) {
JCTypeParameter t = (JCTypeParameter) node;
+ List<JCAnnotation> annos = copy(t.annotations, p);
List<JCExpression> bounds = copy(t.bounds, p);
- return M.at(t.pos).TypeParameter(t.name, bounds);
+ return M.at(t.pos).TypeParameter(t.name, bounds, annos);
}
public JCTree visitInstanceOf(InstanceOfTree node, P p) {
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import static com.sun.tools.javac.code.Flags.*;
@@ -264,9 +265,38 @@
}
}
- public static boolean isExplicitLambda(JCLambda lambda) {
- return lambda.params.isEmpty() ||
- lambda.params.head.vartype != null;
+ /** set 'polyKind' on given tree */
+ public static void setPolyKind(JCTree tree, PolyKind pkind) {
+ switch (tree.getTag()) {
+ case APPLY:
+ ((JCMethodInvocation)tree).polyKind = pkind;
+ break;
+ case NEWCLASS:
+ ((JCNewClass)tree).polyKind = pkind;
+ break;
+ case REFERENCE:
+ ((JCMemberReference)tree).refPolyKind = pkind;
+ break;
+ default:
+ throw new AssertionError("Unexpected tree: " + tree);
+ }
+ }
+
+ /** set 'varargsElement' on given tree */
+ public static void setVarargsElement(JCTree tree, Type varargsElement) {
+ switch (tree.getTag()) {
+ case APPLY:
+ ((JCMethodInvocation)tree).varargsElement = varargsElement;
+ break;
+ case NEWCLASS:
+ ((JCNewClass)tree).varargsElement = varargsElement;
+ break;
+ case REFERENCE:
+ ((JCMemberReference)tree).varargsElement = varargsElement;
+ break;
+ default:
+ throw new AssertionError("Unexpected tree: " + tree);
+ }
}
/** Return true if the tree corresponds to an expression statement */
@@ -423,6 +453,19 @@
case POSTINC:
case POSTDEC:
return getStartPos(((JCUnary) tree).arg);
+ case ANNOTATED_TYPE: {
+ JCAnnotatedType node = (JCAnnotatedType) tree;
+ if (node.annotations.nonEmpty()) {
+ if (node.underlyingType.hasTag(TYPEARRAY) ||
+ node.underlyingType.hasTag(SELECT)) {
+ return getStartPos(node.underlyingType);
+ } else {
+ return getStartPos(node.annotations.head);
+ }
+ } else {
+ return getStartPos(node.underlyingType);
+ }
+ }
case NEWCLASS: {
JCNewClass node = (JCNewClass)tree;
if (node.encl != null)
@@ -530,6 +573,8 @@
return getEndPos(((JCUnary) tree).arg, endPosTable);
case WHILELOOP:
return getEndPos(((JCWhileLoop) tree).body, endPosTable);
+ case ANNOTATED_TYPE:
+ return getEndPos(((JCAnnotatedType) tree).underlyingType, endPosTable);
case ERRONEOUS: {
JCErroneous node = (JCErroneous)tree;
if (node.errs != null && node.errs.nonEmpty())
@@ -769,6 +814,8 @@
return ((JCFieldAccess) tree).sym;
case TYPEAPPLY:
return symbol(((JCTypeApply) tree).clazz);
+ case ANNOTATED_TYPE:
+ return symbol(((JCAnnotatedType) tree).underlyingType);
default:
return null;
}
@@ -1006,17 +1053,24 @@
case NULLCHK:
return Tree.Kind.OTHER;
+ case ANNOTATION:
+ return Tree.Kind.ANNOTATION;
+ case TYPE_ANNOTATION:
+ return Tree.Kind.TYPE_ANNOTATION;
+
default:
return null;
}
}
/**
- * Returns the underlying type of the tree if it is annotated type,
- * or the tree itself otherwise
+ * Returns the underlying type of the tree if it is an annotated type,
+ * or the tree itself otherwise.
*/
public static JCExpression typeIn(JCExpression tree) {
switch (tree.getTag()) {
+ case ANNOTATED_TYPE:
+ return ((JCAnnotatedType)tree).underlyingType;
case IDENT: /* simple names */
case TYPEIDENT: /* primitive name */
case SELECT: /* qualified name */
@@ -1024,20 +1078,55 @@
case WILDCARD: /* wild cards */
case TYPEPARAMETER: /* type parameters */
case TYPEAPPLY: /* parameterized types */
+ case ERRONEOUS: /* error tree TODO: needed for BadCast JSR308 test case. Better way? */
return tree;
default:
throw new AssertionError("Unexpected type tree: " + tree);
}
}
+ /* Return the inner-most type of a type tree.
+ * For an array that contains an annotated type, return that annotated type.
+ * TODO: currently only used by Pretty. Describe behavior better.
+ */
public static JCTree innermostType(JCTree type) {
- switch (type.getTag()) {
- case TYPEARRAY:
- return innermostType(((JCArrayTypeTree)type).elemtype);
- case WILDCARD:
- return innermostType(((JCWildcard)type).inner);
- default:
- return type;
+ JCTree lastAnnotatedType = null;
+ JCTree cur = type;
+ loop: while (true) {
+ switch (cur.getTag()) {
+ case TYPEARRAY:
+ lastAnnotatedType = null;
+ cur = ((JCArrayTypeTree)cur).elemtype;
+ break;
+ case WILDCARD:
+ lastAnnotatedType = null;
+ cur = ((JCWildcard)cur).inner;
+ break;
+ case ANNOTATED_TYPE:
+ lastAnnotatedType = cur;
+ cur = ((JCAnnotatedType)cur).underlyingType;
+ break;
+ default:
+ break loop;
+ }
+ }
+ if (lastAnnotatedType!=null) {
+ return lastAnnotatedType;
+ } else {
+ return cur;
}
}
+
+ private static class TypeAnnotationFinder extends TreeScanner {
+ public boolean foundTypeAnno = false;
+ public void visitAnnotation(JCAnnotation tree) {
+ foundTypeAnno = foundTypeAnno || tree.hasTag(TYPE_ANNOTATION);
+ }
+ }
+
+ public static boolean containsTypeAnnotation(JCTree e) {
+ TypeAnnotationFinder finder = new TypeAnnotationFinder();
+ finder.scan(e);
+ return finder.foundTypeAnno;
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -169,10 +169,26 @@
List<JCExpression> thrown,
JCBlock body,
JCExpression defaultValue) {
+ return MethodDef(
+ mods, name, restype, typarams, null, params,
+ thrown, body, defaultValue);
+ }
+
+ public JCMethodDecl MethodDef(JCModifiers mods,
+ Name name,
+ JCExpression restype,
+ List<JCTypeParameter> typarams,
+ JCVariableDecl recvparam,
+ List<JCVariableDecl> params,
+ List<JCExpression> thrown,
+ JCBlock body,
+ JCExpression defaultValue)
+ {
JCMethodDecl tree = new JCMethodDecl(mods,
name,
restype,
typarams,
+ recvparam,
params,
thrown,
body,
@@ -463,7 +479,11 @@
}
public JCTypeParameter TypeParameter(Name name, List<JCExpression> bounds) {
- JCTypeParameter tree = new JCTypeParameter(name, bounds);
+ return TypeParameter(name, bounds, List.<JCAnnotation>nil());
+ }
+
+ public JCTypeParameter TypeParameter(Name name, List<JCExpression> bounds, List<JCAnnotation> annos) {
+ JCTypeParameter tree = new JCTypeParameter(name, bounds, annos);
tree.pos = pos;
return tree;
}
@@ -481,7 +501,13 @@
}
public JCAnnotation Annotation(JCTree annotationType, List<JCExpression> args) {
- JCAnnotation tree = new JCAnnotation(annotationType, args);
+ JCAnnotation tree = new JCAnnotation(Tag.ANNOTATION, annotationType, args);
+ tree.pos = pos;
+ return tree;
+ }
+
+ public JCAnnotation TypeAnnotation(JCTree annotationType, List<JCExpression> args) {
+ JCAnnotation tree = new JCAnnotation(Tag.TYPE_ANNOTATION, annotationType, args);
tree.pos = pos;
return tree;
}
@@ -497,6 +523,12 @@
return Modifiers(flags, List.<JCAnnotation>nil());
}
+ public JCAnnotatedType AnnotatedType(List<JCAnnotation> annotations, JCExpression underlyingType) {
+ JCAnnotatedType tree = new JCAnnotatedType(annotations, underlyingType);
+ tree.pos = pos;
+ return tree;
+ }
+
public JCErroneous Erroneous() {
return Erroneous(List.<JCTree>nil());
}
@@ -755,7 +787,11 @@
result = Erroneous();
}
public void visitCompound(Attribute.Compound compound) {
- result = visitCompoundInternal(compound);
+ if (compound instanceof Attribute.TypeCompound) {
+ result = visitTypeCompoundInternal((Attribute.TypeCompound) compound);
+ } else {
+ result = visitCompoundInternal(compound);
+ }
}
public JCAnnotation visitCompoundInternal(Attribute.Compound compound) {
ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
@@ -766,6 +802,15 @@
}
return Annotation(Type(compound.type), args.toList());
}
+ public JCAnnotation visitTypeCompoundInternal(Attribute.TypeCompound compound) {
+ ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
+ for (List<Pair<Symbol.MethodSymbol,Attribute>> values = compound.values; values.nonEmpty(); values=values.tail) {
+ Pair<MethodSymbol,Attribute> pair = values.head;
+ JCExpression valueTree = translate(pair.snd);
+ args.append(Assign(Ident(pair.fst), valueTree).setType(valueTree.type));
+ }
+ return TypeAnnotation(Type(compound.type), args.toList());
+ }
public void visitArray(Attribute.Array array) {
ListBuffer<JCExpression> elems = new ListBuffer<JCExpression>();
for (int i = 0; i < array.values.length; i++)
@@ -779,7 +824,11 @@
JCAnnotation translate(Attribute.Compound a) {
return visitCompoundInternal(a);
}
+ JCAnnotation translate(Attribute.TypeCompound a) {
+ return visitTypeCompoundInternal(a);
+ }
}
+
AnnotationBuilder annotationBuilder = new AnnotationBuilder();
/** Create an annotation tree from an attribute.
@@ -788,6 +837,10 @@
return annotationBuilder.translate((Attribute.Compound)a);
}
+ public JCAnnotation TypeAnnotation(Attribute a) {
+ return annotationBuilder.translate((Attribute.TypeCompound) a);
+ }
+
/** Create a method definition from a method symbol and a method body.
*/
public JCMethodDecl MethodDef(MethodSymbol m, JCBlock body) {
@@ -804,6 +857,7 @@
m.name,
Type(mtype.getReturnType()),
TypeParams(mtype.getTypeArguments()),
+ null, // receiver type
Params(mtype.getParameterTypes(), m),
Types(mtype.getThrownTypes()),
body,
@@ -822,7 +876,6 @@
*/
public List<JCTypeParameter> TypeParams(List<Type> typarams) {
ListBuffer<JCTypeParameter> tparams = new ListBuffer<JCTypeParameter>();
- int i = 0;
for (List<Type> l = typarams; l.nonEmpty(); l = l.tail)
tparams.append(TypeParam(l.head.tsym.name, (TypeVar)l.head));
return tparams.toList();
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -84,6 +84,7 @@
scan(tree.mods);
scan(tree.restype);
scan(tree.typarams);
+ scan(tree.recvparam);
scan(tree.params);
scan(tree.thrown);
scan(tree.defaultValue);
@@ -200,15 +201,18 @@
public void visitNewClass(JCNewClass tree) {
scan(tree.encl);
+ scan(tree.typeargs);
scan(tree.clazz);
- scan(tree.typeargs);
scan(tree.args);
scan(tree.def);
}
public void visitNewArray(JCNewArray tree) {
+ scan(tree.annotations);
scan(tree.elemtype);
scan(tree.dims);
+ for (List<JCAnnotation> annos : tree.dimAnnotations)
+ scan(annos);
scan(tree.elems);
}
@@ -291,6 +295,7 @@
}
public void visitTypeParameter(JCTypeParameter tree) {
+ scan(tree.annotations);
scan(tree.bounds);
}
@@ -314,6 +319,11 @@
scan(tree.args);
}
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ scan(tree.annotations);
+ scan(tree.underlyingType);
+ }
+
public void visitErroneous(JCErroneous tree) {
}
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -139,6 +139,7 @@
tree.mods = translate(tree.mods);
tree.restype = translate(tree.restype);
tree.typarams = translateTypeParams(tree.typarams);
+ tree.recvparam = translate(tree.recvparam);
tree.params = translateVarDefs(tree.params);
tree.thrown = translate(tree.thrown);
tree.body = translate(tree.body);
@@ -289,6 +290,11 @@
}
public void visitNewArray(JCNewArray tree) {
+ tree.annotations = translate(tree.annotations);
+ List<List<JCAnnotation>> dimAnnos = List.nil();
+ for (List<JCAnnotation> origDimAnnos : tree.dimAnnotations)
+ dimAnnos = dimAnnos.append(translate(origDimAnnos));
+ tree.dimAnnotations = dimAnnos;
tree.elemtype = translate(tree.elemtype);
tree.dims = translate(tree.dims);
tree.elems = translate(tree.elems);
@@ -385,6 +391,7 @@
}
public void visitTypeParameter(JCTypeParameter tree) {
+ tree.annotations = translate(tree.annotations);
tree.bounds = translate(tree.bounds);
result = tree;
}
@@ -422,6 +429,12 @@
result = tree;
}
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ tree.annotations = translate(tree.annotations);
+ tree.underlyingType = translate(tree.underlyingType);
+ result = tree;
+ }
+
public void visitTree(JCTree tree) {
throw new AssertionError(tree);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -388,7 +388,7 @@
this.source = source;
this.position = pos;
this.key = key;
- this.args = args;
+ this.args = args;
int n = (pos == null ? Position.NOPOS : pos.getPreferredPosition());
if (n == Position.NOPOS || source == null)
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -217,7 +217,7 @@
private JavacMessages messages;
/**
-+ * Handler for initial dispatch of diagnostics.
+ * Handler for initial dispatch of diagnostics.
*/
private DiagnosticHandler diagnosticHandler;
@@ -385,14 +385,17 @@
noticeWriter = warnWriter = errWriter = pw;
}
- public void setWriters(Log other) {
+ /**
+ * Propagate the previous log's information.
+ */
+ public void initRound(Log other) {
this.noticeWriter = other.noticeWriter;
this.warnWriter = other.warnWriter;
this.errWriter = other.errWriter;
- }
-
- public void setSourceMap(Log other) {
this.sourceMap = other.sourceMap;
+ this.recorded = other.recorded;
+ this.nerrors = other.nerrors;
+ this.nwarnings = other.nwarnings;
}
/**
--- a/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Thu Jan 31 10:22:25 2013 -0800
@@ -288,7 +288,7 @@
public String simplify(Symbol s) {
String name = s.getQualifiedName().toString();
- if (!s.type.isCompound()) {
+ if (!s.type.isCompound() && !s.type.isPrimitive()) {
List<Symbol> conflicts = nameClashes.get(s.getSimpleName());
if (conflicts == null ||
(conflicts.size() == 1 &&
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -104,4 +104,8 @@
public AnnotationTypeDoc asAnnotationTypeDoc() {
return null;
}
+
+ public AnnotatedType asAnnotatedType() {
+ return null;
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.javadoc;
+
+import com.sun.javadoc.*;
+import com.sun.tools.javac.code.Attribute;
+import com.sun.tools.javac.code.Attribute.TypeCompound;
+import com.sun.tools.javac.util.List;
+
+/**
+ * Implementation of <code>AnnotatedType</code>, which
+ * represents an annotated type.
+ *
+ * @author Mahmood Ali
+ * @since 1.8
+ */
+public class AnnotatedTypeImpl
+ extends AbstractTypeImpl implements AnnotatedType {
+
+ AnnotatedTypeImpl(DocEnv env, com.sun.tools.javac.code.Type.AnnotatedType type) {
+ super(env, type);
+ }
+
+ /**
+ * Get the annotations of this program element.
+ * Return an empty array if there are none.
+ */
+ @Override
+ public AnnotationDesc[] annotations() {
+ List<TypeCompound> tas = ((com.sun.tools.javac.code.Type.AnnotatedType)type).typeAnnotations;
+ if (tas == null ||
+ tas.isEmpty()) {
+ return new AnnotationDesc[0];
+ }
+ AnnotationDesc res[] = new AnnotationDesc[tas.length()];
+ int i = 0;
+ for (Attribute.Compound a : tas) {
+ res[i++] = new AnnotationDescImpl(env, a);
+ }
+ return res;
+ }
+
+ @Override
+ public com.sun.javadoc.Type underlyingType() {
+ return TypeMaker.getType(env, ((com.sun.tools.javac.code.Type.AnnotatedType)type).underlyingType, true, false);
+ }
+
+ @Override
+ public AnnotatedType asAnnotatedType() {
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return typeName();
+ }
+
+ @Override
+ public String typeName() {
+ return this.underlyingType().typeName();
+ }
+
+ @Override
+ public String qualifiedTypeName() {
+ return this.underlyingType().qualifiedTypeName();
+ }
+
+ @Override
+ public String simpleTypeName() {
+ return this.underlyingType().simpleTypeName();
+ }
+
+ @Override
+ public String dimension() {
+ return this.underlyingType().dimension();
+ }
+
+ @Override
+ public boolean isPrimitive() {
+ return this.underlyingType().isPrimitive();
+ }
+
+ @Override
+ public ClassDoc asClassDoc() {
+ return this.underlyingType().asClassDoc();
+ }
+
+ @Override
+ public TypeVariable asTypeVariable() {
+ return this.underlyingType().asTypeVariable();
+ }
+
+ @Override
+ public WildcardType asWildcardType() {
+ return this.underlyingType().asWildcardType();
+ }
+
+ @Override
+ public ParameterizedType asParameterizedType() {
+ return this.underlyingType().asParameterizedType();
+ }
+}
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1186,6 +1186,13 @@
}
/**
+ * Returns null, as this is not an annotated type.
+ */
+ public AnnotatedType asAnnotatedType() {
+ return null;
+ }
+
+ /**
* Return false, as this is not a primitive type.
*/
public boolean isPrimitive() {
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,10 @@
import javax.tools.JavaFileManager;
import com.sun.javadoc.*;
+import com.sun.source.util.JavacTask;
import com.sun.source.util.TreePath;
-import com.sun.tools.javac.api.JavacTrees;
+import com.sun.tools.doclint.DocLint;
+import com.sun.tools.javac.api.BasicJavacTask;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.ClassType;
@@ -105,6 +107,7 @@
Types types;
JavaFileManager fileManager;
Context context;
+ DocLint doclint;
WeakHashMap<JCTree, TreePath> treePaths = new WeakHashMap<JCTree, TreePath>();
@@ -400,6 +403,9 @@
public void warning(DocImpl doc, String key, String a1) {
if (silent)
return;
+ // suppress messages that have (probably) been covered by doclint
+ if (doclint != null && doc != null && key.startsWith("tag"))
+ return;
messager.warning(doc==null ? null : doc.position(), key, a1);
}
@@ -732,9 +738,15 @@
return p;
}
- TreePath getTreePath(JCCompilationUnit toplevel, JCTree tree) {
- // don't bother to cache paths for classes and members
- return new TreePath(getTreePath(toplevel), tree);
+ TreePath getTreePath(JCCompilationUnit toplevel, JCClassDecl tree) {
+ TreePath p = treePaths.get(tree);
+ if (p == null)
+ treePaths.put(tree, p = new TreePath(getTreePath(toplevel), tree));
+ return p;
+ }
+
+ TreePath getTreePath(JCCompilationUnit toplevel, JCClassDecl cdecl, JCTree tree) {
+ return new TreePath(getTreePath(toplevel, cdecl), tree);
}
/**
@@ -781,4 +793,25 @@
result |= Modifier.VOLATILE;
return result;
}
+
+ void initDoclint(Collection<String> opts) {
+ ArrayList<String> doclintOpts = new ArrayList<String>();
+
+ for (String opt: opts) {
+ doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt);
+ }
+
+ if (doclintOpts.size() == 1
+ && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) {
+ return;
+ }
+
+ JavacTask t = BasicJavacTask.instance(context);
+ doclint = new DocLint();
+ doclint.init(t, doclintOpts.toArray(new String[doclintOpts.size()]), false);
+ }
+
+ boolean showTagMessages() {
+ return (doclint == null);
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -126,7 +126,13 @@
*/
Comment comment() {
if (comment == null) {
- comment = new Comment(this, documentation());
+ String d = documentation();
+ if (env.doclint != null
+ && treePath != null
+ && d.equals(getCommentText(treePath))) {
+ env.doclint.scan(treePath);
+ }
+ comment = new Comment(this, d);
}
return comment;
}
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,14 @@
import java.lang.reflect.Modifier;
import java.text.CollationKey;
+import javax.lang.model.type.TypeKind;
+
import com.sun.javadoc.*;
import com.sun.source.util.TreePath;
+import com.sun.tools.javac.code.Attribute;
import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Attribute.Compound;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type;
import com.sun.tools.javac.util.List;
@@ -195,6 +199,24 @@
return result;
}
+ public AnnotationDesc[] receiverAnnotations() {
+ // TODO: change how receiver annotations are output!
+ Type recvtype = sym.type.asMethodType().recvtype;
+ if (recvtype == null) {
+ return new AnnotationDesc[0];
+ }
+ if (recvtype.getKind() != TypeKind.ANNOTATED) {
+ return new AnnotationDesc[0];
+ }
+ List<? extends Compound> typeAnnos = ((com.sun.tools.javac.code.Type.AnnotatedType)recvtype).typeAnnotations;
+ AnnotationDesc result[] = new AnnotationDesc[typeAnnos.length()];
+ int i = 0;
+ for (Attribute.Compound a : typeAnnos) {
+ result[i++] = new AnnotationDescImpl(env, a);
+ }
+ return result;
+ }
+
/**
* Return the formal type parameters of this method or constructor.
* Return an empty array if there are none.
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@
super.visitMethodDef(tree);
MethodSymbol meth = tree.sym;
if (meth == null || meth.kind != Kinds.MTH) return;
- TreePath treePath = docenv.getTreePath(env.toplevel, tree);
+ TreePath treePath = docenv.getTreePath(env.toplevel, env.enclClass, tree);
if (meth.isConstructor())
docenv.makeConstructorDoc(meth, treePath);
else if (isAnnotationTypeElement(meth))
@@ -90,7 +90,7 @@
if (tree.sym != null &&
tree.sym.kind == Kinds.VAR &&
!isParameter(tree.sym)) {
- docenv.makeFieldDoc(tree.sym, docenv.getTreePath(env.toplevel, tree));
+ docenv.makeFieldDoc(tree.sym, docenv.getTreePath(env.toplevel, env.enclClass, tree));
}
}
--- a/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -121,13 +121,20 @@
}
/**
- * Return null, as this is not a wildcard type;
+ * Return null, as this is not a wildcard type.
*/
public WildcardType asWildcardType() {
return null;
}
/**
+ * Return null, as this is not an annotated type.
+ */
+ public AnnotatedType asAnnotatedType() {
+ return null;
+ }
+
+ /**
* Returns a string representation of the type.
*
* Return name of type including any dimension information.
--- a/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,14 @@
package com.sun.tools.javadoc;
import java.io.IOException;
+import java.util.Collection;
import java.util.Locale;
+
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
@@ -375,4 +376,12 @@
public JavaFileManager getFileManager() {
return env.fileManager;
}
+
+ public void initDocLint(Collection<String> opts) {
+ env.initDoclint(opts);
+ }
+
+ public boolean showTagMessages() {
+ return env.showTagMessages();
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package com.sun.tools.javadoc;
+import javax.lang.model.type.TypeKind;
+
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
@@ -51,12 +53,27 @@
* @param errToClassDoc if true, ERROR type results in a ClassDoc;
* false preserves legacy behavior
*/
+ public static com.sun.javadoc.Type getType(DocEnv env, Type t,
+ boolean errorToClassDoc) {
+ return getType(env, t, errorToClassDoc, true);
+ }
+
@SuppressWarnings("fallthrough")
public static com.sun.javadoc.Type getType(DocEnv env, Type t,
- boolean errToClassDoc) {
+ boolean errToClassDoc, boolean considerAnnotations) {
if (env.legacyDoclet) {
t = env.types.erasure(t);
}
+ if (considerAnnotations
+ && t.getKind() == TypeKind.ANNOTATED) {
+ return new AnnotatedTypeImpl(env, (com.sun.tools.javac.code.Type.AnnotatedType) t);
+ }
+
+ if (t.getKind() == TypeKind.ANNOTATED) {
+ Type.AnnotatedType at = (Type.AnnotatedType) t;
+ return new AnnotatedTypeImpl(env, at);
+ }
+
switch (t.getTag()) {
case CLASS:
if (ClassDocImpl.isGeneric((ClassSymbol)t.tsym)) {
@@ -129,6 +146,11 @@
* Class names are qualified if "full" is true.
*/
static String getTypeString(DocEnv env, Type t, boolean full) {
+ // TODO: should annotations be included here?
+ if (t.getKind() == TypeKind.ANNOTATED) {
+ Type.AnnotatedType at = (Type.AnnotatedType)t;
+ t = at.underlyingType;
+ }
switch (t.getTag()) {
case ARRAY:
StringBuilder s = new StringBuilder();
@@ -282,6 +304,13 @@
}
/**
+ * Return null, as there are no annotations of the type
+ */
+ public AnnotatedType asAnnotatedType() {
+ return null;
+ }
+
+ /**
* Return this type as an <code>AnnotationTypeDoc</code> if it
* represents an annotation type. Array dimensions are ignored.
*/
--- a/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,12 @@
package com.sun.tools.javadoc;
+import javax.lang.model.type.TypeKind;
+
import com.sun.javadoc.*;
+import com.sun.tools.javac.code.Attribute;
+import com.sun.tools.javac.code.Attribute.TypeCompound;
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
@@ -120,11 +124,30 @@
* Get the bounds of a type variable as listed in the "extends" clause.
*/
private static List<Type> getBounds(TypeVar v, DocEnv env) {
- Name boundname = v.getUpperBound().tsym.getQualifiedName();
- if (boundname == boundname.table.names.java_lang_Object) {
+ final Type upperBound = v.getUpperBound();
+ Name boundname = upperBound.tsym.getQualifiedName();
+ if (boundname == boundname.table.names.java_lang_Object
+ && upperBound.getKind() != TypeKind.ANNOTATED) {
return List.nil();
} else {
return env.types.getBounds(v);
}
}
+
+ /**
+ * Get the annotations of this program element.
+ * Return an empty array if there are none.
+ */
+ public AnnotationDesc[] annotations() {
+ if (type.getKind() != TypeKind.ANNOTATED) {
+ return new AnnotationDesc[0];
+ }
+ List<TypeCompound> tas = ((com.sun.tools.javac.code.Type.AnnotatedType) type).typeAnnotations;
+ AnnotationDesc res[] = new AnnotationDesc[tas.length()];
+ int i = 0;
+ for (Attribute.Compound a : tas) {
+ res[i++] = new AnnotationDescImpl(env, a);
+ }
+ return res;
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
package com.sun.tools.javap;
import com.sun.tools.classfile.Annotation;
+import com.sun.tools.classfile.TypeAnnotation;
import com.sun.tools.classfile.Annotation.Annotation_element_value;
import com.sun.tools.classfile.Annotation.Array_element_value;
import com.sun.tools.classfile.Annotation.Class_element_value;
@@ -76,6 +77,124 @@
print(")");
}
+ public void write(TypeAnnotation annot) {
+ write(annot, true, false);
+ }
+
+ public void write(TypeAnnotation annot, boolean showOffsets, boolean resolveIndices) {
+ write(annot.annotation, resolveIndices);
+ print(": ");
+ write(annot.position, showOffsets);
+ }
+
+ public void write(TypeAnnotation.Position pos, boolean showOffsets) {
+ print(pos.type);
+
+ switch (pos.type) {
+ // type cast
+ case CAST:
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ if (showOffsets) {
+ print(", offset=");
+ print(pos.offset);
+ }
+ break;
+ // local variable
+ case LOCAL_VARIABLE:
+ // resource variable
+ case RESOURCE_VARIABLE:
+ if (pos.lvarOffset == null) {
+ print(", lvarOffset is Null!");
+ break;
+ }
+ print(", {");
+ for (int i = 0; i < pos.lvarOffset.length; ++i) {
+ if (i != 0) print("; ");
+ if (showOffsets) {
+ print("start_pc=");
+ print(pos.lvarOffset[i]);
+ }
+ print(", length=");
+ print(pos.lvarLength[i]);
+ print(", index=");
+ print(pos.lvarIndex[i]);
+ }
+ print("}");
+ break;
+ // exception parameter
+ case EXCEPTION_PARAMETER:
+ print(", exception_index=");
+ print(pos.exception_index);
+ break;
+ // method receiver
+ case METHOD_RECEIVER:
+ // Do nothing
+ break;
+ // type parameter
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ print(", param_index=");
+ print(pos.parameter_index);
+ break;
+ // type parameter bound
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ print(", param_index=");
+ print(pos.parameter_index);
+ print(", bound_index=");
+ print(pos.bound_index);
+ break;
+ // class extends or implements clause
+ case CLASS_EXTENDS:
+ print(", type_index=");
+ print(pos.type_index);
+ break;
+ // throws
+ case THROWS:
+ print(", type_index=");
+ print(pos.type_index);
+ break;
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ print(", param_index=");
+ print(pos.parameter_index);
+ break;
+ // method/constructor/reference type argument
+ case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_INVOCATION_TYPE_ARGUMENT:
+ case METHOD_REFERENCE_TYPE_ARGUMENT:
+ if (showOffsets) {
+ print(", offset=");
+ print(pos.offset);
+ }
+ print(", type_index=");
+ print(pos.type_index);
+ break;
+ // We don't need to worry about these
+ case METHOD_RETURN:
+ case FIELD:
+ break;
+ // lambda formal parameter
+ case LAMBDA_FORMAL_PARAMETER:
+ print(", param_index=");
+ print(pos.parameter_index);
+ break;
+ case UNKNOWN:
+ throw new AssertionError("AnnotationWriter: UNKNOWN target type should never occur!");
+ default:
+ throw new AssertionError("AnnotationWriter: Unknown target type for position: " + pos);
+ }
+
+ // Append location data for generics/arrays.
+ if (!pos.location.isEmpty()) {
+ print(", location=");
+ print(pos.location);
+ }
+ }
+
public void write(Annotation.element_value_pair pair) {
write(pair, false);
}
--- a/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,10 @@
import com.sun.tools.classfile.MethodParameters_attribute;
import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute;
import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute;
+import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute;
import com.sun.tools.classfile.RuntimeVisibleParameterAnnotations_attribute;
+import com.sun.tools.classfile.RuntimeVisibleTypeAnnotations_attribute;
import com.sun.tools.classfile.Signature_attribute;
import com.sun.tools.classfile.SourceDebugExtension_attribute;
import com.sun.tools.classfile.SourceFile_attribute;
@@ -433,6 +435,30 @@
return null;
}
+ public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, Void ignore) {
+ println("RuntimeVisibleTypeAnnotations:");
+ indent(+1);
+ for (int i = 0; i < attr.annotations.length; i++) {
+ print(i + ": ");
+ annotationWriter.write(attr.annotations[i]);
+ println();
+ }
+ indent(-1);
+ return null;
+ }
+
+ public Void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, Void ignore) {
+ println("RuntimeInvisibleTypeAnnotations:");
+ indent(+1);
+ for (int i = 0; i < attr.annotations.length; i++) {
+ print(i + ": ");
+ annotationWriter.write(attr.annotations[i]);
+ println();
+ }
+ indent(-1);
+ return null;
+ }
+
public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, Void ignore) {
println("RuntimeVisibleParameterAnnotations:");
indent(+1);
--- a/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@
stackMapWriter = StackMapWriter.instance(context);
localVariableTableWriter = LocalVariableTableWriter.instance(context);
localVariableTypeTableWriter = LocalVariableTypeTableWriter.instance(context);
+ typeAnnotationWriter = TypeAnnotationWriter.instance(context);
options = Options.instance(context);
}
@@ -265,6 +266,11 @@
detailWriters.add(tryBlockWriter);
}
+ if (options.details.contains(InstructionDetailWriter.Kind.TYPE_ANNOS)) {
+ typeAnnotationWriter.reset(attr);
+ detailWriters.add(typeAnnotationWriter);
+ }
+
return detailWriters;
}
@@ -273,6 +279,7 @@
private ConstantWriter constantWriter;
private LocalVariableTableWriter localVariableTableWriter;
private LocalVariableTypeTableWriter localVariableTypeTableWriter;
+ private TypeAnnotationWriter typeAnnotationWriter;
private SourceWriter sourceWriter;
private StackMapWriter stackMapWriter;
private TryBlockWriter tryBlockWriter;
--- a/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,10 +42,13 @@
LOCAL_VAR_TYPES("localVariableTypes"),
SOURCE("source"),
STACKMAPS("stackMaps"),
- TRY_BLOCKS("tryBlocks");
+ TRY_BLOCKS("tryBlocks"),
+ TYPE_ANNOS("typeAnnotations");
+
Kind(String option) {
this.option = option;
}
+
final String option;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.javap;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.Code_attribute;
+import com.sun.tools.classfile.TypeAnnotation;
+import com.sun.tools.classfile.TypeAnnotation.Position;
+import com.sun.tools.classfile.Instruction;
+import com.sun.tools.classfile.Method;
+import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
+import com.sun.tools.classfile.RuntimeTypeAnnotations_attribute;
+import com.sun.tools.classfile.RuntimeVisibleTypeAnnotations_attribute;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Annotate instructions with details about type annotations.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
+public class TypeAnnotationWriter extends InstructionDetailWriter {
+ public enum NoteKind { VISIBLE, INVISIBLE };
+ public static class Note {
+ Note(NoteKind kind, TypeAnnotation anno) {
+ this.kind = kind;
+ this.anno = anno;
+ }
+ public final NoteKind kind;
+ public final TypeAnnotation anno;
+ }
+
+ static TypeAnnotationWriter instance(Context context) {
+ TypeAnnotationWriter instance = context.get(TypeAnnotationWriter.class);
+ if (instance == null)
+ instance = new TypeAnnotationWriter(context);
+ return instance;
+ }
+
+ protected TypeAnnotationWriter(Context context) {
+ super(context);
+ context.put(TypeAnnotationWriter.class, this);
+ annotationWriter = AnnotationWriter.instance(context);
+ classWriter = ClassWriter.instance(context);
+ }
+
+ public void reset(Code_attribute attr) {
+ Method m = classWriter.getMethod();
+ pcMap = new HashMap<Integer, List<Note>>();
+ check(NoteKind.VISIBLE, (RuntimeVisibleTypeAnnotations_attribute) m.attributes.get(Attribute.RuntimeVisibleTypeAnnotations));
+ check(NoteKind.INVISIBLE, (RuntimeInvisibleTypeAnnotations_attribute) m.attributes.get(Attribute.RuntimeInvisibleTypeAnnotations));
+ }
+
+ private void check(NoteKind kind, RuntimeTypeAnnotations_attribute attr) {
+ if (attr == null)
+ return;
+
+ for (TypeAnnotation anno: attr.annotations) {
+ Position p = anno.position;
+ Note note = null;
+ if (p.offset != -1)
+ addNote(p.offset, note = new Note(kind, anno));
+ if (p.lvarOffset != null) {
+ for (int i = 0; i < p.lvarOffset.length; i++) {
+ if (note == null)
+ note = new Note(kind, anno);
+ addNote(p.lvarOffset[i], note);
+ }
+ }
+ }
+ }
+
+ private void addNote(int pc, Note note) {
+ List<Note> list = pcMap.get(pc);
+ if (list == null)
+ pcMap.put(pc, list = new ArrayList<Note>());
+ list.add(note);
+ }
+
+ @Override
+ void writeDetails(Instruction instr) {
+ String indent = space(2); // get from Options?
+ int pc = instr.getPC();
+ List<Note> notes = pcMap.get(pc);
+ if (notes != null) {
+ for (Note n: notes) {
+ print(indent);
+ print("@");
+ annotationWriter.write(n.anno, false, true);
+ print(", ");
+ println(n.kind.toString().toLowerCase());
+ }
+ }
+ }
+
+ private AnnotationWriter annotationWriter;
+ private ClassWriter classWriter;
+ private Map<Integer, List<Note>> pcMap;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/BuildState.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * The build state class captures the source code and generated artifacts
+ * from a build. There are usually two build states, the previous one (prev),
+ * loaded from the javac_state file, and the current one (now).
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class BuildState {
+ private Map<String,Module> modules = new HashMap<String,Module>();
+ private Map<String,Package> packages = new HashMap<String,Package>();
+ private Map<String,Source> sources = new HashMap<String,Source>();
+ private Map<String,File> artifacts = new HashMap<String,File>();
+ // Map from package to a set of packages that depend on said package.
+ private Map<String,Set<String>> dependents = new HashMap<String,Set<String>>();
+
+ public Map<String,Module> modules() { return modules; }
+ public Map<String,Package> packages() { return packages; }
+ public Map<String,Source> sources() { return sources; }
+ public Map<String,File> artifacts() { return artifacts; }
+ public Map<String,Set<String>> dependents() { return dependents; }
+
+ /**
+ * Lookup a module from a name. Create the module if it does
+ * not exist yet.
+ */
+ public Module lookupModule(String mod) {
+ Module m = modules.get(mod);
+ if (m == null) {
+ m = new Module(mod, "???");
+ modules.put(mod, m);
+ }
+ return m;
+ }
+
+ /**
+ * Find a module from a given package name. For example:
+ * The package name "base:java.lang" will fetch the module named "base".
+ * The package name ":java.net" will fetch the default module.
+ */
+ Module findModuleFromPackageName(String pkg) {
+ int cp = pkg.indexOf(':');
+ assert(cp != -1);
+ String mod = pkg.substring(0, cp);
+ return lookupModule(mod);
+ }
+
+ /**
+ * Collect all packages, sources and artifacts for all modules
+ * into the build state.
+ *
+ * @param m The set of modules.
+ */
+ public void collectPackagesSourcesAndArtifacts(Map<String,Module> m) {
+ modules = m;
+ // Extract all the found packages.
+ for (Module i : modules.values()) {
+ for (Map.Entry<String,Package> j : i.packages().entrySet()) {
+ Package p = packages.get(j.getKey());
+ // Check that no two different packages are stored under same name.
+ assert(p == null || p == j.getValue());
+ if (p == null) {
+ p = j.getValue();
+ packages.put(j.getKey(),j.getValue());
+ }
+ for (Map.Entry<String,Source> k : p.sources().entrySet()) {
+ Source s = sources.get(k.getKey());
+ // Check that no two different sources are stored under same name.
+ assert(s == null || s == k.getValue());
+ if (s == null) {
+ s = k.getValue();
+ sources.put(k.getKey(), k.getValue());
+ }
+ }
+ for (Map.Entry<String,File> g : p.artifacts().entrySet()) {
+ File f = artifacts.get(g.getKey());
+ // Check that no two artifacts are stored under the same file.
+ assert(f == null || f == g.getValue());
+ if (f == null) {
+ f = g.getValue();
+ artifacts.put(g.getKey(), g.getValue());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Collect all the artifacts of all modules and packages.
+ *
+ * @param m The set of modules.
+ */
+ public void collectArtifacts(Map<String,Module> m) {
+ modules = m;
+ // Extract all the found packages.
+ for (Module i : modules.values()) {
+ for (Map.Entry<String,Package> j : i.packages().entrySet()) {
+ Package p = packages.get(j.getKey());
+ // Check that no two different packages are stored under same name.
+ assert(p == null || p == j.getValue());
+ p = j.getValue();
+ packages.put(j.getKey(),j.getValue());
+ for (Map.Entry<String,File> g : p.artifacts().entrySet()) {
+ File f = artifacts.get(g.getKey());
+ // Check that no two artifacts are stored under the same file.
+ assert(f == null || f == g.getValue());
+ artifacts.put(g.getKey(), g.getValue());
+ }
+ }
+ }
+ }
+
+ /**
+ * Calculate the package dependents (ie the reverse of the dependencies).
+ */
+ public void calculateDependents() {
+ dependents = new HashMap<String,Set<String>>();
+ for (String s : packages.keySet()) {
+ Package p = packages.get(s);
+ for (String d : p.dependencies()) {
+ Set<String> ss = dependents.get(d);
+ if (ss == null) {
+ ss = new HashSet<String>();
+ dependents.put(d, ss);
+ }
+ // Add the dependent information to the global dependent map.
+ ss.add(s);
+ Package dp = packages.get(d);
+ // Also add the dependent information to the package specific map.
+ // Normally, you do not compile java.lang et al. Therefore
+ // there are several packages that p depends upon that you
+ // do not have in your state database. This is perfectly fine.
+ if (dp != null) {
+ // But this package did exist in the state database.
+ dp.addDependent(p.name());
+ }
+ }
+ }
+ }
+
+ /**
+ * Verify that the setModules method above did the right thing when
+ * running through the module->package->source structure.
+ */
+ public void checkInternalState(String msg, boolean linkedOnly, Map<String,Source> srcs) {
+ boolean baad = false;
+ Map<String,Source> original = new HashMap<String,Source>();
+ Map<String,Source> calculated = new HashMap<String,Source>();
+
+ for (String s : sources.keySet()) {
+ Source ss = sources.get(s);
+ if (ss.isLinkedOnly() == linkedOnly) {
+ calculated.put(s,ss);
+ }
+ }
+ for (String s : srcs.keySet()) {
+ Source ss = srcs.get(s);
+ if (ss.isLinkedOnly() == linkedOnly) {
+ original.put(s,ss);
+ }
+ }
+ if (original.size() != calculated.size()) {
+ Log.error("INTERNAL ERROR "+msg+" original and calculated are not the same size!");
+ baad = true;
+ }
+ if (!original.keySet().equals(calculated.keySet())) {
+ Log.error("INTERNAL ERROR "+msg+" original and calculated do not have the same domain!");
+ baad = true;
+ }
+ if (!baad) {
+ for (String s : original.keySet()) {
+ Source s1 = original.get(s);
+ Source s2 = calculated.get(s);
+ if (s1 == null || s2 == null || !s1.equals(s2)) {
+ Log.error("INTERNAL ERROR "+msg+" original and calculated have differing elements for "+s);
+ }
+ baad = true;
+ }
+ }
+ if (baad) {
+ for (String s : original.keySet()) {
+ Source ss = original.get(s);
+ Source sss = calculated.get(s);
+ if (sss == null) {
+ Log.error("The file "+s+" does not exist in calculated tree of sources.");
+ }
+ }
+ for (String s : calculated.keySet()) {
+ Source ss = calculated.get(s);
+ Source sss = original.get(s);
+ if (sss == null) {
+ Log.error("The file "+s+" does not exist in original set of found sources.");
+ }
+ }
+ }
+ }
+
+ /**
+ * Load a module from the javac state file.
+ */
+ public Module loadModule(String l) {
+ Module m = Module.load(l);
+ modules.put(m.name(), m);
+ return m;
+ }
+
+ /**
+ * Load a package from the javac state file.
+ */
+ public Package loadPackage(Module lastModule, String l) {
+ Package p = Package.load(lastModule, l);
+ lastModule.addPackage(p);
+ packages.put(p.name(), p);
+ return p;
+ }
+
+ /**
+ * Load a source from the javac state file.
+ */
+ public Source loadSource(Package lastPackage, String l, boolean is_generated) {
+ Source s = Source.load(lastPackage, l, is_generated);
+ lastPackage.addSource(s);
+ sources.put(s.name(), s);
+ return s;
+ }
+
+ /**
+ * During an incremental compile we need to copy the old javac state
+ * information about packages that were not recompiled.
+ */
+ public void copyPackagesExcept(BuildState prev, Set<String> recompiled, Set<String> removed) {
+ for (String pkg : prev.packages().keySet()) {
+ // Do not copy recompiled or removed packages.
+ if (recompiled.contains(pkg) || removed.contains(pkg)) continue;
+ Module mnew = findModuleFromPackageName(pkg);
+ Package pprev = prev.packages().get(pkg);
+ mnew.addPackage(pprev);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/CleanProperties.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.*;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * The clean properties transform should not be necessary.
+ * Eventually we will cleanup the property file sources in the OpenJDK instead.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class CleanProperties implements Transformer
+{
+ public void setExtra(String e) {
+ // Any extra information is ignored for clean properties.
+ }
+
+ public void setExtra(String[] a) {
+ // Any extra information is ignored for clean properties.
+ }
+
+ public boolean transform(Map<String,Set<URI>> pkgSrcs,
+ Set<URI> visibleSrcs,
+ Map<URI,Set<String>> visibleClasses,
+ Map<String,Set<String>> oldPackageDependencies,
+ URI destRoot,
+ Map<String,Set<URI>> packageArtifacts,
+ Map<String,Set<String>> packageDependencies,
+ Map<String,String> packagePublicApis,
+ int debugLevel,
+ boolean incremental,
+ int numCores,
+ PrintStream out,
+ PrintStream err)
+ {
+ boolean rc = true;
+ for (String pkgName : pkgSrcs.keySet()) {
+ String pkgNameF = pkgName.replace('.',File.separatorChar);
+ for (URI u : pkgSrcs.get(pkgName)) {
+ File src = new File(u);
+ boolean r = clean(pkgName, pkgNameF, src, new File(destRoot), debugLevel,
+ packageArtifacts);
+ if (r == false) {
+ rc = false;
+ }
+ }
+ }
+ return rc;
+ }
+
+ boolean clean(String pkgName, String pkgNameF, File src, File destRoot, int debugLevel,
+ Map<String,Set<URI>> packageArtifacts)
+ {
+ // Load the properties file.
+ Properties p = new Properties();
+ try {
+ p.load(new FileInputStream(src));
+ } catch (IOException e) {
+ Log.error("Error reading file "+src.getPath());
+ return false;
+ }
+
+ // Sort the properties in increasing key order.
+ List<String> sortedKeys = new ArrayList<String>();
+ for (Object key : p.keySet()) {
+ sortedKeys.add((String)key);
+ }
+ Collections.sort(sortedKeys);
+ Iterator<String> keys = sortedKeys.iterator();
+
+ // Collect the properties into a string buffer.
+ StringBuilder data = new StringBuilder();
+ while (keys.hasNext()) {
+ String key = keys.next();
+ data.append(CompileProperties.escape(key)+":"+CompileProperties.escape((String)p.get(key))+"\n");
+ }
+
+ String destFilename = destRoot.getPath()+File.separator+pkgNameF+File.separator+src.getName();
+ File dest = new File(destFilename);
+
+ // Make sure the dest directories exist.
+ if (!dest.getParentFile().isDirectory()) {
+ if (!dest.getParentFile().mkdirs()) {
+ Log.error("Could not create the directory "+dest.getParentFile().getPath());
+ return false;
+ }
+ }
+
+ Set<URI> as = packageArtifacts.get(pkgName);
+ if (as == null) {
+ as = new HashSet<URI>();
+ packageArtifacts.put(pkgName, as);
+ }
+ as.add(dest.toURI());
+
+ if (dest.exists() && dest.lastModified() > src.lastModified()) {
+ // A cleaned property file exists, and its timestamp is newer than the source.
+ // Assume that we do not need to clean!
+ // Thus we are done.
+ return true;
+ }
+
+ Log.info("Cleaning property file "+pkgNameF+File.separator+src.getName());
+ try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(dest)))) {
+ writer.write(data.toString());
+ } catch ( IOException e ) {
+ Log.error("Could not write file "+dest.getPath());
+ return false;
+ }
+ return true;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/CompileChunk.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A compile chunk is a list of sources/packages to be compiled. Possibly a subset of
+ * the total number of sources/packages to be compiled for this sjavac invocation.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class CompileChunk implements Comparable<CompileChunk> {
+ public int numPackages;
+ public int numDependents;
+ public Set<URI> srcs = new HashSet<URI>();
+ public StringBuilder pkgNames = new StringBuilder();
+ public String pkgFromTos = "";
+
+ public int compareTo(CompileChunk c) {
+ if (numDependents == c.numDependents) return 0;
+ if (numDependents > c.numDependents) return -1;
+ return -1;
+ }
+
+ boolean equal(CompileChunk c) {
+ return numDependents == c.numDependents;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Random;
+import java.util.Set;
+import java.util.Map;
+
+import com.sun.tools.sjavac.server.JavacServer;
+import com.sun.tools.sjavac.server.SysInfo;
+import java.io.PrintStream;
+
+/**
+ * This transform compiles a set of packages containing Java sources.
+ * The compile request is divided into separate sets of source files.
+ * For each set a separate request thread is dispatched to a javac server
+ * and the meta data is accumulated. The number of sets correspond more or
+ * less to the number of cores. Less so now, than it will in the future.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class CompileJavaPackages implements Transformer {
+
+ // The current limited sharing of data between concurrent JavaCompilers
+ // in the server will not give speedups above 3 cores. Thus this limit.
+ // We hope to improve this in the future.
+ final static int limitOnConcurrency = 3;
+
+ String serverSettings;
+ public void setExtra(String e) {
+ serverSettings = e;
+ }
+
+ String[] args;
+ public void setExtra(String[] a) {
+ args = a;
+ }
+
+ public boolean transform(Map<String,Set<URI>> pkgSrcs,
+ Set<URI> visibleSources,
+ Map<URI,Set<String>> visibleClasses,
+ Map<String,Set<String>> oldPackageDependents,
+ URI destRoot,
+ final Map<String,Set<URI>> packageArtifacts,
+ final Map<String,Set<String>> packageDependencies,
+ final Map<String,String> packagePubapis,
+ int debugLevel,
+ boolean incremental,
+ int numCores,
+ PrintStream out,
+ PrintStream err)
+ {
+ boolean rc = true;
+ boolean concurrentCompiles = true;
+
+ // Fetch the id.
+ String id = Util.extractStringOption("id", serverSettings);
+ if (id == null || id.equals("")) {
+ // No explicit id set. Create a random id so that the requests can be
+ // grouped properly in the server.
+ id = "id"+(((new Random()).nextLong())&Long.MAX_VALUE);
+ }
+ // Only keep portfile and sjavac settings..
+ String psServerSettings = Util.cleanSubOptions("--server:", Util.set("portfile","sjavac","background","keepalive"), serverSettings);
+
+ // Get maximum heap size from the server!
+ SysInfo sysinfo = JavacServer.connectGetSysInfo(psServerSettings, out, err);
+ if (sysinfo.numCores == -1) {
+ Log.error("Could not query server for sysinfo!");
+ return false;
+ }
+ int numMBytes = (int)(sysinfo.maxMemory / ((long)(1024*1024)));
+ Log.debug("Server reports "+numMBytes+"MiB of memory and "+sysinfo.numCores+" cores");
+
+ if (numCores <= 0) {
+ // Set the requested number of cores to the number of cores on the server.
+ numCores = sysinfo.numCores;
+ Log.debug("Number of jobs not explicitly set, defaulting to "+sysinfo.numCores);
+ } else if (sysinfo.numCores < numCores) {
+ // Set the requested number of cores to the number of cores on the server.
+ Log.debug("Limiting jobs from explicitly set "+numCores+" to cores available on server: "+sysinfo.numCores);
+ numCores = sysinfo.numCores;
+ } else {
+ Log.debug("Number of jobs explicitly set to "+numCores);
+ }
+ // More than three concurrent cores does not currently give a speedup, at least for compiling the jdk
+ // in the OpenJDK. This will change in the future.
+ int numCompiles = numCores;
+ if (numCores > limitOnConcurrency) numCompiles = limitOnConcurrency;
+ // Split the work up in chunks to compiled.
+
+ int numSources = 0;
+ for (String s : pkgSrcs.keySet()) {
+ Set<URI> ss = pkgSrcs.get(s);
+ numSources += ss.size();
+ }
+
+ int sourcesPerCompile = numSources / numCompiles;
+
+ // For 64 bit Java, it seems we can compile the OpenJDK 8800 files with a 1500M of heap
+ // in a single chunk, with reasonable performance.
+ // For 32 bit java, it seems we need 1G of heap.
+ // Number experimentally determined when compiling the OpenJDK.
+ // Includes space for reasonably efficient garbage collection etc,
+ // Calculating backwards gives us a requirement of
+ // 1500M/8800 = 175 KiB for 64 bit platforms
+ // and 1G/8800 = 119 KiB for 32 bit platform
+ // for each compile.....
+ int kbPerFile = 175;
+ String osarch = System.getProperty("os.arch");
+ if (osarch.equals("i386")) {
+ // For 32 bit platforms, assume it is slightly smaller
+ // because of smaller object headers and pointers.
+ kbPerFile = 119;
+ }
+ int numRequiredMBytes = (kbPerFile*numSources)/1024;
+ Log.debug("For os.arch "+osarch+" the empirically determined heap required per file is "+kbPerFile+"KiB");
+ Log.debug("Server has "+numMBytes+"MiB of heap.");
+ Log.debug("Heuristics say that we need "+numRequiredMBytes+"MiB of heap for all source files.");
+ // Perform heuristics to see how many cores we can use,
+ // or if we have to the work serially in smaller chunks.
+ if (numMBytes < numRequiredMBytes) {
+ // Ouch, cannot fit even a single compile into the heap.
+ // Split it up into several serial chunks.
+ concurrentCompiles = false;
+ // Limit the number of sources for each compile to 500.
+ if (numSources < 500) {
+ numCompiles = 1;
+ sourcesPerCompile = numSources;
+ Log.debug("Compiling as a single source code chunk to stay within heap size limitations!");
+ } else if (sourcesPerCompile > 500) {
+ // This number is very low, and tuned to dealing with the OpenJDK
+ // where the source is >very< circular! In normal application,
+ // with less circularity the number could perhaps be increased.
+ numCompiles = numSources / 500;
+ sourcesPerCompile = numSources/numCompiles;
+ Log.debug("Compiling source as "+numCompiles+" code chunks serially to stay within heap size limitations!");
+ }
+ } else {
+ if (numCompiles > 1) {
+ // Ok, we can fit at least one full compilation on the heap.
+ float usagePerCompile = (float)numRequiredMBytes / ((float)numCompiles * (float)0.7);
+ int usage = (int)(usagePerCompile * (float)numCompiles);
+ Log.debug("Heuristics say that for "+numCompiles+" concurrent compiles we need "+usage+"MiB");
+ if (usage > numMBytes) {
+ // Ouch it does not fit. Reduce to a single chunk.
+ numCompiles = 1;
+ sourcesPerCompile = numSources;
+ // What if the relationship betweem number of compile_chunks and num_required_mbytes
+ // is not linear? Then perhaps 2 chunks would fit where 3 does not. Well, this is
+ // something to experiment upon in the future.
+ Log.debug("Limiting compile to a single thread to stay within heap size limitations!");
+ }
+ }
+ }
+
+ Log.debug("Compiling sources in "+numCompiles+" chunk(s)");
+
+ // Create the chunks to be compiled.
+ final CompileChunk[] compileChunks = createCompileChunks(pkgSrcs, oldPackageDependents,
+ numCompiles, sourcesPerCompile);
+
+ if (Log.isDebugging()) {
+ int cn = 1;
+ for (CompileChunk cc : compileChunks) {
+ Log.debug("Chunk "+cn+" for "+id+" ---------------");
+ cn++;
+ for (URI u : cc.srcs) {
+ Log.debug(""+u);
+ }
+ }
+ }
+
+ // The return values for each chunked compile.
+ final int[] rn = new int[numCompiles];
+ // The requets, might or might not run as a background thread.
+ final Thread[] requests = new Thread[numCompiles];
+
+ final Set<URI> fvisible_sources = visibleSources;
+ final Map<URI,Set<String>> fvisible_classes = visibleClasses;
+
+ long start = System.currentTimeMillis();
+
+ for (int i=0; i<numCompiles; ++i) {
+ final int ii = i;
+ final CompileChunk cc = compileChunks[i];
+
+ // Pass the num_cores and the id (appended with the chunk number) to the server.
+ final String cleanedServerSettings = psServerSettings+",poolsize="+numCores+",id="+id+"-"+ii;
+ final PrintStream fout = out;
+ final PrintStream ferr = err;
+
+ requests[ii] = new Thread() {
+ @Override
+ public void run() {
+ rn[ii] = JavacServer.useServer(cleanedServerSettings,
+ Main.removeWrapperArgs(args),
+ cc.srcs,
+ fvisible_sources,
+ fvisible_classes,
+ packageArtifacts,
+ packageDependencies,
+ packagePubapis,
+ null,
+ fout, ferr);
+ }
+ };
+
+ if (cc.srcs.size() > 0) {
+ String numdeps = "";
+ if (cc.numDependents > 0) numdeps = "(with "+cc.numDependents+" dependents) ";
+ if (!incremental || cc.numPackages > 16) {
+ String info = "("+cc.pkgFromTos+")";
+ if (info.equals("( to )")) {
+ info = "";
+ }
+ Log.info("Compiling "+cc.srcs.size()+" files "+numdeps+"in "+cc.numPackages+" packages "+info);
+ } else {
+ Log.info("Compiling "+cc.pkgNames+numdeps);
+ }
+ if (concurrentCompiles) {
+ requests[ii].start();
+ }
+ else {
+ requests[ii].run();
+ // If there was an error, then stop early when running single threaded.
+ if (rn[i] != 0) {
+ return false;
+ }
+ }
+ }
+ }
+ if (concurrentCompiles) {
+ // If there are background threads for the concurrent compiles, then join them.
+ for (int i=0; i<numCompiles; ++i) {
+ try { requests[i].join(); } catch (InterruptedException e) { }
+ }
+ }
+
+ // Check the return values.
+ for (int i=0; i<numCompiles; ++i) {
+ if (compileChunks[i].srcs.size() > 0) {
+ if (rn[i] != 0) {
+ rc = false;
+ }
+ }
+ }
+ long duration = System.currentTimeMillis() - start;
+ long minutes = duration/60000;
+ long seconds = (duration-minutes*60000)/1000;
+ Log.debug("Compilation of "+numSources+" source files took "+minutes+"m "+seconds+"s");
+
+ return rc;
+ }
+
+
+ /**
+ * Split up the sources into compile chunks. If old package dependents information
+ * is available, sort the order of the chunks into the most dependent first!
+ * (Typically that chunk contains the java.lang package.) In the future
+ * we could perhaps improve the heuristics to put the sources into even more sensible chunks.
+ * Now the package are simple sorted in alphabetical order and chunked, then the chunks
+ * are sorted on how dependent they are.
+ *
+ * @param pkgSrcs The sources to compile.
+ * @param oldPackageDependents Old package dependents, if non-empty, used to sort the chunks.
+ * @param numCompiles The number of chunks.
+ * @param sourcesPerCompile The number of sources per chunk.
+ * @return
+ */
+ CompileChunk[] createCompileChunks(Map<String,Set<URI>> pkgSrcs,
+ Map<String,Set<String>> oldPackageDependents,
+ int numCompiles,
+ int sourcesPerCompile) {
+
+ CompileChunk[] compileChunks = new CompileChunk[numCompiles];
+ for (int i=0; i<compileChunks.length; ++i) {
+ compileChunks[i] = new CompileChunk();
+ }
+
+ // Now go through the packages and spread out the source on the different chunks.
+ int ci = 0;
+ // Sort the packages
+ String[] packageNames = pkgSrcs.keySet().toArray(new String[0]);
+ Arrays.sort(packageNames);
+ String from = null;
+ for (String pkgName : packageNames) {
+ CompileChunk cc = compileChunks[ci];
+ Set<URI> s = pkgSrcs.get(pkgName);
+ if (cc.srcs.size()+s.size() > sourcesPerCompile && ci < numCompiles-1) {
+ from = null;
+ ci++;
+ cc = compileChunks[ci];
+ }
+ cc.numPackages++;
+ cc.srcs.addAll(s);
+
+ // Calculate nice package names to use as information when compiling.
+ String justPkgName = Util.justPackageName(pkgName);
+ // Fetch how many packages depend on this package from the old build state.
+ Set<String> ss = oldPackageDependents.get(pkgName);
+ if (ss != null) {
+ // Accumulate this information onto this chunk.
+ cc.numDependents += ss.size();
+ }
+ if (from == null || from.trim().equals("")) from = justPkgName;
+ cc.pkgNames.append(justPkgName+"("+s.size()+") ");
+ cc.pkgFromTos = from+" to "+justPkgName;
+ }
+ // If we are compiling serially, sort the chunks, so that the chunk (with the most dependents) (usually the chunk
+ // containing java.lang.Object, is to be compiled first!
+ // For concurrent compilation, this does not matter.
+ Arrays.sort(compileChunks);
+ return compileChunks;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/CompileProperties.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.*;
+import java.net.URI;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Map;
+
+/**
+ * Compile properties transform a properties file into a Java source file.
+ * Java has built in support for reading properties from either a text file
+ * in the source or a compiled java source file.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class CompileProperties implements Transformer
+{
+ // Any extra information passed from the command line, for example if:
+ // -tr .proppp=com.sun.tools.javac.smart.CompileProperties,sun.util.resources.LocaleNamesBundle
+ // then extra will be "sun.util.resources.LocaleNamesBundle"
+ String extra;
+
+ public void setExtra(String e) {
+ extra = e;
+ }
+
+ public void setExtra(String[] a) {
+ }
+
+ public boolean transform(Map<String,Set<URI>> pkgSrcs,
+ Set<URI> visibleSrcs,
+ Map<URI,Set<String>> visibleClasses,
+ Map<String,Set<String>> oldPackageDependents,
+ URI destRoot,
+ Map<String,Set<URI>> packageArtifacts,
+ Map<String,Set<String>> packageDependencies,
+ Map<String,String> packagePublicApis,
+ int debugLevel,
+ boolean incremental,
+ int numCores,
+ PrintStream out,
+ PrintStream err) {
+ boolean rc = true;
+ for (String pkgName : pkgSrcs.keySet()) {
+ String pkgNameF = Util.toFileSystemPath(pkgName);
+ for (URI u : pkgSrcs.get(pkgName)) {
+ File src = new File(u);
+ boolean r = compile(pkgName, pkgNameF, src, new File(destRoot), debugLevel,
+ packageArtifacts);
+ if (r == false) {
+ rc = false;
+ }
+ }
+ }
+ return rc;
+ }
+
+ boolean compile(String pkgName, String pkgNameF, File src, File destRoot, int debugLevel,
+ Map<String,Set<URI>> packageArtifacts)
+ {
+ String superClass = "java.util.ListResourceBundle";
+
+ if (extra != null) {
+ superClass = extra;
+ }
+ // Load the properties file.
+ Properties p = new Properties();
+ try {
+ p.load(new FileInputStream(src));
+ } catch (IOException e) {
+ Log.error("Error reading file "+src.getPath());
+ return false;
+ }
+
+ // Calculate the name of the Java source file to be generated.
+ int dp = src.getName().lastIndexOf(".");
+ String classname = src.getName().substring(0,dp);
+
+ // Sort the properties in increasing key order.
+ List<String> sortedKeys = new ArrayList<String>();
+ for (Object key : p.keySet()) {
+ sortedKeys.add((String)key);
+ }
+ Collections.sort(sortedKeys);
+ Iterator<String> keys = sortedKeys.iterator();
+
+ // Collect the properties into a string buffer.
+ StringBuilder data = new StringBuilder();
+ while (keys.hasNext()) {
+ String key = keys.next();
+ data.append(" { \"" + escape(key) + "\", \"" +
+ escape((String)p.get(key)) + "\" },\n");
+ }
+
+ // Create dest file name. It is derived from the properties file name.
+ String destFilename = destRoot.getPath()+File.separator+pkgNameF+File.separator+classname+".java";
+ File dest = new File(destFilename);
+
+ // Make sure the dest directories exist.
+ if (!dest.getParentFile().isDirectory()) {
+ if (!dest.getParentFile().mkdirs()) {
+ Log.error("Could not create the directory "+dest.getParentFile().getPath());
+ return false;
+ }
+ }
+
+ Set<URI> as = packageArtifacts.get(pkgName);
+ if (as == null) {
+ as = new HashSet<URI>();
+ packageArtifacts.put(pkgName, as);
+ }
+ as.add(dest.toURI());
+
+ if (dest.exists() && dest.lastModified() > src.lastModified()) {
+ // A generated file exists, and its timestamp is newer than the source.
+ // Assume that we do not need to regenerate the dest file!
+ // Thus we are done.
+ return true;
+ }
+
+ String packageString = "package " + pkgNameF.replace(File.separatorChar,'.') + ";\n\n";
+
+ Log.info("Compiling property file "+pkgNameF+File.separator+src.getName());
+ try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(dest)))) {
+ MessageFormat format = new MessageFormat(FORMAT);
+ writer.write(format.format(new Object[] { packageString, classname, superClass, data }));
+ } catch ( IOException e ) {
+ Log.error("Could not write file "+dest.getPath());
+ return false;
+ }
+ return true;
+ }
+
+ private static final String FORMAT =
+ "{0}" +
+ "public final class {1} extends {2} '{'\n" +
+ " protected final Object[][] getContents() '{'\n" +
+ " return new Object[][] '{'\n" +
+ "{3}" +
+ " };\n" +
+ " }\n" +
+ "}\n";
+
+ public static String escape(String theString) {
+ int len = theString.length();
+ StringBuilder outBuffer = new StringBuilder(len*2);
+
+ for(int x=0; x<len; x++) {
+ char aChar = theString.charAt(x);
+ switch(aChar) {
+ case '\\':outBuffer.append('\\'); outBuffer.append('\\');
+ break;
+ case '\t':outBuffer.append('\\'); outBuffer.append('t');
+ break;
+ case '\n':outBuffer.append('\\'); outBuffer.append('n');
+ break;
+ case '\r':outBuffer.append('\\'); outBuffer.append('r');
+ break;
+ case '\f':outBuffer.append('\\'); outBuffer.append('f');
+ break;
+ default:
+ if ((aChar < 0x0020) || (aChar > 0x007e)) {
+ outBuffer.append('\\');
+ outBuffer.append('u');
+ outBuffer.append(toHex((aChar >> 12) & 0xF));
+ outBuffer.append(toHex((aChar >> 8) & 0xF));
+ outBuffer.append(toHex((aChar >> 4) & 0xF));
+ outBuffer.append(toHex( aChar & 0xF));
+ } else {
+ if (aChar == '"') {
+ outBuffer.append('\\');
+ }
+ outBuffer.append(aChar);
+ }
+ }
+ }
+ return outBuffer.toString();
+ }
+
+ private static char toHex(int nibble) {
+ return hexDigit[(nibble & 0xF)];
+ }
+
+ private static final char[] hexDigit = {
+ '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
+ };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/CopyFile.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.*;
+import java.net.URI;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Map;
+
+/**
+ * The copy file transform simply copies a matching file from -src to -d .
+ * Such files are typically images, xml documents and other data files.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class CopyFile implements Transformer {
+
+ public void setExtra(String e) {
+ }
+
+ public void setExtra(String[] a) {
+ }
+
+ public boolean transform(Map<String,Set<URI>> pkgSrcs,
+ Set<URI> visibleSrcs,
+ Map<URI,Set<String>> visibleClasses,
+ Map<String,Set<String>> oldPackageDependents,
+ URI destRoot,
+ Map<String,Set<URI>> packageArtifacts,
+ Map<String,Set<String>> packageDependencies,
+ Map<String,String> packagePubapis,
+ int debugLevel,
+ boolean incremental,
+ int numCores,
+ PrintStream out,
+ PrintStream err)
+ {
+ boolean rc = true;
+ String dest_filename;
+ File dest;
+
+ for (String pkgName : pkgSrcs.keySet()) {
+ String pkgNameF = Util.toFileSystemPath(pkgName);
+ for (URI u : pkgSrcs.get(pkgName)) {
+ File src = new File(u);
+ File destDir;
+ destDir = new File(destRoot.getPath()+File.separator+pkgNameF);
+ dest_filename = destRoot.getPath()+File.separator+pkgNameF+File.separator+src.getName();
+ dest = new File(dest_filename);
+
+ if (!destDir.isDirectory()) {
+ if (!destDir.mkdirs()) {
+ Log.error("Error: The copier could not create the directory "+
+ destDir.getPath());
+ return false;
+ }
+ }
+
+ Set<URI> as = packageArtifacts.get(pkgName);
+ if (as == null) {
+ as = new HashSet<URI>();
+ packageArtifacts.put(pkgName, as);
+ }
+ as.add(dest.toURI());
+
+ if (dest.exists() && dest.lastModified() > src.lastModified()) {
+ // A copied file exists, and its timestamp is newer than the source.
+ continue;
+ }
+
+ Log.info("Copying "+pkgNameF+File.separator+src.getName());
+
+ try (InputStream fin = new FileInputStream(src);
+ OutputStream fout = new FileOutputStream(dest)) {
+ byte[] buf = new byte[1024];
+ int len;
+ while ((len = fin.read(buf)) > 0){
+ fout.write(buf, 0, len);
+ }
+ }
+ catch(IOException e){
+ Log.error("Could not copy the file "+src.getPath()+" to "+dest.getPath());
+ rc = false;
+ }
+ }
+ }
+ return rc;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/JavacState.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,857 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.text.SimpleDateFormat;
+import java.net.URI;
+import java.util.*;
+
+/**
+ * The javac state class maintains the previous (prev) and the current (now)
+ * build states and everything else that goes into the javac_state file.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class JavacState
+{
+ // The arguments to the compile. If not identical, then it cannot
+ // be an incremental build!
+ String theArgs;
+ // The number of cores limits how many threads are used for heavy concurrent work.
+ int numCores;
+
+ // The bin_dir/javac_state
+ private String javacStateFilename;
+ private File javacState;
+
+ // The previous build state is loaded from javac_state
+ private BuildState prev;
+ // The current build state is constructed during the build,
+ // then saved as the new javac_state.
+ private BuildState now;
+
+ // Something has changed in the javac_state. It needs to be saved!
+ private boolean needsSaving;
+ // If this is a new javac_state file, then do not print unnecessary messages.
+ private boolean newJavacState;
+
+ // These are packages where something has changed and the package
+ // needs to be recompiled. Actions that trigger recompilation:
+ // * source belonging to the package has changed
+ // * artifact belonging to the package is lost, or its timestamp has been changed.
+ // * an unknown artifact has appeared, we simply delete it, but we also trigger a recompilation.
+ // * a package that is tainted, taints all packages that depend on it.
+ private Set<String> taintedPackages;
+ // After a compile, the pubapis are compared with the pubapis stored in the javac state file.
+ // Any packages where the pubapi differ are added to this set.
+ // Later we use this set and the dependency information to taint dependent packages.
+ private Set<String> packagesWithChangedPublicApis;
+ // When a module-info.java file is changed, taint the module,
+ // then taint all modules that depend on that that module.
+ // A module dependency can occur directly through a require, or
+ // indirectly through a module that does a public export for the first tainted module.
+ // When all modules are tainted, then taint all packages belonging to these modules.
+ // Then rebuild. It is perhaps possible (and valuable?) to do a more finegrained examination of the
+ // change in module-info.java, but that will have to wait.
+ private Set<String> taintedModules;
+ // The set of all packages that has been recompiled.
+ // Copy over the javac_state for the packages that did not need recompilation,
+ // verbatim from the previous (prev) to the new (now) build state.
+ private Set<String> recompiledPackages;
+
+ // The output directories filled with tasty artifacts.
+ private File binDir, gensrcDir, headerDir;
+
+ // The current status of the file system.
+ private Set<File> binArtifacts;
+ private Set<File> gensrcArtifacts;
+ private Set<File> headerArtifacts;
+
+ // The status of the sources.
+ Set<Source> removedSources = null;
+ Set<Source> addedSources = null;
+ Set<Source> modifiedSources = null;
+
+ // Visible sources for linking. These are the only
+ // ones that -sourcepath is allowed to see.
+ Set<URI> visibleSrcs;
+
+ // Visible classes for linking. These are the only
+ // ones that -classpath is allowed to see.
+ // It maps from a classpath root to the set of visible classes for that root.
+ // If the set is empty, then all classes are visible for that root.
+ // It can also map from a jar file to the set of visible classes for that jar file.
+ Map<URI,Set<String>> visibleClasses;
+
+ // Setup two transforms that always exist.
+ private CopyFile copyFiles = new CopyFile();
+ private CompileJavaPackages compileJavaPackages = new CompileJavaPackages();
+
+ // Where to send stdout and stderr.
+ private PrintStream out, err;
+
+ JavacState(String[] args, File bd, File gd, File hd, boolean permitUnidentifiedArtifacts, boolean removeJavacState,
+ PrintStream o, PrintStream e) {
+ out = o;
+ err = e;
+ numCores = Main.findNumberOption(args, "-j");
+ theArgs = "";
+ for (String a : removeArgsNotAffectingState(args)) {
+ theArgs = theArgs+a+" ";
+ }
+ binDir = bd;
+ gensrcDir = gd;
+ headerDir = hd;
+ javacStateFilename = binDir.getPath()+File.separator+"javac_state";
+ javacState = new File(javacStateFilename);
+ if (removeJavacState && javacState.exists()) {
+ javacState.delete();
+ }
+ newJavacState = false;
+ if (!javacState.exists()) {
+ newJavacState = true;
+ // If there is no javac_state then delete the contents of all the artifact dirs!
+ // We do not want to risk building a broken incremental build.
+ // BUT since the makefiles still copy things straight into the bin_dir et al,
+ // we avoid deleting files here, if the option --permit-unidentified-classes was supplied.
+ if (!permitUnidentifiedArtifacts) {
+ deleteContents(binDir);
+ deleteContents(gensrcDir);
+ deleteContents(headerDir);
+ }
+ needsSaving = true;
+ }
+ prev = new BuildState();
+ now = new BuildState();
+ taintedPackages = new HashSet<String>();
+ recompiledPackages = new HashSet<String>();
+ packagesWithChangedPublicApis = new HashSet<String>();
+ }
+
+ public BuildState prev() { return prev; }
+ public BuildState now() { return now; }
+
+ /**
+ * Remove args not affecting the state.
+ */
+ static String[] removeArgsNotAffectingState(String[] args) {
+ String[] out = new String[args.length];
+ int j = 0;
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals("-j")) {
+ // Just skip it and skip following value
+ i++;
+ } else if (args[i].startsWith("--server:")) {
+ // Just skip it.
+ } else if (args[i].startsWith("--log=")) {
+ // Just skip it.
+ } else if (args[i].equals("--compare-found-sources")) {
+ // Just skip it and skip verify file name
+ i++;
+ } else {
+ // Copy argument.
+ out[j] = args[i];
+ j++;
+ }
+ }
+ String[] ret = new String[j];
+ System.arraycopy(out, 0, ret, 0, j);
+ return ret;
+ }
+
+ /**
+ * Specify which sources are visible to the compiler through -sourcepath.
+ */
+ public void setVisibleSources(Map<String,Source> vs) {
+ visibleSrcs = new HashSet<URI>();
+ for (String s : vs.keySet()) {
+ Source src = vs.get(s);
+ visibleSrcs.add(src.file().toURI());
+ }
+ }
+
+ /**
+ * Specify which classes are visible to the compiler through -classpath.
+ */
+ public void setVisibleClasses(Map<String,Source> vs) {
+ visibleSrcs = new HashSet<URI>();
+ for (String s : vs.keySet()) {
+ Source src = vs.get(s);
+ visibleSrcs.add(src.file().toURI());
+ }
+ }
+ /**
+ * Returns true if this is an incremental build.
+ */
+ public boolean isIncremental() {
+ return !prev.sources().isEmpty();
+ }
+
+ /**
+ * Find all artifacts that exists on disk.
+ */
+ public void findAllArtifacts() {
+ binArtifacts = findAllFiles(binDir);
+ gensrcArtifacts = findAllFiles(gensrcDir);
+ headerArtifacts = findAllFiles(headerDir);
+ }
+
+ /**
+ * Lookup the artifacts generated for this package in the previous build.
+ */
+ private Map<String,File> fetchPrevArtifacts(String pkg) {
+ Package p = prev.packages().get(pkg);
+ if (p != null) {
+ return p.artifacts();
+ }
+ return new HashMap<String,File>();
+ }
+
+ /**
+ * Delete all prev artifacts in the currently tainted packages.
+ */
+ public void deleteClassArtifactsInTaintedPackages() {
+ for (String pkg : taintedPackages) {
+ Map<String,File> arts = fetchPrevArtifacts(pkg);
+ for (File f : arts.values()) {
+ if (f.exists() && f.getName().endsWith(".class")) {
+ f.delete();
+ }
+ }
+ }
+ }
+
+ /**
+ * Mark the javac_state file to be in need of saving and as a side effect,
+ * it gets a new timestamp.
+ */
+ private void needsSaving() {
+ needsSaving = true;
+ }
+
+ /**
+ * Save the javac_state file.
+ */
+ public void save() throws IOException {
+ if (!needsSaving) return;
+ try (FileWriter out = new FileWriter(javacStateFilename)) {
+ StringBuilder b = new StringBuilder();
+ long millisNow = System.currentTimeMillis();
+ Date d = new Date(millisNow);
+ SimpleDateFormat df =
+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS");
+ b.append("# javac_state ver 0.3 generated "+millisNow+" "+df.format(d)+"\n");
+ b.append("# This format might change at any time. Please do not depend on it.\n");
+ b.append("# M module\n");
+ b.append("# P package\n");
+ b.append("# S C source_tobe_compiled timestamp\n");
+ b.append("# S L link_only_source timestamp\n");
+ b.append("# G C generated_source timestamp\n");
+ b.append("# A artifact timestamp\n");
+ b.append("# D dependency\n");
+ b.append("# I pubapi\n");
+ b.append("# R arguments\n");
+ b.append("R ").append(theArgs).append("\n");
+
+ // Copy over the javac_state for the packages that did not need recompilation.
+ now.copyPackagesExcept(prev, recompiledPackages, new HashSet<String>());
+ // Save the packages, ie package names, dependencies, pubapis and artifacts!
+ // I.e. the lot.
+ Module.saveModules(now.modules(), b);
+
+ String s = b.toString();
+ out.write(s, 0, s.length());
+ }
+ }
+
+ /**
+ * Load a javac_state file.
+ */
+ public static JavacState load(String[] args, File binDir, File gensrcDir, File headerDir,
+ boolean permitUnidentifiedArtifacts, PrintStream out, PrintStream err) {
+ JavacState db = new JavacState(args, binDir, gensrcDir, headerDir, permitUnidentifiedArtifacts, false, out, err);
+ Module lastModule = null;
+ Package lastPackage = null;
+ Source lastSource = null;
+ boolean noFileFound = false;
+ boolean foundCorrectVerNr = false;
+ boolean newCommandLine = false;
+ boolean syntaxError = false;
+
+ try (BufferedReader in = new BufferedReader(new FileReader(db.javacStateFilename))) {
+ for (;;) {
+ String l = in.readLine();
+ if (l==null) break;
+ if (l.length()>=3 && l.charAt(1) == ' ') {
+ char c = l.charAt(0);
+ if (c == 'M') {
+ lastModule = db.prev.loadModule(l);
+ } else
+ if (c == 'P') {
+ if (lastModule == null) { syntaxError = true; break; }
+ lastPackage = db.prev.loadPackage(lastModule, l);
+ } else
+ if (c == 'D') {
+ if (lastModule == null || lastPackage == null) { syntaxError = true; break; }
+ lastPackage.loadDependency(l);
+ } else
+ if (c == 'I') {
+ if (lastModule == null || lastPackage == null) { syntaxError = true; break; }
+ lastPackage.loadPubapi(l);
+ } else
+ if (c == 'A') {
+ if (lastModule == null || lastPackage == null) { syntaxError = true; break; }
+ lastPackage.loadArtifact(l);
+ } else
+ if (c == 'S') {
+ if (lastModule == null || lastPackage == null) { syntaxError = true; break; }
+ lastSource = db.prev.loadSource(lastPackage, l, false);
+ } else
+ if (c == 'G') {
+ if (lastModule == null || lastPackage == null) { syntaxError = true; break; }
+ lastSource = db.prev.loadSource(lastPackage, l, true);
+ } else
+ if (c == 'R') {
+ String ncmdl = "R "+db.theArgs;
+ if (!l.equals(ncmdl)) {
+ newCommandLine = true;
+ }
+ } else
+ if (c == '#') {
+ if (l.startsWith("# javac_state ver ")) {
+ int sp = l.indexOf(" ", 18);
+ if (sp != -1) {
+ String ver = l.substring(18,sp);
+ if (!ver.equals("0.3")) {
+ break;
+ }
+ foundCorrectVerNr = true;
+ }
+ }
+ }
+ }
+ }
+ } catch (FileNotFoundException e) {
+ // Silently create a new javac_state file.
+ noFileFound = true;
+ } catch (IOException e) {
+ Log.info("Dropping old javac_state because of errors when reading it.");
+ db = new JavacState(args, binDir, gensrcDir, headerDir, permitUnidentifiedArtifacts, true, out, err);
+ foundCorrectVerNr = true;
+ newCommandLine = false;
+ syntaxError = false;
+ }
+ if (foundCorrectVerNr == false && !noFileFound) {
+ Log.info("Dropping old javac_state since it is of an old version.");
+ db = new JavacState(args, binDir, gensrcDir, headerDir, permitUnidentifiedArtifacts, true, out, err);
+ } else
+ if (newCommandLine == true && !noFileFound) {
+ Log.info("Dropping old javac_state since a new command line is used!");
+ db = new JavacState(args, binDir, gensrcDir, headerDir, permitUnidentifiedArtifacts, true, out, err);
+ } else
+ if (syntaxError == true) {
+ Log.info("Dropping old javac_state since it contains syntax errors.");
+ db = new JavacState(args, binDir, gensrcDir, headerDir, permitUnidentifiedArtifacts, true, out, err);
+ }
+ db.prev.calculateDependents();
+ return db;
+ }
+
+ /**
+ * Mark a java package as tainted, ie it needs recompilation.
+ */
+ public void taintPackage(String name, String because) {
+ if (!taintedPackages.contains(name)) {
+ if (because != null) Log.debug("Tainting "+Util.justPackageName(name)+" because "+because);
+ // It has not been tainted before.
+ taintedPackages.add(name);
+ needsSaving();
+ Package nowp = now.packages().get(name);
+ if (nowp != null) {
+ for (String d : nowp.dependents()) {
+ taintPackage(d, because);
+ }
+ }
+ }
+ }
+
+ /**
+ * This packages need recompilation.
+ */
+ public Set<String> taintedPackages() {
+ return taintedPackages;
+ }
+
+ /**
+ * Clean out the tainted package set, used after the first round of compiles,
+ * prior to propagating dependencies.
+ */
+ public void clearTaintedPackages() {
+ taintedPackages = new HashSet<String>();
+ }
+
+ /**
+ * Go through all sources and check which have been removed, added or modified
+ * and taint the corresponding packages.
+ */
+ public void checkSourceStatus(boolean check_gensrc) {
+ removedSources = calculateRemovedSources();
+ for (Source s : removedSources) {
+ if (!s.isGenerated() || check_gensrc) {
+ taintPackage(s.pkg().name(), "source "+s.name()+" was removed");
+ }
+ }
+
+ addedSources = calculateAddedSources();
+ for (Source s : addedSources) {
+ String msg = null;
+ if (isIncremental()) {
+ // When building from scratch, there is no point
+ // printing "was added" for every file since all files are added.
+ // However for an incremental build it makes sense.
+ msg = "source "+s.name()+" was added";
+ }
+ if (!s.isGenerated() || check_gensrc) {
+ taintPackage(s.pkg().name(), msg);
+ }
+ }
+
+ modifiedSources = calculateModifiedSources();
+ for (Source s : modifiedSources) {
+ if (!s.isGenerated() || check_gensrc) {
+ taintPackage(s.pkg().name(), "source "+s.name()+" was modified");
+ }
+ }
+ }
+
+ /**
+ * Acquire the compile_java_packages suffix rule for .java files.
+ */
+ public Map<String,Transformer> getJavaSuffixRule() {
+ Map<String,Transformer> sr = new HashMap<String,Transformer>();
+ sr.put(".java", compileJavaPackages);
+ return sr;
+ }
+
+ /**
+ * Acquire the copying transform.
+ */
+ public Transformer getCopier() {
+ return copyFiles;
+ }
+
+ /**
+ * If artifacts have gone missing, force a recompile of the packages
+ * they belong to.
+ */
+ public void taintPackagesThatMissArtifacts() {
+ for (Package pkg : prev.packages().values()) {
+ for (File f : pkg.artifacts().values()) {
+ if (!f.exists()) {
+ // Hmm, the artifact on disk does not exist! Someone has removed it....
+ // Lets rebuild the package.
+ taintPackage(pkg.name(), ""+f+" is missing.");
+ }
+ }
+ }
+ }
+
+ /**
+ * Propagate recompilation through the dependency chains.
+ * Avoid re-tainting packages that have already been compiled.
+ */
+ public void taintPackagesDependingOnChangedPackages(Set<String> pkgs, Set<String> recentlyCompiled) {
+ for (Package pkg : prev.packages().values()) {
+ for (String dep : pkg.dependencies()) {
+ if (pkgs.contains(dep) && !recentlyCompiled.contains(pkg.name())) {
+ taintPackage(pkg.name(), " its depending on "+dep);
+ }
+ }
+ }
+ }
+
+ /**
+ * Scan all output dirs for artifacts and remove those files (artifacts?)
+ * that are not recognized as such, in the javac_state file.
+ */
+ public void removeUnidentifiedArtifacts() {
+ Set<File> allKnownArtifacts = new HashSet<File>();
+ for (Package pkg : prev.packages().values()) {
+ for (File f : pkg.artifacts().values()) {
+ allKnownArtifacts.add(f);
+ }
+ }
+ // Do not forget about javac_state....
+ allKnownArtifacts.add(javacState);
+
+ for (File f : binArtifacts) {
+ if (!allKnownArtifacts.contains(f)) {
+ Log.debug("Removing "+f.getPath()+" since it is unknown to the javac_state.");
+ f.delete();
+ }
+ }
+ for (File f : headerArtifacts) {
+ if (!allKnownArtifacts.contains(f)) {
+ Log.debug("Removing "+f.getPath()+" since it is unknown to the javac_state.");
+ f.delete();
+ }
+ }
+ for (File f : gensrcArtifacts) {
+ if (!allKnownArtifacts.contains(f)) {
+ Log.debug("Removing "+f.getPath()+" since it is unknown to the javac_state.");
+ f.delete();
+ }
+ }
+ }
+
+ /**
+ * Remove artifacts that are no longer produced when compiling!
+ */
+ public void removeSuperfluousArtifacts(Set<String> recentlyCompiled) {
+ // Nothing to do, if nothing was recompiled.
+ if (recentlyCompiled.size() == 0) return;
+
+ for (String pkg : now.packages().keySet()) {
+ // If this package has not been recompiled, skip the check.
+ if (!recentlyCompiled.contains(pkg)) continue;
+ Collection<File> arts = now.artifacts().values();
+ for (File f : fetchPrevArtifacts(pkg).values()) {
+ if (!arts.contains(f)) {
+ Log.debug("Removing "+f.getPath()+" since it is now superfluous!");
+ if (f.exists()) f.delete();
+ }
+ }
+ }
+ }
+
+ /**
+ * Return those files belonging to prev, but not now.
+ */
+ private Set<Source> calculateRemovedSources() {
+ Set<Source> removed = new HashSet<Source>();
+ for (String src : prev.sources().keySet()) {
+ if (now.sources().get(src) == null) {
+ removed.add(prev.sources().get(src));
+ }
+ }
+ return removed;
+ }
+
+ /**
+ * Return those files belonging to now, but not prev.
+ */
+ private Set<Source> calculateAddedSources() {
+ Set<Source> added = new HashSet<Source>();
+ for (String src : now.sources().keySet()) {
+ if (prev.sources().get(src) == null) {
+ added.add(now.sources().get(src));
+ }
+ }
+ return added;
+ }
+
+ /**
+ * Return those files where the timestamp is newer.
+ * If a source file timestamp suddenly is older than what is known
+ * about it in javac_state, then consider it modified, but print
+ * a warning!
+ */
+ private Set<Source> calculateModifiedSources() {
+ Set<Source> modified = new HashSet<Source>();
+ for (String src : now.sources().keySet()) {
+ Source n = now.sources().get(src);
+ Source t = prev.sources().get(src);
+ if (prev.sources().get(src) != null) {
+ if (t != null) {
+ if (n.lastModified() > t.lastModified()) {
+ modified.add(n);
+ } else if (n.lastModified() < t.lastModified()) {
+ modified.add(n);
+ Log.warn("The source file "+n.name()+" timestamp has moved backwards in time.");
+ }
+ }
+ }
+ }
+ return modified;
+ }
+
+ /**
+ * Recursively delete a directory and all its contents.
+ */
+ private static void deleteContents(File dir) {
+ if (dir != null && dir.exists()) {
+ for (File f : dir.listFiles()) {
+ if (f.isDirectory()) {
+ deleteContents(f);
+ }
+ f.delete();
+ }
+ }
+ }
+
+ /**
+ * Run the copy translator only.
+ */
+ public void performCopying(File binDir, Map<String,Transformer> suffixRules) {
+ Map<String,Transformer> sr = new HashMap<String,Transformer>();
+ for (Map.Entry<String,Transformer> e : suffixRules.entrySet()) {
+ if (e.getValue() == copyFiles) {
+ sr.put(e.getKey(), e.getValue());
+ }
+ }
+ perform(binDir, sr);
+ }
+
+ /**
+ * Run all the translators that translate into java source code.
+ * I.e. all translators that are not copy nor compile_java_source.
+ */
+ public void performTranslation(File gensrcDir, Map<String,Transformer> suffixRules) {
+ Map<String,Transformer> sr = new HashMap<String,Transformer>();
+ for (Map.Entry<String,Transformer> e : suffixRules.entrySet()) {
+ if (e.getValue() != copyFiles &&
+ e.getValue() != compileJavaPackages) {
+ sr.put(e.getKey(), e.getValue());
+ }
+ }
+ perform(gensrcDir, sr);
+ }
+
+ /**
+ * Compile all the java sources. Return true, if it needs to be called again!
+ */
+ public boolean performJavaCompilations(File binDir,
+ String serverSettings,
+ String[] args,
+ Set<String> recentlyCompiled,
+ boolean[] rcValue) {
+ Map<String,Transformer> suffixRules = new HashMap<String,Transformer>();
+ suffixRules.put(".java", compileJavaPackages);
+ compileJavaPackages.setExtra(serverSettings);
+ compileJavaPackages.setExtra(args);
+
+ rcValue[0] = perform(binDir, suffixRules);
+ recentlyCompiled.addAll(taintedPackages());
+ clearTaintedPackages();
+ boolean again = !packagesWithChangedPublicApis.isEmpty();
+ taintPackagesDependingOnChangedPackages(packagesWithChangedPublicApis, recentlyCompiled);
+ packagesWithChangedPublicApis = new HashSet<String>();
+ return again && rcValue[0];
+ }
+
+ /**
+ * Store the source into the set of sources belonging to the given transform.
+ */
+ private void addFileToTransform(Map<Transformer,Map<String,Set<URI>>> gs, Transformer t, Source s) {
+ Map<String,Set<URI>> fs = gs.get(t);
+ if (fs == null) {
+ fs = new HashMap<String,Set<URI>>();
+ gs.put(t, fs);
+ }
+ Set<URI> ss = fs.get(s.pkg().name());
+ if (ss == null) {
+ ss = new HashSet<URI>();
+ fs.put(s.pkg().name(), ss);
+ }
+ ss.add(s.file().toURI());
+ }
+
+ /**
+ * For all packages, find all sources belonging to the package, group the sources
+ * based on their transformers and apply the transformers on each source code group.
+ */
+ private boolean perform(File outputDir, Map<String,Transformer> suffixRules)
+ {
+ boolean rc = true;
+ // Group sources based on transforms. A source file can only belong to a single transform.
+ Map<Transformer,Map<String,Set<URI>>> groupedSources = new HashMap<Transformer,Map<String,Set<URI>>>();
+ for (Source src : now.sources().values()) {
+ Transformer t = suffixRules.get(src.suffix());
+ if (t != null) {
+ if (taintedPackages.contains(src.pkg().name()) && !src.isLinkedOnly()) {
+ addFileToTransform(groupedSources, t, src);
+ }
+ }
+ }
+ // Go through the transforms and transform them.
+ for (Map.Entry<Transformer,Map<String,Set<URI>>> e : groupedSources.entrySet()) {
+ Transformer t = e.getKey();
+ Map<String,Set<URI>> srcs = e.getValue();
+ // These maps need to be synchronized since multiple threads will be writing results into them.
+ Map<String,Set<URI>> packageArtifacts = Collections.synchronizedMap(new HashMap<String,Set<URI>>());
+ Map<String,Set<String>> packageDependencies = Collections.synchronizedMap(new HashMap<String,Set<String>>());
+ Map<String,String> packagePublicApis = Collections.synchronizedMap(new HashMap<String,String>());
+
+ boolean r = t.transform(srcs,
+ visibleSrcs,
+ visibleClasses,
+ prev.dependents(),
+ outputDir.toURI(),
+ packageArtifacts,
+ packageDependencies,
+ packagePublicApis,
+ 0,
+ isIncremental(),
+ numCores,
+ out,
+ err);
+ if (!r) rc = false;
+
+ for (String p : srcs.keySet()) {
+ recompiledPackages.add(p);
+ }
+ // The transform is done! Extract all the artifacts and store the info into the Package objects.
+ for (Map.Entry<String,Set<URI>> a : packageArtifacts.entrySet()) {
+ Module mnow = now.findModuleFromPackageName(a.getKey());
+ mnow.addArtifacts(a.getKey(), a.getValue());
+ }
+ // Extract all the dependencies and store the info into the Package objects.
+ for (Map.Entry<String,Set<String>> a : packageDependencies.entrySet()) {
+ Set<String> deps = a.getValue();
+ Module mnow = now.findModuleFromPackageName(a.getKey());
+ mnow.setDependencies(a.getKey(), deps);
+ }
+ // Extract all the pubapis and store the info into the Package objects.
+ for (Map.Entry<String,String> a : packagePublicApis.entrySet()) {
+ Module mprev = prev.findModuleFromPackageName(a.getKey());
+ List<String> pubapi = Package.pubapiToList(a.getValue());
+ Module mnow = now.findModuleFromPackageName(a.getKey());
+ mnow.setPubapi(a.getKey(), pubapi);
+ if (mprev.hasPubapiChanged(a.getKey(), pubapi)) {
+ // Aha! The pubapi of this package has changed!
+ // It can also be a new compile from scratch.
+ if (mprev.lookupPackage(a.getKey()).existsInJavacState()) {
+ // This is an incremental compile! The pubapi
+ // did change. Trigger recompilation of dependents.
+ packagesWithChangedPublicApis.add(a.getKey());
+ Log.info("The pubapi of "+Util.justPackageName(a.getKey())+" has changed!");
+ }
+ }
+ }
+ }
+ return rc;
+ }
+
+ /**
+ * Utility method to recursively find all files below a directory.
+ */
+ private static Set<File> findAllFiles(File dir) {
+ Set<File> foundFiles = new HashSet<File>();
+ if (dir == null) {
+ return foundFiles;
+ }
+ recurse(dir, foundFiles);
+ return foundFiles;
+ }
+
+ private static void recurse(File dir, Set<File> foundFiles) {
+ for (File f : dir.listFiles()) {
+ if (f.isFile()) {
+ foundFiles.add(f);
+ } else if (f.isDirectory()) {
+ recurse(f, foundFiles);
+ }
+ }
+ }
+
+ /**
+ * Compare the calculate source list, with an explicit list, usually supplied from the makefile.
+ * Used to detect bugs where the makefile and sjavac have different opinions on which files
+ * should be compiled.
+ */
+ public void compareWithMakefileList(File makefileSourceList)
+ throws ProblemException
+ {
+ // If we are building on win32 using for example cygwin the paths in the makefile source list
+ // might be /cygdrive/c/.... which does not match c:\....
+ // We need to adjust our calculated sources to be identical, if necessary.
+ boolean mightNeedRewriting = File.pathSeparatorChar == ';';
+
+ if (makefileSourceList == null) return;
+
+ Set<String> calculatedSources = new HashSet<String>();
+ Set<String> listedSources = new HashSet<String>();
+
+ // Create a set of filenames with full paths.
+ for (Source s : now.sources().values()) {
+ calculatedSources.add(s.file().getPath());
+ }
+ // Read in the file and create another set of filenames with full paths.
+ try {
+ BufferedReader in = new BufferedReader(new FileReader(makefileSourceList));
+ for (;;) {
+ String l = in.readLine();
+ if (l==null) break;
+ l = l.trim();
+ if (mightNeedRewriting) {
+ if (l.indexOf(":") == 1 && l.indexOf("\\") == 2) {
+ // Everything a-ok, the format is already C:\foo\bar
+ } else if (l.indexOf(":") == 1 && l.indexOf("/") == 2) {
+ // The format is C:/foo/bar, rewrite into the above format.
+ l = l.replaceAll("/","\\\\");
+ } else if (l.charAt(0) == '/' && l.indexOf("/",1) != -1) {
+ // The format might be: /cygdrive/c/foo/bar, rewrite into the above format.
+ // Do not hardcode the name cygdrive here.
+ int slash = l.indexOf("/",1);
+ l = l.replaceAll("/","\\\\");
+ l = ""+l.charAt(slash+1)+":"+l.substring(slash+2);
+ }
+ if (Character.isLowerCase(l.charAt(0))) {
+ l = Character.toUpperCase(l.charAt(0))+l.substring(1);
+ }
+ }
+ listedSources.add(l);
+ }
+ } catch (FileNotFoundException e) {
+ throw new ProblemException("Could not open "+makefileSourceList.getPath()+" since it does not exist!");
+ } catch (IOException e) {
+ throw new ProblemException("Could not read "+makefileSourceList.getPath());
+ }
+
+ for (String s : listedSources) {
+ if (!calculatedSources.contains(s)) {
+ throw new ProblemException("The makefile listed source "+s+" was not calculated by the smart javac wrapper!");
+ }
+ }
+
+ for (String s : calculatedSources) {
+ if (!listedSources.contains(s)) {
+ throw new ProblemException("The smart javac wrapper calculated source "+s+" was not listed by the makefiles!");
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Log.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.PrintStream;
+
+/**
+ * Utility class only for sjavac logging.
+ * The log level can be set using for example --log=DEBUG on the sjavac command line.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class Log {
+ private static PrintStream out, err;
+
+ public final static int WARN = 1;
+ public final static int INFO = 2;
+ public final static int DEBUG = 3;
+ public final static int TRACE = 4;
+ private static int level = WARN;
+
+ static public void trace(String msg) {
+ if (level >= TRACE) {
+ out.println(msg);
+ }
+ }
+
+ static public void debug(String msg) {
+ if (level >= DEBUG) {
+ out.println(msg);
+ }
+ }
+
+ static public void info(String msg) {
+ if (level >= INFO) {
+ out.println(msg);
+ }
+ }
+
+ static public void warn(String msg) {
+ err.println(msg);
+ }
+
+ static public void error(String msg) {
+ err.println(msg);
+ }
+
+ static public void setLogLevel(String l, PrintStream o, PrintStream e)
+ throws ProblemException {
+ out = o;
+ err = e;
+ if (l.equals("warn")) level = WARN;
+ else if (l.equals("info")) level = INFO;
+ else if (l.equals("debug")) level = DEBUG;
+ else if (l.equals("trace")) level = TRACE;
+ else throw new ProblemException("No such log level \""+l+"\"");
+ }
+
+ static public boolean isTracing() {
+ return level >= TRACE;
+ }
+
+ static public boolean isDebugging() {
+ return level >= DEBUG;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Main.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,969 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import com.sun.tools.sjavac.server.JavacServer;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.*;
+
+/**
+ * The main class of the smart javac wrapper tool.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class Main {
+
+ /* This is a smart javac wrapper primarily used when building the OpenJDK,
+ though other projects are welcome to use it too. But please be aware
+ that it is not an official api and will change in the future.
+ (We really mean it!)
+
+ Goals:
+
+ ** Create a state file, containing information about the build, so
+ that incremental builds only rebuild what is necessary. Also the
+ state file can be used by make/ant to detect when to trigger
+ a call to the smart javac wrapper.
+
+ This file is called bin/javac_state (assuming that you specified "-d bin")
+ Thus the simplest makefile is:
+
+ SJAVAC=java -cp .../tools.jar com.sun.tools.sjavac.Main
+ SRCS=$(shell find src -name "*.java")
+ bin/javac_state : $(SRCS)
+ $(SJAVAC) src -d bin
+
+ This makefile will run very fast and detect properly when Java code needs to
+ be recompiled. The smart javac wrapper will then use the information in java_state
+ to do an efficient incremental compile.
+
+ Previously it was near enough impossible to write an efficient makefile for Java
+ with support for incremental builds and dependency tracking.
+
+ ** Separate java sources to be compiled from java
+ sources used >only< for linking. The options:
+
+ "dir" points to root dir with sources to be compiled
+ "-sourcepath dir" points to root dir with sources used only for linking
+ "-classpath dir" points to dir with classes used only for linking (as before)
+
+ ** Use all cores for compilation by default.
+ "-j 4" limit the number of cores to 4.
+ For the moment, the sjavac server additionally limits the number of cores to three.
+ This will improve in the future when more sharing is performed between concurrent JavaCompilers.
+
+ ** Basic translation support from other sources to java, and then compilation of the generated java.
+ This functionality might be moved into annotation processors instead.
+ Again this is driven by the OpenJDK sources where properties and a few other types of files
+ are converted into Java sources regularily. The javac_state embraces copy and tr, and perform
+ incremental recompiles and copying for these as well. META-INF will be a special copy rule
+ that will copy any files found below any META-INF dir in src to the bin/META-INF dir.
+ "-copy .gif"
+ "-copy META-INF"
+ "-tr .prop=com.sun.tools.javac.smart.CompileProperties
+ "-tr .propp=com.sun.tools.javac.smart.CompileProperties,java.util.ListResourceBundle
+ "-tr .proppp=com.sun.tools.javac.smart.CompileProperties,sun.util.resources.LocaleNamesBundle
+
+ ** Control which classes in the src,sourcepath and classpath that javac is allowed to see.
+ Again, this is necessary to deal with the source code structure of the OpenJDK which is
+ intricate (read messy).
+
+ "-i tools.*" to include the tools package and all its subpackages in the build.
+ "-x tools.net.aviancarrier.*" to exclude the aviancarrier package and all its sources and subpackages.
+ "-x tools.net.drums" to exclude the drums package only, keep its subpackages.
+ "-xf tools/net/Bar.java" // Do not compile this file...
+ "-xf *Bor.java" // Do not compile Bor.java wherever it is found, BUT do compile ABor.java!
+ "-if tools/net/Bor.java" // Only compile this file...odd, but sometimes used.
+
+ ** The smart javac wrapper is driven by the modification time on the source files and compared
+ to the modification times written into the javac_state file.
+
+ It does not compare the modification time of the source with the modification time of the artifact.
+ However it will detect if the modification time of an artifact has changed compared to the java_state,
+ and this will trigger a delete of the artifact and a subsequent recompile of the source.
+
+ The smart javac wrapper is not a generic makefile/ant system. Its purpose is to compile java source
+ as the final step before the output dir is finalized and immediately jared, or jmodded. The output
+ dir should be considered opaque. Do not write into the outputdir yourself!
+ Any artifacts found in the outputdir that javac_state does not know of, will be deleted!
+ This can however be prevented, using the switch --permit-unidentified-artifacts
+ This switch is necessary when build the OpenJDK because its makefiles still write directly to
+ the output classes dirs.
+
+ Any makefile/ant rules that want to put contents into the outputdir should put the content
+ in one of several source roots. Static content that is under version control, can be put in the same source
+ code tree as the Java sources. Dynamic content that is generated by make/ant on the fly, should
+ be put in a separate gensrc_stuff root. The smart javac wrapper call will then take the arguments:
+ "gensrc_stuff src -d bin"
+
+ The command line:
+ java -cp tools.jar com.sun.tools.sjavac.Main \
+ -i "com.bar.*" -x "com.bar.foo.*" \
+ first_root \
+ -i "com.bar.foo.*" \
+ second_root \
+ -x "org.net.*" \
+ -sourcepath link_root_sources \
+ -classpath link_root_classes \
+ -d bin
+
+ Will compile all sources for package com.bar and its subpackages, found below first_root,
+ except the package com.bar.foo (and its subpackages), for which the sources are picked
+ from second_root instead. It will link against classes in link_root_classes and against
+ sources in link_root_sources, but will not see (try to link against) sources matching org.net.*
+ but will link against org.net* classes (if they exist) in link_root_classes.
+
+ (If you want a set of complex filter rules to be applied to several source directories, without
+ having to repeat the the filter rules for each root. You can use the explicit -src option. For example:
+ sjavac -x "com.foo.*" -src root1:root2:root3 )
+
+ The resulting classes are written into bin.
+ */
+
+ // This is the final destination for classes and copied files.
+ private File bin_dir;
+ // This is where the annotation process will put generated sources.
+ private File gensrc_dir;
+ // This is where javac -h puts the generated c-header files.
+ private File header_dir;
+
+ // This file contains the list of sources genereated by the makefile.
+ // We double check that our calculated list of sources matches this list,
+ // if not, then we terminate with an error!
+ private File makefile_source_list;
+ // The challenging task to manage an incremental build is done by javac_state.
+ private JavacState javac_state;
+
+ // The suffix rules tells you for example, that .java files should be compiled,
+ // and .html files should be copied and .properties files be translated.
+ Map<String,Transformer> suffix_rules;
+
+ public static void main(String... args) {
+ if (args.length > 0 && args[0].startsWith("--startserver:")) {
+ if (args.length>1) {
+ Log.error("When spawning a background server, only a single --startserver argument is allowed.");
+ return;
+ }
+ // Spawn a background server.
+ int rc = JavacServer.startServer(args[0], System.err);
+ System.exit(rc);
+ }
+ Main main = new Main();
+ int rc = main.go(args, System.out, System.err);
+ // Remove the portfile, but only if this background=false was used.
+ JavacServer.cleanup(args);
+ System.exit(rc);
+ }
+
+ private void printHelp() {
+ System.out.println("Usage: sjavac <options>\n"+
+ "where required options are:\n"+
+ "dir Compile all sources in dir recursively\n"+
+ "-d dir Store generated classes here and the javac_state file\n"+
+ "--server:portfile=/tmp/abc Use a background sjavac server\n\n"+
+ "All other arguments as javac, except -implicit:none which is forced by default.\n"+
+ "No java source files can be supplied on the command line, nor can an @file be supplied.\n\n"+
+ "Warning!\n"+
+ "This tool might disappear at any time, and its command line options might change at any time!");
+ }
+
+ public int go(String[] args, PrintStream out, PrintStream err) {
+ try {
+ if (args.length == 0 || findJavaSourceFiles(args) || findAtFile(args) || null==Util.findServerSettings(args)) {
+ printHelp();
+ return 0;
+ }
+
+ Log.setLogLevel(findLogLevel(args), out, err);
+ String server_settings = Util.findServerSettings(args);
+ args = verifyImplicitOption(args);
+ // Find the source root directories, and add the -src option before these, if not there already.
+ args = addSrcBeforeDirectories(args);
+ // Check that there is at least one -src supplied.
+ checkSrcOption(args);
+ // Check that there is one -d supplied.
+ bin_dir = findDirectoryOption(args,"-d","output", true, false, true);
+ gensrc_dir = findDirectoryOption(args,"-s","gensrc", false, false, true);
+ header_dir = findDirectoryOption(args,"-h","headers", false, false, true);
+ makefile_source_list = findFileOption(args,"--compare-found-sources","makefile source list", false);
+
+ // Load the prev build state database.
+ javac_state = JavacState.load(args, bin_dir, gensrc_dir, header_dir,
+ findBooleanOption(args, "--permit-unidentified-artifacts"), out, err);
+
+ // Setup the suffix rules from the command line.
+ suffix_rules = javac_state.getJavaSuffixRule();
+ findTranslateOptions(args, suffix_rules);
+ if (suffix_rules.keySet().size() > 1 && gensrc_dir == null) {
+ Log.error("You have translators but no gensrc dir (-s) specified!");
+ return -1;
+ }
+ findCopyOptions(args, suffix_rules);
+
+ // All found modules are put here.
+ Map<String,Module> modules = new HashMap<String,Module>();
+ // We start out in the legacy empty no-name module.
+ // As soon as we stumble on a module-info.java file we change to that module.
+ Module current_module = new Module("", "");
+ modules.put("", current_module);
+
+ // Find all sources, use the suffix rules to know which files are sources.
+ Map<String,Source> sources = new HashMap<String,Source>();
+ // Find the files, this will automatically populate the found modules
+ // with found packages where the sources are found!
+ findFiles(args, "-src", suffix_rules.keySet(), sources, modules, current_module, false);
+
+ if (sources.isEmpty()) {
+ Log.error("Found nothing to compile!");
+ return -1;
+ }
+
+ // Find all source files allowable for linking.
+ // We might find more modules here as well.
+ Map<String,Source> sources_to_link_to = new HashMap<String,Source>();
+ // Always reuse -src for linking as well! This means that we might
+ // get two -sourcepath on the commandline after the rewrite, which is
+ // fine. We can have as many as we like. You need to have separate -src/-sourcepath/-classpath
+ // if you need different filtering rules for different roots. If you have the same filtering
+ // rules for all sourcepath roots, you can concatenate them using :(;) as before.
+ rewriteOptions(args, "-src", "-sourcepath");
+ findFiles(args, "-sourcepath", Util.set(".java"), sources_to_link_to, modules, current_module, true);
+
+ // Find all class files allowable for linking.
+ // And pickup knowledge of all modules found here.
+ // This cannot currently filter classes inside jar files.
+ Map<String,Source> classes_to_link_to = new HashMap<String,Source>();
+// findFiles(args, "-classpath", Util.set(".class"), classes_to_link_to, modules, current_module, true);
+
+ // Find all module sources allowable for linking.
+ Map<String,Source> modules_to_link_to = new HashMap<String,Source>();
+ // findFiles(args, "-modulepath", Util.set(".class"), modules_to_link_to, modules, current_module, true);
+
+ // Add the set of sources to the build database.
+ javac_state.now().collectPackagesSourcesAndArtifacts(modules);
+ javac_state.now().checkInternalState("checking sources", false, sources);
+ javac_state.now().checkInternalState("checking linked sources", true, sources_to_link_to);
+ javac_state.setVisibleSources(sources_to_link_to);
+
+ // If there is any change in the source files, taint packages
+ // and mark the database in need of saving.
+ javac_state.checkSourceStatus(false);
+
+ // Find all existing artifacts. Their timestamp will match the last modified timestamps stored
+ // in javac_state, simply because loading of the JavacState will clean out all artifacts
+ // that do not match the javac_state database.
+ javac_state.findAllArtifacts();
+
+ // Remove unidentified artifacts from the bin, gensrc and header dirs.
+ // (Unless we allow them to be there.)
+ // I.e. artifacts that are not known according to the build database (javac_state).
+ // For examples, files that have been manually copied into these dirs.
+ // Artifacts with bad timestamps (ie the on disk timestamp does not match the timestamp
+ // in javac_state) have already been removed when the javac_state was loaded.
+ if (!findBooleanOption(args, "--permit-unidentified-artifacts")) {
+ javac_state.removeUnidentifiedArtifacts();
+ }
+ // Go through all sources and taint all packages that miss artifacts.
+ javac_state.taintPackagesThatMissArtifacts();
+
+ // Now clean out all known artifacts belonging to tainted packages.
+ javac_state.deleteClassArtifactsInTaintedPackages();
+ // Copy files, for example property files, images files, xml files etc etc.
+ javac_state.performCopying(bin_dir, suffix_rules);
+ // Translate files, for example compile properties or compile idls.
+ javac_state.performTranslation(gensrc_dir, suffix_rules);
+ // Add any potentially generated java sources to the tobe compiled list.
+ // (Generated sources must always have a package.)
+ Map<String,Source> generated_sources = new HashMap<String,Source>();
+ Source.scanRoot(gensrc_dir, Util.set(".java"), null, null, null, null,
+ generated_sources, modules, current_module, false, true, false);
+ javac_state.now().collectPackagesSourcesAndArtifacts(modules);
+ // Recheck the the source files and their timestamps again.
+ javac_state.checkSourceStatus(true);
+
+ // Now do a safety check that the list of source files is identical
+ // to the list Make believes we are compiling. If we do not get this
+ // right, then incremental builds will fail with subtility.
+ // If any difference is detected, then we will fail hard here.
+ // This is an important safety net.
+ javac_state.compareWithMakefileList(makefile_source_list);
+
+ // Do the compilations, repeatedly until no tainted packages exist.
+ boolean again;
+ // Collect the name of all compiled packages.
+ Set<String> recently_compiled = new HashSet<String>();
+ boolean[] rc = new boolean[1];
+ do {
+ // Clean out artifacts in tainted packages.
+ javac_state.deleteClassArtifactsInTaintedPackages();
+ again = javac_state.performJavaCompilations(bin_dir, server_settings, args, recently_compiled, rc);
+ if (!rc[0]) break;
+ } while (again);
+ // Only update the state if the compile went well.
+ if (rc[0]) {
+ javac_state.save();
+ // Collect all the artifacts.
+ javac_state.now().collectArtifacts(modules);
+ // Remove artifacts that were generated during the last compile, but not this one.
+ javac_state.removeSuperfluousArtifacts(recently_compiled);
+ }
+ return rc[0] ? 0 : -1;
+ } catch (ProblemException e) {
+ Log.error(e.getMessage());
+ return -1;
+ } catch (Exception e) {
+ e.printStackTrace(err);
+ return -1;
+ }
+ }
+
+ /**
+ * Are java source files passed on the command line?
+ */
+ private boolean findJavaSourceFiles(String[] args) {
+ String prev = "";
+ for (String s : args) {
+ if (s.endsWith(".java") && !prev.equals("-xf") && !prev.equals("-if")) {
+ return true;
+ }
+ prev = s;
+ }
+ return false;
+ }
+
+ /**
+ * Is an at file passed on the command line?
+ */
+ private boolean findAtFile(String[] args) {
+ for (String s : args) {
+ if (s.startsWith("@")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Find the log level setting.
+ */
+ private String findLogLevel(String[] args) {
+ for (String s : args) {
+ if (s.startsWith("--log=") && s.length()>6) {
+ return s.substring(6);
+ }
+ if (s.equals("-verbose")) {
+ return "info";
+ }
+ }
+ return "info";
+ }
+
+ /**
+ * Remove smart javac wrapper arguments, before feeding
+ * the args to the plain javac.
+ */
+ static String[] removeWrapperArgs(String[] args) {
+ String[] out = new String[args.length];
+ // The first source path index is remembered
+ // here. So that all following can be concatenated to it.
+ int source_path = -1;
+ // The same for class path.
+ int class_path = -1;
+ // And module path.
+ int module_path = -1;
+ int j = 0;
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals("-src") ||
+ args[i].equals("-x") ||
+ args[i].equals("-i") ||
+ args[i].equals("-xf") ||
+ args[i].equals("-if") ||
+ args[i].equals("-copy") ||
+ args[i].equals("-tr") ||
+ args[i].equals("-j")) {
+ // Just skip it and skip following value
+ i++;
+ } else if (args[i].startsWith("--server:")) {
+ // Just skip it.
+ } else if (args[i].startsWith("--log=")) {
+ // Just skip it.
+ } else if (args[i].equals("--permit-unidentified-artifacts")) {
+ // Just skip it.
+ } else if (args[i].equals("--permit-sources-without-package")) {
+ // Just skip it.
+ } else if (args[i].equals("--compare-found-sources")) {
+ // Just skip it and skip verify file name
+ i++;
+ } else if (args[i].equals("-sourcepath")) {
+ if (source_path == -1) {
+ source_path = j;
+ out[j] = args[i];
+ out[j+1] = args[i+1];
+ j+=2;
+ i++;
+ } else {
+ // Skip this and its argument, but
+ // append argument to found sourcepath.
+ out[source_path+1] = out[source_path+1]+File.pathSeparatorChar+args[i+1];
+ i++;
+ }
+ } else if (args[i].equals("-classpath")) {
+ if (class_path == -1) {
+ class_path = j;
+ out[j] = args[i];
+ out[j+1] = args[i+1];
+ j+=2;
+ i++;
+ } else {
+ // Skip this and its argument, but
+ // append argument to found sourcepath.
+ out[class_path+1] = out[class_path+1]+File.pathSeparatorChar+args[i+1];
+ i++;
+ }
+ } else if (args[i].equals("-modulepath")) {
+ if (module_path == -1) {
+ module_path = j;
+ out[j] = args[i];
+ out[j+1] = args[i+1];
+ j+=2;
+ i++;
+ } else {
+ // Skip this and its argument, but
+ // append argument to found sourcepath.
+ out[module_path+1] = out[module_path+1]+File.pathSeparatorChar+args[i+1];
+ i++;
+ }
+ } else {
+ // Copy argument.
+ out[j] = args[i];
+ j++;
+ }
+ }
+ String[] ret = new String[j];
+ System.arraycopy(out, 0, ret, 0, j);
+ return ret;
+ }
+
+ /**
+ * Make sure directory exist, create it if not.
+ */
+ private static boolean makeSureExists(File dir) {
+ // Make sure the dest directories exist.
+ if (!dir.exists()) {
+ if (!dir.mkdirs()) {
+ Log.error("Could not create the directory "+dir.getPath());
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Verify that a package pattern is valid.
+ */
+ private static void checkPattern(String s) throws ProblemException {
+ // Package names like foo.bar.gamma are allowed, and
+ // package names suffixed with .* like foo.bar.* are
+ // also allowed.
+ Pattern p = Pattern.compile("[a-zA-Z_]{1}[a-zA-Z0-9_]*(\\.[a-zA-Z_]{1}[a-zA-Z0-9_]*)*(\\.\\*)?+");
+ Matcher m = p.matcher(s);
+ if (!m.matches()) {
+ throw new ProblemException("The string \""+s+"\" is not a proper package name pattern.");
+ }
+ }
+
+ /**
+ * Verify that a translate pattern is valid.
+ */
+ private static void checkTranslatePattern(String s) throws ProblemException {
+ // .prop=com.sun.tools.javac.smart.CompileProperties
+ // .idl=com.sun.corba.CompileIdl
+ // .g3=antlr.CompileGrammar,debug=true
+ Pattern p = Pattern.compile(
+ "\\.[a-zA-Z_]{1}[a-zA-Z0-9_]*=[a-z_]{1}[a-z0-9_]*(\\.[a-z_]{1}[a-z0-9_]*)*"+
+ "(\\.[a-zA-Z_]{1}[a-zA-Z0-9_]*)(,.*)?");
+ Matcher m = p.matcher(s);
+ if (!m.matches()) {
+ throw new ProblemException("The string \""+s+"\" is not a proper translate pattern.");
+ }
+ }
+
+ /**
+ * Verify that a copy pattern is valid.
+ */
+ private static void checkCopyPattern(String s) throws ProblemException {
+ // .gif
+ // .html
+ Pattern p = Pattern.compile(
+ "\\.[a-zA-Z_]{1}[a-zA-Z0-9_]*");
+ Matcher m = p.matcher(s);
+ if (!m.matches()) {
+ throw new ProblemException("The string \""+s+"\" is not a proper suffix.");
+ }
+ }
+
+ /**
+ * Verify that a source file name is valid.
+ */
+ private static void checkFilePattern(String s) throws ProblemException {
+ // File names like foo/bar/gamma/Bar.java are allowed,
+ // as well as /bar/jndi.properties as well as,
+ // */bar/Foo.java
+ Pattern p = null;
+ if (File.separatorChar == '\\') {
+ p = Pattern.compile("\\*?(.+\\\\)*.+");
+ }
+ else if (File.separatorChar == '/') {
+ p = Pattern.compile("\\*?(.+/)*.+");
+ } else {
+ throw new ProblemException("This platform uses the unsupported "+File.separatorChar+
+ " as file separator character. Please add support for it!");
+ }
+ Matcher m = p.matcher(s);
+ if (!m.matches()) {
+ throw new ProblemException("The string \""+s+"\" is not a proper file name.");
+ }
+ }
+
+ /**
+ * Scan the arguments to find an option is used.
+ */
+ private static boolean hasOption(String[] args, String option) {
+ for (String a : args) {
+ if (a.equals(option)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Check if -implicit is supplied, if so check that it is none.
+ * If -implicit is not supplied, supply -implicit:none
+ * Only implicit:none is allowed because otherwise the multicore compilations
+ * and dependency tracking will be tangled up.
+ */
+ private static String[] verifyImplicitOption(String[] args)
+ throws ProblemException {
+
+ boolean foundImplicit = false;
+ for (String a : args) {
+ if (a.startsWith("-implicit:")) {
+ foundImplicit = true;
+ if (!a.equals("-implicit:none")) {
+ throw new ProblemException("The only allowed setting for sjavac is -implicit:none, it is also the default.");
+ }
+ }
+ }
+ if (foundImplicit) {
+ return args;
+ }
+ // -implicit:none not found lets add it.
+ String[] newargs = new String[args.length+1];
+ System.arraycopy(args,0, newargs, 0, args.length);
+ newargs[args.length] = "-implicit:none";
+ return newargs;
+ }
+
+ /**
+ * Rewrite a single option into something else.
+ */
+ private static void rewriteOptions(String[] args, String option, String new_option) {
+ for (int i=0; i<args.length; ++i) {
+ if (args[i].equals(option)) {
+ args[i] = new_option;
+ }
+ }
+ }
+
+ /**
+ * Scan the arguments to find an option that specifies a directory.
+ * Create the directory if necessary.
+ */
+ private static File findDirectoryOption(String[] args, String option, String name, boolean needed, boolean allow_dups, boolean create)
+ throws ProblemException, ProblemException {
+ File dir = null;
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals(option)) {
+ if (dir != null) {
+ throw new ProblemException("You have already specified the "+name+" dir!");
+ }
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a directory following "+option+".");
+ }
+ if (args[i+1].indexOf(File.pathSeparatorChar) != -1) {
+ throw new ProblemException("You must only specify a single directory for "+option+".");
+ }
+ dir = new File(args[i+1]);
+ if (!dir.exists()) {
+ if (!create) {
+ throw new ProblemException("This directory does not exist: "+dir.getPath());
+ } else
+ if (!makeSureExists(dir)) {
+ throw new ProblemException("Cannot create directory "+dir.getPath());
+ }
+ }
+ if (!dir.isDirectory()) {
+ throw new ProblemException("\""+args[i+1]+"\" is not a directory.");
+ }
+ }
+ }
+ if (dir == null && needed) {
+ throw new ProblemException("You have to specify "+option);
+ }
+ try {
+ if (dir != null)
+ return dir.getCanonicalFile();
+ } catch (IOException e) {
+ throw new ProblemException(""+e);
+ }
+ return null;
+ }
+
+ /**
+ * Option is followed by path.
+ */
+ private static boolean shouldBeFollowedByPath(String o) {
+ return o.equals("-s") ||
+ o.equals("-h") ||
+ o.equals("-d") ||
+ o.equals("-sourcepath") ||
+ o.equals("-classpath") ||
+ o.equals("-bootclasspath") ||
+ o.equals("-src");
+ }
+
+ /**
+ * Add -src before source root directories if not already there.
+ */
+ private static String[] addSrcBeforeDirectories(String[] args) {
+ List<String> newargs = new ArrayList<String>();
+ for (int i = 0; i<args.length; ++i) {
+ File dir = new File(args[i]);
+ if (dir.exists() && dir.isDirectory()) {
+ if (i == 0 || !shouldBeFollowedByPath(args[i-1])) {
+ newargs.add("-src");
+ }
+ }
+ newargs.add(args[i]);
+ }
+ return newargs.toArray(new String[0]);
+ }
+
+ /**
+ * Check the -src options.
+ */
+ private static void checkSrcOption(String[] args)
+ throws ProblemException {
+ Set<File> dirs = new HashSet<File>();
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals("-src")) {
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a directory following -src.");
+ }
+ StringTokenizer st = new StringTokenizer(args[i+1], File.pathSeparator);
+ while (st.hasMoreElements()) {
+ File dir = new File(st.nextToken());
+ if (!dir.exists()) {
+ throw new ProblemException("This directory does not exist: "+dir.getPath());
+ }
+ if (!dir.isDirectory()) {
+ throw new ProblemException("\""+dir.getPath()+"\" is not a directory.");
+ }
+ if (dirs.contains(dir)) {
+ throw new ProblemException("The src directory \""+dir.getPath()+"\" is specified more than once!");
+ }
+ dirs.add(dir);
+ }
+ }
+ }
+ if (dirs.isEmpty()) {
+ throw new ProblemException("You have to specify -src.");
+ }
+ }
+
+ /**
+ * Scan the arguments to find an option that specifies a file.
+ */
+ private static File findFileOption(String[] args, String option, String name, boolean needed)
+ throws ProblemException, ProblemException {
+ File file = null;
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals(option)) {
+ if (file != null) {
+ throw new ProblemException("You have already specified the "+name+" file!");
+ }
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a file following "+option+".");
+ }
+ file = new File(args[i+1]);
+ if (file.isDirectory()) {
+ throw new ProblemException("\""+args[i+1]+"\" is not a file.");
+ }
+ if (!file.exists() && needed) {
+ throw new ProblemException("The file \""+args[i+1]+"\" does not exist.");
+ }
+
+ }
+ }
+ if (file == null && needed) {
+ throw new ProblemException("You have to specify "+option);
+ }
+ return file;
+ }
+
+ /**
+ * Look for a specific switch, return true if found.
+ */
+ public static boolean findBooleanOption(String[] args, String option) {
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals(option)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Scan the arguments to find an option that specifies a number.
+ */
+ public static int findNumberOption(String[] args, String option) {
+ int rc = 0;
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals(option)) {
+ if (args.length > i+1) {
+ rc = Integer.parseInt(args[i+1]);
+ }
+ }
+ }
+ return rc;
+ }
+
+ /**
+ * Scan the arguments to find the option (-tr) that setup translation rules to java source
+ * from different sources. For example: .properties are translated using CompileProperties
+ * The found translators are stored as suffix rules.
+ */
+ private static void findTranslateOptions(String[] args, Map<String,Transformer> suffix_rules)
+ throws ProblemException, ProblemException {
+
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals("-tr")) {
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a translate rule following -tr.");
+ }
+ String s = args[i+1];
+ checkTranslatePattern(s);
+ int ep = s.indexOf("=");
+ String suffix = s.substring(0,ep);
+ String classname = s.substring(ep+1);
+ if (suffix_rules.get(suffix) != null) {
+ throw new ProblemException("You have already specified a "+
+ "rule for the suffix "+suffix);
+ }
+ if (s.equals(".class")) {
+ throw new ProblemException("You cannot have a translator for .class files!");
+ }
+ if (s.equals(".java")) {
+ throw new ProblemException("You cannot have a translator for .java files!");
+ }
+ String extra = null;
+ int exp = classname.indexOf(",");
+ if (exp != -1) {
+ extra = classname.substring(exp+1);
+ classname = classname.substring(0,exp);
+ }
+ try {
+ Class<?> cl = Class.forName(classname);
+ Transformer t = (Transformer)cl.newInstance();
+ t.setExtra(extra);
+ suffix_rules.put(suffix, t);
+ }
+ catch (Exception e) {
+ throw new ProblemException("Cannot use "+classname+" as a translator!");
+ }
+ }
+ }
+ }
+
+ /**
+ * Scan the arguments to find the option (-copy) that setup copying rules into the bin dir.
+ * For example: -copy .html
+ * The found copiers are stored as suffix rules as well. No translation is done, just copying.
+ */
+ private void findCopyOptions(String[] args, Map<String,Transformer> suffix_rules)
+ throws ProblemException, ProblemException {
+
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals("-copy")) {
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a translate rule following -tr.");
+ }
+ String s = args[i+1];
+ checkCopyPattern(s);
+ if (suffix_rules.get(s) != null) {
+ throw new ProblemException("You have already specified a "+
+ "rule for the suffix "+s);
+ }
+ if (s.equals(".class")) {
+ throw new ProblemException("You cannot have a copy rule for .class files!");
+ }
+ if (s.equals(".java")) {
+ throw new ProblemException("You cannot have a copy rule for .java files!");
+ }
+ suffix_rules.put(s, javac_state.getCopier());
+ }
+ }
+ }
+
+ /**
+ * Rewrite a / separated path into \ separated, but only
+ * if we are running on a platform were File.separatorChar=='\', ie winapi.
+ */
+ private String fixupSeparator(String p) {
+ if (File.separatorChar == '/') return p;
+ return p.replaceAll("/", "\\\\");
+ }
+
+ /**
+ * Scan the arguments for -i -x -xf -if followed by the option
+ * -src, -sourcepath, -modulepath or -classpath and produce a map of all the
+ * files to referenced for that particular option.
+ *
+ * Store the found sources and the found modules in the supplied maps.
+ */
+ private boolean findFiles(String[] args, String option, Set<String> suffixes,
+ Map<String,Source> found_files, Map<String, Module> found_modules,
+ Module current_module, boolean inLinksrc)
+ throws ProblemException, ProblemException
+ {
+ // Track which source roots, source path roots and class path roots have been added.
+ Set<File> roots = new HashSet<File>();
+ // Track the current set of package includes,excludes as well as excluded source files,
+ // to be used in the next -src/-sourcepath/-classpath
+ List<String> includes = new LinkedList<String>();
+ List<String> excludes = new LinkedList<String>();
+ List<String> excludefiles = new LinkedList<String>();
+ List<String> includefiles = new LinkedList<String>();
+ // This include is used to find all modules in the source.
+ List<String> moduleinfo = new LinkedList<String>();
+ moduleinfo.add("module-info.java");
+
+ for (int i = 0; i<args.length; ++i) {
+ if (args[i].equals("-i")) {
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a package pattern following -i");
+ }
+ String incl = args[i+1];
+ checkPattern(incl);
+ includes.add(incl);
+ }
+ if (args[i].equals("-x")) {
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a package pattern following -x");
+ }
+ String excl = args[i+1];
+ checkPattern(excl);
+ excludes.add(excl);
+ }
+ if (args[i].equals("-xf")) {
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a file following -xf");
+ }
+ String exclf = args[i+1];
+ checkFilePattern(exclf);
+ exclf = Util.normalizeDriveLetter(exclf);
+ excludefiles.add(fixupSeparator(exclf));
+ }
+ if (args[i].equals("-if")) {
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a file following -xf");
+ }
+ String inclf = args[i+1];
+ checkFilePattern(inclf);
+ inclf = Util.normalizeDriveLetter(inclf);
+ includefiles.add(fixupSeparator(inclf));
+ }
+ if (args[i].equals(option)) {
+ if (i+1 >= args.length) {
+ throw new ProblemException("You have to specify a directory following "+option);
+ }
+ String[] root_dirs = args[i+1].split(File.pathSeparator);
+ for (String r : root_dirs) {
+ File root = new File(r);
+ if (!root.isDirectory()) {
+ throw new ProblemException("\""+r+"\" is not a directory.");
+ }
+ try {
+ root = root.getCanonicalFile();
+ } catch (IOException e) {
+ throw new ProblemException(""+e);
+ }
+ if (roots.contains(root)) {
+ throw new ProblemException("\""+r+"\" has already been used for "+option);
+ }
+ if (roots.equals(bin_dir)) {
+ throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -d");
+ }
+ if (roots.equals(gensrc_dir)) {
+ throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -s");
+ }
+ if (roots.equals(header_dir)) {
+ throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -h");
+ }
+ roots.add(root);
+ Source.scanRoot(root, suffixes, excludes, includes, excludefiles, includefiles,
+ found_files, found_modules, current_module,
+ findBooleanOption(args, "--permit-sources-without-package"),
+ false, inLinksrc);
+ }
+ }
+ if (args[i].equals("-src") ||
+ args[i].equals("-sourcepath") ||
+ args[i].equals("-modulepath") ||
+ args[i].equals("-classpath"))
+ {
+ // Reset the includes,excludes and excludefiles after they have been used.
+ includes = new LinkedList<String>();
+ excludes = new LinkedList<String>();
+ excludefiles = new LinkedList<String>();
+ includefiles = new LinkedList<String>();
+ }
+ }
+ return true;
+ }
+
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Module.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.File;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * The module is the root of a set of packages/sources/artifacts.
+ * At the moment there is only one module in use, the empty/no-name/default module.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class Module implements Comparable<Module> {
+ private String name;
+ private String dirname;
+ private Map<String,Package> packages = new HashMap<String,Package>();
+ private Map<String,Source> sources = new HashMap<String,Source>();
+ private Map<String,File> artifacts = new HashMap<String,File>();
+
+ public Module(String n, String dn) {
+ name = n;
+ dirname = n;
+ }
+
+ public String name() { return name; }
+ public String dirname() { return dirname; }
+ public Map<String,Package> packages() { return packages; }
+ public Map<String,Source> sources() { return sources; }
+ public Map<String,File> artifacts() { return artifacts; }
+
+ @Override
+ public boolean equals(Object o) {
+ return (o instanceof Module) && name.equals(((Module)o).name);
+ }
+
+ @Override
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ @Override
+ public int compareTo(Module o) {
+ return name.compareTo(o.name);
+ }
+
+ public void save(StringBuilder b) {
+ b.append("M ").append(name).append(":").append("\n");
+ Package.savePackages(packages, b);
+ }
+
+ public static Module load(String l) {
+ int cp = l.indexOf(':',2);
+ if (cp == -1) return null;
+ String name = l.substring(2,cp);
+ return new Module(name, "");
+ }
+
+ public static void saveModules(Map<String,Module> ms, StringBuilder b)
+ {
+ for (Module m : ms.values()) {
+ m.save(b);
+ }
+ }
+
+ public void addPackage(Package p) {
+ packages.put(p.name(), p);
+ }
+
+ public Package lookupPackage(String pkg) {
+ Package p = packages.get(pkg);
+ if (p == null) {
+ p = new Package(this, pkg);
+ packages.put(pkg, p);
+ }
+ return p;
+ }
+
+ public void addSource(String pkg, Source src) {
+ Package p = lookupPackage(pkg);
+ src.setPackage(p);
+ p.addSource(src);
+ sources.put(src.file().getPath(), src);
+ }
+
+ public Source lookupSource(String path) {
+ return sources.get(path);
+ }
+
+ public void addArtifacts(String pkg, Set<URI> as) {
+ Package p = lookupPackage(pkg);
+ for (URI u : as) {
+ p.addArtifact(new File(u));
+ }
+ }
+
+ public void setDependencies(String pkg, Set<String> deps) {
+ Package p = lookupPackage(pkg);
+ p.setDependencies(deps);
+ }
+
+ public void setPubapi(String pkg, List<String> ps) {
+ Package p = lookupPackage(pkg);
+ p.setPubapi(ps);
+ }
+
+ public boolean hasPubapiChanged(String pkg, List<String> ps) {
+ Package p = lookupPackage(pkg);
+ return p.hasPubapiChanged(ps);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Package.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * The Package class maintains meta information about a package.
+ * For example its sources, dependents,its pubapi and its artifacts.
+ *
+ * It might look odd that we track dependents/pubapi/artifacts on
+ * a package level, but it makes sense since recompiling a full package
+ * takes as long as recompiling a single java file in that package,
+ * if you take into account the startup time of the jvm.
+ *
+ * Also the dependency information will be much smaller (good for the javac_state file size)
+ * and it simplifies tracking artifact generation, you do not always know from which
+ * source a class file was generated, but you always know which package it belongs to.
+ *
+ * It is also educational to see package dependencies triggering recompilation of
+ * other packages. Even though the recompilation was perhaps not necessary,
+ * the visible recompilation of the dependent packages indicates how much circular
+ * dependencies your code has.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class Package implements Comparable<Package> {
+ // The module this package belongs to. (There is a legacy module with an empty string name,
+ // used for all legacy sources.)
+ private Module mod;
+ // Name of this package, module:pkg
+ // ex1 jdk.base:java.lang
+ // ex2 :java.lang (when in legacy mode)
+ private String name;
+ // The directory path to the package. If the package belongs to a module,
+ // then that module's file system name is part of the path.
+ private String dirname;
+ // This package depends on these packages.
+ private Set<String> dependencies = new HashSet<String>();
+ // This package has the following dependents, that depend on this package.
+ private Set<String> dependents = new HashSet<String>();
+ // This is the public api of this package.
+ private List<String> pubapi = new ArrayList<String>();
+ // Map from source file name to Source info object.
+ private Map<String,Source> sources = new HashMap<String,Source>();
+ // This package generated these artifacts.
+ private Map<String,File> artifacts = new HashMap<String,File>();
+
+ public Package(Module m, String n) {
+ int c = n.indexOf(":");
+ assert(c != -1);
+ String mn = n.substring(0,c);
+ assert(m.name().equals(m.name()));
+ name = n;
+ dirname = n.replace('.', File.separatorChar);
+ if (m.name().length() > 0) {
+ // There is a module here, prefix the module dir name to the path.
+ dirname = m.dirname()+File.separatorChar+dirname;
+ }
+ }
+
+ public Module mod() { return mod; }
+ public String name() { return name; }
+ public String dirname() { return dirname; }
+ public Map<String,Source> sources() { return sources; }
+ public Map<String,File> artifacts() { return artifacts; }
+ public List<String> pubapi() { return pubapi; }
+
+ public Set<String> dependencies() { return dependencies; }
+ public Set<String> dependents() { return dependents; }
+
+ @Override
+ public boolean equals(Object o) {
+ return (o instanceof Package) && name.equals(((Package)o).name);
+ }
+
+ @Override
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ @Override
+ public int compareTo(Package o) {
+ return name.compareTo(o.name);
+ }
+
+ public void addSource(Source s) {
+ sources.put(s.file().getPath(), s);
+ }
+
+ public void addDependency(String d) {
+ dependencies.add(d);
+ }
+
+ public void addDependent(String d) {
+ dependents.add(d);
+ }
+
+ public void addPubapi(String p) {
+ pubapi.add(p);
+ }
+
+ /**
+ * Check if we have knowledge in the javac state that
+ * describe the results of compiling this package before.
+ */
+ public boolean existsInJavacState() {
+ return artifacts.size() > 0 || pubapi.size() > 0;
+ }
+
+ public static List<String> pubapiToList(String ps)
+ {
+ String[] lines = ps.split("\n");
+ List<String> r = new ArrayList<String>();
+ for (String l : lines) {
+ r.add(l);
+ }
+ return r;
+ }
+
+ public boolean hasPubapiChanged(List<String> ps) {
+ Iterator<String> i = ps.iterator();
+ Iterator<String> j = pubapi.iterator();
+ int line = 0;
+ while (i.hasNext() && j.hasNext()) {
+ String is = i.next();
+ String js = j.next();
+ if (!is.equals(js)) {
+ Log.debug("Change in pubapi for package "+name+" line "+line);
+ Log.debug("Old: "+js);
+ Log.debug("New: "+is);
+ return true;
+ }
+ line++;
+ }
+ if ((i.hasNext() && !j.hasNext() ) ||
+ (!i.hasNext() && j.hasNext())) {
+ Log.debug("Change in pubapi for package "+name);
+ if (i.hasNext()) {
+ Log.debug("New has more lines!");
+ } else {
+ Log.debug("Old has more lines!");
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public void setPubapi(List<String> ps) {
+ pubapi = ps;
+ }
+
+ public void setDependencies(Set<String> ds) {
+ dependencies = ds;
+ }
+
+ public void save(StringBuilder b) {
+ b.append("P ").append(name).append("\n");
+ Source.saveSources(sources, b);
+ saveDependencies(b);
+ savePubapi(b);
+ saveArtifacts(b);
+ }
+
+ static public Package load(Module module, String l) {
+ String name = l.substring(2);
+ return new Package(module, name);
+ }
+
+ public void loadDependency(String l) {
+ String n = l.substring(2);
+ addDependency(n);
+ }
+
+ public void loadPubapi(String l) {
+ String pi = l.substring(2);
+ addPubapi(pi);
+ }
+
+ public void saveDependencies(StringBuilder b) {
+ List<String> sorted_dependencies = new ArrayList<String>();
+ for (String key : dependencies) {
+ sorted_dependencies.add(key);
+ }
+ Collections.sort(sorted_dependencies);
+ for (String a : sorted_dependencies) {
+ b.append("D "+a+"\n");
+ }
+ }
+
+ public void savePubapi(StringBuilder b) {
+ for (String l : pubapi) {
+ b.append("I "+l+"\n");
+ }
+ }
+
+ public static void savePackages(Map<String,Package> packages, StringBuilder b) {
+ List<String> sorted_packages = new ArrayList<String>();
+ for (String key : packages.keySet() ) {
+ sorted_packages.add(key);
+ }
+ Collections.sort(sorted_packages);
+ for (String s : sorted_packages) {
+ Package p = packages.get(s);
+ p.save(b);
+ }
+ }
+
+ public void addArtifact(String a) {
+ artifacts.put(a, new File(a));
+ }
+
+ public void addArtifact(File f) {
+ artifacts.put(f.getPath(), f);
+ }
+
+ public void addArtifacts(Set<URI> as) {
+ for (URI u : as) {
+ addArtifact(new File(u));
+ }
+ }
+
+ public void setArtifacts(Set<URI> as) {
+ assert(!artifacts.isEmpty());
+ artifacts = new HashMap<String,File>();
+ addArtifacts(as);
+ }
+
+ public void loadArtifact(String l) {
+ // Find next space after "A ".
+ int dp = l.indexOf(' ',2);
+ String fn = l.substring(2,dp);
+ long last_modified = Long.parseLong(l.substring(dp+1));
+ File f = new File(fn);
+ if (f.exists() && f.lastModified() != last_modified) {
+ // Hmm, the artifact on disk does not have the same last modified
+ // timestamp as the information from the build database.
+ // We no longer trust the artifact on disk. Delete it.
+ // The smart javac wrapper will then rebuild the artifact.
+ Log.debug("Removing "+f.getPath()+" since its timestamp does not match javac_state.");
+ f.delete();
+ }
+ artifacts.put(f.getPath(), f);
+ }
+
+ public void saveArtifacts(StringBuilder b) {
+ List<File> sorted_artifacts = new ArrayList<File>();
+ for (File f : artifacts.values()) {
+ sorted_artifacts.add(f);
+ }
+ Collections.sort(sorted_artifacts);
+ for (File f : sorted_artifacts) {
+ // The last modified information is only used
+ // to detect tampering with the output dir.
+ // If the outputdir has been modified, not by javac,
+ // then a mismatch will be detected in the last modified
+ // timestamps stored in the build database compared
+ // to the timestamps on disk and the artifact will be deleted.
+
+ b.append("A "+f.getPath()+" "+f.lastModified()+"\n");
+ }
+ }
+
+ /**
+ * Always clean out a tainted package before it is recompiled.
+ */
+ public void deleteArtifacts() {
+ for (File a : artifacts.values()) {
+ a.delete();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/ProblemException.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+/**
+ * Used to signal serious problems when running sjavac.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class ProblemException extends Exception {
+ static final long serialVersionUID = -3387516993124229949L;
+ public ProblemException(String s) {
+ super(s);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Source.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,400 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.File;
+import java.util.Set;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+/** A Source object maintains information about a source file.
+ * For example which package it belongs to and kind of source it is.
+ * The class also knows how to find source files (scanRoot) given include/exclude
+ * patterns and a root.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class Source implements Comparable<Source> {
+ // The package the source belongs to.
+ private Package pkg;
+ // Name of this source file, relative its source root.
+ // For example: java/lang/Object.java
+ // Or if the source file is inside a module:
+ // jdk.base/java/lang/Object.java
+ private String name;
+ // What kind of file is this.
+ private String suffix;
+ // When this source file was last_modified
+ private long lastModified;
+ // The source File.
+ private File file;
+ // The source root under which file resides.
+ private File root;
+ // If the source is generated.
+ private boolean isGenerated;
+ // If the source is only linked to, not compiled.
+ private boolean linkedOnly;
+
+ @Override
+ public boolean equals(Object o) {
+ return (o instanceof Source) && name.equals(((Source)o).name);
+ }
+
+ @Override
+ public int compareTo(Source o) {
+ return name.compareTo(o.name);
+ }
+
+ @Override
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ public Source(Module m, String n, File f, File r) {
+ name = n;
+ int dp = n.lastIndexOf(".");
+ if (dp != -1) {
+ suffix = n.substring(dp);
+ } else {
+ suffix = "";
+ }
+ file = f;
+ root = r;
+ lastModified = f.lastModified();
+ linkedOnly = false;
+ }
+
+ public Source(Package p, String n, long lm) {
+ pkg = p;
+ name = n;
+ int dp = n.lastIndexOf(".");
+ if (dp != -1) {
+ suffix = n.substring(dp);
+ } else {
+ suffix = "";
+ }
+ file = null;
+ root = null;
+ lastModified = lm;
+ linkedOnly = false;
+ int ls = n.lastIndexOf('/');
+ }
+
+ public String name() { return name; }
+ public String suffix() { return suffix; }
+ public Package pkg() { return pkg; }
+ public File file() { return file; }
+ public File root() { return root; }
+ public long lastModified() {
+ return lastModified;
+ }
+
+ public void setPackage(Package p) {
+ pkg = p;
+ }
+
+ public void markAsGenerated() {
+ isGenerated = true;
+ }
+
+ public boolean isGenerated() {
+ return isGenerated;
+ }
+
+ public void markAsLinkedOnly() {
+ linkedOnly = true;
+ }
+
+ public boolean isLinkedOnly() {
+ return linkedOnly;
+ }
+
+ private void save(StringBuilder b) {
+ String CL = linkedOnly?"L":"C";
+ String GS = isGenerated?"G":"S";
+ b.append(GS+" "+CL+" "+name+" "+file.lastModified()+"\n");
+ }
+ // Parse a line that looks like this:
+ // S C /code/alfa/A.java 1357631228000
+ static public Source load(Package lastPackage, String l, boolean isGenerated) {
+ int sp = l.indexOf(' ',4);
+ if (sp == -1) return null;
+ String name = l.substring(4,sp);
+ long last_modified = Long.parseLong(l.substring(sp+1));
+
+ boolean isLinkedOnly = false;
+ if (l.charAt(2) == 'L') {
+ isLinkedOnly = true;
+ } else if (l.charAt(2) == 'C') {
+ isLinkedOnly = false;
+ } else return null;
+
+ Source s = new Source(lastPackage, name, last_modified);
+ s.file = new File(name);
+ if (isGenerated) s.markAsGenerated();
+ if (isLinkedOnly) s.markAsLinkedOnly();
+ return s;
+ }
+
+ public static void saveSources(Map<String,Source> sources, StringBuilder b) {
+ List<String> sorted_sources = new ArrayList<String>();
+ for (String key : sources.keySet()) {
+ sorted_sources.add(key);
+ }
+ Collections.sort(sorted_sources);
+ for (String key : sorted_sources) {
+ Source s = sources.get(key);
+ s.save(b);
+ }
+ }
+
+ /**
+ * Recurse into the directory root and find all files matchine the excl/incl/exclfiles/inclfiles rules.
+ * Detects the existence of module-info.java files and presumes that the directory it resides in
+ * is the name of the current module.
+ */
+ static public void scanRoot(File root,
+ Set<String> suffixes,
+ List<String> excludes, List<String> includes,
+ List<String> excludeFiles, List<String> includeFiles,
+ Map<String,Source> foundFiles,
+ Map<String,Module> foundModules,
+ Module currentModule,
+ boolean permitSourcesWithoutPackage,
+ boolean inGensrc,
+ boolean inLinksrc)
+ throws ProblemException {
+
+ if (root == null) return;
+ int root_prefix = root.getPath().length()+1;
+ // This is the root source directory, it must not contain any Java sources files
+ // because we do not allow Java source files without a package.
+ // (Unless of course --permit-sources-without-package has been specified.)
+ // It might contain other source files however, (for -tr and -copy) these will
+ // always be included, since no package pattern can match the root directory.
+ currentModule = addFilesInDir(root, root_prefix, root, suffixes, permitSourcesWithoutPackage,
+ excludeFiles, includeFiles, false,
+ foundFiles, foundModules, currentModule,
+ inGensrc, inLinksrc);
+
+ File[] dirfiles = root.listFiles();
+ for (File d : dirfiles) {
+ if (d.isDirectory()) {
+ // Descend into the directory structure.
+ scanDirectory(d, root_prefix, root, suffixes,
+ excludes, includes, excludeFiles, includeFiles,
+ false, foundFiles, foundModules, currentModule, inGensrc, inLinksrc);
+ }
+ }
+ }
+
+ /**
+ * Test if a path matches any of the patterns given.
+ * The pattern foo.bar matches only foo.bar
+ * The pattern foo.* matches foo.bar and foo.bar.zoo etc
+ */
+ static private boolean hasMatch(String path, List<String> patterns) {
+ for (String p : patterns) {
+ // Exact match
+ if (p.equals(path)) {
+ return true;
+ }
+ // Single dot the end matches this package and all its subpackages.
+ if (p.endsWith(".*")) {
+ // Remove the wildcard
+ String patprefix = p.substring(0,p.length()-2);
+ // Does the path start with the pattern prefix?
+ if (path.startsWith(patprefix)) {
+ // If the path has the same length as the pattern prefix, then it is a match.
+ // If the path is longer, then make sure that
+ // the next part of the path starts with a dot (.) to prevent
+ // wildcard matching in the middle of a package name.
+ if (path.length()==patprefix.length() || path.charAt(patprefix.length())=='.') {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Matches patterns with the asterisk first. */
+ // The pattern foo/bar.java only matches foo/bar.java
+ // The pattern */bar.java matches foo/bar.java and zoo/bar.java etc
+ static private boolean hasFileMatch(String path, List<String> patterns) {
+ path = Util.normalizeDriveLetter(path);
+ for (String p : patterns) {
+ // Exact match
+ if (p.equals(path)) {
+ return true;
+ }
+ // Single dot the end matches this package and all its subpackages.
+ if (p.startsWith("*")) {
+ // Remove the wildcard
+ String patsuffix = p.substring(1);
+ // Does the path start with the pattern prefix?
+ if (path.endsWith(patsuffix)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Add the files in the directory, assuming that the file has not been excluded.
+ * Returns a fresh Module object, if this was a dir with a module-info.java file.
+ */
+ static private Module addFilesInDir(File dir, int rootPrefix, File root,
+ Set<String> suffixes, boolean allow_javas,
+ List<String> excludeFiles, List<String> includeFiles, boolean all,
+ Map<String,Source> foundFiles,
+ Map<String,Module> foundModules,
+ Module currentModule,
+ boolean inGensrc,
+ boolean inLinksrc)
+ throws ProblemException
+ {
+ for (File f : dir.listFiles()) {
+ if (f.isFile()) {
+ boolean should_add =
+ (excludeFiles == null || excludeFiles.isEmpty() || !hasFileMatch(f.getPath(), excludeFiles))
+ && (includeFiles == null || includeFiles.isEmpty() || hasFileMatch(f.getPath(), includeFiles));
+
+ if (should_add) {
+ if (!allow_javas && f.getName().endsWith(".java")) {
+ throw new ProblemException("No .java files are allowed in the source root "+dir.getPath()+
+ ", please remove "+f.getName());
+ }
+ // Extract the file name relative the root.
+ String fn = f.getPath().substring(rootPrefix);
+ // Extract the package name.
+ int sp = fn.lastIndexOf(File.separatorChar);
+ String pkg = "";
+ if (sp != -1) {
+ pkg = fn.substring(0,sp).replace(File.separatorChar,'.');
+ }
+ // Is this a module-info.java file?
+ if (fn.endsWith("module-info.java")) {
+ // Aha! We have recursed into a module!
+ if (!currentModule.name().equals("")) {
+ throw new ProblemException("You have an extra module-info.java inside a module! Please remove "+fn);
+ }
+ String module_name = fn.substring(0,fn.length()-16);
+ currentModule = new Module(module_name, f.getPath());
+ foundModules.put(module_name, currentModule);
+ }
+ // Extract the suffix.
+ int dp = fn.lastIndexOf(".");
+ String suffix = "";
+ if (dp > 0) {
+ suffix = fn.substring(dp);
+ }
+ // Should the file be added?
+ if (all || suffixes.contains(suffix)) {
+ Source of = foundFiles.get(f.getPath());
+ if (of != null) {
+ throw new ProblemException("You have already added the file "+fn+" from "+of.file().getPath());
+ }
+ of = currentModule.lookupSource(f.getPath());
+ if (of != null) {
+ // Oups, the source is already added, could be ok, could be not, lets check.
+ if (inLinksrc) {
+ // So we are collecting sources for linking only.
+ if (of.isLinkedOnly()) {
+ // Ouch, this one is also for linking only. Bad.
+ throw new ProblemException("You have already added the link only file "+fn+" from "+of.file().getPath());
+ }
+ // Ok, the existing source is to be compiled. Thus this link only is redundant
+ // since all compiled are also linked to. Continue to the next source.
+ // But we need to add the source, so that it will be visible to linking,
+ // if not the multi core compile will fail because a JavaCompiler cannot
+ // find the necessary dependencies for its part of the source.
+ foundFiles.put(f.getPath(), of);
+ continue;
+ } else {
+ // We are looking for sources to compile, if we find an existing to be compiled
+ // source with the same name, it is an internal error, since we must
+ // find the sources to be compiled before we find the sources to be linked to.
+ throw new ProblemException("Internal error: Double add of file "+fn+" from "+of.file().getPath());
+ }
+ }
+ Source s = new Source(currentModule, f.getPath(), f, root);
+ if (inGensrc) s.markAsGenerated();
+ if (inLinksrc) {
+ s.markAsLinkedOnly();
+ }
+ pkg = currentModule.name()+":"+pkg;
+ foundFiles.put(f.getPath(), s);
+ currentModule.addSource(pkg, s);
+ }
+ }
+ }
+ }
+ return currentModule;
+ }
+
+ private static boolean gurka = false;
+
+ static private void scanDirectory(File dir, int rootPrefix, File root,
+ Set<String> suffixes,
+ List<String> excludes, List<String> includes,
+ List<String> excludeFiles, List<String> includeFiles, boolean all,
+ Map<String,Source> foundFiles,
+ Map<String,Module> foundModules,
+ Module currentModule, boolean inGensrc, boolean inLinksrc)
+ throws ProblemException {
+
+ String pkg_name = "";
+ // Remove the root prefix from the dir path, and replace file separator with dots
+ // to get the package name.
+ if (dir.getPath().length() > rootPrefix) {
+ pkg_name = dir.getPath().substring(rootPrefix).replace(File.separatorChar,'.');
+ }
+ // Should this package directory be included and not excluded?
+ if (all || ((includes==null || includes.isEmpty() || hasMatch(pkg_name, includes)) &&
+ (excludes==null || excludes.isEmpty() || !hasMatch(pkg_name, excludes)))) {
+ // Add the source files.
+ currentModule = addFilesInDir(dir, rootPrefix, root, suffixes, true, excludeFiles, includeFiles, all,
+ foundFiles, foundModules, currentModule, inGensrc, inLinksrc);
+ }
+
+ for (File d : dir.listFiles()) {
+ if (d.isDirectory()) {
+ // Descend into the directory structure.
+ scanDirectory(d, rootPrefix, root, suffixes,
+ excludes, includes, excludeFiles, includeFiles, all,
+ foundFiles, foundModules, currentModule, inGensrc, inLinksrc);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Transformer.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.PrintStream;
+import java.net.URI;
+import java.util.Set;
+import java.util.Map;
+
+/**
+ * The transform interface is used to transform content inside a package, from one form to another.
+ * Usually the output form is an unpredictable number of output files. (eg class files)
+ * but can also be an unpredictable number of generated source files (eg idl2java)
+ * or a single predictable output file (eg when copying,cleaning or compiling a properties file).
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public interface Transformer
+{
+ /**
+ * The transform method takes a set of package names, mapped to their source files and to the
+ * pubapis of the packages.
+ *
+ * The transform implementation must:
+ * store the names of the generated artifacts for each package into package_artifacts
+ * store found dependencies to other packages into the supplied set package_dependencies
+ * store the public api for a package into the supplied set package_pubapis
+ *
+ * Any benign messages as a result of running the transform
+ * are written into stdout, and errors are written to stderr.
+ *
+ * The debug_level can be 0=silent (only warnings and errors) 1=normal 2=verbose 3 or greater=debug
+ * setExtra is used to set the extra information information that can be passed on
+ * the command line to the smart javac wrapper.
+ *
+ * If sjavac is building incrementally from an existing javac_state, the var incremental is true.
+ *
+ * The transformer will only be called if some source in the package (or dependency) has
+ * a modified timestamp. Thus the transformer might get called with many sources, of which
+ * only one has changed. The transformer is allowed to regenerate all artifacts but
+ * a better transformer will only write those artifacts that need updating.
+ *
+ * However the transformer must verify that the existing artifacts really are there!
+ * and it must always update package_artifacts, package_dependencies, and package_pubapis correctly.
+ * This means that at least for Java source, it will always have to recompile the sources.
+ *
+ * The transformer is allowed to put files anywhere in the dest_root.
+ * An example of this is, can be the META-INF transformer that copy files
+ * below META-INF directories to the single META-INF directory below dest_root.
+ *
+ * False is returned if there was an error that prevented the transform.
+ * I.e. something was printed on stderr.
+ *
+ * If num_cores is set to a non-zero value. The transform should attempt to use no more than these
+ * number of threads for heavy work.
+ */
+ boolean transform(Map<String,Set<URI>> pkgSrcs,
+ Set<URI> visibleSources,
+ Map<URI,Set<String>> visibleClasses,
+ Map<String,Set<String>> oldPackageDependencies,
+ URI destRoot,
+ Map<String,Set<URI>> packageArtifacts,
+ Map<String,Set<String>> packageDependencies,
+ Map<String,String> packagePublicApis,
+ int debugLevel,
+ boolean incremental,
+ int numCores,
+ PrintStream out,
+ PrintStream err);
+
+ void setExtra(String e);
+ void setExtra(String[] args);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Util.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+/**
+ * Utilities.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class Util {
+
+ public static String toFileSystemPath(String pkgId) {
+ if (pkgId == null || pkgId.length()==0) return null;
+ String pn;
+ if (pkgId.charAt(0) == ':') {
+ // When the module is the default empty module.
+ // Do not prepend the module directory, because there is none.
+ // Thus :java.foo.bar translates to java/foo/bar (or \)
+ pn = pkgId.substring(1).replace('.',File.separatorChar);
+ } else {
+ // There is a module. Thus jdk.base:java.foo.bar translates
+ // into jdk.base/java/foo/bar
+ int cp = pkgId.indexOf(':');
+ String mn = pkgId.substring(0,cp);
+ pn = mn+File.separatorChar+pkgId.substring(cp+1).replace('.',File.separatorChar);
+ }
+ return pn;
+ }
+
+ public static String justPackageName(String pkgName) {
+ int c = pkgName.indexOf(":");
+ assert(c != -1);
+ return pkgName.substring(c+1);
+ }
+
+ public static String extractStringOption(String opName, String s) {
+ int p = s.indexOf(opName+"=");
+ if (p == -1) return null;
+ p+=opName.length()+1;
+ int pe = s.indexOf(',', p);
+ if (pe == -1) pe = s.length();
+ return s.substring(p, pe);
+ }
+
+ public static int extractIntOption(String opName, String s) {
+ int p = s.indexOf(opName+"=");
+ if (p == -1) return 0;
+ p+=opName.length()+1;
+ int pe = s.indexOf(',', p);
+ if (pe == -1) pe = s.length();
+ int v = 0;
+ try {
+ v = Integer.parseInt(s.substring(p, pe));
+ } catch (Exception e) {}
+ return v;
+ }
+
+ /**
+ * Clean out unwanted sub options supplied inside a primary option.
+ * For example to only had portfile remaining from:
+ * settings="--server:id=foo,portfile=bar"
+ * do settings = cleanOptions("--server:",Util.set("-portfile"),settings);
+ * now settings equals "--server:portfile=bar"
+ *
+ * @param optionPrefix The option name, including colon, eg --server:
+ * @param allowsSubOptions A set of the allowed sub options, id portfile etc.
+ * @param s The option settings string.
+ */
+ public static String cleanSubOptions(String optionPrefix, Set<String> allowedSubOptions, String s) {
+ StringBuilder sb = new StringBuilder();
+ if (!s.startsWith(optionPrefix)) return "";
+ StringTokenizer st = new StringTokenizer(s.substring(optionPrefix.length()), ",");
+ while (st.hasMoreTokens()) {
+ String o = st.nextToken();
+ int p = o.indexOf('=');
+ if (p>0) {
+ String key = o.substring(0,p);
+ String val = o.substring(p+1);
+ if (allowedSubOptions.contains(key)) {
+ if (sb.length() > 0) sb.append(',');
+ sb.append(key+"="+val);
+ }
+ }
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Convenience method to create a set with strings.
+ */
+ public static Set<String> set(String... ss) {
+ Set<String> set = new HashSet<String>();
+ set.addAll(Arrays.asList(ss));
+ return set;
+ }
+
+ /**
+ * Normalize windows drive letter paths to upper case to enable string
+ * comparison.
+ *
+ * @param file File name to normalize
+ * @return The normalized string if file has a drive letter at the beginning,
+ * otherwise the original string.
+ */
+ public static String normalizeDriveLetter(String file) {
+ if (file.length() > 2 && file.charAt(1) == ':') {
+ return Character.toUpperCase(file.charAt(0)) + file.substring(1);
+ } else if (file.length() > 3 && file.charAt(0) == '*'
+ && file.charAt(2) == ':') {
+ // Handle a wildcard * at the beginning of the string.
+ return file.substring(0, 1) + Character.toUpperCase(file.charAt(1))
+ + file.substring(2);
+ }
+ return file;
+ }
+
+ /**
+ * Locate the setting for the server properties.
+ */
+ public static String findServerSettings(String[] args) {
+ for (String s : args) {
+ if (s.startsWith("--server:")) {
+ return s;
+ }
+ }
+ return null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/comp/Dependencies.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac.comp;
+
+import javax.lang.model.element.Element;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Name;
+
+/** Utility class containing dependency information between packages
+ * and the pubapi for a package.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class Dependencies {
+ protected static final Context.Key<Dependencies> dependenciesKey =
+ new Context.Key<Dependencies>();
+
+ // The log to be used for error reporting.
+ protected Log log;
+ // Map from package name to packages that the package depends upon.
+ protected Map<Name,Set<Name>> deps;
+ // This is the set of all packages that are supplied
+ // through the java files at the command line.
+ protected Set<Name> explicitPackages;
+
+ // Map from a package name to its public api.
+ // Will the Name encode the module in the future?
+ // If not, this will have to change to map from Module+Name to public api.
+ protected Map<Name,StringBuffer> publicApiPerClass;
+
+ public static Dependencies instance(Context context) {
+ Dependencies instance = context.get(dependenciesKey);
+ if (instance == null)
+ instance = new Dependencies(context);
+ return instance;
+ }
+
+ private Dependencies(Context context) {
+ context.put(dependenciesKey, this);
+ log = Log.instance(context);
+ }
+
+ public void reset()
+ {
+ deps = new HashMap<Name, Set<Name>>();
+ explicitPackages = new HashSet<Name>();
+ publicApiPerClass = new HashMap<Name,StringBuffer>();
+ }
+
+ /**
+ * Fetch the set of dependencies that are relevant to the compile
+ * that has just been performed. I.e. we are only interested in
+ * dependencies for classes that were explicitly compiled.
+ * @return
+ */
+ public Map<String,Set<String>> getDependencies() {
+ Map<String,Set<String>> new_deps = new HashMap<String,Set<String>>();
+ if (explicitPackages == null) return new_deps;
+ for (Name pkg : explicitPackages) {
+ Set<Name> set = deps.get(pkg);
+ if (set != null) {
+ Set<String> new_set = new_deps.get(pkg.toString());
+ if (new_set == null) {
+ new_set = new HashSet<String>();
+ // Modules beware....
+ new_deps.put(":"+pkg.toString(), new_set);
+ }
+ for (Name d : set) {
+ new_set.add(":"+d.toString());
+ }
+ }
+ }
+ return new_deps;
+ }
+
+ class CompareNames implements Comparator<Name> {
+ public int compare(Name a, Name b) {
+ return a.toString().compareTo(b.toString());
+ }
+
+ public boolean equals(Object obj) {
+ return super.equals(obj);
+ }
+ }
+
+ /**
+ * Convert the map from class names to their pubapi to a map
+ * from package names to their pubapi (which is the sorted concatenation
+ * of all the class pubapis)
+ */
+ public Map<String,String> getPubapis() {
+ Map<String,String> publicApiPerPackage = new HashMap<String,String>();
+ if (publicApiPerClass == null) return publicApiPerPackage;
+ Name[] keys = publicApiPerClass.keySet().toArray(new Name[0]);
+ Arrays.sort(keys, new CompareNames());
+ StringBuffer newPublicApi = new StringBuffer();
+ int i=0;
+ String prevPkg = "";
+ for (Name k : keys) {
+ String cn = k.toString();
+ String pn = "";
+ int dp = cn.lastIndexOf('.');
+ if (dp != -1) {
+ pn = cn.substring(0,dp);
+ }
+ if (!pn.equals(prevPkg)) {
+ if (!prevPkg.equals("")) {
+ // Add default module name ":"
+ publicApiPerPackage.put(":"+prevPkg, newPublicApi.toString());
+ }
+ newPublicApi = new StringBuffer();
+ prevPkg = pn;
+ }
+ newPublicApi.append(publicApiPerClass.get(k));
+ i++;
+ }
+ if (!prevPkg.equals(""))
+ publicApiPerPackage.put(":"+prevPkg, newPublicApi.toString());
+ return publicApiPerPackage;
+ }
+
+ /**
+ * Visit the api of a class and construct a pubapi string and
+ * store it into the pubapi_perclass map.
+ */
+ public void visitPubapi(Element e) {
+ Name n = ((ClassSymbol)e).fullname;
+ Name p = ((ClassSymbol)e).packge().fullname;
+ StringBuffer sb = publicApiPerClass.get(n);
+ assert(sb == null);
+ sb = new StringBuffer();
+ PubapiVisitor v = new PubapiVisitor(sb);
+ v.visit(e);
+ if (sb.length()>0) {
+ publicApiPerClass.put(n, sb);
+ }
+ explicitPackages.add(p);
+ }
+
+ /**
+ * Collect a dependency. curr_pkg is marked as depending on dep_pkg.
+ */
+ public void collect(Name currPkg, Name depPkg) {
+ if (!currPkg.equals(depPkg)) {
+ Set<Name> theset = deps.get(currPkg);
+ if (theset==null) {
+ theset = new HashSet<Name>();
+ deps.put(currPkg, theset);
+ }
+ theset.add(depPkg);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.comp;
+
+import java.util.StringTokenizer;
+
+import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.sjavac.server.CompilerThread;
+import java.io.File;
+
+/** Subclass to Resolve that overrides collect.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class JavaCompilerWithDeps extends JavaCompiler {
+
+ /** The dependency database
+ */
+ protected Dependencies deps;
+ protected CompilerThread compilerThread;
+
+ public JavaCompilerWithDeps(Context context, CompilerThread t) {
+ super(context);
+ deps = Dependencies.instance(context);
+ compilerThread = t;
+ needRootClasses = true;
+ }
+
+ public static void preRegister(Context context, final CompilerThread t) {
+ context.put(compilerKey, new Context.Factory<JavaCompiler>() {
+ public JavaCompiler make(Context c) {
+ JavaCompiler instance = new JavaCompilerWithDeps(c, t);
+ c.put(JavaCompiler.class, instance);
+ return instance;
+ }
+ });
+ }
+
+ /** Collect the public apis of classes supplied explicitly for compilation.
+ * @param sym The class to visit.
+ */
+ @Override
+ public void reportPublicApi(ClassSymbol sym) {
+ // The next test will catch when source files are located in the wrong directory!
+ // This ought to be moved into javac as a new warning, or perhaps as part
+ // of the auxiliary class warning.
+
+ // For example if sun.swing.BeanInfoUtils
+ // is in fact stored in: /mybuild/jdk/gensrc/javax/swing/beaninfo/BeanInfoUtils.java
+
+ // We do not need to test that BeanInfoUtils is stored in a file named BeanInfoUtils
+ // since this is checked earlier.
+ if (sym.sourcefile != null) {
+ // Rewrite sun.swing.BeanInfoUtils into /sun/swing/
+ StringBuilder pathb = new StringBuilder();
+ StringTokenizer qn = new StringTokenizer(sym.packge().toString(), ".");
+ boolean first = true;
+ while (qn.hasMoreTokens()) {
+ String o = qn.nextToken();
+ pathb.append("/");
+ pathb.append(o);
+ first = false;
+ }
+ pathb.append("/");
+ String path = pathb.toString();
+
+ // Now cut the uri to be: file:///mybuild/jdk/gensrc/javax/swing/beaninfo/
+ String p = sym.sourcefile.toUri().getPath();
+ // Do not use File.separatorChar here, a URI always uses slashes /.
+ int i = p.lastIndexOf("/");
+ String pp = p.substring(0,i+1);
+
+ // Now check if the truncated uri ends with the path. (It does not == failure!)
+ if (path.length() > 0 && !path.equals("/unnamed package/") && !pp.endsWith(path)) {
+ compilerThread.logError("Error: The source file "+sym.sourcefile.getName()+
+ " is located in the wrong package directory, because it contains the class "+
+ sym.getQualifiedName());
+ }
+ }
+ deps.visitPubapi(sym);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac.comp;
+
+import java.util.Iterator;
+import java.util.List;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementScanner6;
+
+/** Utility class that constructs a textual representation
+ * of the public api of a class.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class PubapiVisitor extends ElementScanner6<Void, Void> {
+
+ StringBuffer sb;
+ // Important that it is 1! Part of protocol over wire, silly yes.
+ // Fix please.
+ int indent = 1;
+
+ public PubapiVisitor(StringBuffer sb) {
+ this.sb = sb;
+ }
+
+ String depth(int l) {
+ return " ".substring(0, l);
+ }
+
+ @Override
+ public Void visitType(TypeElement e, Void p) {
+ if (e.getModifiers().contains(Modifier.PUBLIC)
+ || e.getModifiers().contains(Modifier.PROTECTED))
+ {
+ sb.append(depth(indent) + "TYPE " + e.getQualifiedName() + "\n");
+ indent += 2;
+ Void v = super.visitType(e, p);
+ indent -= 2;
+ return v;
+ }
+ return null;
+ }
+
+ @Override
+ public Void visitVariable(VariableElement e, Void p) {
+ if (e.getModifiers().contains(Modifier.PUBLIC)
+ || e.getModifiers().contains(Modifier.PROTECTED)) {
+ sb.append(depth(indent)).append("VAR ")
+ .append(makeVariableString(e)).append("\n");
+ }
+ // Safe to not recurse here, because the only thing
+ // to visit here is the constructor of a variable declaration.
+ // If it happens to contain an anonymous inner class (which it might)
+ // then this class is never visible outside of the package anyway, so
+ // we are allowed to ignore it here.
+ return null;
+ }
+
+ @Override
+ public Void visitExecutable(ExecutableElement e, Void p) {
+ if (e.getModifiers().contains(Modifier.PUBLIC)
+ || e.getModifiers().contains(Modifier.PROTECTED)) {
+ sb.append(depth(indent)).append("METHOD ")
+ .append(makeMethodString(e)).append("\n");
+ }
+ return null;
+ }
+
+ /**
+ * Creates a String representation of a method element with everything
+ * necessary to track all public aspects of it in an API.
+ * @param e Element to create String for.
+ * @return String representation of element.
+ */
+ protected String makeMethodString(ExecutableElement e) {
+ StringBuilder result = new StringBuilder();
+ for (Modifier modifier : e.getModifiers()) {
+ result.append(modifier.toString());
+ result.append(" ");
+ }
+ result.append(e.getReturnType().toString());
+ result.append(" ");
+ result.append(e.toString());
+
+ List<? extends TypeMirror> thrownTypes = e.getThrownTypes();
+ if (!thrownTypes.isEmpty()) {
+ result.append(" throws ");
+ for (Iterator<? extends TypeMirror> iterator = thrownTypes
+ .iterator(); iterator.hasNext();) {
+ TypeMirror typeMirror = iterator.next();
+ result.append(typeMirror.toString());
+ if (iterator.hasNext()) {
+ result.append(", ");
+ }
+ }
+ }
+ return result.toString();
+ }
+
+ /**
+ * Creates a String representation of a variable element with everything
+ * necessary to track all public aspects of it in an API.
+ * @param e Element to create String for.
+ * @return String representation of element.
+ */
+ protected String makeVariableString(VariableElement e) {
+ StringBuilder result = new StringBuilder();
+ for (Modifier modifier : e.getModifiers()) {
+ result.append(modifier.toString());
+ result.append(" ");
+ }
+ result.append(e.asType().toString());
+ result.append(" ");
+ result.append(e.toString());
+ Object value = e.getConstantValue();
+ if (value != null) {
+ result.append(" = ");
+ if (e.asType().toString().equals("char")) {
+ int v = (int)value.toString().charAt(0);
+ result.append("'\\u"+Integer.toString(v,16)+"'");
+ } else {
+ result.append(value.toString());
+ }
+ }
+ return result.toString();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.comp;
+
+import com.sun.tools.javac.comp.Resolve;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.code.Symbol;
+
+/** Subclass to Resolve that overrides collect.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class ResolveWithDeps extends Resolve {
+
+ /** The dependency database
+ */
+ protected Dependencies deps;
+
+ protected ResolveWithDeps(Context context) {
+ super(context);
+ deps = Dependencies.instance(context);
+ }
+
+ public static void preRegister(Context context) {
+ context.put(resolveKey, new Context.Factory<Resolve>() {
+ public Resolve make(Context c) {
+ Resolve instance = new ResolveWithDeps(c);
+ c.put(Resolve.class, instance);
+ return instance;
+ }
+ });
+ }
+ /** Collect dependencies in the enclosing class
+ * @param from The enclosing class sym
+ * @param to The enclosing classes references this sym.
+ * */
+ @Override
+ public void reportDependence(Symbol from, Symbol to) {
+ // Capture dependencies between the packages.
+ deps.collect(from.packge().fullname, to.packge().fullname);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac.comp;
+
+import com.sun.tools.javac.util.ListBuffer;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.HashMap;
+import javax.tools.*;
+import javax.tools.JavaFileObject.Kind;
+
+/**
+ * Intercepts reads and writes to the file system to gather
+ * information about what artifacts are generated.
+ *
+ * Traps writes to certain files, if the content written is identical
+ * to the existing file.
+ *
+ * Can also blind out the filemanager from seeing certain files in the file system.
+ * Necessary to prevent javac from seeing some sources where the source path points.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class SmartFileManager extends ForwardingJavaFileManager<JavaFileManager> {
+
+ // Set of sources that can be seen by javac.
+ Set<URI> visibleSources = new HashSet<URI>();
+ // Map from modulename:packagename to artifacts.
+ Map<String,Set<URI>> packageArtifacts = new HashMap<String,Set<URI>>();
+ // Where to print informational messages.
+ PrintWriter stdout;
+
+ public SmartFileManager(JavaFileManager fileManager) {
+ super(fileManager);
+ }
+
+ public void setVisibleSources(Set<URI> s) {
+ visibleSources = s;
+ }
+
+ public void cleanArtifacts() {
+ packageArtifacts = new HashMap<String,Set<URI>>();
+ }
+
+ public void setLog(PrintWriter pw) {
+ stdout = pw;
+ }
+
+ public Map<String,Set<URI>> getPackageArtifacts() {
+ return packageArtifacts;
+ }
+
+ @Override
+ public Iterable<JavaFileObject> list(Location location,
+ String packageName,
+ Set<Kind> kinds,
+ boolean recurse)
+ throws IOException
+ {
+ // Acquire the list of files.
+ Iterable<JavaFileObject> files = super.list(location, packageName, kinds, recurse);
+ if (visibleSources.isEmpty()) {
+ return files;
+ }
+ // Now filter!
+ ListBuffer<JavaFileObject> filteredFiles = new ListBuffer<JavaFileObject>();
+ for (JavaFileObject f : files) {
+ URI uri = f.toUri();
+ String t = uri.toString();
+ if (t.startsWith("jar:")
+ || t.endsWith(".class")
+ || visibleSources.contains(uri))
+ {
+ filteredFiles.add(f);
+ }
+ }
+ return filteredFiles;
+ }
+
+ @Override
+ public boolean hasLocation(Location location) {
+ return super.hasLocation(location);
+ }
+
+ @Override
+ public JavaFileObject getJavaFileForInput(Location location,
+ String className,
+ Kind kind)
+ throws IOException
+ {
+ JavaFileObject file = super.getJavaFileForInput(location, className, kind);
+ if (file == null || visibleSources.isEmpty()) {
+ return file;
+ }
+
+ if (visibleSources.contains(file.toUri())) {
+ return file;
+ }
+ return null;
+ }
+
+ @Override
+ public JavaFileObject getJavaFileForOutput(Location location,
+ String className,
+ Kind kind,
+ FileObject sibling)
+ throws IOException
+ {
+ JavaFileObject file = super.getJavaFileForOutput(location, className, kind, sibling);
+ if (file == null) return file;
+ int dp = className.lastIndexOf('.');
+ String pkg_name = "";
+ if (dp != -1) {
+ pkg_name = className.substring(0, dp);
+ }
+ // When modules are in use, then the mod_name might be something like "jdk_base"
+ String mod_name = "";
+ addArtifact(mod_name+":"+pkg_name, file.toUri());
+ return file;
+ }
+
+ @Override
+ public FileObject getFileForInput(Location location,
+ String packageName,
+ String relativeName)
+ throws IOException
+ {
+ FileObject file = super.getFileForInput(location, packageName, relativeName);
+ if (file == null || visibleSources.isEmpty()) {
+ return file;
+ }
+
+ if (visibleSources.contains(file.toUri())) {
+ return file;
+ }
+ return null;
+ }
+
+ @Override
+ public FileObject getFileForOutput(Location location,
+ String packageName,
+ String relativeName,
+ FileObject sibling)
+ throws IOException
+ {
+ FileObject file = super.getFileForOutput(location, packageName, relativeName, sibling);
+ if (file == null) return file;
+ if (location.equals(StandardLocation.NATIVE_HEADER_OUTPUT) &&
+ file instanceof JavaFileObject) {
+ file = new SmartFileObject((JavaFileObject)file, stdout);
+ packageName = ":" + packageNameFromFileName(relativeName);
+ }
+ if (packageName.equals("")) {
+ packageName = ":";
+ }
+ addArtifact(packageName, file.toUri());
+ return file;
+ }
+
+ private String packageNameFromFileName(String fn) {
+ StringBuilder sb = new StringBuilder();
+ int p = fn.indexOf('_'), pp = 0;
+ while (p != -1) {
+ if (sb.length() > 0) sb.append('.');
+ sb.append(fn.substring(pp,p));
+ if (p == fn.length()-1) break;
+ pp = p+1;
+ p = fn.indexOf('_',pp);
+ }
+ return sb.toString();
+ }
+
+ @Override
+ public void flush() throws IOException {
+ super.flush();
+ }
+
+ @Override
+ public void close() throws IOException {
+ super.close();
+ }
+
+ void addArtifact(String pkgName, URI art) {
+ Set<URI> s = packageArtifacts.get(pkgName);
+ if (s == null) {
+ s = new HashSet<URI>();
+ packageArtifacts.put(pkgName, s);
+ }
+ s.add(art);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac.comp;
+
+import java.io.*;
+import java.net.URI;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.NestingKind;
+import javax.tools.JavaFileObject;
+
+/**
+ * The SmartFileObject will return an outputstream that cache the written data
+ * and compare the new content with the old content on disk. Only if they differ,
+ * will the file be updated.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class SmartFileObject implements JavaFileObject {
+
+ JavaFileObject file;
+ PrintWriter stdout;
+
+ public SmartFileObject(JavaFileObject r, PrintWriter pw) {
+ file = r;
+ stdout = pw;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return file.equals(other);
+ }
+
+ @Override
+ public int hashCode() {
+ return file.hashCode();
+ }
+
+ public Kind getKind() {
+ return file.getKind();
+ }
+
+ public boolean isNameCompatible(String simpleName, Kind kind) {
+ return file.isNameCompatible(simpleName, kind);
+ }
+
+ public URI toUri() {
+ return file.toUri();
+ }
+
+ public String getName() {
+ return file.getName();
+ }
+
+ public InputStream openInputStream() throws IOException {
+ return file.openInputStream();
+ }
+
+ public OutputStream openOutputStream() throws IOException {
+ return file.openOutputStream();
+ }
+
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+ return file.getCharContent(ignoreEncodingErrors);
+ }
+
+ static String lineseparator = System.getProperty("line.separator");
+
+ public Writer openWriter() throws IOException {
+ StringBuilder s = new StringBuilder();
+ try (BufferedReader r = new BufferedReader(file.openReader(true))) {
+ while (r.ready()) {
+ s.append(r.readLine()+lineseparator);
+ }
+ } catch (FileNotFoundException e) {
+ // Perfectly ok.
+ }
+ return new SmartWriter(file, s.toString(), file.getName(), stdout);
+ }
+
+ public long getLastModified() {
+ return file.getLastModified();
+ }
+
+ public boolean delete() {
+ return file.delete();
+ }
+
+ public Modifier getAccessLevel() {
+ return file.getAccessLevel();
+ }
+
+ public NestingKind getNestingKind() {
+ return file.getNestingKind();
+ }
+
+ public Reader openReader(boolean ignoreEncodingErrors) throws IOException {
+ return file.openReader(ignoreEncodingErrors);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.comp;
+
+import java.io.*;
+import javax.tools.JavaFileObject;
+
+/**
+ * The SmartWriter will cache the written data and when the writer is closed,
+ * then it will compare the cached data with the old_content string.
+ * If different, then it will write all the new content to the file.
+ * If not, the file is not touched.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class SmartWriter extends Writer {
+
+ String name;
+ JavaFileObject file;
+ String oldContent;
+ StringWriter newContent = new StringWriter();
+ PrintWriter stdout;
+ boolean closed;
+ public SmartWriter(JavaFileObject f, String s, String n, PrintWriter pw) {
+ name = n;
+ file = f;
+ oldContent = s;
+ newContent = new StringWriter();
+ stdout = pw;
+ closed = false;
+ }
+
+ public void write(char[] chars, int i, int i1)
+ {
+ newContent.write(chars, i, i1);
+ }
+
+ public void close() throws IOException {
+ if (closed) return;
+ closed = true;
+ String s = newContent.toString();
+ if (!oldContent.equals(s)) {
+ int p = file.getName().lastIndexOf(File.separatorChar);
+ try (Writer writer = file.openWriter()) {
+ writer.write(s);
+ }
+ stdout.println("Writing "+file.getName().substring(p+1));
+ }
+ }
+
+ public void flush() throws IOException {
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/server/CompilerPool.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac.server;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+import java.util.Stack;
+import java.util.concurrent.Future;
+
+/** The compiler pool maintains compiler threads.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class CompilerPool {
+ // The javac server that created this pool.
+ private JavacServer javacServer;
+ // A semaphore protecting the poolsize number of threads.
+ private Semaphore available;
+ // The stack of compiler threads.
+ private Stack<CompilerThread> compilers = new Stack<CompilerThread>();
+ // And the executor server to spawn threads.
+ private final ExecutorService executorPool;
+ // How many requests are active right now?
+ private int concurrentRequests = 0;
+ // When was the last request finished?
+ private long lastRequestFinished = 0;
+ // The total number of requests to this pool.
+ private int numRequests = 0;
+ // Protect access to the three above values.
+ private static final Object conc = new Object();
+
+ /**
+ * Return the javac server that this pool belongs to.
+ */
+ public JavacServer getJavacServer() {
+ return javacServer;
+ }
+
+ /**
+ * Return how many threads are running at this very moment.
+ */
+ public int numActiveRequests()
+ {
+ synchronized (conc) {
+ return concurrentRequests;
+ }
+ }
+
+ /**
+ * Return when the last request was finished.
+ * I.e. the pool has been idle since.
+ */
+ public long lastRequestFinished()
+ {
+ synchronized (conc) {
+ return lastRequestFinished;
+ }
+ }
+
+ /**
+ * Up the number of active requests.
+ */
+ public int startRequest() {
+ int n;
+ synchronized (conc) {
+ concurrentRequests++;
+ numRequests++;
+ n = numRequests;
+ }
+ return n;
+ }
+
+ /**
+ * Down the number of active requests. Return the current time.
+ */
+ public long stopRequest() {
+ synchronized (conc) {
+ concurrentRequests--;
+ lastRequestFinished = System.currentTimeMillis();
+ }
+ return lastRequestFinished;
+ }
+
+ /**
+ * Create a new compiler pool.
+ */
+ CompilerPool(int poolsize, JavacServer server) {
+ available = new Semaphore(poolsize, true);
+ javacServer = server;
+ executorPool = Executors.newFixedThreadPool(poolsize);
+ lastRequestFinished = System.currentTimeMillis();
+ }
+
+ /**
+ * Execute a compiler thread.
+ */
+ public void execute(CompilerThread ct) {
+ executorPool.execute(ct);
+ }
+
+ /**
+ * Execute a minor task, for example generating bytecodes and writing them to disk,
+ * that belong to a major compiler thread task.
+ */
+ public Future<?> executeSubtask(CompilerThread t, Runnable r) {
+ return executorPool.submit(r);
+ }
+
+ /**
+ * Shutdown the pool.
+ */
+ public void shutdown() {
+ executorPool.shutdown();
+ }
+
+ /**
+ * Acquire a compiler thread from the pool, or block until a thread is available.
+ * If the pools is empty, create a new thread, but never more than is "available".
+ */
+ public CompilerThread grabCompilerThread() throws InterruptedException {
+ available.acquire();
+ if (compilers.empty()) {
+ return new CompilerThread(this);
+ }
+ return compilers.pop();
+ }
+
+ /**
+ * Return the specified compiler thread to the pool.
+ */
+ public void returnCompilerThread(CompilerThread h) {
+ compilers.push(h);
+ available.release();
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/server/CompilerThread.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,419 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac.server;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.concurrent.Future;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.BaseFileManager;
+import com.sun.tools.sjavac.comp.Dependencies;
+import com.sun.tools.sjavac.comp.JavaCompilerWithDeps;
+import com.sun.tools.sjavac.comp.SmartFileManager;
+import com.sun.tools.sjavac.comp.ResolveWithDeps;
+
+/**
+ * The compiler thread maintains a JavaCompiler instance and
+ * can receive a request from the client, perform the compilation
+ * requested and report back the results.
+ *
+ * * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public class CompilerThread implements Runnable {
+ private JavacServer javacServer;
+ private CompilerPool compilerPool;
+ private List<Future<?>> subTasks;
+
+ // Communicating over this socket.
+ private Socket socket;
+
+ // The necessary classes to do a compilation.
+ private com.sun.tools.javac.api.JavacTool compiler;
+ private StandardJavaFileManager fileManager;
+ private BaseFileManager fileManagerBase;
+ private SmartFileManager smartFileManager;
+ private Context context;
+
+ // If true, then this thread is serving a request.
+ private boolean inUse = false;
+
+ CompilerThread(CompilerPool cp) {
+ compilerPool = cp;
+ javacServer = cp.getJavacServer();
+ }
+
+ /**
+ * Execute a minor task, for example generating bytecodes and writing them to disk,
+ * that belong to a major compiler thread task.
+ */
+ public synchronized void executeSubtask(Runnable r) {
+ subTasks.add(compilerPool.executeSubtask(this, r));
+ }
+
+ /**
+ * Count the number of active sub tasks.
+ */
+ public synchronized int numActiveSubTasks() {
+ int c = 0;
+ for (Future<?> f : subTasks) {
+ if (!f.isDone() && !f.isCancelled()) {
+ c++;
+ }
+ }
+ return c;
+ }
+
+ /**
+ * Use this socket for the upcoming request.
+ */
+ public void setSocket(Socket s) {
+ socket = s;
+ }
+
+ /**
+ * Prepare the compiler thread for use. It is not yet started.
+ * It will be started by the executor service.
+ */
+ public synchronized void use() {
+ assert(!inUse);
+ inUse = true;
+ compiler = com.sun.tools.javac.api.JavacTool.create();
+ fileManager = compiler.getStandardFileManager(null, null, null);
+ fileManagerBase = (BaseFileManager)fileManager;
+ smartFileManager = new SmartFileManager(fileManager);
+ context = new Context();
+ context.put(JavaFileManager.class, smartFileManager);
+ ResolveWithDeps.preRegister(context);
+ JavaCompilerWithDeps.preRegister(context, this);
+ subTasks = new ArrayList<Future<?>>();
+ }
+
+ /**
+ * Prepare the compiler thread for idleness.
+ */
+ public synchronized void unuse() {
+ assert(inUse);
+ inUse = false;
+ compiler = null;
+ fileManager = null;
+ fileManagerBase = null;
+ smartFileManager = null;
+ context = null;
+ subTasks = null;
+ }
+
+ /**
+ * Expect this key on the next line read from the reader.
+ */
+ private static boolean expect(BufferedReader in, String key) throws IOException {
+ String s = in.readLine();
+ if (s != null && s.equals(key)) {
+ return true;
+ }
+ return false;
+ }
+
+ // The request identifier, for example GENERATE_NEWBYTECODE
+ String id = "";
+
+ public String currentRequestId() {
+ return id;
+ }
+
+ PrintWriter stdout;
+ PrintWriter stderr;
+ int forcedExitCode = 0;
+
+ public void logError(String msg) {
+ stderr.println(msg);
+ forcedExitCode = -1;
+ }
+
+ /**
+ * Invoked by the executor service.
+ */
+ public void run() {
+ // Unique nr that identifies this request.
+ int thisRequest = compilerPool.startRequest();
+ long start = System.currentTimeMillis();
+ int numClasses = 0;
+ StringBuilder compiledPkgs = new StringBuilder();
+ use();
+
+ PrintWriter out = null;
+ try {
+ javacServer.log("<"+thisRequest+"> Connect from "+socket.getRemoteSocketAddress()+" activethreads="+compilerPool.numActiveRequests());
+ BufferedReader in = new BufferedReader(new InputStreamReader(
+ socket.getInputStream()));
+ out = new PrintWriter(new OutputStreamWriter(
+ socket.getOutputStream()));
+ if (!expect(in, JavacServer.PROTOCOL_COOKIE_VERSION)) {
+ javacServer.log("<"+thisRequest+"> Bad protocol from ip "+socket.getRemoteSocketAddress());
+ return;
+ }
+
+ String cookie = in.readLine();
+ if (cookie == null || !cookie.equals(""+javacServer.getCookie())) {
+ javacServer.log("<"+thisRequest+"> Bad cookie from ip "+socket.getRemoteSocketAddress());
+ return;
+ }
+ if (!expect(in, JavacServer.PROTOCOL_CWD)) {
+ return;
+ }
+ String cwd = in.readLine();
+ if (cwd == null)
+ return;
+ if (!expect(in, JavacServer.PROTOCOL_ID)) {
+ return;
+ }
+ id = in.readLine();
+ if (id == null)
+ return;
+ if (!expect(in, JavacServer.PROTOCOL_ARGS)) {
+ return;
+ }
+ ArrayList<String> the_options = new ArrayList<String>();
+ ArrayList<File> the_classes = new ArrayList<File>();
+ Iterable<File> path = Arrays.<File> asList(new File(cwd));
+
+ for (;;) {
+ String l = in.readLine();
+ if (l == null)
+ return;
+ if (l.equals(JavacServer.PROTOCOL_SOURCES_TO_COMPILE))
+ break;
+ if (l.startsWith("--server:"))
+ continue;
+ if (!l.startsWith("-") && l.endsWith(".java")) {
+ the_classes.add(new File(l));
+ numClasses++;
+ } else {
+ the_options.add(l);
+ }
+ continue;
+ }
+
+ // Load sources to compile
+ Set<URI> sourcesToCompile = new HashSet<URI>();
+ for (;;) {
+ String l = in.readLine();
+ if (l == null)
+ return;
+ if (l.equals(JavacServer.PROTOCOL_VISIBLE_SOURCES))
+ break;
+ try {
+ sourcesToCompile.add(new URI(l));
+ numClasses++;
+ } catch (URISyntaxException e) {
+ return;
+ }
+ }
+ // Load visible sources
+ Set<URI> visibleSources = new HashSet<URI>();
+ boolean fix_drive_letter_case = System.getProperty("os.name").toLowerCase().equals("windows");
+ for (;;) {
+ String l = in.readLine();
+ if (l == null)
+ return;
+ if (l.equals(JavacServer.PROTOCOL_END))
+ break;
+ try {
+ URI u = new URI(l);
+ if (fix_drive_letter_case) {
+ // Make sure the driver letter is lower case.
+ String s = u.toString();
+ if (s.startsWith("file:/") &&
+ Character.isUpperCase(s.charAt(6))) {
+ u = new URI("file:/"+Character.toLowerCase(s.charAt(6))+s.substring(7));
+ }
+ }
+ visibleSources.add(u);
+ } catch (URISyntaxException e) {
+ return;
+ }
+ }
+
+ // A completed request has been received.
+
+ // Now setup the actual compilation....
+ // First deal with explicit source files on cmdline and in at file.
+ com.sun.tools.javac.util.ListBuffer<JavaFileObject> compilationUnits =
+ new com.sun.tools.javac.util.ListBuffer<JavaFileObject>();
+ for (JavaFileObject i : fileManager.getJavaFileObjectsFromFiles(the_classes)) {
+ compilationUnits.append(i);
+ }
+ // Now deal with sources supplied as source_to_compile.
+ com.sun.tools.javac.util.ListBuffer<File> sourcesToCompileFiles =
+ new com.sun.tools.javac.util.ListBuffer<File>();
+ for (URI u : sourcesToCompile) {
+ sourcesToCompileFiles.append(new File(u));
+ }
+ for (JavaFileObject i : fileManager.getJavaFileObjectsFromFiles(sourcesToCompileFiles)) {
+ compilationUnits.append(i);
+ }
+ // Log the options to be used.
+ StringBuilder options = new StringBuilder();
+ for (String s : the_options) {
+ options.append(">").append(s).append("< ");
+ }
+ javacServer.log(id+" <"+thisRequest+"> options "+options.toString());
+
+ forcedExitCode = 0;
+ // Create a new logger.
+ StringWriter stdoutLog = new StringWriter();
+ StringWriter stderrLog = new StringWriter();
+ stdout = new PrintWriter(stdoutLog);
+ stderr = new PrintWriter(stderrLog);
+ com.sun.tools.javac.main.Main.Result rc = com.sun.tools.javac.main.Main.Result.OK;
+ try {
+ if (compilationUnits.size() > 0) {
+ // Bind the new logger to the existing context.
+ context.put(Log.outKey, stderr);
+ Log.instance(context).setWriter(Log.WriterKind.NOTICE, stdout);
+ Log.instance(context).setWriter(Log.WriterKind.WARNING, stderr);
+ Log.instance(context).setWriter(Log.WriterKind.ERROR, stderr);
+ // Process the options.
+ com.sun.tools.javac.api.JavacTool.processOptions(context, smartFileManager, the_options);
+ fileManagerBase.setContext(context);
+ smartFileManager.setVisibleSources(visibleSources);
+ smartFileManager.cleanArtifacts();
+ smartFileManager.setLog(stdout);
+ Dependencies.instance(context).reset();
+
+ com.sun.tools.javac.main.Main ccompiler = new com.sun.tools.javac.main.Main("javacTask", stderr);
+ String[] aa = the_options.toArray(new String[0]);
+
+ // Do the compilation!
+ rc = ccompiler.compile(aa, context, compilationUnits.toList(), null);
+
+ while (numActiveSubTasks()>0) {
+ try { Thread.sleep(1000); } catch (InterruptedException e) { }
+ }
+
+ smartFileManager.flush();
+ }
+ } catch (Exception e) {
+ stderr.println(e.getMessage());
+ forcedExitCode = -1;
+ }
+
+ // Send the response..
+ out.println(JavacServer.PROTOCOL_STDOUT);
+ out.print(stdoutLog);
+ out.println(JavacServer.PROTOCOL_STDERR);
+ out.print(stderrLog);
+ // The compilation is complete! And errors will have already been printed on out!
+ out.println(JavacServer.PROTOCOL_PACKAGE_ARTIFACTS);
+ Map<String,Set<URI>> pa = smartFileManager.getPackageArtifacts();
+ for (String aPkgName : pa.keySet()) {
+ out.println("+"+aPkgName);
+ Set<URI> as = pa.get(aPkgName);
+ for (URI a : as) {
+ out.println(" "+a.toString());
+ }
+ }
+ Dependencies deps = Dependencies.instance(context);
+ out.println(JavacServer.PROTOCOL_PACKAGE_DEPENDENCIES);
+ Map<String,Set<String>> pd = deps.getDependencies();
+ for (String aPkgName : pd.keySet()) {
+ out.println("+"+aPkgName);
+ Set<String> ds = pd.get(aPkgName);
+ // Everything depends on java.lang
+ if (!ds.contains(":java.lang")) ds.add(":java.lang");
+ for (String d : ds) {
+ out.println(" "+d);
+ }
+ }
+ out.println(JavacServer.PROTOCOL_PACKAGE_PUBLIC_APIS);
+ Map<String,String> pp = deps.getPubapis();
+ for (String aPkgName : pp.keySet()) {
+ out.println("+"+aPkgName);
+ String ps = pp.get(aPkgName);
+ // getPubapis added a space to each line!
+ out.println(ps);
+ compiledPkgs.append(aPkgName+" ");
+ }
+ out.println(JavacServer.PROTOCOL_SYSINFO);
+ out.println("num_cores=" + Runtime.getRuntime().availableProcessors());
+ out.println("max_memory=" + Runtime.getRuntime().maxMemory());
+ out.println(JavacServer.PROTOCOL_RETURN_CODE);
+
+ // Errors from sjavac that affect compilation status!
+ int rcv = rc.exitCode;
+ if (rcv == 0 && forcedExitCode != 0) {
+ rcv = forcedExitCode;
+ }
+ out.println("" + rcv);
+ out.println(JavacServer.PROTOCOL_END);
+ out.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (out != null) out.close();
+ if (!socket.isClosed()) {
+ socket.close();
+ }
+ socket = null;
+ } catch (Exception e) {
+ javacServer.log("ERROR "+e);
+ e.printStackTrace();
+ }
+ compilerPool.stopRequest();
+ long duration = System.currentTimeMillis()-start;
+ javacServer.addBuildTime(duration);
+ float classpersec = ((float)numClasses)*(((float)1000.0)/((float)duration));
+ javacServer.log(id+" <"+thisRequest+"> "+compiledPkgs+" duration " + duration+ " ms num_classes="+numClasses+
+ " classpersec="+classpersec+" subtasks="+subTasks.size());
+ javacServer.flushLog();
+ unuse();
+ compilerPool.returnCompilerThread(this);
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/server/JavacServer.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,751 @@
+/*
+ * Copyright (c) 2011-2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.sjavac.server;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.FileNotFoundException;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.util.ArrayList;
+import java.util.Random;
+
+import com.sun.tools.sjavac.Util;
+import com.sun.tools.sjavac.ProblemException;
+import java.io.*;
+import java.util.*;
+
+/**
+ * The JavacServer class contains methods both to setup a server that responds to requests and methods to connect to this server.
+ *
+ * <p><b>This is NOT part of any supported API. If you write code that depends on this, you do so at your own risk. This code and its internal interfaces are
+ * subject to change or deletion without notice.</b></p>
+ */
+public class JavacServer {
+ // Responding to this tcp/ip port on localhost.
+
+ private final ServerSocket serverSocket;
+ // The secret cookie shared between server and client through the port file.
+ private final long myCookie;
+ // When the server was started.
+ private long serverStart;
+ // Accumulated build time for all requests, not counting idle time.
+ private long totalBuildTime;
+ // The javac server specific log file.
+ PrintWriter theLog;
+ // The compiler pool that maintains the compiler threads.
+ CompilerPool compilerPool;
+ // For the client, all port files fetched, one per started javac server.
+ // Though usually only one javac server is started by a client.
+ private static Map<String, PortFile> allPortFiles;
+ private static Map<String, Long> maxServerMemory;
+ final static int ERROR_FATAL = -1;
+ final static int ERROR_BUT_TRY_AGAIN = -4712;
+ final static String PROTOCOL_COOKIE_VERSION = "----THE-COOKIE-V2----";
+ final static String PROTOCOL_CWD = "----THE-CWD----";
+ final static String PROTOCOL_ID = "----THE-ID----";
+ final static String PROTOCOL_ARGS = "----THE-ARGS----";
+ final static String PROTOCOL_SOURCES_TO_COMPILE = "----THE-SOURCES-TO-COMPILE----";
+ final static String PROTOCOL_VISIBLE_SOURCES = "----THE-VISIBLE-SOURCES----";
+ final static String PROTOCOL_END = "----THE-END----";
+ final static String PROTOCOL_STDOUT = "----THE-STDOUT----";
+ final static String PROTOCOL_STDERR = "----THE-STDERR----";
+ final static String PROTOCOL_PACKAGE_ARTIFACTS = "----THE-PACKAGE_ARTIFACTS----";
+ final static String PROTOCOL_PACKAGE_DEPENDENCIES = "----THE-PACKAGE_DEPENDENCIES----";
+ final static String PROTOCOL_PACKAGE_PUBLIC_APIS = "----THE-PACKAGE-PUBLIC-APIS----";
+ final static String PROTOCOL_SYSINFO = "----THE-SYSINFO----";
+ final static String PROTOCOL_RETURN_CODE = "----THE-RETURN-CODE----";
+ // Check if the portfile is gone, every 5 seconds.
+ static int CHECK_PORTFILE_INTERVAL = 5;
+ // Wait 2 seconds for response, before giving up on javac server.
+ static int CONNECTION_TIMEOUT = 2;
+ static int WAIT_BETWEEN_CONNECT_ATTEMPTS = 1;
+ static int MAX_NUM_CONNECT_ATTEMPTS = 3;
+
+ /**
+ * Acquire the port file. Synchronized since several threads inside an smart javac wrapper client acquires the same port file at the same time.
+ */
+ private static synchronized PortFile getPortFile(String filename) throws FileNotFoundException {
+ if (allPortFiles == null) {
+ allPortFiles = new HashMap<String, PortFile>();
+ }
+ PortFile pf = allPortFiles.get(filename);
+ if (pf == null) {
+ pf = new PortFile(filename);
+ allPortFiles.put(filename, pf);
+ }
+ return pf;
+ }
+
+ /**
+ * Get the cookie used for this server.
+ */
+ long getCookie() {
+ return myCookie;
+ }
+
+ /**
+ * Get the port used for this server.
+ */
+ int getPort() {
+ return serverSocket.getLocalPort();
+ }
+
+ /**
+ * Sum up the total build time for this javac server.
+ */
+ public void addBuildTime(long inc) {
+ totalBuildTime += inc;
+ }
+
+ /**
+ * Log this message.
+ */
+ public void log(String msg) {
+ if (theLog != null) {
+ theLog.println(msg);
+ } else {
+ System.err.println(msg);
+ }
+ }
+
+ /**
+ * Make sure the log is flushed.
+ */
+ public void flushLog() {
+ if (theLog != null) {
+ theLog.flush();
+ }
+ }
+
+ /**
+ * Start a server using a settings string. Typically: "--startserver:portfile=/tmp/myserver,poolsize=3" and the string "portfile=/tmp/myserver,poolsize=3"
+ * is sent as the settings parameter. Returns 0 on success, -1 on failure.
+ */
+ public static int startServer(String settings, PrintStream err) {
+ try {
+ String portfile = Util.extractStringOption("portfile", settings);
+ // The log file collects more javac server specific log information.
+ String logfile = Util.extractStringOption("logfile", settings);
+ // The stdouterr file collects all the System.out and System.err writes to disk.
+ String stdouterrfile = Util.extractStringOption("stdouterrfile", settings);
+ // We could perhaps use System.setOut and setErr here.
+ // But for the moment we rely on the client to spawn a shell where stdout
+ // and stderr are redirected already.
+ // The pool size is a limit the number of concurrent compiler threads used.
+ // The server might use less than these to avoid memory problems.
+ int poolsize = Util.extractIntOption("poolsize", settings);
+ if (poolsize <= 0) {
+ // If not set, default to the number of cores.
+ poolsize = Runtime.getRuntime().availableProcessors();
+ }
+
+ // How many seconds of inactivity will the server accept before quitting?
+ int keepalive = Util.extractIntOption("keepalive", settings);
+ if (keepalive <= 0) {
+ keepalive = 120;
+ }
+ // The port file is locked and the server port and cookie is written into it.
+ PortFile portFile = getPortFile(portfile);
+ JavacServer s;
+
+ synchronized (portFile) {
+ portFile.lock();
+ portFile.getValues();
+ if (portFile.containsPortInfo()) {
+ err.println("Javac server not started because portfile exists!");
+ portFile.unlock();
+ return -1;
+ }
+ s = new JavacServer(poolsize, logfile);
+ portFile.setValues(s.getPort(), s.getCookie());
+ portFile.unlock();
+ }
+
+ // Run the server. Will delete the port file when shutting down.
+ // It will shut down automatically when no new requests have come in
+ // during the last 125 seconds.
+ s.run(portFile, err, keepalive);
+ // The run loop for the server has exited.
+ return 0;
+ } catch (Exception e) {
+ e.printStackTrace(err);
+ return -1;
+ }
+ }
+
+ /**
+ * Dispatch a compilation request to a javac server.
+ *
+ * @param args are the command line args to javac and is allowed to contain source files, @file and other command line options to javac.
+ *
+ * The generated classes, h files and other artifacts from the javac invocation are stored by the javac server to disk.
+ *
+ * @param sources_to_compile The sources to compile.
+ *
+ * @param visibleSources If visible sources has a non zero size, then visible_sources are the only files in the file system that the javac server can see!
+ * (Sources to compile are always visible.) The visible sources are those supplied by the (filtered) -sourcepath
+ *
+ * @param visibleClasses If visible classes for a specific root/jar has a non zero size, then visible_classes are the only class files that the javac server
+ * can see, in that root/jar. It maps from a classpath root or a jar file to the set of visible classes for that root/jar.
+ *
+ * The server return meta data about the build in the following parameters.
+ * @param package_artifacts, map from package name to set of created artifacts for that package.
+ * @param package_dependencies, map from package name to set of packages that it depends upon.
+ * @param package_pubapis, map from package name to unique string identifying its pub api.
+ */
+ public static int useServer(String settings, String[] args,
+ Set<URI> sourcesToCompile,
+ Set<URI> visibleSources,
+ Map<URI, Set<String>> visibleClasses,
+ Map<String, Set<URI>> packageArtifacts,
+ Map<String, Set<String>> packageDependencies,
+ Map<String, String> packagePubapis,
+ SysInfo sysinfo,
+ PrintStream out,
+ PrintStream err) {
+ try {
+ // The id can perhaps be used in the future by the javac server to reuse the
+ // JavaCompiler instance for several compiles using the same id.
+ String id = Util.extractStringOption("id", settings);
+ String portfile = Util.extractStringOption("portfile", settings);
+ String logfile = Util.extractStringOption("logfile", settings);
+ String stdouterrfile = Util.extractStringOption("stdouterrfile", settings);
+ String background = Util.extractStringOption("background", settings);
+ if (background == null || !background.equals("false")) {
+ background = "true";
+ }
+ // The sjavac option specifies how the server part of sjavac is spawned.
+ // If you have the experimental sjavac in your path, you are done. If not, you have
+ // to point to a com.sun.tools.sjavac.Main that supports --startserver
+ // for example by setting: sjavac=java%20-jar%20...javac.jar%com.sun.tools.sjavac.Main
+ String sjavac = Util.extractStringOption("sjavac", settings);
+ int poolsize = Util.extractIntOption("poolsize", settings);
+ int keepalive = Util.extractIntOption("keepalive", settings);
+
+ if (keepalive <= 0) {
+ // Default keepalive for server is 120 seconds.
+ // I.e. it will accept 120 seconds of inactivity before quitting.
+ keepalive = 120;
+ }
+ if (portfile == null) {
+ err.println("No portfile was specified!");
+ return -1;
+ }
+ if (logfile == null) {
+ logfile = portfile + ".javaclog";
+ }
+ if (stdouterrfile == null) {
+ stdouterrfile = portfile + ".stdouterr";
+ }
+ // Default to sjavac and hope it is in the path.
+ if (sjavac == null) {
+ sjavac = "sjavac";
+ }
+
+ int attempts = 0;
+ int rc = -1;
+ do {
+ PortFile port_file = getPortFile(portfile);
+ synchronized (port_file) {
+ port_file.lock();
+ port_file.getValues();
+ port_file.unlock();
+ }
+ if (!port_file.containsPortInfo()) {
+ String cmd = fork(sjavac, port_file.getFilename(), logfile, poolsize, keepalive, err, stdouterrfile, background);
+
+ if (background.equals("true") && !port_file.waitForValidValues()) {
+ // Ouch the server did not start! Lets print its stdouterrfile and the command used.
+ printFailedAttempt(cmd, stdouterrfile, err);
+ // And give up.
+ return -1;
+ }
+ }
+ rc = connectAndCompile(port_file, id, args, sourcesToCompile, visibleSources,
+ packageArtifacts, packageDependencies, packagePubapis, sysinfo,
+ out, err);
+ // Try again until we manage to connect. Any error after that
+ // will cause the compilation to fail.
+ if (rc == ERROR_BUT_TRY_AGAIN) {
+ // We could not connect to the server. Try again.
+ attempts++;
+ try {
+ Thread.sleep(WAIT_BETWEEN_CONNECT_ATTEMPTS);
+ } catch (InterruptedException e) {
+ }
+ }
+ } while (rc == ERROR_BUT_TRY_AGAIN && attempts < MAX_NUM_CONNECT_ATTEMPTS);
+ return rc;
+ } catch (Exception e) {
+ e.printStackTrace(err);
+ return -1;
+ }
+ }
+
+ private static void printFailedAttempt(String cmd, String f, PrintStream err) {
+ err.println("---- Failed to start javac server with this command -----");
+ err.println(cmd);
+ try {
+ BufferedReader in = new BufferedReader(new FileReader(f));
+ err.println("---- stdout/stderr output from attempt to start javac server -----");
+ for (;;) {
+ String l = in.readLine();
+ if (l == null) {
+ break;
+ }
+ err.println(l);
+ }
+ err.println("------------------------------------------------------------------");
+ } catch (Exception e) {
+ err.println("The stdout/stderr output in file " + f + " does not exist and the server did not start.");
+ }
+ }
+
+ /**
+ * Spawn the server instance.
+ */
+
+ private JavacServer(int poolSize, String logfile) throws IOException {
+ serverStart = System.currentTimeMillis();
+ // Create a server socket on a random port that is bound to the localhost/127.0.0.1 interface.
+ // I.e only local processes can connect to this port.
+ serverSocket = new ServerSocket(0, 128, InetAddress.getByName(null));
+ compilerPool = new CompilerPool(poolSize, this);
+ Random rnd = new Random();
+ myCookie = rnd.nextLong();
+ theLog = new PrintWriter(logfile);
+ log("Javac server started. port=" + getPort() + " date=" + (new java.util.Date()) + " with poolsize=" + poolSize);
+ flushLog();
+ }
+
+ /**
+ * Fork a background process. Returns the command line used that can be printed if something failed.
+ */
+ private static String fork(String sjavac, String portfile, String logfile, int poolsize, int keepalive,
+ final PrintStream err, String stdouterrfile, String background)
+ throws IOException, ProblemException {
+ if (stdouterrfile != null && stdouterrfile.trim().equals("")) {
+ stdouterrfile = null;
+ }
+ final String startserver = "--startserver:portfile=" + portfile + ",logfile=" + logfile + ",stdouterrfile=" + stdouterrfile + ",poolsize=" + poolsize + ",keepalive="+ keepalive;
+
+ if (background.equals("true")) {
+ sjavac += "%20" + startserver;
+ sjavac = sjavac.replaceAll("%20", " ");
+ sjavac = sjavac.replaceAll("%2C", ",");
+ // If the java/sh/cmd launcher fails the failure will be captured by stdouterr because of the redirection here.
+ String[] cmd = {"/bin/sh", "-c", sjavac + " >> " + stdouterrfile + " 2>&1"};
+ if (!(new File("/bin/sh")).canExecute()) {
+ ArrayList<String> wincmd = new ArrayList<String>();
+ wincmd.add("cmd");
+ wincmd.add("/c");
+ wincmd.add("start");
+ wincmd.add("cmd");
+ wincmd.add("/c");
+ wincmd.add(sjavac + " >> " + stdouterrfile + " 2>&1");
+ cmd = wincmd.toArray(new String[wincmd.size()]);
+ }
+ Process pp = null;
+ try {
+ pp = Runtime.getRuntime().exec(cmd);
+ } catch (Exception e) {
+ e.printStackTrace(err);
+ e.printStackTrace(new PrintWriter(stdouterrfile));
+ }
+ StringBuilder rs = new StringBuilder();
+ for (String s : cmd) {
+ rs.append(s + " ");
+ }
+ return rs.toString();
+ }
+
+ // Do not spawn a background server, instead run it within the same JVM.
+ Thread t = new Thread() {
+ @Override
+ public void run() {
+ try {
+ JavacServer.startServer(startserver, err);
+ } catch (Throwable t) {
+ t.printStackTrace(err);
+ }
+ }
+ };
+ t.start();
+ return "";
+ }
+
+ /**
+ * Expect this key on the next line read from the reader.
+ */
+ private static boolean expect(BufferedReader in, String key) throws IOException {
+ String s = in.readLine();
+ if (s != null && s.equals(key)) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Make a request to the server only to get the maximum possible heap size to use for compilations.
+ *
+ * @param port_file The port file used to synchronize creation of this server.
+ * @param id The identify of the compilation.
+ * @param out Standard out information.
+ * @param err Standard err information.
+ * @return The maximum heap size in bytes.
+ */
+ public static SysInfo connectGetSysInfo(String serverSettings, PrintStream out, PrintStream err) {
+ SysInfo sysinfo = new SysInfo(-1, -1);
+ String id = Util.extractStringOption("id", serverSettings);
+ String portfile = Util.extractStringOption("portfile", serverSettings);
+ try {
+ PortFile pf = getPortFile(portfile);
+ useServer(serverSettings, new String[0],
+ new HashSet<URI>(),
+ new HashSet<URI>(),
+ new HashMap<URI, Set<String>>(),
+ new HashMap<String, Set<URI>>(),
+ new HashMap<String, Set<String>>(),
+ new HashMap<String, String>(),
+ sysinfo, out, err);
+ } catch (Exception e) {
+ e.printStackTrace(err);
+ }
+ return sysinfo;
+ }
+
+ /**
+ * Connect and compile using the javac server settings and the args. When using more advanced features, the sources_to_compile and visible_sources are
+ * supplied to the server and meta data is returned in package_artifacts, package_dependencies and package_pubapis.
+ */
+ private static int connectAndCompile(PortFile portFile, String id, String[] args,
+ Set<URI> sourcesToCompile,
+ Set<URI> visibleSources,
+ Map<String, Set<URI>> packageArtifacts,
+ Map<String, Set<String>> packageDependencies,
+ Map<String, String> packagePublicApis,
+ SysInfo sysinfo,
+ PrintStream out,
+ PrintStream err) {
+ int rc = -3;
+ try {
+ int port = portFile.getPort();
+ if (port == 0) {
+ return ERROR_BUT_TRY_AGAIN;
+ }
+ long cookie = portFile.getCookie();
+
+ // Acquire the localhost/127.0.0.1 address.
+ InetAddress addr = InetAddress.getByName(null);
+ SocketAddress sockaddr = new InetSocketAddress(addr, port);
+ Socket sock = new Socket();
+ int timeoutMs = CONNECTION_TIMEOUT * 1000;
+ try {
+ sock.connect(sockaddr, timeoutMs);
+ } catch (java.net.ConnectException e) {
+ err.println("Could not connect to javac server found in portfile: " + portFile.getFilename() + " " + e);
+ return ERROR_BUT_TRY_AGAIN;
+ }
+ if (!sock.isConnected()) {
+ err.println("Could not connect to javac server found in portfile: " + portFile.getFilename());
+ return ERROR_BUT_TRY_AGAIN;
+ }
+ BufferedReader in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
+ PrintWriter sockout = new PrintWriter(sock.getOutputStream());
+
+ sockout.println(PROTOCOL_COOKIE_VERSION);
+ sockout.println("" + cookie);
+ sockout.println(PROTOCOL_CWD);
+ sockout.println(System.getProperty("user.dir"));
+ sockout.println(PROTOCOL_ID);
+ sockout.println(id);
+ sockout.println(PROTOCOL_ARGS);
+ for (String s : args) {
+ StringBuffer buf = new StringBuffer();
+ String[] paths = s.split(File.pathSeparator);
+ int c = 0;
+ for (String path : paths) {
+ File f = new File(path);
+ if (f.isFile() || f.isDirectory()) {
+ buf.append(f.getAbsolutePath());
+ c++;
+ if (c < paths.length) {
+ buf.append(File.pathSeparator);
+ }
+ } else {
+ buf = new StringBuffer(s);
+ break;
+ }
+ }
+ sockout.println(buf.toString());
+ }
+ sockout.println(PROTOCOL_SOURCES_TO_COMPILE);
+ for (URI uri : sourcesToCompile) {
+ sockout.println(uri.toString());
+ }
+ sockout.println(PROTOCOL_VISIBLE_SOURCES);
+ for (URI uri : visibleSources) {
+ sockout.println(uri.toString());
+ }
+ sockout.println(PROTOCOL_END);
+ sockout.flush();
+
+ StringBuffer stdout = new StringBuffer();
+ StringBuffer stderr = new StringBuffer();
+
+ if (!expect(in, PROTOCOL_STDOUT)) {
+ return ERROR_FATAL;
+ }
+ // Load stdout
+ for (;;) {
+ String l = in.readLine();
+ if (l == null) {
+ return ERROR_FATAL;
+ }
+ if (l.equals(PROTOCOL_STDERR)) {
+ break;
+ }
+ stdout.append(l);
+ stdout.append('\n');
+ }
+ // Load stderr
+ for (;;) {
+ String l = in.readLine();
+ if (l == null) {
+ return ERROR_FATAL;
+ }
+ if (l.equals(PROTOCOL_PACKAGE_ARTIFACTS)) {
+ break;
+ }
+ stderr.append(l);
+ stderr.append('\n');
+ }
+ // Load the package artifacts
+ Set<URI> lastUriSet = null;
+ for (;;) {
+ String l = in.readLine();
+ if (l == null) {
+ return ERROR_FATAL;
+ }
+ if (l.equals(PROTOCOL_PACKAGE_DEPENDENCIES)) {
+ break;
+ }
+ if (l.length() > 1 && l.charAt(0) == '+') {
+ String pkg = l.substring(1);
+ lastUriSet = new HashSet<URI>();
+ packageArtifacts.put(pkg, lastUriSet);
+ } else if (l.length() > 1 && lastUriSet != null) {
+ lastUriSet.add(new URI(l.substring(1)));
+ }
+ }
+ // Load package dependencies
+ Set<String> lastPackageSet = null;
+ for (;;) {
+ String l = in.readLine();
+ if (l == null) {
+ return ERROR_FATAL;
+ }
+ if (l.equals(PROTOCOL_PACKAGE_PUBLIC_APIS)) {
+ break;
+ }
+ if (l.length() > 1 && l.charAt(0) == '+') {
+ String pkg = l.substring(1);
+ lastPackageSet = new HashSet<String>();
+ packageDependencies.put(pkg, lastPackageSet);
+ } else if (l.length() > 1 && lastPackageSet != null) {
+ lastPackageSet.add(l.substring(1));
+ }
+ }
+ // Load package pubapis
+ Map<String, StringBuffer> tmp = new HashMap<String, StringBuffer>();
+ StringBuffer lastPublicApi = null;
+ for (;;) {
+ String l = in.readLine();
+ if (l == null) {
+ return ERROR_FATAL;
+ }
+ if (l.equals(PROTOCOL_SYSINFO)) {
+ break;
+ }
+ if (l.length() > 1 && l.charAt(0) == '+') {
+ String pkg = l.substring(1);
+ lastPublicApi = new StringBuffer();
+ tmp.put(pkg, lastPublicApi);
+ } else if (l.length() > 1 && lastPublicApi != null) {
+ lastPublicApi.append(l.substring(1));
+ lastPublicApi.append("\n");
+ }
+ }
+ for (String p : tmp.keySet()) {
+ assert (packagePublicApis.get(p) == null);
+ String api = tmp.get(p).toString();
+ packagePublicApis.put(p, api);
+ }
+ // Now reading the max memory possible.
+ for (;;) {
+ String l = in.readLine();
+ if (l == null) {
+ return ERROR_FATAL;
+ }
+ if (l.equals(PROTOCOL_RETURN_CODE)) {
+ break;
+ }
+ if (l.startsWith("num_cores=") && sysinfo != null) {
+ sysinfo.numCores = Integer.parseInt(l.substring(10));
+ }
+ if (l.startsWith("max_memory=") && sysinfo != null) {
+ sysinfo.maxMemory = Long.parseLong(l.substring(11));
+ }
+ }
+ String l = in.readLine();
+ if (l == null) {
+ err.println("No return value from the server!");
+ return ERROR_FATAL;
+ }
+ rc = Integer.parseInt(l);
+ out.print(stdout);
+ err.print(stderr);
+ } catch (Exception e) {
+ e.printStackTrace(err);
+ }
+ return rc;
+ }
+
+ /**
+ * Run the server thread until it exits. Either because of inactivity or because the port file has been deleted by someone else, or overtaken by some other
+ * javac server.
+ */
+ private void run(PortFile portFile, PrintStream err, int keepalive) {
+ boolean fileDeleted = false;
+ long timeSinceLastCompile;
+ try {
+ // Every 5 second (check_portfile_interval) we test if the portfile has disappeared => quit
+ // Or if the last request was finished more than 125 seconds ago => quit
+ // 125 = seconds_of_inactivity_before_shutdown+check_portfile_interval
+ serverSocket.setSoTimeout(CHECK_PORTFILE_INTERVAL*1000);
+ for (;;) {
+ try {
+ Socket s = serverSocket.accept();
+ CompilerThread ct = compilerPool.grabCompilerThread();
+ ct.setSocket(s);
+ compilerPool.execute(ct);
+ flushLog();
+ } catch (java.net.SocketTimeoutException e) {
+ if (compilerPool.numActiveRequests() > 0) {
+ // Never quit while there are active requests!
+ continue;
+ }
+ // If this is the timeout after the portfile
+ // has been deleted by us. Then we truly stop.
+ if (fileDeleted) {
+ log("Quitting because of "+(keepalive+CHECK_PORTFILE_INTERVAL)+" seconds of inactivity!");
+ break;
+ }
+ // Check if the portfile is still there.
+ if (!portFile.exists()) {
+ // Time to quit because the portfile was deleted by another
+ // process, probably by the makefile that is done building.
+ log("Quitting because portfile was deleted!");
+ flushLog();
+ break;
+ }
+ // Check if portfile.stop is still there.
+ if (portFile.markedForStop()) {
+ // Time to quit because another process touched the file
+ // server.port.stop to signal that the server should stop.
+ // This is necessary on some operating systems that lock
+ // the port file hard!
+ log("Quitting because a portfile.stop file was found!");
+ portFile.delete();
+ flushLog();
+ break;
+ }
+ // Does the portfile still point to me?
+ if (!portFile.stillMyValues()) {
+ // Time to quit because another build has started.
+ log("Quitting because portfile is now owned by another javac server!");
+ flushLog();
+ break;
+ }
+
+ // Check how long since the last request finished.
+ long diff = System.currentTimeMillis() - compilerPool.lastRequestFinished();
+ if (diff < keepalive * 1000) {
+ // Do not quit if we have waited less than 120 seconds.
+ continue;
+ }
+ // Ok, time to quit because of inactivity. Perhaps the build
+ // was killed and the portfile not cleaned up properly.
+ portFile.delete();
+ fileDeleted = true;
+ log("" + keepalive + " seconds of inactivity quitting in "
+ + CHECK_PORTFILE_INTERVAL + " seconds!");
+ flushLog();
+ // Now we have a second 5 second grace
+ // period where javac remote requests
+ // that have loaded the data from the
+ // recently deleted portfile can connect
+ // and complete their requests.
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace(err);
+ e.printStackTrace(theLog);
+ flushLog();
+ } finally {
+ compilerPool.shutdown();
+ }
+ long realTime = System.currentTimeMillis() - serverStart;
+ log("Shutting down.");
+ log("Total wall clock time " + realTime + "ms build time " + totalBuildTime + "ms");
+ flushLog();
+ }
+
+ public static void cleanup(String... args) {
+ String settings = Util.findServerSettings(args);
+ if (settings == null) return;
+ String portfile = Util.extractStringOption("portfile", settings);
+ String background = Util.extractStringOption("background", settings);
+ if (background != null && background.equals("false")) {
+ // If the server runs within this jvm, then delete the portfile,
+ // since this jvm is about to exit soon.
+ File f = new File(portfile);
+ f.delete();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/server/PortFile.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.sjavac.server;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.FileLockInterruptionException;
+import com.sun.tools.sjavac.Log;
+
+/**
+ * The PortFile class mediates access to a short binary file containing the tcp/ip port (for the localhost)
+ * and a cookie necessary for the server answering on that port. The file can be locked using file system
+ * primitives to avoid race conditions when several javac clients are started at the same. Note that file
+ * system locking is not always supported on a all operating systems and/or file systems.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+class PortFile {
+
+ // Port file format:
+ // byte ordering: high byte first = big endian
+ // Magic nr, 4 byte int, first in file.
+ private final static int magicNr = 0x1174;
+ // Followed by a 4 byte int, with the port nr.
+ // Followed by a 8 byte long, with cookie nr.
+
+ private String filename;
+ private File file;
+ private File stopFile;
+ private RandomAccessFile rwfile;
+ private FileChannel channel;
+ private FileLock lock;
+
+ private boolean containsPortInfo;
+ private int serverPort;
+ private long serverCookie;
+ private int myServerPort;
+ private long myServerCookie;
+
+ /**
+ * Create a new portfile.
+ * @param filename is the path to the file.
+ */
+ public PortFile(String fn) throws FileNotFoundException
+ {
+ filename = fn;
+ file = new File(filename);
+ stopFile = new File(filename+".stop");
+ rwfile = new RandomAccessFile(file, "rw");
+ // The rwfile should only be readable by the owner of the process
+ // and no other! How do we do that on a RandomAccessFile?
+ channel = rwfile.getChannel();
+ containsPortInfo = false;
+ lock = null;
+ }
+
+ /**
+ * Lock the port file.
+ */
+ void lock() throws IOException {
+ lock = channel.lock();
+ }
+
+ /**
+ * Read the values from the port file in the file system.
+ * Expects the port file to be locked.
+ */
+ public void getValues() {
+ containsPortInfo = false;
+ if (lock == null) {
+ // Not locked, remain ignorant about port file contents.
+ return;
+ }
+ try {
+ if (rwfile.length()>0) {
+ rwfile.seek(0);
+ int nr = rwfile.readInt();
+ serverPort = rwfile.readInt();
+ serverCookie = rwfile.readLong();
+
+ if (nr == magicNr) {
+ containsPortInfo = true;
+ } else {
+ containsPortInfo = false;
+ }
+ }
+ } catch (Exception e) {
+ containsPortInfo = false;
+ }
+ }
+
+ /**
+ * Did the locking and getValues succeed?
+ */
+ public boolean containsPortInfo() {
+ return containsPortInfo;
+ }
+
+ /**
+ * If so, then we can acquire the tcp/ip port on localhost.
+ */
+ public int getPort() {
+ assert(containsPortInfo);
+ return serverPort;
+ }
+
+ /**
+ * If so, then we can acquire the server cookie.
+ */
+ public long getCookie() {
+ assert(containsPortInfo);
+ return serverCookie;
+ }
+
+ /**
+ * Store the values into the locked port file.
+ */
+ public void setValues(int port, long cookie) throws IOException {
+ assert(lock != null);
+ rwfile.seek(0);
+ // Write the magic nr that identifes a port file.
+ rwfile.writeInt(magicNr);
+ rwfile.writeInt(port);
+ rwfile.writeLong(cookie);
+ myServerPort = port;
+ myServerCookie = cookie;
+ }
+
+ /**
+ * Delete the port file.
+ */
+ public void delete() throws IOException {
+ // Access to file must be closed before deleting.
+ rwfile.close();
+ // Now delete.
+ file.delete();
+ }
+
+ /**
+ * Is the port file still there?
+ */
+ public boolean exists() throws IOException {
+ return file.exists();
+ }
+
+ /**
+ * Is a stop file there?
+ */
+ public boolean markedForStop() throws IOException {
+ if (stopFile.exists()) {
+ try {
+ stopFile.delete();
+ } catch (Exception e)
+ {}
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Unlock the port file.
+ */
+ public void unlock() throws IOException {
+ assert(lock != null);
+ lock.release();
+ lock = null;
+ }
+
+ /**
+ * Wait for the port file to contain values that look valid.
+ * Return true, if a-ok, false if the valid values did not materialize within 5 seconds.
+ */
+ public synchronized boolean waitForValidValues() throws IOException, FileNotFoundException {
+ for (int tries = 0; tries < 50; tries++) {
+ lock();
+ getValues();
+ unlock();
+ if (containsPortInfo) {
+ Log.debug("Found valid values in port file after waiting "+(tries*100)+"ms");
+ return true;
+ }
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e)
+ {}
+ }
+ Log.debug("Gave up waiting for valid values in port file");
+ return false;
+ }
+
+ /**
+ * Check if the portfile still contains my values, assuming that I am the server.
+ */
+ public synchronized boolean stillMyValues() throws IOException, FileNotFoundException {
+ for (;;) {
+ try {
+ lock();
+ getValues();
+ unlock();
+ if (containsPortInfo) {
+ if (serverPort == myServerPort &&
+ serverCookie == myServerCookie) {
+ // Everything is ok.
+ return true;
+ }
+ // Someone has overwritten the port file.
+ // Probably another javac server, lets quit.
+ return false;
+ }
+ // Something else is wrong with the portfile. Lets quit.
+ return false;
+ } catch (FileLockInterruptionException e) {
+ continue;
+ }
+ catch (ClosedChannelException e) {
+ // The channel has been closed since sjavac is exiting.
+ return false;
+ }
+ }
+ }
+
+ /**
+ * Return the name of the port file.
+ */
+ public String getFilename() {
+ return filename;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/server/SysInfo.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. 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.
+ */
+
+/**
+ * A utility class used to report information about the system
+ * where the javac server is running.
+ *
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+package com.sun.tools.sjavac.server;
+
+public class SysInfo {
+ public int numCores;
+ public long maxMemory;
+
+ public SysInfo(int nc, long mm) {
+ numCores = nc;
+ maxMemory = mm;
+ }
+}
--- a/langtools/src/share/classes/javax/lang/model/SourceVersion.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/SourceVersion.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
*/
public enum SourceVersion {
/*
- * Summary of language evoluation
+ * Summary of language evolution
* 1.1: nested classes
* 1.2: strictfp
* 1.3: no changes
--- a/langtools/src/share/classes/javax/lang/model/element/AnnotationValueVisitor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/element/AnnotationValueVisitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,18 @@
* parameters, return type, etc. rather than one of the abstract
* classes.
*
+ * <p>Note that methods to accommodate new language constructs could
+ * be added in a source <em>compatible</em> way if they were added as
+ * <em>default methods</em>. However, default methods are only
+ * available on Java SE 8 and higher releases and the {@code
+ * javax.lang.model.*} packages bundled in Java SE 8 are required to
+ * also be runnable on Java SE 7. Therefore, default methods
+ * <em>cannot</em> be used when extending {@code javax.lang.model.*}
+ * to cover Java SE 8 language features. However, default methods may
+ * be used in subsequent revisions of the {@code javax.lang.model.*}
+ * packages that are only required to run on Java SE 8 and higher
+ * platform versions.
+ *
* @param <R> the return type of this visitor's methods
* @param <P> the type of the additional parameter to this visitor's methods.
* @author Joseph D. Darcy
--- a/langtools/src/share/classes/javax/lang/model/element/Element.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/element/Element.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -149,6 +149,56 @@
<A extends Annotation> A getAnnotation(Class<A> annotationType);
/**
+ * Returns an array of all of this element's annotation for the
+ * specified type if such annotations are present, else an empty
+ * array. The annotation may be either inherited or directly
+ * present on this element. This method will look through a container
+ * annotation (if present) if the supplied annotation type is
+ * repeatable.
+ *
+ * <p> The annotations returned by this method could contain an element
+ * whose value is of type {@code Class}.
+ * This value cannot be returned directly: information necessary to
+ * locate and load a class (such as the class loader to use) is
+ * not available, and the class might not be loadable at all.
+ * Attempting to read a {@code Class} object by invoking the relevant
+ * method on the returned annotation
+ * will result in a {@link MirroredTypeException},
+ * from which the corresponding {@link TypeMirror} may be extracted.
+ * Similarly, attempting to read a {@code Class[]}-valued element
+ * will result in a {@link MirroredTypesException}.
+ *
+ * <blockquote>
+ * <i>Note:</i> This method is unlike others in this and related
+ * interfaces. It operates on runtime reflective information —
+ * representations of annotation types currently loaded into the
+ * VM — rather than on the representations defined by and used
+ * throughout these interfaces. Consequently, calling methods on
+ * the returned annotation object can throw many of the exceptions
+ * that can be thrown when calling methods on an annotation object
+ * returned by core reflection. This method is intended for
+ * callers that are written to operate on a known, fixed set of
+ * annotation types.
+ * </blockquote>
+ *
+ * @param <A> the annotation type
+ * @param annotationType the {@code Class} object corresponding to
+ * the annotation type
+ * @return this element's annotations for the specified annotation
+ * type if present on this element, else an empty array
+ *
+ * @see #getAnnotationMirrors()
+ * @see #getAnnotation(java.lang.Class)
+ * @see java.lang.reflect.AnnotatedElement#getAnnotations
+ * @see EnumConstantNotPresentException
+ * @see AnnotationTypeMismatchException
+ * @see IncompleteAnnotationException
+ * @see MirroredTypeException
+ * @see MirroredTypesException
+ */
+ <A extends Annotation> A[] getAnnotations(Class<A> annotationType);
+
+ /**
* Returns the modifiers of this element, excluding annotations.
* Implicit modifiers, such as the {@code public} and {@code static}
* modifiers of interface members, are included.
--- a/langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,18 @@
* parameters, return type, etc. rather than one of the abstract
* classes.
*
+ * <p>Note that methods to accommodate new language constructs could
+ * be added in a source <em>compatible</em> way if they were added as
+ * <em>default methods</em>. However, default methods are only
+ * available on Java SE 8 and higher releases and the {@code
+ * javax.lang.model.*} packages bundled in Java SE 8 are required to
+ * also be runnable on Java SE 7. Therefore, default methods
+ * <em>cannot</em> be used when extending {@code javax.lang.model.*}
+ * to cover Java SE 8 language features. However, default methods may
+ * be used in subsequent revisions of the {@code javax.lang.model.*}
+ * packages that are only required to run on Java SE 8 and higher
+ * platform versions.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/javax/lang/model/type/AnnotatedType.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.lang.model.type;
+
+import java.util.List;
+
+import javax.lang.model.element.AnnotationMirror;
+
+/**
+ * Represents an annotated type.
+ *
+ * As of the {@link javax.lang.model.SourceVersion#RELEASE_8
+ * RELEASE_8} source version, annotated types can appear for all
+ * type uses.
+ *
+ * @author Werner Dietl
+ * @since 1.8
+ */
+public interface AnnotatedType extends TypeMirror,
+ DeclaredType, TypeVariable, WildcardType,
+ PrimitiveType, ArrayType {
+
+ List<? extends AnnotationMirror> getAnnotations();
+ TypeMirror getUnderlyingType();
+}
--- a/langtools/src/share/classes/javax/lang/model/type/ExecutableType.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/type/ExecutableType.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -78,6 +78,14 @@
List<? extends TypeMirror> getParameterTypes();
/**
+ * Returns the type of this executable's receiver parameter.
+ *
+ * @return the type of this executable's receiver parameter
+ * TODO: null if none specified or always a valid value?
+ */
+ TypeMirror getReceiverType();
+
+ /**
* Returns the exceptions and other throwables listed in this
* executable's {@code throws} clause.
*
--- a/langtools/src/share/classes/javax/lang/model/type/TypeKind.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/type/TypeKind.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -151,7 +151,14 @@
*
* @since 1.8
*/
- INTERSECTION;
+ INTERSECTION,
+
+ /**
+ * An annotated type.
+ *
+ * @since 1.8
+ */
+ ANNOTATED;
/**
* Returns {@code true} if this kind corresponds to a primitive
--- a/langtools/src/share/classes/javax/lang/model/type/TypeVisitor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/type/TypeVisitor.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,18 @@
* parameters, return type, etc. rather than one of the abstract
* classes.
*
+ * <p>Note that methods to accommodate new language constructs could
+ * be added in a source <em>compatible</em> way if they were added as
+ * <em>default methods</em>. However, default methods are only
+ * available on Java SE 8 and higher releases and the {@code
+ * javax.lang.model.*} packages bundled in Java SE 8 are required to
+ * also be runnable on Java SE 7. Therefore, default methods
+ * <em>cannot</em> be used when extending {@code javax.lang.model.*}
+ * to cover Java SE 8 language features. However, default methods may
+ * be used in subsequent revisions of the {@code javax.lang.model.*}
+ * packages that are only required to run on Java SE 8 and higher
+ * platform versions.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
@@ -182,4 +194,14 @@
* @since 1.8
*/
R visitIntersection(IntersectionType t, P p);
+
+ /**
+ * Visits an annotated type.
+ *
+ * @param t the type to visit
+ * @param p a visitor-specified parameter
+ * @return a visitor-specified result
+ * @since 1.8
+ */
+ R visitAnnotated(AnnotatedType t, P p);
}
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java Thu Jan 31 10:22:25 2013 -0800
@@ -54,6 +54,15 @@
* behavior for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods
* @param <P> the type of the additional parameter to this visitor's methods.
*
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,15 @@
* behavior for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods
* @param <P> the type of the additional parameter to this visitor's methods.
*
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,15 @@
* behavior for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods
* @param <P> the type of the additional parameter to this visitor's methods.
*
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -53,6 +53,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
@@ -125,6 +134,23 @@
}
/**
+ * Visits an {@code AnnotatedType} element by calling {@code
+ * visit} on the underlying type.
+
+ * @param t {@inheritDoc}
+ * @param p {@inheritDoc}
+ * @return the result of calling {@code visit} on the underlying type
+ *
+ * @since 1.8
+ *
+ * TODO: should xxxVisitor8 subclasses override this and call
+ * the defaultAction?
+ */
+ public R visitAnnotated(AnnotatedType t, P p) {
+ return visit(t.getUnderlyingType(), p);
+ }
+
+ /**
* {@inheritDoc}
*
* <p> The default implementation of this method in {@code
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -67,6 +67,15 @@
* for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,15 @@
* for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,15 @@
* for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,15 @@
* behavior for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods
* @param <P> the type of the additional parameter to this visitor's methods.
*
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,15 @@
* behavior for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods
* @param <P> the type of the additional parameter to this visitor's methods.
*
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,15 @@
* behavior for the visit method in question. When the new visitor is
* introduced, all or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods
* @param <P> the type of the additional parameter to this visitor's methods.
*
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@code Void}
* for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's methods. Use {@code Void}
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@code Void}
* for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's methods. Use {@code Void}
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@code Void}
* for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's methods. Use {@code Void}
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,15 @@
* visit method in question. When the new visitor is introduced, all
* or portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,15 @@
* method in question. When the new visitor is introduced, all or
* portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,15 @@
* method in question. When the new visitor is introduced, all or
* portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,15 @@
* method in question. When the new visitor is introduced, all or
* portions of this visitor may be deprecated.
*
+ * <p>Note that adding a default implementation of a new visit method
+ * in a visitor class will occur instead of adding a <em>default
+ * method</em> directly in the visitor interface since a Java SE 8
+ * language feature cannot be used to this version of the API since
+ * this version is required to be runnable on Java SE 7
+ * implementations. Future versions of the API that are only required
+ * to run on Java SE 8 and later may take advantage of default methods
+ * in this situation.
+ *
* @param <R> the return type of this visitor's methods. Use {@link
* Void} for visitors that do not need to return results.
* @param <P> the type of the additional parameter to this visitor's
--- a/langtools/src/share/classes/javax/lang/model/util/Types.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/src/share/classes/javax/lang/model/util/Types.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
package javax.lang.model.util;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.AnnotationTypeMismatchException;
+import java.lang.annotation.IncompleteAnnotationException;
import java.util.List;
import javax.lang.model.element.*;
import javax.lang.model.type.*;
@@ -298,4 +301,116 @@
* for the given type
*/
TypeMirror asMemberOf(DeclaredType containing, Element element);
+
+ /**
+ * Returns the annotations targeting the type.
+ *
+ * @param type the targeted type
+ * @return the type annotations targeting the type
+ */
+ List<? extends AnnotationMirror> typeAnnotationsOf(TypeMirror type);
+
+ /**
+ * Returns the type's annotation for the specified type if
+ * such an annotation is present, else {@code null}. The
+ * annotation has to be directly present on this
+ * element.
+ *
+ * <p> The annotation returned by this method could contain an element
+ * whose value is of type {@code Class}.
+ * This value cannot be returned directly: information necessary to
+ * locate and load a class (such as the class loader to use) is
+ * not available, and the class might not be loadable at all.
+ * Attempting to read a {@code Class} object by invoking the relevant
+ * method on the returned annotation
+ * will result in a {@link MirroredTypeException},
+ * from which the corresponding {@link TypeMirror} may be extracted.
+ * Similarly, attempting to read a {@code Class[]}-valued element
+ * will result in a {@link MirroredTypesException}.
+ *
+ * <blockquote>
+ * <i>Note:</i> This method is unlike others in this and related
+ * interfaces. It operates on runtime reflective information —
+ * representations of annotation types currently loaded into the
+ * VM — rather than on the representations defined by and used
+ * throughout these interfaces. Consequently, calling methods on
+ * the returned annotation object can throw many of the exceptions
+ * that can be thrown when calling methods on an annotation object
+ * returned by core reflection. This method is intended for
+ * callers that are written to operate on a known, fixed set of
+ * annotation types.
+ * </blockquote>
+ *
+ * @param <A> the annotation type
+ * @param type the targeted type
+ * @param annotationType the {@code Class} object corresponding to
+ * the annotation type
+ * @return the type's annotation for the specified annotation
+ * type if present on the type, else {@code null}
+ *
+ * @see Element#getAnnotationMirrors()
+ * @see EnumConstantNotPresentException
+ * @see AnnotationTypeMismatchException
+ * @see IncompleteAnnotationException
+ * @see MirroredTypeException
+ * @see MirroredTypesException
+ */
+ <A extends Annotation> A typeAnnotationOf(TypeMirror type, Class<A> annotationType);
+
+ /**
+ * Returns the annotations targeting the method receiver type.
+ *
+ * @param type the targeted type
+ * @return the receiver type of the executable type
+ */
+ TypeMirror receiverTypeOf(ExecutableType type);
+
+ /**
+ * Returns the type's annotation for the specified executable type
+ * receiver if such an annotation is present, else {@code null}. The
+ * annotation has to be directly present on this
+ * element.
+ *
+ * <p> The annotation returned by this method could contain an element
+ * whose value is of type {@code Class}.
+ * This value cannot be returned directly: information necessary to
+ * locate and load a class (such as the class loader to use) is
+ * not available, and the class might not be loadable at all.
+ * Attempting to read a {@code Class} object by invoking the relevant
+ * method on the returned annotation
+ * will result in a {@link MirroredTypeException},
+ * from which the corresponding {@link TypeMirror} may be extracted.
+ * Similarly, attempting to read a {@code Class[]}-valued element
+ * will result in a {@link MirroredTypesException}.
+ *
+ * <blockquote>
+ * <i>Note:</i> This method is unlike others in this and related
+ * interfaces. It operates on runtime reflective information —
+ * representations of annotation types currently loaded into the
+ * VM — rather than on the representations defined by and used
+ * throughout these interfaces. Consequently, calling methods on
+ * the returned annotation object can throw many of the exceptions
+ * that can be thrown when calling methods on an annotation object
+ * returned by core reflection. This method is intended for
+ * callers that are written to operate on a known, fixed set of
+ * annotation types.
+ * </blockquote>
+ *
+ * @param <A> the annotation type
+ * @param type the method type
+ * @param annotationType the {@code Class} object corresponding to
+ * the annotation type
+ * @return the type's annotation for the specified annotation
+ * type if present on the type, else {@code null}
+ *
+ * @see Element#getAnnotationMirrors()
+ * @see EnumConstantNotPresentException
+ * @see AnnotationTypeMismatchException
+ * @see IncompleteAnnotationException
+ * @see MirroredTypeException
+ * @see MirroredTypesException
+ */
+ // TODO: no longer needed?
+ // <A extends Annotation> A receiverTypeAnnotationOf(ExecutableType type, Class<A> annotationType);
+
}
--- a/langtools/test/Makefile Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -272,6 +272,7 @@
@mkdir -p $(JTREG_OUTPUT_DIR)
JT_JAVA=$(JT_JAVA) $(JTREG) \
-J-Xmx512m \
+ -vmoption:-Xmx768m \
-a -ignore:quiet -v:fail,error,nopass \
-r:$(JTREG_OUTPUT_DIR)/JTreport \
-w:$(JTREG_OUTPUT_DIR)/JTwork \
--- a/langtools/test/com/sun/javadoc/5093723/T5093723.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/5093723/T5093723.java Thu Jan 31 10:22:25 2013 -0800
@@ -36,7 +36,7 @@
private static final String BUG_ID = "5093723";
private static final String[] ARGS = new String[] {
- "-d", BUG_ID + ".out", "-source", "5",
+ "-d", BUG_ID + ".out", "-source", "5", "-Xdoclint:none",
SRC_DIR + "/DocumentedClass.java",
SRC_DIR + "/UndocumentedClass.java"
};
--- a/langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,7 @@
String srcdir = System.getProperty("test.src", ".");
runJavadoc(new String[] {"-d", TMPDIR_STRING1,
+ "-Xdoclint:none",
"-overview", (srcdir + FS + "overview.html"),
"-header", "<A HREF=\"{@docroot}/package-list\">{@docroot}</A> <A HREF=\"{@docRoot}/help-doc\">{@docRoot}</A>",
"-sourcepath", srcdir,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Make sure that annotations types with optional elements has
+ * element headers
+ * @author Mahmood Ali
+ * @library ../lib/
+ * @build JavadocTester
+ * @build TestAnnotationOptional
+ * @run main TestAnnotationOptional
+ */
+
+public class TestAnnotationOptional extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "NO_BUG_ID_YET";
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "-source", "1.5", "pkg"
+ };
+
+ //Input for string search tests.
+ private static final String[][] TEST = {
+ {BUG_ID + FS + "pkg" + FS + "AnnotationOptional.html",
+ "<a name=\"annotation_type_element_detail\">"
+ }
+ };
+
+ private static final String[][] NEGATED_TEST = NO_TEST;
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestAnnotationOptional tester = new TestAnnotationOptional();
+ run(tester, ARGS, TEST, NEGATED_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+import java.lang.annotation.*;
+
+/**
+ * This is just a test annotation type with optional value element.
+ *
+ * @author Mahmood Ali
+ * @since 1.5
+ */
+@Documented public @interface AnnotationOptional {
+ String value() default "";
+}
--- a/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
//Javadoc arguments.
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, SRC_DIR + FS + "C2.java"
+ "-Xdoclint:none", "-d", BUG_ID, SRC_DIR + FS + "C2.java"
};
//Input for string search tests.
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -222,19 +222,19 @@
private static final String[] ARGS1 =
new String[] {
- "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
+ "-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
private static final String[] ARGS2 =
new String[] {
- "-d", BUG_ID, "-nocomment", "-sourcepath", SRC_DIR, "pkg1"};
+ "-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-sourcepath", SRC_DIR, "pkg1"};
private static final String[] ARGS3 =
new String[] {
- "-d", BUG_ID, "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
+ "-Xdoclint:none", "-d", BUG_ID, "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
private static final String[] ARGS4 =
new String[] {
- "-d", BUG_ID, "-nocomment", "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
+ "-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
/**
* The entry point of the test.
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
//Javadoc arguments.
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, "-use", "-source", "1.5", "-sourcepath", SRC_DIR, "pkg", "pkg1", "pkg2"
+ "-Xdoclint:none", "-d", BUG_ID, "-use", "-source", "1.5", "-sourcepath", SRC_DIR, "pkg", "pkg1", "pkg2"
};
//Input for string search tests.
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,6 @@
* @author Bhavesh Patel
*/
@Documented
-@ContainedBy(ContainerSynthDoc.class)
+@Repeatable(ContainerSynthDoc.class)
public @interface ContaineeSynthDoc {
}
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerSynthDoc.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerSynthDoc.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
* @author Bhavesh Patel
*/
@Documented
-@ContainerFor(ContaineeSynthDoc.class)
public @interface ContainerSynthDoc {
ContaineeSynthDoc[] value();
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,6 @@
* @author Bhavesh Patel
*/
@Documented
-@ContainedBy(ContainerSynthNotDoc.class)
+@Repeatable(ContainerSynthNotDoc.class)
public @interface ContaineeSynthDoc {
}
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
*
* @author Bhavesh Patel
*/
-@ContainerFor(ContaineeSynthDoc.class)
public @interface ContainerSynthNotDoc {
ContaineeSynthDoc[] value();
--- a/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
//Javadoc arguments.
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "TestReturnTag.java"
+ "-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "TestReturnTag.java"
};
//Input for string search tests.
--- a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
private static final String BUG_ID = "4496223-4496270-4618686-4720974-4812240-6253614-6253604";
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
+ "-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
};
/**
--- a/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, SRC_DIR + FS + "TestTagMisuse.java"
+ "-Xdoclint:none", "-d", BUG_ID, SRC_DIR + FS + "TestTagMisuse.java"
};
/**
--- a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@
//Javadoc arguments.
private static final String[] ARGS =
new String[] {
+ "-Xdoclint:none",
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-tag",
"todo", "pkg1", "pkg2"
};
--- a/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, SRC_DIR + FS + "C.java"
+ "-Xdoclint:none", "-d", BUG_ID, SRC_DIR + FS + "C.java"
};
/**
--- a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,11 +43,11 @@
//Javadoc arguments.
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+ "-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
};
private static final String[] ARGS2 = new String[] {
- "-d", BUG_ID, "-private", "-sourcepath", SRC_DIR, "pkg"
+ "-Xdoclint:none", "-d", BUG_ID, "-private", "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006735
+ * @ignore
+ * @summary Smoke test for ensuring that annotations are emited to javadoc
+ *
+ * @author Mahmood Ali <mali>
+ * @library ../../lib/
+ * @build JavadocTester
+ * @build TestSmoke
+ * @run main TestSmoke
+ */
+
+public class TestSmoke extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "NOT_SPECIFIED_YET";
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[] {
+ "-d", BUG_ID, "-private", "-sourcepath", SRC_DIR, "pkg"
+ };
+
+ //Input for string search tests.
+ private static final String[][] TEST = {
+ {BUG_ID + FS + "pkg" + FS + "T0x1C.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x1D.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x0D.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x06.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x0B.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x0F.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x20.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x22.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x10.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x10A.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x12.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x11.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x13.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x15.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x14.html", "@DA"},
+ {BUG_ID + FS + "pkg" + FS + "T0x16.html", "@DA"}
+ };
+
+ private static final String[][] NEGATED_TEST = {
+ {BUG_ID + FS + "pkg" + FS + "T0x1C.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x1D.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x00.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x01.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x02.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x04.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x08.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x0D.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x06.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x0B.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x0F.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x20.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x22.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x10.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x10A.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x12.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x11.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x13.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x15.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x14.html", "@A"},
+ {BUG_ID + FS + "pkg" + FS + "T0x16.html", "@A"}
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestSmoke tester = new TestSmoke();
+ run(tester, ARGS, TEST, NEGATED_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+import java.util.*;
+import java.io.*;
+
+/*
+ * @summary compiler accepts all values
+ * @author Mahmood Ali
+ * @author Yuri Gaevsky
+ */
+
+@Target({TYPE_USE})
+@Retention(RetentionPolicy.RUNTIME)
+@interface A {}
+
+@Target({TYPE_USE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@interface DA {}
+
+/** wildcard bound */
+class T0x1C {
+ void m0x1C(List<? extends @A @DA String> lst) {}
+}
+
+/** wildcard bound generic/array */
+class T0x1D<T> {
+ void m0x1D(List<? extends @A @DA List<int[]>> lst) {}
+}
+
+/** typecast */
+class T0x00 {
+ void m0x00(Long l1) {
+ Object l2 = (@A @DA Long) l1;
+ }
+}
+
+/** typecast generic/array */
+class T0x01<T> {
+ void m0x01(List<T> list) {
+ List<T> l = (List<@A @DA T>) list;
+ }
+}
+
+/** instanceof */
+class T0x02 {
+ boolean m0x02(String s) {
+ return (s instanceof @A @DA String);
+ }
+}
+
+/** object creation (new) */
+class T0x04 {
+ void m0x04() {
+ new @A @DA ArrayList<String>();
+ }
+}
+
+/** local variable */
+class T0x08 {
+ void m0x08() {
+ @A @DA String s = null;
+ }
+}
+
+/** method parameter generic/array */
+class T0x0D {
+ void m0x0D(HashMap<@A @DA Object, List<@A @DA List<@A @DA Class>>> s1) {}
+}
+
+/** method receiver */
+class T0x06 {
+ void m0x06(@A @DA T0x06 this) {}
+}
+
+/** method return type generic/array */
+class T0x0B {
+ Class<@A @DA Object> m0x0B() { return null; }
+}
+
+/** field generic/array */
+class T0x0F {
+ HashMap<@A @DA Object, @A @DA Object> c1;
+}
+
+/** method type parameter */
+class T0x20<T, U> {
+ <@A @DA T, @A @DA U> void m0x20() {}
+}
+
+/** class type parameter */
+class T0x22<@A @DA T, @A @DA U> {
+}
+
+/** class type parameter bound */
+class T0x10<T extends @A @DA Cloneable> {
+}
+
+class T0x10A<T extends @A @DA Object> {
+}
+
+/** method type parameter bound */
+class T0x12<T> {
+ <T extends @A @DA Cloneable> void m0x12() {}
+}
+
+/** class type parameter bound generic/array */
+class T0x11<T extends List<@A @DA T>> {
+}
+
+/** method type parameter bound generic/array */
+class T0x13 {
+ static <T extends Comparable<@A @DA T>> T m0x13() {
+ return null;
+ }
+}
+
+/** class extends/implements generic/array */
+class T0x15<T> extends ArrayList<@A @DA T> {
+}
+
+/** type test (instanceof) generic/array */
+class T0x03<T> {
+ void m0x03(T typeObj, Object obj) {
+ boolean ok = obj instanceof String @A @DA [];
+ }
+}
+
+/** object creation (new) generic/array */
+class T0x05<T> {
+ void m0x05() {
+ new ArrayList<@A @DA T>();
+ }
+}
+
+/** local variable generic/array */
+class T0x09<T> {
+ void g() {
+ List<@A @DA String> l = null;
+ }
+
+ void a() {
+ String @A @DA [] as = null;
+ }
+}
+
+/** type argument in constructor call generic/array */
+class T0x19 {
+ <T> T0x19() {}
+
+ void g() {
+ new <List<@A @DA String>> T0x19();
+ }
+}
+
+/** type argument in method call generic/array */
+class T0x1B<T> {
+ void m0x1B() {
+ Collections.<T @A @DA []>emptyList();
+ }
+}
+
+/** type argument in constructor call */
+class T0x18<T> {
+ <T> T0x18() {}
+
+ void m() {
+ new <@A @DA Integer> T0x18();
+ }
+}
+
+/** type argument in method call */
+class T0x1A<T,U> {
+ public static <T, U> T m() { return null; }
+ static void m0x1A() {
+ T0x1A.<@A @DA Integer, @A @DA Short>m();
+ }
+}
+
+/** class extends/implements */
+class T0x14 extends @A @DA Thread implements @A @DA Serializable, @A @DA Cloneable {
+}
+
+/** exception type in throws */
+class T0x16 {
+ void m0x16() throws @A @DA Exception {}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/AnchorTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,93 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
+ * @build DocLintTester
+ * @run main DocLintTester -ref AnchorTest.out AnchorTest.java
+ */
+
+/** */
+public class AnchorTest {
+ // tests for <a name=value>
+
+ /**
+ * <a name=foo></a>
+ */
+ public void a_name_foo() { }
+
+ /**
+ * <a name=foo></a>
+ */
+ public void a_name_already_defined() { }
+
+ /**
+ * <a name=></a>
+ */
+ public void a_name_empty() { }
+
+ /**
+ * <a name=123 ></a>
+ */
+ public void a_name_invalid() { }
+
+ /**
+ * <a name ></a>
+ */
+ public void a_name_missing() { }
+
+ // tests for <a id=value>
+
+ /**
+ * <a id=a_id_foo></a>
+ */
+ public void a_id_foo() { }
+
+ /**
+ * <a id=foo></a>
+ */
+ public void a_id_already_defined() { }
+
+ /**
+ * <a id=></a>
+ */
+ public void a_id_empty() { }
+
+ /**
+ * <a id=123 ></a>
+ */
+ public void a_id_invalid() { }
+
+ /**
+ * <a id ></a>
+ */
+ public void a_id_missing() { }
+
+ // tests for id=value on non-<a> tags
+
+ /**
+ * <p id=p_id_foo>text</p>
+ */
+ public void p_id_foo() { }
+
+ /**
+ * <p id=foo>text</p>
+ */
+ public void p_id_already_defined() { }
+
+ /**
+ * <p id=>text</p>
+ */
+ public void p_id_empty() { }
+
+ /**
+ * <p id=123 >text</p>
+ */
+ public void p_id_invalid() { }
+
+ /**
+ * <p id >text</p>
+ */
+ public void p_id_missing() { }
+
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/AnchorTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,37 @@
+AnchorTest.java:19: error: anchor already defined: foo
+ * <a name=foo></a>
+ ^
+AnchorTest.java:24: error: invalid name for anchor: ""
+ * <a name=></a>
+ ^
+AnchorTest.java:29: error: invalid name for anchor: "123"
+ * <a name=123 ></a>
+ ^
+AnchorTest.java:34: error: no value given for anchor
+ * <a name ></a>
+ ^
+AnchorTest.java:46: error: anchor already defined: foo
+ * <a id=foo></a>
+ ^
+AnchorTest.java:51: error: invalid name for anchor: ""
+ * <a id=></a>
+ ^
+AnchorTest.java:56: error: invalid name for anchor: "123"
+ * <a id=123 ></a>
+ ^
+AnchorTest.java:61: error: no value given for anchor
+ * <a id ></a>
+ ^
+AnchorTest.java:73: error: anchor already defined: foo
+ * <p id=foo>text</p>
+ ^
+AnchorTest.java:78: error: invalid name for anchor: ""
+ * <p id=>text</p>
+ ^
+AnchorTest.java:83: error: invalid name for anchor: "123"
+ * <p id=123 >text</p>
+ ^
+AnchorTest.java:88: error: no value given for anchor
+ * <p id >text</p>
+ ^
+12 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/CoverageExtras.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8006263
+ * @summary Supplementary test cases needed for doclint
+ */
+
+import com.sun.tools.doclint.Checker;
+import com.sun.tools.doclint.Entity;
+import com.sun.tools.doclint.HtmlTag;
+import com.sun.tools.doclint.Messages;
+import java.util.Objects;
+
+public class CoverageExtras {
+ public static void main(String... args) {
+ new CoverageExtras().run();
+ }
+
+ void run() {
+ check(HtmlTag.A, HtmlTag.valueOf("A"), HtmlTag.values());
+ check(HtmlTag.Attr.ABBR, HtmlTag.Attr.valueOf("ABBR"), HtmlTag.Attr.values());
+ check(HtmlTag.AttrKind.INVALID, HtmlTag.AttrKind.valueOf("INVALID"), HtmlTag.AttrKind.values());
+ check(HtmlTag.BlockType.BLOCK, HtmlTag.BlockType.valueOf("BLOCK"), HtmlTag.BlockType.values());
+ check(HtmlTag.EndKind.NONE, HtmlTag.EndKind.valueOf("NONE"), HtmlTag.EndKind.values());
+ check(HtmlTag.Flag.EXPECT_CONTENT, HtmlTag.Flag.valueOf("EXPECT_CONTENT"), HtmlTag.Flag.values());
+
+ check(Checker.Flag.TABLE_HAS_CAPTION, Checker.Flag.valueOf("TABLE_HAS_CAPTION"), Checker.Flag.values());
+
+ check(Entity.nbsp, Entity.valueOf("nbsp"), Entity.values());
+
+ check(Messages.Group.ACCESSIBILITY, Messages.Group.valueOf("ACCESSIBILITY"), Messages.Group.values());
+ }
+
+ <T extends Enum<T>> void check(T expect, T value, T[] values) {
+ if (!Objects.equals(expect, value)) {
+ error("Mismatch: '" + expect + "', '" + value + "'");
+ }
+ if (!Objects.equals(expect, values[0])) {
+ error("Mismatch: '" + expect + "', '" + values[0] + "'");
+ }
+ }
+
+ void error(String msg) {
+ System.err.println("Error: " + msg);
+ errors++;
+ }
+
+ int errors;
+}
--- a/langtools/test/tools/doclint/DocLintTester.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/doclint/DocLintTester.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
import java.util.List;
import com.sun.tools.doclint.DocLint;
+import com.sun.tools.doclint.DocLint.BadArgs;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@@ -45,6 +46,7 @@
public void run(String... args) throws Exception {
String testSrc = System.getProperty("test.src");
+ boolean badArgs = false;
File refFile = null;
List<String> opts = new ArrayList<String>();
List<File> files = new ArrayList<File>();
@@ -52,19 +54,25 @@
String arg = args[i];
if (arg.equals("-ref")) {
refFile = new File(testSrc, args[++i]);
+ } else if (arg.equals("-badargs")) {
+ badArgs = true;
} else if (arg.startsWith("-Xmsgs")) {
opts.add(arg);
+ } else if (arg.startsWith("-")) {
+ opts.add(arg);
+ if (i < args.length - 1 && !args[i+1].startsWith("-"))
+ opts.add(args[++i]);
} else
files.add(new File(testSrc, arg));
}
- check(opts, files, refFile);
+ check(opts, files, badArgs, refFile);
if (errors > 0)
throw new Exception(errors + " errors occurred");
}
- void check(List<String> opts, List<File> files, File refFile) throws Exception {
+ void check(List<String> opts, List<File> files, boolean expectBadArgs, File refFile) throws Exception {
List<String> args = new ArrayList<String>();
args.addAll(opts);
for (File file: files)
@@ -72,7 +80,14 @@
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
- new DocLint().run(pw, args.toArray(new String[args.size()]));
+ try {
+ new DocLint().run(pw, args.toArray(new String[args.size()]));
+ if (expectBadArgs)
+ error("expected exception not thrown");
+ } catch (BadArgs e) {
+ if (!expectBadArgs)
+ error("unexpected exception caught: " + e);
+ }
pw.flush();
String out = normalizeNewlines(removeFileNames(sw.toString())).trim();
if (out != null)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/EndTagsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,39 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006236
+ * @summary doclint: structural issue hidden
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs:-html EndTagsTest.java
+ * @run main DocLintTester -ref EndTagsTest.out EndTagsTest.java
+ */
+
+/** */
+public class EndTagsTest {
+ /** <p> <a name="a1"> text <img alt="image" src="image.png"> </a> </p> */
+ public void valid_all() { }
+
+ /** <p> <a name="a2"> text <img alt="image" src="image.png"> </a> */
+ public void valid_omit_optional_close() { }
+
+ /** </a> */
+ public void invalid_missing_start() { }
+
+ /** <p> </a> */
+ public void invalid_missing_start_2() { }
+
+ /** <p> text </p> </a> */
+ public void invalid_missing_start_3() { }
+
+ /** <img alt="image" src="image.png"> </img> */
+ public void invalid_end() { }
+
+ /** <invalid> </invalid> */
+ public void unknown_start_end() { }
+
+ /** <invalid> */
+ public void unknown_start() { }
+
+ /** </invalid> */
+ public void unknown_end() { }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/EndTagsTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,25 @@
+EndTagsTest.java:18: error: unexpected end tag: </a>
+ /** </a> */
+ ^
+EndTagsTest.java:21: error: unexpected end tag: </a>
+ /** <p> </a> */
+ ^
+EndTagsTest.java:24: error: unexpected end tag: </a>
+ /** <p> text </p> </a> */
+ ^
+EndTagsTest.java:27: error: invalid end tag: </img>
+ /** <img alt="image" src="image.png"> </img> */
+ ^
+EndTagsTest.java:30: error: unknown tag: invalid
+ /** <invalid> </invalid> */
+ ^
+EndTagsTest.java:30: error: unknown tag: invalid
+ /** <invalid> </invalid> */
+ ^
+EndTagsTest.java:33: error: unknown tag: invalid
+ /** <invalid> */
+ ^
+EndTagsTest.java:36: error: unknown tag: invalid
+ /** </invalid> */
+ ^
+8 errors
--- a/langtools/test/tools/doclint/HtmlTagsTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/doclint/HtmlTagsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -54,5 +54,17 @@
* <i> </b> </i>
*/
public void end_unexpected() { }
+
+ /**
+ * <ul> text <li> ... </li> </ul>
+ */
+ public void text_not_allowed() { }
+
+ /**
+ * <ul> <b>text</b> <li> ... </li> </ul>
+ */
+ public void inline_not_allowed() { }
+
+
}
--- a/langtools/test/tools/doclint/HtmlTagsTest.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/doclint/HtmlTagsTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -34,5 +34,11 @@
HtmlTagsTest.java:54: warning: empty <i> tag
* <i> </b> </i>
^
-11 errors
+HtmlTagsTest.java:59: error: text not allowed in <ul> element
+ * <ul> text <li> ... </li> </ul>
+ ^
+HtmlTagsTest.java:64: error: tag not allowed here: <b>
+ * <ul> <b>text</b> <li> ... </li> </ul>
+ ^
+13 errors
1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/LiteralTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006228
+ * @summary Doclint doesn't detect <code> {@code nested inline} </code>
+ * @build DocLintTester
+ * @run main DocLintTester -ref LiteralTest.out LiteralTest.java
+ */
+
+/** */
+public class LiteralTest {
+ /** <code> abc {@literal < & > } def </code> */
+ public void ok_literal_in_code() { }
+
+ /** <code> abc {@code < & > } def </code> */
+ public void bad_code_in_code() { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/LiteralTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,4 @@
+LiteralTest.java:14: warning: {@code} within <code>
+ /** <code> abc {@code < & > } def </code> */
+ ^
+1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/AAA.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8006728
+ * @summary temporarily workaround jtreg problems for doclint tests in othervm
+ */
+
+// dummy test/class to be compiled before other tests in this directory
+// see JDK-8006730
+public class AAA {
+ public static void main(String... args) { }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/BlockTagsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006251
+ * @summary test block tags
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs BlockTagsTest.java
+ */
+
+/** */
+public class BlockTagsTest {
+ /**
+ * <blockquote> abc </blockquote>
+ * <center> abc </center>
+ * <div> abc </div>
+ * <dl> <dt> abc <dd> def </dl>
+ * <div> abc </div>
+ * <h1> abc </h1>
+ * <h2> abc </h2>
+ * <h3> abc </h3>
+ * <h4> abc </h4>
+ * <h5> abc </h5>
+ * <h6> abc </h6>
+ * <hr>
+ * <menu> <li> abc </menu>
+ * <noscript> </noscript>
+ * <ol> <li> abc </ol>
+ * <p> abc </p>
+ * <pre> abc </pre>
+ * <table summary="abc"> <tr> <td> </table>
+ * <ul> <li> abc </ul>
+ */
+ public void supportedTags() { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/EntitiesTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,317 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006263
+ * @summary Supplementary test cases needed for doclint
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs:-html EntitiesTest.java
+ * @run main DocLintTester -Xmsgs:html -ref EntitiesTest.out EntitiesTest.java
+ */
+
+/** */
+class EntitiesTest {
+
+ /**
+ *    
+ * ࡎ ࡎ ࡎ
+ */
+ void range_test() { }
+
+ /**
+ *  
+ * ¡ ¡
+ * ¢ ¢
+ * £ £
+ * ¤ ¤
+ * ¥ ¥
+ * ¦ ¦
+ * § §
+ * ¨ ¨
+ * © ©
+ * ª ª
+ * « «
+ * ¬ ¬
+ * ­ ­
+ * ® ®
+ * ¯ ¯
+ * ° °
+ * ± ±
+ * ² ²
+ * ³ ³
+ * ´ ´
+ * µ µ
+ * ¶ ¶
+ * · ·
+ * ¸ ¸
+ * ¹ ¹
+ * º º
+ * » »
+ * ¼ ¼
+ * ½ ½
+ * ¾ ¾
+ * ¿ ¿
+ * À À
+ * Á Á
+ * Â Â
+ * Ã Ã
+ * Ä Ä
+ * Å Å
+ * Æ Æ
+ * Ç Ç
+ * È È
+ * É É
+ * Ê Ê
+ * Ë Ë
+ * Ì Ì
+ * Í Í
+ * Î Î
+ * Ï Ï
+ * Ð Ð
+ * Ñ Ñ
+ * Ò Ò
+ * Ó Ó
+ * Ô Ô
+ * Õ Õ
+ * Ö Ö
+ * × ×
+ * Ø Ø
+ * Ù Ù
+ * Ú Ú
+ * Û Û
+ * Ü Ü
+ * Ý Ý
+ * Þ Þ
+ * ß ß
+ * à à
+ * á á
+ * â â
+ * ã ã
+ * ä ä
+ * å å
+ * æ æ
+ * ç ç
+ * è è
+ * é é
+ * ê ê
+ * ë ë
+ * ì ì
+ * í í
+ * î î
+ * ï ï
+ * ð ð
+ * ñ ñ
+ * ò ò
+ * ó ó
+ * ô ô
+ * õ õ
+ * ö ö
+ * ÷ ÷
+ * ø ø
+ * ù ù
+ * ú ú
+ * û û
+ * ü ü
+ * ý ý
+ * þ þ
+ * ÿ ÿ
+ * ƒ ƒ
+ * Α Α
+ * Β Β
+ * Γ Γ
+ * Δ Δ
+ * Ε Ε
+ * Ζ Ζ
+ * Η Η
+ * Θ Θ
+ * Ι Ι
+ * Κ Κ
+ * Λ Λ
+ * Μ Μ
+ * Ν Ν
+ * Ξ Ξ
+ * Ο Ο
+ * Π Π
+ * Ρ Ρ
+ * Σ Σ
+ * Τ Τ
+ * Υ Υ
+ * Φ Φ
+ * Χ Χ
+ * Ψ Ψ
+ * Ω Ω
+ * α α
+ * β β
+ * γ γ
+ * δ δ
+ * ε ε
+ * ζ ζ
+ * η η
+ * θ θ
+ * ι ι
+ * κ κ
+ * λ λ
+ * μ μ
+ * ν ν
+ * ξ ξ
+ * ο ο
+ * π π
+ * ρ ρ
+ * ς ς
+ * σ σ
+ * τ τ
+ * υ υ
+ * φ φ
+ * χ χ
+ * ψ ψ
+ * ω ω
+ * ϑ ϑ
+ * ϒ ϒ
+ * ϖ ϖ
+ * • •
+ * … …
+ * ′ ′
+ * ″ ″
+ * ‾ ‾
+ * ⁄ ⁄
+ * ℘ ℘
+ * ℑ ℑ
+ * ℜ ℜ
+ * ™ ™
+ * ℵ ℵ
+ * ← ←
+ * ↑ ↑
+ * → →
+ * ↓ ↓
+ * ↔ ↔
+ * ↵ ↵
+ * ⇐ ⇐
+ * ⇑ ⇑
+ * ⇒ ⇒
+ * ⇓ ⇓
+ * ⇔ ⇔
+ * ∀ ∀
+ * ∂ ∂
+ * ∃ ∃
+ * ∅ ∅
+ * ∇ ∇
+ * ∈ ∈
+ * ∉ ∉
+ * ∋ ∋
+ * ∏ ∏
+ * ∑ ∑
+ * − −
+ * ∗ ∗
+ * √ √
+ * ∝ ∝
+ * ∞ ∞
+ * ∠ ∠
+ * ∧ ∧
+ * ∨ ∨
+ * ∩ ∩
+ * ∪ ∪
+ * &_int; ∫
+ * ∴ ∴
+ * ∼ ∼
+ * ≅ ≅
+ * ≈ ≈
+ * ≠ ≠
+ * ≡ ≡
+ * ≤ ≤
+ * ≥ ≥
+ * ⊂ ⊂
+ * ⊃ ⊃
+ * ⊄ ⊄
+ * ⊆ ⊆
+ * ⊇ ⊇
+ * ⊕ ⊕
+ * ⊗ ⊗
+ * ⊥ ⊥
+ * ⋅ ⋅
+ * ⌈ ⌈
+ * ⌉ ⌉
+ * ⌊ ⌊
+ * ⌋ ⌋
+ * ⟨ 〈
+ * ⟩ 〉
+ * ◊ ◊
+ * ♠ ♠
+ * ♣ ♣
+ * ♥ ♥
+ * ♦ ♦
+ * " "
+ * & &
+ * < <
+ * > >
+ * Œ Œ
+ * œ œ
+ * Š Š
+ * š š
+ * Ÿ Ÿ
+ * ˆ ˆ
+ * ˜ ˜
+ *    
+ *    
+ *    
+ * ‌ ‌
+ * ‍ ‍
+ * ‎ ‎
+ * ‏ ‏
+ * – –
+ * — —
+ * ‘ ‘
+ * ’ ’
+ * ‚ ‚
+ * “ “
+ * ” ”
+ * „ „
+ * † †
+ * ‡ ‡
+ * ‰ ‰
+ * ‹ ‹
+ * › ›
+ * € €
+ */
+ void symbolic_entities() { }
+
+ /**
+ * &bad;
+ */
+ void bad_name() { }
+
+ /**
+ * 
+ * ࡏ
+ */
+ void out_of_range() { }
+
+ /**
+ * ―
+ * ⌫
+ * 
+ */
+ void sparse_negative() { }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/EntitiesTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,19 @@
+EntitiesTest.java:300: error: invalid entity &bad;
+ * &bad;
+ ^
+EntitiesTest.java:305: error: invalid entity 
+ * 
+ ^
+EntitiesTest.java:306: error: invalid entity ࡏ
+ * ࡏ
+ ^
+EntitiesTest.java:311: error: invalid entity ―
+ * ―
+ ^
+EntitiesTest.java:312: error: invalid entity ⌫
+ * ⌫
+ ^
+EntitiesTest.java:313: error: invalid entity 
+ * 
+ ^
+6 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/InlineTagsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006251
+ * @summary test inline tags
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs InlineTagsTest.java
+ */
+
+/** */
+public class InlineTagsTest {
+ /**
+ * <a href="#abc"> abc </a>
+ * <b> abc </b>
+ * <big> abc </big>
+ * <br>
+ * <cite> abc </cite>
+ * <code> abc </code>
+ * <em> abc </em>
+ * <font> abc </font>
+ * <i> abc </i>
+ * <img alt="image" src="image.png">
+ * <small> abc </small>
+ * <span> abc </span>
+ * <strong> abc </strong>
+ * <sub> abc </sub>
+ * <sup> abc </sup>
+ * <tt> abc </tt>
+ * <u> abc </u>
+ * <var> abc </var>
+ */
+ public void supportedTags() { }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/ListTagsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006251
+ * @summary test list tags
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs ListTagsTest.java
+ */
+
+/** */
+public class ListTagsTest {
+ /**
+ * <dl> <dt> abc <dd> def </dl>
+ * <ol> <li> abc </ol>
+ * <ul> <li> abc </ul>
+ */
+ public void supportedTags() { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/OtherTagsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,24 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006251
+ * @summary test other tags
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs -ref OtherTagsTest.out OtherTagsTest.java
+ */
+
+/** */
+public class OtherTagsTest {
+ /**
+ * <body> <p> abc </body>
+ * <frame>
+ * <frameset> </frameset>
+ * <head> </head>
+ * <link>
+ * <meta>
+ * <noframes> </noframes>
+ * <script> </script>
+ * <title> </title>
+ */
+ public void knownInvalidTags() { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/OtherTagsTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,28 @@
+OtherTagsTest.java:13: error: element not allowed in documentation comments: <body>
+ * <body> <p> abc </body>
+ ^
+OtherTagsTest.java:14: error: element not allowed in documentation comments: <frame>
+ * <frame>
+ ^
+OtherTagsTest.java:15: error: element not allowed in documentation comments: <frameset>
+ * <frameset> </frameset>
+ ^
+OtherTagsTest.java:16: error: element not allowed in documentation comments: <head>
+ * <head> </head>
+ ^
+OtherTagsTest.java:17: error: element not allowed in documentation comments: <link>
+ * <link>
+ ^
+OtherTagsTest.java:18: error: element not allowed in documentation comments: <meta>
+ * <meta>
+ ^
+OtherTagsTest.java:19: error: element not allowed in documentation comments: <noframes>
+ * <noframes> </noframes>
+ ^
+OtherTagsTest.java:20: error: element not allowed in documentation comments: <script>
+ * <script> </script>
+ ^
+OtherTagsTest.java:21: error: element not allowed in documentation comments: <title>
+ * <title> </title>
+ ^
+9 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/TableTagsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006251
+ * @summary test table tags
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs TableTagsTest.java
+ */
+
+/** */
+public class TableTagsTest {
+ /**
+ * <table summary="abc"> <tr> <td> </table>
+ * <table summary="abc"> <tr> <th> </table>
+ * <table> <caption> abc </caption> <tr> <td> </table>
+ * <table summary="abc"> <thead> <tr> </thead> <tr> <td> </table>
+ * <table summary="abc"> <tbody> <tr> <td> </tbody> </table>
+ * <table summary="abc"> <tr> <td> <tfoot> <tr> </tfoot></table>
+ */
+ public void supportedTags() { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/TagNotAllowed.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,30 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -ref TagNotAllowed.out TagNotAllowed.java
+ */
+
+/**
+ * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
+ * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
+ * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
+ *
+ * <table summary=description> <b>abc</b> </table>
+ * <table summary=description> <thead> <b>abc</b> </thead> </table>
+ * <table summary=description> <tbody> <b>abc</b> </tbody> </table>
+ * <table summary=description> <tfoot> <b>abc</b> </tfoot> </table>
+ * <table summary=description> <tr> <b>abc</b> </tr> </table>
+ *
+ * <pre>
+ * <img alt="image" src="image.png">
+ * <p> para </p>
+ * <big> text </big>
+ * <small> text </small>
+ * <sub> text </sub>
+ * <sup> text </sup>
+ * </pre>
+ */
+public class TagNotAllowed { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/TagNotAllowed.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,61 @@
+TagNotAllowed.java:11: error: tag not allowed here: <b>
+ * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
+ ^
+TagNotAllowed.java:11: error: tag not allowed here: <b>
+ * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
+ ^
+TagNotAllowed.java:11: error: tag not allowed here: <b>
+ * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
+ ^
+TagNotAllowed.java:12: error: tag not allowed here: <b>
+ * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
+ ^
+TagNotAllowed.java:12: error: tag not allowed here: <b>
+ * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
+ ^
+TagNotAllowed.java:12: error: tag not allowed here: <b>
+ * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
+ ^
+TagNotAllowed.java:13: error: tag not allowed here: <b>
+ * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
+ ^
+TagNotAllowed.java:13: error: tag not allowed here: <b>
+ * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
+ ^
+TagNotAllowed.java:13: error: tag not allowed here: <b>
+ * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
+ ^
+TagNotAllowed.java:15: error: tag not allowed here: <b>
+ * <table summary=description> <b>abc</b> </table>
+ ^
+TagNotAllowed.java:16: error: tag not allowed here: <b>
+ * <table summary=description> <thead> <b>abc</b> </thead> </table>
+ ^
+TagNotAllowed.java:17: error: tag not allowed here: <b>
+ * <table summary=description> <tbody> <b>abc</b> </tbody> </table>
+ ^
+TagNotAllowed.java:18: error: tag not allowed here: <b>
+ * <table summary=description> <tfoot> <b>abc</b> </tfoot> </table>
+ ^
+TagNotAllowed.java:19: error: tag not allowed here: <b>
+ * <table summary=description> <tr> <b>abc</b> </tr> </table>
+ ^
+TagNotAllowed.java:22: error: tag not allowed here: <img>
+ * <img alt="image" src="image.png">
+ ^
+TagNotAllowed.java:23: error: tag not allowed here: <p>
+ * <p> para </p>
+ ^
+TagNotAllowed.java:24: error: tag not allowed here: <big>
+ * <big> text </big>
+ ^
+TagNotAllowed.java:25: error: tag not allowed here: <small>
+ * <small> text </small>
+ ^
+TagNotAllowed.java:26: error: tag not allowed here: <sub>
+ * <sub> text </sub>
+ ^
+TagNotAllowed.java:27: error: tag not allowed here: <sup>
+ * <sup> text </sup>
+ ^
+20 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/TextNotAllowed.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,32 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8004832
+ * @summary Add new doclint package
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -ref TextNotAllowed.out TextNotAllowed.java
+ */
+
+/**
+ * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
+ * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
+ * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
+ *
+ * <table summary=description> abc </table>
+ * <table summary=description> <thead> abc </thead> </table>
+ * <table summary=description> <tbody> abc </tbody> </table>
+ * <table summary=description> <tfoot> abc </tfoot> </table>
+ * <table summary=description> <tr> abc </tr> </table>
+ *
+ * <dl> & <dt> term </dt> < <dd> description </dd> > </dl>
+ * <ol> & <li> item </li> < <li> item </li> > </ol>
+ * <ul> & <li> item </li> < <li> item </li> > </ul>
+ *
+ * <table summary=description> & </table>
+ * <table summary=description> <thead> & </thead> </table>
+ * <table summary=description> <tbody> & </tbody> </table>
+ * <table summary=description> <tfoot> & </tfoot> </table>
+ * <table summary=description> <tr> & </tr> </table>
+ *
+ */
+public class TextNotAllowed { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/html/TextNotAllowed.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,85 @@
+TextNotAllowed.java:11: error: text not allowed in <dl> element
+ * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
+ ^
+TextNotAllowed.java:11: error: text not allowed in <dl> element
+ * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
+ ^
+TextNotAllowed.java:11: error: text not allowed in <dl> element
+ * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
+ ^
+TextNotAllowed.java:12: error: text not allowed in <ol> element
+ * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
+ ^
+TextNotAllowed.java:12: error: text not allowed in <ol> element
+ * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
+ ^
+TextNotAllowed.java:12: error: text not allowed in <ol> element
+ * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
+ ^
+TextNotAllowed.java:13: error: text not allowed in <ul> element
+ * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
+ ^
+TextNotAllowed.java:13: error: text not allowed in <ul> element
+ * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
+ ^
+TextNotAllowed.java:13: error: text not allowed in <ul> element
+ * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
+ ^
+TextNotAllowed.java:15: error: text not allowed in <table> element
+ * <table summary=description> abc </table>
+ ^
+TextNotAllowed.java:16: error: text not allowed in <thead> element
+ * <table summary=description> <thead> abc </thead> </table>
+ ^
+TextNotAllowed.java:17: error: text not allowed in <tbody> element
+ * <table summary=description> <tbody> abc </tbody> </table>
+ ^
+TextNotAllowed.java:18: error: text not allowed in <tfoot> element
+ * <table summary=description> <tfoot> abc </tfoot> </table>
+ ^
+TextNotAllowed.java:19: error: text not allowed in <tr> element
+ * <table summary=description> <tr> abc </tr> </table>
+ ^
+TextNotAllowed.java:21: error: text not allowed in <dl> element
+ * <dl> & <dt> term </dt> < <dd> description </dd> > </dl>
+ ^
+TextNotAllowed.java:21: error: text not allowed in <dl> element
+ * <dl> & <dt> term </dt> < <dd> description </dd> > </dl>
+ ^
+TextNotAllowed.java:21: error: text not allowed in <dl> element
+ * <dl> & <dt> term </dt> < <dd> description </dd> > </dl>
+ ^
+TextNotAllowed.java:22: error: text not allowed in <ol> element
+ * <ol> & <li> item </li> < <li> item </li> > </ol>
+ ^
+TextNotAllowed.java:22: error: text not allowed in <ol> element
+ * <ol> & <li> item </li> < <li> item </li> > </ol>
+ ^
+TextNotAllowed.java:22: error: text not allowed in <ol> element
+ * <ol> & <li> item </li> < <li> item </li> > </ol>
+ ^
+TextNotAllowed.java:23: error: text not allowed in <ul> element
+ * <ul> & <li> item </li> < <li> item </li> > </ul>
+ ^
+TextNotAllowed.java:23: error: text not allowed in <ul> element
+ * <ul> & <li> item </li> < <li> item </li> > </ul>
+ ^
+TextNotAllowed.java:23: error: text not allowed in <ul> element
+ * <ul> & <li> item </li> < <li> item </li> > </ul>
+ ^
+TextNotAllowed.java:25: error: text not allowed in <table> element
+ * <table summary=description> & </table>
+ ^
+TextNotAllowed.java:26: error: text not allowed in <thead> element
+ * <table summary=description> <thead> & </thead> </table>
+ ^
+TextNotAllowed.java:27: error: text not allowed in <tbody> element
+ * <table summary=description> <tbody> & </tbody> </table>
+ ^
+TextNotAllowed.java:28: error: text not allowed in <tfoot> element
+ * <table summary=description> <tfoot> & </tfoot> </table>
+ ^
+TextNotAllowed.java:29: error: text not allowed in <tr> element
+ * <table summary=description> <tr> & </tr> </table>
+ ^
+28 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tidy/AAA.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8006728
+ * @summary temporarily workaround jtreg problems for doclint tests in othervm
+ */
+
+// dummy test/class to be compiled before other tests in this directory
+// see JDK-8006730
+public class AAA {
+ public static void main(String... args) { }
+}
+
--- a/langtools/test/tools/doclint/tidy/ParaInPre.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/doclint/tidy/ParaInPre.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,4 @@
-ParaInPre.java:16: warning: unexpected use of <p> inside <pre> element
+ParaInPre.java:16: error: tag not allowed here: <p>
* <p>
^
-1 warning
+1 error
--- a/langtools/test/tools/doclint/tidy/TextNotAllowed.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/doclint/tidy/TextNotAllowed.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,19 +1,19 @@
TextNotAllowed.java:13: error: text not allowed in <table> element
* <table summary=description> abc </table>
- ^
+ ^
TextNotAllowed.java:14: error: text not allowed in <tbody> element
* <table summary=description> <tbody> abc </tbody> </table>
- ^
+ ^
TextNotAllowed.java:15: error: text not allowed in <tr> element
* <table summary=description> <tr> abc </tr> </table>
- ^
+ ^
TextNotAllowed.java:17: error: text not allowed in <dl> element
* <dl> abc </dl>
- ^
+ ^
TextNotAllowed.java:18: error: text not allowed in <ol> element
* <ol> abc </ol>
- ^
+ ^
TextNotAllowed.java:19: error: text not allowed in <ul> element
* <ul> abc </ul>
- ^
+ ^
6 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/AAA.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8006728
+ * @summary temporarily workaround jtreg problems for doclint tests in othervm
+ */
+
+// dummy test/class to be compiled before other tests in this directory
+// see JDK-8006730
+public class AAA {
+ public static void main(String... args) { }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/HelpTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006263
+ * @summary Supplementary test cases needed for doclint
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -ref HelpTest.out
+ * @run main DocLintTester -ref HelpTest.out -h
+ * @run main DocLintTester -ref HelpTest.out -help
+ * @run main DocLintTester -ref HelpTest.out --help
+ * @run main DocLintTester -ref HelpTest.out -usage
+ * @run main DocLintTester -ref HelpTest.out -?
+ */
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/HelpTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,43 @@
+Usage:
+ doclint [options] source-files...
+
+Options:
+ -Xmsgs
+ Same as -Xmsgs:all
+ -Xmsgs:values
+ Specify categories of issues to be checked, where 'values'
+ is a comma-separated list of any of the following:
+ reference show places where comments contain incorrect
+ references to Java source code elements
+ syntax show basic syntax errors within comments
+ html show issues with HTML tags and attributes
+ accessibility show issues for accessibility
+ missing show issues with missing documentation
+ all all of the above
+ Precede a value with '-' to negate it
+ Categories may be qualified by one of:
+ /public /protected /package /private
+ For positive categories (not beginning with '-')
+ the qualifier applies to that access level and above.
+ For negative categories (beginning with '-')
+ the qualifier applies to that access level and below.
+ If a qualifier is missing, the category applies to
+ all access levels.
+ For example, -Xmsgs:all,-syntax/private
+ This will enable all messages, except syntax errors
+ in the doc comments of private methods.
+ If no -Xmsgs options are provided, the default is
+ equivalent to -Xmsgs:all/protected, meaning that
+ all messages are reported for protected and public
+ declarations only.
+ -stats
+ Report statistics on the reported issues.
+ -h -help --help -usage -?
+ Show this message.
+
+The following javac options are also supported
+ -bootclasspath, -classpath, -sourcepath, -Xmaxerrs, -Xmaxwarns
+
+To run doclint on part of a project, put the compiled classes for your
+project on the classpath (or bootclasspath), then specify the source files
+to be checked on the command line.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/MaxDiagsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,21 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006263
+ * @summary Supplementary test cases needed for doclint
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -ref MaxDiagsTest.out -Xmaxerrs 2 -Xmaxwarns 2 MaxDiagsTest.java
+ * @run main DocLintTester -badargs -Xmaxerrs
+ * @run main DocLintTester -badargs -Xmaxwarns
+ * @run main DocLintTester -badargs -Xmaxerrs two -Xmaxwarns two MaxDiagsTest.java
+ */
+
+public class MaxDiagsTest {
+ /**
+ * � � � �
+ */
+ public void errors() { }
+
+ /** 4 undocumented signature items */
+ public int warnings(int a1, int a2) throws Exception { return 0; }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/MaxDiagsTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+MaxDiagsTest.java:13: warning: no comment
+public class MaxDiagsTest {
+ ^
+MaxDiagsTest.java:15: error: invalid entity �
+ * � � � �
+ ^
+MaxDiagsTest.java:15: error: invalid entity �
+ * � � � �
+ ^
+MaxDiagsTest.java:20: warning: no @param for a1
+ public int warnings(int a1, int a2) throws Exception { return 0; }
+ ^
+2 errors
+2 warnings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/PathsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006263
+ * @summary Supplementary test cases needed for doclint
+ */
+
+import com.sun.tools.doclint.DocLint;
+import com.sun.tools.doclint.DocLint.BadArgs;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.regex.Pattern;
+
+public class PathsTest {
+ public static void main(String... args) throws Exception {
+ new PathsTest().run();
+ }
+
+ void run() throws Exception {
+ String PS = File.pathSeparator;
+ writeFile("src1/p/A.java",
+ "package p; public class A { }");
+ compile("-d", "classes1", "src1/p/A.java");
+
+ writeFile("src2/q/B.java",
+ "package q; public class B extends p.A { }");
+ compile("-d", "classes2", "-classpath", "classes1", "src2/q/B.java");
+
+ writeFile("src/Test.java",
+ "/** &0; */ class Test extends q.B { }");
+
+ test("src/Test.java", "-sourcepath", "src1" + PS + "src2");
+ test("src/Test.java", "-classpath", "classes1" + PS + "classes2");
+ String sysBootClassPath = System.getProperty("sun.boot.class.path");
+ test("src/Test.java", "-bootclasspath",
+ sysBootClassPath + PS + "classes1" + PS + "classes2");
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ }
+
+ Pattern pkgNotFound = Pattern.compile("package [a-z]+ does not exist");
+ Pattern badHtmlEntity = Pattern.compile("bad HTML entity");
+
+ void test(String file, String pathOpt, String path) throws BadArgs, IOException {
+ System.err.println("test " + pathOpt);
+ String out1 = doclint("-Xmsgs", file);
+ if (!pkgNotFound.matcher(out1).find())
+ error("message not found: " + pkgNotFound);
+
+ String out2 = doclint("-Xmsgs", pathOpt, path, file);
+ if (pkgNotFound.matcher(out2).find())
+ error("unexpected message found: " + pkgNotFound);
+ if (!badHtmlEntity.matcher(out1).find())
+ error("message not found: " + badHtmlEntity);
+
+ try {
+ doclint("-Xmsgs", pathOpt);
+ error("expected exception not thrown");
+ } catch (BadArgs e) {
+ System.err.println(e);
+ }
+ }
+
+ void compile(String... args) {
+ for (int i = 0; i < args.length; i++) {
+ if (args[i].equals("-d")) {
+ new File(args[++i]).mkdirs();
+ break;
+ }
+ }
+
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ int rc = com.sun.tools.javac.Main.compile(args, pw);
+ pw.close();
+ String out = sw.toString();
+ if (!out.isEmpty())
+ System.err.println(out);
+ if (rc != 0)
+ error("compilation failed: rc=" + rc);
+ }
+
+ String doclint(String... args) throws BadArgs, IOException {
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ DocLint dl = new DocLint();
+ dl.run(pw, args);
+ pw.close();
+ String out = sw.toString();
+ if (!out.isEmpty())
+ System.err.println(out);
+ return out;
+ }
+
+ File writeFile(String path, String body) throws IOException {
+ File f = new File(path);
+ f.getParentFile().mkdirs();
+ try (FileWriter fw = new FileWriter(path)) {
+ fw.write(body);
+ }
+ return f;
+ }
+
+ void error(String msg) {
+ System.err.println("Error: " + msg);
+ errors++;
+ }
+
+ int errors;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/RunTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006263
+ * @summary Supplementary test cases needed for doclint
+ */
+
+import com.sun.source.util.JavacTask;
+import com.sun.tools.doclint.DocLint;
+import com.sun.tools.doclint.DocLint.BadArgs;
+import com.sun.tools.javac.api.JavacTool;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URI;
+import java.security.Permission;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+
+public class RunTest {
+ static class SimpleSecurityManager extends SecurityManager {
+ boolean allowExit = false;
+
+ @Override
+ public void checkExit(int status) {
+ if (!allowExit)
+ throw new SecurityException("System.exit(" + status + ")");
+ }
+ @Override
+ public void checkPermission(Permission perm) { }
+
+ }
+
+ public static void main(String... args) throws Exception {
+ // if no security manager already installed, install one to
+ // prevent System.exit
+ SimpleSecurityManager secmgr = null;
+ if (System.getSecurityManager() == null) {
+ System.setSecurityManager(secmgr = new SimpleSecurityManager() { });
+ }
+
+ try {
+ new RunTest().run();
+ } finally {
+ if (secmgr != null)
+ secmgr.allowExit = true;
+ }
+ }
+
+ void run() throws Exception {
+ testMain();
+ testRun();
+ testInit();
+ testArgsNoFiles();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ }
+
+ void testMain() {
+ System.err.println("test main(String[])");
+ testMain(true, "-help");
+ testMain(false, "-unknownOption");
+ }
+
+ void testMain(boolean expectOK, String... args) {
+ try {
+ DocLint.main(args);
+ if (!expectOK)
+ error("expected SecurityException (from System.exit) not thrown");
+ } catch (SecurityException e) {
+ System.err.println(e);
+ if (expectOK)
+ error("unexpected SecurityException caught");
+ }
+ }
+
+ void testRun() throws BadArgs, IOException {
+ System.err.println("test run(String[])");
+ DocLint dl = new DocLint();
+ String[] args = { "-help" };
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos);
+ PrintStream prev = System.out;
+ try {
+ System.setOut(ps);
+ dl.run(args);
+ } finally {
+ System.setOut(prev);
+ }
+ ps.close();
+ String stdout = baos.toString();
+
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ dl.run(pw, args);
+ pw.close();
+ String direct = sw.toString();
+
+ if (!stdout.equals(direct)) {
+ error("unexpected output");
+ System.err.println("EXPECT>>" + direct + "<<");
+ System.err.println("FOUND>>" + stdout + "<<");
+ }
+ }
+
+ void testInit() {
+ System.err.println("test init");
+ DocLint dl = new DocLint();
+ String name = dl.getName();
+ if (!Objects.equals(name, "doclint"))
+ error("unexpected result for DocLint.getName()");
+
+ List<? extends JavaFileObject> files =
+ Arrays.asList(createFile("Test.java", "/** &0; */ class Test{ }"));
+ String[] goodArgs = { "-Xmsgs" };
+ testInit(true, goodArgs, files);
+
+ String[] badArgs = { "-unknown" };
+ testInit(false, badArgs, files);
+ }
+
+ void testInit(boolean expectOK, String[] args, List<? extends JavaFileObject> files) {
+ JavacTool javac = JavacTool.create();
+ JavacTask task = javac.getTask(null, null, null, null, null, files);
+ try {
+ DocLint dl = new DocLint();
+ dl.init(task, args, true);
+ if (!expectOK)
+ error("expected IllegalArgumentException not thrown");
+ task.call();
+ } catch (IllegalArgumentException e) {
+ System.err.println(e);
+ if (expectOK)
+ error("unexpected IllegalArgumentException caught");
+ }
+ }
+
+ void testArgsNoFiles() throws BadArgs, IOException {
+ System.err.println("test args, no files");
+ DocLint dl = new DocLint();
+
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ dl.run(pw, "-Xmsgs");
+ pw.close();
+ String out = sw.toString();
+
+ String expect = "no files given";
+ if (!Objects.equals(out.trim(), expect)) {
+ error("unexpected output");
+ System.err.println("EXPECT>>" + expect + "<<");
+ System.err.println("FOUND>>" + out + "<<");
+ }
+
+ }
+
+ JavaFileObject createFile(String name, final String body) {
+ return new SimpleJavaFileObject(URI.create(name), JavaFileObject.Kind.SOURCE) {
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+ return body;
+ }
+ };
+ }
+
+ void error(String msg) {
+ System.err.println("Error: " + msg);
+ errors++;
+ }
+
+ int errors;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/StatsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,19 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006263
+ * @summary Supplementary test cases needed for doclint
+ * @library ..
+ * @build DocLintTester
+ * @run main DocLintTester -ref StatsTest.out -stats -Xmsgs:all StatsTest.java
+ */
+
+// warning: missing comment
+public class StatsTest {
+ /**
+ * � � � �
+ */
+ public void errors() { }
+
+ /** 4 undocumented signature items */
+ public int warnings(int a1, int a2) throws Exception { return 0; }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/doclint/tool/StatsTest.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,43 @@
+StatsTest.java:11: warning: no comment
+public class StatsTest {
+ ^
+StatsTest.java:13: error: invalid entity �
+ * � � � �
+ ^
+StatsTest.java:13: error: invalid entity �
+ * � � � �
+ ^
+StatsTest.java:13: error: invalid entity �
+ * � � � �
+ ^
+StatsTest.java:13: error: invalid entity �
+ * � � � �
+ ^
+StatsTest.java:18: warning: no @param for a1
+ public int warnings(int a1, int a2) throws Exception { return 0; }
+ ^
+StatsTest.java:18: warning: no @param for a2
+ public int warnings(int a1, int a2) throws Exception { return 0; }
+ ^
+StatsTest.java:18: warning: no @return
+ public int warnings(int a1, int a2) throws Exception { return 0; }
+ ^
+StatsTest.java:18: warning: no @throws for java.lang.Exception
+ public int warnings(int a1, int a2) throws Exception { return 0; }
+ ^
+By group...
+ 5: missing
+ 4: html
+
+By diagnostic kind...
+ 5: warning
+ 4: error
+
+By message kind...
+ 4: invalid entity &{0};
+ 2: no @param for {0}
+ 1: no @return
+ 1: no @throws for {0}
+ 1: no comment
+4 errors
+5 warnings
--- a/langtools/test/tools/javac/7129225/TestImportStar.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/7129225/TestImportStar.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
* @build JavacTestingAbstractProcessor
* @compile/fail/ref=NegTest.ref -XDrawDiagnostics TestImportStar.java
* @compile Anno.java AnnoProcessor.java
- * @compile/ref=TestImportStar.ref -XDrawDiagnostics -processor AnnoProcessor -proc:only TestImportStar.java
+ * @compile/fail/ref=TestImportStar.ref -XDrawDiagnostics -processor AnnoProcessor -proc:only TestImportStar.java
*/
//The @compile/fail... verifies that the fix doesn't break the normal compilation of import xxx.*
--- a/langtools/test/tools/javac/7129225/TestImportStar.ref Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/7129225/TestImportStar.ref Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,4 @@
- compiler.note.proc.messager: RUNNING - lastRound = false
TestImportStar.java:39:1: compiler.err.doesnt.exist: xxx
- compiler.note.proc.messager: RUNNING - lastRound = true
+1 error
\ No newline at end of file
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_1.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_1.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.intersection.type: 1, T6722234d.A)
+T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: compiler.misc.intersection.type: 1, T6722234d.A,java.lang.Object)
- compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, java.lang.Object,T6722234d.I1,T6722234d.I2)}
1 error
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_2.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_2.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.intersection.type: 1, T6722234d.A)
+T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: compiler.misc.intersection.type: 1, T6722234d.A,Object)
- compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, Object,I1,I2)}
1 error
--- a/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,14 +23,18 @@
/**
* @test
- * @bug 6769027
+ * @bug 6769027 8006694
* @summary Source line should be displayed immediately after the first diagnostic line
+ * temporarily workaround combo tests are causing time out in several platforms
* @author Maurizio Cimadamore
* @library ../../lib
* @build JavacTestingAbstractThreadedTest
* @run main/othervm T6769027
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.regex.Matcher;
import javax.tools.*;
@@ -488,7 +492,7 @@
}
if (!msg.equals(errorLine)) {
- printInfo(msg, errorLine);
+// printInfo(msg, errorLine);
errCount.incrementAndGet();
}
}
--- a/langtools/test/tools/javac/T6873845.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/T6873845.java Thu Jan 31 10:22:25 2013 -0800
@@ -19,8 +19,8 @@
if (out.contains("sunapi"))
throw new Exception("unexpected output for -X");
- String warn1 = "T6873845.java:72:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
- String warn2 = "T6873845.java:77:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
+ String warn1 = "T6873845.java:73:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
+ String warn2 = "T6873845.java:78:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
String note1 = "- compiler.note.sunapi.filename: T6873845.java" + newline;
String note2 = "- compiler.note.sunapi.recompile" + newline;
@@ -52,7 +52,8 @@
args.add(0, "-XDrawDiagnostics");
String out = compile(args);
if (!out.equals(expect))
- throw new Exception("unexpected output from compiler");
+ throw new Exception("unexpected output from compiler; expected: " + expect +
+ "\n found: " + out);
}
String compile(List<String> args) throws Exception{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T6985181.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6985181
+ * @summary Annotations lost from classfile
+ */
+
+import java.io.*;
+import java.util.*;
+
+public class T6985181 {
+ public static void main(String... args) throws Exception{
+ new T6985181().run();
+ }
+
+ public void run() throws Exception {
+ String code = "@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE_PARAMETER)\n" +
+ "@interface Simple { }\n" +
+ "interface Test<@Simple T> { }";
+
+ File srcFile = writeFile("Test.java", code);
+ File classesDir = new File("classes");
+ classesDir.mkdirs();
+ compile("-d", classesDir.getPath(), srcFile.getPath());
+ String out = javap(new File(classesDir, srcFile.getName().replace(".java", ".class")));
+ if (!out.contains("RuntimeInvisibleTypeAnnotations"))
+ throw new Exception("RuntimeInvisibleTypeAnnotations not found");
+ }
+
+ void compile(String... args) throws Exception {
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ int rc = com.sun.tools.javac.Main.compile(args, pw);
+ pw.close();
+ String out = sw.toString();
+ if (out.length() > 0)
+ System.err.println(out);
+ if (rc != 0)
+ throw new Exception("Compilation failed: rc=" + rc);
+ }
+
+ String javap(File classFile) throws Exception {
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ String[] args = { "-v", classFile.getPath() };
+ int rc = com.sun.tools.javap.Main.run(args, pw);
+ pw.close();
+ String out = sw.toString();
+ if (out.length() > 0)
+ System.err.println(out);
+ if (rc != 0)
+ throw new Exception("javap failed: rc=" + rc);
+ return out;
+ }
+
+ File writeFile(String path, String body) throws IOException {
+ File f = new File(path);
+ FileWriter out = new FileWriter(f);
+ try {
+ out.write(body);
+ } finally {
+ out.close();
+ }
+ return f;
+ }
+}
--- a/langtools/test/tools/javac/T7093325.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/T7093325.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,13 +23,17 @@
/*
* @test
- * @bug 7093325
+ * @bug 7093325 8006694
* @summary Redundant entry in bytecode exception table
+ * temporarily workaround combo tests are causing time out in several platforms
* @library lib
* @build JavacTestingAbstractThreadedTest
- * @run main T7093325
+ * @run main/othervm T7093325
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.io.File;
import java.net.URI;
import java.util.Arrays;
@@ -171,8 +175,6 @@
gapsCount++;
}
- //System.out.printf("gaps %d \n %s \n", gapsCount, source.toString());
-
File compiledTest = new File(String.format("Test%s.class", id));
try {
ClassFile cf = ClassFile.read(compiledTest);
--- a/langtools/test/tools/javac/annotations/6881115/T6881115.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/6881115/T6881115.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,6 @@
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
/*
* @test /nodynamiccopyright/
* @bug 6881115 6976649
@@ -6,15 +9,18 @@
* @compile/fail/ref=T6881115.out -XDrawDiagnostics T6881115.java
*/
+@Target({ElementType.TYPE, ElementType.TYPE_PARAMETER, ElementType.ANNOTATION_TYPE})
@interface A {
B b() default @B(b2 = 1, b2 = 2);
B[] b_arr() default {@B(), @B(b2 = 1, b2 = 2)};
}
+
@interface B {
String b1();
int b2();
}
+
@A(b = @B(b2 = 1, b2 = 2),
b_arr = {@B(), @B(b2 = 1, b2 = 2)})
-class T6881115</*308 @A(b = @B(b2 = 1, b2 = 2),
- b_arr = {@B(), @B(b2 = 1, b2 = 2)})*/ X> {}
+class T6881115<@A(b = @B(b2 = 1, b2 = 2),
+ b_arr = {@B(), @B(b2 = 1, b2 = 2)}) X> {}
--- a/langtools/test/tools/javac/annotations/6881115/T6881115.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/6881115/T6881115.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,11 +1,16 @@
-T6881115.java:10:30: compiler.err.duplicate.annotation.member.value: b2, B
-T6881115.java:10:19: compiler.err.annotation.missing.default.value: B, b1
-T6881115.java:11:26: compiler.err.annotation.missing.default.value.1: B, b1,b2
-T6881115.java:11:43: compiler.err.duplicate.annotation.member.value: b2, B
-T6881115.java:11:32: compiler.err.annotation.missing.default.value: B, b1
-T6881115.java:17:19: compiler.err.duplicate.annotation.member.value: b2, B
-T6881115.java:17:8: compiler.err.annotation.missing.default.value: B, b1
-T6881115.java:18:13: compiler.err.annotation.missing.default.value.1: B, b1,b2
-T6881115.java:18:30: compiler.err.duplicate.annotation.member.value: b2, B
-T6881115.java:18:19: compiler.err.annotation.missing.default.value: B, b1
-10 errors
+T6881115.java:14:30: compiler.err.duplicate.annotation.member.value: b2, B
+T6881115.java:14:19: compiler.err.annotation.missing.default.value: B, b1
+T6881115.java:15:26: compiler.err.annotation.missing.default.value.1: B, b1,b2
+T6881115.java:15:43: compiler.err.duplicate.annotation.member.value: b2, B
+T6881115.java:15:32: compiler.err.annotation.missing.default.value: B, b1
+T6881115.java:23:19: compiler.err.duplicate.annotation.member.value: b2, B
+T6881115.java:23:8: compiler.err.annotation.missing.default.value: B, b1
+T6881115.java:24:13: compiler.err.annotation.missing.default.value.1: B, b1,b2
+T6881115.java:24:30: compiler.err.duplicate.annotation.member.value: b2, B
+T6881115.java:24:19: compiler.err.annotation.missing.default.value: B, b1
+T6881115.java:25:34: compiler.err.duplicate.annotation.member.value: b2, B
+T6881115.java:25:23: compiler.err.annotation.missing.default.value: B, b1
+T6881115.java:26:28: compiler.err.annotation.missing.default.value.1: B, b1,b2
+T6881115.java:26:45: compiler.err.duplicate.annotation.member.value: b2, B
+T6881115.java:26:34: compiler.err.annotation.missing.default.value: B, b1
+15 errors
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,11 +6,9 @@
* @compile/fail/ref=BaseAnnoAsContainerAnno.out -XDrawDiagnostics BaseAnnoAsContainerAnno.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(Foo.class)
-@ContainerFor(Foo.class)
+@Repeatable(Foo.class)
@interface Foo {
Foo[] value() default {};
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/BaseAnnoAsContainerAnno.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-BaseAnnoAsContainerAnno.java:15:11: compiler.err.cyclic.annotation.element
+BaseAnnoAsContainerAnno.java:13:11: compiler.err.cyclic.annotation.element
1 error
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,10 +34,9 @@
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
-@ContainedBy(Foos.class)
+@Repeatable(Foos.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@Retention(RetentionPolicy.RUNTIME)
@interface Foos {
Foo[] value();
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/CheckTargets.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/CheckTargets.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,32 +32,29 @@
import java.lang.annotation.*;
-@ContainedBy(Foos.class)
+@Repeatable(Foos.class)
@Target(ElementType.TYPE)
@interface Foo {}
-@ContainerFor(Foo.class)
@Target(ElementType.ANNOTATION_TYPE)
@interface Foos {
Foo[] value();
}
-@ContainedBy(Bars.class)
+@Repeatable(Bars.class)
@Target(ElementType.TYPE)
@interface Bar {}
-@ContainerFor(Bar.class)
@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE })
@interface Bars {
Bar[] value();
}
-@ContainedBy(Bazs.class)
+@Repeatable(Bazs.class)
@Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@interface Baz {}
-@ContainerFor(Baz.class)
@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE })
@interface Bazs {
Baz[] value();
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/ClassReaderDefault.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,15 @@
* @compile ClassReaderDefault.java
* @compile SeparateCompile.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
public class ClassReaderDefault {
}
-@ContainerFor(Foo.class)
@interface FooContainer {
Foo[] value();
int f() default 0;
}
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/ContainerHasRepeatedContained.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/ContainerHasRepeatedContained.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,13 @@
* @run compile ContainerHasRepeatedContained.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(BarContainer.class)
+@Repeatable(BarContainer.class)
@interface Bar {}
@Bar
@Bar
-@ContainerFor(Bar.class)
@interface BarContainer {
Bar[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,17 +6,14 @@
* @compile/fail/ref=CyclicAnnotation.out -XDrawDiagnostics CyclicAnnotation.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(Foo.class)
-@ContainerFor(Baz.class)
+@Repeatable(Foo.class)
@interface Baz {
Foo[] value() default {};
}
-@ContainedBy(Baz.class)
-@ContainerFor(Foo.class)
+@Repeatable(Baz.class)
@interface Foo{
Baz[] value() default {};
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/CyclicAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,6 +1,2 @@
-CyclicAnnotation.java:12:1: compiler.err.invalid.container.wrong.containerfor: Foo, Baz
-CyclicAnnotation.java:13:1: compiler.err.invalid.container.wrong.containedby: Foo, Baz
-CyclicAnnotation.java:15:11: compiler.err.cyclic.annotation.element
-CyclicAnnotation.java:18:1: compiler.err.invalid.container.wrong.containerfor: Baz, Foo
-CyclicAnnotation.java:19:1: compiler.err.invalid.container.wrong.containedby: Baz, Foo
-5 errors
+CyclicAnnotation.java:13:11: compiler.err.cyclic.annotation.element
+1 error
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/DefaultCasePresent.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,13 +29,11 @@
* @compile DefaultCasePresent.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@interface FooContainer {
Foo[] value();
String other() default "other-method";
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/DelayRepeatedContainer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/DelayRepeatedContainer.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,12 +39,11 @@
@Bar("katt")
@Bar("lol")
-@ContainedBy(BarContainer.class)
+@Repeatable(BarContainer.class)
@interface Bar {
String value();
}
-@ContainerFor(Bar.class)
@interface BarContainer {
Bar[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,15 +6,13 @@
* @compile/fail/ref=DocumentedContainerAnno.out -XDrawDiagnostics DocumentedContainerAnno.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Documented;
@Documented
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@interface FooContainer{
Foo[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/DocumentedContainerAnno.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-DocumentedContainerAnno.java:14:1: compiler.err.invalid.containedby.annotation.not.documented: FooContainer, Foo
+DocumentedContainerAnno.java:13:1: compiler.err.invalid.repeatable.annotation.not.documented: FooContainer, Foo
1 error
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,15 +6,13 @@
* @compile/fail/ref=InheritedContainerAnno.out -XDrawDiagnostics InheritedContainerAnno.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
import java.lang.annotation.Inherited;
@Inherited
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@interface FooContainer{
Foo[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/InheritedContainerAnno.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-InheritedContainerAnno.java:14:1: compiler.err.invalid.containedby.annotation.not.inherited: FooContainer, Foo
+InheritedContainerAnno.java:13:1: compiler.err.invalid.repeatable.annotation.not.inherited: FooContainer, Foo
1 error
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidTarget.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/InvalidTarget.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,11 +32,10 @@
import java.lang.annotation.*;
-@ContainedBy(Foos.class)
+@Repeatable(Foos.class)
@Target(ElementType.ANNOTATION_TYPE)
@interface Foo {}
-@ContainerFor(Foo.class)
@Target(ElementType.TYPE)
@interface Foos {
Foo[] value();
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainedBy.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Smoke test for repeating annotations
- * @compile/fail MissingContainedBy.java
- * @bug 7151010
- */
-
-import java.lang.annotation.*;
-
-
-@ContainerFor(MissingContainedBy.class)
-@interface Foos {
- MissingContainedBy[] value();
-}
-
-public @interface MissingContainedBy {}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,13 +6,11 @@
* @compile/fail/ref=MissingContainer.out -XDrawDiagnostics MissingContainer.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy()
+@Repeatable()
@interface Foo {}
-@ContainerFor(Foo.class)
@interface FooContainer {
Foo[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainer.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,4 @@
-MissingContainer.java:20:1: compiler.err.invalid.containedby.annotation: Foo
-MissingContainer.java:20:6: compiler.err.invalid.containedby.annotation: Foo
-MissingContainer.java:12:1: compiler.err.annotation.missing.default.value: java.lang.annotation.ContainedBy, value
-MissingContainer.java:15:1: compiler.err.invalid.container.wrong.containedby: Foo, FooContainer
-4 errors
+MissingContainer.java:18:1: compiler.err.invalid.repeatable.annotation: Foo
+MissingContainer.java:18:6: compiler.err.invalid.repeatable.annotation: Foo
+MissingContainer.java:11:1: compiler.err.annotation.missing.default.value: java.lang.annotation.Repeatable, value
+3 errors
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingContainerFor.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Smoke test for repeating annotations
- * @compile/fail MissingContainerFor.java
- * @bug 7151010
- */
-
-import java.lang.annotation.*;
-
-@interface Foos {
- MissingContainerFor[] value();
-}
-
-@ContainedBy(Foos.class)
-public @interface MissingContainerFor {}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,13 +6,11 @@
* @compile/fail/ref=MissingDefaultCase1.out -XDrawDiagnostics MissingDefaultCase1.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@interface FooContainer {
Foo[] value();
String other(); // missing default clause
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase1.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-MissingDefaultCase1.java:21:1: compiler.err.duplicate.annotation.invalid.repeated: Foo
-MissingDefaultCase1.java:12:1: compiler.err.invalid.containedby.annotation.elem.nondefault: FooContainer, other()
+MissingDefaultCase1.java:19:1: compiler.err.duplicate.annotation.invalid.repeated: Foo
+MissingDefaultCase1.java:11:1: compiler.err.invalid.repeatable.annotation.elem.nondefault: FooContainer, other()
2 errors
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,13 +6,11 @@
* @compile/fail/ref=MissingDefaultCase2.out -XDrawDiagnostics MissingDefaultCase2.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@interface FooContainer {
Foo[] value();
Foo other(); // missing default clause and return type is an annotation
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingDefaultCase2.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-MissingDefaultCase2.java:21:1: compiler.err.duplicate.annotation.invalid.repeated: Foo
-MissingDefaultCase2.java:12:1: compiler.err.invalid.containedby.annotation.elem.nondefault: FooContainer, other()
+MissingDefaultCase2.java:19:1: compiler.err.duplicate.annotation.invalid.repeated: Foo
+MissingDefaultCase2.java:11:1: compiler.err.invalid.repeatable.annotation.elem.nondefault: FooContainer, other()
2 errors
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,13 +6,11 @@
* @compile/fail/ref=MissingValueMethod.out -XDrawDiagnostics MissingValueMethod.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@interface FooContainer{
Foo[] values(); // wrong method name
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MissingValueMethod.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,4 @@
-MissingValueMethod.java:20:1: compiler.err.invalid.containedby.annotation.no.value: FooContainer
-MissingValueMethod.java:20:6: compiler.err.invalid.containedby.annotation.no.value: FooContainer
-MissingValueMethod.java:12:1: compiler.err.invalid.containedby.annotation.elem.nondefault: FooContainer, values()
+MissingValueMethod.java:18:1: compiler.err.invalid.repeatable.annotation.no.value: FooContainer
+MissingValueMethod.java:18:6: compiler.err.invalid.repeatable.annotation.no.value: FooContainer
+MissingValueMethod.java:11:1: compiler.err.invalid.repeatable.annotation.no.value: FooContainer
3 errors
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MultiLevelRepeatableAnno.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,19 +29,16 @@
* @compile MultiLevelRepeatableAnno.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {}
-@ContainedBy(FooContainerContainer.class)
-@ContainerFor(Foo.class)
+@Repeatable(FooContainerContainer.class)
@interface FooContainer {
Foo[] value();
}
-@ContainerFor(FooContainer.class)
@interface FooContainerContainer {
FooContainer[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/MultipleAnnoMixedOrder.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,25 +29,22 @@
* @compile MultipleAnnoMixedOrder.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {
int getNumbers();
}
-@ContainerFor(Foo.class)
@interface FooContainer {
Foo[] value();
}
-@ContainedBy(BazContainer.class)
+@Repeatable(BazContainer.class)
@interface Baz {
String getStr();
}
-@ContainerFor(Baz.class)
@interface BazContainer {
Baz[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/NestedContainers.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/NestedContainers.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,17 +34,15 @@
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
-@ContainedBy(Foos.class)
+@Repeatable(Foos.class)
@interface Foo {}
@Retention(RetentionPolicy.RUNTIME)
-@ContainedBy(FoosFoos.class)
-@ContainerFor(Foo.class)
+@Repeatable(FoosFoos.class)
@interface Foos {
Foo[] value();
}
-@ContainerFor(Foos.class)
@Retention(RetentionPolicy.RUNTIME)
@interface FoosFoos {
Foos[] value();
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/NoRepeatableAnno.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-NoRepeatableAnno.java:11:1: compiler.err.duplicate.annotation.missing.container: Foo, java.lang.annotation.ContainedBy
-NoRepeatableAnno.java:11:6: compiler.err.duplicate.annotation.missing.container: Foo, java.lang.annotation.ContainedBy
+NoRepeatableAnno.java:11:1: compiler.err.duplicate.annotation.missing.container: Foo, java.lang.annotation.Repeatable
+NoRepeatableAnno.java:11:6: compiler.err.duplicate.annotation.missing.container: Foo, java.lang.annotation.Repeatable
2 errors
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepMemberAnno.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepMemberAnno.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,20 +30,18 @@
* @run compile RepMemberAnno.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
public class RepMemberAnno {
@Bar("Apa") @Bar("Banan")
public void meh() {}
}
-@ContainedBy(BarContainer.class)
+@Repeatable(BarContainer.class)
@interface Bar {
String value();
}
-@ContainerFor(Bar.class)
@interface BarContainer {
Bar[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepSelfMemberAnno.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepSelfMemberAnno.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,21 +34,19 @@
@Retention(RetentionPolicy.RUNTIME)
-@ContainedBy(BarContainer.class)
+@Repeatable(BarContainer.class)
public @interface RepSelfMemberAnno {
@RepSelfMemberAnno @RepSelfMemberAnno
String meh() default "banan";
}
-@ContainedBy(BarContainerContainer.class)
+@Repeatable(BarContainerContainer.class)
@Retention(RetentionPolicy.RUNTIME)
-@ContainerFor(RepSelfMemberAnno.class)
@interface BarContainer {
RepSelfMemberAnno[] value();
}
-@ContainerFor(BarContainer.class)
@Retention(RetentionPolicy.RUNTIME)
@interface BarContainerContainer {
BarContainer[] value();
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingAndContainerPresent.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
import java.lang.annotation.*;
-@ContainedBy(Foos.class)
+@Repeatable(Foos.class)
@interface Foo {}
@interface Foos {
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,9 @@
import java.lang.annotation.*;
-@ContainedBy(Foos.class)
+@Repeatable(Foos.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@Target(ElementType.ANNOTATION_TYPE)
@interface Foos {
Foo[] value();
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/RepeatingTargetNotAllowed.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-RepeatingTargetNotAllowed.java:44:5: compiler.err.invalid.containedby.annotation.incompatible.target: Foos, Foo
+RepeatingTargetNotAllowed.java:43:5: compiler.err.invalid.repeatable.annotation.incompatible.target: Foos, Foo
1 error
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/SelfRepeatingAnnotations.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/SelfRepeatingAnnotations.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
import java.lang.annotation.*;
-@ContainerFor(SelfRepeatingAnno.class)
@Retention(RetentionPolicy.RUNTIME)
@interface Foos {
SelfRepeatingAnno[] value();
@@ -42,7 +41,7 @@
@SelfRepeatingAnno
@Retention(RetentionPolicy.RUNTIME)
@SelfRepeatingAnno
-@ContainedBy(Foos.class)
+@Repeatable(Foos.class)
@interface SelfRepeatingAnno {}
public class SelfRepeatingAnnotations {
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/SingleRepeatingAndContainer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/SingleRepeatingAndContainer.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,9 @@
import java.lang.annotation.*;
-@ContainedBy(Foos.class)
+@Repeatable(Foos.class)
@interface Foo {}
-@ContainerFor(Foo.class)
@interface Foos {
Foo[] value();
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongContainedBy.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Smoke test for repeating annotations
- * @compile/fail UseWrongContainedBy.java
- * @bug 7151010
- */
-
-import java.lang.annotation.*;
-
-@ContainerFor(UseWrongContainedBy.class)
-@interface Foos {
- UseWrongContainedBy[] value();
-}
-
-@ContainedBy(Target.class)
-public @interface UseWrongContainedBy {}
-
-@UseWrongContainedBy @UseWrongContainedBy
-@interface Foo {}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongContainerFor.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Smoke test for repeating annotations
- * @compile/fail UseWrongContainerFor.java
- * @bug 7151010
- */
-
-import java.lang.annotation.*;
-
-@ContainerFor(Retention.class)
-@interface Foos {
- UseWrongContainerFor[] value();
-}
-
-@ContainedBy(Foos.class)
-public @interface UseWrongContainerFor {}
-
-@UseWrongContainerFor @UseWrongContainerFor
-@interface Foo {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/UseWrongRepeatable.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Smoke test for repeating annotations
+ * @compile/fail UseWrongRepeatable.java
+ * @bug 7151010
+ */
+
+import java.lang.annotation.*;
+
+@interface Foos {
+ UseWrongRepeatable[] value();
+}
+
+@Repeatable(Target.class)
+public @interface UseWrongRepeatable {}
+
+@UseWrongRepeatable @UseWrongRepeatable
+@interface Foo {}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongContainedBy.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Smoke test for repeating annotations
- * @compile/fail WrongContainedBy.java
- * @bug 7151010
- */
-
-import java.lang.annotation.*;
-
-@ContainerFor(WrongContainedBy.class)
-@interface Foos {
- WrongContainedBy[] value();
-}
-
-@ContainedBy(Target.class)
-public @interface WrongContainedBy {}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongContainerFor.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Smoke test for repeating annotations
- * @compile/fail WrongContainerFor.java
- * @bug 7151010
- */
-
-import java.lang.annotation.*;
-
-@ContainerFor(Retention.class)
-@interface Foos {
- WrongContainerFor[] value();
-}
-
-@ContainedBy(Foos.class)
-public @interface WrongContainerFor {}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -6,15 +6,13 @@
* @compile/fail/ref=WrongReturnTypeForValue.out -XDrawDiagnostics WrongReturnTypeForValue.java
*/
-import java.lang.annotation.ContainedBy;
-import java.lang.annotation.ContainerFor;
+import java.lang.annotation.Repeatable;
-@ContainedBy(FooContainer.class)
+@Repeatable(FooContainer.class)
@interface Foo {
int getNumbers();
}
-@ContainerFor(Foo.class)
@interface FooContainer{
Foo value(); // wrong return type
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/WrongReturnTypeForValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,4 @@
-WrongReturnTypeForValue.java:22:1: compiler.err.invalid.containedby.annotation.value.return: FooContainer, Foo, Foo[]
-WrongReturnTypeForValue.java:22:6: compiler.err.invalid.containedby.annotation.value.return: FooContainer, Foo, Foo[]
-2 errors
+WrongReturnTypeForValue.java:20:1: compiler.err.invalid.repeatable.annotation.value.return: FooContainer, Foo, Foo[]
+WrongReturnTypeForValue.java:20:6: compiler.err.invalid.repeatable.annotation.value.return: FooContainer, Foo, Foo[]
+WrongReturnTypeForValue.java:11:1: compiler.err.invalid.repeatable.annotation.value.return: FooContainer, Foo, Foo[]
+3 errors
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -163,9 +163,8 @@
String replaceStr = "/*"+type+"*/";
StringBuilder annoData = new StringBuilder();
annoData.append(Helper.ContentVars.IMPORTCONTAINERSTMTS.getVal())
- .append(Helper.ContentVars.CONTAINERFOR.getVal())
.append(Helper.ContentVars.CONTAINER.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(Helper.ContentVars.BASE.getVal());
JavaFileObject pkgInfoFile = null;
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -115,24 +115,21 @@
switch(className) {
case "DeprecatedonBoth":
annoData.append(Helper.ContentVars.DEPRECATED.getVal())
- .append(Helper.ContentVars.CONTAINERFOR.getVal())
.append(Helper.ContentVars.CONTAINER.getVal())
.append(Helper.ContentVars.DEPRECATED.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(Helper.ContentVars.BASE.getVal());
break;
case "DeprecatedonBase":
- annoData.append(Helper.ContentVars.CONTAINERFOR.getVal())
- .append(Helper.ContentVars.CONTAINER.getVal())
+ annoData.append(Helper.ContentVars.CONTAINER.getVal())
.append(Helper.ContentVars.DEPRECATED.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(Helper.ContentVars.BASE.getVal());
break;
case "DeprecatedonContainer":
annoData.append(Helper.ContentVars.DEPRECATED.getVal())
- .append(Helper.ContentVars.CONTAINERFOR.getVal())
.append(Helper.ContentVars.CONTAINER.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(Helper.ContentVars.BASE.getVal());
break;
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -93,17 +93,15 @@
switch(className) {
case "DocumentedonBothAnno":
annoData.append(Helper.ContentVars.DOCUMENTED.getVal())
- .append(Helper.ContentVars.CONTAINERFOR.getVal())
.append(Helper.ContentVars.CONTAINER.getVal())
.append(Helper.ContentVars.DOCUMENTED.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(Helper.ContentVars.BASE.getVal());
break;
case "DocumentedonContainer":
annoData.append(Helper.ContentVars.DOCUMENTED.getVal())
- .append(Helper.ContentVars.CONTAINERFOR.getVal())
.append(Helper.ContentVars.CONTAINER.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(Helper.ContentVars.BASE.getVal());
break;
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/Helper.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/Helper.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,15 +34,13 @@
public class Helper {
enum ContentVars {
- IMPORTCONTAINERSTMTS("\nimport java.lang.annotation.ContainedBy;\n" +
- "\nimport java.lang.annotation.ContainerFor;\n"),
+ IMPORTCONTAINERSTMTS("\nimport java.lang.annotation.Repeatable;\n"),
IMPORTDEPRECATED("import java.lang.Deprecated;\n"),
IMPORTDOCUMENTED("import java.lang.annotation.Documented;\n"),
IMPORTINHERITED("import java.lang.annotation.Inherited;\n"),
IMPORTRETENTION("import java.lang.annotation.Retention;\n" +
"\nimport java.lang.annotation.RetentionPolicy;\n"),
- CONTAINEDBY("\n@ContainedBy(FooContainer.class)\n"),
- CONTAINERFOR("@ContainerFor(Foo.class)\n"),
+ REPEATABLE("\n@Repeatable(FooContainer.class)\n"),
CONTAINER("@interface FooContainer {\n" +" Foo[] value();\n}\n"),
BASE("@interface Foo {}\n"),
REPEATABLEANNO("\n@Foo() @Foo()"),
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -94,17 +94,15 @@
switch(className) {
case "InheritedonBothAnno":
annoData.append(Helper.ContentVars.INHERITED.getVal())
- .append(Helper.ContentVars.CONTAINERFOR.getVal())
.append(Helper.ContentVars.CONTAINER.getVal())
.append(Helper.ContentVars.INHERITED.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(Helper.ContentVars.BASE.getVal());
break;
case "InheritedonBase":
annoData.append(Helper.ContentVars.INHERITED.getVal())
- .append(Helper.ContentVars.CONTAINERFOR.getVal())
.append(Helper.ContentVars.CONTAINER.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(Helper.ContentVars.BASE.getVal());
break;
}
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,7 @@
new DiagnosticCollector<JavaFileObject>();
boolean ok = compileCode(className, contents, diagnostics);
- String expectedErrKey = "compiler.err.invalid.containedby" +
+ String expectedErrKey = "compiler.err.invalid.repeatable" +
".annotation.retention";
if (!shouldCompile && !ok) {
for (Diagnostic<?> d : diagnostics.getDiagnostics()) {
@@ -175,10 +175,9 @@
StringBuilder annoData = new StringBuilder();
annoData.append(Helper.ContentVars.IMPORTCONTAINERSTMTS.getVal())
.append(Helper.ContentVars.IMPORTRETENTION.getVal())
- .append(Helper.ContentVars.CONTAINERFOR.getVal())
.append(replacedRetCAVal)
.append(Helper.ContentVars.CONTAINER.getVal())
- .append(Helper.ContentVars.CONTAINEDBY.getVal())
+ .append(Helper.ContentVars.REPEATABLE.getVal())
.append(replacedRetBaseVal)
.append(Helper.ContentVars.BASE.getVal());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/6967002/T6967002.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6967002 8006775
+ * @summary JDK7 b99 javac compilation error (java.lang.AssertionError)
+ * @author Maurizio Cimadamore
+ * @compile/fail/ref=T6967002.out -XDrawDiagnostics T6967002.java
+ */
+class Test {
+ private static void m(byte[] octets) {
+ return m(octets..., ?);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/6967002/T6967002.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,8 @@
+T6967002.java:33:22: compiler.err.expected: ')'
+T6967002.java:33:25: compiler.err.illegal.start.of.expr
+T6967002.java:33:28: compiler.err.illegal.start.of.expr
+T6967002.java:33:29: compiler.err.illegal.start.of.expr
+T6967002.java:33:27: compiler.err.not.stmt
+T6967002.java:33:30: compiler.err.expected: ';'
+T6967002.java:35:2: compiler.err.premature.eof
+7 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/InnerClass.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,65 @@
+import java.lang.annotation.ElementType;
+
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary compiler crashes when visiting inner classes
+ * @author Mahmood Ali
+ * @compile InnerClass.java
+ */
+
+import java.lang.annotation.*;
+
+class InnerClass {
+
+ InnerClass() {}
+ InnerClass(Object o) {}
+
+ private void a() {
+ new Object() {
+ public <R> void method() { }
+ };
+ }
+
+ Object f1 = new InnerClass() {
+ <R> void method() { }
+ };
+
+ Object f2 = new InnerClass() {
+ <@A R> void method() { }
+ };
+
+ Object f3 = new InnerClass(null) {
+ <R> void method() { }
+ };
+
+ Object f4 = new InnerClass(null) {
+ <@A R> void method() { }
+ };
+
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/MultipleTargets.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary check that type annotations may appear on void method if it is a
+ * method annotation too.
+ * @author Mahmood Ali
+ * @compile MultipleTargets.java
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+class TypeUseTarget<K extends @A Object> {
+ @A void voidMethod() { }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.METHOD})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TargetTypes.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+import java.util.*;
+import java.io.*;
+
+/*
+ * @test
+ * @summary compiler accepts all values
+ * @author Mahmood Ali
+ * @author Yuri Gaevsky
+ * @compile TargetTypes.java
+ */
+
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@interface A {}
+
+/** wildcard bound */
+class T0x1C {
+ void m0x1C(List<? extends @A String> lst) {}
+}
+
+/** wildcard bound generic/array */
+class T0x1D<T> {
+ void m0x1D(List<? extends @A List<int[]>> lst) {}
+}
+
+/** typecast */
+class T0x00 {
+ void m0x00(Long l1) {
+ Object l2 = (@A Long) l1;
+ }
+}
+
+/** typecast generic/array */
+class T0x01<T> {
+ void m0x01(List<T> list) {
+ List<T> l = (List<@A T>) list;
+ }
+}
+
+/** instanceof */
+class T0x02 {
+ boolean m0x02(String s) {
+ return (s instanceof @A String);
+ }
+}
+
+/** object creation (new) */
+class T0x04 {
+ void m0x04() {
+ new @A ArrayList<String>();
+ }
+}
+
+/** local variable */
+class T0x08 {
+ void m0x08() {
+ @A String s = null;
+ }
+}
+
+/** method parameter generic/array */
+class T0x0D {
+ void m0x0D(HashMap<@A Object, List<@A List<@A Class>>> s1) {}
+}
+
+/** method receiver */
+class T0x06 {
+ void m0x06(@A T0x06 this) {}
+}
+
+/** method return type generic/array */
+class T0x0B {
+ Class<@A Object> m0x0B() { return null; }
+}
+
+/** field generic/array */
+class T0x0F {
+ HashMap<@A Object, @A Object> c1;
+}
+
+/** method type parameter */
+class T0x20<T, U> {
+ <@A T, @A U> void m0x20() {}
+}
+
+/** class type parameter */
+class T0x22<@A T, @A U> {
+}
+
+/** class type parameter bound */
+class T0x10<T extends @A Object> {
+}
+
+/** method type parameter bound */
+class T0x12<T> {
+ <T extends @A Object> void m0x12() {}
+}
+
+/** class type parameter bound generic/array */
+class T0x11<T extends List<@A T>> {
+}
+
+
+/** method type parameter bound generic/array */
+class T0x13 {
+ static <T extends Comparable<@A T>> T m0x13() {
+ return null;
+ }
+}
+
+/** class extends/implements generic/array */
+class T0x15<T> extends ArrayList<@A T> {
+}
+
+/** type test (instanceof) generic/array */
+class T0x03<T> {
+ void m0x03(T typeObj, Object obj) {
+ boolean ok = obj instanceof String @A [];
+ }
+}
+
+/** object creation (new) generic/array */
+class T0x05<T> {
+ void m0x05() {
+ new ArrayList<@A T>();
+ }
+}
+
+/** local variable generic/array */
+class T0x09<T> {
+ void g() {
+ List<@A String> l = null;
+ }
+
+ void a() {
+ String @A [] as = null;
+ }
+}
+
+/** type argument in constructor call generic/array */
+class T0x19 {
+ <T> T0x19() {}
+
+ void g() {
+ new <List<@A String>> T0x19();
+ }
+}
+
+/** type argument in method call generic/array */
+class T0x1B<T> {
+ void m0x1B() {
+ Collections.<T @A []>emptyList();
+ }
+}
+
+/** type argument in constructor call */
+class T0x18<T> {
+ <T> T0x18() {}
+
+ void m() {
+ new <@A Integer> T0x18();
+ }
+}
+
+/** type argument in method call */
+class T0x1A<T,U> {
+ public static <T, U> T m() { return null; }
+ static void m0x1A() {
+ T0x1A.<@A Integer, @A Short>m();
+ }
+}
+
+/** class extends/implements */
+class T0x14 extends @A Object implements @A Serializable, @A Cloneable {
+}
+
+/** exception type in throws */
+class T0x16 {
+ void m0x16() throws @A Exception {}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TypeParameterTarget.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary check that type annotations may appear on all type parameter
+ * @author Mahmood Ali
+ * @compile TypeParameterTarget.java
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+class TypeUseTarget<@A K extends Object> {
+ String[] field;
+
+ <@A K, @A V> String genericMethod(K k) { return null; }
+}
+
+interface MyInterface { }
+
+@interface MyAnnotation { }
+
+@Target(ElementType.TYPE_PARAMETER)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.io.*;
+import java.util.Set;
+import java.util.HashSet;
+
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.*;
+import javax.lang.model.util.ElementFilter;
+
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskListener;
+import com.sun.source.util.TreePath;
+import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.main.JavaCompiler.CompileState;
+import com.sun.tools.javac.processing.JavacProcessingEnvironment;
+import com.sun.tools.javac.util.Context;
+
+/*
+ * @test
+ * @summary test that type processors are run when -proc:only is passed.
+ * This class implements the functionality of a type processor, as previously
+ * embodied by the AbstractTypeProcessor class.
+ *
+ * @author Mahmood Ali
+ * @author Werner Dietl
+ */
+@SupportedAnnotationTypes("*")
+public class TypeProcOnly extends AbstractProcessor {
+ private static final String INDICATOR = "INDICATOR";
+
+ private final AttributionTaskListener listener = new AttributionTaskListener();
+ private final Set<Name> elements = new HashSet<Name>();
+
+ @Override
+ public final void init(ProcessingEnvironment env) {
+ super.init(env);
+ JavacTask.instance(env).addTaskListener(listener);
+ Context ctx = ((JavacProcessingEnvironment)processingEnv).getContext();
+ JavaCompiler compiler = JavaCompiler.instance(ctx);
+ compiler.shouldStopPolicyIfNoError = CompileState.max(
+ compiler.shouldStopPolicyIfNoError,
+ CompileState.FLOW);
+ }
+
+ @Override
+ public final boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ for (TypeElement elem : ElementFilter.typesIn(roundEnv.getRootElements())) {
+ elements.add(elem.getQualifiedName());
+ }
+ return false;
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+
+ private final class AttributionTaskListener implements TaskListener {
+ @Override
+ public void started(TaskEvent e) { }
+
+ @Override
+ public void finished(TaskEvent e) {
+ if (e.getKind() != TaskEvent.Kind.ANALYZE)
+ return;
+
+ if (!elements.remove(e.getTypeElement().getQualifiedName()))
+ return;
+
+ System.out.println(INDICATOR);
+ }
+ }
+
+
+ private static File writeTestFile() throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println("class Test { }");
+ out.close();
+ return f;
+ }
+
+ public static void main(String[] args) throws Exception {
+ PrintStream prevOut = System.out;
+
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ PrintStream out = new PrintStream(bytes);
+ System.setOut(out);
+
+ try {
+ File f = writeTestFile();
+ com.sun.tools.javac.Main.compile(new String[] {"-proc:only", "-processor", "TypeProcOnly", f.getAbsolutePath()});
+ } finally {
+ System.setOut(prevOut);
+ }
+
+ if (bytes.toString().trim().equals(INDICATOR)) {
+ System.out.println("PASSED");
+ } else {
+ throw new Exception("Processor did not run correctly. Output: " + bytes);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TypeUseTarget.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary check that type annotations may appear on all type declarations
+ * @author Mahmood Ali
+ * @compile TypeUseTarget.java
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@A
+class TypeUseTarget<K extends @A Object> {
+ @A String @A [] field;
+
+ @A String test(@A TypeUseTarget<K> this, @A String param, @A String @A ... vararg) {
+ @A Object o = new @A String @A [3];
+ TypeUseTarget<@A String> target;
+ return (@A String) null;
+ }
+
+ <K> @A String genericMethod(K k) { return null; }
+ @Decl <K> @A String genericMethod1(K k) { return null; }
+ @A @Decl <K> String genericMethod2(K k) { return null; }
+ @Decl @A <K> String genericMethod3(K k) { return null; }
+ <K> @Decl String genericMethod4(K k) { return null; }
+ <K> @A @Decl String genericMethod5(K k) { return null; }
+}
+
+@A
+interface MyInterface { }
+
+@A
+@interface MyAnnotation { }
+
+@Target(ElementType.TYPE_USE)
+@interface A { }
+
+@interface Decl { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Checks the annotation types targeting array types
+ */
+
+import com.sun.tools.javac.api.JavacTool;
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.lang.annotation.*;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import com.sun.source.tree.*;
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TreeScanner;
+import javax.tools.StandardJavaFileManager;
+
+
+public class AnnotatedArrayOrder {
+ public static void main(String[] args) throws Exception {
+ PrintWriter out = new PrintWriter(System.out, true);
+ JavacTool tool = JavacTool.create();
+ StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
+ File testSrc = new File(System.getProperty("test.src"));
+ Iterable<? extends JavaFileObject> f =
+ fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, "AnnotatedArrayOrder.java")));
+ JavacTask task = tool.getTask(out, fm, null, null, null, f);
+ Iterable<? extends CompilationUnitTree> trees = task.parse();
+ out.flush();
+
+ Scanner s = new Scanner();
+ for (CompilationUnitTree t: trees)
+ s.scan(t, null);
+
+ }
+
+ private static class Scanner extends TreeScanner<Void,Void> {
+ public Void visitCompilationUnit(CompilationUnitTree node, Void ignore) {
+ super.visitCompilationUnit(node, ignore);
+ if (!expectedLocations.isEmpty()) {
+ throw new AssertionError("Didn't found all annotations: " + expectedLocations);
+ }
+ return null;
+ }
+
+ private void testAnnotations(List<? extends AnnotationTree> annos, int found) {
+ String annotation = annos.get(0).toString();
+
+ if (!expectedLocations.containsKey(annotation))
+ throw new AssertionError("Found unexpected annotation: " + annotation + expectedLocations);
+
+ int expected = expectedLocations.get(annotation);
+ if (found != expected)
+ throw new AssertionError("The expected array length for this error doesn't match");
+
+ expectedLocations.remove(annotation);
+ }
+
+ public Void visitAnnotatedType(AnnotatedTypeTree node, Void ignore) {
+ testAnnotations(node.getAnnotations(), arrayLength(node));
+ return super.visitAnnotatedType(node, ignore);
+ }
+
+ private int arrayLength(Tree tree) {
+ switch (tree.getKind()) {
+ case ARRAY_TYPE:
+ return 1 + arrayLength(((ArrayTypeTree)tree).getType());
+ case ANNOTATED_TYPE:
+ return arrayLength(((AnnotatedTypeTree)tree).getUnderlyingType());
+ default:
+ return 0;
+ }
+ }
+ }
+
+ // expectedLocations values:
+ static Map<String, Integer> expectedLocations = new HashMap<String, Integer>();
+
+ // visited code
+ @A String @C [] @B [] field;
+ static {
+ // Shouldn't find @A(), as it is field annotation
+ expectedLocations.put("@B()", 1);
+ expectedLocations.put("@C()", 2);
+ }
+
+ List<@D String @F [] @E []> typearg;
+ static {
+ expectedLocations.put("@D()", 0);
+ expectedLocations.put("@E()", 1);
+ expectedLocations.put("@F()", 2);
+ }
+
+ void varargSimple(@G String @H ... vararg1) { }
+ static {
+ // Shouldn't find @G(), as it is a parameter annotation
+ expectedLocations.put("@H()", 1);
+ }
+
+ void varargLong(@I String @L [] @K [] @J ... vararg2) { }
+ static {
+ // Shouldn't find @I(), as it is a parameter annotation
+ expectedLocations.put("@J()", 1);
+ expectedLocations.put("@K()", 2);
+ expectedLocations.put("@L()", 3);
+ }
+
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface B {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface C {}
+
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface D {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface E {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface F {}
+
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface G {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface H {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface I {}
+
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface J {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface K {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface L {}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Checks that the interaction between annotated and unannotated
+ * array levels in array creation trees
+ */
+
+import com.sun.tools.javac.api.JavacTool;
+import com.sun.tools.javac.tree.JCTree.JCNewArray;
+import java.lang.annotation.*;
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import com.sun.source.tree.*;
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TreeScanner;
+import javax.tools.StandardJavaFileManager;
+
+
+public class ArrayCreationTree {
+ public static void main(String[] args) throws Exception {
+ PrintWriter out = new PrintWriter(System.out, true);
+ JavacTool tool = JavacTool.create();
+ StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
+ File testSrc = new File(System.getProperty("test.src"));
+ Iterable<? extends JavaFileObject> f =
+ fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, "ArrayCreationTree.java")));
+ JavacTask task = tool.getTask(out, fm, null, null, null, f);
+ Iterable<? extends CompilationUnitTree> trees = task.parse();
+ out.flush();
+
+ Scanner s = new Scanner();
+ for (CompilationUnitTree t: trees)
+ s.scan(t, null);
+
+ }
+
+ private static class Scanner extends TreeScanner<Void,Void> {
+ int foundAnnotations = 0;
+ public Void visitCompilationUnit(CompilationUnitTree node, Void ignore) {
+ super.visitCompilationUnit(node, ignore);
+ if (foundAnnotations != expectedAnnotations) {
+ throw new AssertionError("Expected " + expectedAnnotations +
+ " annotations but found: " + foundAnnotations);
+ }
+ return null;
+ }
+
+ private void testAnnotations(List<? extends AnnotationTree> annos, int found) {
+ if (annos.isEmpty()) return;
+
+ String annotation = annos.get(0).toString();
+ foundAnnotations++;
+
+ int expected = -1;
+ if (annotation.equals("@A()"))
+ expected = 0;
+ else if (annotation.equals("@B()"))
+ expected = 1;
+ else if (annotation.equals("@C()"))
+ expected = 2;
+ else
+ throw new AssertionError("found an unexpected annotation: " + annotation);
+ if (found != expected) {
+ throw new AssertionError("Unexpected found length" +
+ ", found " + found + " but expected " + expected);
+ }
+ }
+
+ public Void visitAnnotatedType(AnnotatedTypeTree node, Void ignore) {
+ testAnnotations(node.getAnnotations(), arrayLength(node));
+ return super.visitAnnotatedType(node, ignore);
+ }
+
+ public Void visitNewArray(NewArrayTree node, Void ignore) {
+ // the Tree API hasn't been updated to expose annotations yet
+ JCNewArray newArray = (JCNewArray)node;
+ int totalLength = node.getDimensions().size()
+ + arrayLength(node.getType())
+ + ((newArray.getInitializers() != null) ? 1 : 0);
+ testAnnotations(newArray.annotations, totalLength);
+ int count = 0;
+ for (List<? extends AnnotationTree> annos : newArray.dimAnnotations) {
+ testAnnotations(annos, totalLength - count);
+ count++;
+ }
+ return super.visitNewArray(node, ignore);
+ }
+
+ private int arrayLength(Tree tree) {
+ // TODO: the tree is null when called with node.getType(). Why?
+ if (tree==null) return -1;
+ switch (tree.getKind()) {
+ case ARRAY_TYPE:
+ return 1 + arrayLength(((ArrayTypeTree)tree).getType());
+ case ANNOTATED_TYPE:
+ return arrayLength(((AnnotatedTypeTree)tree).getUnderlyingType());
+ default:
+ return 0;
+ }
+ }
+ }
+
+ static int expectedAnnotations = 21;
+
+ Object a1 = new @A Object @C [2] @B [1];
+ Object b1 = new @A Object @C [2] @B [ ];
+ Object c1 = new @A Object @C [ ] @B [ ] { };
+
+ Object a2 = new @A Object @C [2] [1];
+ Object b2 = new @A Object @C [2] [ ];
+ Object c2 = new @A Object @C [ ] [ ] { };
+
+ Object a3 = new @A Object [2] @B [1];
+ Object b3 = new @A Object [2] @B [ ];
+ Object c3 = new @A Object [ ] @B [ ] { };
+
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface B {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface C {}
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Checks that the interaction between annotated and unannotated
+ * array levels
+ */
+
+import com.sun.tools.javac.api.JavacTool;
+import java.lang.annotation.*;
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import com.sun.source.tree.*;
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TreeScanner;
+import javax.tools.StandardJavaFileManager;
+
+
+public class ArrayPositionConsistency {
+ public static void main(String[] args) throws Exception {
+ PrintWriter out = new PrintWriter(System.out, true);
+ JavacTool tool = JavacTool.create();
+ StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
+ File testSrc = new File(System.getProperty("test.src"));
+ Iterable<? extends JavaFileObject> f =
+ fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, "ArrayPositionConsistency.java")));
+ JavacTask task = tool.getTask(out, fm, null, null, null, f);
+ Iterable<? extends CompilationUnitTree> trees = task.parse();
+ out.flush();
+
+ Scanner s = new Scanner();
+ for (CompilationUnitTree t: trees)
+ s.scan(t, null);
+
+ }
+
+ private static class Scanner extends TreeScanner<Void,Void> {
+ int foundAnnotations = 0;
+ public Void visitCompilationUnit(CompilationUnitTree node, Void ignore) {
+ super.visitCompilationUnit(node, ignore);
+ if (foundAnnotations != expectedAnnotations) {
+ throw new AssertionError("Expected " + expectedAnnotations +
+ " annotations but found: " + foundAnnotations);
+ }
+ return null;
+ }
+
+ private void testAnnotations(List<? extends AnnotationTree> annos, int found) {
+ String annotation = annos.get(0).toString();
+ foundAnnotations++;
+
+ int expected = -1;
+ if (annotation.equals("@A()"))
+ expected = 0;
+ else if (annotation.equals("@B()"))
+ expected = 1;
+ else if (annotation.equals("@C()"))
+ expected = 2;
+ else
+ throw new AssertionError("found an unexpected annotation: " + annotation);
+ if (found != expected) {
+ throw new AssertionError("Unexpected found length" +
+ ", found " + found + " but expected " + expected);
+ }
+ }
+
+ public Void visitAnnotatedType(AnnotatedTypeTree node, Void ignore) {
+ testAnnotations(node.getAnnotations(), arrayLength(node));
+ return super.visitAnnotatedType(node, ignore);
+ }
+
+ private int arrayLength(Tree tree) {
+ switch (tree.getKind()) {
+ case ARRAY_TYPE:
+ return 1 + arrayLength(((ArrayTypeTree)tree).getType());
+ case ANNOTATED_TYPE:
+ return arrayLength(((AnnotatedTypeTree)tree).getUnderlyingType());
+ default:
+ return 0;
+ }
+ }
+ }
+
+ static int expectedAnnotations = 23;
+
+ // visited code
+ @A String @C [] @B [] field1;
+ @A String @C [] [] field2;
+ @A String [] @B [] field3;
+ String [] @B [] field4;
+
+ @A List<String> @C [] @B [] genfield1;
+ @A List<String> @C [] [] genfield2;
+ @A List<String> [] @B [] genfield3;
+ List<String> [] @B [] genfield4;
+
+ List<@A String @C [] @B []> typearg1;
+ List<@A String @C [] []> typearg2;
+ List<@A String [] @B []> typearg3;
+ List< String [] @B []> typearg4;
+
+ void vararg1(@A String @C [] @B ... arg) {}
+ void vararg2(@A String @C [] ... arg) {}
+ void vararg3(@A String [] @B ... arg) {}
+ void vararg4( String [] @B ... arg) {}
+
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface B {}
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface C {}
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/attribution/Scopes.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary test scopes of attribution
+ * @author Mahmood Ali
+ * @compile Scopes.java
+ */
+class Scopes {
+
+ void test(@A(VALUE) Scopes this) { }
+ void test1(@A(value=VALUE) Scopes this) { }
+
+ private static final int VALUE = 1;
+ @interface A { int value(); }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+import java.io.*;
+import java.net.URL;
+import java.util.List;
+
+import com.sun.tools.classfile.*;
+
+public class ClassfileTestHelper {
+ int expected_tinvisibles = 0;
+ int expected_tvisibles = 0;
+ int expected_invisibles = 0;
+ int expected_visibles = 0;
+
+ //Makes debugging much easier. Set to 'false' for less output.
+ public Boolean verbose = true;
+ void println(String msg) { if(verbose) System.out.println(msg); }
+
+ File writeTestFile(String fname, String source) throws IOException {
+ File f = new File(fname);
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println(source);
+ out.close();
+ return f;
+ }
+
+ File compile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] {
+ "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ ClassFile getClassFile(String name) throws IOException, ConstantPoolException {
+ URL url = getClass().getResource(name);
+ InputStream in = url.openStream();
+ try {
+ return ClassFile.read(in);
+ } finally {
+ in.close();
+ }
+ }
+
+ ClassFile getClassFile(URL url) throws IOException, ConstantPoolException {
+ InputStream in = url.openStream();
+ try {
+ return ClassFile.read(in);
+ } finally {
+ in.close();
+ }
+ }
+
+ /************ Helper annotations counting methods ******************/
+ void test(ClassFile cf) {
+ test("CLASS",cf, null, null, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test("CLASS",cf, null, null, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ //RuntimeAnnotations since one annotation can result in two attributes.
+ test("CLASS",cf, null, null, Attribute.RuntimeVisibleAnnotations, true);
+ test("CLASS",cf, null, null, Attribute.RuntimeInvisibleAnnotations, false);
+ }
+
+ void test(ClassFile cf, Method m) {
+ test("METHOD",cf, null, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test("METHOD",cf, null, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ test("METHOD",cf, null, m, Attribute.RuntimeVisibleAnnotations, true);
+ test("METHOD",cf, null, m, Attribute.RuntimeInvisibleAnnotations, false);
+ }
+
+ void test(ClassFile cf, Field f) {
+ test("FIELD",cf, f, null, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test("FIELD",cf, f, null, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ test("FIELD",cf, f, null, Attribute.RuntimeVisibleAnnotations, true);
+ test("FIELD",cf, f, null, Attribute.RuntimeInvisibleAnnotations, false);
+ }
+
+
+ // Test the result of Attributes.getIndex according to expectations
+ // encoded in the class/field/method name; increment annotations counts.
+ void test(String ttype, ClassFile cf, Field f, Method m, String annName, boolean visible) {
+ String testtype = ttype;
+ String name = null;
+ int index = -1;
+ Attribute attr = null;
+ boolean isTAattr = annName.contains("TypeAnnotations");
+ try {
+ switch(testtype) {
+ case "FIELD":
+ name = f.getName(cf.constant_pool);
+ index = f.attributes.getIndex(cf.constant_pool, annName);
+ if(index!= -1) attr = f.attributes.get(index);
+ break;
+ case "METHOD":
+ name = m.getName(cf.constant_pool);
+ index = m.attributes.getIndex(cf.constant_pool, annName);
+ if(index!= -1) attr = m.attributes.get(index);
+ break;
+ default:
+ name = cf.getName();
+ index = cf.attributes.getIndex(cf.constant_pool, annName);
+ if(index!= -1) attr = cf.attributes.get(index);
+ }
+ } catch(ConstantPoolException cpe) { cpe.printStackTrace(); }
+
+ if (index != -1) {
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ if(isTAattr) { //count RuntimeTypeAnnotations
+ RuntimeTypeAnnotations_attribute tAttr =
+ (RuntimeTypeAnnotations_attribute)attr;
+ println(testtype + ": " + name + ", " + annName + ": " +
+ tAttr.annotations.length );
+ allt += tAttr.annotations.length;
+ if (visible)
+ tvisibles += tAttr.annotations.length;
+ else
+ tinvisibles += tAttr.annotations.length;
+ } else {
+ RuntimeAnnotations_attribute tAttr =
+ (RuntimeAnnotations_attribute)attr;
+ println(testtype + ": " + name + ", " + annName + ": " +
+ tAttr.annotations.length );
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+ }
+
+ void countAnnotations() {
+ errors=0;
+ int expected_allt = expected_tvisibles + expected_tinvisibles;
+ int expected_all = expected_visibles + expected_invisibles;
+
+ if (expected_allt != allt) {
+ errors++;
+ System.err.println("Failure: expected " + expected_allt +
+ " type annotations but found " + allt);
+ }
+ if (expected_all != all) {
+ errors++;
+ System.err.println("Failure: expected " + expected_all +
+ " annotations but found " + all);
+ }
+ if (expected_tvisibles != tvisibles) {
+ errors++;
+ System.err.println("Failure: expected " + expected_tvisibles +
+ " typevisible annotations but found " + tvisibles);
+ }
+
+ if (expected_tinvisibles != tinvisibles) {
+ errors++;
+ System.err.println("Failure: expected " + expected_tinvisibles +
+ " typeinvisible annotations but found " + tinvisibles);
+ }
+ allt=0;
+ tvisibles=0;
+ tinvisibles=0;
+ all=0;
+ visibles=0;
+ invisibles=0;
+ }
+
+ int errors;
+ int allt;
+ int tvisibles;
+ int tinvisibles;
+ int all;
+ int visibles;
+ int invisibles;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005085 8005877 8004829 8005681 8006734 8006775
+ * @ignore
+ * @summary Combinations of Target ElementTypes on (repeated)type annotations.
+ */
+
+import com.sun.tools.classfile.*;
+import java.io.File;
+
+public class CombinationsTargetTest1 extends ClassfileTestHelper {
+ // Helps identify test case in event of failure.
+ int testcount = 0;
+ int src1 = 1, src2 = 2, src4 = 4,
+ src5 = 5, src6 = 6, src7 = 7;
+
+ String[] ETypes={"TYPE", "FIELD", "METHOD", "PARAMETER", "CONSTRUCTOR",
+ "LOCAL_VARIABLE", "ANNOTATION_TYPE", "PACKAGE"};
+
+ // local class tests will have an inner class.
+ Boolean hasInnerClass=false;
+ String innerClassname="";
+
+ public static void main(String[] args) throws Exception {
+ new CombinationsTargetTest1().run();
+ }
+
+ void run() throws Exception {
+ // Determines which repeat and order in source(ABMix).
+ Boolean As= false, BDs=true, ABMix=false;
+ int testrun=0;
+ // A repeats and/or B/D repeats, ABMix for order of As and Bs.
+ Boolean [][] bRepeat = new Boolean[][]{{false,false,false},//no repeats
+ {true,false,false}, //repeat @A
+ {false,true,false}, //repeat @B
+ {true,true,false}, //repeat both
+ {false,false,true} //repeat mix
+ };
+ for(Boolean[] bCombo : bRepeat) {
+ As=bCombo[0]; BDs=bCombo[1]; ABMix=bCombo[2];
+ for(String et : ETypes) {
+ switch(et) {
+ case "METHOD":
+ test( 8, 0, 2, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src1);
+ test(10, 0, 2, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src2);
+ test( 8, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src4);
+ test(10, 0, 2, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src6);
+ test( 0, 8, 0, 2, As, BDs, ABMix, "RUNTIME", et, ++testrun, src1);
+ test( 0, 10, 0, 2, As, BDs, ABMix, "RUNTIME", et, ++testrun, src2);
+ test( 0, 8, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, src4);
+ test( 0, 10, 0, 2, As, BDs, ABMix, "RUNTIME", et, ++testrun, src6);
+ break;
+ case "CONSTRUCTOR":
+ case "FIELD":
+ test( 8, 0, 4, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src1);
+ test( 6, 0, 3, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src5);
+ test( 9, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src7);
+ test( 0, 8, 0, 4, As, BDs, ABMix, "RUNTIME", et, ++testrun, src1);
+ test( 0, 6, 0, 3, As, BDs, ABMix, "RUNTIME", et, ++testrun, src5);
+ test( 0, 9, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, src7);
+ break;
+ default:/*TYPE,PARAMETER,LOCAL_VARIABLE,ANNOTATION_TYPE,PACKAGE*/
+ test( 8, 0, 2, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src1);
+ test( 6, 0, 3, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src5);
+ test( 0, 8, 0, 2, As, BDs, ABMix, "RUNTIME", et, ++testrun, src1);
+ test( 0, 6, 0, 3, As, BDs, ABMix, "RUNTIME", et, ++testrun, src5);
+ }
+ }
+ }
+ }
+
+ public void test(int tinv, int tvis, int inv, int vis, Boolean Arepeats,
+ Boolean BDrepeats, Boolean ABmix, String rtn, String et2,
+ Integer N, int source) throws Exception {
+ ++testcount;
+ expected_tvisibles = tvis;
+ expected_tinvisibles = tinv;
+ expected_visibles = vis;
+ expected_invisibles = inv;
+ File testFile = null;
+ String tname="Test" + N.toString();
+ hasInnerClass=false;
+ String testDef = "Test " + testcount + " parameters: tinv=" + tinv +
+ ", tvis=" + tvis + ", inv=" + inv + ", vis=" + vis +
+ ", Arepeats=" + Arepeats + ", BDrepeats=" + BDrepeats +
+ ", ABmix=" + ABmix + ", retention: " + rtn + ", anno2: " +
+ et2 + ", src=" + source;
+
+ println(testDef);
+ // Create test source and File.
+ String sourceString = sourceString(tname, rtn, et2, Arepeats,
+ BDrepeats, ABmix, source);
+ testFile = writeTestFile(tname+".java", sourceString);
+ // Compile test source and read classfile.
+ File classFile = null;
+ try {
+ classFile = compile(testFile);
+ } catch (Error err) {
+ System.err.println("Failed compile. Source:\n" + sourceString);
+ throw err;
+ }
+ //if sourcString() set hasInnerClass it also set innerClassname.
+ if(hasInnerClass) {
+ StringBuffer sb = new StringBuffer(classFile.getAbsolutePath());
+ classFile=new File(sb.insert(sb.lastIndexOf(".class"),innerClassname).toString());
+ }
+ ClassFile cf = ClassFile.read(classFile);
+
+ //Test class,fields and method counts.
+ test(cf);
+
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+ countAnnotations();
+ if (errors > 0) {
+ System.err.println( testDef );
+ System.err.println( "Source:\n" + sourceString );
+ throw new Exception( errors + " errors found" );
+ }
+ println("Pass");
+ }
+
+ //
+ // Source for test cases
+ //
+ String sourceString(String testname, String retentn, String annot2,
+ Boolean Arepeats, Boolean BDrepeats, Boolean ABmix,
+ int src) {
+
+ String As = "@A", Bs = "@B", Ds = "@D";
+ if(Arepeats) As = "@A @A";
+ if(BDrepeats) {
+ Bs = "@B @B";
+ Ds = "@D @D";
+ }
+ if(ABmix) { As = "@A @B"; Bs = "@A @B"; Ds = "@D @D"; }
+
+ // Source to check for TYPE_USE and TYPE_PARAMETER annotations.
+ // Source base (annotations) is same for all test cases.
+ String source = new String();
+ String imports = new String("import java.lang.annotation.*; \n" +
+ "import static java.lang.annotation.RetentionPolicy.*; \n" +
+ "import static java.lang.annotation.ElementType.*; \n" +
+ "import java.util.List; \n" +
+ "import java.util.HashMap; \n" +
+ "import java.util.Map; \n\n");
+
+ String sourceBase = new String("@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,_OTHER_})\n" +
+ "@ContainedBy( AC.class )\n" +
+ "@interface A { }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,_OTHER_})\n" +
+ "@ContainerFor(A.class)\n" +
+ "@interface AC { A[] value(); }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,_OTHER_})\n" +
+ "@ContainedBy( BC.class )\n" +
+ "@interface B { }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,_OTHER_})\n" +
+ "@ContainerFor(B.class)\n" +
+ "@interface BC { B[] value(); } \n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_PARAMETER,_OTHER_})\n" +
+ "@interface C { }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" +
+ "@ContainedBy(DC.class)\n" +
+ "@interface D { }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" +
+ "@ContainerFor(D.class) \n" +
+ "@interface DC { D[] value(); }\n\n");
+
+ // Test case sources with sample generated source.
+ switch(src) {
+ case 1: // repeating type annotations at class level
+ /*
+ * @A @B class Test1 {
+ * @A @B Test1(){}
+ * @A @B Integer i1 = 0;
+ * String @A @B [] @A @B [] sa = null;
+ * // type usage in method body
+ * String test(Test1 this, String param, String ... vararg) {
+ * Object o = new String [3];
+ * return (String) null;
+ * }}
+ */
+ source = new String(
+ "// (repeating) type annotations at class level. \n" +
+ "_As_ _Bs_ class " + testname + " {\n" +
+ "_As_ _Bs_ " + testname +"(){} \n" +
+ "_As_ _Bs_ Integer i1 = 0; \n" +
+ "String _As_ _Bs_ [] _As_ _Bs_ [] sa = null; \n" +
+ "// type usage in method body \n" +
+ "String test("+testname+" this, " +
+ "String param, String ... vararg) { \n" +
+ " Object o = new String [3]; \n" +
+ " return (String) null; \n" +
+ "} \n" +
+ "} \n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+ "\n\n";
+ break;
+ case 2: // (repeating) type annotations on method.
+ /*
+ * class Test12 {
+ * Test12(){}
+ * // type usage on method
+ * @A @B String test(@A @B Test12 this, @A @B String param, @A @B String @A @B ... vararg) {
+ * Object o = new String [3];
+ * return (String) null;
+ * }}
+ */
+ source = new String(
+ "// (repeating) type annotations on method. \n" +
+ "class " + testname + " {\n" +
+ testname +"(){} \n" +
+ "// type usage on method \n" +
+ "_As_ _Bs_ String test(_As_ _Bs_ "+testname+" this, " +
+ "_As_ _Bs_ String param, _As_ _Bs_ String _As_ _Bs_ ... vararg) { \n" +
+ " Object o = new String [3]; \n" +
+ " return (String) null; \n" +
+ "} \n" +
+ "} \n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+ "\n\n";
+ break;
+ case 4: //(repeating) annotations on wildcard, type arguments in anonymous class.
+ /*
+ * class Test13<T extends Object> {
+ * public T data = null;
+ * T getData() { return data;}
+ * String mtest( Test13<String> t){ return t.getData(); }
+ * public void test() {
+ * mtest( new Test13<@A @B String>() {
+ * void m1(List<@A @B ? extends @A @B Object> lst) {}
+ * void m2() throws@A @B Exception { }
+ * });
+ * }
+ * }
+ */
+ source = new String( source +
+ "// (repeating) annotations on wildcard, type arguments in anonymous class. \n" +
+ "class " + testname + "<T extends Object> {\n" +
+ " public T data = null;\n" +
+ " T getData() { return data;}\n" +
+ " String mtest( " + testname + "<String> t){ return t.getData(); }\n" +
+ " public void test() {\n" +
+ " mtest( new " + testname + "<_As_ _Bs_ String>() {\n" +
+ " void m1(List<_As_ _Bs_ ? extends _As_ _Bs_ Object> lst) {}\n" +
+ " void m2() throws_As_ _Bs_ Exception { }\n" +
+ " });\n" +
+ " }\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) + "\n\n";
+ hasInnerClass=true;
+ innerClassname="$1";
+ break;
+ case 5: // (repeating)annotations on type parameters, bounds and type arguments on class decl.
+ /*
+ * @A @B @D
+ * class Test2<@A @B @C @D T extends @A @B Object> {
+ * Map<List<String>, Integer> map =
+ * new HashMap<List< String>, Integer>();
+ * Map<List<String>,Integer> map2 = new HashMap<>();
+ * String test(Test2<T> this) { return null;}
+ * <T> String genericMethod(T t) { return null; }
+ * }
+ */
+ source = new String( source +
+ "// (repeating)annotations on type parameters, bounds and type arguments on class decl. \n" +
+ "_As_ _Bs_ _Ds_\n" + //8004829: A and B on type parameter below.
+ "class " + testname + "<_As_ _Bs_ @C _Ds_ T extends _As_ _Bs_ Object> {\n" +
+ " Map<List<String>, Integer> map =\n" +
+ " new HashMap<List< String>, Integer>();\n" +
+ " Map<List<String>,Integer> map2 = new HashMap<>();\n" +
+ " String test(" + testname + "<T> this) { return null;}\n" +
+ " <T> String genericMethod(T t) { return null; }\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs).replace("_Ds_",Ds) +
+ "\n\n";
+ break;
+ case 6: // (repeating) annotations on type parameters, bounds and type arguments on method.
+ /*
+ * class Test14<T extends Object> {
+ * Map<List<String>, Integer> map =
+ * new HashMap<List<String>, Integer>();
+ * Map<List<String>, Integer> map2 = new HashMap<>();
+ * String test(@A @B Test14<@D T> this) { return null;}
+ * <@C @D T> @A @B String genericMethod(@A @B @D T t) { return null; }
+ * }
+ */
+ source = new String( source +
+ "// (repeating) annotations on type parameters, bounds and type arguments on method. \n" +
+ "class " + testname + "<T extends Object> {\n" +
+ " Map<List<String>, Integer> map =\n" +
+ " new HashMap<List<String>, Integer>();\n" +
+ " Map<List<String>, Integer> map2 = new HashMap<>();\n" +
+ " String test(_As_ _Bs_ " + testname + "<_Ds_ T> this) { return null;}\n" +
+ " <@C _Ds_ T> _As_ _Bs_ String genericMethod(_As_ _Bs_ _Ds_ T t) { return null; }\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs).replace("_Ds_",Ds) +
+ "\n\n";
+ break;
+ case 7: // repeating annotations on type parameters, bounds and type arguments in method.
+ /*
+ * class Test7{
+ * <E extends Comparable> Map<List<E>, E > foo(E e) {
+ * class maptest <@A @B @D E> {
+ * Map<List<@A @B @D E>,@A @B @D E> getMap() {
+ * return new HashMap<List<E>,E>();
+ * }
+ * }
+ * return new maptest<E>().getMap();
+ * }
+ * Map<List<String>,String> shm = foo(new String("hello"));
+ * }
+ */
+ source = new String( source +
+ "// (repeating)annotations on type parameters of class, method return value in method. \n" +
+ "class "+ testname + "{\n" +
+ " <E extends Comparable> Map<List<E>, E > foo(E e) {\n" +
+ " class maptest <_As_ _Bs_ _Ds_ E> {\n" + // inner class $1maptest
+ " Map<List<_As_ _Bs_ _Ds_ E>,_As_ _Bs_ _Ds_ E> getMap() { \n" +
+ " return new HashMap<List<E>,E>();\n" +
+ " }\n" +
+ " }\n" +
+ " return new maptest<E>().getMap();\n" +
+ " }\n" +
+ " Map<List<String>,String> shm = foo(new String(\"hello\"));\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs).replace("_Ds_",Ds) +
+ "\n\n";
+ hasInnerClass=true;
+ innerClassname="$1maptest";
+ break;
+ }
+ return imports + source;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005085 8005877 8004829 8005681 8006734 8006775
+ * @ignore
+ * @summary Combinations of Target ElementTypes on (repeated)type annotations.
+ */
+
+import com.sun.tools.classfile.*;
+import java.io.File;
+
+public class CombinationsTargetTest2 extends ClassfileTestHelper {
+ // Helps identify test case in event of failure.
+ int testcount = 0;
+ int src3 = 3, src8 = 8, src9 = 9;
+
+ String[] ETypes={"TYPE", "FIELD", "METHOD", "PARAMETER", "CONSTRUCTOR",
+ "LOCAL_VARIABLE", "ANNOTATION_TYPE", "PACKAGE"};
+
+ // local class tests will have an inner class.
+ Boolean hasInnerClass=false;
+ String innerClassname="";
+
+ public static void main(String[] args) throws Exception {
+ new CombinationsTargetTest2().run();
+ }
+
+ void run() throws Exception {
+ // Determines which repeat and order in source(ABMix).
+ Boolean As= false, BDs=true, ABMix=false;
+ int testrun=0;
+ // A repeats and/or B/D repeats, ABMix for order of As and Bs.
+ Boolean [][] bRepeat = new Boolean[][]{{false,false,false},//no repeats
+ {true,false,false}, //repeat @A
+ {false,true,false}, //repeat @B
+ {true,true,false}, //repeat both
+ {false,false,true} //repeat mix
+ };
+ for(Boolean[] bCombo : bRepeat) {
+ As=bCombo[0]; BDs=bCombo[1]; ABMix=bCombo[2];
+ for(String et : ETypes) {
+ switch(et) {
+ case "METHOD":
+ test( 8, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src3);
+ test( 0, 8, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, src3);
+ break;
+ case "CONSTRUCTOR":
+ case "FIELD":
+ test( 8, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src3);
+ test( 8, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src8);
+ test( 6, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, src9);
+ test( 0, 8, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, src3);
+ test( 0, 8, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, src8);
+ test( 0, 6, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, src9);
+ break;
+ default:/*TYPE,PARAMETER,LOCAL_VARIABLE,ANNOTATION_TYPE,PACKAGE*/
+ break;
+ }
+ }
+ }
+ }
+
+ public void test(int tinv, int tvis, int inv, int vis, Boolean Arepeats,
+ Boolean BDrepeats, Boolean ABmix, String rtn, String et2,
+ Integer N, int source) throws Exception {
+ ++testcount;
+ expected_tvisibles = tvis;
+ expected_tinvisibles = tinv;
+ expected_visibles = vis;
+ expected_invisibles = inv;
+ File testFile = null;
+ String tname="Test" + N.toString();
+ hasInnerClass=false;
+ String testDef = "Test " + testcount + " parameters: tinv=" + tinv +
+ ", tvis=" + tvis + ", inv=" + inv + ", vis=" + vis +
+ ", Arepeats=" + Arepeats + ", BDrepeats=" + BDrepeats +
+ ", ABmix=" + ABmix + ", retention: " + rtn + ", anno2: " +
+ et2 + ", src=" + source;
+
+// Uncomment this block to run the tests but skip failing scenarios.
+// // 8005681 - skip cases with repeated annotations on new, array, cast.
+// if((source==3 || source==8 || source==9) && (ABmix || (Arepeats && BDrepeats))) {
+// System.out.println(testDef+"\n8005681-skip repeated annotations on new,array,cast");
+// return;
+// }
+
+ println(testDef);
+ // Create test source and File.
+ String sourceString = sourceString(tname, rtn, et2, Arepeats,
+ BDrepeats, ABmix, source);
+ testFile = writeTestFile(tname+".java", sourceString);
+ // Compile test source and read classfile.
+ File classFile = null;
+ try {
+ classFile = compile(testFile);
+ } catch (Error err) {
+ System.err.println("Failed compile. Source:\n" + sourceString);
+ throw err;
+ }
+ //if sourcString() set hasInnerClass it also set innerClassname.
+ if(hasInnerClass) {
+ StringBuffer sb = new StringBuffer(classFile.getAbsolutePath());
+ classFile=new File(sb.insert(sb.lastIndexOf(".class"),innerClassname).toString());
+ }
+ ClassFile cf = ClassFile.read(classFile);
+
+ //Test class,fields and method counts.
+ test(cf);
+
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+ countAnnotations();
+ if (errors > 0) {
+ System.err.println( testDef );
+ System.err.println( "Source:\n" + sourceString );
+ throw new Exception( errors + " errors found" );
+ }
+ println("Pass");
+ }
+
+ //
+ // Source for test cases
+ //
+ String sourceString(String testname, String retentn, String annot2,
+ Boolean Arepeats, Boolean BDrepeats, Boolean ABmix,
+ int src) {
+
+ String As = "@A", Bs = "@B", Ds = "@D";
+ if(Arepeats) As = "@A @A";
+ if(BDrepeats) {
+ Bs = "@B @B";
+ Ds = "@D @D";
+ }
+ if(ABmix) { As = "@A @B"; Bs = "@A @B"; Ds = "@D @D"; }
+
+ // Source to check for TYPE_USE and TYPE_PARAMETER annotations.
+ // Source base (annotations) is same for all test cases.
+ String source = new String();
+ String imports = new String("import java.lang.annotation.*; \n" +
+ "import static java.lang.annotation.RetentionPolicy.*; \n" +
+ "import static java.lang.annotation.ElementType.*; \n" +
+ "import java.util.List; \n" +
+ "import java.util.HashMap; \n" +
+ "import java.util.Map; \n\n");
+
+ String sourceBase = new String("@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,_OTHER_})\n" +
+ "@ContainedBy( AC.class )\n" +
+ "@interface A { }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,_OTHER_})\n" +
+ "@ContainerFor(A.class)\n" +
+ "@interface AC { A[] value(); }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,_OTHER_})\n" +
+ "@ContainedBy( BC.class )\n" +
+ "@interface B { }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,_OTHER_})\n" +
+ "@ContainerFor(B.class)\n" +
+ "@interface BC { B[] value(); } \n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" +
+ "@ContainedBy(DC.class)\n" +
+ "@interface D { }\n\n" +
+
+ "@Retention("+retentn+")\n" +
+ "@Target({TYPE_USE,TYPE_PARAMETER,_OTHER_})\n" +
+ "@ContainerFor(D.class) \n" +
+ "@interface DC { D[] value(); }\n\n");
+
+ // Test case sources with sample generated source
+ switch(src) {
+ case 3: // (repeating) type annotations on field in method body
+ /*
+ * class Test1 {
+ * Test1(){}
+ * // type usage in method body
+ * String test(Test1 this, String param, String ... vararg) {
+ * @A @B
+ * Object o = new @A @B String @A @B [3];
+ * return (@A @B String) null;
+ * }}
+ */
+ source = new String(
+ "class " + testname + " {\n" +
+ "" + testname +"(){} \n" +
+ "// type usage in method body \n" +
+ "String test("+testname+" this, " +
+ "String param, String ... vararg) { \n" +
+ " _As_ _Bs_\n Object o = new _As_ _Bs_ String _As_ _Bs_ [3]; \n" +
+ " return (_As_ _Bs_ String) null; \n" +
+ "} \n" +
+ "} \n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+ "\n\n";
+ break;
+ case 8: // (repeating) annotations on type parameters, bounds and type arguments in new statement.
+ /*
+ * class Test2<T extends Object> {
+ * Map<List<String>, Integer> map =
+ * new HashMap<@A @B List<@A @B String>, @A @B Integer>();
+ * Map<List<String>, Integer> map2 = new @A @B HashMap<>();
+ * String test(Test2<T> this) { return null;}
+ * <T> String genericMethod(T t) { return null; }
+ * }
+ */
+ source = new String( source +
+ "// (repeating) annotations on type parameters, bounds and type arguments. \n" +
+ "class " + testname + "<T extends Object> {\n" +
+ " Map<List<String>, Integer> map =\n" +
+ " new HashMap<_As_ _Bs_ List<_As_ _Bs_ String>, _As_ _Bs_ Integer>();\n" +
+ " Map<List<String>, Integer> map2 = new _As_ _Bs_ HashMap<>();\n" +
+ " String test(" + testname + "<T> this) { return null;}\n" +
+ " <T> String genericMethod(T t) { return null; }\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+ "\n\n";
+ break;
+ case 9: // (repeating)annotations on type parameters of class, method return value in method.
+ /*
+ * class Test3{
+ * <E extends Comparable> Map<List<E>, E > foo(E e) {
+ * class maptest <E> {
+ * Map<List<E>,E> getMap() {
+ * Map<List<E>,E> Em = new HashMap<List<@A @B @D E>,@A @B @D E>();
+ * return Em;
+ * }
+ * }
+ * return new maptest<E>().getMap();
+ * }
+ * Map<List<String>,String> shm = foo(new String("hello"));
+ * }
+ */
+ source = new String( source +
+ "// (repeating)annotations on type parameters of class, method return value in method. \n" +
+ "class "+ testname + "{\n" +
+ " <E extends Comparable> Map<List<E>, E > foo(E e) {\n" +
+ " class maptest <E> {\n" + // inner class $1maptest
+ " Map<List<E>,E> getMap() { \n" +
+ " Map<List<E>,E> Em = new HashMap<List<_As_ _Bs_ _Ds_ E>,_As_ _Bs_ _Ds_ E>();\n" +
+ " return Em;\n" +
+ " }\n" +
+ " }\n" +
+ " return new maptest<E>().getMap();\n" +
+ " }\n" +
+ " Map<List<String>,String> shm = foo(new String(\"hello\"));\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs).replace("_Ds_",Ds) +
+ "\n\n";
+ hasInnerClass=true;
+ innerClassname="$1maptest";
+ break;
+
+ }
+ return imports + source;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+import java.io.*;
+import java.net.URL;
+import java.util.List;
+
+import com.sun.tools.classfile.*;
+
+/*
+ * @test
+ * @bug 6917130 8006775
+ * @summary test that optimized away annotations are not emited to classfile
+ */
+
+public class DeadCode extends ClassfileTestHelper {
+ public static void main(String[] args) throws Exception {
+ new DeadCode().run();
+ }
+
+ public void run() throws Exception {
+ expected_tinvisibles = 1;
+ expected_tvisibles = 0;
+
+ ClassFile cf = getClassFile("DeadCode$Test.class");
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ /*********************** Test class *************************/
+ static class Test {
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A {}
+
+ void test() {
+ List<? extends @A Object> o = null;
+ o.toString();
+
+ @A String m;
+ if (false) {
+ @A String a;
+ @A String b = "m";
+ b.toString();
+ List<? extends @A Object> c = null;
+ c.toString();
+ }
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+import java.io.*;
+import java.net.URL;
+import java.util.List;
+
+import com.sun.tools.classfile.*;
+
+/*
+ * @test ClassLiterals
+ * @summary test that new type arguments are emitted to classfile
+ */
+
+public class NewTypeArguments extends ClassfileTestHelper{
+ public static void main(String[] args) throws Exception {
+ new NewTypeArguments().run();
+ }
+
+ public void run() throws Exception {
+ expected_tinvisibles = 3;
+ expected_tvisibles = 0;
+
+ ClassFile cf = getClassFile("NewTypeArguments$Test.class");
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ /*********************** Test class *************************/
+ static class Test {
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A {}
+ <E> Test(E e) {}
+
+ void test() {
+ new <@A String> Test(null);
+ new <@A List<@A String>> Test(null);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2008 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.net.URL;
+import java.util.List;
+
+import com.sun.tools.classfile.*;
+
+/*
+ * @test NoTargetAnnotations
+ * @summary test that annotations with no Target meta type is emitted
+ * only once as declaration annotation
+ */
+public class NoTargetAnnotations {
+
+ public static void main(String[] args) throws Exception {
+ new NoTargetAnnotations().run();
+ }
+
+ public void run() throws Exception {
+ ClassFile cf = getClassFile("NoTargetAnnotations$Test.class");
+ for (Field f : cf.fields) {
+ test(cf, f);
+ testDeclaration(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ testDeclaration(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ ClassFile getClassFile(String name) throws IOException, ConstantPoolException {
+ URL url = getClass().getResource(name);
+ InputStream in = url.openStream();
+ try {
+ return ClassFile.read(in);
+ } finally {
+ in.close();
+ }
+ }
+
+ /************ Helper annotations counting methods ******************/
+ void test(ClassFile cf, Method m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Field m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void testDeclaration(ClassFile cf, Method m) {
+ testDecl(cf, m, Attribute.RuntimeVisibleAnnotations, true);
+ testDecl(cf, m, Attribute.RuntimeInvisibleAnnotations, false);
+ }
+
+ void testDeclaration(ClassFile cf, Field m) {
+ testDecl(cf, m, Attribute.RuntimeVisibleAnnotations, true);
+ testDecl(cf, m, Attribute.RuntimeInvisibleAnnotations, false);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Field m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void testDecl(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeAnnotations_attribute;
+ RuntimeAnnotations_attribute tAttr = (RuntimeAnnotations_attribute)attr;
+ this.declAnnotations += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void testDecl(ClassFile cf, Field m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeAnnotations_attribute;
+ RuntimeAnnotations_attribute tAttr = (RuntimeAnnotations_attribute)attr;
+ this.declAnnotations += tAttr.annotations.length;
+ }
+ }
+
+ File compileTestFile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-XDTA:writer", "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ void countAnnotations() {
+ int expected_all = expected_visibles + expected_invisibles;
+
+ if (expected_all != all) {
+ errors++;
+ System.err.println("expected " + expected_all
+ + " annotations but found " + all);
+ }
+
+ if (expected_visibles != visibles) {
+ errors++;
+ System.err.println("expected " + expected_visibles
+ + " visibles annotations but found " + visibles);
+ }
+
+ if (expected_invisibles != invisibles) {
+ errors++;
+ System.err.println("expected " + expected_invisibles
+ + " invisibles annotations but found " + invisibles);
+ }
+
+ if (expected_decl != declAnnotations) {
+ errors++;
+ System.err.println("expected " + expected_decl
+ + " declaration annotations but found " + declAnnotations);
+ }
+ }
+
+ int errors;
+ int all;
+ int visibles;
+ int invisibles;
+
+ int declAnnotations;
+
+ /*********************** Test class *************************/
+ static int expected_invisibles = 0;
+ static int expected_visibles = 0;
+ static int expected_decl = 1;
+
+ static class Test {
+ @Retention(RetentionPolicy.RUNTIME)
+ @interface A {}
+
+ @A String method() {
+ return null;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+import java.io.*;
+import java.net.URL;
+import java.util.List;
+
+import com.sun.tools.classfile.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary test that typecasts annotation are emitted if only the cast
+ * expression is optimized away
+ */
+
+public class TypeCasts extends ClassfileTestHelper{
+ public static void main(String[] args) throws Exception {
+ new TypeCasts().run();
+ }
+
+ public void run() throws Exception {
+ expected_tinvisibles = 4;
+ expected_tvisibles = 0;
+
+ ClassFile cf = getClassFile("TypeCasts$Test.class");
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ /*********************** Test class *************************/
+ static class Test {
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A {}
+
+ void emit() {
+ Object o = null;
+ String s = null;
+
+ String a0 = (@A String)o;
+ Object a1 = (@A Object)o;
+
+ String b0 = (@A String)s;
+ Object b1 = (@A Object)s;
+ }
+
+ void alldeadcode() {
+ Object o = null;
+
+ if (false) {
+ String a0 = (@A String)o;
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+import java.io.*;
+import java.net.URL;
+import java.util.List;
+
+import com.sun.tools.classfile.*;
+
+/*
+ * @test Wildcards
+ * @bug 6843077 8006775
+ * @summary test that annotations target wildcards get emitted to classfile
+ */
+public class Wildcards extends ClassfileTestHelper {
+ public static void main(String[] args) throws Exception {
+ new Wildcards().run();
+ }
+
+ public void run() throws Exception {
+ expected_tinvisibles = 3;
+ expected_tvisibles = 0;
+
+ ClassFile cf = getClassFile("Wildcards$Test.class");
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ /*********************** Test class *************************/
+ static class Test {
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A {}
+
+ List<? extends @A Number> f;
+
+ List<? extends @A Object> test(List<? extends @A Number> p) {
+ List<? extends @A Object> l; // not counted... gets optimized away
+ return null;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,15 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006775
+ * @summary Import clauses cannot use annotations.
+ * @author Werner Dietl
+ * @compile/fail/ref=AnnotatedImport.out -XDrawDiagnostics AnnotatedImport.java
+ */
+
+import java.@A util.List;
+import @A java.util.Map;
+import java.util.@A HashMap;
+
+class AnnotatedImport { }
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,7 @@
+AnnotatedImport.java:9:13: compiler.err.expected: token.identifier
+AnnotatedImport.java:9:14: compiler.err.expected3: class, interface, enum
+AnnotatedImport.java:10:7: compiler.err.expected: token.identifier
+AnnotatedImport.java:10:10: compiler.err.expected: ';'
+AnnotatedImport.java:11:18: compiler.err.expected: token.identifier
+AnnotatedImport.java:11:19: compiler.err.expected3: class, interface, enum
+6 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006775
+ * @summary Package declarations cannot use annotations.
+ * @author Werner Dietl
+ * @compile/fail/ref=AnnotatedPackage1.out -XDrawDiagnostics AnnotatedPackage1.java
+ */
+
+package name.@A p1.p2;
+
+class AnnotatedPackage1 { }
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+AnnotatedPackage1.java:9:14: compiler.err.expected: token.identifier
+AnnotatedPackage1.java:9:15: compiler.err.expected3: class, interface, enum
+2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006775
+ * @summary Package declarations cannot use annotations.
+ * @author Werner Dietl
+ * @compile/fail/ref=AnnotatedPackage2.out -XDrawDiagnostics AnnotatedPackage2.java
+ */
+
+package @A p1.p2;
+
+class AnnotatedPackage2 { }
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+AnnotatedPackage2.java:9:8: compiler.err.expected: token.identifier
+AnnotatedPackage2.java:9:10: compiler.err.expected3: class, interface, enum
+2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test that only Java 8 allows type annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=AnnotationVersion.out -XDrawDiagnostics -Xlint:-options -source 1.6 AnnotationVersion.java
+ * @compile/fail/ref=AnnotationVersion7.out -XDrawDiagnostics -Xlint:-options -source 1.7 AnnotationVersion.java
+ */
+class AnnotationVersion {
+ public void method(@A AnnotationVersion this) { }
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+AnnotationVersion.java:10:43: compiler.err.type.annotations.not.supported.in.source: 1.6
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion7.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+AnnotationVersion.java:10:43: compiler.err.type.annotations.not.supported.in.source: 1.7
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/BadCast.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006775
+ * @summary A cast cannot consist of only an annotation.
+ * @author Werner Dietl
+ * @compile/fail/ref=BadCast.out -XDrawDiagnostics BadCast.java
+ */
+class BadCast {
+ static void main() {
+ Object o = (@A) "";
+ }
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/BadCast.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+BadCast.java:10:19: compiler.err.illegal.start.of.type
+1 error
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006733 8006775
+ * @ignore
+ * @summary A static outer class cannot be annotated.
+ * @author Werner Dietl
+ * @compile/fail/ref=CantAnnotateStaticClass.out -XDrawDiagnostics CantAnnotateStaticClass.java
+ */
+
+import java.util.List;
+import java.lang.annotation.*;
+
+class CantAnnotateStaticClass {
+ @Target(ElementType.TYPE_USE)
+ @interface A {}
+
+ static class Outer {
+ class Inner {}
+ }
+
+ // 8 errors:
+ @A Outer.Inner f1;
+ @A Outer.Inner f1r() { return null; }
+ void f1p(@A Outer.Inner p) { }
+ void f1c(Object o) {
+ Object l = (@A Outer.Inner) o;
+ }
+
+ List<@A Outer.Inner> f2;
+ List<@A Outer.Inner> f2r() { return null; }
+ void f2p(List<@A Outer.Inner> p) { }
+ void f2c(Object o) {
+ Object l = (List<@A Outer.Inner>) o;
+ }
+
+ // OK:
+ @A Outer g1;
+ List<@A Outer> g2;
+ Outer. @A Inner g3;
+ List<Outer. @A Inner> g4;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,1 @@
+dummy
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test incomplete array declaration
+ * @author Mahmood Ali
+ * @compile/fail/ref=IncompleteArray.out -XDrawDiagnostics IncompleteArray.java
+ */
+class IncompleteArray {
+ int @A [] @A var;
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+IncompleteArray.java:9:13: compiler.err.illegal.start.of.type
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test incomplete vararg declaration
+ * @author Mahmood Ali
+ * @compile/fail/ref=IncompleteVararg.out -XDrawDiagnostics IncompleteVararg.java
+ */
+class IncompleteArray {
+ // the last variable may be vararg
+ void method(int @A test) { }
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+IncompleteVararg.java:10:19: compiler.err.illegal.start.of.type
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test indexing of an array
+ * @author Mahmood Ali
+ * @compile/fail/ref=IndexArray.out -XDrawDiagnostics IndexArray.java
+ */
+class IndexArray {
+ int[] var;
+ int a = var @A [1];
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+IndexArray.java:10:15: compiler.err.illegal.start.of.expr
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/LintCast.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,69 @@
+import java.lang.annotation.*;
+import java.util.List;
+
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test that compiler doesn't warn about annotated redundant casts
+ * @author Mahmood Ali
+ * @author Werner Dietl
+ * @compile/ref=LintCast.out -Xlint:cast -XDrawDiagnostics LintCast.java
+ */
+class LintCast {
+ void unparameterized() {
+ String s = "m";
+ String s1 = (String)s;
+ String s2 = (@A String)s;
+ }
+
+ void parameterized() {
+ List<String> l = null;
+ List<String> l1 = (List<String>)l;
+ List<String> l2 = (List<@A String>)l;
+ }
+
+ void array() {
+ int @A [] a = null;
+ int[] a1 = (int[])a;
+ int[] a2 = (int @A [])a;
+ }
+
+ void sameAnnotations() {
+ @A String annotated = null;
+ String unannotated = null;
+
+ // compiler ignore annotated casts even if redundant
+ @A String anno1 = (@A String)annotated;
+
+ // warn if redundant without an annotation
+ String anno2 = (String)annotated;
+ String unanno2 = (String)unannotated;
+ }
+
+ void more() {
+ Object @A [] a = null;
+ Object[] a1 = (Object[])a;
+ Object[] a2 = (Object @A [])a;
+
+ @A List<String> l3 = null;
+ List<String> l4 = (List<String>)l3;
+ List<String> l5 = (@A List<String>)l3;
+
+ List<@A String> l6 = null;
+ List<String> l7 = (List<String>)l6;
+ List<String> l8 = (List<@A String>)l6;
+
+ @A Object o = null;
+ Object o1 = (Object)o;
+ Object o2 = (@A Object)o;
+
+ Outer. @A Inner oi = null;
+ Outer.Inner oi1 = (Outer.Inner)oi;
+ Outer.Inner oi2 = (Outer. @A Inner)oi;
+ }
+
+ class Outer { class Inner {} }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/LintCast.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,11 @@
+LintCast.java:15:21: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:21:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
+LintCast.java:27:20: compiler.warn.redundant.cast: (@A :: int[])
+LintCast.java:39:24: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:40:26: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:45:23: compiler.warn.redundant.cast: (@A :: java.lang.Object[])
+LintCast.java:49:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
+LintCast.java:53:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
+LintCast.java:57:21: compiler.warn.redundant.cast: java.lang.Object
+LintCast.java:61:27: compiler.warn.redundant.cast: LintCast.Outer.Inner
+10 warnings
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/OldArray.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary test old array syntax
+ * @author Mahmood Ali
+ * @compile/fail -XDrawDiagnostics OldArray.java
+ */
+class OldArray {
+ String [@A] s() { return null; }
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/Scopes.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check that A is accessible in the class type parameters
+ * @author Mahmood Ali
+ * @compile/fail/ref=Scopes.out -XDrawDiagnostics Scopes.java
+ */
+class Scopes<T extends @UniqueInner Object> {
+ // UniqueInner is not visible in the type parameters.
+ // One has to use Scopes.UniqueInner.
+ // Annotations with the default @Target are not allowed there,
+ // so we also get the second error about the invalid location.
+ // Adding the target here doesn't matter, as we don't resolve
+ // the annotation type.
+ // @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface UniqueInner { };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/Scopes.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+Scopes.java:8:25: compiler.err.cant.resolve: kindname.class, UniqueInner, ,
+Scopes.java:8:24: compiler.err.annotation.type.not.applicable
+2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary static field access isn't a valid location
+ * @author Mahmood Ali
+ * @compile/fail/ref=StaticFields.out -XDrawDiagnostics StaticFields.java
+ */
+class C {
+ int f;
+ int a = @A C.f;
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+StaticFields.java:10:17: compiler.err.illegal.start.of.expr
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary static methods don't have receivers
+ * @author Mahmood Ali
+ * @compile/fail/ref=StaticMethods.out -XDrawDiagnostics StaticMethods.java
+ */
+class StaticMethods {
+ static void main(@A StaticMethods this) { }
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+StaticMethods.java:9:37: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeAndField.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006703 8006775
+ * @summary Ensure that TYPE_USE and FIELD work together.
+ * @author Werner Dietl
+ * @compile TypeAndField.java
+ */
+import java.lang.annotation.*;
+
+class TypeAndField {
+ @TA Integer i;
+ @TA int j;
+}
+
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.TYPE_USE, ElementType.FIELD})
+@interface TA { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/VoidGenericMethod.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary test type annotation on void generic methods
+ * @author Mahmood Ali
+ * @compile/fail VoidGenericMethod.java
+ */
+class VoidGenericMethod {
+ public <T> @A void method() { }
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 6919944 8006775
+ * @summary check for duplicate annotation values
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue {
+ void test() {
+ String @A(value = 2, value = 1) [] s;
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:11:26: compiler.err.duplicate.annotation.member.value: value, A
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnnotation {
+ void test() {
+ String @A @A [] s;
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:11:12: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:11:15: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+
+class InvalidLocation {
+ void test() {
+ String @A [] s;
+ }
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:11:12: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue {
+ void test() {
+ String @A [] s;
+ }
+}
+
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:10:12: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 6919944 8006775
+ * @summary check for duplicate annotation values for type parameter
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue {
+ void method() {
+ class Inner<@A(value = 2, value = 1) K> {}
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:11:31: compiler.err.duplicate.annotation.member.value: value, A
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnno {
+ void innermethod() {
+ class Inner<@A @A K> { }
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:11:17: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:11:20: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,15 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+class InvalidLocation {
+ void innermethod() {
+ class Inner<@A K> {}
+ }
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:10:17: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue {
+ void innermethod() {
+ class Inner<@A K> { }
+ }
+}
+
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:10:17: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 6919944 8006775
+ * @summary check for duplicate annotation values
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue {
+ void test() {
+ String[] a = new String @A(value = 2, value = 1) [5] ;
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:11:43: compiler.err.duplicate.annotation.member.value: value, A
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnnotation {
+ void test() {
+ String[] a = new String @A @A [5] ;
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:11:29: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:11:32: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+
+class InvalidLocation {
+ void test() {
+ String[] s = new String @A [5] ;
+ }
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:11:29: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue {
+ void test() {
+ String[] a = new String @A [5];
+ }
+}
+
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:10:29: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,99 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8006775
+ * @summary Ensure unresolved upper bound annotation is handled correctly
+ * @author Werner Dietl
+ * @compile/fail/ref=BrokenAnnotation.out -XDrawDiagnostics BrokenAnnotation.java
+ */
+
+// No import, making the annotation @A invalid.
+// import java.lang.annotation.*;
+
+// Works: @Broke.A class...
+// Works: class Broke<@Broke.A T> {
+// Used to fail:
+class BrokenAnnotation<T extends @BrokenAnnotation.A Object> {
+ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+ @interface A { }
+}
+
+// If the Annotation is e.g. on the top-level class, we
+// get something like this:
+//
+// Broke.java:6: cannot find symbol
+// symbol : class Target
+// location: class Broke
+// @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+// ^
+// 1 error
+//
+// When the annotation is in the upper bound, one used to get
+// the following stack trace:
+//
+// An exception has occurred in the compiler (1.7.0-jsr308-1.2.7). Please report this bug so we can fix it. For instructions, see http://types.cs.washington.edu/checker-framework/current/README-jsr308.html#reporting-bugs . Thank you.
+// java.lang.NullPointerException
+// at com.sun.tools.javac.code.Type.isCompound(Type.java:346)
+// at com.sun.tools.javac.code.Types.getBounds(Types.java:1940)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter$1.visitTypeVar(RichDiagnosticFormatter.java:534)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter$1.visitTypeVar(RichDiagnosticFormatter.java:1)
+// at com.sun.tools.javac.code.Type$TypeVar.accept(Type.java:1049)
+// at com.sun.tools.javac.code.Types$UnaryVisitor.visit(Types.java:3809)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter$1.visit(RichDiagnosticFormatter.java:450)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter$1.visitClassType(RichDiagnosticFormatter.java:518)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter$1.visitClassType(RichDiagnosticFormatter.java:1)
+// at com.sun.tools.javac.code.Type$ClassType.accept(Type.java:596)
+// at com.sun.tools.javac.code.Types$UnaryVisitor.visit(Types.java:3809)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter.preprocessType(RichDiagnosticFormatter.java:442)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter.preprocessArgument(RichDiagnosticFormatter.java:172)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter.preprocessDiagnostic(RichDiagnosticFormatter.java:155)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter.preprocessArgument(RichDiagnosticFormatter.java:178)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter.preprocessDiagnostic(RichDiagnosticFormatter.java:155)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter.format(RichDiagnosticFormatter.java:111)
+// at com.sun.tools.javac.util.RichDiagnosticFormatter.format(RichDiagnosticFormatter.java:1)
+// at com.sun.tools.javac.util.Log.writeDiagnostic(Log.java:514)
+// at com.sun.tools.javac.util.Log.report(Log.java:496)
+// at com.sun.tools.javac.comp.Resolve.logResolveError(Resolve.java:2160)
+// at com.sun.tools.javac.comp.Resolve.access(Resolve.java:1553)
+// at com.sun.tools.javac.comp.Resolve.access(Resolve.java:1580)
+// at com.sun.tools.javac.comp.Resolve.access(Resolve.java:1592)
+// at com.sun.tools.javac.comp.Resolve.resolveIdent(Resolve.java:1653)
+// at com.sun.tools.javac.comp.Attr.visitIdent(Attr.java:2191)
+// at com.sun.tools.javac.tree.JCTree$JCIdent.accept(JCTree.java:1873)
+// at com.sun.tools.javac.comp.Attr.attribTree(Attr.java:467)
+// at com.sun.tools.javac.comp.Attr.attribType(Attr.java:503)
+// at com.sun.tools.javac.comp.Attr.attribType(Attr.java:496)
+// at com.sun.tools.javac.comp.Attr.attribAnnotationTypes(Attr.java:605)
+// at com.sun.tools.javac.comp.MemberEnter.complete(MemberEnter.java:944)
+// at com.sun.tools.javac.code.Symbol.complete(Symbol.java:432)
+// at com.sun.tools.javac.code.Symbol$ClassSymbol.complete(Symbol.java:832)
+// at com.sun.tools.javac.code.Symbol$ClassSymbol.flags(Symbol.java:775)
+// at com.sun.tools.javac.comp.Resolve.isAccessible(Resolve.java:350)
+// at com.sun.tools.javac.comp.Resolve.isAccessible(Resolve.java:346)
+// at com.sun.tools.javac.comp.Resolve.findMemberType(Resolve.java:1346)
+// at com.sun.tools.javac.comp.Resolve.findIdentInType(Resolve.java:1512)
+// at com.sun.tools.javac.comp.Attr.selectSym(Attr.java:2434)
+// at com.sun.tools.javac.comp.Attr.visitSelect(Attr.java:2312)
+// at com.sun.tools.javac.tree.JCTree$JCFieldAccess.accept(JCTree.java:1805)
+// at com.sun.tools.javac.comp.Attr.attribTree(Attr.java:467)
+// at com.sun.tools.javac.comp.Attr.attribType(Attr.java:503)
+// at com.sun.tools.javac.comp.Attr.attribType(Attr.java:496)
+// at com.sun.tools.javac.comp.Attr.attribAnnotationTypes(Attr.java:605)
+// at com.sun.tools.javac.comp.Attr.visitAnnotatedType(Attr.java:3016)
+// at com.sun.tools.javac.tree.JCTree$JCAnnotatedType.accept(JCTree.java:2253)
+// at com.sun.tools.javac.comp.Attr.attribTree(Attr.java:467)
+// at com.sun.tools.javac.comp.Attr.attribType(Attr.java:503)
+// at com.sun.tools.javac.comp.Attr.attribType(Attr.java:496)
+// at com.sun.tools.javac.comp.Attr.attribTypeVariables(Attr.java:569)
+// at com.sun.tools.javac.comp.MemberEnter.complete(MemberEnter.java:955)
+// at com.sun.tools.javac.code.Symbol.complete(Symbol.java:432)
+// at com.sun.tools.javac.code.Symbol$ClassSymbol.complete(Symbol.java:832)
+// at com.sun.tools.javac.comp.Enter.complete(Enter.java:500)
+// at com.sun.tools.javac.comp.Enter.main(Enter.java:478)
+// at com.sun.tools.javac.main.JavaCompiler.enterTrees(JavaCompiler.java:950)
+// at com.sun.tools.javac.main.JavaCompiler.compile(JavaCompiler.java:841)
+// at com.sun.tools.javac.main.Main.compile(Main.java:441)
+// at com.sun.tools.javac.main.Main.compile(Main.java:358)
+// at com.sun.tools.javac.main.Main.compile(Main.java:347)
+// at com.sun.tools.javac.main.Main.compile(Main.java:338)
+// at com.sun.tools.javac.Main.compile(Main.java:76)
+// at com.sun.tools.javac.Main.main(Main.java:61)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/BrokenAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+BrokenAnnotation.java:16:6: compiler.err.cant.resolve.location: kindname.class, Target, , , (compiler.misc.location: kindname.class, BrokenAnnotation<T>, null)
+BrokenAnnotation.java:15:34: compiler.err.annotation.type.not.applicable
+2 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 6919944 8006775
+ * @summary check for duplicate annotation values for type parameter
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue<K extends @A(value = 2, value = 1) Object> {
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:9:56: compiler.err.duplicate.annotation.member.value: value, A
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnno<K extends @A @A Object> {
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:9:35: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:9:38: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+
+class InvalidLocation<K extends @A Object> {
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:9:33: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+import java.lang.annotation.*;
+
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue<K extends @A Object> {
+}
+
+@Target(ElementType.TYPE_USE)
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:10:40: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 6919944 8006775
+ * @summary check for duplicate annotation values in receiver
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue {
+ void test(@A(value = 2, value = 1) DuplicateAnnotationValue this) { }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:10:27: compiler.err.duplicate.annotation.member.value: value, A
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations in receiver
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnnotation {
+ void test(@A @A DuplicateTypeAnnotation this) { }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:10:13: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:10:16: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,15 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+
+class InvalidLocation {
+ void test(@A InvalidLocation this) {
+ }
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:10:13: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue {
+ void test(@A MissingAnnotationValue this) { }
+}
+
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:9:13: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/Nesting.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006775
+ * @summary Ensure that nested classes/methods work
+ * @author Werner Dietl
+ * @compile Nesting.java
+ */
+@interface A { }
+
+class Nesting {
+ void top(@A Nesting this) {}
+
+ class B {
+ void inB(@A B this) {}
+ }
+
+ void meth(@A Nesting this) {
+ class C {
+ void inMethod(@A C this) {}
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006775
+ * @summary the receiver parameter and static methods/classes
+ * @author Werner Dietl
+ * @compile/fail/ref=StaticThings.out -XDrawDiagnostics StaticThings.java
+ */
+class Test {
+ // bad
+ static void test1(Test this) {}
+
+ // bad
+ static Object test2(Test this) { return null; }
+
+ class Nested1 {
+ // good
+ void test3a(Nested1 this) {}
+ // good
+ void test3b(Test.Nested1 this) {}
+ // No static methods
+ // static void test3c(Nested1 this) {}
+ }
+ static class Nested2 {
+ // good
+ void test4a(Nested2 this) {}
+ // good
+ void test4b(Test.Nested2 this) {}
+ // bad
+ static void test4c(Nested2 this) {}
+ // bad
+ static void test4d(Test.Nested2 this) {}
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,5 @@
+StaticThings.java:52:32: compiler.err.annotation.type.not.applicable
+StaticThings.java:54:37: compiler.err.annotation.type.not.applicable
+StaticThings.java:33:26: compiler.err.annotation.type.not.applicable
+StaticThings.java:36:28: compiler.err.annotation.type.not.applicable
+4 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006775
+ * @summary the receiver parameter has the type of the surrounding class
+ * @author Werner Dietl
+ * @compile/fail/ref=WrongType.out -XDrawDiagnostics WrongType.java
+ */
+
+@interface A {}
+
+class WrongType {
+ Object f;
+
+ void good1(@A WrongType this) {}
+
+ void good2(@A WrongType this) {
+ this.f = null;
+ Object o = this.f;
+ }
+
+ void bad1(@A Object this) {}
+
+ void bad2(@A Object this) {
+ this.f = null;
+ Object o = this.f;
+ }
+
+ void wow(@A XYZ this) {
+ this.f = null;
+ }
+
+ class Inner {
+ void good1(@A Inner this) {}
+ void good2(@A WrongType.Inner this) {}
+
+ void outerOnly(@A WrongType this) {}
+ void wrongInner(@A Object this) {}
+ void badOuter(@A Outer.Inner this) {}
+ void badInner(@A WrongType.XY this) {}
+ }
+
+ class Generics<X> {
+ <Y> void m(Generics<Y> this) {}
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,9 @@
+WrongType.java:51:15: compiler.err.cant.resolve.location: kindname.class, XYZ, , , (compiler.misc.location: kindname.class, WrongType, null)
+WrongType.java:61:27: compiler.err.doesnt.exist: Outer
+WrongType.java:62:31: compiler.err.cant.resolve.location: kindname.class, XY, , , (compiler.misc.location: kindname.class, WrongType, null)
+WrongType.java:44:23: compiler.err.incorrect.receiver.type
+WrongType.java:46:23: compiler.err.incorrect.receiver.type
+WrongType.java:59:33: compiler.err.incorrect.receiver.type
+WrongType.java:60:31: compiler.err.incorrect.receiver.type
+WrongType.java:66:28: compiler.err.incorrect.receiver.type
+8 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for Duplicate annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue {
+ void test() {
+ new @A String();
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:11:9: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnnotation {
+ void test() {
+ new @A @A String();
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:11:9: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:11:12: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+
+class InvalidLocation {
+ void test() {
+ new @A String();
+ }
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:11:9: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue {
+ void test() {
+ new @A String();
+ }
+}
+
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/rest/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:10:9: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 6919944 8006775
+ * @summary check for duplicate annotation values for type parameter
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue<K> {
+ DuplicateAnnotationValue<@A(value = 2, value = 1) String> l;
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:10:42: compiler.err.duplicate.annotation.member.value: value, A
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnno<K> {
+ DuplicateTypeAnno<@A @A String> l;
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:10:21: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:10:24: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+
+class InvalidLocation<K> {
+ InvalidLocation<@A String> l;
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:10:19: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue<K> {
+ MissingAnnotationValue<@A String> l;
+}
+
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:9:26: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 6919944 8006775
+ * @summary check for duplicate annotation values for type parameter
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue<@A(value = 2, value = 1) K> {
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:9:46: compiler.err.duplicate.annotation.member.value: value, A
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnno<@A @A K> {
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:9:25: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:9:28: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,13 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+
+class InvalidLocation<@A K> {
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:9:23: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,11 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue<@A K> {
+}
+
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:8:30: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 6919944 8006775
+ * @summary check for duplicate annotation values for type parameter
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateAnnotationValue.out -XDrawDiagnostics DuplicateAnnotationValue.java
+ */
+import java.lang.annotation.*;
+class DuplicateAnnotationValue<K> {
+ DuplicateAnnotationValue<@A(value = 2, value = 1) ?> l;
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+DuplicateAnnotationValue.java:10:42: compiler.err.duplicate.annotation.member.value: value, A
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for duplicate annotations
+ * @author Mahmood Ali
+ * @compile/fail/ref=DuplicateTypeAnnotation.out -XDrawDiagnostics DuplicateTypeAnnotation.java
+ */
+import java.lang.annotation.*;
+class DuplicateTypeAnno<K> {
+ DuplicateTypeAnno<@A @A ?> l;
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+DuplicateTypeAnnotation.java:10:21: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+DuplicateTypeAnnotation.java:10:24: compiler.err.duplicate.annotation.missing.container: A, java.lang.annotation.Repeatable
+2 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for invalid annotatins given the target
+ * @author Mahmood Ali
+ * @compile/fail/ref=InvalidLocation.out -XDrawDiagnostics InvalidLocation.java
+ */
+
+class InvalidLocation<K> {
+ InvalidLocation<@A ?> l;
+}
+
+@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/InvalidLocation.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+InvalidLocation.java:10:19: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary check for missing annotation value
+ * @author Mahmood Ali
+ * @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
+ */
+class MissingAnnotationValue<K> {
+ MissingAnnotationValue<@A ?> l;
+}
+
+@interface A { int field(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MissingAnnotationValue.java:9:26: compiler.err.annotation.missing.default.value: A, field
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/Constructor.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,37 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test invalid location of TypeUse
+ * @author Mahmood Ali
+ * @compile/fail/ref=Constructor.out -XDrawDiagnostics Constructor.java
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+class Constructor {
+ // Constructor result type use annotation
+ @A Constructor() { }
+
+ // Not type parameter annotation
+ @B Constructor(int x) { }
+
+ // TODO add err: no "this" receiver parameter for constructors
+ // Constructor(@A Constructor this, Object o) { }
+
+ // TODO: support Outer.this.
+}
+
+class Constructor2 {
+ class Inner {
+ // OK
+ @A Inner() { }
+ }
+}
+
+@Target(ElementType.TYPE_USE)
+@interface A { }
+
+@Target(ElementType.TYPE_PARAMETER)
+@interface B { }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/Constructor.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+Constructor.java:17:3: compiler.err.annotation.type.not.applicable
+1 error
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,74 @@
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.TYPE_PARAMETER;
+import static java.lang.annotation.ElementType.TYPE_USE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Class literals are not type uses and cannot be annotated
+ * @author Werner Dietl
+ * @compile/fail/ref=DotClass.out -XDrawDiagnostics DotClass.java
+ */
+
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@interface A {}
+
+@interface B { int value(); }
+
+class T0x1E {
+ void m0x1E() {
+ Class<Object> c = @A Object.class;
+ }
+
+ Class<?> c = @A String.class;
+
+ Class<? extends @A String> as = @A String.class;
+}
+
+class ClassLiterals {
+ public static void main(String[] args) {
+ if (String.class != @A String.class) throw new Error();
+ if (@A int.class != int.class) throw new Error();
+ if (@A int.class != Integer.TYPE) throw new Error();
+ if (@A int @B(0) [].class != int[].class) throw new Error();
+
+ if (String[].class != @A String[].class) throw new Error();
+ if (String[].class != String @A [].class) throw new Error();
+ if (@A int[].class != int[].class) throw new Error();
+ if (@A int @B(0) [].class != int[].class) throw new Error();
+ }
+
+ Object classLit1 = @A String @C [] @B(0) [].class;
+ Object classLit2 = @A String @C [] [].class;
+ Object classLit3 = @A String [] @B(0) [].class;
+ Object classLit4 = String [] @B(0) [].class;
+ Object classLit5 = String @C [] [].class;
+ Object classLit6 = String [] [].class;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/DotClass.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,17 @@
+DotClass.java:47:42: compiler.err.no.annotations.on.dot.class
+DotClass.java:50:33: compiler.err.no.annotations.on.dot.class
+DotClass.java:52:52: compiler.err.no.annotations.on.dot.class
+DotClass.java:57:44: compiler.err.no.annotations.on.dot.class
+DotClass.java:58:26: compiler.err.no.annotations.on.dot.class
+DotClass.java:59:26: compiler.err.no.annotations.on.dot.class
+DotClass.java:60:35: compiler.err.no.annotations.on.dot.class
+DotClass.java:62:48: compiler.err.no.annotations.on.dot.class
+DotClass.java:63:49: compiler.err.no.annotations.on.dot.class
+DotClass.java:64:28: compiler.err.no.annotations.on.dot.class
+DotClass.java:65:35: compiler.err.no.annotations.on.dot.class
+DotClass.java:68:54: compiler.err.no.annotations.on.dot.class
+DotClass.java:69:54: compiler.err.no.annotations.on.dot.class
+DotClass.java:70:54: compiler.err.no.annotations.on.dot.class
+DotClass.java:71:54: compiler.err.no.annotations.on.dot.class
+DotClass.java:72:54: compiler.err.no.annotations.on.dot.class
+16 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test incomplete array declaration
+ * @author Mahmood Ali
+ * @compile/fail/ref=IncompleteArray.out -XDrawDiagnostics IncompleteArray.java
+ */
+class IncompleteArray {
+ int @A [] @A var;
+}
+
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/IncompleteArray.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+IncompleteArray.java:9:13: compiler.err.illegal.start.of.type
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,25 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test invalid location of TypeUse and TypeParameter
+ * @author Mahmood Ali
+ * @compile/fail/ref=NotTypeParameter.out -XDrawDiagnostics NotTypeParameter.java
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+class VoidMethod<@A K> {
+ @A void test() { }
+}
+
+@Target(ElementType.TYPE_USE)
+@interface A { }
+
+class TypeVariable<@B T> {
+ @B T test1() { return null; }
+ void test2(@B T p) {}
+}
+
+@Target(ElementType.TYPE_PARAMETER)
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeParameter.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,4 @@
+NotTypeParameter.java:13:3: compiler.err.annotation.type.not.applicable
+NotTypeParameter.java:20:3: compiler.err.annotation.type.not.applicable
+NotTypeParameter.java:21:14: compiler.err.annotation.type.not.applicable
+3 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test invalid location of TypeUse
+ * @author Mahmood Ali
+ * @compile/fail/ref=NotTypeUse.out -XDrawDiagnostics NotTypeUse.java
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+class VoidMethod {
+ @A void test() { }
+}
+
+@Target(ElementType.TYPE)
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/NotTypeUse.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+NotTypeUse.java:13:3: compiler.err.annotation.type.not.applicable
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,33 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6843077 8006775
+ * @summary test invalid location of TypeUse and TypeParameter
+ * @author Mahmood Ali
+ * @compile/fail/ref=VoidMethod.out -XDrawDiagnostics VoidMethod.java
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+class VoidMethod {
+ // Invalid
+ @A void test1() { }
+ // The following is legal:
+ @B void test2() { }
+ // Invalid
+ @C void test3() { }
+ // The following is legal:
+ @D void test4() { }
+}
+
+@Target(ElementType.TYPE_USE)
+@interface A { }
+
+@Target({ElementType.TYPE_USE, ElementType.METHOD})
+@interface B { }
+
+@Target(ElementType.TYPE_PARAMETER)
+@interface C { }
+
+@Target({ElementType.TYPE_PARAMETER, ElementType.METHOD})
+@interface D { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/target/VoidMethod.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+VoidMethod.java:14:3: compiler.err.annotation.type.not.applicable
+VoidMethod.java:18:3: compiler.err.annotation.type.not.applicable
+2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/BasicTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,81 @@
+
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary random tests for new locations
+ * @author Matt Papi
+ * @compile BasicTest.java
+ */
+
+import java.lang.annotation.*;
+import java.util.*;
+import java.io.*;
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A {}
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B {}
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface C {}
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface D {}
+
+/**
+ * Tests basic JSR 308 parser functionality. We don't really care about what
+ * the parse tree looks like, just that these annotations can be parsed.
+ */
+class BasicTest<T extends @A Object> extends @B LinkedList<T> implements @C List<T> {
+
+ void test() {
+
+ // Handle annotated cast types
+ Object o = (@A Object) "foo";
+
+ // Handle annotated "new" expressions (except arrays; see ArrayTest)
+ String s = new @A String("bar");
+
+ boolean b = o instanceof @A Object;
+
+ @A Map<@B List<@C String>, @D String> map =
+ new @A HashMap<@B List<@C String>, @D String>();
+
+ Class<? extends @A String> c2 = null;
+ }
+
+ // Handle receiver annotations
+ // Handle annotations on a qualified identifier list
+ void test2(@C @D BasicTest<T> this) throws @A IllegalArgumentException, @B IOException {
+
+ }
+
+ // Handle annotations on a varargs element type
+ void test3(@B Object @A... objs) { }
+
+ void test4(@B Class<@C ?> @A ... clz) { }
+
+
+ // TODO: add more tests... nested classes, etc.
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ClassExtends.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: class extends/implements
+ * @author Mahmood Ali
+ * @compile ClassExtends.java
+ */
+abstract class MyClass extends @A ParameterizedClass<@B String>
+ implements @B CharSequence, @A ParameterizedInterface<@B String> { }
+
+interface MyInterface extends @A ParameterizedInterface<@A String>,
+ @B CharSequence { }
+
+class ParameterizedClass<K> {}
+interface ParameterizedInterface<K> {}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A {}
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ClassParameters.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: class type parameter bounds
+ * @author Mahmood Ali
+ * @compile ClassParameters.java
+ */
+class Unannotated<K> { }
+
+class ExtendsBound<K extends @A String> { }
+class ExtendsGeneric<K extends @A Unannotated<@B String>> { }
+class TwoBounds<K extends @A String, V extends @B String> { }
+
+class Complex1<K extends @A String&Runnable> { }
+class Complex2<K extends String & @B Runnable> { }
+class ComplexBoth<K extends @A String & @A Runnable> { }
+
+class Outer {
+ void inner() {
+ class Unannotated<K> { }
+
+ class ExtendsBound<K extends @A String> { }
+ class ExtendsGeneric<K extends @A Unannotated<@B String>> { }
+ class TwoBounds<K extends @A String, V extends @B String> { }
+
+ class Complex1<K extends @A String&Runnable> { }
+ class Complex2<K extends String & @B Runnable> { }
+ class ComplexBoth<K extends @A String & @A Runnable> { }
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ConstructorTypeArgs.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: constructor type args
+ * @author Mahmood Ali
+ * @compile ConstructorTypeArgs.java
+ */
+
+class ConstructorTypeArgs {
+ void oneArg() {
+ new @A MyList<@A String>();
+ new MyList<@A MyList<@B(0) String>>();
+ }
+
+ void twoArg() {
+ new MyMap<String, String>();
+ new MyMap<@A String, @B(0) MyList<@A String>>();
+ }
+
+ void withArraysIn() {
+ new MyList<String[]>();
+ new MyList<@A String @B(0) [] @A []>();
+
+ new MyMap<@A String[], @B(0) MyList<@A String> @A []>();
+ }
+}
+
+class MyList<E> { }
+class MyMap<K, V> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ExceptionParameters.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+import java.io.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: exception parameters
+ * @author Werner Dietl
+ * @compile ExceptionParameters.java
+ */
+
+class ExceptionParameters {
+
+ void exception() {
+ try {
+ foobar();
+ } catch (@A Exception e) {
+ e.toString();
+ }
+ }
+
+ void finalException() {
+ try {
+ foobar();
+ } catch (final @B Exception e) {
+ e.toString();
+ }
+ }
+
+ void multiException1() {
+ try {
+ foobar();
+ } catch (@A NullPointerException | @B IndexOutOfBoundsException e) {
+ e.toString();
+ }
+ }
+
+ void multiException2() {
+ try {
+ foobar();
+ } catch (java.lang.@A NullPointerException | java.lang.@B IndexOutOfBoundsException e) {
+ e.toString();
+ }
+ }
+
+ void foobar() {}
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: expressions
+ * @author Mahmood Ali
+ * @compile Expressions.java
+ */
+class Expressions {
+ void instanceOf() {
+ Object o = null;
+ boolean a = o instanceof @A String;
+ boolean b = o instanceof @B(0) String;
+ }
+
+ void instanceOfArray() {
+ Object o = null;
+ boolean a1 = o instanceof @A String [];
+ boolean a2 = o instanceof @B(0) String [];
+
+ boolean b1 = o instanceof String @A [];
+ boolean b2 = o instanceof String @B(0) [];
+ }
+
+ void objectCreation() {
+ new @A String();
+ new @B(0) String();
+ }
+
+ void objectCreationArray() {
+ Object a1 = new @A String [] [] { };
+ Object a2 = new @A String [1] [];
+ Object a3 = new @A String [1] [2];
+
+ Object b1 = new @A String @B(0) [] [] { };
+ Object b2 = new @A String @B(0) [1] [];
+ Object b3 = new @A String @B(0) [1] [2];
+
+ Object c1 = new @A String [] @B(0) [] { };
+ Object c2 = new @A String [1] @B(0) [];
+ Object c3 = new @A String [1] @B(0) [2];
+
+ Object d1 = new @A String @B(0) [] @B(0) [] { };
+ Object d2 = new @A String @B(0) [1] @B(0) [];
+ Object d3 = new @A String @B(0) [1] @B(0) [2];
+
+ Object rand = new @A String @B(value = 0) [1] @B(value = 0) [2];
+
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Fields.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: field type array/generics
+ * @author Mahmood Ali
+ * @compile Fields.java
+ */
+
+class DefaultScope {
+ Parameterized<String, String> unannotated;
+ Parameterized<@A String, String> firstTypeArg;
+ Parameterized<String, @A String> secondTypeArg;
+ Parameterized<@A String, @B String> bothTypeArgs;
+
+ Parameterized<@A Parameterized<@A String, @B String>, @B String>
+ nestedParameterized;
+
+ @A String [] array1;
+ @A String @B [] array1Deep;
+ @A String [] [] array2;
+ @A String @A [] @B [] array2Deep;
+ String @A [] [] array2First;
+ String [] @B [] array2Second;
+
+ // Old-style array syntax
+ String array2FirstOld @A [];
+ String array2SecondOld [] @B [];
+}
+
+class ModifiedScoped {
+ public final Parameterized<String, String> unannotated = null;
+ public final Parameterized<@A String, String> firstTypeArg = null;
+ public final Parameterized<String, @A String> secondTypeArg = null;
+ public final Parameterized<@A String, @B String> bothTypeArgs = null;
+
+ public final Parameterized<@A Parameterized<@A String, @B String>, @B String>
+ nestedParameterized = null;
+
+ public final @A String [] array1 = null;
+ public final @A String @B [] array1Deep = null;
+ public final @A String [] [] array2 = null;
+ public final @A String @A [] @B [] array2Deep = null;
+ public final String @A [] [] array2First = null;
+ public final String [] @B [] array2Second = null;
+}
+
+class Parameterized<K, V> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/LocalVariables.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: local variables array/generics
+ * @author Mahmood Ali
+ * @compile LocalVariables.java
+ */
+
+class DefaultScope {
+ void parameterized() {
+ Parameterized<String, String> unannotated;
+ Parameterized<@A String, String> firstTypeArg;
+ Parameterized<String, @A String> secondTypeArg;
+ Parameterized<@A String, @B String> bothTypeArgs;
+
+ Parameterized<@A Parameterized<@A String, @B String>, @B String>
+ nestedParameterized;
+ }
+
+ void arrays() {
+ @A String [] array1;
+ @A String @B [] array1Deep;
+ @A String [] [] array2;
+ @A String @A [] @B [] array2Deep;
+ String @A [] [] array2First;
+ String [] @B [] array2Second;
+ }
+}
+
+class ModifiedVars {
+ void parameterized() {
+ final Parameterized<String, String> unannotated = null;
+ final Parameterized<@A String, String> firstTypeArg = null;
+ final Parameterized<String, @A String> secondTypeArg = null;
+ final Parameterized<@A String, @B String> bothTypeArgs = null;
+
+ final Parameterized<@A Parameterized<@A String, @B String>, @B String>
+ nestedParameterized = null;
+ }
+
+ void arrays() {
+ final @A String [] array1 = null;
+ final @A String @B [] array1Deep = null;
+ final @A String [] [] array2 = null;
+ final @A String @A [] @B [] array2Deep = null;
+ final String @A [] [] array2First = null;
+ final String [] @B [] array2Second = null;
+ }
+}
+
+class Parameterized<K, V> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodReturnType.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: method return type array/generics
+ * @author Mahmood Ali
+ * @compile MethodReturnType.java
+ */
+
+class DefaultScope {
+ Parameterized<String, String> unannotated() { return null; }
+ Parameterized<@A String, String> firstTypeArg() { return null; }
+ Parameterized<String, @A String> secondTypeArg() { return null; }
+ Parameterized<@A String, @B String> bothTypeArgs() { return null; }
+
+ Parameterized<@A Parameterized<@A String, @B String>, @B String>
+ nestedParameterized() { return null; }
+
+ public <T> @A String method() { return null; }
+
+ @A String [] array1() { return null; }
+ @A String @B [] array1Deep() { return null; }
+ @A String [] [] array2() { return null; }
+ @A String @A [] @B [] array2Deep() { return null; }
+ String @A [] [] array2First() { return null; }
+ String [] @B [] array2Second() { return null; }
+
+ // Old-style array syntax
+ String array2FirstOld() @A [] { return null; }
+ String array2SecondOld() [] @B [] { return null; }
+}
+
+class ModifiedScoped {
+ public final Parameterized<String, String> unannotated() { return null; }
+ public final Parameterized<@A String, String> firstTypeArg() { return null; }
+ public final Parameterized<String, @A String> secondTypeArg() { return null; }
+ public final Parameterized<@A String, @B String> bothTypeArgs() { return null; }
+
+ public final Parameterized<@A Parameterized<@A String, @B String>, @B String>
+ nestedParameterized() { return null; }
+
+ public final @A String [] array1() { return null; }
+ public final @A String @B [] array1Deep() { return null; }
+ public final @A String [] [] array2() { return null; }
+ public final @A String @A [] @B [] array2Deep() { return null; }
+ public final String @A [] [] array2First() { return null; }
+ public final String [] @B [] array2Second() { return null; }
+}
+
+class Parameterized<K, V> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeArgs.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: method type args
+ * @author Mahmood Ali
+ * @compile MethodTypeArgs.java
+ */
+
+class MethodTypeArgs {
+ void oneArg() {
+ this.<@A String>newList();
+ this.<@A MyList<@B(0) String>>newList();
+
+ MethodTypeArgs.<@A String>newList();
+ MethodTypeArgs.<@A MyList<@B(0) String>>newList();
+ }
+
+ void twoArg() {
+ this.<String, String>newMap();
+ this.<@A String, @B(0) MyList<@A String>>newMap();
+
+ MethodTypeArgs.<String, String>newMap();
+ MethodTypeArgs.<@A String, @B(0) MyList<@A String>>newMap();
+ }
+
+ void withArraysIn() {
+ this.<String[]>newList();
+ this.<@A String @B(0) [] @A []>newList();
+
+ this.<@A String[], @B(0) MyList<@A String> @A []>newMap();
+ }
+
+ static <E> void newList() { }
+ static <K, V> void newMap() { }
+}
+
+class MyList<E> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { int value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MethodTypeParameters.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: method type parameter bounds
+ * @author Mahmood Ali
+ * @compile MethodTypeParameters.java
+ */
+
+class UnscopedUnmodified {
+ <K extends @A String> void methodExtends() {}
+ <K extends @A Parameterized<@B String>> void nestedExtends() {}
+ <K extends @A String, V extends @A Parameterized<@B String>> void dual() {}
+ <K extends String, V extends Parameterized<@B String>> void dualOneAnno() {}
+}
+
+class PublicModifiedMethods {
+ public final <K extends @A String> void methodExtends() {}
+ public final <K extends @A Parameterized<@B String>> void nestedExtends() {}
+ public final <K extends @A String, V extends @A Parameterized<@B String>> void dual() {}
+ public final <K extends String, V extends Parameterized<@B String>> void dualOneAnno() {}
+}
+
+class Parameterized<K> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/MultiCatch.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @ignore // syntax not sure yet.
+ * @bug 8006775
+ * @summary new type annotation location: multicatch
+ * @author Werner Dietl
+ * @compile MultiCatch.java
+ */
+
+class DefaultScope {
+ void exception01() {
+ try {
+ System.out.println("Hello 1!");
+ } catch (@B NullPointerException | @C IllegalArgumentException e) {
+ e.toString();
+ }
+ }
+ void exception02() {
+ try {
+ System.out.println("Hello 2!");
+ } catch @A (@B NullPointerException | @C IllegalArgumentException e) {
+ e.toString();
+ }
+ }
+}
+
+class ModifiedVars {
+ /*
+ void exception() {
+ try {
+ arrays();
+ } catch (final @A Exception e) {
+ e.toString();
+ }
+ }
+ */
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface C { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface D { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+import java.util.Map;
+
+/*
+ * @test
+ * @bug 8006775
+ * @summary new type annotation location: nested types
+ * @author Werner Dietl
+ * @compile NestedTypes.java
+ */
+class Outer {
+ class Inner {
+ class Inner2 {
+ // m1a-c all have the same parameter type.
+ void m1a(@A Inner2 p1a) {}
+ void m1b(Inner.@A Inner2 p1b) {}
+ void m1c(Outer.Inner.@A Inner2 p1c) {}
+ // notice the difference to m1d
+ void m1d(@A Outer.Inner.Inner2 p1d) {}
+
+ // m2a-b both have the same parameter type.
+ void m2a(@A Inner.Inner2 p2a) {}
+ void m2b(Outer.@A Inner.Inner2 p2b) {}
+
+ // The location for @A is the same in m3a-c
+ void m3a(@A Outer p3a) {}
+ void m3b(@A Outer.Inner p3b) {}
+ void m3c(@A Outer.Inner.Inner2 p3c) {}
+
+ // Test combinations
+ void m4a(@A Outer p3a) {}
+ void m4b(@A Outer. @B Inner p3b) {}
+ void m4c(@A Outer. @B Inner. @C Inner2 p3c) {}
+ }
+ }
+
+ void m4a(@A Map p4a) {}
+ void m4b(Map.@B Entry p4c) {}
+ // Illegal:
+ // void m4b(@A Map.Entry p4b) {}
+ // void m4c(@A Map.@B Entry p4c) {}
+
+ void m4c(Map<String,String>.@B Entry<String,String> p4d) {}
+ // Illegal:
+ // void m4d(@A Map<String,String>.@B Entry<String,String> p4d) {}
+
+ void m4e(MyList<Map.Entry> p4e) {}
+ void m4f(MyList<Map.@B Entry> p4f) {}
+ // Illegal:
+ // void m4g(MyList<@A Map.Entry> p4e) {}
+ // void m4h(MyList<@A Map.@B Entry> p4f) {}
+
+ class GInner<X> {
+ class GInner2<Y, Z> {}
+ }
+
+ static class Static {}
+ static class GStatic<X, Y> {
+ static class GStatic2<Z> {}
+ }
+}
+
+class Test1 {
+ // Outer.GStatic<Object,Object>.GStatic2<Object> gs;
+ Outer.GStatic.@A GStatic2<Object> gsgood;
+ // TODO: add failing test
+ // Outer.@A GStatic.GStatic2<Object> gsbad;
+
+ MyList<@A Outer . @B Inner. @C Inner2> f;
+ @A Outer .GInner<Object>.GInner2<String, Integer> g;
+
+ // TODO: Make sure that something like this fails gracefully:
+ // MyList<java.@B lang.Object> pkg;
+
+ @A Outer f1;
+ @A Outer . @B Inner f2 = f1.new @B Inner();
+ // TODO: ensure type annos on new are stored.
+ @A Outer . @B GInner<@C Object> f3 = f1.new @B GInner<@C Object>();
+
+ MyList<@A Outer . @B GInner<@C MyList<@D Object>>. @E GInner2<@F Integer, @G Object>> f4;
+ // MyList<Outer.GInner<Object>.GInner2<Integer>> f4clean;
+
+ @A Outer . @B GInner<@C MyList<@D Object>>. @E GInner2<@F Integer, @G Object> f4top;
+
+ MyList<@A Outer . @B GInner<@C MyList<@D Object @E[] @F[]>>. @G GInner2<@H Integer, @I Object> @J[] @K[]> f4arr;
+
+ @A Outer . @B GInner<@C MyList<@D Object @E[] @F[]>>. @G GInner2<@H Integer, @I Object> @J[] @K[] f4arrtop;
+
+ MyList<Outer . @B Static> f5;
+ // Illegal:
+ // MyList<@A Outer . @B Static> f5;
+
+ Outer . @B Static f6;
+ // Illegal:
+ // @A Outer . @B Static f6;
+
+ Outer . @Bv("B") GStatic<@Cv("C") String, @Dv("D") Object> f7;
+ // Illegal:
+ // @Av("A") Outer . @Bv("B") GStatic<@Cv("C") String, @Dv("D") Object> f7;
+
+ Outer . @Cv("Data") Static f8;
+ // Illegal:
+ // @A Outer . @Cv("Data") Static f8;
+
+ MyList<Outer . @Cv("Data") Static> f9;
+ // Illegal:
+ // MyList<@A Outer . @Cv("Data") Static> f9;
+}
+
+class Test2 {
+ void m() {
+ @A Outer f1 = null;
+ @A Outer.@B Inner f2 = null;
+ Outer.@B Static f3 = null;
+ // Illegal:
+ // @A Outer.@B Static f3 = null;
+ @A Outer.@C Inner f4 = null;
+
+ Outer . @B Static f5 = null;
+ Outer . @Cv("Data") Static f6 = null;
+ MyList<Outer . @Cv("Data") Static> f7 = null;
+ }
+}
+
+class Test3 {
+ void monster(@A Outer p1,
+ @A Outer.@B Inner p2,
+ Outer.@B Static p3,
+ @A Outer.@Cv("Test") Inner p4,
+ Outer . @B Static p5,
+ Outer . @Cv("Data") Static p6,
+ MyList<Outer . @Cv("Data") Static> p7) {
+ }
+}
+
+class Test4 {
+ void m() {
+ @A Outer p1 = new @A Outer();
+ @A Outer.@B Inner p2 = p1.new @B Inner();
+ // Illegal:
+ // @A Outer.@B Static p3 = new @A Outer.@B Static();
+ // Object o3 = new @A Outer.@B Static();
+
+ @A Outer.@Cv("Test") Inner p4 = p1.new @Cv("Test") Inner();
+ Outer . @B Static p5 = new Outer . @B Static();
+ Outer . @Cv("Data") Static p6 = new Outer . @Cv("Data") Static();
+ MyList<Outer . @Cv("Data") Static> p7 = new MyList<Outer . @Cv("Data") Static>();
+ }
+}
+
+class MyList<K> { }
+
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface C { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface D { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface E { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface F { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface G { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface H { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface I { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface J { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface K { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface Av { String value(); }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface Bv { String value(); }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface Cv { String value(); }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface Dv { String value(); }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface Ev { String value(); }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface Fv { String value(); }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Parameters.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: parameter type array/generics
+ * @author Mahmood Ali
+ * @compile Parameters.java
+ */
+
+class Parameters {
+ void unannotated(Parameterized<String, String> a) {}
+ void firstTypeArg(Parameterized<@A String, String> a) {}
+ void secondTypeArg(Parameterized<String, @A String> a) {}
+ void bothTypeArgs(Parameterized<@A String, @B String> both) {}
+
+ void nestedParameterized(Parameterized<@A Parameterized<@A String, @B String>, @B String> a) {}
+
+ void array1(@A String [] a) {}
+ void array1Deep(@A String @B [] a) {}
+ void array2(@A String [] [] a) {}
+ void array2Deep(@A String @A [] @B [] a) {}
+ void array2First(String @A [] [] a) {}
+ void array2Second(String [] @B [] a) {}
+}
+
+class Parameterized<K, V> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: receivers
+ * @author Mahmood Ali, Werner Dietl
+ * @compile Receivers.java
+ */
+class DefaultUnmodified {
+ void plain(@A DefaultUnmodified this) { }
+ <T> void generic(@A DefaultUnmodified this) { }
+ void withException(@A DefaultUnmodified this) throws Exception { }
+ String nonVoid(@A DefaultUnmodified this) { return null; }
+ <T extends Runnable> void accept(@A DefaultUnmodified this, T r) throws Exception { }
+}
+
+class PublicModified {
+ public final void plain(@A PublicModified this) { }
+ public final <T> void generic(@A PublicModified this) { }
+ public final void withException(@A PublicModified this) throws Exception { }
+ public final String nonVoid(@A PublicModified this) { return null; }
+ public final <T extends Runnable> void accept(@A PublicModified this, T r) throws Exception { }
+}
+
+class WithValue {
+ void plain(@B("m") WithValue this) { }
+ <T> void generic(@B("m") WithValue this) { }
+ void withException(@B("m") WithValue this) throws Exception { }
+ String nonVoid(@B("m") WithValue this) { return null; }
+ <T extends Runnable> void accept(@B("m") WithValue this, T r) throws Exception { }
+}
+
+class WithFinal {
+ void plain(final @B("m") WithFinal this) { }
+ <T> void generic(final @B("m") WithFinal this) { }
+ void withException(final @B("m") WithFinal this) throws Exception { }
+ String nonVoid(final @B("m") WithFinal this) { return null; }
+ <T extends Runnable> void accept(final @B("m") WithFinal this, T r) throws Exception { }
+}
+
+class WithBody {
+ Object f;
+
+ void field(@A WithBody this) {
+ this.f = null;
+ }
+ void meth(@A WithBody this) {
+ this.toString();
+ }
+}
+
+class Generic1<X> {
+ void test1(Generic1<X> this) {}
+ void test2(@A Generic1<X> this) {}
+ void test3(Generic1<@A X> this) {}
+ void test4(@A Generic1<@A X> this) {}
+}
+
+class Generic2<@A X> {
+ void test1(Generic2<X> this) {}
+ void test2(@A Generic2<X> this) {}
+ void test3(Generic2<@A X> this) {}
+ void test4(@A Generic2<@A X> this) {}
+}
+
+class Generic3<X extends @A Object> {
+ void test1(Generic3<X> this) {}
+ void test2(@A Generic3<X> this) {}
+ void test3(Generic3<@A X> this) {}
+ void test4(@A Generic3<@A X> this) {}
+}
+
+class Generic4<X extends @A Object> {
+ <Y> void test1(Generic4<X> this) {}
+ <Y> void test2(@A Generic4<X> this) {}
+ <Y> void test3(Generic4<@A X> this) {}
+ <Y> void test4(@A Generic4<@A X> this) {}
+}
+
+class Outer {
+ class Inner {
+ void none(Outer.Inner this) {}
+ void outer(@A Outer.Inner this) {}
+ void inner(Outer. @B("i") Inner this) {}
+ void both(@A Outer.@B("i") Inner this) {}
+
+ void innerOnlyNone(Inner this) {}
+ void innerOnly(@A Inner this) {}
+ }
+}
+
+class GenericOuter<S, T> {
+ class GenericInner<U, V> {
+ void none(GenericOuter<S, T>.GenericInner<U, V> this) {}
+ void outer(@A GenericOuter<S, T>.GenericInner<U, V> this) {}
+ void inner(GenericOuter<S, T>. @B("i") GenericInner<U, V> this) {}
+ void both(@A GenericOuter<S, T>.@B("i") GenericInner<U, V> this) {}
+
+ void innerOnlyNone(GenericInner<U, V> this) {}
+ void innerOnly(@A GenericInner<U, V> this) {}
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A {}
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { String value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 8006775
+ * @summary repeating type annotations are possible
+ * @author Werner Dietl
+ * @compile/fail/ref=RepeatingTypeAnnotations.out -XDrawDiagnostics RepeatingTypeAnnotations.java
+ */
+
+class RepeatingTypeAnnotations {
+ // Fields
+ @RTA @RTA Object fr1 = null;
+ Object fr2 = new @RTA @RTA Object();
+ // error
+ Object fs = new @TA @TA Object();
+ // error
+ Object ft = new @TA @TA Object();
+ Object fe = new @TA @TA Object();
+
+ // Local variables
+ Object foo() {
+ Object o = new @RTA @RTA Object();
+ o = new @TA @RTA @RTA Object();
+ o = new @RTA @TA @RTA Object();
+ // error
+ o = new @RTA @TA @RTA @TA Object();
+ // error
+ return new @TA @TA Object();
+ }
+
+ // Instance creation
+ Object bar() {
+ Object o = new @RTA @RTA MyList<@RTA @RTA Object>();
+ o = new @TA @RTA MyList<@TA @RTA Object>();
+ o = new @TA @RTA @RTA MyList<@RTA @TA @RTA Object>();
+ // error
+ o = new @TA @TA MyList<@RTA @RTA Object>();
+ // error
+ o = new @RTA @RTA MyList<@TA @TA Object>();
+ // error
+ return new @TA @TA MyList<@RTA @RTA Object>();
+ }
+
+ // More tests
+ void oneArg() {
+ Object o = new @RTA @RTA Object();
+ // error
+ o = new @TA @TA Object();
+ o = new @RTA @TA @RTA Object();
+
+ o = new MyList<@RTA @RTA Object>();
+ // error
+ o = new MyList<@TA @TA Object>();
+ // error
+ o = new @TA @TA MyList<@TA @TA Object>();
+ // error
+ this.<@TA @TA String>newList();
+
+ this.<@RTA @RTA MyList<@RTA @RTA String>>newList();
+ // error
+ this.<@TA @TA MyList<@TA @TA String>>newList();
+
+ o = (@RTA @RTA MyList<@RTA @RTA Object>) o;
+ // error
+ o = (@TA @TA MyList<@TA @TA Object>) o;
+
+ this.<@RTA @RTA String, @RTA @RTA Object>newMap();
+ // error
+ this.<@TA @TA String, @TA @TA Object>newMap();
+
+ this.<@RTA @RTA String @RTA @RTA []>newList();
+ // error
+ this.<@TA @TA String @TA @TA []>newList();
+
+ this.<@RTA @RTA String @RTA @RTA [] @RTA @RTA [], MyList<@RTA @RTA String> @RTA @RTA []>newMap();
+ // error
+ this.<String @TA @TA [] @TA @TA [], MyList<@TA @TA String> @TA @TA []>newMap();
+ }
+
+ static <E> void newList() { }
+ static <K, V> void newMap() { }
+}
+
+class MyList<E> { }
+
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface TA { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface TAs {
+ TA[] value();
+}
+
+@Repeatable(RTAs.class)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface RTA { }
+
+@ContainerFor(RTA.class)
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface RTAs {
+ RTA[] value();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,53 @@
+RepeatingTypeAnnotations.java:39:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:39:25: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:41:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:41:25: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:42:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:42:25: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:50:22: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:50:31: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:52:20: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:52:24: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:61:17: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:61:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:63:34: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:63:38: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:65:20: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:65:24: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:72:17: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:72:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:77:24: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:77:28: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:79:17: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:79:21: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:79:32: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:79:36: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:81:15: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:81:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:85:15: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:85:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:85:30: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:85:34: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:89:14: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:89:18: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:89:29: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:89:33: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:93:15: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:93:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:93:31: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:93:35: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:97:30: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:97:34: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:97:15: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:97:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:22: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:26: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:33: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:37: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:68: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:72: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:52: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:56: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+- compiler.note.unchecked.filename: RepeatingTypeAnnotations.java
+- compiler.note.unchecked.recompile
+50 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/ResourceVariables.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+import java.io.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: resource variables
+ * @author Werner Dietl
+ * @compile ResourceVariables.java
+ */
+
+class ResourceVariables {
+ void m() throws Exception {
+ try (@A InputStream is = new @B FileInputStream("xxx")) {
+ }
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Throws.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: throw clauses
+ * @author Mahmood Ali
+ * @compile Throws.java
+ */
+class DefaultUnmodified {
+ void oneException() throws @A Exception {}
+ void twoExceptions() throws @A RuntimeException, @A Exception {}
+}
+
+class PublicModified {
+ public final void oneException(String a) throws @A Exception {}
+ public final void twoExceptions(String a) throws @A RuntimeException, @A Exception {}
+}
+
+class WithValue {
+ void oneException() throws @B("m") Exception {}
+ void twoExceptions() throws @B(value="m") RuntimeException, @A Exception {}
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A {}
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { String value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TopLevelBlocks.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+import java.util.Map;
+
+/*
+ * @test
+ * @bug 8006775
+ * @summary type annotation location: top level blocks
+ * @author Werner Dietl
+ * @compile TopLevelBlocks.java
+ */
+
+class TopLevelBlocks {
+ static Object f;
+
+ {
+ f = new @A Object();
+ }
+
+ static final Object sf;
+
+ static {
+ sf = new @A Object();
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TypeCasts.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: type casts
+ * @author Mahmood Ali
+ * @compile TypeCasts.java
+ */
+class TypeCasts {
+ void methodA() {
+ String s = (@A String) null;
+ Object o = (@A Class<@A String>) null;
+ }
+
+ void methodB() {
+ String s = (@B("m") String) null;
+ Object o = (@B("m") Class<@B("m") String>) null;
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { String value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/TypeParameters.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: class and method type parameters
+ * @author Mahmood Ali
+ * @compile TypeParameters.java
+ */
+
+class Unannotated<K> { }
+class OneAnnotated<@A K> { }
+class TwoAnnotated<@A K, @A V> { }
+class SecondAnnotated<K, @A V extends String> { }
+
+class TestMethods {
+ <K> void unannotated() { }
+ <@A K> void oneAnnotated() { }
+ <@A K, @B("m") V> void twoAnnotated() { }
+ <K, @A V extends @A String> void secondAnnotated() { }
+}
+
+class UnannotatedB<K> { }
+class OneAnnotatedB<@B("m") K> { }
+class TwoAnnotatedB<@B("m") K, @B("m") V> { }
+class SecondAnnotatedB<K, @B("m") V extends @B("m") String> { }
+
+class OneAnnotatedC<@C K> { }
+class TwoAnnotatedC<@C K, @C V> { }
+class SecondAnnotatedC<K, @C V extends String> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { String value(); }
+@Target(ElementType.TYPE_USE)
+@interface C { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Varargs.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,46 @@
+
+/*
+ * Copyright (c) 2008 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @summary test acceptance of varargs annotations
+ * @author Mahmood Ali
+ * @compile Varargs.java
+ */
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A {}
+
+class Varargs {
+
+ // Handle annotations on a varargs element type
+ void varargPlain(Object @A... objs) {
+
+ }
+
+ void varargGeneric(Class<?> @A ... clz) {
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/Wildcards.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.*;
+
+/*
+ * @test
+ * @bug 6843077 8006775
+ * @summary new type annotation location: wildcard bound
+ * @author Mahmood Ali
+ * @compile Wildcards.java
+ */
+class BoundTest {
+ void wcExtends(MyList<? extends @A String> l) { }
+ void wcSuper(MyList<? super @A String> l) { }
+
+ MyList<? extends @A String> returnWcExtends() { return null; }
+ MyList<? super @A String> returnWcSuper() { return null; }
+ MyList<? extends @A MyList<? super @B("m") String>> complex() { return null; }
+}
+
+class BoundWithValue {
+ void wcExtends(MyList<? extends @B("m") String> l) { }
+ void wcSuper(MyList<? super @B(value="m") String> l) { }
+
+ MyList<? extends @B("m") String> returnWcExtends() { return null; }
+ MyList<? super @B(value="m") String> returnWcSuper() { return null; }
+ MyList<? extends @B("m") MyList<? super @B("m") String>> complex() { return null; }
+}
+
+class SelfTest {
+ void wcExtends(MyList<@A ?> l) { }
+ void wcSuper(MyList<@A ?> l) { }
+
+ MyList<@A ?> returnWcExtends() { return null; }
+ MyList<@A ?> returnWcSuper() { return null; }
+ MyList<@A ? extends @A MyList<@B("m") ?>> complex() { return null; }
+}
+
+class SelfWithValue {
+ void wcExtends(MyList<@B("m") ?> l) { }
+ void wcSuper(MyList<@B(value="m") ?> l) { }
+
+ MyList<@B("m") ?> returnWcExtends() { return null; }
+ MyList<@B(value="m") ?> returnWcSuper() { return null; }
+ MyList<@B("m") ? extends MyList<@B("m") ? super String>> complex() { return null; }
+}
+
+class MyList<K> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface B { String value(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.*;
+import javax.lang.model.util.ElementFilter;
+
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskListener;
+import com.sun.source.util.TreePath;
+import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.main.JavaCompiler.CompileState;
+import com.sun.tools.javac.processing.JavacProcessingEnvironment;
+import com.sun.tools.javac.util.Context;
+
+/*
+ * @test
+ * @summary test that package annotations are available to type processors.
+ * This class implements the functionality of a type processor, as previously
+ * embodied by the AbstractTypeProcessor class.
+ *
+ * @author Mahmood Ali
+ * @author Werner Dietl
+ *
+ * @compile PackageProcessor.java
+ * @compile -cp . -processor PackageProcessor mypackage/Anno.java mypackage/MyClass.java mypackage/package-info.java
+ */
+
+@SupportedAnnotationTypes("*")
+public class PackageProcessor extends AbstractProcessor {
+
+ private final AttributionTaskListener listener = new AttributionTaskListener();
+ private final Set<Name> elements = new HashSet<Name>();
+
+ @Override
+ public final void init(ProcessingEnvironment env) {
+ super.init(env);
+ JavacTask.instance(env).addTaskListener(listener);
+ Context ctx = ((JavacProcessingEnvironment)processingEnv).getContext();
+ JavaCompiler compiler = JavaCompiler.instance(ctx);
+ compiler.shouldStopPolicyIfNoError = CompileState.max(compiler.shouldStopPolicyIfNoError,
+ CompileState.FLOW);
+ }
+
+ @Override
+ public final boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ for (TypeElement elem : ElementFilter.typesIn(roundEnv.getRootElements())) {
+ elements.add(elem.getQualifiedName());
+ }
+ return false;
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+
+ private final class AttributionTaskListener implements TaskListener {
+ @Override
+ public void started(TaskEvent e) { }
+
+ @Override
+ public void finished(TaskEvent e) {
+ if (e.getKind() != TaskEvent.Kind.ANALYZE)
+ return;
+
+ if (!elements.remove(e.getTypeElement().getQualifiedName()))
+ return;
+
+ if (e.getTypeElement().getSimpleName().contentEquals("MyClass")) {
+ Element owner = e.getTypeElement().getEnclosingElement();
+ if (owner.getKind() != ElementKind.PACKAGE)
+ throw new RuntimeException("class owner should be a package: " + owner);
+ if (owner.getAnnotationMirrors().size() != 1)
+ throw new RuntimeException("the owner package should have one annotation: " + owner);
+ }
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package mypackage;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Retention;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Anno {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package mypackage;
+
+public class MyClass {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/package-info.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+@mypackage.Anno
+package mypackage;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for class extends clauses
+ * @compile -g Driver.java ReferenceInfoUtil.java ClassExtends.java
+ * @run main Driver ClassExtends
+ */
+public class ClassExtends {
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1),
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
+ })
+ public String regularClass() {
+ return "class Test extends @TA Object implements Cloneable, @TB Runnable {"
+ + " public void run() { } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1,
+ genericLocation = { 3, 0 }),
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 1 })
+ })
+ public String regularClassExtendsParametrized() {
+ return "class Test extends HashMap<@TA String, String> implements Cloneable, Map<String, @TB String>{ } ";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1),
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
+ })
+ public String abstractClass() {
+ return "abstract class Test extends @TA Date implements Cloneable, @TB Runnable {"
+ + " public void run() { } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1,
+ genericLocation = { 3, 0 }),
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 1 })
+ })
+ public String abstractClassExtendsParametrized() {
+ return "abstract class Test extends HashMap<@TA String, String> implements Cloneable, Map<String, @TB String>{ } ";
+ }
+
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
+ public String regularInterface() {
+ return "interface Test extends Cloneable, @TB Runnable { }";
+ }
+
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 1 })
+ public String regularInterfaceExtendsParametrized() {
+ return "interface Test extends Cloneable, Map<String, @TB String>{ } ";
+ }
+
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
+ public String regularEnum() {
+ return "enum Test implements Cloneable, @TB Runnable { TEST; public void run() { } }";
+ }
+
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 0 })
+ public String regularEnumExtendsParametrized() {
+ return
+ "enum Test implements Cloneable, Comparator<@TB String> { TEST; "
+ + "public int compare(String a, String b) { return 0; }}";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for class type parameters
+ * @compile -g Driver.java ReferenceInfoUtil.java ClassTypeParam.java
+ * @run main Driver ClassTypeParam
+ */
+public class ClassTypeParam {
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String regularClass() {
+ return "class Test<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String regularClass2() {
+ return "class Test<@TA K extends @TB Date, @TC V extends @TE Cloneable> { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ })
+ public String regularClassParameterized() {
+ return "class Test<K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TG", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ })
+ public String regularClassParameterized2() {
+ return "class Test<K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String abstractClass() {
+ return "abstract class Test<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ })
+ public String abstractClassParameterized() {
+ return "abstract class Test<K extends @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String regularInterface() {
+ return "interface Test<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ })
+ public String regularInterfaceParameterized() {
+ return "interface Test<K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TG", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ })
+ public String regularInterfaceParameterized2() {
+ return "interface Test<K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ public String useInReturn1() {
+ return "class Test<T> { @TA T m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RETURN, genericLocation = {3, 0})
+ public String useInReturn2() {
+ return "class Test<T> { Class<@TA T> m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0, genericLocation = {3, 0})
+ public String useInParam1() {
+ return "class Test<T> { void m(Class<@TA T> p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0, genericLocation = {3, 0})
+ public String useInParam2() {
+ return "class Test { void m(Class<@TA Object> p) { throw new RuntimeException(); } }";
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for constructor results
+ * @compile -g Driver.java ReferenceInfoUtil.java Constructors.java
+ * @run main Driver Constructors
+ */
+public class Constructors {
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN),
+ @TADescription(annotation = "TB", type = METHOD_RETURN),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ })
+ public String regularClass() {
+ return "class Test { @TA Test() {}" +
+ " @TB Test(@TC int b) {} }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN),
+ @TADescription(annotation = "TB", type = METHOD_RETURN),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ })
+ @TestClass("Test$Inner")
+ public String innerClass() {
+ return "class Test { class Inner {" +
+ " @TA Inner() {}" +
+ " @TB Inner(@TC int b) {}" +
+ " } }";
+ }
+
+ /* TODO: Outer.this annotation support.
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER),
+ @TADescription(annotation = "TB", type = METHOD_RETURN),
+ @TADescription(annotation = "TC", type = METHOD_RECEIVER),
+ @TADescription(annotation = "TD", type = METHOD_RETURN),
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ })
+ @TestClass("Test$Inner")
+ public String innerClass2() {
+ return "class Test { class Inner {" +
+ " @TB Inner(@TA Test Test.this) {}" +
+ " @TD Inner(@TC Test Test.this, @TE int b) {}" +
+ " } }";
+ }
+ */
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.TypeAnnotation;
+import com.sun.tools.classfile.TypeAnnotation.TargetType;
+
+public class Driver {
+
+ private static final PrintStream out = System.out;
+
+ public static void main(String[] args) throws Exception {
+ if (args.length == 0 || args.length > 1)
+ throw new IllegalArgumentException("Usage: java Driver <test-name>");
+ String name = args[0];
+ Class<?> clazz = Class.forName(name);
+ new Driver().runDriver(clazz.newInstance());
+ }
+
+ protected void runDriver(Object object) throws Exception {
+ int passed = 0, failed = 0;
+ Class<?> clazz = object.getClass();
+ out.println("Tests for " + clazz.getName());
+
+ // Find methods
+ for (Method method : clazz.getMethods()) {
+ Map<String, TypeAnnotation.Position> expected = expectedOf(method);
+ if (expected == null)
+ continue;
+ if (method.getReturnType() != String.class)
+ throw new IllegalArgumentException("Test method needs to return a string: " + method);
+ String testClass = testClassOf(method);
+
+ try {
+ String compact = (String)method.invoke(object);
+ String fullFile = wrap(compact);
+ ClassFile cf = compileAndReturn(fullFile, testClass);
+ List<TypeAnnotation> actual = ReferenceInfoUtil.extendedAnnotationsOf(cf);
+ ReferenceInfoUtil.compare(expected, actual, cf);
+ out.println("PASSED: " + method.getName());
+ ++passed;
+ } catch (Throwable e) {
+ out.println("FAILED: " + method.getName());
+ out.println(" " + e.toString());
+ ++failed;
+ }
+ }
+
+ out.println();
+ int total = passed + failed;
+ out.println(total + " total tests: " + passed + " PASSED, " + failed + " FAILED");
+
+ out.flush();
+
+ if (failed != 0)
+ throw new RuntimeException(failed + " tests failed");
+ }
+
+ private Map<String, TypeAnnotation.Position> expectedOf(Method m) {
+ TADescription ta = m.getAnnotation(TADescription.class);
+ TADescriptions tas = m.getAnnotation(TADescriptions.class);
+
+ if (ta == null && tas == null)
+ return null;
+
+ Map<String, TypeAnnotation.Position> result =
+ new HashMap<String, TypeAnnotation.Position>();
+
+ if (ta != null)
+ result.putAll(expectedOf(ta));
+
+ if (tas != null) {
+ for (TADescription a : tas.value()) {
+ result.putAll(expectedOf(a));
+ }
+ }
+
+ return result;
+ }
+
+ private Map<String, TypeAnnotation.Position> expectedOf(TADescription d) {
+ String annoName = d.annotation();
+
+ TypeAnnotation.Position p = new TypeAnnotation.Position();
+ p.type = d.type();
+ if (d.offset() != NOT_SET)
+ p.offset = d.offset();
+ if (d.lvarOffset().length != 0)
+ p.lvarOffset = d.lvarOffset();
+ if (d.lvarLength().length != 0)
+ p.lvarLength = d.lvarLength();
+ if (d.lvarIndex().length != 0)
+ p.lvarIndex = d.lvarIndex();
+ if (d.boundIndex() != NOT_SET)
+ p.bound_index = d.boundIndex();
+ if (d.paramIndex() != NOT_SET)
+ p.parameter_index = d.paramIndex();
+ if (d.typeIndex() != NOT_SET)
+ p.type_index = d.typeIndex();
+ if (d.exceptionIndex() != NOT_SET)
+ p.exception_index = d.exceptionIndex();
+ if (d.genericLocation().length != 0) {
+ p.location = TypeAnnotation.Position.getTypePathFromBinary(wrapIntArray(d.genericLocation()));
+ }
+
+ return Collections.singletonMap(annoName, p);
+ }
+
+ private List<Integer> wrapIntArray(int[] ints) {
+ List<Integer> list = new ArrayList<Integer>(ints.length);
+ for (int i : ints)
+ list.add(i);
+ return list;
+ }
+
+ private String testClassOf(Method m) {
+ TestClass tc = m.getAnnotation(TestClass.class);
+ if (tc != null) {
+ return tc.value();
+ } else {
+ return "Test";
+ }
+ }
+
+ private ClassFile compileAndReturn(String fullFile, String testClass) throws Exception {
+ File source = writeTestFile(fullFile);
+ File clazzFile = compileTestFile(source, testClass);
+ return ClassFile.read(clazzFile);
+ }
+
+ protected File writeTestFile(String fullFile) throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println(fullFile);
+ out.close();
+ return f;
+ }
+
+ protected File compileTestFile(File f, String testClass) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path;
+ if (f.getParent() != null) {
+ path = f.getParent();
+ } else {
+ path = "";
+ }
+
+ return new File(path + testClass + ".class");
+ }
+
+ private String wrap(String compact) {
+ StringBuilder sb = new StringBuilder();
+
+ // Automatically import java.util
+ sb.append("\nimport java.util.*;");
+ sb.append("\nimport java.lang.annotation.*;");
+
+ sb.append("\n\n");
+ boolean isSnippet = !(compact.startsWith("class")
+ || compact.contains(" class"))
+ && !compact.contains("interface")
+ && !compact.contains("enum");
+ if (isSnippet)
+ sb.append("class Test {\n");
+
+ sb.append(compact);
+ sb.append("\n");
+
+ if (isSnippet)
+ sb.append("}\n\n");
+
+ if (isSnippet) {
+ // Have a few common nested types for testing
+ sb.append("class Outer { class Inner {} }");
+ sb.append("class SOuter { static class SInner {} }");
+ sb.append("class GOuter<X, Y> { class GInner<X, Y> {} }");
+ }
+
+ // create A ... F annotation declarations
+ sb.append("\n@interface A {}");
+ sb.append("\n@interface B {}");
+ sb.append("\n@interface C {}");
+ sb.append("\n@interface D {}");
+ sb.append("\n@interface E {}");
+ sb.append("\n@interface F {}");
+
+ // create TA ... TF proper type annotations
+ sb.append("\n");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TB {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TC {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TD {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TE {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TF {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TG {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TH {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TI {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TJ {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TK {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TL {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TM {}");
+
+ // create RTA, RTAs, RTB, RTBs for repeating type annotations
+ sb.append("\n");
+ sb.append("\n@Repeatable(RTAs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTA {}");
+ sb.append("\n@Repeatable(RTBs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTB {}");
+
+ sb.append("\n@ContainerFor(RTA.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value(); }");
+ sb.append("\n@ContainerFor(RTB.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTBs { RTB[] value(); }");
+
+ sb.append("\n@Target(value={ElementType.TYPE,ElementType.FIELD,ElementType.METHOD,ElementType.PARAMETER,ElementType.CONSTRUCTOR,ElementType.LOCAL_VARIABLE})");
+ sb.append("\n@interface Decl {}");
+
+ return sb.toString();
+ }
+
+ public static final int NOT_SET = -888;
+
+}
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@interface TADescription {
+ String annotation();
+
+ TargetType type();
+ int offset() default Driver.NOT_SET;
+ int[] lvarOffset() default { };
+ int[] lvarLength() default { };
+ int[] lvarIndex() default { };
+ int boundIndex() default Driver.NOT_SET;
+ int paramIndex() default Driver.NOT_SET;
+ int typeIndex() default Driver.NOT_SET;
+ int exceptionIndex() default Driver.NOT_SET;
+
+ int[] genericLocation() default {};
+}
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@interface TADescriptions {
+ TADescription[] value() default {};
+}
+
+/**
+ * The name of the class that should be analyzed.
+ * Should only need to be provided when analyzing inner classes.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@interface TestClass {
+ String value() default "Test";
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for exception parameters
+ * @author Werner Dietl
+ * @compile -g Driver.java ReferenceInfoUtil.java ExceptionParameters.java
+ * @run main Driver ExceptionParameters
+ */
+public class ExceptionParameters {
+
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ public String exception() {
+ return "void exception() { try { new Object(); } catch(@TA Exception e) { } }";
+ }
+
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ public String finalException() {
+ return "void finalException() { try { new Object(); } catch(final @TA Exception e) { } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0),
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1),
+ @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ })
+ public String multipleExceptions() {
+ return "void multipleExceptions() { " +
+ "try { new Object(); } catch(@TA Exception e) { }" +
+ "try { new Object(); } catch(@TB Exception e) { }" +
+ "try { new Object(); } catch(@TC Exception e) { }" +
+ " }";
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for field
+ * @compile -g Driver.java ReferenceInfoUtil.java Fields.java
+ * @run main Driver Fields
+ */
+public class Fields {
+
+ // field types
+ @TADescription(annotation = "TA", type = FIELD)
+ public String fieldAsPrimitive() {
+ return "@TA int test;";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD)
+ public String fieldAsObject() {
+ return "@TA Object test;";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 3, 0 }),
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 3, 1 }),
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
+ })
+ public String fieldAsParametrized() {
+ return "@TA Map<@TB String, @TC List<@TD String>> test;";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 0, 0 }),
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 0, 0, 0, 0 })
+ })
+ public String fieldAsArray() {
+ return "@TC String @TA [] @TB [] test;";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 0, 0 }),
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 0, 0, 0, 0 })
+ })
+ public String fieldAsArrayOld() {
+ return "@TC String test @TA [] @TB [];";
+ }
+
+ @TADescriptions({})
+ public String fieldWithDeclarationAnnotatin() {
+ return "@Decl String test;";
+ }
+
+ @TADescriptions({})
+ public String fieldWithNoTargetAnno() {
+ return "@A String test;";
+ }
+
+ // Smoke tests
+ @TADescription(annotation = "TA", type = FIELD)
+ public String interfacefieldAsObject() {
+ return "interface Test { @TA String test = null; }";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD)
+ public String abstractfieldAsObject() {
+ return "abstract class Test { @TA String test; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 3, 0 }),
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 3, 1 }),
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
+ })
+ public String interfacefieldAsParametrized() {
+ return "interface Test { @TA Map<@TB String, @TC List<@TD String>> test = null; }";
+ }
+
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 3, 0 }),
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 3, 1 }),
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
+ })
+ public String staticFieldAsParametrized() {
+ return "static @TA Map<@TB String, @TC List<@TD String>> test;";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test that the examples from the manual are stored as expected
+ * @compile -g Driver.java ReferenceInfoUtil.java FromSpecification.java
+ * @run main Driver FromSpecification
+ */
+public class FromSpecification {
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 2, 0}, paramIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 1}, paramIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 1, 3, 0}, paramIndex = 0)
+ })
+ public String testSpec1() {
+ return "void test(@TA Map<@TB ? extends @TC String, @TD List<@TE Object>> a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 0, 0}, paramIndex = 0)
+ })
+ public String testSpec2() {
+ return "void test(@TI String @TF [] @TG [] @TH [] a) { }";
+ }
+
+ // Note first "1, 0" for top-level class Test.
+ @TADescriptions({
+ @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TL", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TM", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
+ })
+ public String testSpec3() {
+ return "class Test { class O1 { class O2 { class O3 { class NestedStatic {} } } }" +
+ "void test(@TM O1.@TL O2.@TK O3.@TJ NestedStatic a) { } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 3, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 3, 0, 0, 0, 0, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 1}, paramIndex = 0),
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 1, 3, 0}, paramIndex = 0)
+ })
+ public String testSpec4() {
+ return "void test(@TA Map<@TB Comparable<@TF Object @TC [] @TD [] @TE []>, @TG List<@TH String>> a) { }";
+ }
+
+ // Note first "1, 0" for top-level class Test.
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 3, 1}, paramIndex = 0),
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
+ })
+ public String testSpec5() {
+ return "class Test { class O1 { class O2<A, B> { class O3 { class Nested<X, Y> {} } } }" +
+ "void test(@TH O1.@TE O2<@TF String, @TG String>.@TD O3.@TA Nested<@TB String, @TC String> a) { } }";
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for method parameters
+ * @compile -g Driver.java ReferenceInfoUtil.java MethodParameters.java
+ * @run main Driver MethodParameters
+ */
+public class MethodParameters {
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ public String methodParamAsPrimitive() {
+ return "void test(@TA int a) { }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1)
+ public String methodParamAsObject() {
+ return "void test(Object b, @TA Object a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0 }, paramIndex = 0)
+ })
+ public String methodParamAsParametrized() {
+ return "void test(@TA Map<@TB String, @TC List<@TD String>> a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0, 2, 0 }, paramIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0 }, paramIndex = 0),
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0 }, paramIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0, 3, 0 }, paramIndex = 0),
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0, 3, 0, 2, 0 }, paramIndex = 0),
+ @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0, 3, 1 }, paramIndex = 0),
+ @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0, 3, 1, 2, 0 }, paramIndex = 0)
+ })
+ public String methodParamAsWildcard() {
+ return "void test(@TA Map<@TB ? extends @TC String," +
+ " @TD List<@TE ? extends @TF Map<@TG ? super @TH String," +
+ " @TI ? extends @TJ Object>>> a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
+ })
+ public String methodParamAsArray() {
+ return "void test(Object b, @TC String @TA [] @TB [] a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
+ })
+ public String methodParamAsVararg() {
+ return "void test(Object b, @TC String @TA [] @TB ... a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
+ })
+ public String methodParamAsFQVararg() {
+ return "void test(Object b, java.lang.@TC String @TA [] @TB ... a) { }";
+ }
+
+ @TADescriptions({})
+ public String methodWithDeclarationAnnotatin() {
+ return "void test(@Decl String a) { }";
+ }
+
+ @TADescriptions({})
+ public String methodWithNoTargetAnno() {
+ return "void test(@A String a) { }";
+ }
+
+ // Smoke tests
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ public String interfacemethodParamAsObject() {
+ return "interface Test { void test(@TA Object a); }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 2)
+ public String abstractmethodParamAsObject() {
+ return "abstract class Test { abstract void test(Object b, Object c, @TA Object a); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0 }, paramIndex = 0)
+ })
+ public String interfacemethodParamAsParametrized() {
+ return "interface Test { void test(@TA Map<@TB String, @TC List<@TD String>> a); }";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for method receivers
+ * @compile -g Driver.java ReferenceInfoUtil.java MethodReceivers.java
+ * @run main Driver MethodReceivers
+ */
+public class MethodReceivers {
+
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER)
+ public String regularMethod() {
+ return "class Test { void test(@TA Test this) { } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER)
+ public String abstractMethod() {
+ return "abstract class Test { abstract void test(@TA Test this); }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER)
+ public String interfaceMethod() {
+ return "interface Test { void test(@TA Test this); }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER)
+ public String regularWithThrows() {
+ return "class Test { void test(@TA Test this) throws Exception { } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER,
+ genericLocation = {}),
+ @TADescription(annotation = "TB", type = METHOD_RECEIVER,
+ genericLocation = {1, 0})
+ })
+ @TestClass("TestOuter$TestInner")
+ public String nestedtypes1() {
+ return "class TestOuter { class TestInner { void test(@TA TestOuter. @TB TestInner this) { } } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER,
+ genericLocation = {})
+ @TestClass("TestOuter$TestInner")
+ public String nestedtypes2() {
+ return "class TestOuter { class TestInner { void test(@TA TestOuter.TestInner this) { } } }";
+ }
+
+ @TADescription(annotation = "TB", type = METHOD_RECEIVER,
+ genericLocation = {1, 0})
+ @TestClass("TestOuter$TestInner")
+ public String nestedtypes3() {
+ return "class TestOuter { class TestInner { void test(TestOuter. @TB TestInner this) { } } }";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for method return
+ * @compile -g Driver.java ReferenceInfoUtil.java MethodReturns.java
+ * @run main Driver MethodReturns
+ */
+public class MethodReturns {
+
+ // Method returns
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ public String methodReturnAsPrimitive() {
+ return "@TA int test() { return 0; }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ public String methodReturnAsObject() {
+ return "@TA Object test() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 1 }),
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = { 3, 1, 3, 0 })
+ })
+ public String methodReturnAsParametrized() {
+ return "@TA Map<@TB String, @TC List<@TD String>> test() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 0, 0 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 0, 0, 0, 0 })
+ })
+ public String methodReturnAsArray() {
+ return "@TC String @TA [] @TB [] test() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 0, 0 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 0, 0, 0, 0 })
+ })
+ public String methodReturnAsArrayOld() {
+ return "@TC String test() @TA [] @TB [] { return null; }";
+ }
+
+ @TADescriptions({})
+ public String methodWithDeclarationAnnotation() {
+ return "@Decl String test() { return null; }";
+ }
+
+ @TADescriptions({})
+ public String methodWithNoTargetAnno() {
+ return "@A String test() { return null; }";
+ }
+
+ // Smoke tests
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ public String interfaceMethodReturnAsObject() {
+ return "interface Test { @TA Object test(); }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ public String abstractMethodReturnAsObject() {
+ return "abstract class Test { abstract @TA Object test(); }";
+ }
+
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 1 }),
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = { 3, 1, 3, 0 })
+ })
+ public String interfaceMethodReturnAsParametrized() {
+ return "interface Test { @TA Map<@TB String, @TC List<@TD String>> test(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = { 3, 0 }),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 }),
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 0 }),
+ @TADescription(annotation = "TE", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1 }),
+ @TADescription(annotation = "TF", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1, 2, 0 })
+ })
+ public String methodReturnAsNestedWildcard() {
+ return "Set<@TA ? extends @TB GOuter<String, String>. @TC GInner<@TD String, @TE ? super @TF Object>> entrySet() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 0 }),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 1 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 1, 2, 0 })
+ })
+ public String methodReturnAsNestedWildcard2() {
+ return "class GOuter<X, Y> { class GInner<X, Y> {} } " +
+ "class Test<K> { Set<GOuter<String, String>.GInner<@TA K, @TB ? extends @TC Object>> entrySet() { return null; } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 }),
+ })
+ public String methodReturnAsNestedWildcard3() {
+ return "Set<? extends @TB GOuter<String, String>. @TC GInner<String, Object>> entrySet() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 }),
+ })
+ public String methodReturnAsNestedWildcard4() {
+ return "Set<? extends GOuter<String, String>. @TC GInner<String, Object>> entrySet() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 }),
+ })
+ public String methodReturnAsNestedWildcard5() {
+ return "Set<? extends @TB Outer. @TC Inner> entrySet() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 0 }),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1 }),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 }),
+ })
+ public String methodReturnAsNestedWildcard6() {
+ return "Set<? extends GOuter<String, String>. @TC GInner<@TA String, @TB Object>> entrySet() { return null; }";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for method exception clauses
+ * @compile -g Driver.java ReferenceInfoUtil.java MethodThrows.java
+ * @run main Driver MethodThrows
+ */
+public class MethodThrows {
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = THROWS, typeIndex = 0),
+ @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
+ })
+ public String regularMethod() {
+ return "class Test { void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception { } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = THROWS, typeIndex = 0),
+ @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
+ })
+ public String abstractMethod() {
+ return "abstract class Test { abstract void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = THROWS, typeIndex = 0),
+ @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
+ })
+ public String interfaceMethod() {
+ return "interface Test { void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception; }";
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for method type parameters
+ * @compile -g Driver.java ReferenceInfoUtil.java MethodTypeParam.java
+ * @run main Driver MethodTypeParam
+ */
+public class MethodTypeParam {
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String regularClass() {
+ return "<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> void test() { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String regularClass2() {
+ return "<@TA K extends @TB Date, @TC V extends @TE Cloneable> void test() { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ })
+ public String regularClassParameterized() {
+ return "<K extends @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> void test() { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String abstractClass() {
+ return "abstract class Test { abstract <@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> void test(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ })
+ public String abstractClassParameterized() {
+ return "abstract class Test { abstract <K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> void test(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ })
+ public String abstractClassParameterized2() {
+ return "abstract class Test { abstract <K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> void test(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String abstractClassParameterized3() {
+ return "abstract class Test { abstract <K extends @TA List<String>, V extends @TB List<Object>> void test(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ })
+ public String regularInterface() {
+ return "interface Test { <@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> void test(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ })
+ public String regularInterfaceParameterized() {
+ return "interface Test { <@TH K extends @TG Object & @TA Map<String, @TB String>, @TI V extends @TF Object & @TC List<@TD List<@TE Object>>> void test(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ })
+ public String regularInterfaceParameterized2() {
+ return "interface Test { <@TF K extends @TA Map<String, @TB String>, @TG V extends @TC List<@TD List<@TE Object>>> void test(); }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ public String useInReturn1() {
+ return "class Test { <T> @TA T m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RETURN, genericLocation = {3, 0})
+ public String useInReturn2() {
+ return "class Test { <T> Class<@TA T> m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_RETURN)
+ })
+ public String useInReturn3() {
+ return "class Test { <T extends @TA Object> @TB T m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0, genericLocation = {3, 0})
+ public String useInParam1() {
+ return "class Test { <T> void m(Class<@TA T> p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0, genericLocation = {3, 0})
+ public String useInParam2() {
+ return "class Test { void m(Class<@TA Object> p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 2),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ })
+ public String useInParam3() {
+ return "interface IA {} " +
+ "interface IB<XB> {} " +
+ "interface IC<XC> {} " +
+ "class Test { <T extends @TA IB<IA> & @TB IC<IA>> void m(@TC T p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1,
+ genericLocation = {}),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 2,
+ genericLocation = {}),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0)
+ })
+ public String useInParam4() {
+ return "class Test {" +
+ " interface IA {} " +
+ " interface IB<XB> {} " +
+ " interface IC<XC> {} " +
+ " <T extends @TA IB<IA> & @TB IC<IA>> void m(@TC T p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {}),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {1, 0}),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {1, 0, 3, 0}),
+ })
+ public String useInParam5() {
+ return "class Test {" +
+ " interface IA {} " +
+ " class CB<XC> {} " +
+ " <T extends @TA Test. @TB CB<@TC IA>> void m(T p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER,
+ paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {}),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {1, 0, 3, 0}),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1,
+ genericLocation = {}),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1,
+ genericLocation = {3, 0})
+ })
+ public String useInParam6() {
+ return "class Test {" +
+ " interface IA {} " +
+ " interface IB<XB> {} " +
+ " class CC<XC> {} " +
+ " interface ID<XD> {} " +
+ " <@TA T extends @TB Test.CC<@TC IA> & Test. @TD ID<@TE IA>> void m(T p) { throw new RuntimeException(); } }";
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @bug 8006732 8006775
+ * @ignore
+ * @summary Test population of reference info for multicatch exception parameters
+ * @author Werner Dietl
+ * @compile -g Driver.java ReferenceInfoUtil.java MultiCatch.java
+ * @run main Driver MultiCatch
+ */
+public class MultiCatch {
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0),
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ })
+ public String multiCatch1() {
+ return "void multiCatch1() { " +
+ "try { new Object(); } catch (@TA NullPointerException | @TB IndexOutOfBoundsException e) { e.toString(); } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0),
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1),
+ @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2),
+ })
+ public String multiCatch2() {
+ return "void multiCatch2() { " +
+ "try { new Object(); } catch (@TA NullPointerException | @TB IndexOutOfBoundsException | @TC IllegalArgumentException e) { e.toString(); } }";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,834 @@
+/*
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for nested types
+ * @compile -g Driver.java ReferenceInfoUtil.java NestedTypes.java
+ * @run main Driver NestedTypes
+ */
+public class NestedTypes {
+
+ // method parameters
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
+ })
+ public String testParam1() {
+ return "void test(@TA Outer.@TB Inner a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0)
+ })
+ public String testParam1b() {
+ return "void test(List<@TA Outer.@TB Inner> a) { }";
+ }
+
+ // TODO: the tests that use @TA Map.Entry should fail, as
+ // Map cannot be annotated.
+ // We need some tests for the fully qualified name syntax.
+ /*
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0)
+ public String testParam1c() {
+ return "void test(java.util.@TA Map.Entry a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
+ })
+ public String testParam1d() {
+ return "void test(java.util.@TA Map.@TB Entry a) { }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ public String testParam1e() {
+ return "void test(List<java.util.@TA Map.Entry> a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0)
+ })
+ public String testParam1f() {
+ return "void test(List<java.util.@TA Map. @TB Entry> a) { }";
+ }
+ */
+
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ public String testParam1g() {
+ return "void test(List<java.util.Map. @TB Entry> a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
+ })
+ public String testParam2() {
+ return "void test(@TA GOuter<String,String>.@TB GInner<String,String> a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0)
+ })
+ public String testParam2b() {
+ return "void test(List<@TA GOuter<String,String>.@TB GInner<String,String>> a) { }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0),
+ @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
+ @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0}, paramIndex = 0)
+ })
+ public String testParam3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " void test(@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[] a) { }\n" +
+ "}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}, paramIndex = 0),
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0),
+ @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0),
+ @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0}, paramIndex = 0)
+ })
+ public String testParam4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " void test(List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]> a) { }\n" +
+ "}";
+ }
+
+
+ // Local variables
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ })
+ public String testLocal1a() {
+ return "void test() { @TA Outer.@TB Inner a = null; }";
+ }
+
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ public String testLocal1b() {
+ return "void test() { @TA Outer.Inner a = null; }";
+ }
+
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ public String testLocal1c() {
+ return "void test() { Outer.@TB Inner a = null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ })
+ public String testLocal2() {
+ return "void test() { @TA GOuter<String,String>.@TB GInner<String,String> a = null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TD", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TE", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TF", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TG", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TH", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TI", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TJ", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TK", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ })
+ public String testLocal3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " void test() { @TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[] a = null; }\n" +
+ "}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TD", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TE", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TF", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TG", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TH", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TI", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TJ", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
+ @TADescription(annotation = "TK", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ })
+ public String testLocal4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " void test() { List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]> a = null; }\n" +
+ "}";
+ }
+
+
+ // fields
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {}),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {1, 0})
+ })
+ public String testField1a() {
+ return "@TA Outer.@TB Inner a;";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {})
+ public String testField1b() {
+ return "@TA Outer.Inner a;";
+ }
+
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {1, 0})
+ public String testField1c() {
+ return "Outer.@TB Inner a;";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {}),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {1, 0})
+ })
+ public String testField2() {
+ return "@TA GOuter<String,String>.@TB GInner<String,String> a;";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {0, 0, 0, 0}),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0}),
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
+ @TADescription(annotation = "TE", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
+ @TADescription(annotation = "TG", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}),
+ @TADescription(annotation = "TH", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TI", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1}),
+ @TADescription(annotation = "TJ", type = FIELD),
+ @TADescription(annotation = "TK", type = FIELD,
+ genericLocation = {0, 0})
+ })
+ public String testField3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " @TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[] a;\n" +
+ "}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0}),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}),
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
+ @TADescription(annotation = "TE", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
+ @TADescription(annotation = "TG", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}),
+ @TADescription(annotation = "TH", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TI", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1}),
+ @TADescription(annotation = "TJ", type = FIELD,
+ genericLocation = {3, 0}),
+ @TADescription(annotation = "TK", type = FIELD,
+ genericLocation = {3, 0, 0, 0})
+ })
+ public String testField4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]> a;\n" +
+ "}";
+ }
+
+
+ // return types
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {}),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {1, 0})
+ })
+ public String testReturn1() {
+ return "@TA Outer.@TB Inner test() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {}),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {1, 0})
+ })
+ public String testReturn2() {
+ return "@TA GOuter<String,String>.@TB GInner<String,String> test() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0}),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0}),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
+ @TADescription(annotation = "TE", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
+ @TADescription(annotation = "TG", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}),
+ @TADescription(annotation = "TH", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TI", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1}),
+ @TADescription(annotation = "TJ", type = METHOD_RETURN),
+ @TADescription(annotation = "TK", type = METHOD_RETURN,
+ genericLocation = {0, 0})
+ })
+ public String testReturn3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " @TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[] test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0}),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
+ @TADescription(annotation = "TE", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0}),
+ @TADescription(annotation = "TF", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
+ @TADescription(annotation = "TG", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}),
+ @TADescription(annotation = "TH", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TI", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1}),
+ @TADescription(annotation = "TJ", type = METHOD_RETURN,
+ genericLocation = {3, 0}),
+ @TADescription(annotation = "TK", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0})
+ })
+ public String testReturn4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]> test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {3, 0}),
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 0}),
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 1}),
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 1, 3, 0}),
+ @TADescription(annotation = "TE", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0}),
+ @TADescription(annotation = "TF", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0}),
+ @TADescription(annotation = "TG", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
+ @TADescription(annotation = "TH", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0}),
+ @TADescription(annotation = "TI", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
+ @TADescription(annotation = "TJ", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 1, 0}),
+ })
+ public String testReturn5() {
+ return "class GOuter<A, B> {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " List<@TA GOuter<@TB String, @TC List<@TD Object>> . @TE GInner<@TF List<@TG Object @TH[] @TI[]>>. @TJ GInner2<String, String>> test() { return null; }\n" +
+ "}";
+ }
+
+
+ // type parameters
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {}, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0}, paramIndex = 0, boundIndex = 0)
+ })
+ public String testTypeparam1() {
+ return "<X extends @TA Outer.@TB Inner> X test() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {}, paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0}, paramIndex = 0, boundIndex = 0)
+ })
+ public String testTypeparam2() {
+ return "<X extends @TA GOuter<String,String>.@TB GInner<String,String>> X test() { return null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {},
+ paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0},
+ paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0},
+ paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0, 3, 0},
+ paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0, 3, 0, 0, 0},
+ paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 1, 0},
+ paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 1, 0, 3, 0},
+ paramIndex = 0, boundIndex = 0),
+ @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 1, 0, 3, 1},
+ paramIndex = 0, boundIndex = 0),
+ })
+ public String testTypeparam3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " <X extends @TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object>> X test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TJ", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0},
+ paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TK", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0},
+ paramIndex = 0, boundIndex = 1)
+ })
+ public String testTypeparam4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " <X extends List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]>> X test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 0}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 1}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 1, 3, 0}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0, boundIndex = 1),
+ @TADescription(annotation = "TJ", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 1, 0}, paramIndex = 0, boundIndex = 1),
+ })
+ public String testTypeparam5() {
+ return "class GOuter<A, B> {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class Test {\n" +
+ " <X extends List<@TA GOuter<@TB String, @TC List<@TD Object>> . @TE GInner<@TF List<@TG Object @TH[] @TI[]>>. @TJ GInner2<String, String>>> X test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0})
+ public String testUses1a() {
+ return "class Test { class Inner {} List<@TA Inner> f; }";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0})
+ public String testUses1b() {
+ return "class Test { class Inner {} List<@TA Test.Inner> f; }";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ @TestClass("Test$Inner")
+ public String testUses2a() {
+ return "class Test { class Inner { class Inner2{} List<@TA Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0})
+ @TestClass("Test$Inner")
+ public String testUses2b() {
+ return "class Test { class Inner { class Inner2{} List<@TA Inner.Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ @TestClass("Test$Inner")
+ public String testUses2c() {
+ return "class Test { class Inner { class Inner2{} List<Inner.@TA Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0})
+ @TestClass("Test$Inner")
+ public String testUses2d() {
+ return "class Test{ class Inner { class Inner2{} List<@TA Test.Inner.Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0})
+ @TestClass("Test$Inner")
+ public String testUses2e() {
+ return "class Test { class Inner { class Inner2{} List<Test.@TA Inner.Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ @TestClass("Test$Inner")
+ public String testUses2f() {
+ return "class Test { class Inner { class Inner2{} List<Test.Inner.@TA Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ @TestClass("Test$Inner")
+ public String testUses3a() {
+ return "class Test { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<Test.Inner.@TA Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0})
+ @TestClass("Test$Inner")
+ public String testUses3b() {
+ return "class Test { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<Test.@TA Inner.Inner2> f; }}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {}),
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {3, 0})
+ })
+ public String testUses4() {
+ return "class Test { static class TInner {}\n" +
+ " @TA TInner f; \n" +
+ " List<@TB TInner> g; }";
+ }
+
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 3, 1})
+ @TestClass("Test$Inner")
+ public String testUses3c() {
+ return "class Test { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<Test.Inner<String, @TA Object>.Inner2<Test, Test>> f; }}";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex=0)
+ public String testFullyQualified1() {
+ return "void testme(java.security.@TA ProtectionDomain protectionDomain) {}";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex=0,
+ genericLocation = {3, 0})
+ public String testFullyQualified2() {
+ return "void testme(List<java.security.@TA ProtectionDomain> protectionDomain) {}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
+ // Only classes count, not methods.
+ genericLocation = {1, 0, 1, 0},
+ lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE),
+ })
+ @TestClass("Outer$Inner")
+ public String testMethodNesting1() {
+ return "class Outer {\n" +
+ " class Inner {\n" +
+ " void foo() {\n" +
+ " class MInner {}\n" +
+ " @TA Outer . @TB Inner l1 = null;\n" +
+ " @TC MInner l2 = null;\n" +
+ " }\n" +
+ "}}\n";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = NEW,
+ genericLocation = {},
+ offset = 0),
+ @TADescription(annotation = "TB", type = NEW,
+ genericLocation = {1, 0},
+ offset = 0),
+ @TADescription(annotation = "TC", type = NEW,
+ // Only classes count, not methods.
+ genericLocation = {1, 0, 1, 0},
+ offset = 12),
+ })
+ @TestClass("Outer$Inner")
+ public String testMethodNesting2() {
+ return "class Outer {\n" +
+ " class Inner {\n" +
+ " void foo() {\n" +
+ " class MInner {}\n" +
+ " Object o1 = new @TA Outer . @TB Inner();" +
+ " Object o2 = new @TC MInner();\n" +
+ " }\n" +
+ "}}\n";
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for new object creations
+ * @compile -g Driver.java ReferenceInfoUtil.java NewObjects.java
+ * @run main Driver NewObjects
+ */
+public class NewObjects {
+
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnObject() {
+ return "Object returnObject() { return new @TA String(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String returnObjectGeneric() {
+ return "Object returnObjectGeneric() { return new @TA ArrayList<@TB String>(); }";
+ }
+
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initObject() {
+ return "void initObject() { Object a = new @TA String(); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = NEW,
+ genericLocation = { 3, 1 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String initObjectGeneric() {
+ return "void initObjectGeneric() { Object a = new @TA HashMap<@TB String, @TC String>(); }";
+ }
+
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String eqtestObject() {
+ return "void eqtestObject() { if (null == new @TA String()); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String eqtestObjectGeneric() {
+ return "void eqtestObjectGeneric() { if (null == new @TA ArrayList<@TB String >()); }";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.TypeAnnotation;
+import com.sun.tools.classfile.Field;
+import com.sun.tools.classfile.Method;
+import com.sun.tools.classfile.RuntimeTypeAnnotations_attribute;
+import com.sun.tools.classfile.ConstantPool.InvalidIndex;
+import com.sun.tools.classfile.ConstantPool.UnexpectedEntry;
+
+public class ReferenceInfoUtil {
+
+ public static final int IGNORE_VALUE = -321;
+
+ public static List<TypeAnnotation> extendedAnnotationsOf(ClassFile cf) {
+ List<TypeAnnotation> annos = new ArrayList<TypeAnnotation>();
+ findAnnotations(cf, annos);
+ return annos;
+ }
+
+ /////////////////// Extract type annotations //////////////////
+ private static void findAnnotations(ClassFile cf, List<TypeAnnotation> annos) {
+ findAnnotations(cf, Attribute.RuntimeVisibleTypeAnnotations, annos);
+ findAnnotations(cf, Attribute.RuntimeInvisibleTypeAnnotations, annos);
+
+ for (Field f : cf.fields) {
+ findAnnotations(cf, f, annos);
+ }
+ for (Method m: cf.methods) {
+ findAnnotations(cf, m, annos);
+ }
+ }
+
+ private static void findAnnotations(ClassFile cf, Method m, List<TypeAnnotation> annos) {
+ findAnnotations(cf, m, Attribute.RuntimeVisibleTypeAnnotations, annos);
+ findAnnotations(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, annos);
+ }
+
+ private static void findAnnotations(ClassFile cf, Field m, List<TypeAnnotation> annos) {
+ findAnnotations(cf, m, Attribute.RuntimeVisibleTypeAnnotations, annos);
+ findAnnotations(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, annos);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ private static void findAnnotations(ClassFile cf, String name, List<TypeAnnotation> annos) {
+ int index = cf.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = cf.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ annos.addAll(Arrays.asList(tAttr.annotations));
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ private static void findAnnotations(ClassFile cf, Method m, String name, List<TypeAnnotation> annos) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ annos.addAll(Arrays.asList(tAttr.annotations));
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ private static void findAnnotations(ClassFile cf, Field m, String name, List<TypeAnnotation> annos) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ annos.addAll(Arrays.asList(tAttr.annotations));
+ }
+ }
+
+ /////////////////// TA Position Builder ///////////////////////
+ /* TODO: comment out this dead code. Was this unfinished code that was
+ * supposed to be used somewhere? The tests pass without this.
+ private static class TAPositionBuilder {
+ private TypeAnnotation.Position pos = new TypeAnnotation.Position();
+
+ private TAPositionBuilder() { }
+
+ public TypeAnnotation.Position build() { return pos; }
+
+ public static TAPositionBuilder ofType(TypeAnnotation.TargetType type) {
+ TAPositionBuilder builder = new TAPositionBuilder();
+ builder.pos.type = type;
+ return builder;
+ }
+
+ public TAPositionBuilder atOffset(int offset) {
+ switch (pos.type) {
+ // type cast
+ case TYPECAST:
+ // instanceof
+ case INSTANCEOF:
+ // new expression
+ case NEW:
+ pos.offset = offset;
+ break;
+ default:
+ throw new IllegalArgumentException("invalid field for given type: " + pos.type);
+ }
+ return this;
+ }
+
+ public TAPositionBuilder atLocalPosition(int offset, int length, int index) {
+ switch (pos.type) {
+ // local variable
+ case LOCAL_VARIABLE:
+ pos.lvarOffset = new int[] { offset };
+ pos.lvarLength = new int[] { length };
+ pos.lvarIndex = new int[] { index };
+ break;
+ default:
+ throw new IllegalArgumentException("invalid field for given type: " + pos.type);
+ }
+ return this;
+ }
+
+ public TAPositionBuilder atParameterIndex(int index) {
+ switch (pos.type) {
+ // type parameters
+ case CLASS_TYPE_PARAMETER:
+ case METHOD_TYPE_PARAMETER:
+ // method parameter
+ case METHOD_FORMAL_PARAMETER:
+ pos.parameter_index = index;
+ break;
+ default:
+ throw new IllegalArgumentException("invalid field for given type: " + pos.type);
+ }
+ return this;
+ }
+
+ public TAPositionBuilder atParamBound(int param, int bound) {
+ switch (pos.type) {
+ // type parameters bounds
+ case CLASS_TYPE_PARAMETER_BOUND:
+ case METHOD_TYPE_PARAMETER_BOUND:
+ pos.parameter_index = param;
+ pos.bound_index = bound;
+ break;
+ default:
+ throw new IllegalArgumentException("invalid field for given type: " + pos.type);
+ }
+ return this;
+ }
+
+ public TAPositionBuilder atWildcardPosition(TypeAnnotation.Position pos) {
+ switch (pos.type) {
+ // wildcards
+ case WILDCARD_BOUND:
+ pos.wildcard_position = pos;
+ break;
+ default:
+ throw new IllegalArgumentException("invalid field for given type: " + pos.type);
+ }
+ return this;
+ }
+
+ public TAPositionBuilder atTypeIndex(int index) {
+ switch (pos.type) {
+ // class extends or implements clauses
+ case CLASS_EXTENDS:
+ // throws
+ case THROWS:
+ pos.type_index = index;
+ break;
+ default:
+ throw new IllegalArgumentException("invalid field for given type: " + pos.type);
+ }
+ return this;
+ }
+
+ public TAPositionBuilder atOffsetWithIndex(int offset, int index) {
+ switch (pos.type) {
+ // method type argument: wasn't specified
+ case NEW_TYPE_ARGUMENT:
+ case METHOD_TYPE_ARGUMENT:
+ pos.offset = offset;
+ pos.type_index = index;
+ break;
+ default:
+ throw new IllegalArgumentException("invalid field for given type: " + pos.type);
+ }
+ return this;
+ }
+
+ public TAPositionBuilder atGenericLocation(Integer ...loc) {
+ pos.location = Arrays.asList(loc);
+ pos.type = pos.type.getGenericComplement();
+ return this;
+ }
+ }*/
+
+ /////////////////////// Equality testing /////////////////////
+ private static boolean areEquals(int a, int b) {
+ return a == b || a == IGNORE_VALUE || b == IGNORE_VALUE;
+ }
+
+ private static boolean areEquals(int[] a, int[] a2) {
+ if (a==a2)
+ return true;
+ if (a==null || a2==null)
+ return false;
+
+ int length = a.length;
+ if (a2.length != length)
+ return false;
+
+ for (int i=0; i<length; i++)
+ if (a[i] != a2[i] && a[i] != IGNORE_VALUE && a2[i] != IGNORE_VALUE)
+ return false;
+
+ return true;
+ }
+
+ public static boolean areEquals(TypeAnnotation.Position p1, TypeAnnotation.Position p2) {
+ if (p1 == p2)
+ return true;
+ if (p1 == null || p2 == null)
+ return false;
+
+ return ((p1.type == p2.type)
+ && (p1.location.equals(p2.location))
+ && areEquals(p1.offset, p2.offset)
+ && areEquals(p1.lvarOffset, p2.lvarOffset)
+ && areEquals(p1.lvarLength, p2.lvarLength)
+ && areEquals(p1.lvarIndex, p2.lvarIndex)
+ && areEquals(p1.bound_index, p2.bound_index)
+ && areEquals(p1.parameter_index, p2.parameter_index)
+ && areEquals(p1.type_index, p2.type_index)
+ && areEquals(p1.exception_index, p2.exception_index));
+ }
+
+ private static TypeAnnotation findAnnotation(String name, List<TypeAnnotation> annotations, ClassFile cf) throws InvalidIndex, UnexpectedEntry {
+ String properName = "L" + name + ";";
+ for (TypeAnnotation anno : annotations) {
+ String actualName = cf.constant_pool.getUTF8Value(anno.annotation.type_index);
+ if (properName.equals(actualName))
+ return anno;
+ }
+ return null;
+ }
+
+ public static boolean compare(Map<String, TypeAnnotation.Position> expectedAnnos,
+ List<TypeAnnotation> actualAnnos, ClassFile cf) throws InvalidIndex, UnexpectedEntry {
+ if (actualAnnos.size() != expectedAnnos.size()) {
+ throw new ComparisionException("Wrong number of annotations",
+ expectedAnnos,
+ actualAnnos);
+ }
+
+ for (Map.Entry<String, TypeAnnotation.Position> e : expectedAnnos.entrySet()) {
+ String aName = e.getKey();
+ TypeAnnotation.Position expected = e.getValue();
+ TypeAnnotation actual = findAnnotation(aName, actualAnnos, cf);
+ if (actual == null)
+ throw new ComparisionException("Expected annotation not found: " + aName);
+
+ // TODO: you currently get an exception if the test case does not use all necessary
+ // annotation attributes, e.g. forgetting the offset for a local variable.
+ // It would be nicer to give an understandable warning instead.
+ if (!areEquals(expected, actual.position)) {
+ throw new ComparisionException("Unexpected position for annotation : " + aName +
+ "\n Expected: " + expected.toString() +
+ "\n Found: " + actual.position.toString());
+ }
+ }
+ return true;
+ }
+}
+
+class ComparisionException extends RuntimeException {
+ private static final long serialVersionUID = -3930499712333815821L;
+
+ public final Map<String, TypeAnnotation.Position> expected;
+ public final List<TypeAnnotation> found;
+
+ public ComparisionException(String message) {
+ this(message, null, null);
+ }
+
+ public ComparisionException(String message, Map<String, TypeAnnotation.Position> expected, List<TypeAnnotation> found) {
+ super(message);
+ this.expected = expected;
+ this.found = found;
+ }
+
+ public String toString() {
+ String str = super.toString();
+ if (expected != null && found != null) {
+ str += "\n\tExpected: " + expected.size() + " annotations; but found: " + found.size() + " annotations\n" +
+ " Expected: " + expected +
+ "\n Found: " + found;
+ }
+ return str;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for repeating type annotations
+ * @compile -g Driver.java ReferenceInfoUtil.java RepeatingTypeAnnotations.java
+ * @run main Driver RepeatingTypeAnnotations
+ * @author Werner Dietl
+ */
+public class RepeatingTypeAnnotations {
+ // Field types
+ @TADescription(annotation = "RTAs", type = FIELD)
+ public String fieldAsPrimitive() {
+ return "@RTA @RTA int test;";
+ }
+
+ // Method returns
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ public String methodReturn1() {
+ return "@RTA @RTA int test() { return 0; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ public String methodReturn2() {
+ return "@RTAs({@RTA, @RTA}) int test() { return 0; }";
+ }
+
+ // Method parameters
+ @TADescriptions({
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0),
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0,
+ genericLocation = { 3, 0 })
+ })
+ public String methodParam1() {
+ return "void m(@RTA @RTA List<@RTB @RTB String> p) {}";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0),
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0,
+ genericLocation = { 3, 0 })
+ })
+ public String methodParam2() {
+ return "void m(@RTAs({@RTA, @RTA}) List<@RTBs({@RTB, @RTB}) String> p) {}";
+ }
+
+ // TODO: test that all other locations work with repeated type annotations.
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for type casts
+ * @compile -g Driver.java ReferenceInfoUtil.java TypeCasts.java
+ * @run main Driver TypeCasts
+ */
+public class TypeCasts {
+
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnObject() {
+ return "Object returnObject() { return (@TA String)null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = CAST,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String returnObjectArray() {
+ return "Object returnObjectArray() { return (@TC String @TA [] @TB [])null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String returnObjectGeneric() {
+ return "Object returnObjectGeneric() { return (@TA List<@TB String>)null; }";
+ }
+
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnPrim() {
+ return "Object returnPrim() { return (@TA int)0; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String returnPrimArray() {
+ return "Object returnPrimArray() { return (@TB int @TA [])null; }";
+ }
+
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initObject() {
+ return "void initObject() { Object a = (@TA String)null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String initObjectArray() {
+ return "void initObjectArray() { Object a = (@TB String @TA [])null; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String initObjectGeneric() {
+ return "void initObjectGeneric() { Object a = (@TA List<@TB String>)null; }";
+ }
+
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initPrim() {
+ return "void initPrim() { Object a = (@TA int)0; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String initPrimArray() {
+ return "void initPrimArray() { Object a = (@TB int @TA [])null; }";
+ }
+
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String eqtestObject() {
+ return "void eqtestObject() { if (null == (@TA String)null); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String eqtestObjectArray() {
+ return "void eqtestObjectArray() { if (null == (@TB String @TA [])null); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String eqtestObjectGeneric() {
+ return "void eqtestObjectGeneric() { if (null == (@TA List<@TB String >)null); }";
+ }
+
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ // compiler optimizes away compile time constants casts
+ public String eqtestPrim() {
+ return "void eqtestPrim(int a) { if (0 == (@TA int)a); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String eqtestPrimArray() {
+ return "void eqtestPrimArray() { if (null == (@TB int @TA [])null); }";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+
+/*
+ * @test
+ * @summary Test population of reference info for class literals
+ * @compile -g Driver.java ReferenceInfoUtil.java TypeTests.java
+ * @run main Driver TypeTests
+ */
+public class TypeTests {
+
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnObject() {
+ return "Object returnObject() { return null instanceof @TA String; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String returnObjectArray() {
+ return "Object returnObjectArray() { return null instanceof @TC String @TA [] @TB []; }";
+ }
+
+ // no type test for primitives
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String returnPrimArray() {
+ return "Object returnPrimArray() { return null instanceof @TC int @TA [] @TB []; }";
+ }
+
+ // no void
+ // no void array
+
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initObject() {
+ return "void initObject() { Object a = null instanceof @TA String; }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String initObjectArray() {
+ return "void initObjectArray() { Object a = null instanceof @TC String @TA [] @TB []; }";
+ }
+
+ // no primitive instanceof
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String initPrimArray() {
+ return "void initPrimArray() { Object a = null instanceof @TC int @TA [] @TB []; }";
+ }
+
+ // no void
+ // no void array
+
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String eqtestObject() {
+ return "void eqtestObject() { if (true == (null instanceof @TA String)); }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String eqtestObjectArray() {
+ return "void eqtestObjectArray() { if (true == (null instanceof @TC String @TA [] @TB [])); }";
+ }
+
+ // no primitives
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ })
+ public String eqtestPrimArray() {
+ return "void eqtestPrimArray() { if (true == (null instanceof @TC int @TA [] @TB [])); }";
+ }
+
+ // no void
+ // no void array
+
+}
--- a/langtools/test/tools/javac/api/EndPositions.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/api/EndPositions.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,7 @@
* an annotation processor is present
*/
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.Tree;
import com.sun.source.util.JavacTask;
-import com.sun.source.util.Trees;
import java.io.IOException;
import java.net.URI;
import java.util.Arrays;
@@ -72,16 +68,17 @@
JavacTask task = (JavacTask)javac.getTask(null, null, diagnostics, options, null, compilationUnits);
boolean valid = task.call();
if (valid)
- throw new AssertionError("Compilation succeeded unexpectedly");
+ throw new AssertionError("Expected one error, but found none.");
List<Diagnostic<? extends JavaFileObject>> errors = diagnostics.getDiagnostics();
if (errors.size() != 1)
- throw new AssertionError("Expected one error only, but found " + errors.size() + " errors");
+ throw new AssertionError("Expected one error only, but found " + errors.size() + "; errors: " + errors);
Diagnostic<?> error = errors.get(0);
if (error.getStartPosition() >= error.getEndPosition())
throw new AssertionError("Expected start to be less than end position: start [" +
- error.getStartPosition() + "], end [" + error.getEndPosition() +"]");
+ error.getStartPosition() + "], end [" + error.getEndPosition() +"]" +
+ "; diagnostics code: " + error.getCode());
System.out.println("All is good!");
}
--- a/langtools/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,13 +23,17 @@
/*
* @test
- * @bug 8002099
+ * @bug 8002099 8006694
* @summary Add support for intersection types in cast expression
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main/timeout=360 IntersectionTypeCastTest
+ * @run main/othervm/timeout=360 IntersectionTypeCastTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import javax.tools.Diagnostic;
@@ -287,8 +291,7 @@
final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
JavacTask ct = (JavacTask)tool.getTask(null, fm.get(), diagChecker,
- Arrays.asList("-XDallowIntersectionTypes"),
- null, Arrays.asList(source));
+ null, null, Arrays.asList(source));
try {
ct.analyze();
} catch (Throwable ex) {
--- a/langtools/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -170,7 +170,7 @@
void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
checkCount++;
JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
- Arrays.asList("-XDallowIntersectionTypes"), null, Arrays.asList(source));
+ null, null, Arrays.asList(source));
ct.parse();
if (diagChecker.errorFound) {
throw new Error("Unexpected parser error for source:\n" +
--- a/langtools/test/tools/javac/cast/intersection/model/Model01.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/cast/intersection/model/Model01.java Thu Jan 31 10:22:25 2013 -0800
@@ -27,7 +27,7 @@
* @summary Add support for intersection types in cast expression
* @library /tools/javac/lib
* @build JavacTestingAbstractProcessor ModelChecker
- * @compile -XDallowIntersectionTypes -processor ModelChecker Model01.java
+ * @compile -processor ModelChecker Model01.java
*/
import javax.lang.model.element.ElementKind;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/Static01.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005166
+ * @summary Add support for static interface methods
+ * smoke test for static interface methods
+ * @compile -XDallowStaticInterfaceMethods Static01.java
+ */
+public class Static01 {
+
+ static int assertionCount = 0;
+
+ static void assertTrue(boolean cond) {
+ assertionCount++;
+ if (!cond)
+ throw new AssertionError();
+ }
+
+ interface I {
+ public static void test() {
+ assertTrue(true);
+ }
+ }
+
+ public static void main(String[] args) {
+ I.test();
+ assertTrue(assertionCount == 1);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/Static02.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005166
+ * @summary Add support for static interface methods
+ * smoke test for static interface methods
+ * @compile/fail/ref=Static02.out -XDrawDiagnostics -XDallowStaticInterfaceMethods Static02.java
+ */
+class Static02 {
+
+ interface I {
+ public static void test() { }
+ }
+
+ public static void main(String[] args) {
+ I.test(); //ok
+ I i = new I() {};
+ i.test(); //no!
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/Static02.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+Static02.java:40:15: compiler.err.illegal.static.intf.meth.call: Static02.I
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005166
+ * @summary Add support for static interface methods
+ * Smoke test for static interface method hiding
+ */
+
+import com.sun.source.util.JavacTask;
+import java.net.URI;
+import java.util.Arrays;
+import javax.tools.Diagnostic;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+
+public class InterfaceMethodHidingTest {
+
+ static int checkCount = 0;
+
+ enum SignatureKind {
+ VOID_INTEGER("void m(Integer s)", "return;"),
+ STRING_INTEGER("String m(Integer s)", "return null;"),
+ VOID_STRING("void m(String s)", "return;"),
+ STRING_STRING("String m(String s)", "return null;");
+
+ String sigStr;
+ String retStr;
+
+ SignatureKind(String sigStr, String retStr) {
+ this.sigStr = sigStr;
+ this.retStr = retStr;
+ }
+
+ boolean overrideEquivalentWith(SignatureKind s2) {
+ switch (this) {
+ case VOID_INTEGER:
+ case STRING_INTEGER:
+ return s2 == VOID_INTEGER || s2 == STRING_INTEGER;
+ case VOID_STRING:
+ case STRING_STRING:
+ return s2 == VOID_STRING || s2 == STRING_STRING;
+ default:
+ throw new AssertionError("bad signature kind");
+ }
+ }
+ }
+
+ enum MethodKind {
+ VIRTUAL("", "#M #S;"),
+ STATIC("static", "#M #S { #BE; #R }"),
+ DEFAULT("default", "#M #S { #BE; #R }");
+
+ String modStr;
+ String methTemplate;
+
+ MethodKind(String modStr, String methTemplate) {
+ this.modStr = modStr;
+ this.methTemplate = methTemplate;
+ }
+
+ boolean inherithed() {
+ return this != STATIC;
+ }
+
+ static boolean overrides(MethodKind mk1, SignatureKind sk1, MethodKind mk2, SignatureKind sk2) {
+ return sk1 == sk2 &&
+ mk2.inherithed() &&
+ mk1 != STATIC;
+ }
+
+ String getBody(BodyExpr be, SignatureKind sk) {
+ return methTemplate.replaceAll("#BE", be.bodyExprStr)
+ .replaceAll("#R", sk.retStr)
+ .replaceAll("#M", modStr)
+ .replaceAll("#S", sk.sigStr);
+ }
+ }
+
+ enum BodyExpr {
+ NONE(""),
+ THIS("Object o = this");
+
+ String bodyExprStr;
+
+ BodyExpr(String bodyExprStr) {
+ this.bodyExprStr = bodyExprStr;
+ }
+
+ boolean allowed(MethodKind mk) {
+ return this == NONE ||
+ mk != MethodKind.STATIC;
+ }
+ }
+
+ public static void main(String... args) throws Exception {
+
+ //create default shared JavaCompiler - reused across multiple compilations
+ JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+ StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
+
+ for (MethodKind mk1 : MethodKind.values()) {
+ for (SignatureKind sk1 : SignatureKind.values()) {
+ for (BodyExpr be1 : BodyExpr.values()) {
+ for (MethodKind mk2 : MethodKind.values()) {
+ for (SignatureKind sk2 : SignatureKind.values()) {
+ for (BodyExpr be2 : BodyExpr.values()) {
+ for (MethodKind mk3 : MethodKind.values()) {
+ for (SignatureKind sk3 : SignatureKind.values()) {
+ for (BodyExpr be3 : BodyExpr.values()) {
+ new InterfaceMethodHidingTest(mk1, mk2, mk3, sk1, sk2, sk3, be1, be2, be3).run(comp, fm);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ System.out.println("Total check executed: " + checkCount);
+ }
+
+ MethodKind mk1, mk2, mk3;
+ SignatureKind sk1, sk2, sk3;
+ BodyExpr be1, be2, be3;
+ JavaSource source;
+ DiagnosticChecker diagChecker;
+
+ InterfaceMethodHidingTest(MethodKind mk1, MethodKind mk2, MethodKind mk3,
+ SignatureKind sk1, SignatureKind sk2, SignatureKind sk3, BodyExpr be1, BodyExpr be2, BodyExpr be3) {
+ this.mk1 = mk1;
+ this.mk2 = mk2;
+ this.mk3 = mk3;
+ this.sk1 = sk1;
+ this.sk2 = sk2;
+ this.sk3 = sk3;
+ this.be1 = be1;
+ this.be2 = be2;
+ this.be3 = be3;
+ this.source = new JavaSource();
+ this.diagChecker = new DiagnosticChecker();
+ }
+
+ class JavaSource extends SimpleJavaFileObject {
+
+ String template = "interface Sup {\n" +
+ " default void sup() { }\n" +
+ "}\n" +
+ "interface A extends Sup {\n" +
+ " #M1\n" +
+ "}\n" +
+ "interface B extends A, Sup {\n" +
+ " #M2\n" +
+ "}\n" +
+ "interface C extends B, Sup {\n" +
+ " #M3\n" +
+ "}\n";
+
+ String source;
+
+ public JavaSource() {
+ super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+ source = template.replaceAll("#M1", mk1.getBody(be1, sk1))
+ .replaceAll("#M2", mk2.getBody(be2, sk2))
+ .replaceAll("#M3", mk3.getBody(be3, sk3));
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return source;
+ }
+ }
+
+ void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
+ JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
+ Arrays.asList("-XDallowStaticInterfaceMethods"), null, Arrays.asList(source));
+ try {
+ ct.analyze();
+ } catch (Throwable ex) {
+ throw new AssertionError("Error thrown when analyzing the following source:\n" + source.getCharContent(true));
+ }
+ check();
+ }
+
+ void check() {
+ boolean errorExpected =
+ !be1.allowed(mk1) || !be2.allowed(mk2) || !be3.allowed(mk3);
+
+ if (mk1.inherithed()) {
+ errorExpected |=
+ sk2.overrideEquivalentWith(sk1) && !MethodKind.overrides(mk2, sk2, mk1, sk1) ||
+ sk3.overrideEquivalentWith(sk1) && !MethodKind.overrides(mk3, sk3, mk1, sk1);
+ }
+
+ if (mk2.inherithed()) {
+ errorExpected |=
+ sk3.overrideEquivalentWith(sk2) && !MethodKind.overrides(mk3, sk3, mk2, sk2);
+ }
+
+ checkCount++;
+ if (diagChecker.errorFound != errorExpected) {
+ throw new AssertionError("Problem when compiling source:\n" + source.getCharContent(true) +
+ "\nfound error: " + diagChecker.errorFound);
+ }
+ }
+
+ static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
+
+ boolean errorFound;
+
+ public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+ if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+ errorFound = true;
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/import/StaticImport1.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005166
+ * @summary Add support for static interface methods
+ * Smoke test for static imports of static interface methods
+ * @compile -XDallowStaticInterfaceMethods StaticImport1.java
+ */
+
+import static pkg.A.*;
+
+class StaticImport1 {
+ void test() {
+ m();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/import/StaticImport2.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005166
+ * @summary Add support for static interface methods
+ * Smoke test for static imports of static interface methods
+ * @compile/fail/ref=StaticImport2.out -XDrawDiagnostics -XDallowStaticInterfaceMethods StaticImport2.java
+ */
+
+import static pkg.B.*;
+
+class StaticImport2 {
+ void test() {
+ m();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/import/StaticImport2.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+StaticImport2.java:36:9: compiler.err.cant.resolve.location.args: kindname.method, m, , , (compiler.misc.location: kindname.class, StaticImport2, null)
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/import/StaticImport3.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8005166
+ * @summary Add support for static interface methods
+ * Smoke test for static imports of static interface methods
+ * @compile/fail/ref=StaticImport3.out -XDrawDiagnostics -XDallowStaticInterfaceMethods StaticImport3.java
+ */
+
+import static pkg.C.*;
+
+class StaticImport3 {
+ void test() {
+ m();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/import/StaticImport3.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+StaticImport3.java:36:9: compiler.err.cant.resolve.location.args: kindname.method, m, , , (compiler.misc.location: kindname.class, StaticImport3, null)
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/import/pkg/A.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+public interface A {
+ static void m() { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/import/pkg/B.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+public interface B extends A { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/defaultMethods/static/import/pkg/C.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+public class C implements A { }
--- a/langtools/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,17 +23,21 @@
/*
* @test
+ * @bug 8006694
* @summary Automatic test for checking correctness of default super/this resolution
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main TestDefaultSuperCall
+ * @run main/othervm TestDefaultSuperCall
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
import javax.tools.Diagnostic;
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
@@ -212,7 +216,6 @@
List<String> elementsWithMethod;
Shape(ElementKind... elements) {
- errWriter.println("elements = " + Arrays.toString(elements));
enclosingElements = new ArrayList<>();
enclosingNames = new ArrayList<>();
elementsWithMethod = new ArrayList<>();
@@ -406,7 +409,6 @@
public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
- errWriter.println(diagnostic.getMessage(Locale.getDefault()));
errorFound = true;
}
}
--- a/langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7192245
+ * @bug 7192245 8005851 8005166
* @summary Automatic test for checking set of allowed modifiers on interface methods
*/
@@ -54,7 +54,7 @@
}
List<String> getOptions() {
- return Arrays.asList("-source", versionString);
+ return Arrays.asList("-XDallowStaticInterfaceMethods", "-source", versionString);
}
}
@@ -77,32 +77,6 @@
this.modStr = modStr;
}
- boolean isAllowed(EnclosingKind ek, ModifierKind otherMod) {
- if (this == otherMod) return false;
- switch (this) {
- case NONE:
- return true;
- case ABSTRACT:
- return otherMod != PRIVATE;
- case NATIVE:
- return otherMod != ABSTRACT &&
- otherMod != STRICTFP;
- case FINAL:
- case STATIC:
- case SYNCHRONIZED:
- case STRICTFP:
- return otherMod != ABSTRACT;
- case PUBLIC:
- return true;
- case PROTECTED:
- return ek == EnclosingKind.ABSTRACT_CLASS;
- case DEFAULT:
- return otherMod != ABSTRACT;
- default:
- return true;
- }
- }
-
static boolean intersect(ModifierKind mk, ModifierKind... mks) {
for (ModifierKind mk2 : mks) {
if (mk == mk2) return true;
@@ -113,7 +87,7 @@
static boolean compatible(MethodKind mk, ModifierKind mod1, ModifierKind mod2, EnclosingKind ek) {
if (intersect(ABSTRACT, mod1, mod2) || intersect(NATIVE, mod1, mod2)) {
return mk == MethodKind.NO_BODY;
- } else if (intersect(DEFAULT, mod1, mod2)) {
+ } else if (intersect(DEFAULT, mod1, mod2) || intersect(STATIC, mod1, mod2)) {
return mk == MethodKind.BODY;
} else {
return ek == EnclosingKind.INTERFACE ?
@@ -123,7 +97,6 @@
boolean compatible(EnclosingKind ek) {
switch (this) {
- case STATIC:
case PRIVATE:
case PROTECTED:
return ek != EnclosingKind.INTERFACE;
@@ -176,17 +149,17 @@
static Result[][] allowedModifierPairs = {
/* NONE PUBLIC PROTECTED PRIVATE ABSTRACT STATIC NATIVE SYNCHRONIZED FINAL STRICTFP DEFAULT */
- /* NONE */ { T , T , C , C , T , C , C , C , C , C , I },
- /* PUBLIC */ { T , F , F , F , T , C , C , C , C , C , I },
+ /* NONE */ { T , T , C , C , T , T , C , C , C , C , I },
+ /* PUBLIC */ { T , F , F , F , T , T , C , C , C , C , I },
/* PROTECTED */ { C , F , F , F , C , C , C , C , C , C , F },
/* PRIVATE */ { C , F , F , F , F , C , C , C , C , C , F },
/* ABSTRACT */ { T , T , C , F , F , F , F , F , F , F , F },
- /* STATIC */ { C , C , C , C , F , F , C , C , C , C , F },
+ /* STATIC */ { T , T , C , C , F , F , C , C , C , T , F },
/* NATIVE */ { C , C , C , C , F , C , F , C , C , F , F },
- /* SYNCHRONIZED */ { C , C , C , C , F , C , C , F , C , C , I },
+ /* SYNCHRONIZED */ { C , C , C , C , F , C , C , F , C , C , F },
/* FINAL */ { C , C , C , C , F , C , C , C , F , C , F },
- /* STRICTFP */ { C , C , C , C , F , C , F , C , C , F , I },
- /* DEFAULT */ { I , I , F , F , F , F , F , I , F , I , F }};
+ /* STRICTFP */ { C , C , C , C , F , T , F , C , C , F , I },
+ /* DEFAULT */ { I , I , F , F , F , F , F , F , F , I , F }};
}
enum MethodKind {
@@ -291,6 +264,9 @@
errorExpected |= ModifierKind.intersect(ModifierKind.DEFAULT, modk1, modk2) &&
vk == VersionKind.PRE_LAMBDA;
+ errorExpected |= ModifierKind.intersect(ModifierKind.STATIC, modk1, modk2) &&
+ ek == EnclosingKind.INTERFACE && vk == VersionKind.PRE_LAMBDA;
+
checkCount++;
if (diagChecker.errorFound != errorExpected) {
throw new AssertionError("Problem when compiling source:\n" + source.getCharContent(true) +
--- a/langtools/test/tools/javac/diags/CheckResourceKeys.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/diags/CheckResourceKeys.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -200,6 +200,7 @@
Set<String> needToInvestigate = new TreeSet<String>(Arrays.asList(
+ "compiler.misc.fatal.err.cant.close.loader", // Supressed by JSR308
"compiler.err.cant.read.file", // UNUSED
"compiler.err.illegal.self.ref", // UNUSED
"compiler.err.io.exception", // UNUSED
--- a/langtools/test/tools/javac/diags/examples.not-yet.txt Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/diags/examples.not-yet.txt Thu Jan 31 10:22:25 2013 -0800
@@ -1,13 +1,14 @@
compiler.err.already.annotated # internal compiler error?
compiler.err.already.defined.this.unit # seems to be masked by compiler.err.duplicate.class
compiler.err.annotation.value.not.allowable.type # cannot happen: precluded by complete type-specific tests
+compiler.err.bad.functional.intf.anno # seems to be masked by compiler.err.annotation.type.not.applicable
compiler.err.cant.read.file # (apt.JavaCompiler?)
compiler.err.cant.select.static.class.from.param.type
compiler.err.dc.unterminated.string # cannot happen
compiler.err.illegal.char.for.encoding
-compiler.err.invalid.containedby.annotation # should not happen
-compiler.err.invalid.containedby.annotation.invalid.value # "can't" happen
-compiler.err.invalid.containedby.annotation.multiple.values # can't happen
+compiler.err.invalid.repeatable.annotation # should not happen
+compiler.err.invalid.repeatable.annotation.invalid.value # "can't" happen
+compiler.err.invalid.repeatable.annotation.multiple.values # can't happen
compiler.err.io.exception # (javah.JavahTask?)
compiler.err.limit.code # Code
compiler.err.limit.code.too.large.for.try.stmt # Gen
@@ -47,6 +48,7 @@
compiler.misc.bad.enclosing.method # bad class file
compiler.misc.bad.runtime.invisible.param.annotations # bad class file
compiler.misc.bad.signature # bad class file
+compiler.misc.bad.type.annotation.value
compiler.misc.base.membership # UNUSED
compiler.misc.ccf.found.later.version
compiler.misc.ccf.unrecognized.attribute
@@ -58,6 +60,7 @@
compiler.misc.fatal.err.cant.close # JavaCompiler
compiler.misc.file.does.not.contain.package
compiler.misc.illegal.start.of.class.file
+compiler.misc.inferred.do.not.conform.to.lower.bounds # cannot happen?
compiler.misc.kindname.annotation
compiler.misc.kindname.enum
compiler.misc.kindname.package
@@ -67,6 +70,7 @@
compiler.misc.kindname.value
compiler.misc.incompatible.eq.lower.bounds # cannot happen?
compiler.misc.no.unique.minimal.instance.exists
+compiler.misc.no.unique.maximal.instance.exists # cannot happen?
compiler.misc.resume.abort # prompt for a response
compiler.misc.source.unavailable # DiagnosticSource
compiler.misc.token.bad-symbol
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/BadFunctionalIntfAnno.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.bad.functional.intf.anno.1
+// key: compiler.misc.not.a.functional.intf
+
+@FunctionalInterface
+class BadFunctionalIntfAnno { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/CantAnnotateNestedType.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.cant.annotate.nested.type
+
+import java.lang.annotation.*;
+
+class CantAnnotateStaticClass {
+ @Target(ElementType.TYPE_USE)
+ @interface A {}
+
+ interface Outer {
+ interface Inner {}
+ }
+
+ // Error:
+ @A Outer.Inner f;
+
+ // OK:
+ @A Outer g;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/CantAnnotateStaticClass.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.cant.annotate.static.class
+
+import java.lang.annotation.*;
+
+class CantAnnotateStaticClass {
+ @Target(ElementType.TYPE_USE)
+ @interface A {}
+
+ static class Outer {
+ class Inner {}
+ }
+
+ // Error:
+ @A Outer.Inner f;
+
+ // OK:
+ @A Outer g;
+}
--- a/langtools/test/tools/javac/diags/examples/ContainedByDocumentedMismatch.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.containedby.annotation.not.documented
-
-import java.lang.annotation.*;
-
-@Documented
-@ContainedBy(Annos.class)
-@interface Anno { }
-
-@ContainerFor(Anno.class)
-@interface Annos { Anno[] value(); }
-
-@Anno
-@Anno
-class ContainedByDocumentedMismatch { }
--- a/langtools/test/tools/javac/diags/examples/ContainedByInheritedMismatch.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.containedby.annotation.not.inherited
-
-import java.lang.annotation.*;
-
-@Inherited
-@ContainedBy(Annos.class)
-@interface Anno { }
-
-@ContainerFor(Anno.class)
-@interface Annos { Anno[] value(); }
-
-@Anno
-@Anno
-class ContainedByInheritedMismatch { }
--- a/langtools/test/tools/javac/diags/examples/ContainedByNoValue.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.containedby.annotation.no.value
-
-import java.lang.annotation.*;
-
-@ContainedBy(Annos.class)
-@interface Anno { }
-
-@ContainerFor(Anno.class)
-@interface Annos {}
-
-@Anno
-@Anno
-class ContainedByNoValue { }
--- a/langtools/test/tools/javac/diags/examples/ContainedByNonDefault.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.containedby.annotation.elem.nondefault
-
-import java.lang.annotation.*;
-
-@ContainedBy(Annos.class)
-@interface Anno { }
-
-@ContainerFor(Anno.class)
-@interface Annos { Anno[] value(); String foo(); }
-
-class ContainedByNonDefault { }
--- a/langtools/test/tools/javac/diags/examples/ContainedByRetentionMismatch.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.containedby.annotation.retention
-
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@ContainedBy(Annos.class)
-@interface Anno { }
-
-@ContainerFor(Anno.class)
-@interface Annos { Anno[] value(); }
-
-@Anno
-@Anno
-class ContainedByRetentionMismatch { }
--- a/langtools/test/tools/javac/diags/examples/ContainedByTargetMismatch.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.containedby.annotation.incompatible.target
-
-import java.lang.annotation.*;
-
-@ContainedBy(Annos.class)
-@Target(ElementType.METHOD)
-@interface Anno { }
-
-@ContainerFor(Anno.class)
-@interface Annos { Anno[] value(); }
-
-class ContainedByTargetMismatch { }
--- a/langtools/test/tools/javac/diags/examples/ContainedByWrongValueType.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.containedby.annotation.value.return
-
-import java.lang.annotation.*;
-
-@ContainedBy(Annos.class)
-@interface Anno { }
-
-@ContainerFor(Anno.class)
-@interface Annos { String value(); }
-
-@Anno
-@Anno
-class ContainedByWrongValueType { }
--- a/langtools/test/tools/javac/diags/examples/CyclicInference.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/diags/examples/CyclicInference.java Thu Jan 31 10:22:25 2013 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-// key: compiler.err.cant.apply.symbol
+// key: compiler.err.prob.found.req
// key: compiler.misc.cyclic.inference
class CyclicInference {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/IllegalStaticIntfMethCall.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.illegal.static.intf.meth.call
+// options: -XDallowStaticInterfaceMethods
+
+class IllegalStaticIntfMethCall {
+ interface A {
+ static void m() { }
+ }
+ void test(A a) {
+ a.m();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/IncorrectReceiverType.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.incorrect.receiver.type
+
+class IncorrectReceiverType {
+ void m(Object this) {}
+}
--- a/langtools/test/tools/javac/diags/examples/InferredDoNotConformToLower.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.prob.found.req
-// key: compiler.misc.inferred.do.not.conform.to.lower.bounds
-
-import java.util.*;
-
-class InferredDoNotConformToLower {
- <X extends Number> List<X> m() { return null; }
- { List<? super String> lss = this.m(); }
-}
--- a/langtools/test/tools/javac/diags/examples/InvalidDuplicateAnnotation.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/diags/examples/InvalidDuplicateAnnotation.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,17 +22,16 @@
*/
// key: compiler.err.duplicate.annotation.invalid.repeated
-// key: compiler.err.invalid.containedby.annotation.elem.nondefault
-//
+// key: compiler.err.invalid.repeatable.annotation.elem.nondefault
+
// We need an almost valid containing annotation. The easiest way to get
// one close enough to valid is by forgetting a default.
import java.lang.annotation.*;
-@ContainedBy(Annos.class)
+@Repeatable(Annos.class)
@interface Anno { }
-@ContainerFor(Anno.class)
@interface Annos { Anno[] value(); String foo(); }
@Anno
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/NoAnnotationsOnDotClass.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.no.annotations.on.dot.class
+
+class NoAnnotationsOnDotClass {
+ @Target(ElementType.TYPE_USE)
+ @interface A {}
+
+ Object o = @A Object.class;
+}
--- a/langtools/test/tools/javac/diags/examples/NoUniqueMaximalInstance.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.prob.found.req
-// key: compiler.misc.no.unique.maximal.instance.exists
-
-class NoUniqueMaximalInstance {
- <Z extends Integer> Z m() { return null; }
-
- { String s = m(); }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/RepeatableDocumentedMismatch.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.invalid.repeatable.annotation.not.documented
+
+import java.lang.annotation.*;
+
+@Documented
+@Repeatable(Annos.class)
+@interface Anno { }
+
+@interface Annos { Anno[] value(); }
+
+@Anno
+@Anno
+class RepeatableDocumentedMismatch { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/RepeatableInheritedMismatch.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.invalid.repeatable.annotation.not.inherited
+
+import java.lang.annotation.*;
+
+@Inherited
+@Repeatable(Annos.class)
+@interface Anno { }
+
+@interface Annos { Anno[] value(); }
+
+@Anno
+@Anno
+class RepeatableInheritedMismatch { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/RepeatableNoValue.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.invalid.repeatable.annotation.no.value
+
+import java.lang.annotation.*;
+
+@Repeatable(Annos.class)
+@interface Anno { }
+
+@interface Annos {}
+
+@Anno
+@Anno
+class RepeatableNoValue { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/RepeatableNonDefault.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.invalid.repeatable.annotation.elem.nondefault
+
+import java.lang.annotation.*;
+
+@Repeatable(Annos.class)
+@interface Anno { }
+
+@interface Annos { Anno[] value(); String foo(); }
+
+class RepeatableNonDefault { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/RepeatableRetentionMismatch.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.invalid.repeatable.annotation.retention
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Annos.class)
+@interface Anno { }
+
+@interface Annos { Anno[] value(); }
+
+@Anno
+@Anno
+class RepeatableRetentionMismatch { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/RepeatableTargetMismatch.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.invalid.repeatable.annotation.incompatible.target
+
+import java.lang.annotation.*;
+
+@Repeatable(Annos.class)
+@Target(ElementType.METHOD)
+@interface Anno { }
+
+@interface Annos { Anno[] value(); }
+
+class RepeatableTargetMismatch { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/RepeatableWrongValueType.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.invalid.repeatable.annotation.value.return
+
+import java.lang.annotation.*;
+
+@Repeatable(Annos.class)
+@interface Anno { }
+
+@interface Annos { String value(); }
+
+@Anno
+@Anno
+class RepeatableWrongValueType { }
--- a/langtools/test/tools/javac/diags/examples/RepeatingAnnotationAndContainer.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/diags/examples/RepeatingAnnotationAndContainer.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,14 +21,13 @@
* questions.
*/
-// key: compiler.err.invalid.containedby.annotation.repeated.and.container.present
+// key: compiler.err.invalid.repeatable.annotation.repeated.and.container.present
import java.lang.annotation.*;
-@ContainedBy(Annos.class)
+@Repeatable(Annos.class)
@interface Anno { }
-@ContainerFor(Anno.class)
@interface Annos { Anno[] value(); }
@Anno
--- a/langtools/test/tools/javac/diags/examples/SecondaryBoundMustBeMarkerIntf.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/diags/examples/SecondaryBoundMustBeMarkerIntf.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,7 +23,6 @@
// key: compiler.err.prob.found.req
// key: compiler.misc.secondary.bound.must.be.marker.intf
-// options: -XDallowIntersectionTypes
class SecondaryBoundMustBeMarkerInterface {
Runnable r = (Runnable & Comparable<?>)()->{};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/StaticIntfMethodNotSupported.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.static.intf.methods.not.supported.in.source
+// options: -source 7 -Xlint:-options -XDallowStaticInterfaceMethods
+
+interface StaticIntfMethodNotSupported {
+ static void m() { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/ThisAsIdentifier.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.this.as.identifier
+
+class ThisAsIdentifier {
+ Object this;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/TypeAnnotationsNotSupported.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.type.annotations.not.supported.in.source
+// key: compiler.warn.source.no.bootclasspath
+// options: -source 6
+
+@interface Anno { }
+
+class TypeAnnotationsNotSupported {
+ void m() {
+ int i = (@Anno int) 3.14;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/UnderscoreAsIdentifier.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.warn.underscore.as.identifier
+
+class UnderscoreAsIdentifier {
+ String _ = null;
+}
--- a/langtools/test/tools/javac/diags/examples/WhereIntersection.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/diags/examples/WhereIntersection.java Thu Jan 31 10:22:25 2013 -0800
@@ -25,7 +25,7 @@
// key: compiler.misc.where.description.intersection
// key: compiler.misc.intersection.type
// key: compiler.err.prob.found.req
-// key: compiler.misc.inconvertible.types
+// key: compiler.misc.inferred.do.not.conform.to.upper.bounds
// options: -XDdiags=where
// run: simple
--- a/langtools/test/tools/javac/diags/examples/WrongContainedBy.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.container.no.containerfor
-// key: compiler.err.invalid.container.wrong.containedby
-
-import java.lang.annotation.*;
-
-@ContainerFor(WrongContainedBy.class)
-@interface Foos {
- WrongContainedBy[] value();
-}
-
-@ContainedBy(Target.class)
-public @interface WrongContainedBy {}
--- a/langtools/test/tools/javac/diags/examples/WrongContainerFor.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// key: compiler.err.invalid.container.wrong.containerfor
-// key: compiler.err.invalid.container.no.containedby
-
-import java.lang.annotation.*;
-
-@ContainerFor(Retention.class)
-@interface Foos {
- WrongContainerFor[] value();
-}
-
-@ContainedBy(Foos.class)
-public @interface WrongContainerFor {}
--- a/langtools/test/tools/javac/failover/CheckAttributedTree.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/failover/CheckAttributedTree.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,13 +23,17 @@
/*
* @test
- * @bug 6970584
+ * @bug 6970584 8006694
* @summary assorted position errors in compiler syntax trees
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../lib
* @build JavacTestingAbstractThreadedTest
- * @run main CheckAttributedTree -q -r -et ERRONEOUS .
+ * @run main/othervm CheckAttributedTree -q -r -et ERRONEOUS .
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
@@ -358,11 +362,18 @@
}
Info self = new Info(tree, endPosTable);
- check(!mandatoryType(tree) ||
- (tree.type != null &&
- checkFields(tree)),
- "'null' found in tree ",
- self);
+ if (mandatoryType(tree)) {
+ check(tree.type != null,
+ "'null' field 'type' found in tree ", self);
+ if (tree.type==null)
+ new Throwable().printStackTrace();
+ }
+
+ Field errField = checkFields(tree);
+ if (errField!=null) {
+ check(false,
+ "'null' field '" + errField.getName() + "' found in tree ", self);
+ }
Info prevEncl = encl;
encl = self;
@@ -391,7 +402,7 @@
}
}
- boolean checkFields(JCTree t) {
+ Field checkFields(JCTree t) {
List<Field> fieldsToCheck = treeUtil.getFieldsOfType(t,
excludedFields,
Symbol.class,
@@ -399,7 +410,7 @@
for (Field f : fieldsToCheck) {
try {
if (f.get(t) == null) {
- return false;
+ return f;
}
}
catch (IllegalAccessException e) {
@@ -407,7 +418,7 @@
//swallow it
}
}
- return true;
+ return null;
}
@Override
@@ -505,7 +516,7 @@
}
public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
- out.println(diagnostic);
+ //out.println(diagnostic);
switch (diagnostic.getKind()) {
case ERROR:
errors++;
--- a/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,13 +23,17 @@
/*
* @test
- * @bug 7046778
+ * @bug 7046778 8006694
* @summary Project Coin: problem with diamond and member inner classes
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main DiamondAndInnerClassTest
+ * @run main/othervm DiamondAndInnerClassTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import com.sun.source.util.JavacTask;
import java.net.URI;
import java.util.Arrays;
--- a/langtools/test/tools/javac/generics/diamond/T6939780.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/diamond/T6939780.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,4 @@
+T6939780.java:18:33: compiler.warn.diamond.redundant.args: Foo<java.lang.Number>, Foo<java.lang.Number>
T6939780.java:19:28: compiler.warn.diamond.redundant.args: Foo<java.lang.Number>, Foo<java.lang.Number>
T6939780.java:20:28: compiler.warn.diamond.redundant.args.1: Foo<java.lang.Integer>, Foo<java.lang.Number>
-2 warnings
+3 warnings
--- a/langtools/test/tools/javac/generics/diamond/neg/Neg05.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg05.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,25 +1,25 @@
Neg05.java:19:48: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:19:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>)
Neg05.java:20:58: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:20:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>)
Neg05.java:21:43: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:21:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>)
Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:22:43: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>)
Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:24:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>)
Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:25:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>)
Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:26:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>)
Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:27:43: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>)
Neg05.java:31:37: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:31:44: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V, Neg05.Foo<V>, Neg05<?>.Foo<java.lang.String>))
Neg05.java:32:47: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:32:54: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V, Neg05.Foo<V>, Neg05<?>.Foo<? extends java.lang.String>))
Neg05.java:33:32: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:33:39: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V, Neg05.Foo<V>, Neg05<?>.Foo<?>))
Neg05.java:34:45: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:34:52: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V, Neg05.Foo<V>, Neg05<?>.Foo<? super java.lang.String>))
Neg05.java:36:37: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:36:44: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V,Z, Neg05.Foo<V>, Neg05<?>.Foo<java.lang.String>))
Neg05.java:37:47: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:37:54: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V,Z, Neg05.Foo<V>, Neg05<?>.Foo<? extends java.lang.String>))
Neg05.java:38:32: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:38:39: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V,Z, Neg05.Foo<V>, Neg05<?>.Foo<?>))
Neg05.java:39:45: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:39:52: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V,Z, Neg05.Foo<V>, Neg05<?>.Foo<? super java.lang.String>))
24 errors
--- a/langtools/test/tools/javac/generics/diamond/neg/Neg10.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg10.java Thu Jan 31 10:22:25 2013 -0800
@@ -4,7 +4,8 @@
*
* @summary Check that 'complex' diamond can infer type that is too specific
* @author mcimadamore
- * @compile/fail/ref=Neg10.out Neg10.java -XDrawDiagnostics
+ * @compile/fail/ref=Neg10.out -source 7 -Xlint:-options Neg10.java -XDrawDiagnostics
+ * @compile Neg10.java -XDrawDiagnostics
*
*/
--- a/langtools/test/tools/javac/generics/diamond/neg/Neg10.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg10.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-Neg10.java:16:22: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg10.Foo<java.lang.Integer>, Neg10.Foo<java.lang.Number>)
+Neg10.java:17:22: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg10.Foo<java.lang.Integer>, Neg10.Foo<java.lang.Number>)
1 error
--- a/langtools/test/tools/javac/generics/inference/6315770/T6315770.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/inference/6315770/T6315770.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-T6315770.java:16:42: compiler.err.prob.found.req: (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
-T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer&java.lang.Runnable, java.lang.String)
+T6315770.java:16:42: compiler.err.prob.found.req: (compiler.misc.incompatible.upper.bounds: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
+T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.String, java.lang.Integer,java.lang.Runnable)
2 errors
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-T6638712b.java:14:21: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, java.lang.String,java.lang.Object)
+T6638712b.java:14:21: compiler.err.prob.found.req: (compiler.misc.incompatible.eq.upper.bounds: T, java.lang.Integer, java.lang.String,java.lang.Object)
1 error
--- a/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-T6650759m.java:43:36: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer, java.lang.String)
+T6650759m.java:43:36: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.String, java.lang.Integer,java.lang.Object)
1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/inference/8006692/T8006692.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8006692
+ * @summary jdk/test/java/util/Collections/BigBinarySearch.java fails to compile
+ * @compile T8006692.java
+ */
+
+import java.util.*;
+
+class Test {
+ static void test(List<Integer> l, int i) {
+ equal(i, Collections.binarySearch(l, l.get(i)));
+ }
+ static void equal(Object x, Object y) {}
+}
--- a/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,14 +23,18 @@
/*
* @test
- * @bug 7062745
+ * @bug 7062745 8006694
* @summary Regression: difference in overload resolution when two methods
- * are maximally specific
+ * are maximally specific
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main GenericOverrideTest
+ * @run main/othervm GenericOverrideTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import javax.tools.Diagnostic;
--- a/langtools/test/tools/javac/lambda/BadConv03.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/BadConv03.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-BadConv03.java:19:11: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, BadConv03.B))
+BadConv03.java:19:11: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: BadConv03.B, (compiler.misc.incompatible.abstracts: kindname.interface, BadConv03.B))
1 error
--- a/langtools/test/tools/javac/lambda/BadLambdaPos.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/BadLambdaPos.out Thu Jan 31 10:22:25 2013 -0800
@@ -4,6 +4,6 @@
BadLambdaPos.java:23:18: compiler.err.unexpected.lambda
BadLambdaPos.java:23:34: compiler.err.unexpected.lambda
BadLambdaPos.java:24:21: compiler.err.unexpected.lambda
-BadLambdaPos.java:28:22: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-BadLambdaPos.java:29:28: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
+BadLambdaPos.java:28:22: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
+BadLambdaPos.java:29:28: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
8 errors
--- a/langtools/test/tools/javac/lambda/BadTargetType.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/BadTargetType.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
-BadTargetType.java:16:24: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-BadTargetType.java:17:17: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-BadTargetType.java:20:9: compiler.err.cant.apply.symbol: kindname.method, m1, java.lang.Object, @460, kindname.class, BadTargetType, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf))
-BadTargetType.java:21:9: compiler.err.cant.apply.symbol: kindname.method, m2, java.lang.Object, @489, kindname.class, BadTargetType, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf))
+BadTargetType.java:16:24: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
+BadTargetType.java:17:17: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
+BadTargetType.java:20:9: compiler.err.cant.apply.symbol: kindname.method, m1, java.lang.Object, @460, kindname.class, BadTargetType, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf: java.lang.Object))
+BadTargetType.java:21:9: compiler.err.cant.apply.symbol: kindname.method, m2, java.lang.Object, @489, kindname.class, BadTargetType, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf: java.lang.Object))
4 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/FunctionalInterfaceAnno.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,33 @@
+/*
+ * @test /nodynamiccopyright/
+ * @summary smoke test for functional interface annotation
+ * @compile/fail/ref=FunctionalInterfaceAnno.out -XDrawDiagnostics FunctionalInterfaceAnno.java
+ */
+class FunctionalInterfaceAnno {
+ @FunctionalInterface
+ static class A { } //not an interface
+
+ @FunctionalInterface
+ static abstract class B { } //not an interface
+
+ @FunctionalInterface
+ enum C { } //not an interface
+
+ @FunctionalInterface
+ @interface D { } //not an interface
+
+ @FunctionalInterface
+ interface E { } //no abstracts
+
+ @FunctionalInterface
+ interface F { default void m() { } } //no abstracts
+
+ @FunctionalInterface
+ interface G { String toString(); } //no abstracts
+
+ @FunctionalInterface
+ interface H { void m(); void n(); } //incompatible abstracts
+
+ @FunctionalInterface
+ interface I { void m(); } //ok
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/FunctionalInterfaceAnno.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,9 @@
+FunctionalInterfaceAnno.java:7:5: compiler.err.bad.functional.intf.anno.1: (compiler.misc.not.a.functional.intf: FunctionalInterfaceAnno.A)
+FunctionalInterfaceAnno.java:10:5: compiler.err.bad.functional.intf.anno.1: (compiler.misc.not.a.functional.intf: FunctionalInterfaceAnno.B)
+FunctionalInterfaceAnno.java:13:5: compiler.err.bad.functional.intf.anno.1: (compiler.misc.not.a.functional.intf: FunctionalInterfaceAnno.C)
+FunctionalInterfaceAnno.java:16:5: compiler.err.bad.functional.intf.anno.1: (compiler.misc.not.a.functional.intf: FunctionalInterfaceAnno.D)
+FunctionalInterfaceAnno.java:19:5: compiler.err.bad.functional.intf.anno.1: (compiler.misc.not.a.functional.intf.1: FunctionalInterfaceAnno.E, (compiler.misc.no.abstracts: kindname.interface, FunctionalInterfaceAnno.E))
+FunctionalInterfaceAnno.java:22:5: compiler.err.bad.functional.intf.anno.1: (compiler.misc.not.a.functional.intf.1: FunctionalInterfaceAnno.F, (compiler.misc.no.abstracts: kindname.interface, FunctionalInterfaceAnno.F))
+FunctionalInterfaceAnno.java:25:5: compiler.err.bad.functional.intf.anno.1: (compiler.misc.not.a.functional.intf.1: FunctionalInterfaceAnno.G, (compiler.misc.no.abstracts: kindname.interface, FunctionalInterfaceAnno.G))
+FunctionalInterfaceAnno.java:28:5: compiler.err.bad.functional.intf.anno.1: (compiler.misc.not.a.functional.intf.1: FunctionalInterfaceAnno.H, (compiler.misc.incompatible.abstracts: kindname.interface, FunctionalInterfaceAnno.H))
+8 errors
--- a/langtools/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,15 +23,19 @@
/**
* @test
- * @bug 8003280 8004102
+ * @bug 8003280 8004102 8006694
* @summary Add lambda tests
* perform several automated checks in lambda conversion, esp. around accessibility
+ * temporarily workaround combo tests are causing time out in several platforms
* @author Maurizio Cimadamore
* @library ../lib
* @build JavacTestingAbstractThreadedTest
- * @run main FunctionalInterfaceConversionTest
+ * @run main/othervm FunctionalInterfaceConversionTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.io.IOException;
import java.net.URI;
import java.util.Arrays;
--- a/langtools/test/tools/javac/lambda/Intersection01.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/Intersection01.java Thu Jan 31 10:22:25 2013 -0800
@@ -25,7 +25,7 @@
* @test
* @bug 8002099
* @summary Add support for intersection types in cast expression
- * @compile/fail/ref=Intersection01.out -XDallowIntersectionTypes -XDrawDiagnostics Intersection01.java
+ * @compile/fail/ref=Intersection01.out -XDrawDiagnostics Intersection01.java
*/
class Intersection01 {
--- a/langtools/test/tools/javac/lambda/Intersection01.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/Intersection01.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-Intersection01.java:36:45: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.no.abstracts: kindname.interface, java.io.Serializable))
-Intersection01.java:38:45: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.no.abstracts: kindname.interface, java.io.Serializable))
+Intersection01.java:36:45: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: java.io.Serializable, (compiler.misc.no.abstracts: kindname.interface, java.io.Serializable))
+Intersection01.java:38:45: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: java.io.Serializable, (compiler.misc.no.abstracts: kindname.interface, java.io.Serializable))
2 errors
--- a/langtools/test/tools/javac/lambda/LambdaConv09.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/LambdaConv09.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
-LambdaConv09.java:42:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.no.abstracts: kindname.interface, LambdaConv09.Foo1))
-LambdaConv09.java:43:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.no.abstracts: kindname.interface, LambdaConv09.Foo2))
-LambdaConv09.java:44:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.no.abstracts: kindname.interface, LambdaConv09.Foo3))
-LambdaConv09.java:46:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.no.abstracts: kindname.interface, LambdaConv09.Foo5))
+LambdaConv09.java:42:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: LambdaConv09.Foo1, (compiler.misc.no.abstracts: kindname.interface, LambdaConv09.Foo1))
+LambdaConv09.java:43:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: LambdaConv09.Foo2, (compiler.misc.no.abstracts: kindname.interface, LambdaConv09.Foo2))
+LambdaConv09.java:44:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: LambdaConv09.Foo3, (compiler.misc.no.abstracts: kindname.interface, LambdaConv09.Foo3))
+LambdaConv09.java:46:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: LambdaConv09.Foo5, (compiler.misc.no.abstracts: kindname.interface, LambdaConv09.Foo5))
4 errors
--- a/langtools/test/tools/javac/lambda/LambdaExpr10.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/LambdaExpr10.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,9 +1,9 @@
-LambdaExpr10.java:18:28: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-LambdaExpr10.java:19:32: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-LambdaExpr10.java:23:40: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-LambdaExpr10.java:24:46: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-LambdaExpr10.java:28:29: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-LambdaExpr10.java:29:33: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
+LambdaExpr10.java:18:28: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
+LambdaExpr10.java:19:32: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
+LambdaExpr10.java:23:40: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
+LambdaExpr10.java:24:46: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
+LambdaExpr10.java:28:29: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
+LambdaExpr10.java:29:33: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
LambdaExpr10.java:33:35: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.inconvertible.types: java.lang.Object, void))
LambdaExpr10.java:34:49: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.inconvertible.types: java.lang.Object, void))
8 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/LambdaExpr21.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8006684
+ * @summary Compiler produces java.lang.VerifyError: Bad type on operand stack
+ * @run main LambdaExpr21
+ */
+public class LambdaExpr21 {
+
+ static int assertionCount = 0;
+
+ static void assertTrue(boolean cond) {
+ assertionCount++;
+ if (!cond)
+ throw new AssertionError();
+ }
+
+ interface SAM {
+ void foo();
+ }
+
+ static class Checker {
+ Checker(boolean cond) {
+ assertTrue(cond);
+ }
+ }
+
+ static {
+ SAM s = ()-> { new Checker(true) { }; };
+ s.foo();
+ }
+
+ static void test(){
+ SAM s = ()-> { new Checker(true) { }; };
+ s.foo();
+ }
+
+ static SAM s = ()-> { new Checker(true) { }; };
+
+ public static void main(String[] args) {
+ test();
+ s.foo();
+ assertTrue(assertionCount == 3);
+ }
+}
--- a/langtools/test/tools/javac/lambda/LambdaParserTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/LambdaParserTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,15 +23,18 @@
/*
* @test
- * @bug 7115050
- * @bug 8003280
+ * @bug 7115050 8003280 8005852 8006694
* @summary Add lambda tests
* Add parser support for lambda expressions
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../lib
* @build JavacTestingAbstractThreadedTest
- * @run main LambdaParserTest
+ * @run main/othervm LambdaParserTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import javax.tools.Diagnostic;
@@ -46,12 +49,12 @@
enum LambdaKind {
NILARY_EXPR("()->x"),
NILARY_STMT("()->{ return x; }"),
- ONEARY_SHORT_EXPR("x->x"),
- ONEARY_SHORT_STMT("x->{ return x; }"),
- ONEARY_EXPR("(#M1 #T1 x)->x"),
- ONEARY_STMT("(#M1 #T1 x)->{ return x; }"),
- TWOARY_EXPR("(#M1 #T1 x, #M2 #T2 y)->x"),
- TWOARY_STMT("(#M1 #T1 x, #M2 #T2 y)->{ return x; }");
+ ONEARY_SHORT_EXPR("#PN->x"),
+ ONEARY_SHORT_STMT("#PN->{ return x; }"),
+ ONEARY_EXPR("(#M1 #T1 #PN)->x"),
+ ONEARY_STMT("(#M1 #T1 #PN)->{ return x; }"),
+ TWOARY_EXPR("(#M1 #T1 #PN, #M2 #T2 y)->x"),
+ TWOARY_STMT("(#M1 #T1 #PN, #M2 #T2 y)->{ return x; }");
String lambdaTemplate;
@@ -60,11 +63,12 @@
}
String getLambdaString(LambdaParameterKind pk1, LambdaParameterKind pk2,
- ModifierKind mk1, ModifierKind mk2) {
+ ModifierKind mk1, ModifierKind mk2, LambdaParameterName pn) {
return lambdaTemplate.replaceAll("#M1", mk1.modifier)
.replaceAll("#M2", mk2.modifier)
.replaceAll("#T1", pk1.parameterType)
- .replaceAll("#T2", pk2.parameterType);
+ .replaceAll("#T2", pk2.parameterType)
+ .replaceAll("#PN", pn.nameStr);
}
int arity() {
@@ -87,6 +91,17 @@
}
}
+ enum LambdaParameterName {
+ IDENT("x"),
+ UNDERSCORE("_");
+
+ String nameStr;
+
+ LambdaParameterName(String nameStr) {
+ this.nameStr = nameStr;
+ }
+ }
+
enum LambdaParameterKind {
IMPLICIT(""),
EXPLIICT_SIMPLE("A"),
@@ -151,8 +166,8 @@
}
String expressionString(LambdaParameterKind pk1, LambdaParameterKind pk2,
- ModifierKind mk1, ModifierKind mk2, LambdaKind lk, SubExprKind sk) {
- return expressionTemplate.replaceAll("#L", lk.getLambdaString(pk1, pk2, mk1, mk2))
+ ModifierKind mk1, ModifierKind mk2, LambdaKind lk, LambdaParameterName pn, SubExprKind sk) {
+ return expressionTemplate.replaceAll("#L", lk.getLambdaString(pk1, pk2, mk1, mk2, pn))
.replaceAll("#S", sk.subExpression);
}
}
@@ -174,25 +189,27 @@
public static void main(String... args) throws Exception {
for (LambdaKind lk : LambdaKind.values()) {
- for (LambdaParameterKind pk1 : LambdaParameterKind.values()) {
- if (lk.arity() < 1 && pk1 != LambdaParameterKind.IMPLICIT)
- continue;
- for (LambdaParameterKind pk2 : LambdaParameterKind.values()) {
- if (lk.arity() < 2 && pk2 != LambdaParameterKind.IMPLICIT)
+ for (LambdaParameterName pn : LambdaParameterName.values()) {
+ for (LambdaParameterKind pk1 : LambdaParameterKind.values()) {
+ if (lk.arity() < 1 && pk1 != LambdaParameterKind.IMPLICIT)
continue;
- for (ModifierKind mk1 : ModifierKind.values()) {
- if (mk1 != ModifierKind.NONE && lk.isShort())
+ for (LambdaParameterKind pk2 : LambdaParameterKind.values()) {
+ if (lk.arity() < 2 && pk2 != LambdaParameterKind.IMPLICIT)
continue;
- if (lk.arity() < 1 && mk1 != ModifierKind.NONE)
- continue;
- for (ModifierKind mk2 : ModifierKind.values()) {
- if (lk.arity() < 2 && mk2 != ModifierKind.NONE)
+ for (ModifierKind mk1 : ModifierKind.values()) {
+ if (mk1 != ModifierKind.NONE && lk.isShort())
+ continue;
+ if (lk.arity() < 1 && mk1 != ModifierKind.NONE)
continue;
- for (SubExprKind sk : SubExprKind.values()) {
- for (ExprKind ek : ExprKind.values()) {
- pool.execute(
- new LambdaParserTest(pk1, pk2, mk1,
- mk2, lk, sk, ek));
+ for (ModifierKind mk2 : ModifierKind.values()) {
+ if (lk.arity() < 2 && mk2 != ModifierKind.NONE)
+ continue;
+ for (SubExprKind sk : SubExprKind.values()) {
+ for (ExprKind ek : ExprKind.values()) {
+ pool.execute(
+ new LambdaParserTest(pk1, pk2, mk1,
+ mk2, lk, sk, ek, pn));
+ }
}
}
}
@@ -209,6 +226,7 @@
ModifierKind mk1;
ModifierKind mk2;
LambdaKind lk;
+ LambdaParameterName pn;
SubExprKind sk;
ExprKind ek;
JavaSource source;
@@ -216,12 +234,13 @@
LambdaParserTest(LambdaParameterKind pk1, LambdaParameterKind pk2,
ModifierKind mk1, ModifierKind mk2, LambdaKind lk,
- SubExprKind sk, ExprKind ek) {
+ SubExprKind sk, ExprKind ek, LambdaParameterName pn) {
this.pk1 = pk1;
this.pk2 = pk2;
this.mk1 = mk1;
this.mk2 = mk2;
this.lk = lk;
+ this.pn = pn;
this.sk = sk;
this.ek = ek;
this.source = new JavaSource();
@@ -239,7 +258,7 @@
public JavaSource() {
super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
source = template.replaceAll("#E",
- ek.expressionString(pk1, pk2, mk1, mk2, lk, sk));
+ ek.expressionString(pk1, pk2, mk1, mk2, lk, pn, sk));
}
@Override
@@ -272,6 +291,9 @@
errorExpected = true;
}
+ errorExpected |= pn == LambdaParameterName.UNDERSCORE &&
+ lk.arity() > 0;
+
if (errorExpected != diagChecker.errorFound) {
throw new Error("invalid diagnostics for source:\n" +
source.getCharContent(true) +
--- a/langtools/test/tools/javac/lambda/MethodReference04.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/MethodReference04.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-MethodReference04.java:13:16: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
+MethodReference04.java:13:16: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
1 error
--- a/langtools/test/tools/javac/lambda/MethodReference25.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/MethodReference25.java Thu Jan 31 10:22:25 2013 -0800
@@ -25,21 +25,13 @@
* @test
* @bug 8003280
* @summary Add lambda tests
- * check that non-boxing method references conversion has the precedence
- * @run main MethodReference25
+ * check that non-boxing method references is not preferred over boxing one
+ * @compile/fail/ref=MethodReference25.out -XDrawDiagnostics MethodReference25.java
*/
-public class MethodReference25 {
+class MethodReference25 {
- static void assertTrue(boolean cond) {
- assertionCount++;
- if (!cond)
- throw new AssertionError();
- }
-
- static int assertionCount = 0;
-
- static void m(Integer i) { assertTrue(true); }
+ static void m(Integer i) { }
interface SAM1 {
void m(int x);
@@ -49,11 +41,10 @@
void m(Integer x);
}
- static void call(int i, SAM1 s) { s.m(i); assertTrue(false); }
+ static void call(int i, SAM1 s) { s.m(i); }
static void call(int i, SAM2 s) { s.m(i); }
public static void main(String[] args) {
- call(1, MethodReference25::m); //resolves to call(int, SAM2)
- assertTrue(assertionCount == 1);
+ call(1, MethodReference25::m); //ambiguous
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/MethodReference25.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+MethodReference25.java:48:9: compiler.err.ref.ambiguous: call, kindname.method, call(int,MethodReference25.SAM1), MethodReference25, kindname.method, call(int,MethodReference25.SAM2), MethodReference25
+1 error
--- a/langtools/test/tools/javac/lambda/MethodReference26.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/MethodReference26.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,9 +1,30 @@
/*
- * @test /nodynamiccopyright/
- * @bug 8003280
- * @summary Add lambda tests
- * check strict method conversion does not allow loose method reference conversion
- * @compile/fail/ref=MethodReference26.out -XDrawDiagnostics MethodReference26.java
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary check strict method conversion allows loose method reference conversion
+ * @compile MethodReference26.java
*/
class MethodReference26 {
@@ -18,6 +39,6 @@
static void call(Integer i, SAM s) { }
static void test() {
- call(1, MethodReference26::m); //ambiguous
+ call(1, MethodReference26::m); //ok
}
}
--- a/langtools/test/tools/javac/lambda/MethodReference26.out Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-MethodReference26.java:21:9: compiler.err.ref.ambiguous: call, kindname.method, call(int,MethodReference26.SAM), MethodReference26, kindname.method, call(java.lang.Integer,MethodReference26.SAM), MethodReference26
-1 error
--- a/langtools/test/tools/javac/lambda/MethodReference43.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/MethodReference43.java Thu Jan 31 10:22:25 2013 -0800
@@ -60,9 +60,9 @@
static void m(SAM1 s) { assertTrue(false); }
- static void m(SAM2 s) { assertTrue(true); }
+ static void m(SAM2 s) { assertTrue(false); }
static void m(SAM3 s) { assertTrue(false); }
- static void m(SAM4 s) { assertTrue(false); }
+ static void m(SAM4 s) { assertTrue(true); }
public static void main(String[] args) {
m(Foo::new);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/MethodReference59.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8004102
+ * @summary Add support for array constructor references
+ */
+public class MethodReference59 {
+
+ static int assertionCount = 0;
+
+ static void assertTrue(boolean cond) {
+ assertionCount++;
+ if (!cond)
+ throw new AssertionError();
+ }
+
+ interface ArrayFactory<X> {
+ X make(int size);
+ }
+
+ public static void main(String[] args) {
+ ArrayFactory<int[]> factory1 = int[]::new;
+ int[] i1 = factory1.make(5);
+ assertTrue(i1.length == 5);
+ ArrayFactory<int[][]> factory2 = int[][]::new;
+ int[][] i2 = factory2.make(5);
+ assertTrue(i2.length == 5);
+ assertTrue(assertionCount == 2);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/MethodReference60.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8004102
+ * @summary Add support for array constructor references
+ * @compile/fail/ref=MethodReference60.out -XDrawDiagnostics MethodReference60.java
+ */
+public class MethodReference60 {
+
+ interface ArrayFactory<X> {
+ X make(int size);
+ }
+
+ interface BadArrayFactory1<X> {
+ X make();
+ }
+
+ interface BadArrayFactory2<X> {
+ X make(int i1, int i2);
+ }
+
+ interface BadArrayFactory3<X> {
+ X make(String s);
+ }
+
+ public static void main(String[] args) {
+ BadArrayFactory1<int[]> factory1 = int[]::new; //param mismatch
+ BadArrayFactory2<int[]> factory2 = int[]::new; //param mismatch
+ BadArrayFactory3<int[]> factory3 = int[]::new; //param mismatch
+ ArrayFactory<Integer> factory4 = int[]::new; //return type mismatch
+ ArrayFactory<Integer[]> factory5 = int[]::new; //return type mismatch
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/MethodReference60.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,6 @@
+MethodReference60.java:49:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, compiler.misc.no.args, kindname.class, Array, (compiler.misc.arg.length.mismatch)))
+MethodReference60.java:50:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, int,int, kindname.class, Array, (compiler.misc.arg.length.mismatch)))
+MethodReference60.java:51:44: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.constructor, (compiler.misc.cant.apply.symbol: kindname.constructor, Array, int, java.lang.String, kindname.class, Array, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, int))))
+MethodReference60.java:52:42: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.mref: (compiler.misc.inconvertible.types: int[], java.lang.Integer))
+MethodReference60.java:53:44: compiler.err.prob.found.req: (compiler.misc.incompatible.ret.type.in.mref: (compiler.misc.inconvertible.types: int[], java.lang.Integer[]))
+5 errors
--- a/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -24,14 +24,18 @@
/*
* @test
* @bug 7115052
- * @bug 8003280
+ * @bug 8003280 8006694
* @summary Add lambda tests
* Add parser support for method references
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../lib
* @build JavacTestingAbstractThreadedTest
- * @run main MethodReferenceParserTest
+ * @run main/othervm MethodReferenceParserTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import javax.tools.Diagnostic;
--- a/langtools/test/tools/javac/lambda/TargetType01.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType01.java Thu Jan 31 10:22:25 2013 -0800
@@ -27,7 +27,7 @@
* @summary Add lambda tests
* check nested case of overload resolution and lambda parameter inference
* @author Maurizio Cimadamore
- * @compile TargetType01.java
+ * @compile/fail/ref=TargetType01.out -XDrawDiagnostics TargetType01.java
*/
class TargetType01 {
@@ -43,7 +43,6 @@
static String M(F_S_S f){ return null; }
static {
- //ambiguity here - the compiler does not try all the combinations!
- M(x1 -> { return M( x2 -> { return x1 + x2; });});
+ M(x1 -> { return M( x2 -> { return x1 + x2; });}); //ambiguous
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/TargetType01.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,3 @@
+TargetType01.java:46:9: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01
+TargetType01.java:46:26: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01
+2 errors
--- a/langtools/test/tools/javac/lambda/TargetType06.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType06.java Thu Jan 31 10:22:25 2013 -0800
@@ -4,7 +4,7 @@
* @summary Add lambda tests
* check complex case of target typing
* @author Maurizio Cimadamore
- * @compile/fail/ref=TargetType06.out -XDrawDiagnostics TargetType06.java
+ * @compile TargetType06.java
*/
import java.util.List;
--- a/langtools/test/tools/javac/lambda/TargetType06.out Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-TargetType06.java:25:23: compiler.err.cant.apply.symbol: kindname.method, map, TargetType06.Function<B,B>, @510, kindname.class, TargetType06, (compiler.misc.cyclic.inference: B)
-1 error
--- a/langtools/test/tools/javac/lambda/TargetType10.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType10.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-TargetType10.java:17:11: compiler.err.cant.apply.symbol: kindname.method, compose, TargetType10.Function<B,C>,TargetType10.Function<A,? extends B>, @500,@515, kindname.class, TargetType10.Test, (compiler.misc.cyclic.inference: B,A)
+TargetType10.java:17:18: compiler.err.prob.found.req: (compiler.misc.cyclic.inference: B,A)
1 error
--- a/langtools/test/tools/javac/lambda/TargetType11.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType11.java Thu Jan 31 10:22:25 2013 -0800
@@ -4,7 +4,7 @@
* @summary Add lambda tests
* check that wildcards in the target method of a lambda conversion is handled correctly
* @author Maurizio Cimadamore
- * @compile/fail/ref=TargetType11.out -Xlint:unchecked -XDrawDiagnostics TargetType11.java
+ * @compile TargetType11.java
*/
class TargetType11 {
--- a/langtools/test/tools/javac/lambda/TargetType11.out Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-TargetType11.java:16:61: compiler.warn.unchecked.varargs.non.reifiable.type: TargetType11.Predicate<? super T>
-TargetType11.java:20:32: compiler.err.cant.apply.symbol: kindname.method, and, TargetType11.Predicate<? super T>[], @706,@718, kindname.class, TargetType11.Test, (compiler.misc.cyclic.inference: T)
-1 error
-1 warning
--- a/langtools/test/tools/javac/lambda/TargetType14.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType14.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-TargetType14.java:20:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: TargetType14.SAM<java.lang.String>, TargetType14.SAM<java.lang.Integer>)
+TargetType14.java:20:29: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer, java.lang.String)
1 error
--- a/langtools/test/tools/javac/lambda/TargetType17.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType17.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,9 +1,9 @@
-TargetType17.java:14:21: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-TargetType17.java:15:23: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-TargetType17.java:16:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-TargetType17.java:17:21: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-TargetType17.java:18:23: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-TargetType17.java:19:25: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-TargetType17.java:20:21: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
-TargetType17.java:21:27: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
+TargetType17.java:14:21: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: byte)
+TargetType17.java:15:23: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: short)
+TargetType17.java:16:19: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: int)
+TargetType17.java:17:21: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: long)
+TargetType17.java:18:23: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: float)
+TargetType17.java:19:25: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: double)
+TargetType17.java:20:21: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: char)
+TargetType17.java:21:27: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: boolean)
8 errors
--- a/langtools/test/tools/javac/lambda/TargetType21.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType21.java Thu Jan 31 10:22:25 2013 -0800
@@ -26,8 +26,8 @@
void test() {
call(x -> { throw new Exception(); }); //ambiguous
- call(x -> { System.out.println(""); }); //ok - resolves to call(SAM2)
- call(x -> { return (Object) null; }); //error - call(SAM3) is not applicable because of cyclic inference
- call(x -> { return null; }); ////ok - resolves to call(SAM1)
+ call(x -> { System.out.println(""); }); //ambiguous
+ call(x -> { return (Object) null; }); //cyclic inference
+ call(x -> { return null; }); //ambiguous
}
}
--- a/langtools/test/tools/javac/lambda/TargetType21.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType21.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,6 @@
-TargetType21.java:28:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM1), TargetType21, kindname.method, call(TargetType21.SAM2), TargetType21
-TargetType21.java:30:9: compiler.err.cant.apply.symbols: kindname.method, call, @737,{(compiler.misc.inapplicable.method: kindname.method, TargetType21, call(TargetType21.SAM1), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.inconvertible.types: java.lang.Object, java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, TargetType21, call(TargetType21.SAM2), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.unexpected.ret.val)))),(compiler.misc.inapplicable.method: kindname.method, TargetType21, <R,A>call(TargetType21.SAM3<R,A>), (compiler.misc.cyclic.inference: A))}
-2 errors
+TargetType21.java:28:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM2), TargetType21, kindname.method, <R,A>call(TargetType21.SAM3<R,A>), TargetType21
+TargetType21.java:28:14: compiler.err.incompatible.thrown.types.in.lambda: java.lang.Exception
+TargetType21.java:29:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM2), TargetType21, kindname.method, <R,A>call(TargetType21.SAM3<R,A>), TargetType21
+TargetType21.java:30:13: compiler.err.prob.found.req: (compiler.misc.cyclic.inference: A)
+TargetType21.java:31:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM1), TargetType21, kindname.method, <R,A>call(TargetType21.SAM3<R,A>), TargetType21
+5 errors
--- a/langtools/test/tools/javac/lambda/TargetType26.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType26.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-TargetType26.java:16:7: compiler.err.cant.apply.symbol: kindname.method, call, Z, @340, kindname.class, TargetType26, (compiler.misc.cyclic.inference: Z)
+TargetType26.java:16:11: compiler.err.prob.found.req: (compiler.misc.cyclic.inference: Z)
1 error
--- a/langtools/test/tools/javac/lambda/TargetType27.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType27.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-TargetType27.java:18:9: compiler.err.cant.apply.symbol: kindname.method, m, TargetType27.F<A,R>, @490, kindname.class, TargetType27, (compiler.misc.cyclic.inference: R)
+TargetType27.java:18:10: compiler.err.prob.found.req: (compiler.misc.cyclic.inference: R)
1 error
--- a/langtools/test/tools/javac/lambda/TargetType28.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType28.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-TargetType28.java:20:32: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: TargetType28.SuperFoo<java.lang.Number>, TargetType28.SuperFoo<java.lang.String>)
-TargetType28.java:21:33: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: TargetType28.SuperFoo<java.lang.Number>, TargetType28.SuperFoo<java.lang.Integer>)
+TargetType28.java:20:32: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.eq.bounds: java.lang.Number, java.lang.Number,java.lang.String)
+TargetType28.java:21:33: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.eq.bounds: java.lang.Number, java.lang.Number,java.lang.Integer)
2 errors
--- a/langtools/test/tools/javac/lambda/TargetType39.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType39.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-TargetType39.java:19:9: compiler.err.cant.apply.symbol: kindname.method, call, TargetType39.SAM<U,V>, @442, kindname.class, TargetType39, (compiler.misc.cyclic.inference: U)
-TargetType39.java:20:9: compiler.err.cant.apply.symbol: kindname.method, call, TargetType39.SAM<U,V>, @479, kindname.class, TargetType39, (compiler.misc.cyclic.inference: V)
+TargetType39.java:19:13: compiler.err.prob.found.req: (compiler.misc.cyclic.inference: U)
+TargetType39.java:20:13: compiler.err.prob.found.req: (compiler.misc.cyclic.inference: V)
2 errors
--- a/langtools/test/tools/javac/lambda/TargetType43.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType43.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
-TargetType43.java:13:20: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
+TargetType43.java:13:20: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
TargetType43.java:13:30: compiler.err.cant.resolve.location: kindname.class, NonExistentClass, , , (compiler.misc.location: kindname.class, TargetType43, null)
-TargetType43.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m, java.lang.Object, @359, kindname.class, TargetType43, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf))
+TargetType43.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m, java.lang.Object, @359, kindname.class, TargetType43, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf: java.lang.Object))
TargetType43.java:14:21: compiler.err.cant.resolve.location: kindname.class, NonExistentClass, , , (compiler.misc.location: kindname.class, TargetType43, null)
4 errors
--- a/langtools/test/tools/javac/lambda/TargetType45.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType45.java Thu Jan 31 10:22:25 2013 -0800
@@ -3,7 +3,7 @@
* @bug 8003280
* @summary Add lambda tests
* compiler crashes during flow analysis as it fails to report diagnostics during attribution
- * @compile/fail/ref=TargetType45.out -XDrawDiagnostics TargetType45.java
+ * @compile TargetType45.java
*/
class TargetType45 {
--- a/langtools/test/tools/javac/lambda/TargetType45.out Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-TargetType45.java:27:28: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: U,V, (compiler.misc.inconvertible.types: TargetType45.Mapper<java.lang.String,java.lang.Integer>, TargetType45.Mapper<? super java.lang.Object,? extends java.lang.Integer>))
-1 error
--- a/langtools/test/tools/javac/lambda/TargetType50.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TargetType50.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,3 +1,3 @@
-TargetType50.java:25:28: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.eq.bounds: java.lang.String, java.lang.String,java.lang.Object)
-TargetType50.java:26:28: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.eq.bounds: java.lang.String, java.lang.String,java.lang.Object)
+TargetType50.java:25:28: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: TargetType50.Sink<java.lang.Object>, TargetType50.Sink<java.lang.String>)
+TargetType50.java:26:28: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: TargetType50.Sink<java.lang.Object>, TargetType50.Sink<java.lang.String>)
2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/TargetType51.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary smoke test for combinator-like stuck analysis
+ * @author Maurizio Cimadamore
+ * @compile TargetType51.java
+ */
+
+import java.util.Comparator;
+
+class TargetType51 {
+
+ interface SimpleMapper<T, U> {
+ T map(U t);
+ }
+
+ interface SimpleList<X> {
+ SimpleList<X> sort(Comparator<? super X> c);
+ }
+
+ static class Person {
+ String getName() { return ""; }
+ }
+
+ <T, U extends Comparable<? super U>> Comparator<T> comparing(SimpleMapper<U, T> mapper) { return null; }
+
+ static class F<U extends Comparable<? super U>, T> {
+ F(SimpleMapper<U, T> f) { }
+ }
+
+ void testAssignmentContext(SimpleList<Person> list, boolean cond) {
+ SimpleList<Person> p1 = list.sort(comparing(Person::getName));
+ SimpleList<Person> p2 = list.sort(comparing(x->x.getName()));
+ SimpleList<Person> p3 = list.sort(cond ? comparing(Person::getName) : comparing(x->x.getName()));
+ SimpleList<Person> p4 = list.sort((cond ? comparing(Person::getName) : comparing(x->x.getName())));
+ }
+
+ void testMethodContext(SimpleList<Person> list, boolean cond) {
+ testMethodContext(list.sort(comparing(Person::getName)), true);
+ testMethodContext(list.sort(comparing(x->x.getName())), true);
+ testMethodContext(list.sort(cond ? comparing(Person::getName) : comparing(x->x.getName())), true);
+ testMethodContext(list.sort((cond ? comparing(Person::getName) : comparing(x->x.getName()))), true);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/TargetType52.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @summary uncatched sam conversion failure exception lead to javac crash
+ * @compile/fail/ref=TargetType52.out -XDrawDiagnostics TargetType52.java
+ */
+class TargetType52 {
+
+ interface FI<T extends CharSequence, V extends java.util.AbstractList<T>> {
+ T m(V p);
+ }
+
+ void m(FI<? extends CharSequence, ? extends java.util.ArrayList<? extends CharSequence>> fip) { }
+
+ void test() {
+ m(p -> p.get(0));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/TargetType52.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+TargetType52.java:15:9: compiler.err.cant.apply.symbol: kindname.method, m, TargetType52.FI<? extends java.lang.CharSequence,? extends java.util.ArrayList<? extends java.lang.CharSequence>>, @444, kindname.class, TargetType52, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.no.suitable.functional.intf.inst: TargetType52.FI<java.lang.CharSequence,java.util.ArrayList<? extends java.lang.CharSequence>>))
+1 error
--- a/langtools/test/tools/javac/lambda/TestInvokeDynamic.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/TestInvokeDynamic.java Thu Jan 31 10:22:25 2013 -0800
@@ -24,15 +24,18 @@
/*
* @test
* @bug 7194586
- *
- * @bug 8003280
+ * @bug 8003280 8006694
* @summary Add lambda tests
* Add back-end support for invokedynamic
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../lib
* @build JavacTestingAbstractThreadedTest
- * @run main TestInvokeDynamic
+ * @run main/othervm TestInvokeDynamic
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import com.sun.source.tree.MethodInvocationTree;
import com.sun.source.tree.MethodTree;
import com.sun.source.util.TaskEvent;
@@ -48,7 +51,6 @@
import com.sun.tools.classfile.Method;
import com.sun.tools.javac.api.JavacTaskImpl;
-import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.MethodSymbol;
import com.sun.tools.javac.code.Symtab;
@@ -67,11 +69,8 @@
import java.util.Locale;
import javax.tools.Diagnostic;
-import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.ToolProvider;
import static com.sun.tools.javac.jvm.ClassFile.*;
--- a/langtools/test/tools/javac/lambda/VoidCompatibility.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/VoidCompatibility.java Thu Jan 31 10:22:25 2013 -0800
@@ -3,7 +3,7 @@
* @bug 8003280
* @summary Add lambda tests
* check that that void compatibility affects overloading as expected
- * @compile/fail/ref=VoidCompatibility.out -XDrawDiagnostics VoidCompatibility.java
+ * @compile VoidCompatibility.java
*/
class VoidCompatibility {
@@ -14,13 +14,13 @@
void schedule(Thunk<?> t) { }
void test() {
- schedule(() -> System.setProperty("done", "true")); //2
+ schedule(() -> System.setProperty("done", "true")); //non-void most specific
schedule(() -> { System.setProperty("done", "true"); }); //1
schedule(() -> { return System.setProperty("done", "true"); }); //2
schedule(() -> System.out.println("done")); //1
schedule(() -> { System.out.println("done"); }); //1
schedule(Thread::yield); //1
- schedule(Thread::getAllStackTraces); //ambiguous
+ schedule(Thread::getAllStackTraces); //non-void most specific
schedule(Thread::interrupted); //1 (most specific)
}
}
--- a/langtools/test/tools/javac/lambda/VoidCompatibility.out Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-VoidCompatibility.java:17:9: compiler.err.ref.ambiguous: schedule, kindname.method, schedule(VoidCompatibility.Runnable), VoidCompatibility, kindname.method, schedule(VoidCompatibility.Thunk<?>), VoidCompatibility
-VoidCompatibility.java:23:9: compiler.err.ref.ambiguous: schedule, kindname.method, schedule(VoidCompatibility.Runnable), VoidCompatibility, kindname.method, schedule(VoidCompatibility.Thunk<?>), VoidCompatibility
-2 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/WarnUnderscoreAsIdent.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Check usages of underscore as identifier generate warnings
+ * @compile/fail/ref=WarnUnderscoreAsIdent.out -XDrawDiagnostics -Werror WarnUnderscoreAsIdent.java
+ */
+package _._;
+
+import _._;
+
+class _ {
+ String _ = null;
+ void _(String _) { }
+ void testLocal() {
+ String _ = null;
+ }
+ void testFor() {
+ for (int _ = 0; _ < 10; _++);
+ }
+ void testTry() {
+ try { } catch (Throwable _) { }
+ }
+ void testLabel() {
+ _:
+ for (;;) {
+ break _;
+ }
+ _:
+ for (;;) {
+ continue _;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/WarnUnderscoreAsIdent.out Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,20 @@
+WarnUnderscoreAsIdent.java:29:9: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:29:11: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:31:8: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:31:10: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:33:7: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:34:12: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:35:10: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:35:19: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:37:16: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:40:18: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:40:25: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:40:33: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:43:34: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:46:9: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:48:19: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:50:9: compiler.warn.underscore.as.identifier
+WarnUnderscoreAsIdent.java:52:22: compiler.warn.underscore.as.identifier
+- compiler.err.warnings.and.werror
+1 error
+17 warnings
--- a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-LambdaTest2_neg1.java:15:13: compiler.err.cant.apply.symbol: kindname.method, methodQooRoo, QooRoo<java.lang.Integer,java.lang.Integer,java.lang.Void>, @531, kindname.class, LambdaTest2_neg1, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, QooRoo)))
+LambdaTest2_neg1.java:15:13: compiler.err.cant.apply.symbol: kindname.method, methodQooRoo, QooRoo<java.lang.Integer,java.lang.Integer,java.lang.Void>, @531, kindname.class, LambdaTest2_neg1, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.not.a.functional.intf.1: QooRoo, (compiler.misc.incompatible.abstracts: kindname.interface, QooRoo)))
1 error
--- a/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM1.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM1.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-NonSAM1.java:11:20: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.no.abstracts: kindname.interface, Planet))
+NonSAM1.java:11:20: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: Planet, (compiler.misc.no.abstracts: kindname.interface, Planet))
1 error
--- a/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM3.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/funcInterfaces/NonSAM3.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,9 +1,9 @@
-NonSAM3.java:15:21: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, FooBar))
-NonSAM3.java:16:22: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, FooBar))
-NonSAM3.java:17:17: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, DE))
-NonSAM3.java:18:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, DE))
-NonSAM3.java:19:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, DE))
-NonSAM3.java:20:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, DE))
-NonSAM3.java:21:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, DE))
-NonSAM3.java:22:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: (compiler.misc.incompatible.abstracts: kindname.interface, DE))
+NonSAM3.java:15:21: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: FooBar, (compiler.misc.incompatible.abstracts: kindname.interface, FooBar))
+NonSAM3.java:16:22: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: FooBar, (compiler.misc.incompatible.abstracts: kindname.interface, FooBar))
+NonSAM3.java:17:17: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: DE, (compiler.misc.incompatible.abstracts: kindname.interface, DE))
+NonSAM3.java:18:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: DE, (compiler.misc.incompatible.abstracts: kindname.interface, DE))
+NonSAM3.java:19:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: DE, (compiler.misc.incompatible.abstracts: kindname.interface, DE))
+NonSAM3.java:20:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: DE, (compiler.misc.incompatible.abstracts: kindname.interface, DE))
+NonSAM3.java:21:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: DE, (compiler.misc.incompatible.abstracts: kindname.interface, DE))
+NonSAM3.java:22:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf.1: DE, (compiler.misc.incompatible.abstracts: kindname.interface, DE))
8 errors
--- a/langtools/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -248,7 +248,7 @@
void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
- Arrays.asList("-XDallowIntersectionTypes"), null, Arrays.asList(source));
+ null, null, Arrays.asList(source));
try {
ct.analyze();
} catch (Throwable ex) {
--- a/langtools/test/tools/javac/lambda/lambdaExpression/AbstractClass_neg.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/lambdaExpression/AbstractClass_neg.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-AbstractClass_neg.java:16:17: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
+AbstractClass_neg.java:16:17: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: AbstractClass_neg.SAM)
1 error
--- a/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression5.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/lambdaExpression/InvalidExpression5.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-InvalidExpression5.java:12:20: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf)
+InvalidExpression5.java:12:20: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: java.lang.Object)
1 error
--- a/langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -149,8 +149,7 @@
return false; //ambiguous target type
}
else if(lambdaBody == LambdaBody.IMPLICIT) {
- if(returnValue != ReturnValue.INTEGER) //ambiguous target type
- return false;
+ return false;
}
else { //explicit parameter type
if(fInterface.getParameterType().equals("Integer")) //ambiguous target type
--- a/langtools/test/tools/javac/lambda/methodReference/SamConversion.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/methodReference/SamConversion.java Thu Jan 31 10:22:25 2013 -0800
@@ -149,14 +149,6 @@
test2(A::method3, 4);
test2(new A()::method4, 5);
test2(new A()::method5, 6);
- A a = new A(A::method1); //A(Foo f) called
- assertTrue(a.method2(1) == 11);
- assertTrue(a.method4(1) == 11);
- assertTrue(a.method5(1) == 11);
- A a2 = new A(new A()::method2); //A(Bar b) called
- assertTrue(a2.method2(1) == 12);
- assertTrue(a2.method4(1) == 12);
- assertTrue(a2.method5(1) == 12);
}
/**
@@ -279,7 +271,7 @@
testConditionalExpression(false);
testLambdaExpressionBody();
- assertTrue(assertionCount == 38);
+ assertTrue(assertionCount == 32);
}
static class MyException extends Exception {}
--- a/langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -186,10 +186,7 @@
if(context != Context.CONSTRUCTOR && fInterface != FInterface.C && methodDef == MethodDef.METHOD6)
//method that throws exceptions not thrown by the interface method is a mismatch
return false;
- if(context == Context.CONSTRUCTOR &&
- methodReference != MethodReference.METHOD1 &&
- methodReference != MethodReference.METHOD2 &&
- methodReference != MethodReference.METHOD3)//ambiguous reference
+ if(context == Context.CONSTRUCTOR)
return false;
return true;
}
--- a/langtools/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,14 +23,18 @@
/*
* @test
- * @bug 8003280
+ * @bug 8003280 8006694
* @summary Add lambda tests
* Automatic test for checking correctness of structural most specific test routine
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main/timeout=600 StructuralMostSpecificTest
+ * @run main/othervm/timeout=600 StructuralMostSpecificTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import javax.tools.Diagnostic;
--- a/langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg5.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg5.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,2 +1,2 @@
-InferenceTest_neg5.java:14:13: compiler.err.cant.apply.symbol: kindname.method, method1, InferenceTest_neg5.SAM1<X>, @419, kindname.class, InferenceTest_neg5, (compiler.misc.cyclic.inference: X)
+InferenceTest_neg5.java:14:21: compiler.err.prob.found.req: (compiler.misc.cyclic.inference: X)
1 error
--- a/langtools/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,16 +23,20 @@
/**
* @test
- * @bug 8003280
+ * @bug 8003280 8006694
* @summary Add lambda tests
* perform automated checks in type inference in lambda expressions
* in different contexts
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../../../lib
* @build JavacTestingAbstractThreadedTest
* @compile TypeInferenceComboTest.java
- * @run main/timeout=360 TypeInferenceComboTest
+ * @run main/othervm/timeout=360 TypeInferenceComboTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import javax.tools.Diagnostic;
@@ -256,16 +260,6 @@
};
public void run() {
- outWriter.println("kk:");
- StringBuilder sb = new StringBuilder("SamKind:");
- sb.append(samKind).append(" SamTargetType:")
- .append(samTargetType).append(" ParameterType:").append(parameterType)
- .append(" ReturnType:").append(returnType).append(" Context:")
- .append(context).append(" LambdaKind:").append(lambdaKind)
- .append(" LambdaBodyType:").append(lambdaBodyType)
- .append(" ParameterKind:").append(parameterKind).append(" Keyword:")
- .append(keyword);
- outWriter.println(sb);
DiagnosticChecker dc = new DiagnosticChecker();
JavacTask ct = (JavacTask)comp.getTask(null, fm.get(), dc,
null, null, Arrays.asList(samSourceFile, clientSourceFile));
--- a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -807,20 +807,8 @@
fail("Could not load class", e);
}
}
-
- public void testSynchronizedDefault() {
- try {
- java.lang.Class.forName("org.openjdk.tests.vm.SynchronizedDefault");
- } catch (Exception e) {
- fail("Could not load class", e);
- }
- }
}
interface StrictfpDefault {
default strictfp void m() {}
}
-
-interface SynchronizedDefault {
- default synchronized void m() {}
-}
--- a/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,9 @@
* questions.
*/
+// this test has been disabled because of timeout issues.
+// see JDK-8006746
+
package org.openjdk.tests.vm;
import java.util.*;
@@ -91,7 +94,7 @@
private static final ConcreteMethod canonicalMethod = new ConcreteMethod(
"String", "m", "returns " + EMPTY + ";", AccessFlag.PUBLIC);
- @Test(groups = "vm", dataProvider = "allShapes")
+ @Test(enabled = false, groups = "vm", dataProvider = "allShapes")
public void separateCompilationTest(Hierarchy hs) {
ClassCase cc = hs.root;
Type type = sourceTypeFrom(hs.root);
--- a/langtools/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -26,6 +26,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.tools.JavaCompiler;
import javax.tools.StandardJavaFileManager;
@@ -67,9 +68,7 @@
protected static void checkAfterExec(boolean printCheckCount)
throws InterruptedException {
pool.shutdown();
- while (!pool.isTerminated()) {
- Thread.sleep(10);
- }
+ pool.awaitTermination(15, TimeUnit.MINUTES);
if (errCount.get() > 0) {
if (throwAssertionOnError) {
closePrinters();
--- a/langtools/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,13 +23,17 @@
/*
* @test
- * @bug 7030606
+ * @bug 7030606 8006694
* @summary Project-coin: multi-catch types should be pairwise disjoint
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main DisjunctiveTypeWellFormednessTest
+ * @run main/othervm DisjunctiveTypeWellFormednessTest
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import javax.tools.Diagnostic;
--- a/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.2.out Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.2.out Thu Jan 31 10:22:25 2013 -0800
@@ -1,4 +1,3 @@
SemanticErrorTest.java:11:46: compiler.err.repeated.interface
- compiler.err.proc.messager: Deliberate Error
-SemanticErrorTest.java:11:46: compiler.err.repeated.interface
-2 errors
+2 errors
\ No newline at end of file
--- a/langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@
@Nesting(LOCAL)
class LocalClass{};
- Object o = new /*@Nesting(ANONYMOUS)*/ Object() { // An anonymous annotated class
+ Object o = new @Nesting(ANONYMOUS) Object() { // An anonymous annotated class
public String toString() {
return "I have no name!";
}
@@ -96,10 +96,9 @@
List<String> names = new ArrayList<String>();
for(Class<?> clazz : classes) {
String name = clazz.getName();
- Nesting anno = clazz.getAnnotation(Nesting.class);
System.out.format("%s is %s%n",
clazz.getName(),
- anno == null ? "(unset/ANONYMOUS)" : anno.value());
+ clazz.getAnnotation(Nesting.class).value());
testClassName(name);
names.add(name);
}
@@ -158,6 +157,7 @@
}
}
+@Target({ElementType.TYPE, ElementType.TYPE_USE})
@Retention(RUNTIME)
@interface Nesting {
NestingKind value();
@@ -185,8 +185,8 @@
typeElt.getQualifiedName().toString(),
typeElt.getKind().toString(),
nestingKind.toString());
- Nesting anno = typeElt.getAnnotation(Nesting.class);
- if ((anno == null ? NestingKind.ANONYMOUS : anno.value()) != nestingKind) {
+
+ if (typeElt.getAnnotation(Nesting.class).value() != nestingKind) {
throw new RuntimeException("Mismatch of expected and reported nesting kind.");
}
}
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
* @summary Modeling type implementing missing interfaces
* @library /tools/javac/lib
* @build JavacTestingAbstractProcessor TestMissingElement
- * @compile -proc:only -XprintRounds -processor TestMissingElement InvalidSource.java
+ * @compile/fail/ref=TestMissingElement.ref -proc:only -XprintRounds -XDrawDiagnostics -processor TestMissingElement InvalidSource.java
*/
import java.util.*;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.ref Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,49 @@
+Round 1:
+ input files: {ExpectInterfaces, ExpectSupertype, OK, InvalidSource}
+ annotations: [ExpectSupertype, ExpectInterfaces]
+ last round: false
+Round 2:
+ input files: {}
+ annotations: []
+ last round: true
+InvalidSource.java:55:42: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:58:44: compiler.err.doesnt.exist: A
+InvalidSource.java:61:54: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.package, java.util, null)
+InvalidSource.java:64:47: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:67:44: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:70:46: compiler.err.doesnt.exist: A
+InvalidSource.java:73:55: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:76:59: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:79:46: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:79:49: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:82:44: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:85:46: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:88:50: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:91:45: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:91:48: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:94:49: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:97:51: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:97:57: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:100:49: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:103:51: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:103:57: compiler.err.cant.resolve.location: kindname.class, B, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+InvalidSource.java:106:58: compiler.err.cant.resolve.location: kindname.class, X, , , (compiler.misc.location: kindname.class, InvalidSource, null)
+22 errors
+check supertype: InvalidSource.TestClassMissingClassA -- !:empty clss A!
+check supertype: InvalidSource.TestClassMissingClassAB -- !:empty clss (pkg A).B!
+check supertype: InvalidSource.TestClassMissingClass_juA -- !:empty clss (pkg java.util).A!
+check supertype: InvalidSource.TestClassTMissingClassAT -- !:empty clss A!<tvar T>
+check interfaces: InvalidSource.TestClassMissingIntfA -- !:empty intf A!
+check interfaces: InvalidSource.TestClassMissingIntfAB -- !:empty intf (pkg A).B!
+check interfaces: InvalidSource.TestClassMissingIntfAOK -- !:empty intf A!, intf OK
+check interfaces: InvalidSource.TestClassOKMissingIntfA -- intf OK, !:empty intf A!
+check interfaces: InvalidSource.TestClassMissingIntfA_B -- !:empty intf A!, !:empty intf B!
+check interfaces: InvalidSource.TestIntfMissingIntfA -- !:empty intf A!
+check interfaces: InvalidSource.TestIntfMissingIntfAOK -- !:empty intf A!, intf OK
+check interfaces: InvalidSource.TestIntfOKMissingIntfA -- intf OK, !:empty intf A!
+check interfaces: InvalidSource.TestIntfMissingIntfAB -- !:empty intf A!, !:empty intf B!
+check interfaces: InvalidSource.TestClassTMissingIntfAT -- !:empty intf A!<tvar T>
+check interfaces: InvalidSource.TestClassTMissingIntfAT_B -- !:empty intf A!<tvar T>, !:empty intf B!
+check interfaces: InvalidSource.TestIntfTMissingIntfAT -- !:empty intf A!<tvar T>
+check interfaces: InvalidSource.TestIntfTMissingIntfAT_B -- !:empty intf A!<tvar T>, !:empty intf B!
+check interfaces: InvalidSource.TestClassListMissingX -- intf (pkg java.util).List<!:empty clss X!>
\ No newline at end of file
--- a/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
* @author Scott Seligman
* @library /tools/javac/lib
* @build JavacTestingAbstractProcessor DirectSupersOfErr
- * @compile -processor DirectSupersOfErr -proc:only C1.java
+ * @compile/fail/ref=DirectSupersOfErr.ref -processor DirectSupersOfErr -proc:only -XDrawDiagnostics C1.java
*/
import java.util.Set;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.ref Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,2 @@
+C1.java:24:18: compiler.err.cant.resolve: kindname.class, Bogus, ,
+1 error
--- a/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,44 +23,44 @@
@TraceResolve(keys={"compiler.err.ref.ambiguous"})
class PrimitiveOverReferenceVarargsAmbiguous {
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS, mostSpecific=true)
static void m_byte(byte... b) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS)
static void m_byte(Byte... b) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS, mostSpecific=true)
static void m_short(short... s) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS)
static void m_short(Short... s) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS, mostSpecific=true)
static void m_int(int... i) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS)
static void m_int(Integer... i) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS, mostSpecific=true)
static void m_long(long... l) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS)
static void m_long(Long... l) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS, mostSpecific=true)
static void m_float(float... f) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS)
static void m_float(Float... f) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS, mostSpecific=true)
static void m_double(double... d) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS)
static void m_double(Double... d) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS, mostSpecific=true)
static void m_char(char... c) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS)
static void m_char(Character... c) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS, mostSpecific=true)
static void m_bool(boolean... z) {}
- @Candidate(applicable=Phase.VARARGS, mostSpecific=false)
+ @Candidate(applicable=Phase.VARARGS)
static void m_bool(Boolean... z) {}
{
--- a/langtools/test/tools/javac/tree/TreeKindTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/tree/TreeKindTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
import com.sun.source.tree.*;
-public class TreeKindTest{
+public class TreeKindTest {
public static void main(String... args) {
boolean ok = true;
@@ -108,6 +108,11 @@
ok = ok & verify(k, i, i == ClassTree.class);
break;
+ case ANNOTATION:
+ case TYPE_ANNOTATION:
+ ok = ok & verify(k, i, i == AnnotationTree.class);
+ break;
+
case OTHER:
ok = ok & verify(k, i, i == null);
break;
--- a/langtools/test/tools/javac/tree/TreePosTest.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/tree/TreePosTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.tree.EndPosTable;
import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.JCTree.JCAnnotatedType;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.tree.JCTree.JCNewClass;
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
@@ -100,7 +101,8 @@
* @test
* @bug 6919889
* @summary assorted position errors in compiler syntax trees
- * @run main TreePosTest -q -r -ef ./tools/javac/typeAnnotations -ef ./tools/javap/typeAnnotations -et ANNOTATED_TYPE .
+ * OLD: -q -r -ef ./tools/javac/typeAnnotations -ef ./tools/javap/typeAnnotations -et ANNOTATED_TYPE .
+ * @run main TreePosTest -q -r .
*/
public class TreePosTest {
/**
@@ -367,15 +369,24 @@
// e.g. int[][] a = new int[2][];
check("encl.start <= start", encl, self, encl.start <= self.start);
check("start <= pos", encl, self, self.start <= self.pos);
- if (!(self.tag == TYPEARRAY
+ if (!( (self.tag == TYPEARRAY ||
+ isAnnotatedArray(self.tree))
&& (encl.tag == VARDEF ||
encl.tag == METHODDEF ||
- encl.tag == TYPEARRAY))) {
+ encl.tag == TYPEARRAY ||
+ isAnnotatedArray(encl.tree))
+ ||
+ encl.tag == ANNOTATED_TYPE && self.tag == SELECT
+ )) {
check("encl.pos <= start || end <= encl.pos",
encl, self, encl.pos <= self.start || self.end <= encl.pos);
}
check("pos <= end", encl, self, self.pos <= self.end);
- if (!(self.tag == TYPEARRAY && encl.tag == TYPEARRAY)) {
+ if (!( (self.tag == TYPEARRAY || isAnnotatedArray(self.tree)) &&
+ (encl.tag == TYPEARRAY || isAnnotatedArray(encl.tree))
+ ||
+ encl.tag == MODIFIERS && self.tag == ANNOTATION
+ ) ) {
check("end <= encl.end", encl, self, self.end <= encl.end);
}
}
@@ -387,6 +398,11 @@
encl = prevEncl;
}
+ private boolean isAnnotatedArray(JCTree tree) {
+ return tree.hasTag(ANNOTATED_TYPE) &&
+ ((JCAnnotatedType)tree).underlyingType.hasTag(TYPEARRAY);
+ }
+
@Override
public void visitVarDef(JCVariableDecl tree) {
// enum member declarations are desugared in the parser and have
@@ -427,7 +443,8 @@
viewer.addEntry(sourcefile, label, encl, self);
}
- String s = self.tree.toString();
+ String s = "encl: " + encl.tree.toString() +
+ " this: " + self.tree.toString();
String msg = sourcefile.getName() + ": " + label + ": " +
"encl:" + encl + " this:" + self + "\n" +
s.substring(0, Math.min(80, s.length())).replaceAll("[\r\n]+", " ");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/treeannotests/AnnoTreeTests.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @build DA TA Test TestProcessor
+ * @compile -proc:only -processor TestProcessor AnnoTreeTests.java
+ */
+
+@Test(4)
+class AnnoTreeTests {
+ // primitive types
+ // @TA("int") int i1 = 0; // TODO: Only visible via ClassFile
+ long i2 = (@TA("long") long) 0;
+
+ // simple array types
+ // @DA("short") short[] a1; // TODO: Only visible via ClassFile
+ byte @TA("byte[]") [] a2;
+ float[] a3 = (@TA("float") float[]) null;
+ double[] a4 = (double @TA("double[]") []) null;
+
+ // multi-dimensional array types
+ // (still to come)
+}
--- a/langtools/test/tools/javac/treeannotests/TestProcessor.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/treeannotests/TestProcessor.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -203,13 +203,16 @@
* expression <i>name</i>=<i>value</i>.
*/
String getStringValue(JCExpression e) {
- if (e.getTag() == JCTree.ASSIGN) {
+ if (e.hasTag(JCTree.Tag.ASSIGN)) {
JCAssign a = (JCAssign) e;
JCExpression rhs = a.rhs;
- if (rhs.getTag() == JCTree.LITERAL) {
+ if (rhs.hasTag(JCTree.Tag.LITERAL)) {
JCLiteral l = (JCLiteral) rhs;
return (String) l.value;
}
+ } else if (e.hasTag(JCTree.Tag.LITERAL)) {
+ JCLiteral l = (JCLiteral) e;
+ return (String) l.value;
}
throw new IllegalArgumentException(e.toString());
}
--- a/langtools/test/tools/javac/typeAnnotations/newlocations/BasicTest.java Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-
-/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6843077
- * @summary random tests for new locations
- * @author Matt Papi
- * @compile/fail/ref=BasicTest.out -XDrawDiagnostics BasicTest.java
- */
-
-import java.util.*;
-import java.io.*;
-
-@interface A {}
-@interface B {}
-@interface C {}
-@interface D {}
-
-//308: Test inverted to verify that type annotations can not be parsed yet.
-
-/**
- * Tests basic JSR 308 parser functionality. We don't really care about what
- * the parse tree looks like, just that these annotations can be parsed.
- */
-class BasicTest<T extends @A Object> extends @B LinkedList<T> implements @C List<T> {
-
- void test() {
-
- // Handle annotated class literals/cast types
- Class<?> c = @A String.class;
- Object o = (@A Object) "foo";
-
- // Handle annotated "new" expressions (except arrays; see ArrayTest)
- String s = new @A String("bar");
-
- boolean b = o instanceof @A Object;
-
-
- @A Map<@B List<@C String>, @D String> map =
- new @A HashMap<@B List<@C String>, @D String>();
-
- Class<? extends @A String> c2 = @A String.class;
- }
-
- // Handle receiver annotations
- // Handle annotations on a qualified identifier list
- void test2() @C @D throws @A IllegalArgumentException, @B IOException {
-
- }
-
- // Handle annotations on a varargs element type
- void test3(Object @A... objs) {
-
- }
-}
--- a/langtools/test/tools/javac/typeAnnotations/newlocations/BasicTest.out Thu Jan 31 10:10:34 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-BasicTest.java:47:27: compiler.err.illegal.start.of.type
-BasicTest.java:47:28: compiler.err.expected: '{'
-BasicTest.java:47:36: compiler.err.expected: token.identifier
-BasicTest.java:47:38: compiler.err.illegal.start.of.type
-BasicTest.java:47:45: compiler.err.expected: token.identifier
-BasicTest.java:47:47: compiler.err.expected: ';'
-BasicTest.java:47:62: compiler.err.expected: token.identifier
-BasicTest.java:47:84: compiler.err.expected: token.identifier
-BasicTest.java:52:22: compiler.err.illegal.start.of.expr
-BasicTest.java:52:31: compiler.err.expected: ';'
-BasicTest.java:52:37: compiler.err.expected: token.identifier
-BasicTest.java:53:30: compiler.err.expected: token.identifier
-BasicTest.java:53:31: compiler.err.expected: ->
-BasicTest.java:56:23: compiler.err.expected: token.identifier
-BasicTest.java:56:24: compiler.err.expected2: '(', '['
-BasicTest.java:56:25: compiler.err.expected: ';'
-BasicTest.java:56:27: compiler.err.invalid.meth.decl.ret.type.req
-BasicTest.java:56:34: compiler.err.illegal.start.of.type
-BasicTest.java:58:34: compiler.err.illegal.start.of.type
-BasicTest.java:61:16: compiler.err.illegal.start.of.type
-BasicTest.java:61:18: compiler.err.expected: ';'
-BasicTest.java:61:24: compiler.err.illegal.start.of.type
-BasicTest.java:61:26: compiler.err.expected: ';'
-BasicTest.java:61:33: compiler.err.expected: token.identifier
-BasicTest.java:61:34: compiler.err.illegal.start.of.type
-BasicTest.java:61:35: compiler.err.expected: token.identifier
-BasicTest.java:61:37: compiler.err.expected: ';'
-BasicTest.java:61:45: compiler.err.expected: token.identifier
-BasicTest.java:61:50: compiler.err.expected: token.identifier
-BasicTest.java:62:16: compiler.err.expected: token.identifier
-BasicTest.java:62:17: compiler.err.expected2: '(', '['
-BasicTest.java:62:18: compiler.err.expected: ';'
-BasicTest.java:62:28: compiler.err.illegal.start.of.type
-BasicTest.java:62:30: compiler.err.expected: ';'
-BasicTest.java:62:36: compiler.err.illegal.start.of.type
-BasicTest.java:62:38: compiler.err.expected: ';'
-BasicTest.java:62:45: compiler.err.expected: token.identifier
-BasicTest.java:62:46: compiler.err.illegal.start.of.type
-BasicTest.java:62:47: compiler.err.expected: token.identifier
-BasicTest.java:62:49: compiler.err.expected: ';'
-BasicTest.java:62:57: compiler.err.expected: token.identifier
-BasicTest.java:62:58: compiler.err.illegal.start.of.type
-BasicTest.java:62:59: compiler.err.expected: token.identifier
-BasicTest.java:64:25: compiler.err.illegal.start.of.type
-BasicTest.java:64:27: compiler.err.expected: ';'
-BasicTest.java:64:34: compiler.err.expected: token.identifier
-BasicTest.java:64:38: compiler.err.expected: token.identifier
-BasicTest.java:64:41: compiler.err.illegal.start.of.expr
-BasicTest.java:64:50: compiler.err.expected: ';'
-BasicTest.java:64:56: compiler.err.expected: token.identifier
-BasicTest.java:69:17: compiler.err.expected: ';'
-BasicTest.java:69:24: compiler.err.illegal.start.of.type
-BasicTest.java:69:30: compiler.err.expected: ';'
-BasicTest.java:69:59: compiler.err.expected: token.identifier
-BasicTest.java:69:74: compiler.err.expected: ';'
-BasicTest.java:74:22: compiler.err.expected: token.identifier
-BasicTest.java:74:24: compiler.err.expected: ';'
-BasicTest.java:74:25: compiler.err.illegal.start.of.type
-BasicTest.java:74:33: compiler.err.expected: ';'
-BasicTest.java:77:2: compiler.err.premature.eof
-60 errors
--- a/langtools/test/tools/javac/varargs/7042566/T7042566.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/varargs/7042566/T7042566.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,13 +23,17 @@
/*
* @test
- * @bug 7042566
+ * @bug 7042566 8006694
* @summary Unambiguous varargs method calls flagged as ambiguous
+ * temporarily workaround combo tests are causing time out in several platforms
* @library ../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main T7042566
+ * @run main/othervm T7042566
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.io.File;
import java.net.URI;
import java.util.Arrays;
--- a/langtools/test/tools/javac/varargs/warning/Warn4.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/varargs/warning/Warn4.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,14 +23,18 @@
/**
* @test
- * @bug 6945418 6993978
+ * @bug 6945418 6993978 8006694
* @summary Project Coin: Simplified Varargs Method Invocation
+ * temporarily workaround combo tests are causing time out in several platforms
* @author mcimadamore
* @library ../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main Warn4
+ * @run main/othervm Warn4
*/
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import java.util.Set;
@@ -238,7 +242,6 @@
for (Warning wkind : Warning.values()) {
boolean isSuppressed = wkind.isSuppressed(trustMe, sourceLevel,
suppressLevelClient, suppressLevelDecl, modKind);
- System.out.println("SUPPRESSED = " + isSuppressed);
badOutput |= (warnArr[wkind.ordinal()] && !isSuppressed) !=
diagChecker.warnings.contains(wkind);
}
--- a/langtools/test/tools/javac/varargs/warning/Warn5.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javac/varargs/warning/Warn5.java Thu Jan 31 10:22:25 2013 -0800
@@ -23,13 +23,18 @@
/**
* @test
- * @bug 6993978 7097436
+ * @bug 6993978 7097436 8006694
* @summary Project Coin: Annotation to reduce varargs warnings
+ * temporarily workaround combo tests are causing time out in several platforms
* @author mcimadamore
* @library ../../lib
* @build JavacTestingAbstractThreadedTest
- * @run main Warn5
+ * @run main/othervm Warn5
*/
+
+// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047)
+// see JDK-8006746
+
import java.net.URI;
import java.util.Arrays;
import java.util.EnumSet;
--- a/langtools/test/tools/javadoc/6958836/Test.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javadoc/6958836/Test.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@
// Force en_US locale in lieu of something like -XDrawDiagnostics.
// For some reason, this must be the first option when used.
opts.addAll(list("-locale", "en_US"));
+ opts.add("-Xdoclint:none");
opts.addAll(list("-classpath", System.getProperty("test.src")));
opts.addAll(list("-d", testOutDir.getPath()));
opts.addAll(testOpts);
--- a/langtools/test/tools/javadoc/6964914/Test.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javadoc/6964914/Test.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,7 @@
void javadoc(String path, String expect) {
File testSrc = new File(System.getProperty("test.src"));
String[] args = {
+ "-Xdoclint:none",
"-source", "1.4", // enables certain Parser warnings
"-bootclasspath", System.getProperty("sun.boot.class.path"),
"-classpath", ".",
--- a/langtools/test/tools/javadoc/6964914/TestStdDoclet.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javadoc/6964914/TestStdDoclet.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,7 @@
Process p = new ProcessBuilder()
.command(javadoc.getPath(),
"-J-Xbootclasspath:" + System.getProperty("sun.boot.class.path"),
+ "-Xdoclint:none",
"-package",
new File(testSrc, thisClassName + ".java").getPath())
.redirectErrorStream(true)
--- a/langtools/test/tools/javadoc/MaxWarns.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javadoc/MaxWarns.java Thu Jan 31 10:22:25 2013 -0800
@@ -74,7 +74,7 @@
String javadoc(File f) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
- String[] args = { "-d", "api", f.getPath() };
+ String[] args = { "-Xdoclint:none", "-d", "api", f.getPath() };
int rc = com.sun.tools.javadoc.Main.execute("javadoc", pw, pw, pw,
com.sun.tools.doclets.standard.Standard.class.getName(), args);
pw.flush();
--- a/langtools/test/tools/javadoc/T6551367.java Thu Jan 31 10:10:34 2013 +0100
+++ b/langtools/test/tools/javadoc/T6551367.java Thu Jan 31 10:22:25 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
File source = new File(testSrc, file);
int rc = execute("javadoc", "T6551367",
T6551367.class.getClassLoader(),
- new String[]{source.getPath(), "-d", destDir.getAbsolutePath()});
+ new String[]{"-Xdoclint:none", source.getPath(), "-d", destDir.getAbsolutePath()});
if (rc != 0)
throw new Error("unexpected exit from javadoc: " + rc);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javadoc/doclint/DocLintTest.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8004834
+ * @summary Add doclint support into javadoc
+ */
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.tools.Diagnostic;
+import javax.tools.DocumentationTool;
+import javax.tools.DocumentationTool.DocumentationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+import static javax.tools.Diagnostic.Kind.*;
+
+import com.sun.tools.javac.main.Main;
+
+public class DocLintTest {
+ public static void main(String... args) throws Exception {
+ new DocLintTest().run();
+ }
+
+ DocumentationTool javadoc;
+ StandardJavaFileManager fm;
+ JavaFileObject file;
+
+ final String code =
+ /* 01 */ "/** Class comment. */\n" +
+ /* 02 */ "public class Test {\n" +
+ /* 03 */ " /** Method comment. */\n" +
+ /* 04 */ " public void method() { }\n" +
+ /* 05 */ "\n" +
+ /* 06 */ " /** Syntax < error. */\n" +
+ /* 07 */ " private void syntaxError() { }\n" +
+ /* 08 */ "\n" +
+ /* 09 */ " /** @see DoesNotExist */\n" +
+ /* 10 */ " protected void referenceError() { }\n" +
+ /* 11 */ "\n" +
+ /* 12 */ " /** @return */\n" +
+ /* 13 */ " public int emptyReturn() { return 0; }\n" +
+ /* 14 */ "}\n";
+
+ private final String rawDiags = "-XDrawDiagnostics";
+
+ private enum Message {
+ // doclint messages
+ DL_ERR6(ERROR, "Test.java:6:16: compiler.err.proc.messager: malformed HTML"),
+ DL_ERR9(ERROR, "Test.java:9:14: compiler.err.proc.messager: reference not found"),
+ DL_WRN12(WARNING, "Test.java:12:9: compiler.warn.proc.messager: no description for @return"),
+
+ // doclint messages when -XDrawDiagnostics is not in effect
+ DL_ERR9A(ERROR, "Test.java:9: error: reference not found"),
+ DL_WRN12A(WARNING, "Test.java:12: warning: no description for @return"),
+
+ // javadoc messages about bad content: these should only appear when doclint is disabled
+ JD_WRN10(WARNING, "Test.java:10: warning - Tag @see: reference not found: DoesNotExist"),
+ JD_WRN13(WARNING, "Test.java:13: warning - @return tag has no arguments."),
+
+ // javadoc messages for bad options
+ OPT_BADARG(ERROR, "javadoc: error - Invalid argument for -Xdoclint option"),
+ OPT_BADQUAL(ERROR, "javadoc: error - Access qualifiers not permitted for -Xdoclint arguments");
+
+ final Diagnostic.Kind kind;
+ final String text;
+
+ static Message get(String text) {
+ for (Message m: values()) {
+ if (m.text.equals(text))
+ return m;
+ }
+ return null;
+ }
+
+ Message(Diagnostic.Kind kind, String text) {
+ this.kind = kind;
+ this.text = text;
+ }
+
+ @Override
+ public String toString() {
+ return "[" + kind + ",\"" + text + "\"]";
+ }
+ }
+
+ void run() throws Exception {
+ javadoc = ToolProvider.getSystemDocumentationTool();
+ fm = javadoc.getStandardFileManager(null, null, null);
+ fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(new File(".")));
+ file = new SimpleJavaFileObject(URI.create("Test.java"), JavaFileObject.Kind.SOURCE) {
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncoding) {
+ return code;
+ }
+ };
+
+ test(Collections.<String>emptyList(),
+ Main.Result.ERROR,
+ EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A));
+
+ test(Arrays.asList(rawDiags),
+ Main.Result.ERROR,
+ EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
+
+ test(Arrays.asList("-Xdoclint:none"),
+ Main.Result.OK,
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
+
+ test(Arrays.asList(rawDiags, "-Xdoclint"),
+ Main.Result.ERROR,
+ EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
+
+ test(Arrays.asList(rawDiags, "-Xdoclint:all/public"),
+ Main.Result.ERROR,
+ EnumSet.of(Message.OPT_BADQUAL));
+
+ test(Arrays.asList(rawDiags, "-Xdoclint:all", "-public"),
+ Main.Result.OK,
+ EnumSet.of(Message.DL_WRN12));
+
+ test(Arrays.asList(rawDiags, "-Xdoclint:syntax"),
+ Main.Result.OK,
+ EnumSet.of(Message.DL_WRN12));
+
+ test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"),
+ Main.Result.ERROR,
+ EnumSet.of(Message.DL_ERR6, Message.DL_WRN12));
+
+ test(Arrays.asList(rawDiags, "-Xdoclint:reference"),
+ Main.Result.ERROR,
+ EnumSet.of(Message.DL_ERR9));
+
+ test(Arrays.asList(rawDiags, "-Xdoclint:badarg"),
+ Main.Result.ERROR,
+ EnumSet.of(Message.OPT_BADARG));
+
+ if (errors > 0)
+ throw new Exception(errors + " errors occurred");
+ }
+
+ void test(List<String> opts, Main.Result expectResult, Set<Message> expectMessages) {
+ System.err.println("test: " + opts);
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ List<JavaFileObject> files = Arrays.asList(file);
+ try {
+ DocumentationTask t = javadoc.getTask(pw, fm, null, null, opts, files);
+ boolean ok = t.call();
+ pw.close();
+ String out = sw.toString().replaceAll("[\r\n]+", "\n");
+ if (!out.isEmpty())
+ System.err.println(out);
+ if (ok && expectResult != Main.Result.OK) {
+ error("Compilation succeeded unexpectedly");
+ } else if (!ok && expectResult != Main.Result.ERROR) {
+ error("Compilation failed unexpectedly");
+ } else
+ check(out, expectMessages);
+ } catch (IllegalArgumentException e) {
+ System.err.println(e);
+ String expectOut = expectMessages.iterator().next().text;
+ if (expectResult != Main.Result.CMDERR)
+ error("unexpected exception caught");
+ else if (!e.getMessage().equals(expectOut)) {
+ error("unexpected exception message: "
+ + e.getMessage()
+ + " expected: " + expectOut);
+ }
+ }
+
+// if (errors > 0)
+// throw new Error("stop");
+ }
+
+ private void check(String out, Set<Message> expect) {
+ Pattern ignore = Pattern.compile("^(Building|Constructing|Generating|Loading|Standard|Starting| ) .*");
+ Pattern stats = Pattern.compile("^([1-9]+) (error|warning)(s?)");
+ Set<Message> found = EnumSet.noneOf(Message.class);
+ int e = 0, w = 0;
+ for (String line: out.split("[\r\n]+")) {
+ if (ignore.matcher(line).matches())
+ continue;
+
+ Matcher s = stats.matcher(line);
+ if (s.matches()) {
+ int i = Integer.valueOf(s.group(1));
+ if (s.group(2).equals("error"))
+ e++;
+ else
+ w++;
+ continue;
+ }
+
+ Message m = Message.get(line);
+ if (m == null)
+ error("Unexpected line: " + line);
+ else
+ found.add(m);
+ }
+ for (Message m: expect) {
+ if (!found.contains(m))
+ error("expected message not found: " + m.text);
+ }
+ for (Message m: found) {
+ if (!expect.contains(m))
+ error("unexpected message found: " + m.text);
+ }
+ }
+
+ void error(String msg) {
+ System.err.println("Error: " + msg);
+ errors++;
+ }
+
+ int errors;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import com.sun.tools.classfile.*;
+
+/*
+ * @test JSR175Annotations
+ * @bug 6843077
+ * @summary test that only type annotations are recorded as such in classfile
+ */
+
+public class JSR175Annotations {
+ public static void main(String[] args) throws Exception {
+ new JSR175Annotations().run();
+ }
+
+ public void run() throws Exception {
+ File javaFile = writeTestFile();
+ File classFile = compileTestFile(javaFile);
+
+ ClassFile cf = ClassFile.read(classFile);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ void test(ClassFile cf, Method m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Field m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Field m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ File writeTestFile() throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println("import java.lang.annotation.*;");
+ out.println("abstract class Test { ");
+ out.println(" @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})");
+ out.println(" @Retention(RetentionPolicy.RUNTIME)");
+ out.println(" @interface A { }");
+ out.println(" @A String m;");
+ out.println(" @A String method(@A String a) {");
+ out.println(" return a;");
+ out.println(" }");
+ out.println("}");
+ out.close();
+ return f;
+ }
+
+ File compileTestFile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ void countAnnotations() {
+ int expected_visibles = 0, expected_invisibles = 0;
+ int expected_all = expected_visibles + expected_invisibles;
+
+ if (expected_all != all) {
+ errors++;
+ System.err.println("expected " + expected_all
+ + " annotations but found " + all);
+ }
+
+ if (expected_visibles != visibles) {
+ errors++;
+ System.err.println("expected " + expected_visibles
+ + " visibles annotations but found " + visibles);
+ }
+
+ if (expected_invisibles != invisibles) {
+ errors++;
+ System.err.println("expected " + expected_invisibles
+ + " invisibles annotations but found " + invisibles);
+ }
+
+ }
+
+ int errors;
+ int all;
+ int visibles;
+ int invisibles;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/NewArray.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import com.sun.tools.classfile.*;
+
+/*
+ * @test NewArray
+ * @bug 6843077
+ * @summary test that all type annotations are present in the classfile
+ */
+
+public class NewArray {
+ public static void main(String[] args) throws Exception {
+ new NewArray().run();
+ }
+
+ public void run() throws Exception {
+ File javaFile = writeTestFile();
+ File classFile = compileTestFile(javaFile);
+
+ ClassFile cf = ClassFile.read(classFile);
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ void test(ClassFile cf) {
+ test(cf, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Method m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Field m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, String name, boolean visible) {
+ int index = cf.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = cf.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Field m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ File writeTestFile() throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println("import java.lang.annotation.*;");
+ out.println("import java.util.*;");
+ out.println("class Test { ");
+ out.println(" @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})");
+ out.println(" @interface A { }");
+
+ out.println(" void test() {");
+ out.println(" Object a = new @A String @A [5] @A [];");
+ out.println(" Object b = new @A String @A [5] @A [3];");
+ out.println(" Object c = new @A String @A [] @A [] {};");
+ out.println(" }");
+ out.println("}");
+
+ out.close();
+ return f;
+ }
+
+ File compileTestFile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ void countAnnotations() {
+ int expected_visibles = 0, expected_invisibles = 9;
+ int expected_all = expected_visibles + expected_invisibles;
+
+ if (expected_all != all) {
+ errors++;
+ System.err.println("expected " + expected_all
+ + " annotations but found " + all);
+ }
+
+ if (expected_visibles != visibles) {
+ errors++;
+ System.err.println("expected " + expected_visibles
+ + " visibles annotations but found " + visibles);
+ }
+
+ if (expected_invisibles != invisibles) {
+ errors++;
+ System.err.println("expected " + expected_invisibles
+ + " invisibles annotations but found " + invisibles);
+ }
+
+ }
+
+ int errors;
+ int all;
+ int visibles;
+ int invisibles;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/Presence.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import java.lang.annotation.ElementType;
+
+import com.sun.tools.classfile.*;
+
+/*
+ * @test Presence
+ * @bug 6843077
+ * @summary test that all type annotations are present in the classfile
+ */
+
+public class Presence {
+ public static void main(String[] args) throws Exception {
+ new Presence().run();
+ }
+
+ public void run() throws Exception {
+ File javaFile = writeTestFile();
+ File classFile = compileTestFile(javaFile);
+
+ ClassFile cf = ClassFile.read(classFile);
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ void test(ClassFile cf) {
+ test(cf, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Method m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Field m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, String name, boolean visible) {
+ int index = cf.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = cf.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Field m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ File writeTestFile() throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println("import java.util.*;");
+ out.println("import java.lang.annotation.*;");
+
+ out.println("class Test<@Test.A T extends @Test.A List<@Test.A String>> { ");
+ out.println(" @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})");
+ out.println(" @interface A { }");
+
+ out.println(" Map<@A String, Map<@A String, @A String>> f1;");
+
+ out.println(" <@A TM extends @A List<@A String>>");
+ out.println(" Map<@A String, @A List<@A String>>");
+ out.println(" method(@A Test<T> this, List<@A String> @A [] param1, String @A [] @A ... param2)");
+ out.println(" throws @A Exception {");
+ out.println(" @A String lc1 = null;");
+ out.println(" @A List<@A String> lc2 = null;");
+ out.println(" @A String @A [] [] @A[] lc3 = null;");
+ out.println(" List<? extends @A List<@A String>> lc4 = null;");
+ out.println(" Object lc5 = (@A List<@A String>) null;");
+ out.println(" boolean lc6 = lc1 instanceof @A String;");
+ out.println(" boolean lc7 = lc5 instanceof @A String @A [] @A [];");
+ out.println(" new @A ArrayList<@A String>();");
+ out.println(" Object lc8 = new @A String @A [4];");
+ out.println(" try {");
+ out.println(" Object lc10 = int.class;");
+ out.println(" } catch (@A Exception e) { e.toString(); }");
+ out.println(" return null;");
+ out.println(" }");
+ out.println(" void vararg1(String @A ... t) { } ");
+ out.println("}");
+ out.close();
+ return f;
+ }
+
+ File compileTestFile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ void countAnnotations() {
+ int expected_visibles = 0, expected_invisibles = 38;
+ int expected_all = expected_visibles + expected_invisibles;
+
+ if (expected_all != all) {
+ errors++;
+ System.err.println("expected " + expected_all
+ + " annotations but found " + all);
+ }
+
+ if (expected_visibles != visibles) {
+ errors++;
+ System.err.println("expected " + expected_visibles
+ + " visibles annotations but found " + visibles);
+ }
+
+ if (expected_invisibles != invisibles) {
+ errors++;
+ System.err.println("expected " + expected_invisibles
+ + " invisibles annotations but found " + invisibles);
+ }
+
+ }
+
+ int errors;
+ int all;
+ int visibles;
+ int invisibles;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/PresenceInner.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import com.sun.tools.classfile.*;
+
+/*
+ * @test PresenceInner
+ * @bug 6843077
+ * @summary test that annotations in inner types count only once
+ */
+
+public class PresenceInner {
+ public static void main(String[] args) throws Exception {
+ new PresenceInner().run();
+ }
+
+ public void run() throws Exception {
+ File javaFile = writeTestFile();
+ File classFile = compileTestFile(javaFile);
+
+ ClassFile cf = ClassFile.read(classFile);
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ // counts are zero when vising outer class
+ countAnnotations(0);
+
+ // visit inner class
+ File innerFile = new File("Test$1Inner.class");
+ ClassFile icf = ClassFile.read(innerFile);
+ test(icf);
+ for (Field f : icf.fields) {
+ test(cf, f);
+ }
+ for (Method m: icf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations(1);
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ void test(ClassFile cf) {
+ test(cf, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Method m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Field m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, String name, boolean visible) {
+ int index = cf.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = cf.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Field m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ File writeTestFile() throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+
+ out.println("import java.lang.annotation.*;");
+ out.println("class Test {");
+ out.println(" void method() {");
+ out.println(" class Inner<T extends @A Object> { }");
+ out.println(" }");
+ out.println("}");
+ out.println("@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})");
+ out.println("@interface A { }");
+ out.close();
+ System.out.println(f.getAbsolutePath());
+ return f;
+ }
+
+ File compileTestFile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ void countAnnotations(int expected_invisibles) {
+ int expected_visibles = 0;
+ int expected_all = expected_visibles + expected_invisibles;
+
+ if (expected_all != all) {
+ errors++;
+ System.err.println("expected " + expected_all
+ + " annotations but found " + all);
+ }
+
+ if (expected_visibles != visibles) {
+ errors++;
+ System.err.println("expected " + expected_visibles
+ + " visibles annotations but found " + visibles);
+ }
+
+ if (expected_invisibles != invisibles) {
+ errors++;
+ System.err.println("expected " + expected_invisibles
+ + " invisibles annotations but found " + invisibles);
+ }
+
+ }
+
+ int errors;
+ int all;
+ int visibles;
+ int invisibles;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/T6855990.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+
+/*
+ * @test
+ * @bug 6855990
+ * @summary InstructionDetailWriter should support new 308 annotations attribute
+ */
+
+public class T6855990 {
+ public static void main(String[] args) throws Exception {
+ new T6855990().run();
+ }
+
+ public void run() throws Exception {
+ @Simple String[] args = { "-c", "-XDdetails:typeAnnotations", "T6855990" };
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ int rc = com.sun.tools.javap.Main.run(args, pw);
+ pw.close();
+ String out = sw.toString();
+ System.out.println(out);
+ if (out.indexOf("@Simple: LOCAL_VARIABLE") == -1)
+ throw new Exception("expected output not found");
+ }
+}
+
+@interface Simple { }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/TypeCasts.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import com.sun.tools.classfile.*;
+
+/*
+ * @test
+ * @bug 6843077
+ * @summary test that typecasts annotation are emitted if only the cast
+ * expression is optimized away
+ */
+
+public class TypeCasts {
+ public static void main(String[] args) throws Exception {
+ new TypeCasts().run();
+ }
+
+ public void run() throws Exception {
+ File javaFile = writeTestFile();
+ File classFile = compileTestFile(javaFile);
+
+ ClassFile cf = ClassFile.read(classFile);
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ void test(ClassFile cf) {
+ test(cf, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Method m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Field m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, String name, boolean visible) {
+ int index = cf.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = cf.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Field m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+
+ File writeTestFile() throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println("import java.lang.annotation.*;");
+ out.println("class Test { ");
+ out.println(" @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})");
+ out.println(" @interface A { }");
+
+ out.println(" void emit() {");
+ out.println(" Object o = null;");
+ out.println(" String s = null;");
+
+ out.println(" String a0 = (@A String)o;");
+ out.println(" Object a1 = (@A Object)o;");
+
+ out.println(" String b0 = (@A String)s;");
+ out.println(" Object b1 = (@A Object)s;");
+ out.println(" }");
+
+ out.println(" void alldeadcode() {");
+ out.println(" Object o = null;");
+
+ out.println(" if (false) {");
+ out.println(" String a0 = (@A String)o;");
+ out.println(" }");
+ out.println(" }");
+
+ out.println("}");
+ out.close();
+ return f;
+ }
+
+ File compileTestFile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ void countAnnotations() {
+ int expected_visibles = 0, expected_invisibles = 4;
+ int expected_all = expected_visibles + expected_invisibles;
+
+ if (expected_all != all) {
+ errors++;
+ System.err.println("expected " + expected_all
+ + " annotations but found " + all);
+ }
+
+ if (expected_visibles != visibles) {
+ errors++;
+ System.err.println("expected " + expected_visibles
+ + " visibles annotations but found " + visibles);
+ }
+
+ if (expected_invisibles != invisibles) {
+ errors++;
+ System.err.println("expected " + expected_invisibles
+ + " invisibles annotations but found " + invisibles);
+ }
+
+ }
+
+ int errors;
+ int all;
+ int visibles;
+ int invisibles;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/Visibility.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import com.sun.tools.classfile.*;
+
+/*
+ * @test Visibility
+ * @bug 6843077
+ * @summary test that type annotations are recorded in the classfile
+ */
+
+public class Visibility {
+ public static void main(String[] args) throws Exception {
+ new Visibility().run();
+ }
+
+ public void run() throws Exception {
+ File javaFile = writeTestFile();
+ File classFile = compileTestFile(javaFile);
+
+ ClassFile cf = ClassFile.read(classFile);
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ void test(ClassFile cf, Method m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ File writeTestFile() throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println("import java.lang.annotation.ElementType;");
+ out.println("import java.lang.annotation.Retention;");
+ out.println("import java.lang.annotation.RetentionPolicy;");
+ out.println("import java.lang.annotation.Target;");
+ out.println("abstract class Test { ");
+ // visible annotations: RUNTIME
+ out.println(" @Retention(RetentionPolicy.RUNTIME)");
+ out.println(" @Target(ElementType.TYPE_USE)");
+ out.println(" @interface A { }");
+ out.println(" void visible(@A Test this) { }");
+
+ // invisible annotations: CLASS
+ out.println(" @Retention(RetentionPolicy.CLASS)");
+ out.println(" @Target(ElementType.TYPE_USE)");
+ out.println(" @interface B { }");
+ out.println(" void invisible(@B Test this) { }");
+
+ // source annotations
+ out.println(" @Retention(RetentionPolicy.SOURCE)");
+ out.println(" @Target(ElementType.TYPE_USE)");
+ out.println(" @interface C { }");
+ out.println(" void source(@C Test this) { }");
+
+ // default visibility: CLASS
+ out.println(" @Target(ElementType.TYPE_USE)");
+ out.println(" @interface D { }");
+ out.println(" void def(@D Test this) { }");
+ out.println("}");
+ out.close();
+ return f;
+ }
+
+ File compileTestFile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ void countAnnotations() {
+ int expected_all = 3, expected_visibles = 1, expected_invisibles = 2;
+
+ if (expected_all != all) {
+ errors++;
+ System.err.println("expected " + expected_all
+ + " annotations but found " + all);
+ }
+
+ if (expected_visibles != visibles) {
+ errors++;
+ System.err.println("expected " + expected_visibles
+ + " visibles annotations but found " + visibles);
+ }
+
+ if (expected_invisibles != invisibles) {
+ errors++;
+ System.err.println("expected " + expected_invisibles
+ + " invisibles annotations but found " + invisibles);
+ }
+
+ }
+
+ int errors;
+ int all;
+ int visibles;
+ int invisibles;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javap/typeAnnotations/Wildcards.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import com.sun.tools.classfile.*;
+
+/*
+ * @test Wildcards
+ * @bug 6843077
+ * @summary test that annotations target wildcards get emitted to classfile
+ */
+public class Wildcards {
+ public static void main(String[] args) throws Exception {
+ new Wildcards().run();
+ }
+
+ public void run() throws Exception {
+ File javaFile = writeTestFile();
+ File classFile = compileTestFile(javaFile);
+
+ ClassFile cf = ClassFile.read(classFile);
+ test(cf);
+ for (Field f : cf.fields) {
+ test(cf, f);
+ }
+ for (Method m: cf.methods) {
+ test(cf, m);
+ }
+
+ countAnnotations();
+
+ if (errors > 0)
+ throw new Exception(errors + " errors found");
+ System.out.println("PASSED");
+ }
+
+ void test(ClassFile cf) {
+ test(cf, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Method m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ void test(ClassFile cf, Field m) {
+ test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+ test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, String name, boolean visible) {
+ int index = cf.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = cf.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Method m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ // test the result of Attributes.getIndex according to expectations
+ // encoded in the method's name
+ void test(ClassFile cf, Field m, String name, boolean visible) {
+ int index = m.attributes.getIndex(cf.constant_pool, name);
+ if (index != -1) {
+ Attribute attr = m.attributes.get(index);
+ assert attr instanceof RuntimeTypeAnnotations_attribute;
+ RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+ all += tAttr.annotations.length;
+ if (visible)
+ visibles += tAttr.annotations.length;
+ else
+ invisibles += tAttr.annotations.length;
+ }
+ }
+
+ File writeTestFile() throws IOException {
+ File f = new File("Test.java");
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+ out.println("import java.lang.annotation.*;");
+ out.println("import java.util.*;");
+ out.println("class Test { ");
+ out.println(" @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})");
+ out.println(" @interface A { }");
+
+ out.println(" List<? extends @A Number> f;");
+
+ out.println(" List<? extends @A Object> test(List<? extends @A Number> p) {");
+ out.println(" List<? extends @A Object> l;"); // not counted... gets optimized away
+ out.println(" return null;");
+ out.println(" }");
+ out.println("}");
+
+ out.close();
+ return f;
+ }
+
+ File compileTestFile(File f) {
+ int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.8", "-g", f.getPath() });
+ if (rc != 0)
+ throw new Error("compilation failed. rc=" + rc);
+ String path = f.getPath();
+ return new File(path.substring(0, path.length() - 5) + ".class");
+ }
+
+ void countAnnotations() {
+ int expected_visibles = 0, expected_invisibles = 3;
+ int expected_all = expected_visibles + expected_invisibles;
+
+ if (expected_all != all) {
+ errors++;
+ System.err.println("expected " + expected_all
+ + " annotations but found " + all);
+ }
+
+ if (expected_visibles != visibles) {
+ errors++;
+ System.err.println("expected " + expected_visibles
+ + " visibles annotations but found " + visibles);
+ }
+
+ if (expected_invisibles != invisibles) {
+ errors++;
+ System.err.println("expected " + expected_invisibles
+ + " invisibles annotations but found " + invisibles);
+ }
+
+ }
+
+ int errors;
+ int all;
+ int visibles;
+ int invisibles;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/SJavac.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,573 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.*;
+import java.io.*;
+import java.net.*;
+import java.nio.file.*;
+import java.nio.file.attribute.*;
+import java.nio.charset.*;
+
+import com.sun.tools.sjavac.Main;
+
+public
+class SJavac {
+
+ public static void main(String... args) throws Exception {
+ SJavac s = new SJavac();
+ s.test();
+ }
+
+ FileSystem defaultfs = FileSystems.getDefault();
+
+ // Where to put generated sources that will
+ // test aspects of sjavac, ie JTWork/scratch/gensrc
+ Path gensrc;
+ // More gensrc dirs are used to test merging of serveral source roots.
+ Path gensrc2;
+ Path gensrc3;
+
+ // Where to put compiled classes.
+ Path bin;
+ // Where to put c-header files.
+ Path headers;
+
+ // The sjavac compiler.
+ Main main = new Main();
+
+ // Remember the previous bin and headers state here.
+ Map<String,Long> previous_bin_state;
+ Map<String,Long> previous_headers_state;
+
+ public void test() throws Exception {
+ gensrc = defaultfs.getPath("gensrc");
+ gensrc2 = defaultfs.getPath("gensrc2");
+ gensrc3 = defaultfs.getPath("gensrc3");
+ bin = defaultfs.getPath("bin");
+ headers = defaultfs.getPath("headers");
+
+ Files.createDirectory(gensrc);
+ Files.createDirectory(gensrc2);
+ Files.createDirectory(gensrc3);
+ Files.createDirectory(bin);
+ Files.createDirectory(headers);
+
+ initialCompile();
+ incrementalCompileNoChanges();
+ incrementalCompileDroppingClasses();
+ incrementalCompileWithChange();
+ incrementalCompileDropAllNatives();
+ incrementalCompileAddNative();
+ incrementalCompileChangeNative();
+ compileWithOverrideSource();
+ compileWithInvisibleSources();
+ compileCircularSources();
+
+ delete(gensrc);
+ delete(gensrc2);
+ delete(gensrc3);
+ delete(bin);
+ }
+
+ void initialCompile() throws Exception {
+ System.out.println("\nInitial compile of gensrc.");
+ System.out.println("----------------------------");
+ populate(gensrc,
+ "alfa/AINT.java",
+ "package alfa; public interface AINT { void aint(); }",
+
+ "alfa/A.java",
+ "package alfa; public class A implements AINT { "+
+ "public final static int DEFINITION = 17; public void aint() { } }",
+
+ "alfa/AA.java",
+ "package alfa;"+
+ "// A package private class, not contributing to the public api.\n"+
+ "class AA {"+
+ " // A properly nested static inner class.\n"+
+ " static class AAA { }\n"+
+ " // A properly nested inner class.\n"+
+ " class AAAA { }\n"+
+ " Runnable foo() {\n"+
+ " // A proper anonymous class.\n"+
+ " return new Runnable() { public void run() { } };\n"+
+ " }\n"+
+ " AAA aaa;\n"+
+ " AAAA aaaa;\n"+
+ " AAAAA aaaaa;\n"+
+ "}\n"+
+ "class AAAAA {\n"+
+ " // A bad auxiliary class, but no one is referencing it\n"+
+ " // from outside of this source file, therefore it is ok.\n"+
+ "}\n",
+
+ "beta/BINT.java",
+ "package beta;public interface BINT { void foo(); }",
+
+ "beta/B.java",
+ "package beta; import alfa.A; public class B {"+
+ "private int b() { return A.DEFINITION; } native void foo(); }");
+
+ compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false", "--log=debug");
+ previous_bin_state = collectState(bin);
+ previous_headers_state = collectState(headers);
+ }
+
+ void incrementalCompileNoChanges() throws Exception {
+ System.out.println("\nTesting that no change in sources implies no change in binaries.");
+ System.out.println("------------------------------------------------------------------");
+ compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false", "--log=debug");
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyEqual(new_bin_state, previous_bin_state);
+ Map<String,Long> new_headers_state = collectState(headers);
+ verifyEqual(previous_headers_state, new_headers_state);
+ }
+
+ void incrementalCompileDroppingClasses() throws Exception {
+ System.out.println("\nTesting that deleting AA.java deletes all");
+ System.out.println("generated inner class as well as AA.class");
+ System.out.println("-----------------------------------------");
+ removeFrom(gensrc, "alfa/AA.java");
+ compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false", "--log=debug");
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyThatFilesHaveBeenRemoved(previous_bin_state, new_bin_state,
+ "bin/alfa/AA$1.class",
+ "bin/alfa/AA$AAAA.class",
+ "bin/alfa/AA$AAA.class",
+ "bin/alfa/AAAAA.class",
+ "bin/alfa/AA.class");
+
+ previous_bin_state = new_bin_state;
+ Map<String,Long> new_headers_state = collectState(headers);
+ verifyEqual(previous_headers_state, new_headers_state);
+ }
+
+ void incrementalCompileWithChange() throws Exception {
+ System.out.println("\nNow update the A.java file with a new timestamps and");
+ System.out.println("new final static definition. This should trigger a recompile,");
+ System.out.println("not only of alfa, but also beta.");
+ System.out.println("But check that the generated native header was not updated!");
+ System.out.println("Since we did not modify the native api of B.");
+ System.out.println("-------------------------------------------------------------");
+
+ populate(gensrc,"alfa/A.java",
+ "package alfa; public class A implements AINT { "+
+ "public final static int DEFINITION = 18; public void aint() { } private void foo() { } }");
+
+ compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false", "--log=debug");
+ Map<String,Long> new_bin_state = collectState(bin);
+
+ verifyNewerFiles(previous_bin_state, new_bin_state,
+ "bin/alfa/A.class",
+ "bin/alfa/AINT.class",
+ "bin/beta/B.class",
+ "bin/beta/BINT.class",
+ "bin/javac_state");
+ previous_bin_state = new_bin_state;
+
+ Map<String,Long> new_headers_state = collectState(headers);
+ verifyEqual(new_headers_state, previous_headers_state);
+ }
+
+ void incrementalCompileDropAllNatives() throws Exception {
+ System.out.println("\nNow update the B.java file with one less native method,");
+ System.out.println("ie it has no longer any methods!");
+ System.out.println("Verify that beta_B.h is removed!");
+ System.out.println("---------------------------------------------------------");
+
+ populate(gensrc,"beta/B.java",
+ "package beta; import alfa.A; public class B {"+
+ "private int b() { return A.DEFINITION; } }");
+
+ compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false", "--log=debug");
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyNewerFiles(previous_bin_state, new_bin_state,
+ "bin/beta/B.class",
+ "bin/beta/BINT.class",
+ "bin/javac_state");
+ previous_bin_state = new_bin_state;
+
+ Map<String,Long> new_headers_state = collectState(headers);
+ verifyThatFilesHaveBeenRemoved(previous_headers_state, new_headers_state,
+ "headers/beta_B.h");
+ previous_headers_state = new_headers_state;
+ }
+
+ void incrementalCompileAddNative() throws Exception {
+ System.out.println("\nNow update the B.java file with a final static annotated with @Native.");
+ System.out.println("Verify that beta_B.h is added again!");
+ System.out.println("------------------------------------------------------------------------");
+
+ populate(gensrc,"beta/B.java",
+ "package beta; import alfa.A; public class B {"+
+ "private int b() { return A.DEFINITION; } "+
+ "@java.lang.annotation.Native final static int alfa = 42; }");
+
+ compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false", "--log=debug");
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyNewerFiles(previous_bin_state, new_bin_state,
+ "bin/beta/B.class",
+ "bin/beta/BINT.class",
+ "bin/javac_state");
+ previous_bin_state = new_bin_state;
+
+ Map<String,Long> new_headers_state = collectState(headers);
+ verifyThatFilesHaveBeenAdded(previous_headers_state, new_headers_state,
+ "headers/beta_B.h");
+ previous_headers_state = new_headers_state;
+ }
+
+ void incrementalCompileChangeNative() throws Exception {
+ System.out.println("\nNow update the B.java file with a new value for the final static"+
+ " annotated with @Native.");
+ System.out.println("Verify that beta_B.h is rewritten again!");
+ System.out.println("-------------------------------------------------------------------");
+
+ populate(gensrc,"beta/B.java",
+ "package beta; import alfa.A; public class B {"+
+ "private int b() { return A.DEFINITION; } "+
+ "@java.lang.annotation.Native final static int alfa = 43; }");
+
+ compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false", "--log=debug");
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyNewerFiles(previous_bin_state, new_bin_state,
+ "bin/beta/B.class",
+ "bin/beta/BINT.class",
+ "bin/javac_state");
+ previous_bin_state = new_bin_state;
+
+ Map<String,Long> new_headers_state = collectState(headers);
+ verifyNewerFiles(previous_headers_state, new_headers_state,
+ "headers/beta_B.h");
+ previous_headers_state = new_headers_state;
+ }
+
+ void compileWithOverrideSource() throws Exception {
+ System.out.println("\nNow verify that we can override sources to be compiled.");
+ System.out.println("Compile gensrc and gensrc2. However do not compile broken beta.B in gensrc,");
+ System.out.println("only compile ok beta.B in gensrc2.");
+ System.out.println("---------------------------------------------------------------------------");
+
+ delete(gensrc);
+ delete(gensrc2);
+ delete(bin);
+ previous_bin_state = collectState(bin);
+
+ populate(gensrc,"alfa/A.java",
+ "package alfa; import beta.B; import gamma.C; public class A { B b; C c; }",
+ "beta/B.java",
+ "package beta; public class B { broken",
+ "gamma/C.java",
+ "package gamma; public class C { }");
+
+ populate(gensrc2,
+ "beta/B.java",
+ "package beta; public class B { }");
+
+ compile("-x", "beta", "gensrc", "gensrc2", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false");
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
+ "bin/alfa/A.class",
+ "bin/beta/B.class",
+ "bin/gamma/C.class",
+ "bin/javac_state");
+
+ System.out.println("----- Compile with exluded beta went well!");
+ delete(bin);
+ compileExpectFailure("gensrc", "gensrc2", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false");
+
+ System.out.println("----- Compile without exluded beta failed, as expected! Good!");
+ delete(bin);
+ }
+
+ void compileWithInvisibleSources() throws Exception {
+ System.out.println("\nNow verify that we can make sources invisible to linking (sourcepath).");
+ System.out.println("Compile gensrc and link against gensrc2 and gensrc3, however");
+ System.out.println("gensrc2 contains broken code in beta.B, thus we must exclude that package");
+ System.out.println("fortunately gensrc3 contains a proper beta.B.");
+ System.out.println("------------------------------------------------------------------------");
+
+ // Start with a fresh gensrcs and bin.
+ delete(gensrc);
+ delete(gensrc2);
+ delete(gensrc3);
+ delete(bin);
+ previous_bin_state = collectState(bin);
+
+ populate(gensrc,"alfa/A.java",
+ "package alfa; import beta.B; import gamma.C; public class A { B b; C c; }");
+ populate(gensrc2,"beta/B.java",
+ "package beta; public class B { broken",
+ "gamma/C.java",
+ "package gamma; public class C { }");
+ populate(gensrc3, "beta/B.java",
+ "package beta; public class B { }");
+
+ compile("gensrc", "-x", "beta", "-sourcepath", "gensrc2",
+ "-sourcepath", "gensrc3", "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false");
+
+ System.out.println("The first compile went well!");
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
+ "bin/alfa/A.class",
+ "bin/javac_state");
+
+ System.out.println("----- Compile with exluded beta went well!");
+ delete(bin);
+ compileExpectFailure("gensrc", "-sourcepath", "gensrc2", "-sourcepath", "gensrc3",
+ "-d", "bin", "-h", "headers", "-j", "1",
+ "--server:portfile=testserver,background=false");
+
+ System.out.println("----- Compile without exluded beta failed, as expected! Good!");
+ delete(bin);
+ }
+
+ void compileCircularSources() throws Exception {
+ System.out.println("\nNow verify that circular sources split on multiple cores can be compiled.");
+ System.out.println("---------------------------------------------------------------------------");
+
+ // Start with a fresh gensrcs and bin.
+ delete(gensrc);
+ delete(gensrc2);
+ delete(gensrc3);
+ delete(bin);
+ previous_bin_state = collectState(bin);
+
+ populate(gensrc,"alfa/A.java",
+ "package alfa; public class A { beta.B b; }",
+ "beta/B.java",
+ "package beta; public class B { gamma.C c; }",
+ "gamma/C.java",
+ "package gamma; public class C { alfa.A a; }");
+
+ compile("gensrc", "-d", "bin", "-h", "headers", "-j", "3",
+ "--server:portfile=testserver,background=false","--log=debug");
+ Map<String,Long> new_bin_state = collectState(bin);
+ verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
+ "bin/alfa/A.class",
+ "bin/beta/B.class",
+ "bin/gamma/C.class",
+ "bin/javac_state");
+ delete(bin);
+ }
+
+ void removeFrom(Path dir, String... args) throws IOException {
+ for (String filename : args) {
+ Path p = dir.resolve(filename);
+ Files.delete(p);
+ }
+ }
+
+ void populate(Path src, String... args) throws IOException {
+ if (!Files.exists(src)) {
+ Files.createDirectory(src);
+ }
+ String[] a = args;
+ for (int i = 0; i<a.length; i+=2) {
+ String filename = a[i];
+ String content = a[i+1];
+ Path p = src.resolve(filename);
+ Files.createDirectories(p.getParent());
+ PrintWriter out = new PrintWriter(Files.newBufferedWriter(p,
+ Charset.defaultCharset()));
+ out.println(content);
+ out.close();
+ }
+ }
+
+ void delete(Path root) throws IOException {
+ if (!Files.exists(root)) return;
+ Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException
+ {
+ Files.delete(file);
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException e) throws IOException
+ {
+ if (e == null) {
+ if (!dir.equals(root)) Files.delete(dir);
+ return FileVisitResult.CONTINUE;
+ } else {
+ // directory iteration failed
+ throw e;
+ }
+ }
+ });
+ }
+
+ void compile(String... args) throws Exception {
+ int rc = main.go(args, System.out, System.err);
+ if (rc != 0) throw new Exception("Error during compile!");
+
+ // Wait a second, to get around the (temporary) problem with
+ // second resolution in the Java file api. But do not do this
+ // on windows where the timestamps work.
+ long in_a_sec = System.currentTimeMillis()+1000;
+ while (in_a_sec > System.currentTimeMillis()) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+
+ void compileExpectFailure(String... args) throws Exception {
+ int rc = main.go(args, System.out, System.err);
+ if (rc == 0) throw new Exception("Expected error during compile! Did not fail!");
+ }
+
+ Map<String,Long> collectState(Path dir) throws IOException
+ {
+ final Map<String,Long> files = new HashMap<>();
+ Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+ throws IOException
+ {
+ files.put(file.toString(),new Long(Files.getLastModifiedTime(file).toMillis()));
+ return FileVisitResult.CONTINUE;
+ }
+ });
+ return files;
+ }
+
+ void verifyThatFilesHaveBeenRemoved(Map<String,Long> from,
+ Map<String,Long> to,
+ String... args) throws Exception {
+
+ Set<String> froms = from.keySet();
+ Set<String> tos = to.keySet();
+
+ if (froms.equals(tos)) {
+ throw new Exception("Expected new state to have fewer files than previous state!");
+ }
+
+ for (String t : tos) {
+ if (!froms.contains(t)) {
+ throw new Exception("Expected "+t+" to exist in previous state!");
+ }
+ }
+
+ for (String f : args) {
+ f = f.replace("/", File.separator);
+ if (!froms.contains(f)) {
+ throw new Exception("Expected "+f+" to exist in previous state!");
+ }
+ if (tos.contains(f)) {
+ throw new Exception("Expected "+f+" to have been removed from the new state!");
+ }
+ }
+
+ if (froms.size() - args.length != tos.size()) {
+ throw new Exception("There are more removed files than the expected list!");
+ }
+ }
+
+ void verifyThatFilesHaveBeenAdded(Map<String,Long> from,
+ Map<String,Long> to,
+ String... args) throws Exception {
+
+ Set<String> froms = from.keySet();
+ Set<String> tos = to.keySet();
+
+ if (froms.equals(tos)) {
+ throw new Exception("Expected new state to have more files than previous state!");
+ }
+
+ for (String t : froms) {
+ if (!tos.contains(t)) {
+ throw new Exception("Expected "+t+" to exist in new state!");
+ }
+ }
+
+ for (String f : args) {
+ f = f.replace("/", File.separator);
+ if (!tos.contains(f)) {
+ throw new Exception("Expected "+f+" to have been added to new state!");
+ }
+ if (froms.contains(f)) {
+ throw new Exception("Expected "+f+" to not exist in previous state!");
+ }
+ }
+
+ if (froms.size() + args.length != tos.size()) {
+ throw new Exception("There are more added files than the expected list!");
+ }
+ }
+
+ void verifyNewerFiles(Map<String,Long> from,
+ Map<String,Long> to,
+ String... args) throws Exception {
+ if (!from.keySet().equals(to.keySet())) {
+ throw new Exception("Expected the set of files to be identical!");
+ }
+ Set<String> files = new HashSet<String>();
+ for (String s : args) {
+ files.add(s.replace("/", File.separator));
+ }
+ for (String fn : from.keySet()) {
+ long f = from.get(fn);
+ long t = to.get(fn);
+ if (files.contains(fn)) {
+ if (t <= f) {
+ throw new Exception("Expected "+fn+" to have a more recent timestamp!");
+ }
+ } else {
+ if (t != f) {
+ throw new Exception("Expected "+fn+" to have the same timestamp!");
+ }
+ }
+ }
+ }
+
+ String print(Map<String,Long> m) {
+ StringBuilder b = new StringBuilder();
+ Set<String> keys = m.keySet();
+ for (String k : keys) {
+ b.append(k+" "+m.get(k)+"\n");
+ }
+ return b.toString();
+ }
+
+ void verifyEqual(Map<String,Long> from, Map<String,Long> to) throws Exception {
+ if (!from.equals(to)) {
+ System.out.println("FROM---"+print(from));
+ System.out.println("TO-----"+print(to));
+ throw new Exception("The dir should not differ! But it does!");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/SJavacWrapper.java Thu Jan 31 10:22:25 2013 -0800
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test all aspects of sjavac.
+ *
+ * @bug 8004658
+ * @summary Add internal smart javac wrapper to solve JEP 139
+ *
+ * @run main SJavacWrapper
+ */
+
+import java.io.*;
+import java.lang.reflect.Method;
+import java.net.*;
+
+
+public
+class SJavacWrapper {
+
+ public static void main(String... args) throws Exception {
+ URL url = SJavacWrapper.class.getClassLoader().getResource("com/sun/tools/sjavac/Main.class");
+ if (url == null) {
+ // No sjavac in the classpath.
+ System.out.println("sjavac not available: pass by default");
+ return;
+ }
+
+ File testSrc = new File(System.getProperty("test.src"));
+ File sjavac_java = new File(testSrc, "SJavac.java");
+ File testClasses = new File(System.getProperty("test.classes"));
+ File sjavac_class = new File(testClasses, "SJavac.class");
+ if (sjavac_class.lastModified() < sjavac_java.lastModified()) {
+ String[] javac_args = { "-d", testClasses.getPath(), sjavac_java.getPath() };
+ System.err.println("Recompiling SJavac.java");
+ int rc = com.sun.tools.javac.Main.compile(javac_args);
+ if (rc != 0)
+ throw new Exception("compilation failed");
+ }
+
+ Class<?> sjavac = Class.forName("SJavac");
+ Method sjavac_main = sjavac.getMethod("main", String[].class);
+ sjavac_main.invoke(null, new Object[] { args });
+ }
+
+}
--- a/make/install-rules.gmk Thu Jan 31 10:10:34 2013 +0100
+++ b/make/install-rules.gmk Thu Jan 31 10:22:25 2013 -0800
@@ -96,6 +96,9 @@
combo_build:
@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
+ $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all
+ $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo
+ $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all
install-clobber:
ifeq ($(BUILD_INSTALL), true)
--- a/make/jprt.properties Thu Jan 31 10:10:34 2013 +0100
+++ b/make/jprt.properties Thu Jan 31 10:22:25 2013 -0800
@@ -28,6 +28,9 @@
# Locked down to jdk8
jprt.tools.default.release=jdk8
+# Unix toolkit to use for building on windows
+jprt.windows.jdk8.build.unix.toolkit=cygwin
+
# The different build flavors we want, we override here so we just get these 2
jprt.build.flavors=product,fastdebug
@@ -89,6 +92,7 @@
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_time}, \
${jprt.my.test.target.set:TESTNAME=jdk_other}
# All vm test targets (testset=all)
--- a/test/Makefile Thu Jan 31 10:10:34 2013 +0100
+++ b/test/Makefile Thu Jan 31 10:22:25 2013 -0800
@@ -63,7 +63,8 @@
jdk_nio \
jdk_security1 \
jdk_text \
- jdk_util
+ jdk_util \
+ jdk_time
# These tests are not part of the default testing list
JDK_NONDEFAULT_TEST_LIST = \