--- a/.hgtags Thu Sep 05 15:37:40 2013 +0400
+++ b/.hgtags Fri Sep 06 15:09:44 2013 -0700
@@ -225,3 +225,5 @@
edb01c460d4cab21ff0ff13512df7b746efaa0e7 jdk8-b101
bbe43d712fe08e650808d774861b256ccb34e500 jdk8-b102
30a1d677a20c6a95f98043d8f20ce570304e3818 jdk8-b103
+b5ed503c26ad38869c247c5e32debec217fd056b jdk8-b104
+589f4fdc584e373a47cde0162e9eceec9165c381 jdk8-b105
--- a/.hgtags-top-repo Thu Sep 05 15:37:40 2013 +0400
+++ b/.hgtags-top-repo Fri Sep 06 15:09:44 2013 -0700
@@ -225,3 +225,5 @@
9f74a220677dc265a724515d8e2617548cef62f1 jdk8-b101
5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102
b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103
+96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104
+5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105
--- a/NewMakefile.gmk Thu Sep 05 15:37:40 2013 +0400
+++ b/NewMakefile.gmk Fri Sep 06 15:09:44 2013 -0700
@@ -69,11 +69,11 @@
# 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) bundles-only, $(strip $(shell \
- $(MAKE) -p -q -f common/makefiles/Main.gmk SPEC=$(firstword $(SPEC)) | \
+ $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
$(all_phony_targets):
- $(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
+ @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
$(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
.PHONY: $(all_phony_targets)
@@ -98,6 +98,7 @@
$(info . # corba and jdk)
$(info . make all # Compile everything, all repos and images)
$(info . make images # Create complete j2sdk and j2re images)
+ $(info . make docs # Create javadocs)
$(info . make overlay-images # Create limited images for sparc 64 bit platforms)
$(info . make profiles # Create complete j2re compact profile images)
$(info . make bootcycle-images # Build images twice, second time with newly build JDK)
@@ -109,7 +110,7 @@
$(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 (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
$(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!)
--- a/README-builds.html Thu Sep 05 15:37:40 2013 +0400
+++ b/README-builds.html Fri Sep 06 15:09:44 2013 -0700
@@ -154,7 +154,7 @@
</code>
</blockquote>
Once you have all the repositories, keep in mind that each
- repository is it's own independent repository.
+ repository is its own independent repository.
You can also re-run <code>./get_source.sh</code> anytime to
pull over all the latest changesets in all the repositories.
This set of nested repositories has been given the term
@@ -241,6 +241,14 @@
source code for the OpenJDK Corba functionality
</td>
</tr>
+ <tr>
+ <td>
+ nashorn
+ </td>
+ <td>
+ source code for the OpenJDK JavaScript implementation
+ </td>
+ </tr>
</tbody>
</table>
</blockquote>
@@ -386,7 +394,7 @@
<code>--with-boot-jdk</code>.
</li>
<li>
- Insure that GNU make, the Bootstrap JDK,
+ Ensure that GNU make, the Bootstrap JDK,
and the compilers are all
in your PATH environment variable
</li>
@@ -1202,19 +1210,18 @@
<blockquote>
<p>
- <b>Q:</b> The <code>configure</code> file looks horrible!
+ <b>Q:</b> The <code>generated-configure.sh</code> file looks horrible!
How are you going to edit it?
<br>
- <b>A:</b> The <code>configure</code> file is generated (think
+ <b>A:</b> The <code>generated-configure.sh</code> file is generated (think
"compiled") by the autoconf tools. The source code is
- in <code>configure.ac</code> various .m4 files in common/autoconf,
- which are
- much more readable.
+ in <code>configure.ac</code> and various .m4 files in common/autoconf,
+ which are much more readable.
</p>
<p>
<b>Q:</b>
- Why is the <code>configure</code> file checked in,
+ Why is the <code>generated-configure.sh</code> file checked in,
if it is generated?
<br>
<b>A:</b>
@@ -1229,13 +1236,29 @@
<p>
<b>Q:</b>
Do you require a specific version of autoconf for regenerating
- <code>configure</code>?
+ <code>generated-configure.sh</code>?
<br>
<b>A:</b>
- Currently, no, but this will likely be the case when things have
- settled down a bit more. (The reason for this is to avoid
- large spurious changes in <code>configure</code>
- in commits that made small changes to <code>configure.ac</code>).
+ Yes, version 2.69 is required and should be easy
+ enough to aquire on all supported operating
+ systems. The reason for this is to avoid
+ large spurious changes in <code>generated-configure.sh</code>.
+ </p>
+
+ <p>
+ <b>Q:</b>
+ How do you regenerate <code>generated-configure.sh</code>
+ after making changes to the input files?
+ <br>
+ <b>A:</b>
+ Regnerating <code>generated-configure.sh</code>
+ should always be done using the
+ script <code>common/autoconf/autogen.sh</code> to
+ ensure that the correct files get updated. This
+ script should also be run after mercurial tries to
+ merge <code>generated-configure.sh</code> as a
+ merge of the generated file is not guaranteed to
+ be correct.
</p>
<p>
@@ -1307,9 +1330,9 @@
you will need to modify the makefiles. But for normal file
additions or removals, no changes are needed. There are certan
exceptions for some native libraries where the source files are spread
- over many directories which also contain courses for other
+ over many directories which also contain sources for other
libraries. In these cases it was simply easier to create include lists
- rather thane excludes.
+ rather than excludes.
</p>
<p>
@@ -1327,14 +1350,14 @@
<p>
<b>Q:</b>
<code>configure</code> provides OpenJDK-specific features such as
- <code>--enable-jigsaw</code> or <code>--with-builddeps-server</code>
- that are not described in this document. What about those?
+ <code>--with-builddeps-server</code> that are not
+ described in this document. What about those?
<br>
<b>A:</b>
Try them out if you like! But be aware that most of these are
experimental features.
Many of them don't do anything at all at the moment; the option
- is just a placeholder. Other depends on
+ is just a placeholder. Others depend on
pieces of code or infrastructure that is currently
not ready for prime time.
</p>
@@ -1386,24 +1409,6 @@
</p>
<p>
- <b>Q:</b> What is @GenerateNativeHeaders?
- <br>
- <b>A:</b>
- To speed up compilation, we added a flag to javac which makes it
- do the job of javah as well, as a by-product; that is, generating
- native .h header files. These files are only generated
- if a class contains native methods. However, sometimes
- a class contains no native method,
- but still contains constants that native code needs to use.
- The new GenerateNativeHeaders annotation tells javac to
- force generation of a
- header file in these cases. (We don't want to generate
- native headers for all classes that contains constants
- but no native methods, since
- that would slow down the compilation process needlessly.)
- </p>
-
- <p>
<b>Q:</b>
Is anything able to use the results of the new build's default make target?
<br>
@@ -1429,10 +1434,9 @@
What should I do?
<br>
<b>A:</b>
- It might very well be that we have missed to add support for
+ It might very well be that we have neglected to add support for
an option that was actually used from outside the build system.
- Email us and we will
- add support for it!
+ Email us and we will add support for it!
</p>
</blockquote>
--- a/common/autoconf/autogen.sh Thu Sep 05 15:37:40 2013 +0400
+++ b/common/autoconf/autogen.sh Fri Sep 06 15:09:44 2013 -0700
@@ -44,10 +44,8 @@
custom_hook=$custom_script_dir/custom-hook.m4
AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`"
-AUTOCONF_267="`which autoconf-2.67 2> /dev/null | grep -v '^no autoconf-2.67 in'`"
echo "Autoconf found: ${AUTOCONF}"
-echo "Autoconf-2.67 found: ${AUTOCONF_267}"
if test "x${AUTOCONF}" = x; then
echo You need autoconf installed to be able to regenerate the configure script
@@ -55,10 +53,6 @@
exit 1
fi
-if test "x${AUTOCONF_267}" != x; then
- AUTOCONF=${AUTOCONF_267};
-fi
-
echo Generating generated-configure.sh with ${AUTOCONF}
cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh
rm -rf autom4te.cache
--- a/common/autoconf/configure.ac Thu Sep 05 15:37:40 2013 +0400
+++ b/common/autoconf/configure.ac Fri Sep 06 15:09:44 2013 -0700
@@ -30,7 +30,7 @@
###############################################################################
-AC_PREREQ([2.61])
+AC_PREREQ([2.69])
AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
AC_CONFIG_AUX_DIR([build-aux])
--- a/common/autoconf/generated-configure.sh Thu Sep 05 15:37:40 2013 +0400
+++ b/common/autoconf/generated-configure.sh Fri Sep 06 15:09:44 2013 -0700
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
+# Generated by GNU Autoconf 2.69 for OpenJDK jdk8.
#
# Report bugs to <build-dev@openjdk.java.net>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@
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
@@ -135,6 +134,31 @@
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # 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
+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+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -168,7 +192,8 @@
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,14 +238,25 @@
if test "x$CONFIG_SHELL" != x; then :
- # 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.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # 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
+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+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -323,6 +359,14 @@
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -444,6 +488,10 @@
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -478,16 +526,16 @@
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
+ fi
+else
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -499,28 +547,8 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1462,7 +1490,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
@@ -1513,8 +1541,6 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1898,9 +1924,9 @@
if $ac_init_version; then
cat <<\_ACEOF
OpenJDK configure jdk8
-generated by GNU Autoconf 2.67
-
-Copyright (C) 2010 Free Software Foundation, Inc.
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1944,7 +1970,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1982,7 +2008,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
@@ -2020,7 +2046,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_objc_try_compile
@@ -2057,7 +2083,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -2094,7 +2120,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
@@ -2107,10 +2133,10 @@
ac_fn_cxx_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2177,7 +2203,7 @@
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2186,7 +2212,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_cxx_check_header_mongrel
@@ -2227,7 +2253,7 @@
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_run
@@ -2241,7 +2267,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 "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2259,7 +2285,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_cxx_check_header_compile
@@ -2280,7 +2306,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2296,7 +2323,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2322,7 +2350,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2338,7 +2367,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2372,7 +2402,8 @@
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2436,7 +2467,7 @@
rm -f conftest.val
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_cxx_compute_int
@@ -2468,7 +2499,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2482,7 +2513,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
@@ -2495,7 +2526,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 "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2550,7 +2581,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_cxx_check_func
@@ -2563,7 +2594,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 "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2581,7 +2612,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
cat >config.log <<_ACEOF
@@ -2589,7 +2620,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.67. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2847,7 +2878,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
@@ -3433,7 +3464,7 @@
pulse)
PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
x11)
- PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev" ;;
+ PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
ccache)
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
* )
@@ -3452,11 +3483,11 @@
cups)
PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
freetype2)
- PKGHANDLER_COMMAND="sudo yum install freetype2-devel" ;;
+ PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
pulse)
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
x11)
- PKGHANDLER_COMMAND="sudo yum install libXtst-devel" ;;
+ PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
ccache)
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
* )
@@ -3787,7 +3818,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1376579640
+DATE_WHEN_GENERATED=1377850299
###############################################################################
#
@@ -3825,7 +3856,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 test "${ac_cv_path_BASENAME+set}" = set; then :
+if ${ac_cv_path_BASENAME+:} false; then :
$as_echo_n "(cached) " >&6
else
case $BASENAME in
@@ -3839,7 +3870,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_BASENAME="$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
@@ -3884,7 +3915,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 test "${ac_cv_path_BASH+set}" = set; then :
+if ${ac_cv_path_BASH+:} false; then :
$as_echo_n "(cached) " >&6
else
case $BASH in
@@ -3898,7 +3929,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_BASH="$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
@@ -3943,7 +3974,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 test "${ac_cv_path_CAT+set}" = set; then :
+if ${ac_cv_path_CAT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CAT in
@@ -3957,7 +3988,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CAT="$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
@@ -4002,7 +4033,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 test "${ac_cv_path_CHMOD+set}" = set; then :
+if ${ac_cv_path_CHMOD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CHMOD in
@@ -4016,7 +4047,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CHMOD="$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
@@ -4061,7 +4092,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 test "${ac_cv_path_CMP+set}" = set; then :
+if ${ac_cv_path_CMP+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CMP in
@@ -4075,7 +4106,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CMP="$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
@@ -4120,7 +4151,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 test "${ac_cv_path_COMM+set}" = set; then :
+if ${ac_cv_path_COMM+:} false; then :
$as_echo_n "(cached) " >&6
else
case $COMM in
@@ -4134,7 +4165,7 @@
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
+ if as_fn_executable_p "$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
@@ -4179,7 +4210,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 test "${ac_cv_path_CP+set}" = set; then :
+if ${ac_cv_path_CP+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CP in
@@ -4193,7 +4224,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CP="$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
@@ -4238,7 +4269,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 test "${ac_cv_path_CPIO+set}" = set; then :
+if ${ac_cv_path_CPIO+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CPIO in
@@ -4252,7 +4283,7 @@
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
+ if as_fn_executable_p "$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
@@ -4297,7 +4328,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 test "${ac_cv_path_CUT+set}" = set; then :
+if ${ac_cv_path_CUT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CUT in
@@ -4311,7 +4342,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CUT="$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
@@ -4356,7 +4387,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 test "${ac_cv_path_DATE+set}" = set; then :
+if ${ac_cv_path_DATE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $DATE in
@@ -4370,7 +4401,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_DATE="$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
@@ -4415,7 +4446,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 test "${ac_cv_path_DIFF+set}" = set; then :
+if ${ac_cv_path_DIFF+:} false; then :
$as_echo_n "(cached) " >&6
else
case $DIFF in
@@ -4429,7 +4460,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_DIFF="$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
@@ -4474,7 +4505,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 test "${ac_cv_path_DIRNAME+set}" = set; then :
+if ${ac_cv_path_DIRNAME+:} false; then :
$as_echo_n "(cached) " >&6
else
case $DIRNAME in
@@ -4488,7 +4519,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_DIRNAME="$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
@@ -4533,7 +4564,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 test "${ac_cv_path_ECHO+set}" = set; then :
+if ${ac_cv_path_ECHO+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ECHO in
@@ -4547,7 +4578,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ECHO="$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
@@ -4592,7 +4623,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 test "${ac_cv_path_EXPR+set}" = set; then :
+if ${ac_cv_path_EXPR+:} false; then :
$as_echo_n "(cached) " >&6
else
case $EXPR in
@@ -4606,7 +4637,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_EXPR="$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
@@ -4651,7 +4682,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 test "${ac_cv_path_FILE+set}" = set; then :
+if ${ac_cv_path_FILE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $FILE in
@@ -4665,7 +4696,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_FILE="$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
@@ -4710,7 +4741,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 test "${ac_cv_path_FIND+set}" = set; then :
+if ${ac_cv_path_FIND+:} false; then :
$as_echo_n "(cached) " >&6
else
case $FIND in
@@ -4724,7 +4755,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_FIND="$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
@@ -4769,7 +4800,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 test "${ac_cv_path_HEAD+set}" = set; then :
+if ${ac_cv_path_HEAD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $HEAD in
@@ -4783,7 +4814,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_HEAD="$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
@@ -4828,7 +4859,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 test "${ac_cv_path_LN+set}" = set; then :
+if ${ac_cv_path_LN+:} false; then :
$as_echo_n "(cached) " >&6
else
case $LN in
@@ -4842,7 +4873,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_LN="$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
@@ -4887,7 +4918,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 test "${ac_cv_path_LS+set}" = set; then :
+if ${ac_cv_path_LS+:} false; then :
$as_echo_n "(cached) " >&6
else
case $LS in
@@ -4901,7 +4932,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_LS="$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
@@ -4946,7 +4977,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 test "${ac_cv_path_MKDIR+set}" = set; then :
+if ${ac_cv_path_MKDIR+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MKDIR in
@@ -4960,7 +4991,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MKDIR="$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
@@ -5005,7 +5036,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 test "${ac_cv_path_MKTEMP+set}" = set; then :
+if ${ac_cv_path_MKTEMP+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MKTEMP in
@@ -5019,7 +5050,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MKTEMP="$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
@@ -5064,7 +5095,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 test "${ac_cv_path_MV+set}" = set; then :
+if ${ac_cv_path_MV+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MV in
@@ -5078,7 +5109,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MV="$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
@@ -5123,7 +5154,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 test "${ac_cv_path_PRINTF+set}" = set; then :
+if ${ac_cv_path_PRINTF+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PRINTF in
@@ -5137,7 +5168,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PRINTF="$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
@@ -5182,7 +5213,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 test "${ac_cv_path_RM+set}" = set; then :
+if ${ac_cv_path_RM+:} false; then :
$as_echo_n "(cached) " >&6
else
case $RM in
@@ -5196,7 +5227,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_RM="$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
@@ -5241,7 +5272,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 test "${ac_cv_path_SH+set}" = set; then :
+if ${ac_cv_path_SH+:} false; then :
$as_echo_n "(cached) " >&6
else
case $SH in
@@ -5255,7 +5286,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_SH="$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
@@ -5300,7 +5331,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 test "${ac_cv_path_SORT+set}" = set; then :
+if ${ac_cv_path_SORT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $SORT in
@@ -5314,7 +5345,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_SORT="$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
@@ -5359,7 +5390,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 test "${ac_cv_path_TAIL+set}" = set; then :
+if ${ac_cv_path_TAIL+:} false; then :
$as_echo_n "(cached) " >&6
else
case $TAIL in
@@ -5373,7 +5404,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_TAIL="$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
@@ -5418,7 +5449,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 test "${ac_cv_path_TAR+set}" = set; then :
+if ${ac_cv_path_TAR+:} false; then :
$as_echo_n "(cached) " >&6
else
case $TAR in
@@ -5432,7 +5463,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_TAR="$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
@@ -5477,7 +5508,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 test "${ac_cv_path_TEE+set}" = set; then :
+if ${ac_cv_path_TEE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $TEE in
@@ -5491,7 +5522,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_TEE="$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
@@ -5536,7 +5567,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 test "${ac_cv_path_TOUCH+set}" = set; then :
+if ${ac_cv_path_TOUCH+:} false; then :
$as_echo_n "(cached) " >&6
else
case $TOUCH in
@@ -5550,7 +5581,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_TOUCH="$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
@@ -5595,7 +5626,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 test "${ac_cv_path_TR+set}" = set; then :
+if ${ac_cv_path_TR+:} false; then :
$as_echo_n "(cached) " >&6
else
case $TR in
@@ -5609,7 +5640,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_TR="$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
@@ -5654,7 +5685,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 test "${ac_cv_path_UNAME+set}" = set; then :
+if ${ac_cv_path_UNAME+:} false; then :
$as_echo_n "(cached) " >&6
else
case $UNAME in
@@ -5668,7 +5699,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_UNAME="$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
@@ -5713,7 +5744,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 test "${ac_cv_path_UNIQ+set}" = set; then :
+if ${ac_cv_path_UNIQ+:} false; then :
$as_echo_n "(cached) " >&6
else
case $UNIQ in
@@ -5727,7 +5758,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_UNIQ="$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
@@ -5772,7 +5803,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 test "${ac_cv_path_WC+set}" = set; then :
+if ${ac_cv_path_WC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $WC in
@@ -5786,7 +5817,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_WC="$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
@@ -5831,7 +5862,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 test "${ac_cv_path_WHICH+set}" = set; then :
+if ${ac_cv_path_WHICH+:} false; then :
$as_echo_n "(cached) " >&6
else
case $WHICH in
@@ -5845,7 +5876,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_WHICH="$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
@@ -5890,7 +5921,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 test "${ac_cv_path_XARGS+set}" = set; then :
+if ${ac_cv_path_XARGS+:} false; then :
$as_echo_n "(cached) " >&6
else
case $XARGS in
@@ -5904,7 +5935,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_XARGS="$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
@@ -5950,7 +5981,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 test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -5962,7 +5993,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6000,7 +6031,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 test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -6014,7 +6045,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -6075,7 +6106,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -6092,7 +6123,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -6154,7 +6185,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6171,7 +6202,7 @@
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -6233,7 +6264,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 test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -6253,7 +6284,7 @@
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -6319,7 +6350,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 test "${ac_cv_path_NAWK+set}" = set; then :
+if ${ac_cv_path_NAWK+:} false; then :
$as_echo_n "(cached) " >&6
else
case $NAWK in
@@ -6333,7 +6364,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_NAWK="$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
@@ -6383,7 +6414,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 test "${ac_cv_path_CYGPATH+set}" = set; then :
+if ${ac_cv_path_CYGPATH+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CYGPATH in
@@ -6397,7 +6428,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CYGPATH="$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
@@ -6423,7 +6454,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 test "${ac_cv_path_READLINK+set}" = set; then :
+if ${ac_cv_path_READLINK+:} false; then :
$as_echo_n "(cached) " >&6
else
case $READLINK in
@@ -6437,7 +6468,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_READLINK="$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
@@ -6463,7 +6494,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 test "${ac_cv_path_DF+set}" = set; then :
+if ${ac_cv_path_DF+:} false; then :
$as_echo_n "(cached) " >&6
else
case $DF in
@@ -6477,7 +6508,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_DF="$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
@@ -6503,7 +6534,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 test "${ac_cv_path_SETFILE+set}" = set; then :
+if ${ac_cv_path_SETFILE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $SETFILE in
@@ -6517,7 +6548,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_SETFILE="$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
@@ -6549,7 +6580,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
@@ -6565,7 +6596,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='-'
@@ -6583,7 +6614,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
@@ -6598,7 +6629,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='-'
@@ -6616,7 +6647,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+if ${ac_cv_target+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
@@ -6631,7 +6662,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='-'
@@ -8157,7 +8188,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 test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
+if ${ac_cv_prog_PKGHANDLER+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PKGHANDLER"; then
@@ -8169,7 +8200,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_PKGHANDLER="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8522,7 +8553,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 test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
+if ${ac_cv_path_CHECK_GMAKE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_GMAKE in
@@ -8536,7 +8567,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CHECK_GMAKE="$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
@@ -8876,7 +8907,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 test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
+if ${ac_cv_path_CHECK_MAKE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_MAKE in
@@ -8890,7 +8921,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CHECK_MAKE="$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
@@ -9235,7 +9266,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 test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
+if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_TOOLSDIR_GMAKE in
@@ -9249,7 +9280,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CHECK_TOOLSDIR_GMAKE="$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
@@ -9588,7 +9619,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 test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
+if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CHECK_TOOLSDIR_MAKE in
@@ -9602,7 +9633,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CHECK_TOOLSDIR_MAKE="$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
@@ -9984,7 +10015,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 test "${ac_cv_path_UNZIP+set}" = set; then :
+if ${ac_cv_path_UNZIP+:} false; then :
$as_echo_n "(cached) " >&6
else
case $UNZIP in
@@ -9998,7 +10029,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_UNZIP="$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
@@ -10043,7 +10074,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 test "${ac_cv_path_ZIP+set}" = set; then :
+if ${ac_cv_path_ZIP+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ZIP in
@@ -10057,7 +10088,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ZIP="$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
@@ -10102,7 +10133,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 test "${ac_cv_path_LDD+set}" = set; then :
+if ${ac_cv_path_LDD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $LDD in
@@ -10116,7 +10147,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_LDD="$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
@@ -10148,7 +10179,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 test "${ac_cv_path_OTOOL+set}" = set; then :
+if ${ac_cv_path_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
case $OTOOL in
@@ -10162,7 +10193,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_OTOOL="$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
@@ -10193,7 +10224,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 test "${ac_cv_path_READELF+set}" = set; then :
+if ${ac_cv_path_READELF+:} false; then :
$as_echo_n "(cached) " >&6
else
case $READELF in
@@ -10207,7 +10238,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_READELF="$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
@@ -10236,7 +10267,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 test "${ac_cv_path_HG+set}" = set; then :
+if ${ac_cv_path_HG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $HG in
@@ -10250,7 +10281,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_HG="$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
@@ -10276,7 +10307,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 test "${ac_cv_path_STAT+set}" = set; then :
+if ${ac_cv_path_STAT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $STAT in
@@ -10290,7 +10321,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_STAT="$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
@@ -10316,7 +10347,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 test "${ac_cv_path_TIME+set}" = set; then :
+if ${ac_cv_path_TIME+:} false; then :
$as_echo_n "(cached) " >&6
else
case $TIME in
@@ -10330,7 +10361,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_TIME="$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
@@ -10369,7 +10400,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 test "${ac_cv_path_COMM+set}" = set; then :
+if ${ac_cv_path_COMM+:} false; then :
$as_echo_n "(cached) " >&6
else
case $COMM in
@@ -10383,7 +10414,7 @@
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
+ if as_fn_executable_p "$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
@@ -10431,7 +10462,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 test "${ac_cv_path_XATTR+set}" = set; then :
+if ${ac_cv_path_XATTR+:} false; then :
$as_echo_n "(cached) " >&6
else
case $XATTR in
@@ -10445,7 +10476,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_XATTR="$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
@@ -10487,7 +10518,7 @@
set dummy codesign; 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_CODESIGN+set}" = set; then :
+if ${ac_cv_path_CODESIGN+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CODESIGN in
@@ -10501,7 +10532,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CODESIGN="$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
@@ -10551,7 +10582,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 test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -10565,7 +10596,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$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
@@ -10594,7 +10625,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 test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -10608,7 +10639,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$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
@@ -10767,7 +10798,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 test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
+if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$BDEPS_UNZIP"; then
@@ -10779,7 +10810,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_BDEPS_UNZIP="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10813,7 +10844,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 test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
+if ${ac_cv_prog_BDEPS_FTP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$BDEPS_FTP"; then
@@ -10825,7 +10856,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_BDEPS_FTP="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12109,7 +12140,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 test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
+if ${ac_cv_path_JAVAC_CHECK+:} false; then :
$as_echo_n "(cached) " >&6
else
case $JAVAC_CHECK in
@@ -12123,7 +12154,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_JAVAC_CHECK="$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
@@ -12149,7 +12180,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 test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
+if ${ac_cv_path_JAVA_CHECK+:} false; then :
$as_echo_n "(cached) " >&6
else
case $JAVA_CHECK in
@@ -12163,7 +12194,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_JAVA_CHECK="$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
@@ -16478,7 +16509,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 test "${ac_cv_path_JTREGEXE+set}" = set; then :
+if ${ac_cv_path_JTREGEXE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $JTREGEXE in
@@ -16492,7 +16523,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_JTREGEXE="$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
@@ -16546,7 +16577,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 test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
+if ${ac_cv_path_CYGWIN_LINK+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CYGWIN_LINK in
@@ -16560,7 +16591,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CYGWIN_LINK="$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
@@ -17989,7 +18020,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 test "${ac_cv_path_BUILD_CC+set}" = set; then :
+if ${ac_cv_path_BUILD_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_CC in
@@ -18003,7 +18034,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_BUILD_CC="$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
@@ -18300,7 +18331,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 test "${ac_cv_path_BUILD_CXX+set}" = set; then :
+if ${ac_cv_path_BUILD_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_CXX in
@@ -18314,7 +18345,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_BUILD_CXX="$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
@@ -18609,7 +18640,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 test "${ac_cv_path_BUILD_LD+set}" = set; then :
+if ${ac_cv_path_BUILD_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $BUILD_LD in
@@ -18623,7 +18654,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_BUILD_LD="$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
@@ -19116,7 +19147,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 test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
+if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $TOOLS_DIR_CC in
@@ -19130,7 +19161,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_TOOLS_DIR_CC="$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
@@ -19168,7 +19199,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 test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
+if ${ac_cv_path_POTENTIAL_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $POTENTIAL_CC in
@@ -19182,7 +19213,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_POTENTIAL_CC="$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
@@ -19581,7 +19612,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 test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
+if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PROPER_COMPILER_CC"; then
@@ -19593,7 +19624,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_PROPER_COMPILER_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -19625,7 +19656,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 test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PROPER_COMPILER_CC"; then
@@ -19637,7 +19668,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_PROPER_COMPILER_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -20075,7 +20106,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 test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -20087,7 +20118,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -20119,7 +20150,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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -20131,7 +20162,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -20172,7 +20203,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
@@ -20287,7 +20318,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; }
@@ -20330,7 +20361,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
@@ -20389,7 +20420,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
@@ -20400,7 +20431,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 test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20441,7 +20472,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
@@ -20451,7 +20482,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 test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20488,7 +20519,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 test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -20566,7 +20597,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 test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -20575,8 +20606,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -20689,7 +20719,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 test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
+if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
case $TOOLS_DIR_CXX in
@@ -20703,7 +20733,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_TOOLS_DIR_CXX="$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
@@ -20741,7 +20771,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 test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
+if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
case $POTENTIAL_CXX in
@@ -20755,7 +20785,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_POTENTIAL_CXX="$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
@@ -21154,7 +21184,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 test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
+if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PROPER_COMPILER_CXX"; then
@@ -21166,7 +21196,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_PROPER_COMPILER_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21198,7 +21228,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 test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
@@ -21210,7 +21240,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_PROPER_COMPILER_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21652,7 +21682,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 test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -21664,7 +21694,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21696,7 +21726,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 test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -21708,7 +21738,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21774,7 +21804,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 test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21811,7 +21841,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 test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -21909,7 +21939,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 test "${ac_cv_prog_OBJC+set}" = set; then :
+if ${ac_cv_prog_OBJC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJC"; then
@@ -21921,7 +21951,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21953,7 +21983,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 test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJC"; then
@@ -21965,7 +21995,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -22029,7 +22059,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 test "${ac_cv_objc_compiler_gnu+set}" = set; then :
+if ${ac_cv_objc_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22066,7 +22096,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 test "${ac_cv_prog_objc_g+set}" = set; then :
+if ${ac_cv_prog_objc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_objc_werror_flag=$ac_objc_werror_flag
@@ -22442,7 +22472,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 test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -22454,7 +22484,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -22482,7 +22512,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 test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -22494,7 +22524,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -22824,7 +22854,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 test "${ac_cv_prog_WINLD+set}" = set; then :
+if ${ac_cv_prog_WINLD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$WINLD"; then
@@ -22837,7 +22867,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "$CYGWIN_LINK"; then
ac_prog_rejected=yes
continue
@@ -23163,7 +23193,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 test "${ac_cv_prog_MT+set}" = set; then :
+if ${ac_cv_prog_MT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$MT"; then
@@ -23176,7 +23206,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/mt"; then
ac_prog_rejected=yes
continue
@@ -23484,7 +23514,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 test "${ac_cv_prog_RC+set}" = set; then :
+if ${ac_cv_prog_RC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RC"; then
@@ -23497,7 +23527,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/rc"; then
ac_prog_rejected=yes
continue
@@ -23876,7 +23906,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 test "${ac_cv_prog_WINAR+set}" = set; then :
+if ${ac_cv_prog_WINAR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$WINAR"; then
@@ -23888,7 +23918,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_WINAR="lib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -24182,7 +24212,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 test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -24194,7 +24224,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="dumpbin"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -24501,7 +24531,7 @@
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -24617,7 +24647,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
@@ -24901,7 +24931,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 test "${ac_cv_prog_CXXCPP+set}" = set; then :
+ if ${ac_cv_prog_CXXCPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
@@ -25017,7 +25047,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
@@ -25319,7 +25349,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 test "${ac_cv_path_AS+set}" = set; then :
+if ${ac_cv_path_AS+:} false; then :
$as_echo_n "(cached) " >&6
else
case $AS in
@@ -25333,7 +25363,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_AS="$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
@@ -25631,7 +25661,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 test "${ac_cv_path_NM+set}" = set; then :
+if ${ac_cv_path_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
case $NM in
@@ -25645,7 +25675,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_NM="$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
@@ -25937,7 +25967,7 @@
set dummy gnm; 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_GNM+set}" = set; then :
+if ${ac_cv_path_GNM+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GNM in
@@ -25951,7 +25981,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GNM="$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
@@ -26243,7 +26273,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 test "${ac_cv_path_STRIP+set}" = set; then :
+if ${ac_cv_path_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
case $STRIP in
@@ -26257,7 +26287,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_STRIP="$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
@@ -26549,7 +26579,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 test "${ac_cv_path_MCS+set}" = set; then :
+if ${ac_cv_path_MCS+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MCS in
@@ -26563,7 +26593,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MCS="$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
@@ -26857,7 +26887,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 test "${ac_cv_prog_NM+set}" = set; then :
+if ${ac_cv_prog_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -26869,7 +26899,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NM="${ac_tool_prefix}nm"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -26897,7 +26927,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 test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
+if ${ac_cv_prog_ac_ct_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NM"; then
@@ -26909,7 +26939,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NM="nm"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -27217,7 +27247,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 test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -27229,7 +27259,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -27257,7 +27287,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 test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -27269,7 +27299,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -27582,7 +27612,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 test "${ac_cv_prog_OBJCOPY+set}" = set; then :
+if ${ac_cv_prog_OBJCOPY+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJCOPY"; then
@@ -27594,7 +27624,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -27626,7 +27656,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 test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJCOPY"; then
@@ -27638,7 +27668,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -27953,7 +27983,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 test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -27965,7 +27995,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -27997,7 +28027,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 test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -28009,7 +28039,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -28321,7 +28351,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 test "${ac_cv_path_LIPO+set}" = set; then :
+if ${ac_cv_path_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
case $LIPO in
@@ -28335,7 +28365,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_LIPO="$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
@@ -28638,7 +28668,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 test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28813,7 +28843,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" = x""yes; then :
+if test "x$ac_cv_header_stdio_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STDIO_H 1
_ACEOF
@@ -28842,7 +28872,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 test "${ac_cv_sizeof_int_p+set}" = set; then :
+if ${ac_cv_sizeof_int_p+:} false; 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 :
@@ -28852,7 +28882,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
@@ -28899,7 +28929,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 test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
@@ -29573,7 +29603,7 @@
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
# Setting these parameters makes it an error to link to macosx APIs that are
# newer than the given OS version and makes the linked binaries compatible even
# if built on a newer version of the OS.
@@ -30075,8 +30105,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 test "${ac_cv_have_x+set}" = set; then :
+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
@@ -30353,7 +30383,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 test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30387,14 +30417,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" = x""yes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; 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 test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30428,7 +30458,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" = x""yes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
@@ -30447,14 +30477,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" = x""yes; then :
+if test "x$ac_cv_func_gethostbyname" = xyes; 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 test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30488,14 +30518,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" = x""yes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; 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 test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30529,7 +30559,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" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
@@ -30544,14 +30574,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" = x""yes; then :
+if test "x$ac_cv_func_connect" = xyes; 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 test "${ac_cv_lib_socket_connect+set}" = set; then :
+if ${ac_cv_lib_socket_connect+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30585,7 +30615,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" = x""yes; then :
+if test "x$ac_cv_lib_socket_connect" = xyes; then :
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
@@ -30593,14 +30623,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" = x""yes; then :
+if test "x$ac_cv_func_remove" = xyes; 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 test "${ac_cv_lib_posix_remove+set}" = set; then :
+if ${ac_cv_lib_posix_remove+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30634,7 +30664,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" = x""yes; then :
+if test "x$ac_cv_lib_posix_remove" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
@@ -30642,14 +30672,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" = x""yes; then :
+if test "x$ac_cv_func_shmat" = xyes; 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 test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+if ${ac_cv_lib_ipc_shmat+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30683,7 +30713,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" = x""yes; then :
+if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
@@ -30701,7 +30731,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 test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -30735,7 +30765,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" = x""yes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
@@ -30816,7 +30846,7 @@
CFLAGS="$CFLAGS $X_CFLAGS"
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
-for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h
+for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " # include <X11/Xlib.h>
@@ -30869,7 +30899,7 @@
HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
fi
- as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG" "$LINENO" 5
+ as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
fi
@@ -31753,7 +31783,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 test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
+if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -31787,7 +31817,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" = x""yes; then :
+if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
FREETYPE2_FOUND=true
else
as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
@@ -32075,7 +32105,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" = x""yes; then :
+if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ALSA_ASOUNDLIB_H 1
_ACEOF
@@ -32134,7 +32164,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 test "${ac_cv_lib_jpeg_main+set}" = set; then :
+if ${ac_cv_lib_jpeg_main+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32162,7 +32192,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" = x""yes; then :
+if test "x$ac_cv_lib_jpeg_main" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
@@ -32211,7 +32241,7 @@
USE_EXTERNAL_LIBGIF=false
elif test "x${with_giflib}" = "xsystem"; then
ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
+if test "x$ac_cv_header_gif_lib_h" = xyes; then :
else
as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5
@@ -32220,7 +32250,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5
$as_echo_n "checking for DGifGetCode in -lgif... " >&6; }
-if test "${ac_cv_lib_gif_DGifGetCode+set}" = set; then :
+if ${ac_cv_lib_gif_DGifGetCode+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32254,7 +32284,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5
$as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; }
-if test "x$ac_cv_lib_gif_DGifGetCode" = x""yes; then :
+if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGIF 1
_ACEOF
@@ -32286,7 +32316,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
$as_echo_n "checking for compress in -lz... " >&6; }
-if test "${ac_cv_lib_z_compress+set}" = set; then :
+if ${ac_cv_lib_z_compress+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32320,7 +32350,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" = x""yes; then :
+if test "x$ac_cv_lib_z_compress" = xyes; then :
ZLIB_FOUND=yes
else
ZLIB_FOUND=no
@@ -32413,7 +32443,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
$as_echo_n "checking for cos in -lm... " >&6; }
-if test "${ac_cv_lib_m_cos+set}" = set; then :
+if ${ac_cv_lib_m_cos+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32447,7 +32477,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" = x""yes; then :
+if test "x$ac_cv_lib_m_cos" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -32471,7 +32501,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 test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -32505,7 +32535,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" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
_ACEOF
@@ -32735,7 +32765,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
@@ -32751,7 +32781,7 @@
set dummy llvm-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 test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then :
+if ${ac_cv_prog_LLVM_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LLVM_CONFIG"; then
@@ -32763,7 +32793,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LLVM_CONFIG="llvm-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -33367,7 +33397,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 test "${ac_cv_path_CCACHE+set}" = set; then :
+if ${ac_cv_path_CCACHE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $CCACHE in
@@ -33381,7 +33411,7 @@
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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CCACHE="$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
@@ -33629,10 +33659,21 @@
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ 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
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;}
@@ -33664,7 +33705,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"
@@ -33765,6 +33806,7 @@
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
@@ -33960,16 +34002,16 @@
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
+ fi
+else
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -34029,28 +34071,16 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -34072,7 +34102,7 @@
# values after options handling.
ac_log="
This file was extended by OpenJDK $as_me jdk8, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -34135,10 +34165,10 @@
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.67,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -34227,7 +34257,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -34264,7 +34294,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
@@ -34286,9 +34316,10 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -34296,12 +34327,13 @@
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$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.
@@ -34323,7 +34355,7 @@
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
@@ -34351,7 +34383,7 @@
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -34399,7 +34431,7 @@
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -34431,7 +34463,7 @@
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
@@ -34465,7 +34497,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 >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -34477,8 +34509,8 @@
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -34579,7 +34611,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
@@ -34598,7 +34630,7 @@
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_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 `:'.
@@ -34607,7 +34639,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'"
@@ -34633,8 +34665,8 @@
esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -34759,21 +34791,22 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack
"
-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
+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
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { 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"; } &&
{ $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 "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -34784,20 +34817,20 @@
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$ac_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 "$tmp/config.h" "$ac_file" \
+ mv "$ac_tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
;;
--- a/common/autoconf/help.m4 Thu Sep 05 15:37:40 2013 +0400
+++ b/common/autoconf/help.m4 Fri Sep 06 15:09:44 2013 -0700
@@ -83,7 +83,7 @@
pulse)
PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
x11)
- PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev" ;;
+ PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
ccache)
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
* )
@@ -102,11 +102,11 @@
cups)
PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
freetype2)
- PKGHANDLER_COMMAND="sudo yum install freetype2-devel" ;;
+ PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
pulse)
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
x11)
- PKGHANDLER_COMMAND="sudo yum install libXtst-devel" ;;
+ PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
ccache)
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
* )
--- a/common/autoconf/libraries.m4 Thu Sep 05 15:37:40 2013 +0400
+++ b/common/autoconf/libraries.m4 Fri Sep 06 15:09:44 2013 -0700
@@ -185,7 +185,7 @@
CFLAGS="$CFLAGS $X_CFLAGS"
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
-AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h],
+AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
[X11_A_OK=yes],
[X11_A_OK=no; break],
[ # include <X11/Xlib.h>
@@ -197,7 +197,7 @@
if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
HELP_MSG_MISSING_DEPENDENCY([x11])
- AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG])
+ AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
fi
AC_SUBST(X_CFLAGS)
--- a/common/autoconf/toolchain.m4 Thu Sep 05 15:37:40 2013 +0400
+++ b/common/autoconf/toolchain.m4 Fri Sep 06 15:09:44 2013 -0700
@@ -905,7 +905,7 @@
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
# Setting these parameters makes it an error to link to macosx APIs that are
# newer than the given OS version and makes the linked binaries compatible even
# if built on a newer version of the OS.
--- a/common/makefiles/Main.gmk Thu Sep 05 15:37:40 2013 +0400
+++ b/common/makefiles/Main.gmk Fri Sep 06 15:09:44 2013 -0700
@@ -183,7 +183,7 @@
test: images test-only
test-only: start-make
@$(call TargetEnter)
- @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
+ @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
@$(call TargetExit)
# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
@@ -242,7 +242,7 @@
.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
-.PHONY: all clean dist-clean bootcycle-images start-make
+.PHONY: default all clean dist-clean bootcycle-images start-make
.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
.PHONY: profiles profiles-only profiles-oscheck
--- a/corba/.hgtags Thu Sep 05 15:37:40 2013 +0400
+++ b/corba/.hgtags Fri Sep 06 15:09:44 2013 -0700
@@ -225,3 +225,5 @@
a013024b07475782f1fa8e196e950b34b4077663 jdk8-b101
528c7e76eaeee022817ee085668459bc97cf5665 jdk8-b102
49c4a777fdfd648d4c3fffc940fdb97a23108ca8 jdk8-b103
+d411c60a8c2fe8fdc572af907775e90f7eefd513 jdk8-b104
+4e38de7c767e34104fa147b5b346d9fe6b731279 jdk8-b105
--- a/hotspot/.hgtags Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/.hgtags Fri Sep 06 15:09:44 2013 -0700
@@ -369,3 +369,7 @@
7f55137d6aa81efc6eb0035813709f2cb6a26b8b hs25-b45
6f9be7f87b9653e94fd8fb3070891a0cc91b15bf jdk8-b103
580430d131ccd475e2f2ad4006531b8c4813d102 hs25-b46
+104743074675359cfbf7f4dcd9ab2a5974a16627 jdk8-b104
+c1604d5885a6f2adc0bcea2fa142a8f6bafad2f0 hs25-b47
+acac3bde66b2c22791c257a8d99611d6d08c6713 jdk8-b105
+18b4798adbc42c6fa16f5ecb7d5cd3ca130754bf hs25-b48
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Fri Sep 06 15:09:44 2013 -0700
@@ -75,19 +75,19 @@
javaFieldsCount = new CIntField(type.getCIntegerField("_java_fields_count"), 0);
constants = new MetadataField(type.getAddressField("_constants"), 0);
classLoaderData = type.getAddressField("_class_loader_data");
- sourceFileName = type.getAddressField("_source_file_name");
sourceDebugExtension = type.getAddressField("_source_debug_extension");
innerClasses = type.getAddressField("_inner_classes");
+ sourceFileNameIndex = new CIntField(type.getCIntegerField("_source_file_name_index"), 0);
nonstaticFieldSize = new CIntField(type.getCIntegerField("_nonstatic_field_size"), 0);
staticFieldSize = new CIntField(type.getCIntegerField("_static_field_size"), 0);
- staticOopFieldCount = new CIntField(type.getCIntegerField("_static_oop_field_count"), 0);
+ staticOopFieldCount = new CIntField(type.getCIntegerField("_static_oop_field_count"), 0);
nonstaticOopMapSize = new CIntField(type.getCIntegerField("_nonstatic_oop_map_size"), 0);
isMarkedDependent = new CIntField(type.getCIntegerField("_is_marked_dependent"), 0);
initState = new CIntField(type.getCIntegerField("_init_state"), 0);
vtableLen = new CIntField(type.getCIntegerField("_vtable_len"), 0);
itableLen = new CIntField(type.getCIntegerField("_itable_len"), 0);
breakpoints = type.getAddressField("_breakpoints");
- genericSignature = type.getAddressField("_generic_signature");
+ genericSignatureIndex = new CIntField(type.getCIntegerField("_generic_signature_index"), 0);
majorVersion = new CIntField(type.getCIntegerField("_major_version"), 0);
minorVersion = new CIntField(type.getCIntegerField("_minor_version"), 0);
headerSize = Oop.alignObjectOffset(type.getSize());
@@ -134,9 +134,9 @@
private static CIntField javaFieldsCount;
private static MetadataField constants;
private static AddressField classLoaderData;
- private static AddressField sourceFileName;
private static AddressField sourceDebugExtension;
private static AddressField innerClasses;
+ private static CIntField sourceFileNameIndex;
private static CIntField nonstaticFieldSize;
private static CIntField staticFieldSize;
private static CIntField staticOopFieldCount;
@@ -146,7 +146,7 @@
private static CIntField vtableLen;
private static CIntField itableLen;
private static AddressField breakpoints;
- private static AddressField genericSignature;
+ private static CIntField genericSignatureIndex;
private static CIntField majorVersion;
private static CIntField minorVersion;
@@ -346,7 +346,7 @@
public ConstantPool getConstants() { return (ConstantPool) constants.getValue(this); }
public ClassLoaderData getClassLoaderData() { return ClassLoaderData.instantiateWrapperFor(classLoaderData.getValue(getAddress())); }
public Oop getClassLoader() { return getClassLoaderData().getClassLoader(); }
- public Symbol getSourceFileName() { return getSymbol(sourceFileName); }
+ public Symbol getSourceFileName() { return getConstants().getSymbolAt(sourceFileNameIndex.getValue(this)); }
public String getSourceDebugExtension(){ return CStringUtilities.getString(sourceDebugExtension.getValue(getAddress())); }
public long getNonstaticFieldSize() { return nonstaticFieldSize.getValue(this); }
public long getStaticOopFieldCount() { return staticOopFieldCount.getValue(this); }
@@ -354,7 +354,7 @@
public boolean getIsMarkedDependent() { return isMarkedDependent.getValue(this) != 0; }
public long getVtableLen() { return vtableLen.getValue(this); }
public long getItableLen() { return itableLen.getValue(this); }
- public Symbol getGenericSignature() { return getSymbol(genericSignature); }
+ public Symbol getGenericSignature() { return getConstants().getSymbolAt(genericSignatureIndex.getValue(this)); }
public long majorVersion() { return majorVersion.getValue(this); }
public long minorVersion() { return minorVersion.getValue(this); }
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java Fri Sep 06 15:09:44 2013 -0700
@@ -92,8 +92,13 @@
System.err.println("Warning: Can not create class filter!");
}
}
- String outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
- setOutputDirectory(outputDirectory);
+
+ // outputDirectory and jarStream are alternatives: setting one closes the other.
+ // If neither is set, use outputDirectory from the System property:
+ if (outputDirectory == null && jarStream == null) {
+ String dirName = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
+ setOutputDirectory(dirName);
+ }
// walk through the system dictionary
SystemDictionary dict = VM.getVM().getSystemDictionary();
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js Fri Sep 06 15:09:44 2013 -0700
@@ -35,8 +35,9 @@
sapkg.code = sapkg.hotspot.code;
sapkg.compiler = sapkg.hotspot.compiler;
-// 'debugger' is a JavaScript keyword :-(
-// sapkg.debugger = sapkg.hotspot.debugger;
+// 'debugger' is a JavaScript keyword, but ES5 relaxes the
+// restriction of using keywords as property name
+sapkg.debugger = sapkg.hotspot.debugger;
sapkg.interpreter = sapkg.hotspot.interpreter;
sapkg.jdi = sapkg.hotspot.jdi;
@@ -116,27 +117,36 @@
return args;
}
+ // Handle __has__ specially to avoid metacircularity problems
+ // when called from __get__.
+ // Calling
+ // this.__has__(name)
+ // will in turn call
+ // this.__call__('__has__', name)
+ // which is not handled below
+ function __has__(name) {
+ if (typeof(name) == 'number') {
+ return so["has(int)"](name);
+ } else {
+ if (name == '__wrapped__') {
+ return true;
+ } else if (so["has(java.lang.String)"](name)) {
+ return true;
+ } else if (name.equals('toString')) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+
if (so instanceof sapkg.utilities.soql.ScriptObject) {
return new JSAdapter() {
- __getIds__: function() {
- return so.getIds();
+ __getIds__: function() {
+ return so.getIds();
},
- __has__ : function(name) {
- if (typeof(name) == 'number') {
- return so["has(int)"](name);
- } else {
- if (name == '__wrapped__') {
- return true;
- } else if (so["has(java.lang.String)"](name)) {
- return true;
- } else if (name.equals('toString')) {
- return true;
- } else {
- return false;
- }
- }
- },
+ __has__ : __has__,
__delete__ : function(name) {
if (typeof(name) == 'number') {
@@ -147,7 +157,8 @@
},
__get__ : function(name) {
- if (! this.__has__(name)) {
+ // don't call this.__has__(name); see comments above function __has__
+ if (! __has__.call(this, name)) {
return undefined;
}
if (typeof(name) == 'number') {
@@ -162,7 +173,7 @@
var args = prepareArgsArray(arguments);
var r;
try {
- r = value.call(args);
+ r = value.call(Java.to(args, 'java.lang.Object[]'));
} catch (e) {
println("call to " + name + " failed!");
throw e;
@@ -204,6 +215,18 @@
}
// define "writeln" and "write" if not defined
+ if (typeof(println) == 'undefined') {
+ println = function (str) {
+ java.lang.System.out.println(String(str));
+ }
+ }
+
+ if (typeof(print) == 'undefined') {
+ print = function (str) {
+ java.lang.System.out.print(String(str));
+ }
+ }
+
if (typeof(writeln) == 'undefined') {
writeln = println;
}
@@ -235,7 +258,7 @@
this.jclasses = function() {
forEachKlass(function (clazz) {
- writeln(clazz.getName().asString() + " @" + clazz.getHandle().toString());
+ writeln(clazz.getName().asString() + " @" + clazz.getAddress().toString());
});
}
registerCommand("classes", "classes", "jclasses");
@@ -490,14 +513,14 @@
function forEachKlass(callback) {
var VisitorClass = sapkg.memory.SystemDictionary.ClassVisitor;
var visitor = new VisitorClass() { visit: callback };
- sa.sysDict["classesDo(sun.jvm.hotspot.memory.SystemDictionary$ClassVisitor)"](visitor);
+ sa.sysDict["classesDo(sun.jvm.hotspot.memory.SystemDictionary.ClassVisitor)"](visitor);
}
// iterate system dictionary for each 'Klass' and initiating loader
function forEachKlassAndLoader(callback) {
var VisitorClass = sapkg.memory.SystemDictionary.ClassAndLoaderVisitor;
var visitor = new VisitorClass() { visit: callback };
- sa.sysDict["classesDo(sun.jvm.hotspot.memory.SystemDictionary$ClassAndLoaderVisitor)"](visitor);
+ sa.sysDict["classesDo(sun.jvm.hotspot.memory.SystemDictionary.ClassAndLoaderVisitor)"](visitor);
}
// iterate system dictionary for each primitive array klass
@@ -522,7 +545,12 @@
// iterates Java heap for each Oop
function forEachOop(callback) {
- sa.objHeap.iterate(new sapkg.oops.HeapVisitor() { doObj: callback });
+ function empty() { }
+ sa.objHeap.iterate(new sapkg.oops.HeapVisitor() {
+ prologue: empty,
+ doObj: callback,
+ epilogue: empty
+ });
}
// iterates Java heap for each Oop of given 'klass'.
@@ -536,8 +564,14 @@
if (includeSubtypes == undefined) {
includeSubtypes = true;
}
+
+ function empty() { }
sa.objHeap.iterateObjectsOfKlass(
- new sapkg.oops.HeapVisitor() { doObj: callback },
+ new sapkg.oops.HeapVisitor() {
+ prologue: empty,
+ doObj: callback,
+ epilogue: empty
+ },
klass, includeSubtypes);
}
@@ -746,9 +780,9 @@
// ignore;
continue;
} else {
- // some type names have ':'. replace to make it as a
+ // some type names have ':', '<', '>', '*', ' '. replace to make it as a
// JavaScript identifier
- tmp.name = tmp.name.replace(':', '_').replace('<', '_').replace('>', '_').replace('*', '_').replace(' ', '_');
+ tmp.name = ("" + tmp.name).replace(/[:<>* ]/g, '_');
eval("function read" + tmp.name + "(addr) {" +
" return readVMType('" + tmp.name + "', addr);}");
eval("function print" + tmp.name + "(addr) {" +
--- a/hotspot/make/bsd/makefiles/gcc.make Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/bsd/makefiles/gcc.make Fri Sep 06 15:09:44 2013 -0700
@@ -247,7 +247,7 @@
# Not yet supported by clang in Xcode 4.6.2
# WARNINGS_ARE_ERRORS += -Wno-tautological-constant-out-of-range-compare
WARNINGS_ARE_ERRORS += -Wno-delete-non-virtual-dtor -Wno-deprecated -Wno-format -Wno-dynamic-class-memaccess
- WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
+ WARNINGS_ARE_ERRORS += -Wno-empty-body
endif
WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef
--- a/hotspot/make/hotspot_version Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/hotspot_version Fri Sep 06 15:09:44 2013 -0700
@@ -35,7 +35,7 @@
HS_MAJOR_VER=25
HS_MINOR_VER=0
-HS_BUILD_NUMBER=46
+HS_BUILD_NUMBER=48
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
--- a/hotspot/make/linux/makefiles/amd64.make Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/linux/makefiles/amd64.make Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -31,9 +31,4 @@
CFLAGS += -D_LP64=1
-# The serviceability agent relies on frame pointer (%rbp) to walk thread stack
-ifndef USE_SUNCC
- CFLAGS += -fno-omit-frame-pointer
-endif
-
OPT_CFLAGS/compactingPermGenGen.o = -O1
--- a/hotspot/make/linux/makefiles/gcc.make Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/linux/makefiles/gcc.make Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -398,3 +398,10 @@
ifdef MINIMIZE_RAM_USAGE
CFLAGS += -DMINIMIZE_RAM_USAGE
endif
+
+# Stack walking in the JVM relies on frame pointer (%rbp) to walk thread stack.
+# Explicitly specify -fno-omit-frame-pointer because it is off by default
+# starting with gcc 4.6.
+ifndef USE_SUNCC
+ CFLAGS += -fno-omit-frame-pointer
+endif
--- a/hotspot/make/windows/build_vm_def.sh Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/windows/build_vm_def.sh Fri Sep 06 15:09:44 2013 -0700
@@ -42,8 +42,6 @@
MKS_HOME=`dirname "$SH"`
fi
-echo "EXPORTS" > vm1.def
-
AWK="$MKS_HOME/awk.exe"
if [ ! -e $AWK ]; then
AWK="$MKS_HOME/gawk.exe"
@@ -55,6 +53,22 @@
RM="$MKS_HOME/rm.exe"
DUMPBIN="link.exe /dump"
+if [ "$1" = "-nosa" ]; then
+ echo EXPORTS > vm.def
+ echo ""
+ echo "***"
+ echo "*** Not building SA: BUILD_WIN_SA != 1"
+ echo "*** C++ Vtables NOT included in vm.def"
+ echo "*** This jvm.dll will NOT work properly with SA."
+ echo "***"
+ echo "*** When in doubt, set BUILD_WIN_SA=1, clean and rebuild."
+ echo "***"
+ echo ""
+ exit
+fi
+
+echo "EXPORTS" > vm1.def
+
# When called from IDE the first param should contain the link version, otherwise may be nill
if [ "x$1" != "x" ]; then
LD_VER="$1"
--- a/hotspot/make/windows/makefiles/debug.make Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/windows/makefiles/debug.make Fri Sep 06 15:09:44 2013 -0700
@@ -49,9 +49,6 @@
# Force resources to be rebuilt every time
$(Res_Files): FORCE
-vm.def: $(Obj_Files)
- sh $(WorkSpace)/make/windows/build_vm_def.sh
-
$(AOUT): $(Res_Files) $(Obj_Files) vm.def
$(LD) @<<
$(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
--- a/hotspot/make/windows/makefiles/fastdebug.make Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/windows/makefiles/fastdebug.make Fri Sep 06 15:09:44 2013 -0700
@@ -48,9 +48,6 @@
# Force resources to be rebuilt every time
$(Res_Files): FORCE
-vm.def: $(Obj_Files)
- sh $(WorkSpace)/make/windows/build_vm_def.sh
-
$(AOUT): $(Res_Files) $(Obj_Files) vm.def
$(LD) @<<
$(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
--- a/hotspot/make/windows/makefiles/product.make Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/windows/makefiles/product.make Fri Sep 06 15:09:44 2013 -0700
@@ -51,9 +51,6 @@
# Force resources to be rebuilt every time
$(Res_Files): FORCE
-vm.def: $(Obj_Files)
- sh $(WorkSpace)/make/windows/build_vm_def.sh
-
$(AOUT): $(Res_Files) $(Obj_Files) vm.def
$(LD) @<<
$(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
--- a/hotspot/make/windows/makefiles/projectcreator.make Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/windows/makefiles/projectcreator.make Fri Sep 06 15:09:44 2013 -0700
@@ -92,6 +92,10 @@
-disablePch getThread_windows_$(Platform_arch).cpp \
-disablePch_compiler2 opcodes.cpp
+!if "$(BUILD_WIN_SA)" != "1"
+BUILD_VM_DEF_FLAG=-nosa
+!endif
+
# Common options for the IDE builds for c1, and c2
ProjectCreatorIDEOptions=\
$(ProjectCreatorIDEOptions) \
@@ -104,7 +108,7 @@
-jdkTargetRoot $(HOTSPOTJDKDIST) \
-define ALIGN_STACK_FRAMES \
-define VM_LITTLE_ENDIAN \
- -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \
+ -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(BUILD_VM_DEF_FLAG) $(LD_VER)" \
-ignoreFile jsig.c \
-ignoreFile jvmtiEnvRecommended.cpp \
-ignoreFile jvmtiEnvStub.cpp \
--- a/hotspot/make/windows/makefiles/vm.make Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/make/windows/makefiles/vm.make Fri Sep 06 15:09:44 2013 -0700
@@ -393,3 +393,11 @@
_build_pch_file.obj:
@echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
$(CXX) $(CXX_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp
+
+!if "$(BUILD_WIN_SA)" != "1"
+BUILD_VM_DEF_FLAG=-nosa
+!endif
+
+vm.def: $(Obj_Files)
+ sh $(WorkSpace)/make/windows/build_vm_def.sh $(BUILD_VM_DEF_FLAG)
+
--- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -29,6 +29,7 @@
#include "interpreter/interpreter.hpp"
#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -1145,7 +1146,7 @@
assert(oop_recorder() != NULL, "this assembler needs an OopRecorder");
int klass_index = oop_recorder()->find_index(k);
RelocationHolder rspec = metadata_Relocation::spec(klass_index);
- narrowOop encoded_k = oopDesc::encode_klass(k);
+ narrowOop encoded_k = Klass::encode_klass(k);
assert_not_delayed();
// Relocation with special format (see relocInfo_sparc.hpp).
@@ -1419,7 +1420,6 @@
load_klass(O0_obj, O0_obj);
// assert((klass != NULL)
br_null_short(O0_obj, pn, fail);
- // TODO: Future assert that klass is lower 4g memory for UseCompressedKlassPointers
wrccr( O5_save_flags ); // Restore CCR's
@@ -4089,52 +4089,91 @@
}
void MacroAssembler::encode_klass_not_null(Register r) {
- assert(Metaspace::is_initialized(), "metaspace should be initialized");
assert (UseCompressedKlassPointers, "must be compressed");
- assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
- if (Universe::narrow_klass_base() != NULL)
- sub(r, G6_heapbase, r);
- srlx(r, LogKlassAlignmentInBytes, r);
+ assert(Universe::narrow_klass_base() != NULL, "narrow_klass_base should be initialized");
+ assert(r != G6_heapbase, "bad register choice");
+ set((intptr_t)Universe::narrow_klass_base(), G6_heapbase);
+ sub(r, G6_heapbase, r);
+ if (Universe::narrow_klass_shift() != 0) {
+ assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
+ srlx(r, LogKlassAlignmentInBytes, r);
+ }
+ reinit_heapbase();
}
void MacroAssembler::encode_klass_not_null(Register src, Register dst) {
- assert(Metaspace::is_initialized(), "metaspace should be initialized");
- assert (UseCompressedKlassPointers, "must be compressed");
- assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
- if (Universe::narrow_klass_base() == NULL) {
- srlx(src, LogKlassAlignmentInBytes, dst);
+ if (src == dst) {
+ encode_klass_not_null(src);
} else {
- sub(src, G6_heapbase, dst);
- srlx(dst, LogKlassAlignmentInBytes, dst);
+ assert (UseCompressedKlassPointers, "must be compressed");
+ assert(Universe::narrow_klass_base() != NULL, "narrow_klass_base should be initialized");
+ set((intptr_t)Universe::narrow_klass_base(), dst);
+ sub(src, dst, dst);
+ if (Universe::narrow_klass_shift() != 0) {
+ srlx(dst, LogKlassAlignmentInBytes, dst);
+ }
}
}
+// Function instr_size_for_decode_klass_not_null() counts the instructions
+// generated by decode_klass_not_null() and reinit_heapbase(). Hence, if
+// the instructions they generate change, then this method needs to be updated.
+int MacroAssembler::instr_size_for_decode_klass_not_null() {
+ assert (UseCompressedKlassPointers, "only for compressed klass ptrs");
+ // set + add + set
+ int num_instrs = insts_for_internal_set((intptr_t)Universe::narrow_klass_base()) + 1 +
+ insts_for_internal_set((intptr_t)Universe::narrow_ptrs_base());
+ if (Universe::narrow_klass_shift() == 0) {
+ return num_instrs * BytesPerInstWord;
+ } else { // sllx
+ return (num_instrs + 1) * BytesPerInstWord;
+ }
+}
+
+// !!! If the instructions that get generated here change then function
+// instr_size_for_decode_klass_not_null() needs to get updated.
void MacroAssembler::decode_klass_not_null(Register r) {
- assert(Metaspace::is_initialized(), "metaspace should be initialized");
// Do not add assert code to this unless you change vtableStubs_sparc.cpp
// pd_code_size_limit.
assert (UseCompressedKlassPointers, "must be compressed");
- assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
- sllx(r, LogKlassAlignmentInBytes, r);
- if (Universe::narrow_klass_base() != NULL)
- add(r, G6_heapbase, r);
+ assert(Universe::narrow_klass_base() != NULL, "narrow_klass_base should be initialized");
+ assert(r != G6_heapbase, "bad register choice");
+ set((intptr_t)Universe::narrow_klass_base(), G6_heapbase);
+ if (Universe::narrow_klass_shift() != 0)
+ sllx(r, LogKlassAlignmentInBytes, r);
+ add(r, G6_heapbase, r);
+ reinit_heapbase();
}
void MacroAssembler::decode_klass_not_null(Register src, Register dst) {
- assert(Metaspace::is_initialized(), "metaspace should be initialized");
- // Do not add assert code to this unless you change vtableStubs_sparc.cpp
- // pd_code_size_limit.
- assert (UseCompressedKlassPointers, "must be compressed");
- assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
- sllx(src, LogKlassAlignmentInBytes, dst);
- if (Universe::narrow_klass_base() != NULL)
- add(dst, G6_heapbase, dst);
+ if (src == dst) {
+ decode_klass_not_null(src);
+ } else {
+ // Do not add assert code to this unless you change vtableStubs_sparc.cpp
+ // pd_code_size_limit.
+ assert (UseCompressedKlassPointers, "must be compressed");
+ assert(Universe::narrow_klass_base() != NULL, "narrow_klass_base should be initialized");
+ if (Universe::narrow_klass_shift() != 0) {
+ assert((src != G6_heapbase) && (dst != G6_heapbase), "bad register choice");
+ set((intptr_t)Universe::narrow_klass_base(), G6_heapbase);
+ sllx(src, LogKlassAlignmentInBytes, dst);
+ add(dst, G6_heapbase, dst);
+ reinit_heapbase();
+ } else {
+ set((intptr_t)Universe::narrow_klass_base(), dst);
+ add(src, dst, dst);
+ }
+ }
}
void MacroAssembler::reinit_heapbase() {
if (UseCompressedOops || UseCompressedKlassPointers) {
- AddressLiteral base(Universe::narrow_ptrs_base_addr());
- load_ptr_contents(base, G6_heapbase);
+ if (Universe::heap() != NULL) {
+ set((intptr_t)Universe::narrow_ptrs_base(), G6_heapbase);
+ } else {
+ AddressLiteral base(Universe::narrow_ptrs_base_addr());
+ load_ptr_contents(base, G6_heapbase);
+ }
}
}
--- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -1177,6 +1177,9 @@
void push_CPU_state();
void pop_CPU_state();
+ // Returns the byte size of the instructions generated by decode_klass_not_null().
+ static int instr_size_for_decode_klass_not_null();
+
// if heap base register is used - reinit it with the correct value
void reinit_heapbase();
--- a/hotspot/src/cpu/sparc/vm/relocInfo_sparc.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/sparc/vm/relocInfo_sparc.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -97,7 +97,7 @@
guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi");
if (format() != 0) {
assert(type() == relocInfo::oop_type || type() == relocInfo::metadata_type, "only narrow oops or klasses case");
- jint np = type() == relocInfo::oop_type ? oopDesc::encode_heap_oop((oop)x) : oopDesc::encode_klass((Klass*)x);
+ jint np = type() == relocInfo::oop_type ? oopDesc::encode_heap_oop((oop)x) : Klass::encode_klass((Klass*)x);
inst &= ~Assembler::hi22(-1);
inst |= Assembler::hi22((intptr_t)np);
if (verify_only) {
--- a/hotspot/src/cpu/sparc/vm/sparc.ad Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad Fri Sep 06 15:09:44 2013 -0700
@@ -559,10 +559,7 @@
int klass_load_size;
if (UseCompressedKlassPointers) {
assert(Universe::heap() != NULL, "java heap should be initialized");
- if (Universe::narrow_klass_base() == NULL)
- klass_load_size = 2*BytesPerInstWord; // see MacroAssembler::load_klass()
- else
- klass_load_size = 3*BytesPerInstWord;
+ klass_load_size = MacroAssembler::instr_size_for_decode_klass_not_null() + 1*BytesPerInstWord;
} else {
klass_load_size = 1*BytesPerInstWord;
}
@@ -1663,9 +1660,12 @@
if (UseCompressedKlassPointers) {
assert(Universe::heap() != NULL, "java heap should be initialized");
st->print_cr("\tLDUW [R_O0 + oopDesc::klass_offset_in_bytes],R_G5\t! Inline cache check - compressed klass");
- st->print_cr("\tSLL R_G5,3,R_G5");
- if (Universe::narrow_klass_base() != NULL)
- st->print_cr("\tADD R_G5,R_G6_heap_base,R_G5");
+ st->print_cr("\tSET Universe::narrow_klass_base,R_G6_heap_base");
+ if (Universe::narrow_klass_shift() != 0) {
+ st->print_cr("\tSLL R_G5,3,R_G5");
+ }
+ st->print_cr("\tADD R_G5,R_G6_heap_base,R_G5");
+ st->print_cr("\tSET Universe::narrow_ptrs_base,R_G6_heap_base");
} else {
st->print_cr("\tLDX [R_O0 + oopDesc::klass_offset_in_bytes],R_G5\t! Inline cache check");
}
@@ -2563,10 +2563,7 @@
int klass_load_size;
if (UseCompressedKlassPointers) {
assert(Universe::heap() != NULL, "java heap should be initialized");
- if (Universe::narrow_klass_base() == NULL)
- klass_load_size = 2*BytesPerInstWord;
- else
- klass_load_size = 3*BytesPerInstWord;
+ klass_load_size = MacroAssembler::instr_size_for_decode_klass_not_null() + 1*BytesPerInstWord;
} else {
klass_load_size = 1*BytesPerInstWord;
}
--- a/hotspot/src/cpu/sparc/vm/vtableStubs_sparc.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/sparc/vm/vtableStubs_sparc.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -219,13 +219,13 @@
const int basic = 5*BytesPerInstWord +
// shift;add for load_klass (only shift with zero heap based)
(UseCompressedKlassPointers ?
- ((Universe::narrow_klass_base() == NULL) ? BytesPerInstWord : 2*BytesPerInstWord) : 0);
+ MacroAssembler::instr_size_for_decode_klass_not_null() : 0);
return basic + slop;
} else {
const int basic = (28 LP64_ONLY(+ 6)) * BytesPerInstWord +
// shift;add for load_klass (only shift with zero heap based)
(UseCompressedKlassPointers ?
- ((Universe::narrow_klass_base() == NULL) ? BytesPerInstWord : 2*BytesPerInstWord) : 0);
+ MacroAssembler::instr_size_for_decode_klass_not_null() : 0);
return (basic + slop);
}
}
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,7 @@
#include "interpreter/interpreter.hpp"
#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -4810,23 +4811,8 @@
}
void MacroAssembler::load_prototype_header(Register dst, Register src) {
-#ifdef _LP64
- if (UseCompressedKlassPointers) {
- assert (Universe::heap() != NULL, "java heap should be initialized");
- movl(dst, Address(src, oopDesc::klass_offset_in_bytes()));
- if (Universe::narrow_klass_shift() != 0) {
- assert(LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
- assert(LogKlassAlignmentInBytes == Address::times_8, "klass not aligned on 64bits?");
- movq(dst, Address(r12_heapbase, dst, Address::times_8, Klass::prototype_header_offset()));
- } else {
- movq(dst, Address(dst, Klass::prototype_header_offset()));
- }
- } else
-#endif
- {
- movptr(dst, Address(src, oopDesc::klass_offset_in_bytes()));
- movptr(dst, Address(dst, Klass::prototype_header_offset()));
- }
+ load_klass(dst, src);
+ movptr(dst, Address(dst, Klass::prototype_header_offset()));
}
void MacroAssembler::store_klass(Register dst, Register src) {
@@ -4914,7 +4900,7 @@
#ifdef ASSERT
void MacroAssembler::verify_heapbase(const char* msg) {
- assert (UseCompressedOops || UseCompressedKlassPointers, "should be compressed");
+ assert (UseCompressedOops, "should be compressed");
assert (Universe::heap() != NULL, "java heap should be initialized");
if (CheckCompressedOops) {
Label ok;
@@ -5058,69 +5044,80 @@
}
void MacroAssembler::encode_klass_not_null(Register r) {
- assert(Metaspace::is_initialized(), "metaspace should be initialized");
-#ifdef ASSERT
- verify_heapbase("MacroAssembler::encode_klass_not_null: heap base corrupted?");
-#endif
- if (Universe::narrow_klass_base() != NULL) {
- subq(r, r12_heapbase);
- }
+ assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
+ // Use r12 as a scratch register in which to temporarily load the narrow_klass_base.
+ assert(r != r12_heapbase, "Encoding a klass in r12");
+ mov64(r12_heapbase, (int64_t)Universe::narrow_klass_base());
+ subq(r, r12_heapbase);
if (Universe::narrow_klass_shift() != 0) {
assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
shrq(r, LogKlassAlignmentInBytes);
}
+ reinit_heapbase();
}
void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
- assert(Metaspace::is_initialized(), "metaspace should be initialized");
-#ifdef ASSERT
- verify_heapbase("MacroAssembler::encode_klass_not_null2: heap base corrupted?");
-#endif
- if (dst != src) {
- movq(dst, src);
- }
- if (Universe::narrow_klass_base() != NULL) {
- subq(dst, r12_heapbase);
- }
- if (Universe::narrow_klass_shift() != 0) {
- assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
- shrq(dst, LogKlassAlignmentInBytes);
- }
-}
-
+ if (dst == src) {
+ encode_klass_not_null(src);
+ } else {
+ mov64(dst, (int64_t)Universe::narrow_klass_base());
+ negq(dst);
+ addq(dst, src);
+ if (Universe::narrow_klass_shift() != 0) {
+ assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
+ shrq(dst, LogKlassAlignmentInBytes);
+ }
+ }
+}
+
+// Function instr_size_for_decode_klass_not_null() counts the instructions
+// generated by decode_klass_not_null(register r) and reinit_heapbase(),
+// when (Universe::heap() != NULL). Hence, if the instructions they
+// generate change, then this method needs to be updated.
+int MacroAssembler::instr_size_for_decode_klass_not_null() {
+ assert (UseCompressedKlassPointers, "only for compressed klass ptrs");
+ // mov64 + addq + shlq? + mov64 (for reinit_heapbase()).
+ return (Universe::narrow_klass_shift() == 0 ? 20 : 24);
+}
+
+// !!! If the instructions that get generated here change then function
+// instr_size_for_decode_klass_not_null() needs to get updated.
void MacroAssembler::decode_klass_not_null(Register r) {
- assert(Metaspace::is_initialized(), "metaspace should be initialized");
// Note: it will change flags
+ assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
assert (UseCompressedKlassPointers, "should only be used for compressed headers");
+ assert(r != r12_heapbase, "Decoding a klass in r12");
// Cannot assert, unverified entry point counts instructions (see .ad file)
// vtableStubs also counts instructions in pd_code_size_limit.
// Also do not verify_oop as this is called by verify_oop.
if (Universe::narrow_klass_shift() != 0) {
assert(LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
shlq(r, LogKlassAlignmentInBytes);
- if (Universe::narrow_klass_base() != NULL) {
- addq(r, r12_heapbase);
- }
- } else {
- assert (Universe::narrow_klass_base() == NULL, "sanity");
- }
+ }
+ // Use r12 as a scratch register in which to temporarily load the narrow_klass_base.
+ mov64(r12_heapbase, (int64_t)Universe::narrow_klass_base());
+ addq(r, r12_heapbase);
+ reinit_heapbase();
}
void MacroAssembler::decode_klass_not_null(Register dst, Register src) {
- assert(Metaspace::is_initialized(), "metaspace should be initialized");
// Note: it will change flags
+ assert(Universe::narrow_klass_base() != NULL, "Base should be initialized");
assert (UseCompressedKlassPointers, "should only be used for compressed headers");
- // Cannot assert, unverified entry point counts instructions (see .ad file)
- // vtableStubs also counts instructions in pd_code_size_limit.
- // Also do not verify_oop as this is called by verify_oop.
- if (Universe::narrow_klass_shift() != 0) {
- assert(LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
- assert(LogKlassAlignmentInBytes == Address::times_8, "klass not aligned on 64bits?");
- leaq(dst, Address(r12_heapbase, src, Address::times_8, 0));
+ if (dst == src) {
+ decode_klass_not_null(dst);
} else {
- assert (Universe::narrow_klass_base() == NULL, "sanity");
- if (dst != src) {
- movq(dst, src);
+ // Cannot assert, unverified entry point counts instructions (see .ad file)
+ // vtableStubs also counts instructions in pd_code_size_limit.
+ // Also do not verify_oop as this is called by verify_oop.
+
+ mov64(dst, (int64_t)Universe::narrow_klass_base());
+ if (Universe::narrow_klass_shift() != 0) {
+ assert(LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong");
+ assert(LogKlassAlignmentInBytes == Address::times_8, "klass not aligned on 64bits?");
+ leaq(dst, Address(dst, src, Address::times_8, 0));
+ } else {
+ addq(dst, src);
}
}
}
@@ -5148,7 +5145,7 @@
assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
int klass_index = oop_recorder()->find_index(k);
RelocationHolder rspec = metadata_Relocation::spec(klass_index);
- mov_narrow_oop(dst, oopDesc::encode_klass(k), rspec);
+ mov_narrow_oop(dst, Klass::encode_klass(k), rspec);
}
void MacroAssembler::set_narrow_klass(Address dst, Klass* k) {
@@ -5156,7 +5153,7 @@
assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
int klass_index = oop_recorder()->find_index(k);
RelocationHolder rspec = metadata_Relocation::spec(klass_index);
- mov_narrow_oop(dst, oopDesc::encode_klass(k), rspec);
+ mov_narrow_oop(dst, Klass::encode_klass(k), rspec);
}
void MacroAssembler::cmp_narrow_oop(Register dst, jobject obj) {
@@ -5182,7 +5179,7 @@
assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
int klass_index = oop_recorder()->find_index(k);
RelocationHolder rspec = metadata_Relocation::spec(klass_index);
- Assembler::cmp_narrow_oop(dst, oopDesc::encode_klass(k), rspec);
+ Assembler::cmp_narrow_oop(dst, Klass::encode_klass(k), rspec);
}
void MacroAssembler::cmp_narrow_klass(Address dst, Klass* k) {
@@ -5190,14 +5187,23 @@
assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
int klass_index = oop_recorder()->find_index(k);
RelocationHolder rspec = metadata_Relocation::spec(klass_index);
- Assembler::cmp_narrow_oop(dst, oopDesc::encode_klass(k), rspec);
+ Assembler::cmp_narrow_oop(dst, Klass::encode_klass(k), rspec);
}
void MacroAssembler::reinit_heapbase() {
if (UseCompressedOops || UseCompressedKlassPointers) {
- movptr(r12_heapbase, ExternalAddress((address)Universe::narrow_ptrs_base_addr()));
- }
-}
+ if (Universe::heap() != NULL) {
+ if (Universe::narrow_oop_base() == NULL) {
+ MacroAssembler::xorptr(r12_heapbase, r12_heapbase);
+ } else {
+ mov64(r12_heapbase, (int64_t)Universe::narrow_ptrs_base());
+ }
+ } else {
+ movptr(r12_heapbase, ExternalAddress((address)Universe::narrow_ptrs_base_addr()));
+ }
+ }
+}
+
#endif // _LP64
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -371,6 +371,10 @@
void cmp_narrow_klass(Register dst, Klass* k);
void cmp_narrow_klass(Address dst, Klass* k);
+ // Returns the byte size of the instructions generated by decode_klass_not_null()
+ // when compressed klass pointers are being used.
+ static int instr_size_for_decode_klass_not_null();
+
// if heap base register is used - reinit it with the correct value
void reinit_heapbase();
--- a/hotspot/src/cpu/x86/vm/relocInfo_x86.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/x86/vm/relocInfo_x86.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -55,9 +55,9 @@
}
} else {
if (verify_only) {
- assert(*(uint32_t*) disp == oopDesc::encode_klass((Klass*)x), "instructions must match");
+ assert(*(uint32_t*) disp == Klass::encode_klass((Klass*)x), "instructions must match");
} else {
- *(int32_t*) disp = oopDesc::encode_klass((Klass*)x);
+ *(int32_t*) disp = Klass::encode_klass((Klass*)x);
}
}
} else {
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -675,7 +675,6 @@
__ movptr(rax, Address(rax, oopDesc::klass_offset_in_bytes())); // get klass
__ testptr(rax, rax);
__ jcc(Assembler::zero, error); // if klass is NULL it is broken
- // TODO: Future assert that klass is lower 4g memory for UseCompressedKlassPointers
// return if everything seems ok
__ bind(exit);
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -1021,7 +1021,6 @@
__ load_klass(rax, rax); // get klass
__ testptr(rax, rax);
__ jcc(Assembler::zero, error); // if klass is NULL it is broken
- // TODO: Future assert that klass is lower 4g memory for UseCompressedKlassPointers
// return if everything seems ok
__ bind(exit);
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -849,9 +849,9 @@
address entry = __ pc();
// rbx,: Method*
- // rsi: senderSP must preserved for slow path, set SP to it on fast path
- // rdx: scratch
- // rdi: scratch
+ // r13: senderSP must preserved for slow path, set SP to it on fast path
+ // c_rarg0: scratch (rdi on non-Win64, rcx on Win64)
+ // c_rarg1: scratch (rsi on non-Win64, rdx on Win64)
Label slow_path;
// If we need a safepoint check, generate full interpreter entry.
@@ -865,8 +865,8 @@
// Load parameters
const Register crc = rax; // crc
- const Register val = rdx; // source java byte value
- const Register tbl = rdi; // scratch
+ const Register val = c_rarg0; // source java byte value
+ const Register tbl = c_rarg1; // scratch
// Arguments are reversed on java expression stack
__ movl(val, Address(rsp, wordSize)); // byte value
@@ -880,7 +880,7 @@
// _areturn
__ pop(rdi); // get return address
- __ mov(rsp, rsi); // set sp to sender sp
+ __ mov(rsp, r13); // set sp to sender sp
__ jmp(rdi);
// generate a vanilla native entry as the slow path
@@ -919,20 +919,24 @@
const Register crc = c_rarg0; // crc
const Register buf = c_rarg1; // source java byte array address
const Register len = c_rarg2; // length
+ const Register off = len; // offset (never overlaps with 'len')
// Arguments are reversed on java expression stack
- __ movl(len, Address(rsp, wordSize)); // Length
// Calculate address of start element
if (kind == Interpreter::java_util_zip_CRC32_updateByteBuffer) {
__ movptr(buf, Address(rsp, 3*wordSize)); // long buf
- __ addptr(buf, Address(rsp, 2*wordSize)); // + offset
+ __ movl2ptr(off, Address(rsp, 2*wordSize)); // offset
+ __ addq(buf, off); // + offset
__ movl(crc, Address(rsp, 5*wordSize)); // Initial CRC
} else {
__ movptr(buf, Address(rsp, 3*wordSize)); // byte[] array
__ addptr(buf, arrayOopDesc::base_offset_in_bytes(T_BYTE)); // + header size
- __ addptr(buf, Address(rsp, 2*wordSize)); // + offset
+ __ movl2ptr(off, Address(rsp, 2*wordSize)); // offset
+ __ addq(buf, off); // + offset
__ movl(crc, Address(rsp, 4*wordSize)); // Initial CRC
}
+ // Can now load 'len' since we're finished with 'off'
+ __ movl(len, Address(rsp, wordSize)); // Length
__ super_call_VM_leaf(CAST_FROM_FN_PTR(address, StubRoutines::updateBytesCRC32()), crc, buf, len);
// result in rax
--- a/hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -211,11 +211,11 @@
if (is_vtable_stub) {
// Vtable stub size
return (DebugVtables ? 512 : 24) + (CountCompiledCalls ? 13 : 0) +
- (UseCompressedKlassPointers ? 16 : 0); // 1 leaq can be 3 bytes + 1 long
+ (UseCompressedKlassPointers ? MacroAssembler::instr_size_for_decode_klass_not_null() : 0);
} else {
// Itable stub size
return (DebugVtables ? 512 : 74) + (CountCompiledCalls ? 13 : 0) +
- (UseCompressedKlassPointers ? 32 : 0); // 2 leaqs
+ (UseCompressedKlassPointers ? MacroAssembler::instr_size_for_decode_klass_not_null() : 0);
}
// In order to tune these parameters, run the JVM with VM options
// +PrintMiscellaneous and +WizardMode to see information about
--- a/hotspot/src/cpu/x86/vm/x86_64.ad Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad Fri Sep 06 15:09:44 2013 -0700
@@ -1393,9 +1393,7 @@
{
if (UseCompressedKlassPointers) {
st->print_cr("movl rscratch1, [j_rarg0 + oopDesc::klass_offset_in_bytes()]\t# compressed klass");
- if (Universe::narrow_klass_shift() != 0) {
- st->print_cr("\tdecode_klass_not_null rscratch1, rscratch1");
- }
+ st->print_cr("\tdecode_klass_not_null rscratch1, rscratch1");
st->print_cr("\tcmpq rax, rscratch1\t # Inline cache check");
} else {
st->print_cr("\tcmpq rax, [j_rarg0 + oopDesc::klass_offset_in_bytes()]\t"
@@ -4035,146 +4033,6 @@
%}
%}
-operand indirectNarrowKlass(rRegN reg)
-%{
- predicate(Universe::narrow_klass_shift() == 0);
- constraint(ALLOC_IN_RC(ptr_reg));
- match(DecodeNKlass reg);
-
- format %{ "[$reg]" %}
- interface(MEMORY_INTER) %{
- base($reg);
- index(0x4);
- scale(0x0);
- disp(0x0);
- %}
-%}
-
-operand indOffset8NarrowKlass(rRegN reg, immL8 off)
-%{
- predicate(Universe::narrow_klass_shift() == 0);
- constraint(ALLOC_IN_RC(ptr_reg));
- match(AddP (DecodeNKlass reg) off);
-
- format %{ "[$reg + $off (8-bit)]" %}
- interface(MEMORY_INTER) %{
- base($reg);
- index(0x4);
- scale(0x0);
- disp($off);
- %}
-%}
-
-operand indOffset32NarrowKlass(rRegN reg, immL32 off)
-%{
- predicate(Universe::narrow_klass_shift() == 0);
- constraint(ALLOC_IN_RC(ptr_reg));
- match(AddP (DecodeNKlass reg) off);
-
- format %{ "[$reg + $off (32-bit)]" %}
- interface(MEMORY_INTER) %{
- base($reg);
- index(0x4);
- scale(0x0);
- disp($off);
- %}
-%}
-
-operand indIndexOffsetNarrowKlass(rRegN reg, rRegL lreg, immL32 off)
-%{
- predicate(Universe::narrow_klass_shift() == 0);
- constraint(ALLOC_IN_RC(ptr_reg));
- match(AddP (AddP (DecodeNKlass reg) lreg) off);
-
- op_cost(10);
- format %{"[$reg + $off + $lreg]" %}
- interface(MEMORY_INTER) %{
- base($reg);
- index($lreg);
- scale(0x0);
- disp($off);
- %}
-%}
-
-operand indIndexNarrowKlass(rRegN reg, rRegL lreg)
-%{
- predicate(Universe::narrow_klass_shift() == 0);
- constraint(ALLOC_IN_RC(ptr_reg));
- match(AddP (DecodeNKlass reg) lreg);
-
- op_cost(10);
- format %{"[$reg + $lreg]" %}
- interface(MEMORY_INTER) %{
- base($reg);
- index($lreg);
- scale(0x0);
- disp(0x0);
- %}
-%}
-
-operand indIndexScaleNarrowKlass(rRegN reg, rRegL lreg, immI2 scale)
-%{
- predicate(Universe::narrow_klass_shift() == 0);
- constraint(ALLOC_IN_RC(ptr_reg));
- match(AddP (DecodeNKlass reg) (LShiftL lreg scale));
-
- op_cost(10);
- format %{"[$reg + $lreg << $scale]" %}
- interface(MEMORY_INTER) %{
- base($reg);
- index($lreg);
- scale($scale);
- disp(0x0);
- %}
-%}
-
-operand indIndexScaleOffsetNarrowKlass(rRegN reg, immL32 off, rRegL lreg, immI2 scale)
-%{
- predicate(Universe::narrow_klass_shift() == 0);
- constraint(ALLOC_IN_RC(ptr_reg));
- match(AddP (AddP (DecodeNKlass reg) (LShiftL lreg scale)) off);
-
- op_cost(10);
- format %{"[$reg + $off + $lreg << $scale]" %}
- interface(MEMORY_INTER) %{
- base($reg);
- index($lreg);
- scale($scale);
- disp($off);
- %}
-%}
-
-operand indCompressedKlassOffset(rRegN reg, immL32 off) %{
- predicate(UseCompressedKlassPointers && (Universe::narrow_klass_shift() == Address::times_8));
- constraint(ALLOC_IN_RC(ptr_reg));
- match(AddP (DecodeNKlass reg) off);
-
- op_cost(10);
- format %{"[R12 + $reg << 3 + $off] (compressed klass addressing)" %}
- interface(MEMORY_INTER) %{
- base(0xc); // R12
- index($reg);
- scale(0x3);
- disp($off);
- %}
-%}
-
-operand indPosIndexScaleOffsetNarrowKlass(rRegN reg, immL32 off, rRegI idx, immI2 scale)
-%{
- constraint(ALLOC_IN_RC(ptr_reg));
- predicate(Universe::narrow_klass_shift() == 0 && n->in(2)->in(3)->in(1)->as_Type()->type()->is_long()->_lo >= 0);
- match(AddP (AddP (DecodeNKlass reg) (LShiftL (ConvI2L idx) scale)) off);
-
- op_cost(10);
- format %{"[$reg + $off + $idx << $scale]" %}
- interface(MEMORY_INTER) %{
- base($reg);
- index($idx);
- scale($scale);
- disp($off);
- %}
-%}
-
//----------Special Memory Operands--------------------------------------------
// Stack Slot Operand - This operand is used for loading and storing temporary
// values on the stack where a match requires a value to
@@ -4345,11 +4203,7 @@
indCompressedOopOffset,
indirectNarrow, indOffset8Narrow, indOffset32Narrow,
indIndexOffsetNarrow, indIndexNarrow, indIndexScaleNarrow,
- indIndexScaleOffsetNarrow, indPosIndexScaleOffsetNarrow,
- indCompressedKlassOffset,
- indirectNarrowKlass, indOffset8NarrowKlass, indOffset32NarrowKlass,
- indIndexOffsetNarrowKlass, indIndexNarrowKlass, indIndexScaleNarrowKlass,
- indIndexScaleOffsetNarrowKlass, indPosIndexScaleOffsetNarrowKlass);
+ indIndexScaleOffsetNarrow, indPosIndexScaleOffsetNarrow);
//----------PIPELINE-----------------------------------------------------------
// Rules which define the behavior of the target architectures pipeline.
@@ -6665,7 +6519,7 @@
instruct encodeKlass_not_null(rRegN dst, rRegP src, rFlagsReg cr) %{
match(Set dst (EncodePKlass src));
effect(KILL cr);
- format %{ "encode_heap_oop_not_null $dst,$src" %}
+ format %{ "encode_klass_not_null $dst,$src" %}
ins_encode %{
__ encode_klass_not_null($dst$$Register, $src$$Register);
%}
@@ -6675,7 +6529,7 @@
instruct decodeKlass_not_null(rRegP dst, rRegN src, rFlagsReg cr) %{
match(Set dst (DecodeNKlass src));
effect(KILL cr);
- format %{ "decode_heap_oop_not_null $dst,$src" %}
+ format %{ "decode_klass_not_null $dst,$src" %}
ins_encode %{
Register s = $src$$Register;
Register d = $dst$$Register;
--- a/hotspot/src/cpu/zero/vm/assembler_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/assembler_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -50,6 +50,7 @@
#ifdef ASSERT
bool AbstractAssembler::pd_check_instruction_mark() {
ShouldNotCallThis();
+ return false;
}
#endif
@@ -73,6 +74,7 @@
RegisterOrConstant MacroAssembler::delayed_value_impl(
intptr_t* delayed_value_addr, Register tmpl, int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant();
}
void MacroAssembler::store_oop(jobject obj) {
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -1008,6 +1008,7 @@
address CppInterpreter::return_entry(TosState state, int length) {
ShouldNotCallThis();
+ return NULL;
}
address CppInterpreter::deopt_entry(TosState state, int length) {
--- a/hotspot/src/cpu/zero/vm/frame_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/frame_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -116,6 +116,7 @@
bool frame::safe_for_sender(JavaThread *thread) {
ShouldNotCallThis();
+ return false;
}
void frame::pd_gc_epilog() {
@@ -123,6 +124,7 @@
bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
ShouldNotCallThis();
+ return false;
}
BasicType frame::interpreter_frame_result(oop* oop_result,
@@ -184,9 +186,8 @@
int frame::frame_size(RegisterMap* map) const {
#ifdef PRODUCT
ShouldNotCallThis();
-#else
+#endif // PRODUCT
return 0; // make javaVFrame::print_value work
-#endif // PRODUCT
}
intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
--- a/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -36,7 +36,7 @@
_deopt_state = unknown;
}
-inline address frame::sender_pc() const { ShouldNotCallThis(); }
+inline address frame::sender_pc() const { ShouldNotCallThis(); return NULL; }
inline frame::frame(ZeroFrame* zf, intptr_t* sp) {
_zeroframe = zf;
@@ -89,6 +89,7 @@
inline intptr_t* frame::link() const {
ShouldNotCallThis();
+ return NULL;
}
#ifdef CC_INTERP
@@ -151,14 +152,17 @@
inline oop frame::saved_oop_result(RegisterMap* map) const {
ShouldNotCallThis();
+ return NULL;
}
inline bool frame::is_older(intptr_t* id) const {
ShouldNotCallThis();
+ return false;
}
inline intptr_t* frame::entry_frame_argument_at(int offset) const {
ShouldNotCallThis();
+ return NULL;
}
inline intptr_t* frame::unextended_sp() const {
--- a/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -49,8 +49,10 @@
address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL;
}
void* InlineCacheBuffer::ic_buffer_cached_value(address code_begin) {
ShouldNotCallThis();
+ return NULL;
}
--- a/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -40,6 +40,7 @@
Register tmp,
int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant();
}
};
--- a/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -64,6 +64,7 @@
return NULL;
Unimplemented();
+ return NULL;
}
address InterpreterGenerator::generate_abstract_entry() {
--- a/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -51,15 +51,18 @@
public:
bool is_jump() {
ShouldNotCallThis();
+ return false;
}
bool is_safepoint_poll() {
ShouldNotCallThis();
+ return false;
}
};
inline NativeInstruction* nativeInstruction_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeCall : public NativeInstruction {
@@ -70,18 +73,22 @@
address instruction_address() const {
ShouldNotCallThis();
+ return NULL;
}
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL;
}
address return_address() const {
ShouldNotCallThis();
+ return NULL;
}
address destination() const {
ShouldNotCallThis();
+ return NULL;
}
void set_destination_mt_safe(address dest) {
@@ -98,25 +105,30 @@
static bool is_call_before(address return_address) {
ShouldNotCallThis();
+ return false;
}
};
inline NativeCall* nativeCall_before(address return_address) {
ShouldNotCallThis();
+ return NULL;
}
inline NativeCall* nativeCall_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeMovConstReg : public NativeInstruction {
public:
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL;
}
intptr_t data() const {
ShouldNotCallThis();
+ return 0;
}
void set_data(intptr_t x) {
@@ -126,12 +138,14 @@
inline NativeMovConstReg* nativeMovConstReg_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeMovRegMem : public NativeInstruction {
public:
int offset() const {
ShouldNotCallThis();
+ return 0;
}
void set_offset(intptr_t x) {
@@ -145,6 +159,7 @@
inline NativeMovRegMem* nativeMovRegMem_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeJump : public NativeInstruction {
@@ -155,6 +170,7 @@
address jump_destination() const {
ShouldNotCallThis();
+ return NULL;
}
void set_jump_destination(address dest) {
@@ -172,12 +188,14 @@
inline NativeJump* nativeJump_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeGeneralJump : public NativeInstruction {
public:
address jump_destination() const {
ShouldNotCallThis();
+ return NULL;
}
static void insert_unconditional(address code_pos, address entry) {
@@ -191,6 +209,7 @@
inline NativeGeneralJump* nativeGeneralJump_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
#endif // CPU_ZERO_VM_NATIVEINST_ZERO_HPP
--- a/hotspot/src/cpu/zero/vm/register_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/register_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -32,8 +32,10 @@
const char* RegisterImpl::name() const {
ShouldNotCallThis();
+ return NULL;
}
const char* FloatRegisterImpl::name() const {
ShouldNotCallThis();
+ return NULL;
}
--- a/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -37,6 +37,7 @@
address Relocation::pd_call_destination(address orig_addr) {
ShouldNotCallThis();
+ return NULL;
}
void Relocation::pd_set_call_destination(address x) {
@@ -45,6 +46,7 @@
address Relocation::pd_get_address_from_code() {
ShouldNotCallThis();
+ return NULL;
}
address* Relocation::pd_address_in_code() {
--- a/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -89,6 +89,7 @@
ret_type);
#else
ShouldNotCallThis();
+ return NULL;
#endif // SHARK
}
@@ -99,6 +100,7 @@
uint SharedRuntime::out_preserve_stack_slots() {
ShouldNotCallThis();
+ return 0;
}
JRT_LEAF(void, zero_stub())
@@ -135,4 +137,5 @@
VMRegPair *regs,
int total_args_passed) {
ShouldNotCallThis();
+ return 0;
}
--- a/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -39,16 +39,20 @@
VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
ShouldNotCallThis();
+ return NULL;
}
VtableStub* VtableStubs::create_itable_stub(int vtable_index) {
ShouldNotCallThis();
+ return NULL;
}
int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
ShouldNotCallThis();
+ return 0;
}
int VtableStub::pd_code_alignment() {
ShouldNotCallThis();
+ return 0;
}
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -642,13 +642,14 @@
#endif
#ifdef __APPLE__
-static uint64_t locate_unique_thread_id() {
+static uint64_t locate_unique_thread_id(mach_port_t mach_thread_port) {
// Additional thread_id used to correlate threads in SA
thread_identifier_info_data_t m_ident_info;
mach_msg_type_number_t count = THREAD_IDENTIFIER_INFO_COUNT;
- thread_info(::mach_thread_self(), THREAD_IDENTIFIER_INFO,
+ thread_info(mach_thread_port, THREAD_IDENTIFIER_INFO,
(thread_info_t) &m_ident_info, &count);
+
return m_ident_info.thread_id;
}
#endif
@@ -679,9 +680,14 @@
}
#ifdef __APPLE__
- // thread_id is mach thread on macos
- osthread->set_thread_id(::mach_thread_self());
- osthread->set_unique_thread_id(locate_unique_thread_id());
+ // thread_id is mach thread on macos, which pthreads graciously caches and provides for us
+ mach_port_t thread_id = ::pthread_mach_thread_np(::pthread_self());
+ guarantee(thread_id != 0, "thread id missing from pthreads");
+ osthread->set_thread_id(thread_id);
+
+ uint64_t unique_thread_id = locate_unique_thread_id(thread_id);
+ guarantee(unique_thread_id != 0, "unique thread id was not found");
+ osthread->set_unique_thread_id(unique_thread_id);
#else
// thread_id is pthread_id on BSD
osthread->set_thread_id(::pthread_self());
@@ -843,8 +849,14 @@
// Store pthread info into the OSThread
#ifdef __APPLE__
- osthread->set_thread_id(::mach_thread_self());
- osthread->set_unique_thread_id(locate_unique_thread_id());
+ // thread_id is mach thread on macos, which pthreads graciously caches and provides for us
+ mach_port_t thread_id = ::pthread_mach_thread_np(::pthread_self());
+ guarantee(thread_id != 0, "just checking");
+ osthread->set_thread_id(thread_id);
+
+ uint64_t unique_thread_id = locate_unique_thread_id(thread_id);
+ guarantee(unique_thread_id != 0, "just checking");
+ osthread->set_unique_thread_id(unique_thread_id);
#else
osthread->set_thread_id(::pthread_self());
#endif
@@ -1115,7 +1127,7 @@
intx os::current_thread_id() {
#ifdef __APPLE__
- return (intx)::mach_thread_self();
+ return (intx)::pthread_mach_thread_np(::pthread_self());
#else
return (intx)::pthread_self();
#endif
@@ -2313,7 +2325,9 @@
}
-char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
+char* os::reserve_memory_special(size_t bytes, size_t alignment, char* req_addr, bool exec) {
+ fatal("This code is not used or maintained.");
+
// "exec" is passed in but not used. Creating the shared image for
// the code cache doesn't have an SHM_X executable permission to check.
assert(UseLargePages && UseSHM, "only for SHM large pages");
@@ -3275,11 +3289,15 @@
// and if UserSignalHandler is installed all bets are off
if (CheckJNICalls) {
if (libjsig_is_loaded) {
- tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
+ if (PrintJNIResolving) {
+ tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
+ }
check_signals = false;
}
if (AllowUserSignalHandlers) {
- tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
+ if (PrintJNIResolving) {
+ tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
+ }
check_signals = false;
}
}
@@ -4736,3 +4754,8 @@
return n;
}
+#ifndef PRODUCT
+void TestReserveMemorySpecial_test() {
+ // No tests available for this platform
+}
+#endif
--- a/hotspot/src/os/linux/vm/globals_linux.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os/linux/vm/globals_linux.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -40,6 +40,9 @@
product(bool, UseHugeTLBFS, false, \
"Use MAP_HUGETLB for large pages") \
\
+ product(bool, UseTransparentHugePages, false, \
+ "Use MADV_HUGEPAGE for large pages") \
+ \
product(bool, LoadExecStackDllInVMThread, true, \
"Load DLLs with executable-stack attribute in the VM Thread") \
\
--- a/hotspot/src/os/linux/vm/os_linux.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -2720,36 +2720,7 @@
int os::Linux::commit_memory_impl(char* addr, size_t size,
size_t alignment_hint, bool exec) {
- int err;
- if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
- int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
- uintptr_t res =
- (uintptr_t) ::mmap(addr, size, prot,
- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB,
- -1, 0);
- if (res != (uintptr_t) MAP_FAILED) {
- if (UseNUMAInterleaving) {
- numa_make_global(addr, size);
- }
- return 0;
- }
-
- err = errno; // save errno from mmap() call above
-
- if (!recoverable_mmap_error(err)) {
- // However, it is not clear that this loss of our reserved mapping
- // happens with large pages on Linux or that we cannot recover
- // from the loss. For now, we just issue a warning and we don't
- // call vm_exit_out_of_memory(). This issue is being tracked by
- // JBS-8007074.
- warn_fail_commit_memory(addr, size, alignment_hint, exec, err);
-// vm_exit_out_of_memory(size, OOM_MMAP_ERROR,
-// "committing reserved memory.");
- }
- // Fall through and try to use small pages
- }
-
- err = os::Linux::commit_memory_impl(addr, size, exec);
+ int err = os::Linux::commit_memory_impl(addr, size, exec);
if (err == 0) {
realign_memory(addr, size, alignment_hint);
}
@@ -2774,7 +2745,7 @@
}
void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
- if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
+ if (UseTransparentHugePages && alignment_hint > (size_t)vm_page_size()) {
// We don't check the return value: madvise(MADV_HUGEPAGE) may not
// be supported or the memory may already be backed by huge pages.
::madvise(addr, bytes, MADV_HUGEPAGE);
@@ -2787,7 +2758,7 @@
// uncommitted at all. We don't do anything in this case to avoid creating a segment with
// small pages on top of the SHM segment. This method always works for small pages, so we
// allow that in any case.
- if (alignment_hint <= (size_t)os::vm_page_size() || !UseSHM) {
+ if (alignment_hint <= (size_t)os::vm_page_size() || can_commit_large_page_memory()) {
commit_memory(addr, bytes, alignment_hint, !ExecMem);
}
}
@@ -3157,11 +3128,31 @@
return linux_mprotect(addr, size, PROT_READ|PROT_WRITE);
}
+bool os::Linux::transparent_huge_pages_sanity_check(bool warn, size_t page_size) {
+ bool result = false;
+ void *p = mmap(NULL, page_size * 2, PROT_READ|PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE,
+ -1, 0);
+ if (p != MAP_FAILED) {
+ void *aligned_p = align_ptr_up(p, page_size);
+
+ result = madvise(aligned_p, page_size, MADV_HUGEPAGE) == 0;
+
+ munmap(p, page_size * 2);
+ }
+
+ if (warn && !result) {
+ warning("TransparentHugePages is not supported by the operating system.");
+ }
+
+ return result;
+}
+
bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) {
bool result = false;
- void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE,
- MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
- -1, 0);
+ void *p = mmap(NULL, page_size, PROT_READ|PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
+ -1, 0);
if (p != MAP_FAILED) {
// We don't know if this really is a huge page or not.
@@ -3182,12 +3173,10 @@
}
fclose(fp);
}
- munmap (p, page_size);
- if (result)
- return true;
- }
-
- if (warn) {
+ munmap(p, page_size);
+ }
+
+ if (warn && !result) {
warning("HugeTLBFS is not supported by the operating system.");
}
@@ -3235,82 +3224,114 @@
static size_t _large_page_size = 0;
-void os::large_page_init() {
- if (!UseLargePages) {
- UseHugeTLBFS = false;
- UseSHM = false;
- return;
- }
-
- if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) {
- // If UseLargePages is specified on the command line try both methods,
- // if it's default, then try only HugeTLBFS.
- if (FLAG_IS_DEFAULT(UseLargePages)) {
- UseHugeTLBFS = true;
- } else {
- UseHugeTLBFS = UseSHM = true;
- }
- }
-
- if (LargePageSizeInBytes) {
- _large_page_size = LargePageSizeInBytes;
- } else {
- // large_page_size on Linux is used to round up heap size. x86 uses either
- // 2M or 4M page, depending on whether PAE (Physical Address Extensions)
- // mode is enabled. AMD64/EM64T uses 2M page in 64bit mode. IA64 can use
- // page as large as 256M.
- //
- // Here we try to figure out page size by parsing /proc/meminfo and looking
- // for a line with the following format:
- // Hugepagesize: 2048 kB
- //
- // If we can't determine the value (e.g. /proc is not mounted, or the text
- // format has been changed), we'll use the largest page size supported by
- // the processor.
+size_t os::Linux::find_large_page_size() {
+ size_t large_page_size = 0;
+
+ // large_page_size on Linux is used to round up heap size. x86 uses either
+ // 2M or 4M page, depending on whether PAE (Physical Address Extensions)
+ // mode is enabled. AMD64/EM64T uses 2M page in 64bit mode. IA64 can use
+ // page as large as 256M.
+ //
+ // Here we try to figure out page size by parsing /proc/meminfo and looking
+ // for a line with the following format:
+ // Hugepagesize: 2048 kB
+ //
+ // If we can't determine the value (e.g. /proc is not mounted, or the text
+ // format has been changed), we'll use the largest page size supported by
+ // the processor.
#ifndef ZERO
- _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M)
- ARM_ONLY(2 * M) PPC_ONLY(4 * M);
+ large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M)
+ ARM_ONLY(2 * M) PPC_ONLY(4 * M);
#endif // ZERO
- FILE *fp = fopen("/proc/meminfo", "r");
- if (fp) {
- while (!feof(fp)) {
- int x = 0;
- char buf[16];
- if (fscanf(fp, "Hugepagesize: %d", &x) == 1) {
- if (x && fgets(buf, sizeof(buf), fp) && strcmp(buf, " kB\n") == 0) {
- _large_page_size = x * K;
- break;
- }
- } else {
- // skip to next line
- for (;;) {
- int ch = fgetc(fp);
- if (ch == EOF || ch == (int)'\n') break;
- }
+ FILE *fp = fopen("/proc/meminfo", "r");
+ if (fp) {
+ while (!feof(fp)) {
+ int x = 0;
+ char buf[16];
+ if (fscanf(fp, "Hugepagesize: %d", &x) == 1) {
+ if (x && fgets(buf, sizeof(buf), fp) && strcmp(buf, " kB\n") == 0) {
+ large_page_size = x * K;
+ break;
+ }
+ } else {
+ // skip to next line
+ for (;;) {
+ int ch = fgetc(fp);
+ if (ch == EOF || ch == (int)'\n') break;
}
}
- fclose(fp);
}
- }
-
- // print a warning if any large page related flag is specified on command line
- bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS);
-
+ fclose(fp);
+ }
+
+ if (!FLAG_IS_DEFAULT(LargePageSizeInBytes) && LargePageSizeInBytes != large_page_size) {
+ warning("Setting LargePageSizeInBytes has no effect on this OS. Large page size is "
+ SIZE_FORMAT "%s.", byte_size_in_proper_unit(large_page_size),
+ proper_unit_for_byte_size(large_page_size));
+ }
+
+ return large_page_size;
+}
+
+size_t os::Linux::setup_large_page_size() {
+ _large_page_size = Linux::find_large_page_size();
const size_t default_page_size = (size_t)Linux::page_size();
if (_large_page_size > default_page_size) {
_page_sizes[0] = _large_page_size;
_page_sizes[1] = default_page_size;
_page_sizes[2] = 0;
}
- UseHugeTLBFS = UseHugeTLBFS &&
- Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size);
-
- if (UseHugeTLBFS)
+
+ return _large_page_size;
+}
+
+bool os::Linux::setup_large_page_type(size_t page_size) {
+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) &&
+ FLAG_IS_DEFAULT(UseSHM) &&
+ FLAG_IS_DEFAULT(UseTransparentHugePages)) {
+ // If UseLargePages is specified on the command line try all methods,
+ // if it's default, then try only UseTransparentHugePages.
+ if (FLAG_IS_DEFAULT(UseLargePages)) {
+ UseTransparentHugePages = true;
+ } else {
+ UseHugeTLBFS = UseTransparentHugePages = UseSHM = true;
+ }
+ }
+
+ if (UseTransparentHugePages) {
+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseTransparentHugePages);
+ if (transparent_huge_pages_sanity_check(warn_on_failure, page_size)) {
+ UseHugeTLBFS = false;
+ UseSHM = false;
+ return true;
+ }
+ UseTransparentHugePages = false;
+ }
+
+ if (UseHugeTLBFS) {
+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS);
+ if (hugetlbfs_sanity_check(warn_on_failure, page_size)) {
+ UseSHM = false;
+ return true;
+ }
+ UseHugeTLBFS = false;
+ }
+
+ return UseSHM;
+}
+
+void os::large_page_init() {
+ if (!UseLargePages) {
+ UseHugeTLBFS = false;
+ UseTransparentHugePages = false;
UseSHM = false;
-
- UseLargePages = UseHugeTLBFS || UseSHM;
+ return;
+ }
+
+ size_t large_page_size = Linux::setup_large_page_size();
+ UseLargePages = Linux::setup_large_page_type(large_page_size);
set_coredump_filter();
}
@@ -3319,16 +3340,22 @@
#define SHM_HUGETLB 04000
#endif
-char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
+char* os::Linux::reserve_memory_special_shm(size_t bytes, size_t alignment, char* req_addr, bool exec) {
// "exec" is passed in but not used. Creating the shared image for
// the code cache doesn't have an SHM_X executable permission to check.
assert(UseLargePages && UseSHM, "only for SHM large pages");
+ assert(is_ptr_aligned(req_addr, os::large_page_size()), "Unaligned address");
+
+ if (!is_size_aligned(bytes, os::large_page_size()) || alignment > os::large_page_size()) {
+ return NULL; // Fallback to small pages.
+ }
key_t key = IPC_PRIVATE;
char *addr;
bool warn_on_failure = UseLargePages &&
(!FLAG_IS_DEFAULT(UseLargePages) ||
+ !FLAG_IS_DEFAULT(UseSHM) ||
!FLAG_IS_DEFAULT(LargePageSizeInBytes)
);
char msg[128];
@@ -3376,42 +3403,219 @@
return NULL;
}
- if ((addr != NULL) && UseNUMAInterleaving) {
- numa_make_global(addr, bytes);
- }
-
- // The memory is committed
- MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC);
+ return addr;
+}
+
+static void warn_on_large_pages_failure(char* req_addr, size_t bytes, int error) {
+ assert(error == ENOMEM, "Only expect to fail if no memory is available");
+
+ bool warn_on_failure = UseLargePages &&
+ (!FLAG_IS_DEFAULT(UseLargePages) ||
+ !FLAG_IS_DEFAULT(UseHugeTLBFS) ||
+ !FLAG_IS_DEFAULT(LargePageSizeInBytes));
+
+ if (warn_on_failure) {
+ char msg[128];
+ jio_snprintf(msg, sizeof(msg), "Failed to reserve large pages memory req_addr: "
+ PTR_FORMAT " bytes: " SIZE_FORMAT " (errno = %d).", req_addr, bytes, error);
+ warning(msg);
+ }
+}
+
+char* os::Linux::reserve_memory_special_huge_tlbfs_only(size_t bytes, char* req_addr, bool exec) {
+ assert(UseLargePages && UseHugeTLBFS, "only for Huge TLBFS large pages");
+ assert(is_size_aligned(bytes, os::large_page_size()), "Unaligned size");
+ assert(is_ptr_aligned(req_addr, os::large_page_size()), "Unaligned address");
+
+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
+ char* addr = (char*)::mmap(req_addr, bytes, prot,
+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_HUGETLB,
+ -1, 0);
+
+ if (addr == MAP_FAILED) {
+ warn_on_large_pages_failure(req_addr, bytes, errno);
+ return NULL;
+ }
+
+ assert(is_ptr_aligned(addr, os::large_page_size()), "Must be");
return addr;
}
+char* os::Linux::reserve_memory_special_huge_tlbfs_mixed(size_t bytes, size_t alignment, char* req_addr, bool exec) {
+ size_t large_page_size = os::large_page_size();
+
+ assert(bytes >= large_page_size, "Shouldn't allocate large pages for small sizes");
+
+ // Allocate small pages.
+
+ char* start;
+ if (req_addr != NULL) {
+ assert(is_ptr_aligned(req_addr, alignment), "Must be");
+ assert(is_size_aligned(bytes, alignment), "Must be");
+ start = os::reserve_memory(bytes, req_addr);
+ assert(start == NULL || start == req_addr, "Must be");
+ } else {
+ start = os::reserve_memory_aligned(bytes, alignment);
+ }
+
+ if (start == NULL) {
+ return NULL;
+ }
+
+ assert(is_ptr_aligned(start, alignment), "Must be");
+
+ // os::reserve_memory_special will record this memory area.
+ // Need to release it here to prevent overlapping reservations.
+ MemTracker::record_virtual_memory_release((address)start, bytes);
+
+ char* end = start + bytes;
+
+ // Find the regions of the allocated chunk that can be promoted to large pages.
+ char* lp_start = (char*)align_ptr_up(start, large_page_size);
+ char* lp_end = (char*)align_ptr_down(end, large_page_size);
+
+ size_t lp_bytes = lp_end - lp_start;
+
+ assert(is_size_aligned(lp_bytes, large_page_size), "Must be");
+
+ if (lp_bytes == 0) {
+ // The mapped region doesn't even span the start and the end of a large page.
+ // Fall back to allocate a non-special area.
+ ::munmap(start, end - start);
+ return NULL;
+ }
+
+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
+
+
+ void* result;
+
+ if (start != lp_start) {
+ result = ::mmap(start, lp_start - start, prot,
+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED,
+ -1, 0);
+ if (result == MAP_FAILED) {
+ ::munmap(lp_start, end - lp_start);
+ return NULL;
+ }
+ }
+
+ result = ::mmap(lp_start, lp_bytes, prot,
+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_HUGETLB,
+ -1, 0);
+ if (result == MAP_FAILED) {
+ warn_on_large_pages_failure(req_addr, bytes, errno);
+ // If the mmap above fails, the large pages region will be unmapped and we
+ // have regions before and after with small pages. Release these regions.
+ //
+ // | mapped | unmapped | mapped |
+ // ^ ^ ^ ^
+ // start lp_start lp_end end
+ //
+ ::munmap(start, lp_start - start);
+ ::munmap(lp_end, end - lp_end);
+ return NULL;
+ }
+
+ if (lp_end != end) {
+ result = ::mmap(lp_end, end - lp_end, prot,
+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED,
+ -1, 0);
+ if (result == MAP_FAILED) {
+ ::munmap(start, lp_end - start);
+ return NULL;
+ }
+ }
+
+ return start;
+}
+
+char* os::Linux::reserve_memory_special_huge_tlbfs(size_t bytes, size_t alignment, char* req_addr, bool exec) {
+ assert(UseLargePages && UseHugeTLBFS, "only for Huge TLBFS large pages");
+ assert(is_ptr_aligned(req_addr, alignment), "Must be");
+ assert(is_power_of_2(alignment), "Must be");
+ assert(is_power_of_2(os::large_page_size()), "Must be");
+ assert(bytes >= os::large_page_size(), "Shouldn't allocate large pages for small sizes");
+
+ if (is_size_aligned(bytes, os::large_page_size()) && alignment <= os::large_page_size()) {
+ return reserve_memory_special_huge_tlbfs_only(bytes, req_addr, exec);
+ } else {
+ return reserve_memory_special_huge_tlbfs_mixed(bytes, alignment, req_addr, exec);
+ }
+}
+
+char* os::reserve_memory_special(size_t bytes, size_t alignment, char* req_addr, bool exec) {
+ assert(UseLargePages, "only for large pages");
+
+ char* addr;
+ if (UseSHM) {
+ addr = os::Linux::reserve_memory_special_shm(bytes, alignment, req_addr, exec);
+ } else {
+ assert(UseHugeTLBFS, "must be");
+ addr = os::Linux::reserve_memory_special_huge_tlbfs(bytes, alignment, req_addr, exec);
+ }
+
+ if (addr != NULL) {
+ if (UseNUMAInterleaving) {
+ numa_make_global(addr, bytes);
+ }
+
+ // The memory is committed
+ MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC);
+ }
+
+ return addr;
+}
+
+bool os::Linux::release_memory_special_shm(char* base, size_t bytes) {
+ // detaching the SHM segment will also delete it, see reserve_memory_special_shm()
+ return shmdt(base) == 0;
+}
+
+bool os::Linux::release_memory_special_huge_tlbfs(char* base, size_t bytes) {
+ return pd_release_memory(base, bytes);
+}
+
bool os::release_memory_special(char* base, size_t bytes) {
+ assert(UseLargePages, "only for large pages");
+
MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
- // detaching the SHM segment will also delete it, see reserve_memory_special()
- int rslt = shmdt(base);
- if (rslt == 0) {
+
+ bool res;
+ if (UseSHM) {
+ res = os::Linux::release_memory_special_shm(base, bytes);
+ } else {
+ assert(UseHugeTLBFS, "must be");
+ res = os::Linux::release_memory_special_huge_tlbfs(base, bytes);
+ }
+
+ if (res) {
tkr.record((address)base, bytes);
- return true;
} else {
tkr.discard();
- return false;
- }
+ }
+
+ return res;
}
size_t os::large_page_size() {
return _large_page_size;
}
-// HugeTLBFS allows application to commit large page memory on demand;
-// with SysV SHM the entire memory region must be allocated as shared
+// With SysV SHM the entire memory region must be allocated as shared
// memory.
+// HugeTLBFS allows application to commit large page memory on demand.
+// However, when committing memory with HugeTLBFS fails, the region
+// that was supposed to be committed will lose the old reservation
+// and allow other threads to steal that memory region. Because of this
+// behavior we can't commit HugeTLBFS memory.
bool os::can_commit_large_page_memory() {
- return UseHugeTLBFS;
+ return UseTransparentHugePages;
}
bool os::can_execute_large_page_memory() {
- return UseHugeTLBFS;
+ return UseTransparentHugePages || UseHugeTLBFS;
}
// Reserve memory at an arbitrary address, only if that area is
@@ -4563,21 +4767,23 @@
UseNUMA = false;
}
}
- // With SHM large pages we cannot uncommit a page, so there's not way
+ // With SHM and HugeTLBFS large pages we cannot uncommit a page, so there's no way
// we can make the adaptive lgrp chunk resizing work. If the user specified
- // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and
+ // both UseNUMA and UseLargePages (or UseSHM/UseHugeTLBFS) on the command line - warn and
// disable adaptive resizing.
- if (UseNUMA && UseLargePages && UseSHM) {
- if (!FLAG_IS_DEFAULT(UseNUMA)) {
- if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) {
+ if (UseNUMA && UseLargePages && !can_commit_large_page_memory()) {
+ if (FLAG_IS_DEFAULT(UseNUMA)) {
+ UseNUMA = false;
+ } else {
+ if (FLAG_IS_DEFAULT(UseLargePages) &&
+ FLAG_IS_DEFAULT(UseSHM) &&
+ FLAG_IS_DEFAULT(UseHugeTLBFS)) {
UseLargePages = false;
} else {
- warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing");
+ warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, disabling adaptive resizing");
UseAdaptiveSizePolicy = false;
UseAdaptiveNUMAChunkSizing = false;
}
- } else {
- UseNUMA = false;
}
}
if (!UseNUMA && ForceNUMA) {
@@ -5848,3 +6054,149 @@
}
#endif // JAVASE_EMBEDDED
+
+
+/////////////// Unit tests ///////////////
+
+#ifndef PRODUCT
+
+#define test_log(...) \
+ do {\
+ if (VerboseInternalVMTests) { \
+ tty->print_cr(__VA_ARGS__); \
+ tty->flush(); \
+ }\
+ } while (false)
+
+class TestReserveMemorySpecial : AllStatic {
+ public:
+ static void small_page_write(void* addr, size_t size) {
+ size_t page_size = os::vm_page_size();
+
+ char* end = (char*)addr + size;
+ for (char* p = (char*)addr; p < end; p += page_size) {
+ *p = 1;
+ }
+ }
+
+ static void test_reserve_memory_special_huge_tlbfs_only(size_t size) {
+ if (!UseHugeTLBFS) {
+ return;
+ }
+
+ test_log("test_reserve_memory_special_huge_tlbfs_only(" SIZE_FORMAT ")", size);
+
+ char* addr = os::Linux::reserve_memory_special_huge_tlbfs_only(size, NULL, false);
+
+ if (addr != NULL) {
+ small_page_write(addr, size);
+
+ os::Linux::release_memory_special_huge_tlbfs(addr, size);
+ }
+ }
+
+ static void test_reserve_memory_special_huge_tlbfs_only() {
+ if (!UseHugeTLBFS) {
+ return;
+ }
+
+ size_t lp = os::large_page_size();
+
+ for (size_t size = lp; size <= lp * 10; size += lp) {
+ test_reserve_memory_special_huge_tlbfs_only(size);
+ }
+ }
+
+ static void test_reserve_memory_special_huge_tlbfs_mixed(size_t size, size_t alignment) {
+ if (!UseHugeTLBFS) {
+ return;
+ }
+
+ test_log("test_reserve_memory_special_huge_tlbfs_mixed(" SIZE_FORMAT ", " SIZE_FORMAT ")",
+ size, alignment);
+
+ assert(size >= os::large_page_size(), "Incorrect input to test");
+
+ char* addr = os::Linux::reserve_memory_special_huge_tlbfs_mixed(size, alignment, NULL, false);
+
+ if (addr != NULL) {
+ small_page_write(addr, size);
+
+ os::Linux::release_memory_special_huge_tlbfs(addr, size);
+ }
+ }
+
+ static void test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(size_t size) {
+ size_t lp = os::large_page_size();
+ size_t ag = os::vm_allocation_granularity();
+
+ for (size_t alignment = ag; is_size_aligned(size, alignment); alignment *= 2) {
+ test_reserve_memory_special_huge_tlbfs_mixed(size, alignment);
+ }
+ }
+
+ static void test_reserve_memory_special_huge_tlbfs_mixed() {
+ size_t lp = os::large_page_size();
+ size_t ag = os::vm_allocation_granularity();
+
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp);
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp + ag);
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp + lp / 2);
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2);
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 + ag);
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 - ag);
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 + lp / 2);
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 10);
+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 10 + lp / 2);
+ }
+
+ static void test_reserve_memory_special_huge_tlbfs() {
+ if (!UseHugeTLBFS) {
+ return;
+ }
+
+ test_reserve_memory_special_huge_tlbfs_only();
+ test_reserve_memory_special_huge_tlbfs_mixed();
+ }
+
+ static void test_reserve_memory_special_shm(size_t size, size_t alignment) {
+ if (!UseSHM) {
+ return;
+ }
+
+ test_log("test_reserve_memory_special_shm(" SIZE_FORMAT ", " SIZE_FORMAT ")", size, alignment);
+
+ char* addr = os::Linux::reserve_memory_special_shm(size, alignment, NULL, false);
+
+ if (addr != NULL) {
+ assert(is_ptr_aligned(addr, alignment), "Check");
+ assert(is_ptr_aligned(addr, os::large_page_size()), "Check");
+
+ small_page_write(addr, size);
+
+ os::Linux::release_memory_special_shm(addr, size);
+ }
+ }
+
+ static void test_reserve_memory_special_shm() {
+ size_t lp = os::large_page_size();
+ size_t ag = os::vm_allocation_granularity();
+
+ for (size_t size = ag; size < lp * 3; size += ag) {
+ for (size_t alignment = ag; is_size_aligned(size, alignment); alignment *= 2) {
+ test_reserve_memory_special_shm(size, alignment);
+ }
+ }
+ }
+
+ static void test() {
+ test_reserve_memory_special_huge_tlbfs();
+ test_reserve_memory_special_shm();
+ }
+};
+
+void TestReserveMemorySpecial_test() {
+ TestReserveMemorySpecial::test();
+}
+
+#endif
--- a/hotspot/src/os/linux/vm/os_linux.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os/linux/vm/os_linux.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -32,6 +32,7 @@
class Linux {
friend class os;
+ friend class TestReserveMemorySpecial;
// For signal-chaining
#define MAXSIGNUM 32
@@ -92,8 +93,21 @@
static void rebuild_cpu_to_node_map();
static GrowableArray<int>* cpu_to_node() { return _cpu_to_node; }
+ static size_t find_large_page_size();
+ static size_t setup_large_page_size();
+
+ static bool setup_large_page_type(size_t page_size);
+ static bool transparent_huge_pages_sanity_check(bool warn, size_t pages_size);
static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
+ static char* reserve_memory_special_shm(size_t bytes, size_t alignment, char* req_addr, bool exec);
+ static char* reserve_memory_special_huge_tlbfs(size_t bytes, size_t alignment, char* req_addr, bool exec);
+ static char* reserve_memory_special_huge_tlbfs_only(size_t bytes, char* req_addr, bool exec);
+ static char* reserve_memory_special_huge_tlbfs_mixed(size_t bytes, size_t alignment, char* req_addr, bool exec);
+
+ static bool release_memory_special_shm(char* base, size_t bytes);
+ static bool release_memory_special_huge_tlbfs(char* base, size_t bytes);
+
static void print_full_memory_info(outputStream* st);
static void print_distro_info(outputStream* st);
static void print_libversion_info(outputStream* st);
--- a/hotspot/src/os/posix/vm/os_posix.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os/posix/vm/os_posix.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -260,6 +260,55 @@
return ::fdopen(fd, mode);
}
+void* os::get_default_process_handle() {
+ return (void*)::dlopen(NULL, RTLD_LAZY);
+}
+
+// Builds a platform dependent Agent_OnLoad_<lib_name> function name
+// which is used to find statically linked in agents.
+// Parameters:
+// sym_name: Symbol in library we are looking for
+// lib_name: Name of library to look in, NULL for shared libs.
+// is_absolute_path == true if lib_name is absolute path to agent
+// such as "/a/b/libL.so"
+// == false if only the base name of the library is passed in
+// such as "L"
+char* os::build_agent_function_name(const char *sym_name, const char *lib_name,
+ bool is_absolute_path) {
+ char *agent_entry_name;
+ size_t len;
+ size_t name_len;
+ size_t prefix_len = strlen(JNI_LIB_PREFIX);
+ size_t suffix_len = strlen(JNI_LIB_SUFFIX);
+ const char *start;
+
+ if (lib_name != NULL) {
+ len = name_len = strlen(lib_name);
+ if (is_absolute_path) {
+ // Need to strip path, prefix and suffix
+ if ((start = strrchr(lib_name, *os::file_separator())) != NULL) {
+ lib_name = ++start;
+ }
+ if (len <= (prefix_len + suffix_len)) {
+ return NULL;
+ }
+ lib_name += prefix_len;
+ name_len = strlen(lib_name) - suffix_len;
+ }
+ }
+ len = (lib_name != NULL ? name_len : 0) + strlen(sym_name) + 2;
+ agent_entry_name = NEW_C_HEAP_ARRAY_RETURN_NULL(char, len, mtThread);
+ if (agent_entry_name == NULL) {
+ return NULL;
+ }
+ strcpy(agent_entry_name, sym_name);
+ if (lib_name != NULL) {
+ strcat(agent_entry_name, "_");
+ strncat(agent_entry_name, lib_name, name_len);
+ }
+ return agent_entry_name;
+}
+
os::WatcherThreadCrashProtection::WatcherThreadCrashProtection() {
assert(Thread::current()->is_Watcher_thread(), "Must be WatcherThread");
}
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -3385,7 +3385,7 @@
return true;
}
-char* os::reserve_memory_special(size_t size, char* addr, bool exec) {
+char* os::reserve_memory_special(size_t size, size_t alignment, char* addr, bool exec) {
fatal("os::reserve_memory_special should not be called on Solaris.");
return NULL;
}
@@ -6601,3 +6601,9 @@
return strlen(buffer);
}
+
+#ifndef PRODUCT
+void TestReserveMemorySpecial_test() {
+ // No tests available for this platform
+}
+#endif
--- a/hotspot/src/os/windows/vm/os_windows.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -3156,7 +3156,12 @@
return true;
}
-char* os::reserve_memory_special(size_t bytes, char* addr, bool exec) {
+char* os::reserve_memory_special(size_t bytes, size_t alignment, char* addr, bool exec) {
+ assert(UseLargePages, "only for large pages");
+
+ if (!is_size_aligned(bytes, os::large_page_size()) || alignment > os::large_page_size()) {
+ return NULL; // Fallback to small pages.
+ }
const DWORD prot = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
const DWORD flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
@@ -5394,6 +5399,75 @@
return true;
}
+void* os::get_default_process_handle() {
+ return (void*)GetModuleHandle(NULL);
+}
+
+// Builds a platform dependent Agent_OnLoad_<lib_name> function name
+// which is used to find statically linked in agents.
+// Additionally for windows, takes into account __stdcall names.
+// Parameters:
+// sym_name: Symbol in library we are looking for
+// lib_name: Name of library to look in, NULL for shared libs.
+// is_absolute_path == true if lib_name is absolute path to agent
+// such as "C:/a/b/L.dll"
+// == false if only the base name of the library is passed in
+// such as "L"
+char* os::build_agent_function_name(const char *sym_name, const char *lib_name,
+ bool is_absolute_path) {
+ char *agent_entry_name;
+ size_t len;
+ size_t name_len;
+ size_t prefix_len = strlen(JNI_LIB_PREFIX);
+ size_t suffix_len = strlen(JNI_LIB_SUFFIX);
+ const char *start;
+
+ if (lib_name != NULL) {
+ len = name_len = strlen(lib_name);
+ if (is_absolute_path) {
+ // Need to strip path, prefix and suffix
+ if ((start = strrchr(lib_name, *os::file_separator())) != NULL) {
+ lib_name = ++start;
+ } else {
+ // Need to check for C:
+ if ((start = strchr(lib_name, ':')) != NULL) {
+ lib_name = ++start;
+ }
+ }
+ if (len <= (prefix_len + suffix_len)) {
+ return NULL;
+ }
+ lib_name += prefix_len;
+ name_len = strlen(lib_name) - suffix_len;
+ }
+ }
+ len = (lib_name != NULL ? name_len : 0) + strlen(sym_name) + 2;
+ agent_entry_name = NEW_C_HEAP_ARRAY_RETURN_NULL(char, len, mtThread);
+ if (agent_entry_name == NULL) {
+ return NULL;
+ }
+ if (lib_name != NULL) {
+ const char *p = strrchr(sym_name, '@');
+ if (p != NULL && p != sym_name) {
+ // sym_name == _Agent_OnLoad@XX
+ strncpy(agent_entry_name, sym_name, (p - sym_name));
+ agent_entry_name[(p-sym_name)] = '\0';
+ // agent_entry_name == _Agent_OnLoad
+ strcat(agent_entry_name, "_");
+ strncat(agent_entry_name, lib_name, name_len);
+ strcat(agent_entry_name, p);
+ // agent_entry_name == _Agent_OnLoad_lib_name@XX
+ } else {
+ strcpy(agent_entry_name, sym_name);
+ strcat(agent_entry_name, "_");
+ strncat(agent_entry_name, lib_name, name_len);
+ }
+ } else {
+ strcpy(agent_entry_name, sym_name);
+ }
+ return agent_entry_name;
+}
+
#else
// Kernel32 API
typedef BOOL (WINAPI* SwitchToThread_Fn)(void);
@@ -5638,3 +5712,9 @@
}
#endif
+
+#ifndef PRODUCT
+void TestReserveMemorySpecial_test() {
+ // No tests available for this platform
+}
+#endif
--- a/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -190,7 +190,7 @@
inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { release_store_fence((volatile jlong*)p, (jlong)v); }
inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { release_store_fence((volatile jlong*)p, jdouble_cast(v)); }
+inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { release_store_fence((volatile jlong*)p, jlong_cast(v)); }
inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) {
#ifdef AMD64
--- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -715,6 +715,7 @@
err.report_and_die();
ShouldNotReachHere();
+ return false;
}
// From solaris_i486.s ported to bsd_i486.s
--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -66,6 +66,7 @@
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return frame();
}
frame os::current_frame() {
@@ -103,16 +104,19 @@
address os::Bsd::ucontext_get_pc(ucontext_t* uc) {
ShouldNotCallThis();
+ return NULL;
}
ExtendedPC os::fetch_frame_from_context(void* ucVoid,
intptr_t** ret_sp,
intptr_t** ret_fp) {
ShouldNotCallThis();
+ return ExtendedPC();
}
frame os::fetch_frame_from_context(void* ucVoid) {
ShouldNotCallThis();
+ return frame();
}
extern "C" JNIEXPORT int
@@ -240,6 +244,7 @@
sprintf(buf, fmt, sig, info->si_addr);
fatal(buf);
+ return false;
}
void os::Bsd::init_thread_fpu_state(void) {
@@ -373,17 +378,7 @@
extern "C" {
int SpinPause() {
- }
-
- int SafeFetch32(int *adr, int errValue) {
- int value = errValue;
- value = *adr;
- return value;
- }
- intptr_t SafeFetchN(intptr_t *adr, intptr_t errValue) {
- intptr_t value = errValue;
- value = *adr;
- return value;
+ return 1;
}
void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
--- a/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -110,6 +110,7 @@
void* ucontext,
bool isInJava) {
ShouldNotCallThis();
+ return false;
}
// These routines are only used on cpu architectures that
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -915,16 +915,6 @@
// Return to the now deoptimized frame.
}
- // If we are patching in a non-perm oop, make sure the nmethod
- // is on the right list.
- if (ScavengeRootsInCode && mirror.not_null() && mirror()->is_scavengable()) {
- MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag);
- nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
- guarantee(nm != NULL, "only nmethods can contain non-perm oops");
- if (!nm->on_scavenge_root_list())
- CodeCache::add_scavenge_root_nmethod(nm);
- }
-
// Now copy code back
{
@@ -1125,6 +1115,21 @@
}
}
}
+
+ // If we are patching in a non-perm oop, make sure the nmethod
+ // is on the right list.
+ if (ScavengeRootsInCode && mirror.not_null() && mirror()->is_scavengable()) {
+ MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag);
+ nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
+ guarantee(nm != NULL, "only nmethods can contain non-perm oops");
+ if (!nm->on_scavenge_root_list()) {
+ CodeCache::add_scavenge_root_nmethod(nm);
+ }
+
+ // Since we've patched some oops in the nmethod,
+ // (re)register it with the heap.
+ Universe::heap()->register_nmethod(nm);
+ }
JRT_END
//
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -2590,7 +2590,7 @@
valid_symbol_at(sourcefile_index),
"Invalid SourceFile attribute at constant pool index %u in class file %s",
sourcefile_index, CHECK);
- set_class_sourcefile(_cp->symbol_at(sourcefile_index));
+ set_class_sourcefile_index(sourcefile_index);
}
@@ -2728,7 +2728,7 @@
valid_symbol_at(signature_index),
"Invalid constant pool index %u in Signature attribute in class file %s",
signature_index, CHECK);
- set_class_generic_signature(_cp->symbol_at(signature_index));
+ set_class_generic_signature_index(signature_index);
}
void ClassFileParser::parse_classfile_bootstrap_methods_attribute(u4 attribute_byte_length, TRAPS) {
@@ -2975,13 +2975,11 @@
void ClassFileParser::apply_parsed_class_attributes(instanceKlassHandle k) {
if (_synthetic_flag)
k->set_is_synthetic();
- if (_sourcefile != NULL) {
- _sourcefile->increment_refcount();
- k->set_source_file_name(_sourcefile);
+ if (_sourcefile_index != 0) {
+ k->set_source_file_name_index(_sourcefile_index);
}
- if (_generic_signature != NULL) {
- _generic_signature->increment_refcount();
- k->set_generic_signature(_generic_signature);
+ if (_generic_signature_index != 0) {
+ k->set_generic_signature_index(_generic_signature_index);
}
if (_sde_buffer != NULL) {
k->set_source_debug_extension(_sde_buffer, _sde_length);
--- a/hotspot/src/share/vm/classfile/classFileParser.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/classfile/classFileParser.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -62,8 +62,8 @@
bool _synthetic_flag;
int _sde_length;
char* _sde_buffer;
- Symbol* _sourcefile;
- Symbol* _generic_signature;
+ u2 _sourcefile_index;
+ u2 _generic_signature_index;
// Metadata created before the instance klass is created. Must be deallocated
// if not transferred to the InstanceKlass upon successful class loading
@@ -81,16 +81,16 @@
Array<AnnotationArray*>* _fields_type_annotations;
InstanceKlass* _klass; // InstanceKlass once created.
- void set_class_synthetic_flag(bool x) { _synthetic_flag = x; }
- void set_class_sourcefile(Symbol* x) { _sourcefile = x; }
- void set_class_generic_signature(Symbol* x) { _generic_signature = x; }
- void set_class_sde_buffer(char* x, int len) { _sde_buffer = x; _sde_length = len; }
+ void set_class_synthetic_flag(bool x) { _synthetic_flag = x; }
+ void set_class_sourcefile_index(u2 x) { _sourcefile_index = x; }
+ void set_class_generic_signature_index(u2 x) { _generic_signature_index = x; }
+ void set_class_sde_buffer(char* x, int len) { _sde_buffer = x; _sde_length = len; }
void init_parsed_class_attributes(ClassLoaderData* loader_data) {
_loader_data = loader_data;
_synthetic_flag = false;
- _sourcefile = NULL;
- _generic_signature = NULL;
+ _sourcefile_index = 0;
+ _generic_signature_index = 0;
_sde_buffer = NULL;
_sde_length = 0;
// initialize the other flags too:
--- a/hotspot/src/share/vm/code/nmethod.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/code/nmethod.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -687,6 +687,7 @@
code_buffer->copy_values_to(this);
if (ScavengeRootsInCode && detect_scavenge_root_oops()) {
CodeCache::add_scavenge_root_nmethod(this);
+ Universe::heap()->register_nmethod(this);
}
debug_only(verify_scavenge_root_oops());
CodeCache::commit(this);
@@ -881,6 +882,7 @@
dependencies->copy_to(this);
if (ScavengeRootsInCode && detect_scavenge_root_oops()) {
CodeCache::add_scavenge_root_nmethod(this);
+ Universe::heap()->register_nmethod(this);
}
debug_only(verify_scavenge_root_oops());
@@ -1300,6 +1302,13 @@
methodHandle the_method(method());
No_Safepoint_Verifier nsv;
+ // during patching, depending on the nmethod state we must notify the GC that
+ // code has been unloaded, unregistering it. We cannot do this right while
+ // holding the Patching_lock because we need to use the CodeCache_lock. This
+ // would be prone to deadlocks.
+ // This flag is used to remember whether we need to later lock and unregister.
+ bool nmethod_needs_unregister = false;
+
{
// invalidate osr nmethod before acquiring the patching lock since
// they both acquire leaf locks and we don't want a deadlock.
@@ -1332,6 +1341,13 @@
inc_decompile_count();
}
+ // If the state is becoming a zombie, signal to unregister the nmethod with
+ // the heap.
+ // This nmethod may have already been unloaded during a full GC.
+ if ((state == zombie) && !is_unloaded()) {
+ nmethod_needs_unregister = true;
+ }
+
// Change state
_state = state;
@@ -1367,6 +1383,9 @@
// safepoint can sneak in, otherwise the oops used by the
// dependency logic could have become stale.
MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+ if (nmethod_needs_unregister) {
+ Universe::heap()->unregister_nmethod(this);
+ }
flush_dependencies(NULL);
}
@@ -1817,21 +1836,10 @@
if (_method != NULL) f(_method);
}
-
-// This method is called twice during GC -- once while
-// tracing the "active" nmethods on thread stacks during
-// the (strong) marking phase, and then again when walking
-// the code cache contents during the weak roots processing
-// phase. The two uses are distinguished by means of the
-// 'do_strong_roots_only' flag, which is true in the first
-// case. We want to walk the weak roots in the nmethod
-// only in the second case. The weak roots in the nmethod
-// are the oops in the ExceptionCache and the InlineCache
-// oops.
-void nmethod::oops_do(OopClosure* f, bool do_strong_roots_only) {
+void nmethod::oops_do(OopClosure* f, bool allow_zombie) {
// make sure the oops ready to receive visitors
- assert(!is_zombie() && !is_unloaded(),
- "should not call follow on zombie or unloaded nmethod");
+ assert(allow_zombie || !is_zombie(), "should not call follow on zombie nmethod");
+ assert(!is_unloaded(), "should not call follow on unloaded nmethod");
// If the method is not entrant or zombie then a JMP is plastered over the
// first few bytes. If an oop in the old code was there, that oop
--- a/hotspot/src/share/vm/code/nmethod.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/code/nmethod.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -566,7 +566,7 @@
void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map,
OopClosure* f);
void oops_do(OopClosure* f) { oops_do(f, false); }
- void oops_do(OopClosure* f, bool do_strong_roots_only);
+ void oops_do(OopClosure* f, bool allow_zombie);
bool detect_scavenge_root_oops();
void verify_scavenge_root_oops() PRODUCT_RETURN;
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -3460,7 +3460,9 @@
void ConcurrentMarkSweepGeneration::shrink(size_t bytes) {
assert_locked_or_safepoint(Heap_lock);
size_t size = ReservedSpace::page_align_size_down(bytes);
- if (size > 0) {
+ // Only shrink if a compaction was done so that all the free space
+ // in the generation is in a contiguous block at the end.
+ if (size > 0 && did_compact()) {
shrink_by(size);
}
}
@@ -5478,40 +5480,42 @@
HandleMark hm;
SequentialSubTasksDone* pst = space->par_seq_tasks();
- assert(pst->valid(), "Uninitialized use?");
uint nth_task = 0;
uint n_tasks = pst->n_tasks();
- HeapWord *start, *end;
- while (!pst->is_task_claimed(/* reference */ nth_task)) {
- // We claimed task # nth_task; compute its boundaries.
- if (chunk_top == 0) { // no samples were taken
- assert(nth_task == 0 && n_tasks == 1, "Can have only 1 EdenSpace task");
- start = space->bottom();
- end = space->top();
- } else if (nth_task == 0) {
- start = space->bottom();
- end = chunk_array[nth_task];
- } else if (nth_task < (uint)chunk_top) {
- assert(nth_task >= 1, "Control point invariant");
- start = chunk_array[nth_task - 1];
- end = chunk_array[nth_task];
- } else {
- assert(nth_task == (uint)chunk_top, "Control point invariant");
- start = chunk_array[chunk_top - 1];
- end = space->top();
- }
- MemRegion mr(start, end);
- // Verify that mr is in space
- assert(mr.is_empty() || space->used_region().contains(mr),
- "Should be in space");
- // Verify that "start" is an object boundary
- assert(mr.is_empty() || oop(mr.start())->is_oop(),
- "Should be an oop");
- space->par_oop_iterate(mr, cl);
- }
- pst->all_tasks_completed();
+ if (n_tasks > 0) {
+ assert(pst->valid(), "Uninitialized use?");
+ HeapWord *start, *end;
+ while (!pst->is_task_claimed(/* reference */ nth_task)) {
+ // We claimed task # nth_task; compute its boundaries.
+ if (chunk_top == 0) { // no samples were taken
+ assert(nth_task == 0 && n_tasks == 1, "Can have only 1 EdenSpace task");
+ start = space->bottom();
+ end = space->top();
+ } else if (nth_task == 0) {
+ start = space->bottom();
+ end = chunk_array[nth_task];
+ } else if (nth_task < (uint)chunk_top) {
+ assert(nth_task >= 1, "Control point invariant");
+ start = chunk_array[nth_task - 1];
+ end = chunk_array[nth_task];
+ } else {
+ assert(nth_task == (uint)chunk_top, "Control point invariant");
+ start = chunk_array[chunk_top - 1];
+ end = space->top();
+ }
+ MemRegion mr(start, end);
+ // Verify that mr is in space
+ assert(mr.is_empty() || space->used_region().contains(mr),
+ "Should be in space");
+ // Verify that "start" is an object boundary
+ assert(mr.is_empty() || oop(mr.start())->is_oop(),
+ "Should be an oop");
+ space->par_oop_iterate(mr, cl);
+ }
+ pst->all_tasks_completed();
+ }
}
void
@@ -5788,7 +5792,7 @@
DefNewGeneration* dng = (DefNewGeneration*)_young_gen;
// Eden space
- {
+ if (!dng->eden()->is_empty()) {
SequentialSubTasksDone* pst = dng->eden()->par_seq_tasks();
assert(!pst->valid(), "Clobbering existing data?");
// Each valid entry in [0, _eden_chunk_index) represents a task.
@@ -8694,9 +8698,10 @@
assert(inFreeRange(), "Should only be called if currently in a free range.");
HeapWord* const eob = ((HeapWord*)fc) + chunk_size;
assert(_sp->used_region().contains(eob - 1),
- err_msg("eob = " PTR_FORMAT " out of bounds wrt _sp = [" PTR_FORMAT "," PTR_FORMAT ")"
+ err_msg("eob = " PTR_FORMAT " eob-1 = " PTR_FORMAT " _limit = " PTR_FORMAT
+ " out of bounds wrt _sp = [" PTR_FORMAT "," PTR_FORMAT ")"
" when examining fc = " PTR_FORMAT "(" SIZE_FORMAT ")",
- _limit, _sp->bottom(), _sp->end(), fc, chunk_size));
+ eob, eob-1, _limit, _sp->bottom(), _sp->end(), fc, chunk_size));
if (eob >= _limit) {
assert(eob == _limit || fc->is_free(), "Only a free chunk should allow us to cross over the limit");
if (CMSTraceSweeper) {
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -4529,7 +4529,7 @@
_total_prev_live_bytes(0), _total_next_live_bytes(0),
_hum_used_bytes(0), _hum_capacity_bytes(0),
_hum_prev_live_bytes(0), _hum_next_live_bytes(0),
- _total_remset_bytes(0) {
+ _total_remset_bytes(0), _total_strong_code_roots_bytes(0) {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
MemRegion g1_committed = g1h->g1_committed();
MemRegion g1_reserved = g1h->g1_reserved();
@@ -4553,9 +4553,11 @@
G1PPRL_BYTE_H_FORMAT
G1PPRL_BYTE_H_FORMAT
G1PPRL_DOUBLE_H_FORMAT
+ G1PPRL_BYTE_H_FORMAT
G1PPRL_BYTE_H_FORMAT,
"type", "address-range",
- "used", "prev-live", "next-live", "gc-eff", "remset");
+ "used", "prev-live", "next-live", "gc-eff",
+ "remset", "code-roots");
_out->print_cr(G1PPRL_LINE_PREFIX
G1PPRL_TYPE_H_FORMAT
G1PPRL_ADDR_BASE_H_FORMAT
@@ -4563,9 +4565,11 @@
G1PPRL_BYTE_H_FORMAT
G1PPRL_BYTE_H_FORMAT
G1PPRL_DOUBLE_H_FORMAT
+ G1PPRL_BYTE_H_FORMAT
G1PPRL_BYTE_H_FORMAT,
"", "",
- "(bytes)", "(bytes)", "(bytes)", "(bytes/ms)", "(bytes)");
+ "(bytes)", "(bytes)", "(bytes)", "(bytes/ms)",
+ "(bytes)", "(bytes)");
}
// It takes as a parameter a reference to one of the _hum_* fields, it
@@ -4608,6 +4612,8 @@
size_t next_live_bytes = r->next_live_bytes();
double gc_eff = r->gc_efficiency();
size_t remset_bytes = r->rem_set()->mem_size();
+ size_t strong_code_roots_bytes = r->rem_set()->strong_code_roots_mem_size();
+
if (r->used() == 0) {
type = "FREE";
} else if (r->is_survivor()) {
@@ -4642,6 +4648,7 @@
_total_prev_live_bytes += prev_live_bytes;
_total_next_live_bytes += next_live_bytes;
_total_remset_bytes += remset_bytes;
+ _total_strong_code_roots_bytes += strong_code_roots_bytes;
// Print a line for this particular region.
_out->print_cr(G1PPRL_LINE_PREFIX
@@ -4651,9 +4658,11 @@
G1PPRL_BYTE_FORMAT
G1PPRL_BYTE_FORMAT
G1PPRL_DOUBLE_FORMAT
+ G1PPRL_BYTE_FORMAT
G1PPRL_BYTE_FORMAT,
type, bottom, end,
- used_bytes, prev_live_bytes, next_live_bytes, gc_eff , remset_bytes);
+ used_bytes, prev_live_bytes, next_live_bytes, gc_eff,
+ remset_bytes, strong_code_roots_bytes);
return false;
}
@@ -4669,7 +4678,8 @@
G1PPRL_SUM_MB_PERC_FORMAT("used")
G1PPRL_SUM_MB_PERC_FORMAT("prev-live")
G1PPRL_SUM_MB_PERC_FORMAT("next-live")
- G1PPRL_SUM_MB_FORMAT("remset"),
+ G1PPRL_SUM_MB_FORMAT("remset")
+ G1PPRL_SUM_MB_FORMAT("code-roots"),
bytes_to_mb(_total_capacity_bytes),
bytes_to_mb(_total_used_bytes),
perc(_total_used_bytes, _total_capacity_bytes),
@@ -4677,6 +4687,7 @@
perc(_total_prev_live_bytes, _total_capacity_bytes),
bytes_to_mb(_total_next_live_bytes),
perc(_total_next_live_bytes, _total_capacity_bytes),
- bytes_to_mb(_total_remset_bytes));
+ bytes_to_mb(_total_remset_bytes),
+ bytes_to_mb(_total_strong_code_roots_bytes));
_out->cr();
}
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -1257,6 +1257,9 @@
// Accumulator for the remembered set size
size_t _total_remset_bytes;
+ // Accumulator for strong code roots memory size
+ size_t _total_strong_code_roots_bytes;
+
static double perc(size_t val, size_t total) {
if (total == 0) {
return 0.0;
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "code/codeCache.hpp"
#include "code/icBuffer.hpp"
#include "gc_implementation/g1/bufferingOopClosure.hpp"
#include "gc_implementation/g1/concurrentG1Refine.hpp"
@@ -980,7 +981,8 @@
if (should_try_gc) {
bool succeeded;
- result = do_collection_pause(word_size, gc_count_before, &succeeded);
+ result = do_collection_pause(word_size, gc_count_before, &succeeded,
+ GCCause::_g1_inc_collection_pause);
if (result != NULL) {
assert(succeeded, "only way to get back a non-NULL result");
return result;
@@ -1105,7 +1107,8 @@
// enough space for the allocation to succeed after the pause.
bool succeeded;
- result = do_collection_pause(word_size, gc_count_before, &succeeded);
+ result = do_collection_pause(word_size, gc_count_before, &succeeded,
+ GCCause::_g1_humongous_allocation);
if (result != NULL) {
assert(succeeded, "only way to get back a non-NULL result");
return result;
@@ -1176,20 +1179,27 @@
ModRefBarrierSet* _mr_bs;
public:
PostMCRemSetClearClosure(G1CollectedHeap* g1h, ModRefBarrierSet* mr_bs) :
- _g1h(g1h), _mr_bs(mr_bs) { }
+ _g1h(g1h), _mr_bs(mr_bs) {}
+
bool doHeapRegion(HeapRegion* r) {
+ HeapRegionRemSet* hrrs = r->rem_set();
+
if (r->continuesHumongous()) {
+ // We'll assert that the strong code root list and RSet is empty
+ assert(hrrs->strong_code_roots_list_length() == 0, "sanity");
+ assert(hrrs->occupied() == 0, "RSet should be empty");
return false;
}
+
_g1h->reset_gc_time_stamps(r);
- HeapRegionRemSet* hrrs = r->rem_set();
- if (hrrs != NULL) hrrs->clear();
+ hrrs->clear();
// You might think here that we could clear just the cards
// corresponding to the used region. But no: if we leave a dirty card
// in a region we might allocate into, then it would prevent that card
// from being enqueued, and cause it to be missed.
// Re: the performance cost: we shouldn't be doing full GC anyway!
_mr_bs->clear(MemRegion(r->bottom(), r->end()));
+
return false;
}
};
@@ -1269,30 +1279,6 @@
heap_region_iterate(&cl);
}
-double G1CollectedHeap::verify(bool guard, const char* msg) {
- double verify_time_ms = 0.0;
-
- if (guard && total_collections() >= VerifyGCStartAt) {
- double verify_start = os::elapsedTime();
- HandleMark hm; // Discard invalid handles created during verification
- prepare_for_verify();
- Universe::verify(VerifyOption_G1UsePrevMarking, msg);
- verify_time_ms = (os::elapsedTime() - verify_start) * 1000;
- }
-
- return verify_time_ms;
-}
-
-void G1CollectedHeap::verify_before_gc() {
- double verify_time_ms = verify(VerifyBeforeGC, " VerifyBeforeGC:");
- g1_policy()->phase_times()->record_verify_before_time_ms(verify_time_ms);
-}
-
-void G1CollectedHeap::verify_after_gc() {
- double verify_time_ms = verify(VerifyAfterGC, " VerifyAfterGC:");
- g1_policy()->phase_times()->record_verify_after_time_ms(verify_time_ms);
-}
-
bool G1CollectedHeap::do_collection(bool explicit_gc,
bool clear_all_soft_refs,
size_t word_size) {
@@ -1433,7 +1419,7 @@
// Delete metaspaces for unloaded class loaders and clean up loader_data graph
ClassLoaderDataGraph::purge();
- MetaspaceAux::verify_metrics();
+ MetaspaceAux::verify_metrics();
// Note: since we've just done a full GC, concurrent
// marking is no longer active. Therefore we need not
@@ -1504,6 +1490,9 @@
heap_region_iterate(&rebuild_rs);
}
+ // Rebuild the strong code root lists for each region
+ rebuild_strong_code_roots();
+
if (true) { // FIXME
MetaspaceGC::compute_new_size();
}
@@ -2019,10 +2008,12 @@
size_t init_byte_size = collector_policy()->initial_heap_byte_size();
size_t max_byte_size = collector_policy()->max_heap_byte_size();
+ size_t heap_alignment = collector_policy()->max_alignment();
// Ensure that the sizes are properly aligned.
Universe::check_alignment(init_byte_size, HeapRegion::GrainBytes, "g1 heap");
Universe::check_alignment(max_byte_size, HeapRegion::GrainBytes, "g1 heap");
+ Universe::check_alignment(max_byte_size, heap_alignment, "g1 heap");
_cg1r = new ConcurrentG1Refine(this);
@@ -2039,12 +2030,8 @@
// If this happens then we could end up using a non-optimal
// compressed oops mode.
- // Since max_byte_size is aligned to the size of a heap region (checked
- // above).
- Universe::check_alignment(max_byte_size, HeapRegion::GrainBytes, "g1 heap");
-
ReservedSpace heap_rs = Universe::reserve_heap(max_byte_size,
- HeapRegion::GrainBytes);
+ heap_alignment);
// It is important to do this in a way such that concurrent readers can't
// temporarily think something is in the heap. (I've actually seen this
@@ -3109,6 +3096,145 @@
return NULL; // keep some compilers happy
}
+// TODO: VerifyRootsClosure extends OopsInGenClosure so that we can
+// pass it as the perm_blk to SharedHeap::process_strong_roots.
+// When process_strong_roots stop calling perm_blk->younger_refs_iterate
+// we can change this closure to extend the simpler OopClosure.
+class VerifyRootsClosure: public OopsInGenClosure {
+private:
+ G1CollectedHeap* _g1h;
+ VerifyOption _vo;
+ bool _failures;
+public:
+ // _vo == UsePrevMarking -> use "prev" marking information,
+ // _vo == UseNextMarking -> use "next" marking information,
+ // _vo == UseMarkWord -> use mark word from object header.
+ VerifyRootsClosure(VerifyOption vo) :
+ _g1h(G1CollectedHeap::heap()),
+ _vo(vo),
+ _failures(false) { }
+
+ bool failures() { return _failures; }
+
+ template <class T> void do_oop_nv(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ if (_g1h->is_obj_dead_cond(obj, _vo)) {
+ gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
+ "points to dead obj "PTR_FORMAT, p, (void*) obj);
+ if (_vo == VerifyOption_G1UseMarkWord) {
+ gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark()));
+ }
+ obj->print_on(gclog_or_tty);
+ _failures = true;
+ }
+ }
+ }
+
+ void do_oop(oop* p) { do_oop_nv(p); }
+ void do_oop(narrowOop* p) { do_oop_nv(p); }
+};
+
+class G1VerifyCodeRootOopClosure: public OopsInGenClosure {
+ G1CollectedHeap* _g1h;
+ OopClosure* _root_cl;
+ nmethod* _nm;
+ VerifyOption _vo;
+ bool _failures;
+
+ template <class T> void do_oop_work(T* p) {
+ // First verify that this root is live
+ _root_cl->do_oop(p);
+
+ if (!G1VerifyHeapRegionCodeRoots) {
+ // We're not verifying the code roots attached to heap region.
+ return;
+ }
+
+ // Don't check the code roots during marking verification in a full GC
+ if (_vo == VerifyOption_G1UseMarkWord) {
+ return;
+ }
+
+ // Now verify that the current nmethod (which contains p) is
+ // in the code root list of the heap region containing the
+ // object referenced by p.
+
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+
+ // Now fetch the region containing the object
+ HeapRegion* hr = _g1h->heap_region_containing(obj);
+ HeapRegionRemSet* hrrs = hr->rem_set();
+ // Verify that the strong code root list for this region
+ // contains the nmethod
+ if (!hrrs->strong_code_roots_list_contains(_nm)) {
+ gclog_or_tty->print_cr("Code root location "PTR_FORMAT" "
+ "from nmethod "PTR_FORMAT" not in strong "
+ "code roots for region ["PTR_FORMAT","PTR_FORMAT")",
+ p, _nm, hr->bottom(), hr->end());
+ _failures = true;
+ }
+ }
+ }
+
+public:
+ G1VerifyCodeRootOopClosure(G1CollectedHeap* g1h, OopClosure* root_cl, VerifyOption vo):
+ _g1h(g1h), _root_cl(root_cl), _vo(vo), _nm(NULL), _failures(false) {}
+
+ void do_oop(oop* p) { do_oop_work(p); }
+ void do_oop(narrowOop* p) { do_oop_work(p); }
+
+ void set_nmethod(nmethod* nm) { _nm = nm; }
+ bool failures() { return _failures; }
+};
+
+class G1VerifyCodeRootBlobClosure: public CodeBlobClosure {
+ G1VerifyCodeRootOopClosure* _oop_cl;
+
+public:
+ G1VerifyCodeRootBlobClosure(G1VerifyCodeRootOopClosure* oop_cl):
+ _oop_cl(oop_cl) {}
+
+ void do_code_blob(CodeBlob* cb) {
+ nmethod* nm = cb->as_nmethod_or_null();
+ if (nm != NULL) {
+ _oop_cl->set_nmethod(nm);
+ nm->oops_do(_oop_cl);
+ }
+ }
+};
+
+class YoungRefCounterClosure : public OopClosure {
+ G1CollectedHeap* _g1h;
+ int _count;
+ public:
+ YoungRefCounterClosure(G1CollectedHeap* g1h) : _g1h(g1h), _count(0) {}
+ void do_oop(oop* p) { if (_g1h->is_in_young(*p)) { _count++; } }
+ void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+
+ int count() { return _count; }
+ void reset_count() { _count = 0; };
+};
+
+class VerifyKlassClosure: public KlassClosure {
+ YoungRefCounterClosure _young_ref_counter_closure;
+ OopClosure *_oop_closure;
+ public:
+ VerifyKlassClosure(G1CollectedHeap* g1h, OopClosure* cl) : _young_ref_counter_closure(g1h), _oop_closure(cl) {}
+ void do_klass(Klass* k) {
+ k->oops_do(_oop_closure);
+
+ _young_ref_counter_closure.reset_count();
+ k->oops_do(&_young_ref_counter_closure);
+ if (_young_ref_counter_closure.count() > 0) {
+ guarantee(k->has_modified_oops(), err_msg("Klass %p, has young refs but is not dirty.", k));
+ }
+ }
+};
+
class VerifyLivenessOopClosure: public OopClosure {
G1CollectedHeap* _g1h;
VerifyOption _vo;
@@ -3242,75 +3368,7 @@
}
};
-class YoungRefCounterClosure : public OopClosure {
- G1CollectedHeap* _g1h;
- int _count;
- public:
- YoungRefCounterClosure(G1CollectedHeap* g1h) : _g1h(g1h), _count(0) {}
- void do_oop(oop* p) { if (_g1h->is_in_young(*p)) { _count++; } }
- void do_oop(narrowOop* p) { ShouldNotReachHere(); }
-
- int count() { return _count; }
- void reset_count() { _count = 0; };
-};
-
-class VerifyKlassClosure: public KlassClosure {
- YoungRefCounterClosure _young_ref_counter_closure;
- OopClosure *_oop_closure;
- public:
- VerifyKlassClosure(G1CollectedHeap* g1h, OopClosure* cl) : _young_ref_counter_closure(g1h), _oop_closure(cl) {}
- void do_klass(Klass* k) {
- k->oops_do(_oop_closure);
-
- _young_ref_counter_closure.reset_count();
- k->oops_do(&_young_ref_counter_closure);
- if (_young_ref_counter_closure.count() > 0) {
- guarantee(k->has_modified_oops(), err_msg("Klass %p, has young refs but is not dirty.", k));
- }
- }
-};
-
-// TODO: VerifyRootsClosure extends OopsInGenClosure so that we can
-// pass it as the perm_blk to SharedHeap::process_strong_roots.
-// When process_strong_roots stop calling perm_blk->younger_refs_iterate
-// we can change this closure to extend the simpler OopClosure.
-class VerifyRootsClosure: public OopsInGenClosure {
-private:
- G1CollectedHeap* _g1h;
- VerifyOption _vo;
- bool _failures;
-public:
- // _vo == UsePrevMarking -> use "prev" marking information,
- // _vo == UseNextMarking -> use "next" marking information,
- // _vo == UseMarkWord -> use mark word from object header.
- VerifyRootsClosure(VerifyOption vo) :
- _g1h(G1CollectedHeap::heap()),
- _vo(vo),
- _failures(false) { }
-
- bool failures() { return _failures; }
-
- template <class T> void do_oop_nv(T* p) {
- T heap_oop = oopDesc::load_heap_oop(p);
- if (!oopDesc::is_null(heap_oop)) {
- oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
- if (_g1h->is_obj_dead_cond(obj, _vo)) {
- gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
- "points to dead obj "PTR_FORMAT, p, (void*) obj);
- if (_vo == VerifyOption_G1UseMarkWord) {
- gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark()));
- }
- obj->print_on(gclog_or_tty);
- _failures = true;
- }
- }
- }
-
- void do_oop(oop* p) { do_oop_nv(p); }
- void do_oop(narrowOop* p) { do_oop_nv(p); }
-};
-
-// This is the task used for parallel heap verification.
+// This is the task used for parallel verification of the heap regions
class G1ParVerifyTask: public AbstractGangTask {
private:
@@ -3344,20 +3402,15 @@
}
};
-void G1CollectedHeap::verify(bool silent) {
- verify(silent, VerifyOption_G1UsePrevMarking);
-}
-
-void G1CollectedHeap::verify(bool silent,
- VerifyOption vo) {
+void G1CollectedHeap::verify(bool silent, VerifyOption vo) {
if (SafepointSynchronize::is_at_safepoint()) {
+ assert(Thread::current()->is_VM_thread(),
+ "Expected to be executed serially by the VM thread at this point");
+
if (!silent) { gclog_or_tty->print("Roots "); }
VerifyRootsClosure rootsCl(vo);
-
- assert(Thread::current()->is_VM_thread(),
- "Expected to be executed serially by the VM thread at this point");
-
- CodeBlobToOopClosure blobsCl(&rootsCl, /*do_marking=*/ false);
+ G1VerifyCodeRootOopClosure codeRootsCl(this, &rootsCl, vo);
+ G1VerifyCodeRootBlobClosure blobsCl(&codeRootsCl);
VerifyKlassClosure klassCl(this, &rootsCl);
// We apply the relevant closures to all the oops in the
@@ -3376,7 +3429,7 @@
&klassCl
);
- bool failures = rootsCl.failures();
+ bool failures = rootsCl.failures() || codeRootsCl.failures();
if (vo != VerifyOption_G1UseMarkWord) {
// If we're verifying during a full GC then the region sets
@@ -3445,6 +3498,34 @@
}
}
+void G1CollectedHeap::verify(bool silent) {
+ verify(silent, VerifyOption_G1UsePrevMarking);
+}
+
+double G1CollectedHeap::verify(bool guard, const char* msg) {
+ double verify_time_ms = 0.0;
+
+ if (guard && total_collections() >= VerifyGCStartAt) {
+ double verify_start = os::elapsedTime();
+ HandleMark hm; // Discard invalid handles created during verification
+ prepare_for_verify();
+ Universe::verify(VerifyOption_G1UsePrevMarking, msg);
+ verify_time_ms = (os::elapsedTime() - verify_start) * 1000;
+ }
+
+ return verify_time_ms;
+}
+
+void G1CollectedHeap::verify_before_gc() {
+ double verify_time_ms = verify(VerifyBeforeGC, " VerifyBeforeGC:");
+ g1_policy()->phase_times()->record_verify_before_time_ms(verify_time_ms);
+}
+
+void G1CollectedHeap::verify_after_gc() {
+ double verify_time_ms = verify(VerifyAfterGC, " VerifyAfterGC:");
+ g1_policy()->phase_times()->record_verify_after_time_ms(verify_time_ms);
+}
+
class PrintRegionClosure: public HeapRegionClosure {
outputStream* _st;
public:
@@ -3619,14 +3700,15 @@
HeapWord* G1CollectedHeap::do_collection_pause(size_t word_size,
unsigned int gc_count_before,
- bool* succeeded) {
+ bool* succeeded,
+ GCCause::Cause gc_cause) {
assert_heap_not_locked_and_not_at_safepoint();
g1_policy()->record_stop_world_start();
VM_G1IncCollectionPause op(gc_count_before,
word_size,
false, /* should_initiate_conc_mark */
g1_policy()->max_pause_time_ms(),
- GCCause::_g1_inc_collection_pause);
+ gc_cause);
VMThread::execute(&op);
HeapWord* result = op.result();
@@ -3866,8 +3948,9 @@
append_secondary_free_list_if_not_empty_with_lock();
}
- assert(check_young_list_well_formed(),
- "young list should be well formed");
+ assert(check_young_list_well_formed(), "young list should be well formed");
+ assert(check_heap_region_claim_values(HeapRegion::InitialClaimValue),
+ "sanity check");
// Don't dynamically change the number of GC threads this early. A value of
// 0 is used to indicate serial work. When parallel work is done,
@@ -4987,7 +5070,11 @@
G1ParPushHeapRSClosure push_heap_rs_cl(_g1h, &pss);
- int so = SharedHeap::SO_AllClasses | SharedHeap::SO_Strings | SharedHeap::SO_CodeCache;
+ // Don't scan the scavengable methods in the code cache as part
+ // of strong root scanning. The code roots that point into a
+ // region in the collection set are scanned when we scan the
+ // region's RSet.
+ int so = SharedHeap::SO_AllClasses | SharedHeap::SO_Strings;
pss.start_strong_roots();
_g1h->g1_process_strong_roots(/* is scavenging */ true,
@@ -5029,67 +5116,6 @@
// *** Common G1 Evacuation Stuff
-// Closures that support the filtering of CodeBlobs scanned during
-// external root scanning.
-
-// Closure applied to reference fields in code blobs (specifically nmethods)
-// to determine whether an nmethod contains references that point into
-// the collection set. Used as a predicate when walking code roots so
-// that only nmethods that point into the collection set are added to the
-// 'marked' list.
-
-class G1FilteredCodeBlobToOopClosure : public CodeBlobToOopClosure {
-
- class G1PointsIntoCSOopClosure : public OopClosure {
- G1CollectedHeap* _g1;
- bool _points_into_cs;
- public:
- G1PointsIntoCSOopClosure(G1CollectedHeap* g1) :
- _g1(g1), _points_into_cs(false) { }
-
- bool points_into_cs() const { return _points_into_cs; }
-
- template <class T>
- void do_oop_nv(T* p) {
- if (!_points_into_cs) {
- T heap_oop = oopDesc::load_heap_oop(p);
- if (!oopDesc::is_null(heap_oop) &&
- _g1->in_cset_fast_test(oopDesc::decode_heap_oop_not_null(heap_oop))) {
- _points_into_cs = true;
- }
- }
- }
-
- virtual void do_oop(oop* p) { do_oop_nv(p); }
- virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
- };
-
- G1CollectedHeap* _g1;
-
-public:
- G1FilteredCodeBlobToOopClosure(G1CollectedHeap* g1, OopClosure* cl) :
- CodeBlobToOopClosure(cl, true), _g1(g1) { }
-
- virtual void do_code_blob(CodeBlob* cb) {
- nmethod* nm = cb->as_nmethod_or_null();
- if (nm != NULL && !(nm->test_oops_do_mark())) {
- G1PointsIntoCSOopClosure predicate_cl(_g1);
- nm->oops_do(&predicate_cl);
-
- if (predicate_cl.points_into_cs()) {
- // At least one of the reference fields or the oop relocations
- // in the nmethod points into the collection set. We have to
- // 'mark' this nmethod.
- // Note: Revisit the following if CodeBlobToOopClosure::do_code_blob()
- // or MarkingCodeBlobClosure::do_code_blob() change.
- if (!nm->test_set_oops_do_mark()) {
- do_newly_marked_nmethod(nm);
- }
- }
- }
- }
-};
-
// This method is run in a GC worker.
void
@@ -5107,9 +5133,10 @@
BufferingOopClosure buf_scan_non_heap_roots(scan_non_heap_roots);
- // Walk the code cache w/o buffering, because StarTask cannot handle
- // unaligned oop locations.
- G1FilteredCodeBlobToOopClosure eager_scan_code_roots(this, scan_non_heap_roots);
+ assert(so & SO_CodeCache || scan_rs != NULL, "must scan code roots somehow");
+ // Walk the code cache/strong code roots w/o buffering, because StarTask
+ // cannot handle unaligned oop locations.
+ CodeBlobToOopClosure eager_scan_code_roots(scan_non_heap_roots, true /* do_marking */);
process_strong_roots(false, // no scoping; this is parallel code
is_scavenging, so,
@@ -5154,9 +5181,22 @@
}
g1_policy()->phase_times()->record_satb_filtering_time(worker_i, satb_filtering_ms);
+ // If this is an initial mark pause, and we're not scanning
+ // the entire code cache, we need to mark the oops in the
+ // strong code root lists for the regions that are not in
+ // the collection set.
+ // Note all threads participate in this set of root tasks.
+ double mark_strong_code_roots_ms = 0.0;
+ if (g1_policy()->during_initial_mark_pause() && !(so & SO_CodeCache)) {
+ double mark_strong_roots_start = os::elapsedTime();
+ mark_strong_code_roots(worker_i);
+ mark_strong_code_roots_ms = (os::elapsedTime() - mark_strong_roots_start) * 1000.0;
+ }
+ g1_policy()->phase_times()->record_strong_code_root_mark_time(worker_i, mark_strong_code_roots_ms);
+
// Now scan the complement of the collection set.
if (scan_rs != NULL) {
- g1_rem_set()->oops_into_collection_set_do(scan_rs, worker_i);
+ g1_rem_set()->oops_into_collection_set_do(scan_rs, &eager_scan_code_roots, worker_i);
}
_process_strong_tasks->all_tasks_completed();
}
@@ -5774,9 +5814,6 @@
process_discovered_references(n_workers);
// Weak root processing.
- // Note: when JSR 292 is enabled and code blobs can contain
- // non-perm oops then we will need to process the code blobs
- // here too.
{
G1STWIsAliveClosure is_alive(this);
G1KeepAliveClosure keep_alive(this);
@@ -5792,6 +5829,17 @@
hot_card_cache->reset_hot_cache();
hot_card_cache->set_use_cache(true);
+ // Migrate the strong code roots attached to each region in
+ // the collection set. Ideally we would like to do this
+ // after we have finished the scanning/evacuation of the
+ // strong code roots for a particular heap region.
+ migrate_strong_code_roots();
+
+ if (g1_policy()->during_initial_mark_pause()) {
+ // Reset the claim values set during marking the strong code roots
+ reset_heap_region_claim_values();
+ }
+
finalize_for_evac_failure();
if (evacuation_failed()) {
@@ -6588,3 +6636,208 @@
_humongous_set.verify_end();
_free_list.verify_end();
}
+
+// Optimized nmethod scanning
+
+class RegisterNMethodOopClosure: public OopClosure {
+ G1CollectedHeap* _g1h;
+ nmethod* _nm;
+
+ template <class T> void do_oop_work(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ HeapRegion* hr = _g1h->heap_region_containing(obj);
+ assert(!hr->isHumongous(), "code root in humongous region?");
+
+ // HeapRegion::add_strong_code_root() avoids adding duplicate
+ // entries but having duplicates is OK since we "mark" nmethods
+ // as visited when we scan the strong code root lists during the GC.
+ hr->add_strong_code_root(_nm);
+ assert(hr->rem_set()->strong_code_roots_list_contains(_nm), "add failed?");
+ }
+ }
+
+public:
+ RegisterNMethodOopClosure(G1CollectedHeap* g1h, nmethod* nm) :
+ _g1h(g1h), _nm(nm) {}
+
+ void do_oop(oop* p) { do_oop_work(p); }
+ void do_oop(narrowOop* p) { do_oop_work(p); }
+};
+
+class UnregisterNMethodOopClosure: public OopClosure {
+ G1CollectedHeap* _g1h;
+ nmethod* _nm;
+
+ template <class T> void do_oop_work(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ HeapRegion* hr = _g1h->heap_region_containing(obj);
+ assert(!hr->isHumongous(), "code root in humongous region?");
+ hr->remove_strong_code_root(_nm);
+ assert(!hr->rem_set()->strong_code_roots_list_contains(_nm), "remove failed?");
+ }
+ }
+
+public:
+ UnregisterNMethodOopClosure(G1CollectedHeap* g1h, nmethod* nm) :
+ _g1h(g1h), _nm(nm) {}
+
+ void do_oop(oop* p) { do_oop_work(p); }
+ void do_oop(narrowOop* p) { do_oop_work(p); }
+};
+
+void G1CollectedHeap::register_nmethod(nmethod* nm) {
+ CollectedHeap::register_nmethod(nm);
+
+ guarantee(nm != NULL, "sanity");
+ RegisterNMethodOopClosure reg_cl(this, nm);
+ nm->oops_do(®_cl);
+}
+
+void G1CollectedHeap::unregister_nmethod(nmethod* nm) {
+ CollectedHeap::unregister_nmethod(nm);
+
+ guarantee(nm != NULL, "sanity");
+ UnregisterNMethodOopClosure reg_cl(this, nm);
+ nm->oops_do(®_cl, true);
+}
+
+class MigrateCodeRootsHeapRegionClosure: public HeapRegionClosure {
+public:
+ bool doHeapRegion(HeapRegion *hr) {
+ assert(!hr->isHumongous(), "humongous region in collection set?");
+ hr->migrate_strong_code_roots();
+ return false;
+ }
+};
+
+void G1CollectedHeap::migrate_strong_code_roots() {
+ MigrateCodeRootsHeapRegionClosure cl;
+ double migrate_start = os::elapsedTime();
+ collection_set_iterate(&cl);
+ double migration_time_ms = (os::elapsedTime() - migrate_start) * 1000.0;
+ g1_policy()->phase_times()->record_strong_code_root_migration_time(migration_time_ms);
+}
+
+// Mark all the code roots that point into regions *not* in the
+// collection set.
+//
+// Note we do not want to use a "marking" CodeBlobToOopClosure while
+// walking the the code roots lists of regions not in the collection
+// set. Suppose we have an nmethod (M) that points to objects in two
+// separate regions - one in the collection set (R1) and one not (R2).
+// Using a "marking" CodeBlobToOopClosure here would result in "marking"
+// nmethod M when walking the code roots for R1. When we come to scan
+// the code roots for R2, we would see that M is already marked and it
+// would be skipped and the objects in R2 that are referenced from M
+// would not be evacuated.
+
+class MarkStrongCodeRootCodeBlobClosure: public CodeBlobClosure {
+
+ class MarkStrongCodeRootOopClosure: public OopClosure {
+ ConcurrentMark* _cm;
+ HeapRegion* _hr;
+ uint _worker_id;
+
+ template <class T> void do_oop_work(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ // Only mark objects in the region (which is assumed
+ // to be not in the collection set).
+ if (_hr->is_in(obj)) {
+ _cm->grayRoot(obj, (size_t) obj->size(), _worker_id);
+ }
+ }
+ }
+
+ public:
+ MarkStrongCodeRootOopClosure(ConcurrentMark* cm, HeapRegion* hr, uint worker_id) :
+ _cm(cm), _hr(hr), _worker_id(worker_id) {
+ assert(!_hr->in_collection_set(), "sanity");
+ }
+
+ void do_oop(narrowOop* p) { do_oop_work(p); }
+ void do_oop(oop* p) { do_oop_work(p); }
+ };
+
+ MarkStrongCodeRootOopClosure _oop_cl;
+
+public:
+ MarkStrongCodeRootCodeBlobClosure(ConcurrentMark* cm, HeapRegion* hr, uint worker_id):
+ _oop_cl(cm, hr, worker_id) {}
+
+ void do_code_blob(CodeBlob* cb) {
+ nmethod* nm = (cb == NULL) ? NULL : cb->as_nmethod_or_null();
+ if (nm != NULL) {
+ nm->oops_do(&_oop_cl);
+ }
+ }
+};
+
+class MarkStrongCodeRootsHRClosure: public HeapRegionClosure {
+ G1CollectedHeap* _g1h;
+ uint _worker_id;
+
+public:
+ MarkStrongCodeRootsHRClosure(G1CollectedHeap* g1h, uint worker_id) :
+ _g1h(g1h), _worker_id(worker_id) {}
+
+ bool doHeapRegion(HeapRegion *hr) {
+ HeapRegionRemSet* hrrs = hr->rem_set();
+ if (hr->isHumongous()) {
+ // Code roots should never be attached to a humongous region
+ assert(hrrs->strong_code_roots_list_length() == 0, "sanity");
+ return false;
+ }
+
+ if (hr->in_collection_set()) {
+ // Don't mark code roots into regions in the collection set here.
+ // They will be marked when we scan them.
+ return false;
+ }
+
+ MarkStrongCodeRootCodeBlobClosure cb_cl(_g1h->concurrent_mark(), hr, _worker_id);
+ hr->strong_code_roots_do(&cb_cl);
+ return false;
+ }
+};
+
+void G1CollectedHeap::mark_strong_code_roots(uint worker_id) {
+ MarkStrongCodeRootsHRClosure cl(this, worker_id);
+ if (G1CollectedHeap::use_parallel_gc_threads()) {
+ heap_region_par_iterate_chunked(&cl,
+ worker_id,
+ workers()->active_workers(),
+ HeapRegion::ParMarkRootClaimValue);
+ } else {
+ heap_region_iterate(&cl);
+ }
+}
+
+class RebuildStrongCodeRootClosure: public CodeBlobClosure {
+ G1CollectedHeap* _g1h;
+
+public:
+ RebuildStrongCodeRootClosure(G1CollectedHeap* g1h) :
+ _g1h(g1h) {}
+
+ void do_code_blob(CodeBlob* cb) {
+ nmethod* nm = (cb != NULL) ? cb->as_nmethod_or_null() : NULL;
+ if (nm == NULL) {
+ return;
+ }
+
+ if (ScavengeRootsInCode && nm->detect_scavenge_root_oops()) {
+ _g1h->register_nmethod(nm);
+ }
+ }
+};
+
+void G1CollectedHeap::rebuild_strong_code_roots() {
+ RebuildStrongCodeRootClosure blob_cl(this);
+ CodeCache::blobs_do(&blob_cl);
+}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -46,6 +46,7 @@
// may combine concurrent marking with parallel, incremental compaction of
// heap subsets that will yield large amounts of garbage.
+// Forward declarations
class HeapRegion;
class HRRSCleanupTask;
class GenerationSpec;
@@ -69,6 +70,7 @@
class G1NewTracer;
class G1OldTracer;
class EvacuationFailedInfo;
+class nmethod;
typedef OverflowTaskQueue<StarTask, mtGC> RefToScanQueue;
typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet;
@@ -163,18 +165,6 @@
: G1AllocRegion("Mutator Alloc Region", false /* bot_updates */) { }
};
-// The G1 STW is alive closure.
-// An instance is embedded into the G1CH and used as the
-// (optional) _is_alive_non_header closure in the STW
-// reference processor. It is also extensively used during
-// reference processing during STW evacuation pauses.
-class G1STWIsAliveClosure: public BoolObjectClosure {
- G1CollectedHeap* _g1;
-public:
- G1STWIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
- bool do_object_b(oop p);
-};
-
class SurvivorGCAllocRegion : public G1AllocRegion {
protected:
virtual HeapRegion* allocate_new_region(size_t word_size, bool force);
@@ -193,6 +183,18 @@
: G1AllocRegion("Old GC Alloc Region", true /* bot_updates */) { }
};
+// The G1 STW is alive closure.
+// An instance is embedded into the G1CH and used as the
+// (optional) _is_alive_non_header closure in the STW
+// reference processor. It is also extensively used during
+// reference processing during STW evacuation pauses.
+class G1STWIsAliveClosure: public BoolObjectClosure {
+ G1CollectedHeap* _g1;
+public:
+ G1STWIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
+ bool do_object_b(oop p);
+};
+
class RefineCardTableEntryClosure;
class G1CollectedHeap : public SharedHeap {
@@ -774,9 +776,10 @@
// it has to be read while holding the Heap_lock. Currently, both
// methods that call do_collection_pause() release the Heap_lock
// before the call, so it's easy to read gc_count_before just before.
- HeapWord* do_collection_pause(size_t word_size,
- unsigned int gc_count_before,
- bool* succeeded);
+ HeapWord* do_collection_pause(size_t word_size,
+ unsigned int gc_count_before,
+ bool* succeeded,
+ GCCause::Cause gc_cause);
// The guts of the incremental collection pause, executed by the vm
// thread. It returns false if it is unable to do the collection due
@@ -1549,42 +1552,6 @@
virtual jlong millis_since_last_gc();
- // Perform any cleanup actions necessary before allowing a verification.
- virtual void prepare_for_verify();
-
- // Perform verification.
-
- // vo == UsePrevMarking -> use "prev" marking information,
- // vo == UseNextMarking -> use "next" marking information
- // vo == UseMarkWord -> use the mark word in the object header
- //
- // NOTE: Only the "prev" marking information is guaranteed to be
- // consistent most of the time, so most calls to this should use
- // vo == UsePrevMarking.
- // Currently, there is only one case where this is called with
- // vo == UseNextMarking, which is to verify the "next" marking
- // information at the end of remark.
- // Currently there is only one place where this is called with
- // vo == UseMarkWord, which is to verify the marking during a
- // full GC.
- void verify(bool silent, VerifyOption vo);
-
- // Override; it uses the "prev" marking information
- virtual void verify(bool silent);
-
- virtual void print_on(outputStream* st) const;
- virtual void print_extended_on(outputStream* st) const;
- virtual void print_on_error(outputStream* st) const;
-
- virtual void print_gc_threads_on(outputStream* st) const;
- virtual void gc_threads_do(ThreadClosure* tc) const;
-
- // Override
- void print_tracing_info() const;
-
- // The following two methods are helpful for debugging RSet issues.
- void print_cset_rsets() PRODUCT_RETURN;
- void print_all_rsets() PRODUCT_RETURN;
// Convenience function to be used in situations where the heap type can be
// asserted to be this type.
@@ -1661,13 +1628,86 @@
else return is_obj_ill(obj, hr);
}
+ bool allocated_since_marking(oop obj, HeapRegion* hr, VerifyOption vo);
+ HeapWord* top_at_mark_start(HeapRegion* hr, VerifyOption vo);
+ bool is_marked(oop obj, VerifyOption vo);
+ const char* top_at_mark_start_str(VerifyOption vo);
+
+ ConcurrentMark* concurrent_mark() const { return _cm; }
+
+ // Refinement
+
+ ConcurrentG1Refine* concurrent_g1_refine() const { return _cg1r; }
+
+ // The dirty cards region list is used to record a subset of regions
+ // whose cards need clearing. The list if populated during the
+ // remembered set scanning and drained during the card table
+ // cleanup. Although the methods are reentrant, population/draining
+ // phases must not overlap. For synchronization purposes the last
+ // element on the list points to itself.
+ HeapRegion* _dirty_cards_region_list;
+ void push_dirty_cards_region(HeapRegion* hr);
+ HeapRegion* pop_dirty_cards_region();
+
+ // Optimized nmethod scanning support routines
+
+ // Register the given nmethod with the G1 heap
+ virtual void register_nmethod(nmethod* nm);
+
+ // Unregister the given nmethod from the G1 heap
+ virtual void unregister_nmethod(nmethod* nm);
+
+ // Migrate the nmethods in the code root lists of the regions
+ // in the collection set to regions in to-space. In the event
+ // of an evacuation failure, nmethods that reference objects
+ // that were not successfullly evacuated are not migrated.
+ void migrate_strong_code_roots();
+
+ // During an initial mark pause, mark all the code roots that
+ // point into regions *not* in the collection set.
+ void mark_strong_code_roots(uint worker_id);
+
+ // Rebuild the stong code root lists for each region
+ // after a full GC
+ void rebuild_strong_code_roots();
+
+ // Verification
+
+ // The following is just to alert the verification code
+ // that a full collection has occurred and that the
+ // remembered sets are no longer up to date.
+ bool _full_collection;
+ void set_full_collection() { _full_collection = true;}
+ void clear_full_collection() {_full_collection = false;}
+ bool full_collection() {return _full_collection;}
+
+ // Perform any cleanup actions necessary before allowing a verification.
+ virtual void prepare_for_verify();
+
+ // Perform verification.
+
+ // vo == UsePrevMarking -> use "prev" marking information,
+ // vo == UseNextMarking -> use "next" marking information
+ // vo == UseMarkWord -> use the mark word in the object header
+ //
+ // NOTE: Only the "prev" marking information is guaranteed to be
+ // consistent most of the time, so most calls to this should use
+ // vo == UsePrevMarking.
+ // Currently, there is only one case where this is called with
+ // vo == UseNextMarking, which is to verify the "next" marking
+ // information at the end of remark.
+ // Currently there is only one place where this is called with
+ // vo == UseMarkWord, which is to verify the marking during a
+ // full GC.
+ void verify(bool silent, VerifyOption vo);
+
+ // Override; it uses the "prev" marking information
+ virtual void verify(bool silent);
+
// The methods below are here for convenience and dispatch the
// appropriate method depending on value of the given VerifyOption
- // parameter. The options for that parameter are:
- //
- // vo == UsePrevMarking -> use "prev" marking information,
- // vo == UseNextMarking -> use "next" marking information,
- // vo == UseMarkWord -> use mark word from object header
+ // parameter. The values for that parameter, and their meanings,
+ // are the same as those above.
bool is_obj_dead_cond(const oop obj,
const HeapRegion* hr,
@@ -1692,31 +1732,21 @@
return false; // keep some compilers happy
}
- bool allocated_since_marking(oop obj, HeapRegion* hr, VerifyOption vo);
- HeapWord* top_at_mark_start(HeapRegion* hr, VerifyOption vo);
- bool is_marked(oop obj, VerifyOption vo);
- const char* top_at_mark_start_str(VerifyOption vo);
+ // Printing
- // The following is just to alert the verification code
- // that a full collection has occurred and that the
- // remembered sets are no longer up to date.
- bool _full_collection;
- void set_full_collection() { _full_collection = true;}
- void clear_full_collection() {_full_collection = false;}
- bool full_collection() {return _full_collection;}
+ virtual void print_on(outputStream* st) const;
+ virtual void print_extended_on(outputStream* st) const;
+ virtual void print_on_error(outputStream* st) const;
- ConcurrentMark* concurrent_mark() const { return _cm; }
- ConcurrentG1Refine* concurrent_g1_refine() const { return _cg1r; }
+ virtual void print_gc_threads_on(outputStream* st) const;
+ virtual void gc_threads_do(ThreadClosure* tc) const;
- // The dirty cards region list is used to record a subset of regions
- // whose cards need clearing. The list if populated during the
- // remembered set scanning and drained during the card table
- // cleanup. Although the methods are reentrant, population/draining
- // phases must not overlap. For synchronization purposes the last
- // element on the list points to itself.
- HeapRegion* _dirty_cards_region_list;
- void push_dirty_cards_region(HeapRegion* hr);
- HeapRegion* pop_dirty_cards_region();
+ // Override
+ void print_tracing_info() const;
+
+ // The following two methods are helpful for debugging RSet issues.
+ void print_cset_rsets() PRODUCT_RETURN;
+ void print_all_rsets() PRODUCT_RETURN;
public:
void stop_conc_gc_threads();
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -313,7 +313,8 @@
void G1CollectorPolicy::initialize_flags() {
set_min_alignment(HeapRegion::GrainBytes);
size_t card_table_alignment = GenRemSet::max_alignment_constraint(rem_set_name());
- set_max_alignment(MAX2(card_table_alignment, min_alignment()));
+ size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
+ set_max_alignment(MAX3(card_table_alignment, min_alignment(), page_size));
if (SurvivorRatio < 1) {
vm_exit_during_initialization("Invalid survivor ratio specified");
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -161,6 +161,8 @@
_last_update_rs_times_ms(_max_gc_threads, "%.1lf"),
_last_update_rs_processed_buffers(_max_gc_threads, "%d"),
_last_scan_rs_times_ms(_max_gc_threads, "%.1lf"),
+ _last_strong_code_root_scan_times_ms(_max_gc_threads, "%.1lf"),
+ _last_strong_code_root_mark_times_ms(_max_gc_threads, "%.1lf"),
_last_obj_copy_times_ms(_max_gc_threads, "%.1lf"),
_last_termination_times_ms(_max_gc_threads, "%.1lf"),
_last_termination_attempts(_max_gc_threads, SIZE_FORMAT),
@@ -182,6 +184,8 @@
_last_update_rs_times_ms.reset();
_last_update_rs_processed_buffers.reset();
_last_scan_rs_times_ms.reset();
+ _last_strong_code_root_scan_times_ms.reset();
+ _last_strong_code_root_mark_times_ms.reset();
_last_obj_copy_times_ms.reset();
_last_termination_times_ms.reset();
_last_termination_attempts.reset();
@@ -197,6 +201,8 @@
_last_update_rs_times_ms.verify();
_last_update_rs_processed_buffers.verify();
_last_scan_rs_times_ms.verify();
+ _last_strong_code_root_scan_times_ms.verify();
+ _last_strong_code_root_mark_times_ms.verify();
_last_obj_copy_times_ms.verify();
_last_termination_times_ms.verify();
_last_termination_attempts.verify();
@@ -210,6 +216,8 @@
_last_satb_filtering_times_ms.get(i) +
_last_update_rs_times_ms.get(i) +
_last_scan_rs_times_ms.get(i) +
+ _last_strong_code_root_scan_times_ms.get(i) +
+ _last_strong_code_root_mark_times_ms.get(i) +
_last_obj_copy_times_ms.get(i) +
_last_termination_times_ms.get(i);
@@ -239,6 +247,9 @@
// Now subtract the time taken to fix up roots in generated code
misc_time_ms += _cur_collection_code_root_fixup_time_ms;
+ // Strong code root migration time
+ misc_time_ms += _cur_strong_code_root_migration_time_ms;
+
// Subtract the time taken to clean the card table from the
// current value of "other time"
misc_time_ms += _cur_clear_ct_time_ms;
@@ -257,9 +268,13 @@
if (_last_satb_filtering_times_ms.sum() > 0.0) {
_last_satb_filtering_times_ms.print(2, "SATB Filtering (ms)");
}
+ if (_last_strong_code_root_mark_times_ms.sum() > 0.0) {
+ _last_strong_code_root_mark_times_ms.print(2, "Code Root Marking (ms)");
+ }
_last_update_rs_times_ms.print(2, "Update RS (ms)");
_last_update_rs_processed_buffers.print(3, "Processed Buffers");
_last_scan_rs_times_ms.print(2, "Scan RS (ms)");
+ _last_strong_code_root_scan_times_ms.print(2, "Code Root Scanning (ms)");
_last_obj_copy_times_ms.print(2, "Object Copy (ms)");
_last_termination_times_ms.print(2, "Termination (ms)");
if (G1Log::finest()) {
@@ -273,12 +288,17 @@
if (_last_satb_filtering_times_ms.sum() > 0.0) {
_last_satb_filtering_times_ms.print(1, "SATB Filtering (ms)");
}
+ if (_last_strong_code_root_mark_times_ms.sum() > 0.0) {
+ _last_strong_code_root_mark_times_ms.print(1, "Code Root Marking (ms)");
+ }
_last_update_rs_times_ms.print(1, "Update RS (ms)");
_last_update_rs_processed_buffers.print(2, "Processed Buffers");
_last_scan_rs_times_ms.print(1, "Scan RS (ms)");
+ _last_strong_code_root_scan_times_ms.print(1, "Code Root Scanning (ms)");
_last_obj_copy_times_ms.print(1, "Object Copy (ms)");
}
print_stats(1, "Code Root Fixup", _cur_collection_code_root_fixup_time_ms);
+ print_stats(1, "Code Root Migration", _cur_strong_code_root_migration_time_ms);
print_stats(1, "Clear CT", _cur_clear_ct_time_ms);
double misc_time_ms = pause_time_sec * MILLIUNITS - accounted_time_ms();
print_stats(1, "Other", misc_time_ms);
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -119,6 +119,8 @@
WorkerDataArray<double> _last_update_rs_times_ms;
WorkerDataArray<int> _last_update_rs_processed_buffers;
WorkerDataArray<double> _last_scan_rs_times_ms;
+ WorkerDataArray<double> _last_strong_code_root_scan_times_ms;
+ WorkerDataArray<double> _last_strong_code_root_mark_times_ms;
WorkerDataArray<double> _last_obj_copy_times_ms;
WorkerDataArray<double> _last_termination_times_ms;
WorkerDataArray<size_t> _last_termination_attempts;
@@ -128,6 +130,7 @@
double _cur_collection_par_time_ms;
double _cur_collection_code_root_fixup_time_ms;
+ double _cur_strong_code_root_migration_time_ms;
double _cur_clear_ct_time_ms;
double _cur_ref_proc_time_ms;
@@ -179,6 +182,14 @@
_last_scan_rs_times_ms.set(worker_i, ms);
}
+ void record_strong_code_root_scan_time(uint worker_i, double ms) {
+ _last_strong_code_root_scan_times_ms.set(worker_i, ms);
+ }
+
+ void record_strong_code_root_mark_time(uint worker_i, double ms) {
+ _last_strong_code_root_mark_times_ms.set(worker_i, ms);
+ }
+
void record_obj_copy_time(uint worker_i, double ms) {
_last_obj_copy_times_ms.set(worker_i, ms);
}
@@ -208,6 +219,10 @@
_cur_collection_code_root_fixup_time_ms = ms;
}
+ void record_strong_code_root_migration_time(double ms) {
+ _cur_strong_code_root_migration_time_ms = ms;
+ }
+
void record_ref_proc_time(double ms) {
_cur_ref_proc_time_ms = ms;
}
@@ -294,6 +309,14 @@
return _last_scan_rs_times_ms.average();
}
+ double average_last_strong_code_root_scan_time(){
+ return _last_strong_code_root_scan_times_ms.average();
+ }
+
+ double average_last_strong_code_root_mark_time(){
+ return _last_strong_code_root_mark_times_ms.average();
+ }
+
double average_last_obj_copy_time() {
return _last_obj_copy_times_ms.average();
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -262,6 +262,7 @@
old_collection_counters()->update_all();
young_collection_counters()->update_all();
MetaspaceCounters::update_performance_counters();
+ CompressedClassSpaceCounters::update_performance_counters();
}
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -104,15 +104,25 @@
class ScanRSClosure : public HeapRegionClosure {
size_t _cards_done, _cards;
G1CollectedHeap* _g1h;
+
OopsInHeapRegionClosure* _oc;
+ CodeBlobToOopClosure* _code_root_cl;
+
G1BlockOffsetSharedArray* _bot_shared;
CardTableModRefBS *_ct_bs;
- int _worker_i;
- int _block_size;
- bool _try_claimed;
+
+ double _strong_code_root_scan_time_sec;
+ int _worker_i;
+ int _block_size;
+ bool _try_claimed;
+
public:
- ScanRSClosure(OopsInHeapRegionClosure* oc, int worker_i) :
+ ScanRSClosure(OopsInHeapRegionClosure* oc,
+ CodeBlobToOopClosure* code_root_cl,
+ int worker_i) :
_oc(oc),
+ _code_root_cl(code_root_cl),
+ _strong_code_root_scan_time_sec(0.0),
_cards(0),
_cards_done(0),
_worker_i(worker_i),
@@ -160,6 +170,12 @@
card_start, card_start + G1BlockOffsetSharedArray::N_words);
}
+ void scan_strong_code_roots(HeapRegion* r) {
+ double scan_start = os::elapsedTime();
+ r->strong_code_roots_do(_code_root_cl);
+ _strong_code_root_scan_time_sec += (os::elapsedTime() - scan_start);
+ }
+
bool doHeapRegion(HeapRegion* r) {
assert(r->in_collection_set(), "should only be called on elements of CS.");
HeapRegionRemSet* hrrs = r->rem_set();
@@ -173,6 +189,7 @@
// _try_claimed || r->claim_iter()
// is true: either we're supposed to work on claimed-but-not-complete
// regions, or we successfully claimed the region.
+
HeapRegionRemSetIterator iter(hrrs);
size_t card_index;
@@ -205,30 +222,43 @@
}
}
if (!_try_claimed) {
+ // Scan the strong code root list attached to the current region
+ scan_strong_code_roots(r);
+
hrrs->set_iter_complete();
}
return false;
}
+
+ double strong_code_root_scan_time_sec() {
+ return _strong_code_root_scan_time_sec;
+ }
+
size_t cards_done() { return _cards_done;}
size_t cards_looked_up() { return _cards;}
};
-void G1RemSet::scanRS(OopsInHeapRegionClosure* oc, int worker_i) {
+void G1RemSet::scanRS(OopsInHeapRegionClosure* oc,
+ CodeBlobToOopClosure* code_root_cl,
+ int worker_i) {
double rs_time_start = os::elapsedTime();
HeapRegion *startRegion = _g1->start_cset_region_for_worker(worker_i);
- ScanRSClosure scanRScl(oc, worker_i);
+ ScanRSClosure scanRScl(oc, code_root_cl, worker_i);
_g1->collection_set_iterate_from(startRegion, &scanRScl);
scanRScl.set_try_claimed();
_g1->collection_set_iterate_from(startRegion, &scanRScl);
- double scan_rs_time_sec = os::elapsedTime() - rs_time_start;
+ double scan_rs_time_sec = (os::elapsedTime() - rs_time_start)
+ - scanRScl.strong_code_root_scan_time_sec();
- assert( _cards_scanned != NULL, "invariant" );
+ assert(_cards_scanned != NULL, "invariant");
_cards_scanned[worker_i] = scanRScl.cards_done();
_g1p->phase_times()->record_scan_rs_time(worker_i, scan_rs_time_sec * 1000.0);
+ _g1p->phase_times()->record_strong_code_root_scan_time(worker_i,
+ scanRScl.strong_code_root_scan_time_sec() * 1000.0);
}
// Closure used for updating RSets and recording references that
@@ -288,7 +318,8 @@
}
void G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
- int worker_i) {
+ CodeBlobToOopClosure* code_root_cl,
+ int worker_i) {
#if CARD_REPEAT_HISTO
ct_freq_update_histo_and_reset();
#endif
@@ -328,7 +359,7 @@
_g1p->phase_times()->record_update_rs_time(worker_i, 0.0);
}
if (G1UseParallelRSetScanning || (worker_i == 0)) {
- scanRS(oc, worker_i);
+ scanRS(oc, code_root_cl, worker_i);
} else {
_g1p->phase_times()->record_scan_rs_time(worker_i, 0.0);
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -81,14 +81,23 @@
G1RemSet(G1CollectedHeap* g1, CardTableModRefBS* ct_bs);
~G1RemSet();
- // Invoke "blk->do_oop" on all pointers into the CS in objects in regions
- // outside the CS (having invoked "blk->set_region" to set the "from"
- // region correctly beforehand.) The "worker_i" param is for the
- // parallel case where the number of the worker thread calling this
- // function can be helpful in partitioning the work to be done. It
- // should be the same as the "i" passed to the calling thread's
- // work(i) function. In the sequential case this param will be ingored.
- void oops_into_collection_set_do(OopsInHeapRegionClosure* blk, int worker_i);
+ // Invoke "blk->do_oop" on all pointers into the collection set
+ // from objects in regions outside the collection set (having
+ // invoked "blk->set_region" to set the "from" region correctly
+ // beforehand.)
+ //
+ // Invoke code_root_cl->do_code_blob on the unmarked nmethods
+ // on the strong code roots list for each region in the
+ // collection set.
+ //
+ // The "worker_i" param is for the parallel case where the id
+ // of the worker thread calling this function can be helpful in
+ // partitioning the work to be done. It should be the same as
+ // the "i" passed to the calling thread's work(i) function.
+ // In the sequential case this param will be ignored.
+ void oops_into_collection_set_do(OopsInHeapRegionClosure* blk,
+ CodeBlobToOopClosure* code_root_cl,
+ int worker_i);
// Prepare for and cleanup after an oops_into_collection_set_do
// call. Must call each of these once before and after (in sequential
@@ -98,7 +107,10 @@
void prepare_for_oops_into_collection_set_do();
void cleanup_after_oops_into_collection_set_do();
- void scanRS(OopsInHeapRegionClosure* oc, int worker_i);
+ void scanRS(OopsInHeapRegionClosure* oc,
+ CodeBlobToOopClosure* code_root_cl,
+ int worker_i);
+
void updateRS(DirtyCardQueue* into_cset_dcq, int worker_i);
CardTableModRefBS* ct_bs() { return _ct_bs; }
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -127,32 +127,55 @@
class HRRSStatsIter: public HeapRegionClosure {
size_t _occupied;
- size_t _total_mem_sz;
- size_t _max_mem_sz;
- HeapRegion* _max_mem_sz_region;
+
+ size_t _total_rs_mem_sz;
+ size_t _max_rs_mem_sz;
+ HeapRegion* _max_rs_mem_sz_region;
+
+ size_t _total_code_root_mem_sz;
+ size_t _max_code_root_mem_sz;
+ HeapRegion* _max_code_root_mem_sz_region;
public:
HRRSStatsIter() :
_occupied(0),
- _total_mem_sz(0),
- _max_mem_sz(0),
- _max_mem_sz_region(NULL)
+ _total_rs_mem_sz(0),
+ _max_rs_mem_sz(0),
+ _max_rs_mem_sz_region(NULL),
+ _total_code_root_mem_sz(0),
+ _max_code_root_mem_sz(0),
+ _max_code_root_mem_sz_region(NULL)
{}
bool doHeapRegion(HeapRegion* r) {
- size_t mem_sz = r->rem_set()->mem_size();
- if (mem_sz > _max_mem_sz) {
- _max_mem_sz = mem_sz;
- _max_mem_sz_region = r;
+ HeapRegionRemSet* hrrs = r->rem_set();
+
+ // HeapRegionRemSet::mem_size() includes the
+ // size of the strong code roots
+ size_t rs_mem_sz = hrrs->mem_size();
+ if (rs_mem_sz > _max_rs_mem_sz) {
+ _max_rs_mem_sz = rs_mem_sz;
+ _max_rs_mem_sz_region = r;
}
- _total_mem_sz += mem_sz;
- size_t occ = r->rem_set()->occupied();
+ _total_rs_mem_sz += rs_mem_sz;
+
+ size_t code_root_mem_sz = hrrs->strong_code_roots_mem_size();
+ if (code_root_mem_sz > _max_code_root_mem_sz) {
+ _max_code_root_mem_sz = code_root_mem_sz;
+ _max_code_root_mem_sz_region = r;
+ }
+ _total_code_root_mem_sz += code_root_mem_sz;
+
+ size_t occ = hrrs->occupied();
_occupied += occ;
return false;
}
- size_t total_mem_sz() { return _total_mem_sz; }
- size_t max_mem_sz() { return _max_mem_sz; }
+ size_t total_rs_mem_sz() { return _total_rs_mem_sz; }
+ size_t max_rs_mem_sz() { return _max_rs_mem_sz; }
+ HeapRegion* max_rs_mem_sz_region() { return _max_rs_mem_sz_region; }
+ size_t total_code_root_mem_sz() { return _total_code_root_mem_sz; }
+ size_t max_code_root_mem_sz() { return _max_code_root_mem_sz; }
+ HeapRegion* max_code_root_mem_sz_region() { return _max_code_root_mem_sz_region; }
size_t occupied() { return _occupied; }
- HeapRegion* max_mem_sz_region() { return _max_mem_sz_region; }
};
double calc_percentage(size_t numerator, size_t denominator) {
@@ -184,22 +207,33 @@
HRRSStatsIter blk;
G1CollectedHeap::heap()->heap_region_iterate(&blk);
+ // RemSet stats
out->print_cr(" Total heap region rem set sizes = "SIZE_FORMAT"K."
" Max = "SIZE_FORMAT"K.",
- blk.total_mem_sz()/K, blk.max_mem_sz()/K);
+ blk.total_rs_mem_sz()/K, blk.max_rs_mem_sz()/K);
out->print_cr(" Static structures = "SIZE_FORMAT"K,"
" free_lists = "SIZE_FORMAT"K.",
HeapRegionRemSet::static_mem_size() / K,
HeapRegionRemSet::fl_mem_size() / K);
out->print_cr(" "SIZE_FORMAT" occupied cards represented.",
blk.occupied());
- HeapRegion* max_mem_sz_region = blk.max_mem_sz_region();
- HeapRegionRemSet* rem_set = max_mem_sz_region->rem_set();
+ HeapRegion* max_rs_mem_sz_region = blk.max_rs_mem_sz_region();
+ HeapRegionRemSet* max_rs_rem_set = max_rs_mem_sz_region->rem_set();
out->print_cr(" Max size region = "HR_FORMAT", "
"size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
- HR_FORMAT_PARAMS(max_mem_sz_region),
- (rem_set->mem_size() + K - 1)/K,
- (rem_set->occupied() + K - 1)/K);
-
+ HR_FORMAT_PARAMS(max_rs_mem_sz_region),
+ (max_rs_rem_set->mem_size() + K - 1)/K,
+ (max_rs_rem_set->occupied() + K - 1)/K);
out->print_cr(" Did %d coarsenings.", num_coarsenings());
+ // Strong code root stats
+ out->print_cr(" Total heap region code-root set sizes = "SIZE_FORMAT"K."
+ " Max = "SIZE_FORMAT"K.",
+ blk.total_code_root_mem_sz()/K, blk.max_code_root_mem_sz()/K);
+ HeapRegion* max_code_root_mem_sz_region = blk.max_code_root_mem_sz_region();
+ HeapRegionRemSet* max_code_root_rem_set = max_code_root_mem_sz_region->rem_set();
+ out->print_cr(" Max size region = "HR_FORMAT", "
+ "size = "SIZE_FORMAT "K, num_elems = "SIZE_FORMAT".",
+ HR_FORMAT_PARAMS(max_code_root_mem_sz_region),
+ (max_code_root_rem_set->strong_code_roots_mem_size() + K - 1)/K,
+ (max_code_root_rem_set->strong_code_roots_list_length()));
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -319,7 +319,10 @@
\
diagnostic(bool, G1VerifyRSetsDuringFullGC, false, \
"If true, perform verification of each heap region's " \
- "remembered set when verifying the heap during a full GC.")
+ "remembered set when verifying the heap during a full GC.") \
+ \
+ diagnostic(bool, G1VerifyHeapRegionCodeRoots, false, \
+ "Verify the code root lists attached to each heap region.")
G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "code/nmethod.hpp"
#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
@@ -50,144 +51,6 @@
OopClosure* oc) :
_r_bottom(r->bottom()), _r_end(r->end()), _oc(oc) { }
-class VerifyLiveClosure: public OopClosure {
-private:
- G1CollectedHeap* _g1h;
- CardTableModRefBS* _bs;
- oop _containing_obj;
- bool _failures;
- int _n_failures;
- VerifyOption _vo;
-public:
- // _vo == UsePrevMarking -> use "prev" marking information,
- // _vo == UseNextMarking -> use "next" marking information,
- // _vo == UseMarkWord -> use mark word from object header.
- VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) :
- _g1h(g1h), _bs(NULL), _containing_obj(NULL),
- _failures(false), _n_failures(0), _vo(vo)
- {
- BarrierSet* bs = _g1h->barrier_set();
- if (bs->is_a(BarrierSet::CardTableModRef))
- _bs = (CardTableModRefBS*)bs;
- }
-
- void set_containing_obj(oop obj) {
- _containing_obj = obj;
- }
-
- bool failures() { return _failures; }
- int n_failures() { return _n_failures; }
-
- virtual void do_oop(narrowOop* p) { do_oop_work(p); }
- virtual void do_oop( oop* p) { do_oop_work(p); }
-
- void print_object(outputStream* out, oop obj) {
-#ifdef PRODUCT
- Klass* k = obj->klass();
- const char* class_name = InstanceKlass::cast(k)->external_name();
- out->print_cr("class name %s", class_name);
-#else // PRODUCT
- obj->print_on(out);
-#endif // PRODUCT
- }
-
- template <class T>
- void do_oop_work(T* p) {
- assert(_containing_obj != NULL, "Precondition");
- assert(!_g1h->is_obj_dead_cond(_containing_obj, _vo),
- "Precondition");
- T heap_oop = oopDesc::load_heap_oop(p);
- if (!oopDesc::is_null(heap_oop)) {
- oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
- bool failed = false;
- if (!_g1h->is_in_closed_subset(obj) || _g1h->is_obj_dead_cond(obj, _vo)) {
- MutexLockerEx x(ParGCRareEvent_lock,
- Mutex::_no_safepoint_check_flag);
-
- if (!_failures) {
- gclog_or_tty->print_cr("");
- gclog_or_tty->print_cr("----------");
- }
- if (!_g1h->is_in_closed_subset(obj)) {
- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
- gclog_or_tty->print_cr("Field "PTR_FORMAT
- " of live obj "PTR_FORMAT" in region "
- "["PTR_FORMAT", "PTR_FORMAT")",
- p, (void*) _containing_obj,
- from->bottom(), from->end());
- print_object(gclog_or_tty, _containing_obj);
- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
- (void*) obj);
- } else {
- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
- HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
- gclog_or_tty->print_cr("Field "PTR_FORMAT
- " of live obj "PTR_FORMAT" in region "
- "["PTR_FORMAT", "PTR_FORMAT")",
- p, (void*) _containing_obj,
- from->bottom(), from->end());
- print_object(gclog_or_tty, _containing_obj);
- gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
- "["PTR_FORMAT", "PTR_FORMAT")",
- (void*) obj, to->bottom(), to->end());
- print_object(gclog_or_tty, obj);
- }
- gclog_or_tty->print_cr("----------");
- gclog_or_tty->flush();
- _failures = true;
- failed = true;
- _n_failures++;
- }
-
- if (!_g1h->full_collection() || G1VerifyRSetsDuringFullGC) {
- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
- HeapRegion* to = _g1h->heap_region_containing(obj);
- if (from != NULL && to != NULL &&
- from != to &&
- !to->isHumongous()) {
- jbyte cv_obj = *_bs->byte_for_const(_containing_obj);
- jbyte cv_field = *_bs->byte_for_const(p);
- const jbyte dirty = CardTableModRefBS::dirty_card_val();
-
- bool is_bad = !(from->is_young()
- || to->rem_set()->contains_reference(p)
- || !G1HRRSFlushLogBuffersOnVerify && // buffers were not flushed
- (_containing_obj->is_objArray() ?
- cv_field == dirty
- : cv_obj == dirty || cv_field == dirty));
- if (is_bad) {
- MutexLockerEx x(ParGCRareEvent_lock,
- Mutex::_no_safepoint_check_flag);
-
- if (!_failures) {
- gclog_or_tty->print_cr("");
- gclog_or_tty->print_cr("----------");
- }
- gclog_or_tty->print_cr("Missing rem set entry:");
- gclog_or_tty->print_cr("Field "PTR_FORMAT" "
- "of obj "PTR_FORMAT", "
- "in region "HR_FORMAT,
- p, (void*) _containing_obj,
- HR_FORMAT_PARAMS(from));
- _containing_obj->print_on(gclog_or_tty);
- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
- "in region "HR_FORMAT,
- (void*) obj,
- HR_FORMAT_PARAMS(to));
- obj->print_on(gclog_or_tty);
- gclog_or_tty->print_cr("Obj head CTE = %d, field CTE = %d.",
- cv_obj, cv_field);
- gclog_or_tty->print_cr("----------");
- gclog_or_tty->flush();
- _failures = true;
- if (!failed) _n_failures++;
- }
- }
- }
- }
- }
-};
-
template<class ClosureType>
HeapWord* walk_mem_region_loop(ClosureType* cl, G1CollectedHeap* g1h,
HeapRegion* hr,
@@ -368,7 +231,7 @@
if (!par) {
// If this is parallel, this will be done later.
HeapRegionRemSet* hrrs = rem_set();
- if (hrrs != NULL) hrrs->clear();
+ hrrs->clear();
_claimed = InitialClaimValue;
}
zero_marked_bytes();
@@ -505,6 +368,7 @@
_rem_set(NULL), _recorded_rs_length(0), _predicted_elapsed_time_ms(0),
_predicted_bytes_to_copy(0)
{
+ _rem_set = new HeapRegionRemSet(sharedOffsetArray, this);
_orig_end = mr.end();
// Note that initialize() will set the start of the unmarked area of the
// region.
@@ -512,8 +376,6 @@
set_top(bottom());
set_saved_mark();
- _rem_set = new HeapRegionRemSet(sharedOffsetArray, this);
-
assert(HeapRegionRemSet::num_par_rem_sets() > 0, "Invariant.");
}
@@ -733,6 +595,160 @@
return NULL;
}
+// Code roots support
+
+void HeapRegion::add_strong_code_root(nmethod* nm) {
+ HeapRegionRemSet* hrrs = rem_set();
+ hrrs->add_strong_code_root(nm);
+}
+
+void HeapRegion::remove_strong_code_root(nmethod* nm) {
+ HeapRegionRemSet* hrrs = rem_set();
+ hrrs->remove_strong_code_root(nm);
+}
+
+void HeapRegion::migrate_strong_code_roots() {
+ assert(in_collection_set(), "only collection set regions");
+ assert(!isHumongous(), "not humongous regions");
+
+ HeapRegionRemSet* hrrs = rem_set();
+ hrrs->migrate_strong_code_roots();
+}
+
+void HeapRegion::strong_code_roots_do(CodeBlobClosure* blk) const {
+ HeapRegionRemSet* hrrs = rem_set();
+ hrrs->strong_code_roots_do(blk);
+}
+
+class VerifyStrongCodeRootOopClosure: public OopClosure {
+ const HeapRegion* _hr;
+ nmethod* _nm;
+ bool _failures;
+ bool _has_oops_in_region;
+
+ template <class T> void do_oop_work(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+
+ // Note: not all the oops embedded in the nmethod are in the
+ // current region. We only look at those which are.
+ if (_hr->is_in(obj)) {
+ // Object is in the region. Check that its less than top
+ if (_hr->top() <= (HeapWord*)obj) {
+ // Object is above top
+ gclog_or_tty->print_cr("Object "PTR_FORMAT" in region "
+ "["PTR_FORMAT", "PTR_FORMAT") is above "
+ "top "PTR_FORMAT,
+ obj, _hr->bottom(), _hr->end(), _hr->top());
+ _failures = true;
+ return;
+ }
+ // Nmethod has at least one oop in the current region
+ _has_oops_in_region = true;
+ }
+ }
+ }
+
+public:
+ VerifyStrongCodeRootOopClosure(const HeapRegion* hr, nmethod* nm):
+ _hr(hr), _failures(false), _has_oops_in_region(false) {}
+
+ void do_oop(narrowOop* p) { do_oop_work(p); }
+ void do_oop(oop* p) { do_oop_work(p); }
+
+ bool failures() { return _failures; }
+ bool has_oops_in_region() { return _has_oops_in_region; }
+};
+
+class VerifyStrongCodeRootCodeBlobClosure: public CodeBlobClosure {
+ const HeapRegion* _hr;
+ bool _failures;
+public:
+ VerifyStrongCodeRootCodeBlobClosure(const HeapRegion* hr) :
+ _hr(hr), _failures(false) {}
+
+ void do_code_blob(CodeBlob* cb) {
+ nmethod* nm = (cb == NULL) ? NULL : cb->as_nmethod_or_null();
+ if (nm != NULL) {
+ // Verify that the nemthod is live
+ if (!nm->is_alive()) {
+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod "
+ PTR_FORMAT" in its strong code roots",
+ _hr->bottom(), _hr->end(), nm);
+ _failures = true;
+ } else {
+ VerifyStrongCodeRootOopClosure oop_cl(_hr, nm);
+ nm->oops_do(&oop_cl);
+ if (!oop_cl.has_oops_in_region()) {
+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod "
+ PTR_FORMAT" in its strong code roots "
+ "with no pointers into region",
+ _hr->bottom(), _hr->end(), nm);
+ _failures = true;
+ } else if (oop_cl.failures()) {
+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other "
+ "failures for nmethod "PTR_FORMAT,
+ _hr->bottom(), _hr->end(), nm);
+ _failures = true;
+ }
+ }
+ }
+ }
+
+ bool failures() { return _failures; }
+};
+
+void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const {
+ if (!G1VerifyHeapRegionCodeRoots) {
+ // We're not verifying code roots.
+ return;
+ }
+ if (vo == VerifyOption_G1UseMarkWord) {
+ // Marking verification during a full GC is performed after class
+ // unloading, code cache unloading, etc so the strong code roots
+ // attached to each heap region are in an inconsistent state. They won't
+ // be consistent until the strong code roots are rebuilt after the
+ // actual GC. Skip verifying the strong code roots in this particular
+ // time.
+ assert(VerifyDuringGC, "only way to get here");
+ return;
+ }
+
+ HeapRegionRemSet* hrrs = rem_set();
+ int strong_code_roots_length = hrrs->strong_code_roots_list_length();
+
+ // if this region is empty then there should be no entries
+ // on its strong code root list
+ if (is_empty()) {
+ if (strong_code_roots_length > 0) {
+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty "
+ "but has "INT32_FORMAT" code root entries",
+ bottom(), end(), strong_code_roots_length);
+ *failures = true;
+ }
+ return;
+ }
+
+ // An H-region should have an empty strong code root list
+ if (isHumongous()) {
+ if (strong_code_roots_length > 0) {
+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous "
+ "but has "INT32_FORMAT" code root entries",
+ bottom(), end(), strong_code_roots_length);
+ *failures = true;
+ }
+ return;
+ }
+
+ VerifyStrongCodeRootCodeBlobClosure cb_cl(this);
+ strong_code_roots_do(&cb_cl);
+
+ if (cb_cl.failures()) {
+ *failures = true;
+ }
+}
+
void HeapRegion::print() const { print_on(gclog_or_tty); }
void HeapRegion::print_on(outputStream* st) const {
if (isHumongous()) {
@@ -761,10 +777,143 @@
G1OffsetTableContigSpace::print_on(st);
}
-void HeapRegion::verify() const {
- bool dummy = false;
- verify(VerifyOption_G1UsePrevMarking, /* failures */ &dummy);
-}
+class VerifyLiveClosure: public OopClosure {
+private:
+ G1CollectedHeap* _g1h;
+ CardTableModRefBS* _bs;
+ oop _containing_obj;
+ bool _failures;
+ int _n_failures;
+ VerifyOption _vo;
+public:
+ // _vo == UsePrevMarking -> use "prev" marking information,
+ // _vo == UseNextMarking -> use "next" marking information,
+ // _vo == UseMarkWord -> use mark word from object header.
+ VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) :
+ _g1h(g1h), _bs(NULL), _containing_obj(NULL),
+ _failures(false), _n_failures(0), _vo(vo)
+ {
+ BarrierSet* bs = _g1h->barrier_set();
+ if (bs->is_a(BarrierSet::CardTableModRef))
+ _bs = (CardTableModRefBS*)bs;
+ }
+
+ void set_containing_obj(oop obj) {
+ _containing_obj = obj;
+ }
+
+ bool failures() { return _failures; }
+ int n_failures() { return _n_failures; }
+
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+
+ void print_object(outputStream* out, oop obj) {
+#ifdef PRODUCT
+ Klass* k = obj->klass();
+ const char* class_name = InstanceKlass::cast(k)->external_name();
+ out->print_cr("class name %s", class_name);
+#else // PRODUCT
+ obj->print_on(out);
+#endif // PRODUCT
+ }
+
+ template <class T>
+ void do_oop_work(T* p) {
+ assert(_containing_obj != NULL, "Precondition");
+ assert(!_g1h->is_obj_dead_cond(_containing_obj, _vo),
+ "Precondition");
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ bool failed = false;
+ if (!_g1h->is_in_closed_subset(obj) || _g1h->is_obj_dead_cond(obj, _vo)) {
+ MutexLockerEx x(ParGCRareEvent_lock,
+ Mutex::_no_safepoint_check_flag);
+
+ if (!_failures) {
+ gclog_or_tty->print_cr("");
+ gclog_or_tty->print_cr("----------");
+ }
+ if (!_g1h->is_in_closed_subset(obj)) {
+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+ gclog_or_tty->print_cr("Field "PTR_FORMAT
+ " of live obj "PTR_FORMAT" in region "
+ "["PTR_FORMAT", "PTR_FORMAT")",
+ p, (void*) _containing_obj,
+ from->bottom(), from->end());
+ print_object(gclog_or_tty, _containing_obj);
+ gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
+ (void*) obj);
+ } else {
+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+ HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
+ gclog_or_tty->print_cr("Field "PTR_FORMAT
+ " of live obj "PTR_FORMAT" in region "
+ "["PTR_FORMAT", "PTR_FORMAT")",
+ p, (void*) _containing_obj,
+ from->bottom(), from->end());
+ print_object(gclog_or_tty, _containing_obj);
+ gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
+ "["PTR_FORMAT", "PTR_FORMAT")",
+ (void*) obj, to->bottom(), to->end());
+ print_object(gclog_or_tty, obj);
+ }
+ gclog_or_tty->print_cr("----------");
+ gclog_or_tty->flush();
+ _failures = true;
+ failed = true;
+ _n_failures++;
+ }
+
+ if (!_g1h->full_collection() || G1VerifyRSetsDuringFullGC) {
+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+ HeapRegion* to = _g1h->heap_region_containing(obj);
+ if (from != NULL && to != NULL &&
+ from != to &&
+ !to->isHumongous()) {
+ jbyte cv_obj = *_bs->byte_for_const(_containing_obj);
+ jbyte cv_field = *_bs->byte_for_const(p);
+ const jbyte dirty = CardTableModRefBS::dirty_card_val();
+
+ bool is_bad = !(from->is_young()
+ || to->rem_set()->contains_reference(p)
+ || !G1HRRSFlushLogBuffersOnVerify && // buffers were not flushed
+ (_containing_obj->is_objArray() ?
+ cv_field == dirty
+ : cv_obj == dirty || cv_field == dirty));
+ if (is_bad) {
+ MutexLockerEx x(ParGCRareEvent_lock,
+ Mutex::_no_safepoint_check_flag);
+
+ if (!_failures) {
+ gclog_or_tty->print_cr("");
+ gclog_or_tty->print_cr("----------");
+ }
+ gclog_or_tty->print_cr("Missing rem set entry:");
+ gclog_or_tty->print_cr("Field "PTR_FORMAT" "
+ "of obj "PTR_FORMAT", "
+ "in region "HR_FORMAT,
+ p, (void*) _containing_obj,
+ HR_FORMAT_PARAMS(from));
+ _containing_obj->print_on(gclog_or_tty);
+ gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
+ "in region "HR_FORMAT,
+ (void*) obj,
+ HR_FORMAT_PARAMS(to));
+ obj->print_on(gclog_or_tty);
+ gclog_or_tty->print_cr("Obj head CTE = %d, field CTE = %d.",
+ cv_obj, cv_field);
+ gclog_or_tty->print_cr("----------");
+ gclog_or_tty->flush();
+ _failures = true;
+ if (!failed) _n_failures++;
+ }
+ }
+ }
+ }
+ }
+};
// This really ought to be commoned up into OffsetTableContigSpace somehow.
// We would need a mechanism to make that code skip dead objects.
@@ -904,6 +1053,13 @@
*failures = true;
return;
}
+
+ verify_strong_code_roots(vo, failures);
+}
+
+void HeapRegion::verify() const {
+ bool dummy = false;
+ verify(VerifyOption_G1UsePrevMarking, /* failures */ &dummy);
}
// G1OffsetTableContigSpace code; copied from space.cpp. Hope this can go
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -52,6 +52,7 @@
class HeapRegionRemSetIterator;
class HeapRegion;
class HeapRegionSetBase;
+class nmethod;
#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
#define HR_FORMAT_PARAMS(_hr_) \
@@ -371,7 +372,8 @@
RebuildRSClaimValue = 5,
ParEvacFailureClaimValue = 6,
AggregateCountClaimValue = 7,
- VerifyCountClaimValue = 8
+ VerifyCountClaimValue = 8,
+ ParMarkRootClaimValue = 9
};
inline HeapWord* par_allocate_no_bot_updates(size_t word_size) {
@@ -796,6 +798,25 @@
virtual void reset_after_compaction();
+ // Routines for managing a list of code roots (attached to the
+ // this region's RSet) that point into this heap region.
+ void add_strong_code_root(nmethod* nm);
+ void remove_strong_code_root(nmethod* nm);
+
+ // During a collection, migrate the successfully evacuated
+ // strong code roots that referenced into this region to the
+ // new regions that they now point into. Unsuccessfully
+ // evacuated code roots are not migrated.
+ void migrate_strong_code_roots();
+
+ // Applies blk->do_code_blob() to each of the entries in
+ // the strong code roots list for this region
+ void strong_code_roots_do(CodeBlobClosure* blk) const;
+
+ // Verify that the entries on the strong code root list for this
+ // region are live and include at least one pointer into this region.
+ void verify_strong_code_roots(VerifyOption vo, bool* failures) const;
+
void print() const;
void print_on(outputStream* st) const;
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -33,6 +33,7 @@
#include "oops/oop.inline.hpp"
#include "utilities/bitMap.inline.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/growableArray.hpp"
class PerRegionTable: public CHeapObj<mtGC> {
friend class OtherRegionsTable;
@@ -849,7 +850,7 @@
HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
HeapRegion* hr)
- : _bosa(bosa), _other_regions(hr) {
+ : _bosa(bosa), _strong_code_roots_list(NULL), _other_regions(hr) {
reset_for_par_iteration();
}
@@ -908,6 +909,12 @@
}
void HeapRegionRemSet::clear() {
+ if (_strong_code_roots_list != NULL) {
+ delete _strong_code_roots_list;
+ }
+ _strong_code_roots_list = new (ResourceObj::C_HEAP, mtGC)
+ GrowableArray<nmethod*>(10, 0, NULL, true);
+
_other_regions.clear();
assert(occupied() == 0, "Should be clear.");
reset_for_par_iteration();
@@ -925,6 +932,121 @@
_other_regions.scrub(ctbs, region_bm, card_bm);
}
+
+// Code roots support
+
+void HeapRegionRemSet::add_strong_code_root(nmethod* nm) {
+ assert(nm != NULL, "sanity");
+ // Search for the code blob from the RHS to avoid
+ // duplicate entries as much as possible
+ if (_strong_code_roots_list->find_from_end(nm) < 0) {
+ // Code blob isn't already in the list
+ _strong_code_roots_list->push(nm);
+ }
+}
+
+void HeapRegionRemSet::remove_strong_code_root(nmethod* nm) {
+ assert(nm != NULL, "sanity");
+ int idx = _strong_code_roots_list->find(nm);
+ if (idx >= 0) {
+ _strong_code_roots_list->remove_at(idx);
+ }
+ // Check that there were no duplicates
+ guarantee(_strong_code_roots_list->find(nm) < 0, "duplicate entry found");
+}
+
+class NMethodMigrationOopClosure : public OopClosure {
+ G1CollectedHeap* _g1h;
+ HeapRegion* _from;
+ nmethod* _nm;
+
+ uint _num_self_forwarded;
+
+ template <class T> void do_oop_work(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ if (_from->is_in(obj)) {
+ // Reference still points into the source region.
+ // Since roots are immediately evacuated this means that
+ // we must have self forwarded the object
+ assert(obj->is_forwarded(),
+ err_msg("code roots should be immediately evacuated. "
+ "Ref: "PTR_FORMAT", "
+ "Obj: "PTR_FORMAT", "
+ "Region: "HR_FORMAT,
+ p, (void*) obj, HR_FORMAT_PARAMS(_from)));
+ assert(obj->forwardee() == obj,
+ err_msg("not self forwarded? obj = "PTR_FORMAT, (void*)obj));
+
+ // The object has been self forwarded.
+ // Note, if we're during an initial mark pause, there is
+ // no need to explicitly mark object. It will be marked
+ // during the regular evacuation failure handling code.
+ _num_self_forwarded++;
+ } else {
+ // The reference points into a promotion or to-space region
+ HeapRegion* to = _g1h->heap_region_containing(obj);
+ to->rem_set()->add_strong_code_root(_nm);
+ }
+ }
+ }
+
+public:
+ NMethodMigrationOopClosure(G1CollectedHeap* g1h, HeapRegion* from, nmethod* nm):
+ _g1h(g1h), _from(from), _nm(nm), _num_self_forwarded(0) {}
+
+ void do_oop(narrowOop* p) { do_oop_work(p); }
+ void do_oop(oop* p) { do_oop_work(p); }
+
+ uint retain() { return _num_self_forwarded > 0; }
+};
+
+void HeapRegionRemSet::migrate_strong_code_roots() {
+ assert(hr()->in_collection_set(), "only collection set regions");
+ assert(!hr()->isHumongous(), "not humongous regions");
+
+ ResourceMark rm;
+
+ // List of code blobs to retain for this region
+ GrowableArray<nmethod*> to_be_retained(10);
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+
+ while (_strong_code_roots_list->is_nonempty()) {
+ nmethod *nm = _strong_code_roots_list->pop();
+ if (nm != NULL) {
+ NMethodMigrationOopClosure oop_cl(g1h, hr(), nm);
+ nm->oops_do(&oop_cl);
+ if (oop_cl.retain()) {
+ to_be_retained.push(nm);
+ }
+ }
+ }
+
+ // Now push any code roots we need to retain
+ assert(to_be_retained.is_empty() || hr()->evacuation_failed(),
+ "Retained nmethod list must be empty or "
+ "evacuation of this region failed");
+
+ while (to_be_retained.is_nonempty()) {
+ nmethod* nm = to_be_retained.pop();
+ assert(nm != NULL, "sanity");
+ add_strong_code_root(nm);
+ }
+}
+
+void HeapRegionRemSet::strong_code_roots_do(CodeBlobClosure* blk) const {
+ for (int i = 0; i < _strong_code_roots_list->length(); i += 1) {
+ nmethod* nm = _strong_code_roots_list->at(i);
+ blk->do_code_blob(nm);
+ }
+}
+
+size_t HeapRegionRemSet::strong_code_roots_mem_size() {
+ return sizeof(GrowableArray<nmethod*>) +
+ _strong_code_roots_list->max_length() * sizeof(nmethod*);
+}
+
//-------------------- Iteration --------------------
HeapRegionRemSetIterator:: HeapRegionRemSetIterator(const HeapRegionRemSet* hrrs) :
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -37,6 +37,7 @@
class HeapRegionRemSetIterator;
class PerRegionTable;
class SparsePRT;
+class nmethod;
// Essentially a wrapper around SparsePRTCleanupTask. See
// sparsePRT.hpp for more details.
@@ -191,6 +192,10 @@
G1BlockOffsetSharedArray* _bosa;
G1BlockOffsetSharedArray* bosa() const { return _bosa; }
+ // A list of code blobs (nmethods) whose code contains pointers into
+ // the region that owns this RSet.
+ GrowableArray<nmethod*>* _strong_code_roots_list;
+
OtherRegionsTable _other_regions;
enum ParIterState { Unclaimed, Claimed, Complete };
@@ -282,11 +287,13 @@
}
// The actual # of bytes this hr_remset takes up.
+ // Note also includes the strong code root set.
size_t mem_size() {
return _other_regions.mem_size()
// This correction is necessary because the above includes the second
// part.
- + sizeof(this) - sizeof(OtherRegionsTable);
+ + (sizeof(this) - sizeof(OtherRegionsTable))
+ + strong_code_roots_mem_size();
}
// Returns the memory occupancy of all static data structures associated
@@ -304,6 +311,37 @@
bool contains_reference(OopOrNarrowOopStar from) const {
return _other_regions.contains_reference(from);
}
+
+ // Routines for managing the list of code roots that point into
+ // the heap region that owns this RSet.
+ void add_strong_code_root(nmethod* nm);
+ void remove_strong_code_root(nmethod* nm);
+
+ // During a collection, migrate the successfully evacuated strong
+ // code roots that referenced into the region that owns this RSet
+ // to the RSets of the new regions that they now point into.
+ // Unsuccessfully evacuated code roots are not migrated.
+ void migrate_strong_code_roots();
+
+ // Applies blk->do_code_blob() to each of the entries in
+ // the strong code roots list
+ void strong_code_roots_do(CodeBlobClosure* blk) const;
+
+ // Returns the number of elements in the strong code roots list
+ int strong_code_roots_list_length() {
+ return _strong_code_roots_list->length();
+ }
+
+ // Returns true if the strong code roots contains the given
+ // nmethod.
+ bool strong_code_roots_list_contains(nmethod* nm) {
+ return _strong_code_roots_list->contains(nm);
+ }
+
+ // Returns the amount of memory, in bytes, currently
+ // consumed by the strong code roots.
+ size_t strong_code_roots_mem_size();
+
void print() const;
// Called during a stop-world phase to perform any deferred cleanups.
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -70,9 +70,6 @@
guarantee(target_pause_time_ms > 0.0,
err_msg("target_pause_time_ms = %1.6lf should be positive",
target_pause_time_ms));
- guarantee(word_size == 0 || gc_cause == GCCause::_g1_inc_collection_pause,
- "we can only request an allocation if the GC cause is for "
- "an incremental GC pause");
_gc_cause = gc_cause;
}
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -216,6 +216,7 @@
young_gen()->update_counters();
old_gen()->update_counters();
MetaspaceCounters::update_performance_counters();
+ CompressedClassSpaceCounters::update_performance_counters();
}
size_t ParallelScavengeHeap::capacity() const {
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -118,6 +118,14 @@
}
}
+void CollectedHeap::register_nmethod(nmethod* nm) {
+ assert_locked_or_safepoint(CodeCache_lock);
+}
+
+void CollectedHeap::unregister_nmethod(nmethod* nm) {
+ assert_locked_or_safepoint(CodeCache_lock);
+}
+
void CollectedHeap::trace_heap(GCWhen::Type when, GCTracer* gc_tracer) {
const GCHeapSummary& heap_summary = create_heap_summary();
const MetaspaceSummary& metaspace_summary = create_metaspace_summary();
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -49,6 +49,7 @@
class Thread;
class ThreadClosure;
class VirtualSpaceSummary;
+class nmethod;
class GCMessage : public FormatBuffer<1024> {
public:
@@ -603,6 +604,11 @@
void print_heap_before_gc();
void print_heap_after_gc();
+ // Registering and unregistering an nmethod (compiled code) with the heap.
+ // Override with specific mechanism for each specialized heap type.
+ virtual void register_nmethod(nmethod* nm);
+ virtual void unregister_nmethod(nmethod* nm);
+
void trace_heap_before_gc(GCTracer* gc_tracer);
void trace_heap_after_gc(GCTracer* gc_tracer);
--- a/hotspot/src/share/vm/memory/allocation.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/allocation.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -666,7 +666,7 @@
NEW_RESOURCE_ARRAY_RETURN_NULL(type, 1)
#define NEW_C_HEAP_ARRAY3(type, size, memflags, pc, allocfail)\
- (type*) AllocateHeap(size * sizeof(type), memflags, pc, allocfail)
+ (type*) AllocateHeap((size) * sizeof(type), memflags, pc, allocfail)
#define NEW_C_HEAP_ARRAY2(type, size, memflags, pc)\
(type*) (AllocateHeap((size) * sizeof(type), memflags, pc))
@@ -675,16 +675,16 @@
(type*) (AllocateHeap((size) * sizeof(type), memflags))
#define NEW_C_HEAP_ARRAY2_RETURN_NULL(type, size, memflags, pc)\
- NEW_C_HEAP_ARRAY3(type, size, memflags, pc, AllocFailStrategy::RETURN_NULL)
+ NEW_C_HEAP_ARRAY3(type, (size), memflags, pc, AllocFailStrategy::RETURN_NULL)
#define NEW_C_HEAP_ARRAY_RETURN_NULL(type, size, memflags)\
- NEW_C_HEAP_ARRAY3(type, size, memflags, (address)0, AllocFailStrategy::RETURN_NULL)
+ NEW_C_HEAP_ARRAY3(type, (size), memflags, (address)0, AllocFailStrategy::RETURN_NULL)
#define REALLOC_C_HEAP_ARRAY(type, old, size, memflags)\
- (type*) (ReallocateHeap((char*)old, (size) * sizeof(type), memflags))
+ (type*) (ReallocateHeap((char*)(old), (size) * sizeof(type), memflags))
#define REALLOC_C_HEAP_ARRAY_RETURN_NULL(type, old, size, memflags)\
- (type*) (ReallocateHeap((char*)old, (size) * sizeof(type), memflags, AllocFailStrategy::RETURN_NULL))
+ (type*) (ReallocateHeap((char*)(old), (size) * sizeof(type), memflags, AllocFailStrategy::RETURN_NULL))
#define FREE_C_HEAP_ARRAY(type, old, memflags) \
FreeHeap((char*)(old), memflags)
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -193,6 +193,8 @@
alignment = lcm(os::large_page_size(), alignment);
}
+ assert(alignment >= min_alignment(), "Must be");
+
return alignment;
}
--- a/hotspot/src/share/vm/memory/filemap.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/filemap.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -362,15 +362,12 @@
ReservedSpace FileMapInfo::reserve_shared_memory() {
struct FileMapInfo::FileMapHeader::space_info* si = &_header._space[0];
char* requested_addr = si->_base;
- size_t alignment = os::vm_allocation_granularity();
- size_t size = align_size_up(SharedReadOnlySize + SharedReadWriteSize +
- SharedMiscDataSize + SharedMiscCodeSize,
- alignment);
+ size_t size = FileMapInfo::shared_spaces_size();
// Reserve the space first, then map otherwise map will go right over some
// other reserved memory (like the code cache).
- ReservedSpace rs(size, alignment, false, requested_addr);
+ ReservedSpace rs(size, os::vm_allocation_granularity(), false, requested_addr);
if (!rs.is_reserved()) {
fail_continue(err_msg("Unable to reserve shared space at required address " INTPTR_FORMAT, requested_addr));
return rs;
@@ -559,3 +556,19 @@
si->_base, si->_base + si->_used);
}
}
+
+// Unmap mapped regions of shared space.
+void FileMapInfo::stop_sharing_and_unmap(const char* msg) {
+ FileMapInfo *map_info = FileMapInfo::current_info();
+ if (map_info) {
+ map_info->fail_continue(msg);
+ for (int i = 0; i < MetaspaceShared::n_regions; i++) {
+ if (map_info->_header._space[i]._base != NULL) {
+ map_info->unmap_region(i);
+ map_info->_header._space[i]._base = NULL;
+ }
+ }
+ } else if (DumpSharedSpaces) {
+ fail_stop(msg, NULL);
+ }
+}
--- a/hotspot/src/share/vm/memory/filemap.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/filemap.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -150,6 +150,15 @@
// Return true if given address is in the mapped shared space.
bool is_in_shared_space(const void* p) NOT_CDS_RETURN_(false);
void print_shared_spaces() NOT_CDS_RETURN;
+
+ static size_t shared_spaces_size() {
+ return align_size_up(SharedReadOnlySize + SharedReadWriteSize +
+ SharedMiscDataSize + SharedMiscCodeSize,
+ os::vm_allocation_granularity());
+ }
+
+ // Stop CDS sharing and unmap CDS regions.
+ static void stop_sharing_and_unmap(const char* msg);
};
#endif // SHARE_VM_MEMORY_FILEMAP_HPP
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -95,13 +95,13 @@
guarantee(HeapWordSize == wordSize, "HeapWordSize must equal wordSize");
// The heap must be at least as aligned as generations.
- size_t alignment = Generation::GenGrain;
+ size_t gen_alignment = Generation::GenGrain;
_gen_specs = gen_policy()->generations();
// Make sure the sizes are all aligned.
for (i = 0; i < _n_gens; i++) {
- _gen_specs[i]->align(alignment);
+ _gen_specs[i]->align(gen_alignment);
}
// Allocate space for the heap.
@@ -109,9 +109,11 @@
char* heap_address;
size_t total_reserved = 0;
int n_covered_regions = 0;
- ReservedSpace heap_rs(0);
+ ReservedSpace heap_rs;
- heap_address = allocate(alignment, &total_reserved,
+ size_t heap_alignment = collector_policy()->max_alignment();
+
+ heap_address = allocate(heap_alignment, &total_reserved,
&n_covered_regions, &heap_rs);
if (!heap_rs.is_reserved()) {
@@ -168,6 +170,8 @@
const size_t pageSize = UseLargePages ?
os::large_page_size() : os::vm_page_size();
+ assert(alignment % pageSize == 0, "Must be");
+
for (int i = 0; i < _n_gens; i++) {
total_reserved += _gen_specs[i]->max_size();
if (total_reserved < _gen_specs[i]->max_size()) {
@@ -175,24 +179,17 @@
}
n_covered_regions += _gen_specs[i]->n_covered_regions();
}
- assert(total_reserved % pageSize == 0,
- err_msg("Gen size; total_reserved=" SIZE_FORMAT ", pageSize="
- SIZE_FORMAT, total_reserved, pageSize));
+ assert(total_reserved % alignment == 0,
+ err_msg("Gen size; total_reserved=" SIZE_FORMAT ", alignment="
+ SIZE_FORMAT, total_reserved, alignment));
// Needed until the cardtable is fixed to have the right number
// of covered regions.
n_covered_regions += 2;
- if (UseLargePages) {
- assert(total_reserved != 0, "total_reserved cannot be 0");
- total_reserved = round_to(total_reserved, os::large_page_size());
- if (total_reserved < os::large_page_size()) {
- vm_exit_during_initialization(overflow_msg);
- }
- }
+ *_total_reserved = total_reserved;
+ *_n_covered_regions = n_covered_regions;
- *_total_reserved = total_reserved;
- *_n_covered_regions = n_covered_regions;
*heap_rs = Universe::reserve_heap(total_reserved, alignment);
return heap_rs->base();
}
@@ -1211,6 +1208,7 @@
}
MetaspaceCounters::update_performance_counters();
+ CompressedClassSpaceCounters::update_performance_counters();
always_do_update_barrier = UseConcMarkSweepGC;
};
--- a/hotspot/src/share/vm/memory/heap.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/heap.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -118,9 +118,12 @@
_number_of_committed_segments = size_to_segments(_memory.committed_size());
_number_of_reserved_segments = size_to_segments(_memory.reserved_size());
assert(_number_of_reserved_segments >= _number_of_committed_segments, "just checking");
+ const size_t reserved_segments_alignment = MAX2((size_t)os::vm_page_size(), granularity);
+ const size_t reserved_segments_size = align_size_up(_number_of_reserved_segments, reserved_segments_alignment);
+ const size_t committed_segments_size = align_to_page_size(_number_of_committed_segments);
// reserve space for _segmap
- if (!_segmap.initialize(align_to_page_size(_number_of_reserved_segments), align_to_page_size(_number_of_committed_segments))) {
+ if (!_segmap.initialize(reserved_segments_size, committed_segments_size)) {
return false;
}
--- a/hotspot/src/share/vm/memory/iterator.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/iterator.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -64,7 +64,7 @@
}
void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) {
- nm->oops_do(_cl, /*do_strong_roots_only=*/ true);
+ nm->oops_do(_cl, /*allow_zombie=*/ false);
}
void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) {
--- a/hotspot/src/share/vm/memory/metaspace.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/metaspace.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -35,6 +35,7 @@
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "runtime/globals.hpp"
+#include "runtime/java.hpp"
#include "runtime/mutex.hpp"
#include "runtime/orderAccess.hpp"
#include "services/memTracker.hpp"
@@ -54,6 +55,8 @@
MetaWord* last_allocated = 0;
+size_t Metaspace::_class_metaspace_size;
+
// Used in declarations in SpaceManager and ChunkManager
enum ChunkIndex {
ZeroIndex = 0,
@@ -261,10 +264,6 @@
// count of chunks contained in this VirtualSpace
uintx _container_count;
- // Convenience functions for logical bottom and end
- MetaWord* bottom() const { return (MetaWord*) _virtual_space.low(); }
- MetaWord* end() const { return (MetaWord*) _virtual_space.high(); }
-
// Convenience functions to access the _virtual_space
char* low() const { return virtual_space()->low(); }
char* high() const { return virtual_space()->high(); }
@@ -284,6 +283,10 @@
VirtualSpaceNode(ReservedSpace rs) : _top(NULL), _next(NULL), _rs(rs), _container_count(0) {}
~VirtualSpaceNode();
+ // Convenience functions for logical bottom and end
+ MetaWord* bottom() const { return (MetaWord*) _virtual_space.low(); }
+ MetaWord* end() const { return (MetaWord*) _virtual_space.high(); }
+
// address of next available space in _virtual_space;
// Accessors
VirtualSpaceNode* next() { return _next; }
@@ -342,7 +345,7 @@
};
// byte_size is the size of the associated virtualspace.
-VirtualSpaceNode::VirtualSpaceNode(size_t byte_size) : _top(NULL), _next(NULL), _rs(0), _container_count(0) {
+VirtualSpaceNode::VirtualSpaceNode(size_t byte_size) : _top(NULL), _next(NULL), _rs(), _container_count(0) {
// align up to vm allocation granularity
byte_size = align_size_up(byte_size, os::vm_allocation_granularity());
@@ -1313,7 +1316,8 @@
// Class virtual space should always be expanded. Call GC for the other
// metadata virtual space.
- if (vsl == Metaspace::class_space_list()) return true;
+ if (Metaspace::using_class_space() &&
+ (vsl == Metaspace::class_space_list())) return true;
// If this is part of an allocation after a GC, expand
// unconditionally.
@@ -2257,7 +2261,7 @@
size_t raw_word_size = get_raw_word_size(word_size);
size_t min_size = TreeChunk<Metablock, FreeList>::min_size();
assert(raw_word_size >= min_size,
- err_msg("Should not deallocate dark matter " SIZE_FORMAT, word_size));
+ err_msg("Should not deallocate dark matter " SIZE_FORMAT "<" SIZE_FORMAT, word_size, min_size));
block_freelists()->return_block(p, raw_word_size);
}
@@ -2374,7 +2378,7 @@
if (result == NULL) {
result = grow_and_allocate(word_size);
}
- if (result > 0) {
+ if (result != 0) {
inc_used_metrics(word_size);
assert(result != (MetaWord*) chunks_in_use(MediumIndex),
"Head of the list is being allocated");
@@ -2476,15 +2480,13 @@
size_t MetaspaceAux::_allocated_capacity_words[] = {0, 0};
size_t MetaspaceAux::_allocated_used_words[] = {0, 0};
+size_t MetaspaceAux::free_bytes(Metaspace::MetadataType mdtype) {
+ VirtualSpaceList* list = Metaspace::get_space_list(mdtype);
+ return list == NULL ? 0 : list->free_bytes();
+}
+
size_t MetaspaceAux::free_bytes() {
- size_t result = 0;
- if (Metaspace::class_space_list() != NULL) {
- result = result + Metaspace::class_space_list()->free_bytes();
- }
- if (Metaspace::space_list() != NULL) {
- result = result + Metaspace::space_list()->free_bytes();
- }
- return result;
+ return free_bytes(Metaspace::ClassType) + free_bytes(Metaspace::NonClassType);
}
void MetaspaceAux::dec_capacity(Metaspace::MetadataType mdtype, size_t words) {
@@ -2549,6 +2551,9 @@
}
size_t MetaspaceAux::capacity_bytes_slow(Metaspace::MetadataType mdtype) {
+ if ((mdtype == Metaspace::ClassType) && !Metaspace::using_class_space()) {
+ return 0;
+ }
// Don't count the space in the freelists. That space will be
// added to the capacity calculation as needed.
size_t capacity = 0;
@@ -2563,18 +2568,18 @@
}
size_t MetaspaceAux::reserved_in_bytes(Metaspace::MetadataType mdtype) {
- size_t reserved = (mdtype == Metaspace::ClassType) ?
- Metaspace::class_space_list()->virtual_space_total() :
- Metaspace::space_list()->virtual_space_total();
- return reserved * BytesPerWord;
+ VirtualSpaceList* list = Metaspace::get_space_list(mdtype);
+ return list == NULL ? 0 : list->virtual_space_total();
}
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) ?
- Metaspace::class_space_list()->chunk_manager() :
- Metaspace::space_list()->chunk_manager();
+ VirtualSpaceList* list = Metaspace::get_space_list(mdtype);
+ if (list == NULL) {
+ return 0;
+ }
+ ChunkManager* chunk = list->chunk_manager();
chunk->slow_verify();
return chunk->free_chunks_total();
}
@@ -2615,7 +2620,6 @@
// This is printed when PrintGCDetails
void MetaspaceAux::print_on(outputStream* out) {
- Metaspace::MetadataType ct = Metaspace::ClassType;
Metaspace::MetadataType nct = Metaspace::NonClassType;
out->print_cr(" Metaspace total "
@@ -2629,12 +2633,15 @@
allocated_capacity_bytes(nct)/K,
allocated_used_bytes(nct)/K,
reserved_in_bytes(nct)/K);
- out->print_cr(" class space "
- SIZE_FORMAT "K, used " SIZE_FORMAT "K,"
- " reserved " SIZE_FORMAT "K",
- allocated_capacity_bytes(ct)/K,
- allocated_used_bytes(ct)/K,
- reserved_in_bytes(ct)/K);
+ if (Metaspace::using_class_space()) {
+ Metaspace::MetadataType ct = Metaspace::ClassType;
+ out->print_cr(" class space "
+ SIZE_FORMAT "K, used " SIZE_FORMAT "K,"
+ " reserved " SIZE_FORMAT "K",
+ allocated_capacity_bytes(ct)/K,
+ allocated_used_bytes(ct)/K,
+ reserved_in_bytes(ct)/K);
+ }
}
// Print information for class space and data space separately.
@@ -2659,13 +2666,37 @@
assert(!SafepointSynchronize::is_at_safepoint() || used_and_free == capacity_bytes, "Accounting is wrong");
}
-// Print total fragmentation for class and data metaspaces separately
+// Print total fragmentation for class metaspaces
+void MetaspaceAux::print_class_waste(outputStream* out) {
+ assert(Metaspace::using_class_space(), "class metaspace not used");
+ size_t cls_specialized_waste = 0, cls_small_waste = 0, cls_medium_waste = 0;
+ size_t cls_specialized_count = 0, cls_small_count = 0, cls_medium_count = 0, cls_humongous_count = 0;
+ ClassLoaderDataGraphMetaspaceIterator iter;
+ while (iter.repeat()) {
+ Metaspace* msp = iter.get_next();
+ if (msp != NULL) {
+ 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_humongous_count += msp->class_vsm()->sum_count_in_chunks_in_use(HumongousIndex);
+ }
+ }
+ out->print_cr(" class: " SIZE_FORMAT " specialized(s) " SIZE_FORMAT ", "
+ SIZE_FORMAT " small(s) " SIZE_FORMAT ", "
+ SIZE_FORMAT " medium(s) " SIZE_FORMAT ", "
+ "large count " SIZE_FORMAT,
+ cls_specialized_count, cls_specialized_waste,
+ cls_small_count, cls_small_waste,
+ cls_medium_count, cls_medium_waste, cls_humongous_count);
+}
+
+// Print total fragmentation for data and class metaspaces separately
void MetaspaceAux::print_waste(outputStream* out) {
-
size_t specialized_waste = 0, small_waste = 0, medium_waste = 0;
size_t specialized_count = 0, small_count = 0, medium_count = 0, humongous_count = 0;
- size_t cls_specialized_waste = 0, cls_small_waste = 0, cls_medium_waste = 0;
- size_t cls_specialized_count = 0, cls_small_count = 0, cls_medium_count = 0, cls_humongous_count = 0;
ClassLoaderDataGraphMetaspaceIterator iter;
while (iter.repeat()) {
@@ -2678,14 +2709,6 @@
medium_waste += msp->vsm()->sum_waste_in_chunks_in_use(MediumIndex);
medium_count += msp->vsm()->sum_count_in_chunks_in_use(MediumIndex);
humongous_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_humongous_count += msp->class_vsm()->sum_count_in_chunks_in_use(HumongousIndex);
}
}
out->print_cr("Total fragmentation waste (words) doesn't count free space");
@@ -2695,13 +2718,9 @@
"large count " SIZE_FORMAT,
specialized_count, specialized_waste, small_count,
small_waste, medium_count, medium_waste, humongous_count);
- out->print_cr(" class: " SIZE_FORMAT " specialized(s) " SIZE_FORMAT ", "
- SIZE_FORMAT " small(s) " SIZE_FORMAT ", "
- SIZE_FORMAT " medium(s) " SIZE_FORMAT ", "
- "large count " SIZE_FORMAT,
- cls_specialized_count, cls_specialized_waste,
- cls_small_count, cls_small_waste,
- cls_medium_count, cls_medium_waste, cls_humongous_count);
+ if (Metaspace::using_class_space()) {
+ print_class_waste(out);
+ }
}
// Dump global metaspace things from the end of ClassLoaderDataGraph
@@ -2714,7 +2733,9 @@
void MetaspaceAux::verify_free_chunks() {
Metaspace::space_list()->chunk_manager()->verify();
- Metaspace::class_space_list()->chunk_manager()->verify();
+ if (Metaspace::using_class_space()) {
+ Metaspace::class_space_list()->chunk_manager()->verify();
+ }
}
void MetaspaceAux::verify_capacity() {
@@ -2776,7 +2797,9 @@
Metaspace::~Metaspace() {
delete _vsm;
- delete _class_vsm;
+ if (using_class_space()) {
+ delete _class_vsm;
+ }
}
VirtualSpaceList* Metaspace::_space_list = NULL;
@@ -2784,9 +2807,123 @@
#define VIRTUALSPACEMULTIPLIER 2
+#ifdef _LP64
+void Metaspace::set_narrow_klass_base_and_shift(address metaspace_base, address cds_base) {
+ // Figure out the narrow_klass_base and the narrow_klass_shift. The
+ // narrow_klass_base is the lower of the metaspace base and the cds base
+ // (if cds is enabled). The narrow_klass_shift depends on the distance
+ // between the lower base and higher address.
+ address lower_base;
+ address higher_address;
+ if (UseSharedSpaces) {
+ higher_address = MAX2((address)(cds_base + FileMapInfo::shared_spaces_size()),
+ (address)(metaspace_base + class_metaspace_size()));
+ lower_base = MIN2(metaspace_base, cds_base);
+ } else {
+ higher_address = metaspace_base + class_metaspace_size();
+ lower_base = metaspace_base;
+ }
+ Universe::set_narrow_klass_base(lower_base);
+ if ((uint64_t)(higher_address - lower_base) < (uint64_t)max_juint) {
+ Universe::set_narrow_klass_shift(0);
+ } else {
+ assert(!UseSharedSpaces, "Cannot shift with UseSharedSpaces");
+ Universe::set_narrow_klass_shift(LogKlassAlignmentInBytes);
+ }
+}
+
+// Return TRUE if the specified metaspace_base and cds_base are close enough
+// to work with compressed klass pointers.
+bool Metaspace::can_use_cds_with_metaspace_addr(char* metaspace_base, address cds_base) {
+ assert(cds_base != 0 && UseSharedSpaces, "Only use with CDS");
+ assert(UseCompressedKlassPointers, "Only use with CompressedKlassPtrs");
+ address lower_base = MIN2((address)metaspace_base, cds_base);
+ address higher_address = MAX2((address)(cds_base + FileMapInfo::shared_spaces_size()),
+ (address)(metaspace_base + class_metaspace_size()));
+ return ((uint64_t)(higher_address - lower_base) < (uint64_t)max_juint);
+}
+
+// Try to allocate the metaspace at the requested addr.
+void Metaspace::allocate_metaspace_compressed_klass_ptrs(char* requested_addr, address cds_base) {
+ assert(using_class_space(), "called improperly");
+ assert(UseCompressedKlassPointers, "Only use with CompressedKlassPtrs");
+ assert(class_metaspace_size() < KlassEncodingMetaspaceMax,
+ "Metaspace size is too big");
+
+ ReservedSpace metaspace_rs = ReservedSpace(class_metaspace_size(),
+ os::vm_allocation_granularity(),
+ false, requested_addr, 0);
+ if (!metaspace_rs.is_reserved()) {
+ if (UseSharedSpaces) {
+ // Keep trying to allocate the metaspace, increasing the requested_addr
+ // by 1GB each time, until we reach an address that will no longer allow
+ // use of CDS with compressed klass pointers.
+ char *addr = requested_addr;
+ while (!metaspace_rs.is_reserved() && (addr + 1*G > addr) &&
+ can_use_cds_with_metaspace_addr(addr + 1*G, cds_base)) {
+ addr = addr + 1*G;
+ metaspace_rs = ReservedSpace(class_metaspace_size(),
+ os::vm_allocation_granularity(), false, addr, 0);
+ }
+ }
+
+ // If no successful allocation then try to allocate the space anywhere. If
+ // that fails then OOM doom. At this point we cannot try allocating the
+ // metaspace as if UseCompressedKlassPointers is off because too much
+ // initialization has happened that depends on UseCompressedKlassPointers.
+ // So, UseCompressedKlassPointers cannot be turned off at this point.
+ if (!metaspace_rs.is_reserved()) {
+ metaspace_rs = ReservedSpace(class_metaspace_size(),
+ os::vm_allocation_granularity(), false);
+ if (!metaspace_rs.is_reserved()) {
+ vm_exit_during_initialization(err_msg("Could not allocate metaspace: %d bytes",
+ class_metaspace_size()));
+ }
+ }
+ }
+
+ // If we got here then the metaspace got allocated.
+ MemTracker::record_virtual_memory_type((address)metaspace_rs.base(), mtClass);
+
+ // Verify that we can use shared spaces. Otherwise, turn off CDS.
+ if (UseSharedSpaces && !can_use_cds_with_metaspace_addr(metaspace_rs.base(), cds_base)) {
+ FileMapInfo::stop_sharing_and_unmap(
+ "Could not allocate metaspace at a compatible address");
+ }
+
+ set_narrow_klass_base_and_shift((address)metaspace_rs.base(),
+ UseSharedSpaces ? (address)cds_base : 0);
+
+ initialize_class_space(metaspace_rs);
+
+ if (PrintCompressedOopsMode || (PrintMiscellaneous && Verbose)) {
+ gclog_or_tty->print_cr("Narrow klass base: " PTR_FORMAT ", Narrow klass shift: " SIZE_FORMAT,
+ Universe::narrow_klass_base(), Universe::narrow_klass_shift());
+ gclog_or_tty->print_cr("Metaspace Size: " SIZE_FORMAT " Address: " PTR_FORMAT " Req Addr: " PTR_FORMAT,
+ class_metaspace_size(), metaspace_rs.base(), requested_addr);
+ }
+}
+
+// For UseCompressedKlassPointers the class space is reserved above the top of
+// the Java heap. The argument passed in is at the base of the compressed space.
+void Metaspace::initialize_class_space(ReservedSpace rs) {
+ // The reserved space size may be bigger because of alignment, esp with UseLargePages
+ assert(rs.size() >= ClassMetaspaceSize,
+ err_msg(SIZE_FORMAT " != " UINTX_FORMAT, rs.size(), ClassMetaspaceSize));
+ assert(using_class_space(), "Must be using class space");
+ _class_space_list = new VirtualSpaceList(rs);
+}
+
+#endif
+
void Metaspace::global_initialize() {
// Initialize the alignment for shared spaces.
int max_alignment = os::vm_page_size();
+ size_t cds_total = 0;
+
+ set_class_metaspace_size(align_size_up(ClassMetaspaceSize,
+ os::vm_allocation_granularity()));
+
MetaspaceShared::set_max_alignment(max_alignment);
if (DumpSharedSpaces) {
@@ -2798,15 +2935,31 @@
// Initialize with the sum of the shared space sizes. The read-only
// and read write metaspace chunks will be allocated out of this and the
// remainder is the misc code and data chunks.
- size_t total = align_size_up(SharedReadOnlySize + SharedReadWriteSize +
- SharedMiscDataSize + SharedMiscCodeSize,
- os::vm_allocation_granularity());
- size_t word_size = total/wordSize;
- _space_list = new VirtualSpaceList(word_size);
+ cds_total = FileMapInfo::shared_spaces_size();
+ _space_list = new VirtualSpaceList(cds_total/wordSize);
+
+#ifdef _LP64
+ // Set the compressed klass pointer base so that decoding of these pointers works
+ // properly when creating the shared archive.
+ assert(UseCompressedOops && UseCompressedKlassPointers,
+ "UseCompressedOops and UseCompressedKlassPointers must be set");
+ Universe::set_narrow_klass_base((address)_space_list->current_virtual_space()->bottom());
+ if (TraceMetavirtualspaceAllocation && Verbose) {
+ gclog_or_tty->print_cr("Setting_narrow_klass_base to Address: " PTR_FORMAT,
+ _space_list->current_virtual_space()->bottom());
+ }
+
+ // Set the shift to zero.
+ assert(class_metaspace_size() < (uint64_t)(max_juint) - cds_total,
+ "CDS region is too large");
+ Universe::set_narrow_klass_shift(0);
+#endif
+
} else {
// If using shared space, open the file that contains the shared space
// and map in the memory before initializing the rest of metaspace (so
// the addresses don't conflict)
+ address cds_address = NULL;
if (UseSharedSpaces) {
FileMapInfo* mapinfo = new FileMapInfo();
memset(mapinfo, 0, sizeof(FileMapInfo));
@@ -2821,8 +2974,22 @@
assert(!mapinfo->is_open() && !UseSharedSpaces,
"archive file not closed or shared spaces not disabled.");
}
+ cds_total = FileMapInfo::shared_spaces_size();
+ cds_address = (address)mapinfo->region_base(0);
}
+#ifdef _LP64
+ // If UseCompressedKlassPointers is set then allocate the metaspace area
+ // above the heap and above the CDS area (if it exists).
+ if (using_class_space()) {
+ if (UseSharedSpaces) {
+ allocate_metaspace_compressed_klass_ptrs((char *)(cds_address + cds_total), cds_address);
+ } else {
+ allocate_metaspace_compressed_klass_ptrs((char *)CompressedKlassPointersBase, 0);
+ }
+ }
+#endif
+
// Initialize these before initializing the VirtualSpaceList
_first_chunk_word_size = InitialBootClassLoaderMetaspaceSize / BytesPerWord;
_first_chunk_word_size = align_word_size_up(_first_chunk_word_size);
@@ -2840,39 +3007,28 @@
}
}
-// For UseCompressedKlassPointers the class space is reserved as a piece of the
-// Java heap because the compression algorithm is the same for each. The
-// argument passed in is at the top of the compressed space
-void Metaspace::initialize_class_space(ReservedSpace rs) {
- // The reserved space size may be bigger because of alignment, esp with UseLargePages
- assert(rs.size() >= ClassMetaspaceSize,
- err_msg(SIZE_FORMAT " != " UINTX_FORMAT, rs.size(), ClassMetaspaceSize));
- _class_space_list = new VirtualSpaceList(rs);
-}
-
-void Metaspace::initialize(Mutex* lock,
- MetaspaceType type) {
+void Metaspace::initialize(Mutex* lock, MetaspaceType type) {
assert(space_list() != NULL,
"Metadata VirtualSpaceList has not been initialized");
- _vsm = new SpaceManager(Metaspace::NonClassType, lock, space_list());
+ _vsm = new SpaceManager(NonClassType, lock, space_list());
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");
-
- // Allocate SpaceManager for classes.
- _class_vsm = new SpaceManager(Metaspace::ClassType, lock, class_space_list());
- if (_class_vsm == NULL) {
- return;
+ vsm()->get_initial_chunk_sizes(type, &word_size, &class_word_size);
+
+ if (using_class_space()) {
+ assert(class_space_list() != NULL,
+ "Class VirtualSpaceList has not been initialized");
+
+ // Allocate SpaceManager for classes.
+ _class_vsm = new SpaceManager(ClassType, lock, class_space_list());
+ if (_class_vsm == NULL) {
+ return;
+ }
}
MutexLockerEx cl(SpaceManager::expand_lock(), Mutex::_no_safepoint_check_flag);
@@ -2888,11 +3044,13 @@
}
// Allocate chunk for class metadata objects
- Metachunk* class_chunk =
- 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);
+ if (using_class_space()) {
+ Metachunk* class_chunk =
+ 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);
+ }
}
_alloc_record_head = NULL;
@@ -2906,7 +3064,8 @@
MetaWord* Metaspace::allocate(size_t word_size, MetadataType mdtype) {
// DumpSharedSpaces doesn't use class metadata area (yet)
- if (mdtype == ClassType && !DumpSharedSpaces) {
+ // Also, don't use class_vsm() unless UseCompressedKlassPointers is true.
+ if (mdtype == ClassType && using_class_space()) {
return class_vsm()->allocate(word_size);
} else {
return vsm()->allocate(word_size);
@@ -2937,14 +3096,19 @@
}
size_t Metaspace::used_words_slow(MetadataType mdtype) const {
- // return vsm()->allocated_used_words();
- return mdtype == ClassType ? class_vsm()->sum_used_in_chunks_in_use() :
- vsm()->sum_used_in_chunks_in_use(); // includes overhead!
+ if (mdtype == ClassType) {
+ return using_class_space() ? class_vsm()->sum_used_in_chunks_in_use() : 0;
+ } else {
+ return vsm()->sum_used_in_chunks_in_use(); // includes overhead!
+ }
}
size_t Metaspace::free_words(MetadataType mdtype) const {
- return mdtype == ClassType ? class_vsm()->sum_free_in_chunks_in_use() :
- vsm()->sum_free_in_chunks_in_use();
+ if (mdtype == ClassType) {
+ return using_class_space() ? class_vsm()->sum_free_in_chunks_in_use() : 0;
+ } else {
+ return vsm()->sum_free_in_chunks_in_use();
+ }
}
// Space capacity in the Metaspace. It includes
@@ -2953,8 +3117,11 @@
// in the space available in the dictionary which
// is already counted in some chunk.
size_t Metaspace::capacity_words_slow(MetadataType mdtype) const {
- return mdtype == ClassType ? class_vsm()->sum_capacity_in_chunks_in_use() :
- vsm()->sum_capacity_in_chunks_in_use();
+ if (mdtype == ClassType) {
+ return using_class_space() ? class_vsm()->sum_capacity_in_chunks_in_use() : 0;
+ } else {
+ return vsm()->sum_capacity_in_chunks_in_use();
+ }
}
size_t Metaspace::used_bytes_slow(MetadataType mdtype) const {
@@ -2977,8 +3144,8 @@
#endif
return;
}
- if (is_class) {
- class_vsm()->deallocate(ptr, word_size);
+ if (is_class && using_class_space()) {
+ class_vsm()->deallocate(ptr, word_size);
} else {
vsm()->deallocate(ptr, word_size);
}
@@ -2992,7 +3159,7 @@
#endif
return;
}
- if (is_class) {
+ if (is_class && using_class_space()) {
class_vsm()->deallocate(ptr, word_size);
} else {
vsm()->deallocate(ptr, word_size);
@@ -3101,14 +3268,18 @@
MutexLockerEx cl(SpaceManager::expand_lock(),
Mutex::_no_safepoint_check_flag);
space_list()->purge();
- class_space_list()->purge();
+ if (using_class_space()) {
+ class_space_list()->purge();
+ }
}
void Metaspace::print_on(outputStream* out) const {
// Print both class virtual space counts and metaspace.
if (Verbose) {
- vsm()->print_on(out);
+ vsm()->print_on(out);
+ if (using_class_space()) {
class_vsm()->print_on(out);
+ }
}
}
@@ -3122,17 +3293,21 @@
// be needed. Note, locking this can cause inversion problems with the
// caller in MetaspaceObj::is_metadata() function.
return space_list()->contains(ptr) ||
- class_space_list()->contains(ptr);
+ (using_class_space() && class_space_list()->contains(ptr));
}
void Metaspace::verify() {
vsm()->verify();
- class_vsm()->verify();
+ if (using_class_space()) {
+ class_vsm()->verify();
+ }
}
void Metaspace::dump(outputStream* const out) const {
out->print_cr("\nVirtual space manager: " INTPTR_FORMAT, vsm());
vsm()->dump(out);
- out->print_cr("\nClass space manager: " INTPTR_FORMAT, class_vsm());
- class_vsm()->dump(out);
+ if (using_class_space()) {
+ out->print_cr("\nClass space manager: " INTPTR_FORMAT, class_vsm());
+ class_vsm()->dump(out);
+ }
}
--- a/hotspot/src/share/vm/memory/metaspace.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/metaspace.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -105,6 +105,16 @@
// Align up the word size to the allocation word size
static size_t align_word_size_up(size_t);
+ // Aligned size of the metaspace.
+ static size_t _class_metaspace_size;
+
+ static size_t class_metaspace_size() {
+ return _class_metaspace_size;
+ }
+ static void set_class_metaspace_size(size_t metaspace_size) {
+ _class_metaspace_size = metaspace_size;
+ }
+
static size_t _first_chunk_word_size;
static size_t _first_class_chunk_word_size;
@@ -126,11 +136,26 @@
static VirtualSpaceList* space_list() { return _space_list; }
static VirtualSpaceList* class_space_list() { return _class_space_list; }
+ static VirtualSpaceList* get_space_list(MetadataType mdtype) {
+ assert(mdtype != MetadataTypeCount, "MetadaTypeCount can't be used as mdtype");
+ return mdtype == ClassType ? class_space_list() : space_list();
+ }
// This is used by DumpSharedSpaces only, where only _vsm is used. So we will
// maintain a single list for now.
void record_allocation(void* ptr, MetaspaceObj::Type type, size_t word_size);
+#ifdef _LP64
+ static void set_narrow_klass_base_and_shift(address metaspace_base, address cds_base);
+
+ // Returns true if can use CDS with metaspace allocated as specified address.
+ static bool can_use_cds_with_metaspace_addr(char* metaspace_base, address cds_base);
+
+ static void allocate_metaspace_compressed_klass_ptrs(char* requested_addr, address cds_base);
+
+ static void initialize_class_space(ReservedSpace rs);
+#endif
+
class AllocRecord : public CHeapObj<mtClass> {
public:
AllocRecord(address ptr, MetaspaceObj::Type type, int byte_size)
@@ -151,7 +176,6 @@
// Initialize globals for Metaspace
static void global_initialize();
- 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; }
@@ -172,8 +196,6 @@
MetaWord* expand_and_allocate(size_t size,
MetadataType mdtype);
- static bool is_initialized() { return _class_space_list != NULL; }
-
static bool contains(const void *ptr);
void dump(outputStream* const out) const;
@@ -190,11 +212,16 @@
};
void iterate(AllocRecordClosure *closure);
+
+ // Return TRUE only if UseCompressedKlassPointers is True and DumpSharedSpaces is False.
+ static bool using_class_space() {
+ return NOT_LP64(false) LP64_ONLY(UseCompressedKlassPointers && !DumpSharedSpaces);
+ }
+
};
class MetaspaceAux : AllStatic {
static size_t free_chunks_total(Metaspace::MetadataType mdtype);
- static size_t free_chunks_total_in_bytes(Metaspace::MetadataType mdtype);
public:
// Statistics for class space and data space in metaspace.
@@ -238,13 +265,15 @@
// Used by MetaspaceCounters
static size_t free_chunks_total();
static size_t free_chunks_total_in_bytes();
+ static size_t free_chunks_total_in_bytes(Metaspace::MetadataType mdtype);
static size_t allocated_capacity_words(Metaspace::MetadataType mdtype) {
return _allocated_capacity_words[mdtype];
}
static size_t allocated_capacity_words() {
- return _allocated_capacity_words[Metaspace::ClassType] +
- _allocated_capacity_words[Metaspace::NonClassType];
+ return _allocated_capacity_words[Metaspace::NonClassType] +
+ (Metaspace::using_class_space() ?
+ _allocated_capacity_words[Metaspace::ClassType] : 0);
}
static size_t allocated_capacity_bytes(Metaspace::MetadataType mdtype) {
return allocated_capacity_words(mdtype) * BytesPerWord;
@@ -257,8 +286,9 @@
return _allocated_used_words[mdtype];
}
static size_t allocated_used_words() {
- return _allocated_used_words[Metaspace::ClassType] +
- _allocated_used_words[Metaspace::NonClassType];
+ return _allocated_used_words[Metaspace::NonClassType] +
+ (Metaspace::using_class_space() ?
+ _allocated_used_words[Metaspace::ClassType] : 0);
}
static size_t allocated_used_bytes(Metaspace::MetadataType mdtype) {
return allocated_used_words(mdtype) * BytesPerWord;
@@ -268,6 +298,7 @@
}
static size_t free_bytes();
+ static size_t free_bytes(Metaspace::MetadataType mdtype);
// Total capacity in all Metaspaces
static size_t capacity_bytes_slow() {
@@ -300,6 +331,7 @@
static void print_on(outputStream * out);
static void print_on(outputStream * out, Metaspace::MetadataType mdtype);
+ static void print_class_waste(outputStream* out);
static void print_waste(outputStream* out);
static void dump(outputStream* out);
static void verify_free_chunks();
--- a/hotspot/src/share/vm/memory/metaspaceCounters.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/metaspaceCounters.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -25,11 +25,47 @@
#include "precompiled.hpp"
#include "memory/metaspaceCounters.hpp"
#include "memory/resourceArea.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/perfData.hpp"
#include "utilities/exceptions.hpp"
-MetaspaceCounters* MetaspaceCounters::_metaspace_counters = NULL;
+class MetaspacePerfCounters: public CHeapObj<mtInternal> {
+ friend class VMStructs;
+ PerfVariable* _capacity;
+ PerfVariable* _used;
+ PerfVariable* _max_capacity;
+
+ PerfVariable* create_variable(const char *ns, const char *name, size_t value, TRAPS) {
+ const char *path = PerfDataManager::counter_name(ns, name);
+ return PerfDataManager::create_variable(SUN_GC, path, PerfData::U_Bytes, value, THREAD);
+ }
+
+ void create_constant(const char *ns, const char *name, size_t value, TRAPS) {
+ const char *path = PerfDataManager::counter_name(ns, name);
+ PerfDataManager::create_constant(SUN_GC, path, PerfData::U_Bytes, value, THREAD);
+ }
-size_t MetaspaceCounters::calc_total_capacity() {
+ public:
+ MetaspacePerfCounters(const char* ns, size_t min_capacity, size_t curr_capacity, size_t max_capacity, size_t used) {
+ EXCEPTION_MARK;
+ ResourceMark rm;
+
+ create_constant(ns, "minCapacity", min_capacity, THREAD);
+ _capacity = create_variable(ns, "capacity", curr_capacity, THREAD);
+ _max_capacity = create_variable(ns, "maxCapacity", max_capacity, THREAD);
+ _used = create_variable(ns, "used", used, THREAD);
+ }
+
+ void update(size_t capacity, size_t max_capacity, size_t used) {
+ _capacity->set_value(capacity);
+ _max_capacity->set_value(max_capacity);
+ _used->set_value(used);
+ }
+};
+
+MetaspacePerfCounters* MetaspaceCounters::_perf_counters = NULL;
+
+size_t MetaspaceCounters::calculate_capacity() {
// The total capacity is the sum of
// 1) capacity of Metachunks in use by all Metaspaces
// 2) unused space at the end of each Metachunk
@@ -39,95 +75,65 @@
return total_capacity;
}
-MetaspaceCounters::MetaspaceCounters() :
- _capacity(NULL),
- _used(NULL),
- _max_capacity(NULL) {
+void MetaspaceCounters::initialize_performance_counters() {
if (UsePerfData) {
+ assert(_perf_counters == NULL, "Should only be initialized once");
+
size_t min_capacity = MetaspaceAux::min_chunk_size();
+ size_t capacity = calculate_capacity();
size_t max_capacity = MetaspaceAux::reserved_in_bytes();
- size_t curr_capacity = calc_total_capacity();
size_t used = MetaspaceAux::allocated_used_bytes();
- initialize(min_capacity, max_capacity, curr_capacity, used);
- }
-}
-
-static PerfVariable* create_ms_variable(const char *ns,
- const char *name,
- size_t value,
- TRAPS) {
- const char *path = PerfDataManager::counter_name(ns, name);
- PerfVariable *result =
- PerfDataManager::create_variable(SUN_GC, path, PerfData::U_Bytes, value,
- CHECK_NULL);
- return result;
-}
-
-static void create_ms_constant(const char *ns,
- const char *name,
- size_t value,
- TRAPS) {
- const char *path = PerfDataManager::counter_name(ns, name);
- PerfDataManager::create_constant(SUN_GC, path, PerfData::U_Bytes, value, CHECK);
-}
-
-void MetaspaceCounters::initialize(size_t min_capacity,
- size_t max_capacity,
- size_t curr_capacity,
- size_t used) {
-
- if (UsePerfData) {
- EXCEPTION_MARK;
- ResourceMark rm;
-
- const char *ms = "metaspace";
-
- create_ms_constant(ms, "minCapacity", min_capacity, CHECK);
- _max_capacity = create_ms_variable(ms, "maxCapacity", max_capacity, CHECK);
- _capacity = create_ms_variable(ms, "capacity", curr_capacity, CHECK);
- _used = create_ms_variable(ms, "used", used, CHECK);
- }
-}
-
-void MetaspaceCounters::update_capacity() {
- assert(UsePerfData, "Should not be called unless being used");
- size_t total_capacity = calc_total_capacity();
- _capacity->set_value(total_capacity);
-}
-
-void MetaspaceCounters::update_used() {
- assert(UsePerfData, "Should not be called unless being used");
- size_t used_in_bytes = MetaspaceAux::allocated_used_bytes();
- _used->set_value(used_in_bytes);
-}
-
-void MetaspaceCounters::update_max_capacity() {
- assert(UsePerfData, "Should not be called unless being used");
- assert(_max_capacity != NULL, "Should be initialized");
- size_t reserved_in_bytes = MetaspaceAux::reserved_in_bytes();
- _max_capacity->set_value(reserved_in_bytes);
-}
-
-void MetaspaceCounters::update_all() {
- if (UsePerfData) {
- update_used();
- update_capacity();
- update_max_capacity();
- }
-}
-
-void MetaspaceCounters::initialize_performance_counters() {
- if (UsePerfData) {
- assert(_metaspace_counters == NULL, "Should only be initialized once");
- _metaspace_counters = new MetaspaceCounters();
+ _perf_counters = new MetaspacePerfCounters("metaspace", min_capacity, capacity, max_capacity, used);
}
}
void MetaspaceCounters::update_performance_counters() {
if (UsePerfData) {
- assert(_metaspace_counters != NULL, "Should be initialized");
- _metaspace_counters->update_all();
+ assert(_perf_counters != NULL, "Should be initialized");
+
+ size_t capacity = calculate_capacity();
+ size_t max_capacity = MetaspaceAux::reserved_in_bytes();
+ size_t used = MetaspaceAux::allocated_used_bytes();
+
+ _perf_counters->update(capacity, max_capacity, used);
}
}
+MetaspacePerfCounters* CompressedClassSpaceCounters::_perf_counters = NULL;
+
+size_t CompressedClassSpaceCounters::calculate_capacity() {
+ return MetaspaceAux::allocated_capacity_bytes(_class_type) +
+ MetaspaceAux::free_bytes(_class_type) +
+ MetaspaceAux::free_chunks_total_in_bytes(_class_type);
+}
+
+void CompressedClassSpaceCounters::update_performance_counters() {
+ if (UsePerfData && UseCompressedKlassPointers) {
+ assert(_perf_counters != NULL, "Should be initialized");
+
+ size_t capacity = calculate_capacity();
+ size_t max_capacity = MetaspaceAux::reserved_in_bytes(_class_type);
+ size_t used = MetaspaceAux::allocated_used_bytes(_class_type);
+
+ _perf_counters->update(capacity, max_capacity, used);
+ }
+}
+
+void CompressedClassSpaceCounters::initialize_performance_counters() {
+ if (UsePerfData) {
+ assert(_perf_counters == NULL, "Should only be initialized once");
+ const char* ns = "compressedclassspace";
+
+ if (UseCompressedKlassPointers) {
+ size_t min_capacity = MetaspaceAux::min_chunk_size();
+ size_t capacity = calculate_capacity();
+ size_t max_capacity = MetaspaceAux::reserved_in_bytes(_class_type);
+ size_t used = MetaspaceAux::allocated_used_bytes(_class_type);
+
+ _perf_counters = new MetaspacePerfCounters(ns, min_capacity, capacity, max_capacity, used);
+ } else {
+ _perf_counters = new MetaspacePerfCounters(ns, 0, 0, 0, 0);
+ }
+ }
+}
--- a/hotspot/src/share/vm/memory/metaspaceCounters.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/metaspaceCounters.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -25,31 +25,27 @@
#ifndef SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
#define SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
-#include "runtime/perfData.hpp"
+#include "memory/metaspace.hpp"
+
+class MetaspacePerfCounters;
-class MetaspaceCounters: public CHeapObj<mtClass> {
- friend class VMStructs;
- PerfVariable* _capacity;
- PerfVariable* _used;
- PerfVariable* _max_capacity;
- static MetaspaceCounters* _metaspace_counters;
- void initialize(size_t min_capacity,
- size_t max_capacity,
- size_t curr_capacity,
- size_t used);
- size_t calc_total_capacity();
+class MetaspaceCounters: public AllStatic {
+ static MetaspacePerfCounters* _perf_counters;
+ static size_t calculate_capacity();
+
public:
- MetaspaceCounters();
- ~MetaspaceCounters();
-
- void update_capacity();
- void update_used();
- void update_max_capacity();
-
- void update_all();
-
static void initialize_performance_counters();
static void update_performance_counters();
-
};
+
+class CompressedClassSpaceCounters: public AllStatic {
+ static MetaspacePerfCounters* _perf_counters;
+ static size_t calculate_capacity();
+ static const Metaspace::MetadataType _class_type = Metaspace::ClassType;
+
+ public:
+ static void initialize_performance_counters();
+ static void update_performance_counters();
+};
+
#endif // SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
--- a/hotspot/src/share/vm/memory/metaspaceShared.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/metaspaceShared.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -52,7 +52,6 @@
int tag = 0;
soc->do_tag(--tag);
- assert(!UseCompressedOops, "UseCompressedOops doesn't work with shared archive");
// Verify the sizes of various metadata in the system.
soc->do_tag(sizeof(Method));
soc->do_tag(sizeof(ConstMethod));
--- a/hotspot/src/share/vm/memory/universe.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/universe.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -145,8 +145,6 @@
NarrowPtrStruct Universe::_narrow_klass = { NULL, 0, true };
address Universe::_narrow_ptrs_base;
-size_t Universe::_class_metaspace_size;
-
void Universe::basic_type_classes_do(void f(Klass*)) {
f(boolArrayKlassObj());
f(byteArrayKlassObj());
@@ -641,6 +639,8 @@
return status;
}
+ Metaspace::global_initialize();
+
// Create memory for metadata. Must be after initializing heap for
// DumpSharedSpaces.
ClassLoaderData::init_null_class_loader_data();
@@ -681,25 +681,27 @@
// 32Gb
// OopEncodingHeapMax == NarrowOopHeapMax << LogMinObjAlignmentInBytes;
-char* Universe::preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode) {
+char* Universe::preferred_heap_base(size_t heap_size, size_t alignment, NARROW_OOP_MODE mode) {
+ assert(is_size_aligned((size_t)OopEncodingHeapMax, alignment), "Must be");
+ assert(is_size_aligned((size_t)NarrowOopHeapMax, alignment), "Must be");
+ assert(is_size_aligned(heap_size, alignment), "Must be");
+
+ uintx heap_base_min_address_aligned = align_size_up(HeapBaseMinAddress, alignment);
+
size_t base = 0;
#ifdef _LP64
if (UseCompressedOops) {
assert(mode == UnscaledNarrowOop ||
mode == ZeroBasedNarrowOop ||
mode == HeapBasedNarrowOop, "mode is invalid");
- const size_t total_size = heap_size + HeapBaseMinAddress;
+ const size_t total_size = heap_size + heap_base_min_address_aligned;
// Return specified base for the first request.
if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) {
- base = HeapBaseMinAddress;
+ base = heap_base_min_address_aligned;
- // If the total size and the metaspace size are small enough to allow
- // UnscaledNarrowOop then just use UnscaledNarrowOop.
- } else if ((total_size <= OopEncodingHeapMax) && (mode != HeapBasedNarrowOop) &&
- (!UseCompressedKlassPointers ||
- (((OopEncodingHeapMax - heap_size) + Universe::class_metaspace_size()) <= KlassEncodingMetaspaceMax))) {
- // We don't need to check the metaspace size here because it is always smaller
- // than total_size.
+ // If the total size is small enough to allow UnscaledNarrowOop then
+ // just use UnscaledNarrowOop.
+ } else if ((total_size <= OopEncodingHeapMax) && (mode != HeapBasedNarrowOop)) {
if ((total_size <= NarrowOopHeapMax) && (mode == UnscaledNarrowOop) &&
(Universe::narrow_oop_shift() == 0)) {
// Use 32-bits oops without encoding and
@@ -716,13 +718,6 @@
base = (OopEncodingHeapMax - heap_size);
}
}
-
- // See if ZeroBaseNarrowOop encoding will work for a heap based at
- // (KlassEncodingMetaspaceMax - class_metaspace_size()).
- } else if (UseCompressedKlassPointers && (mode != HeapBasedNarrowOop) &&
- (Universe::class_metaspace_size() + HeapBaseMinAddress <= KlassEncodingMetaspaceMax) &&
- (KlassEncodingMetaspaceMax + heap_size - Universe::class_metaspace_size() <= OopEncodingHeapMax)) {
- base = (KlassEncodingMetaspaceMax - Universe::class_metaspace_size());
} else {
// UnscaledNarrowOop encoding didn't work, and no base was found for ZeroBasedOops or
// HeapBasedNarrowOop encoding was requested. So, can't reserve below 32Gb.
@@ -732,8 +727,7 @@
// Set narrow_oop_base and narrow_oop_use_implicit_null_checks
// used in ReservedHeapSpace() constructors.
// The final values will be set in initialize_heap() below.
- if ((base != 0) && ((base + heap_size) <= OopEncodingHeapMax) &&
- (!UseCompressedKlassPointers || (base + Universe::class_metaspace_size()) <= KlassEncodingMetaspaceMax)) {
+ if ((base != 0) && ((base + heap_size) <= OopEncodingHeapMax)) {
// Use zero based compressed oops
Universe::set_narrow_oop_base(NULL);
// Don't need guard page for implicit checks in indexed
@@ -754,6 +748,8 @@
}
}
#endif
+
+ assert(is_ptr_aligned((char*)base, alignment), "Must be");
return (char*)base; // also return NULL (don't care) for 32-bit VM
}
@@ -816,9 +812,7 @@
tty->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB",
Universe::heap()->base(), Universe::heap()->reserved_region().byte_size()/M);
}
- if (((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax) ||
- (UseCompressedKlassPointers &&
- ((uint64_t)Universe::heap()->base() + Universe::class_metaspace_size() > KlassEncodingMetaspaceMax))) {
+ if (((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax)) {
// Can't reserve heap below 32Gb.
// keep the Universe::narrow_oop_base() set in Universe::reserve_heap()
Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
@@ -849,20 +843,16 @@
}
}
}
+
if (verbose) {
tty->cr();
tty->cr();
}
- if (UseCompressedKlassPointers) {
- Universe::set_narrow_klass_base(Universe::narrow_oop_base());
- Universe::set_narrow_klass_shift(MIN2(Universe::narrow_oop_shift(), LogKlassAlignmentInBytes));
- }
Universe::set_narrow_ptrs_base(Universe::narrow_oop_base());
}
- // Universe::narrow_oop_base() is one page below the metaspace
- // base. The actual metaspace base depends on alignment constraints
- // so we don't know its exact location here.
- assert((intptr_t)Universe::narrow_oop_base() <= (intptr_t)(Universe::heap()->base() - os::vm_page_size() - ClassMetaspaceSize) ||
+ // Universe::narrow_oop_base() is one page below the heap.
+ assert((intptr_t)Universe::narrow_oop_base() <= (intptr_t)(Universe::heap()->base() -
+ os::vm_page_size()) ||
Universe::narrow_oop_base() == NULL, "invalid value");
assert(Universe::narrow_oop_shift() == LogMinObjAlignmentInBytes ||
Universe::narrow_oop_shift() == 0, "invalid value");
@@ -882,35 +872,36 @@
// Reserve the Java heap, which is now the same for all GCs.
ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
- // Add in the class metaspace area so the classes in the headers can
- // be compressed the same as instances.
- // Need to round class space size up because it's below the heap and
- // the actual alignment depends on its size.
- Universe::set_class_metaspace_size(align_size_up(ClassMetaspaceSize, alignment));
- size_t total_reserved = align_size_up(heap_size + Universe::class_metaspace_size(), alignment);
+ size_t total_reserved = align_size_up(heap_size, alignment);
assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
"heap size is too big for compressed oops");
- char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
- ReservedHeapSpace total_rs(total_reserved, alignment, UseLargePages, addr);
+ bool use_large_pages = UseLargePages && is_size_aligned(alignment, os::large_page_size());
+ assert(!UseLargePages
+ || UseParallelOldGC
+ || use_large_pages, "Wrong alignment to use large pages");
+
+ char* addr = Universe::preferred_heap_base(total_reserved, alignment, Universe::UnscaledNarrowOop);
+
+ ReservedHeapSpace total_rs(total_reserved, alignment, use_large_pages, addr);
if (UseCompressedOops) {
if (addr != NULL && !total_rs.is_reserved()) {
// Failed to reserve at specified address - the requested memory
// region is taken already, for example, by 'java' launcher.
// Try again to reserver heap higher.
- addr = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
+ addr = Universe::preferred_heap_base(total_reserved, alignment, Universe::ZeroBasedNarrowOop);
ReservedHeapSpace total_rs0(total_reserved, alignment,
- UseLargePages, addr);
+ use_large_pages, addr);
if (addr != NULL && !total_rs0.is_reserved()) {
// Failed to reserve at specified address again - give up.
- addr = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
+ addr = Universe::preferred_heap_base(total_reserved, alignment, Universe::HeapBasedNarrowOop);
assert(addr == NULL, "");
ReservedHeapSpace total_rs1(total_reserved, alignment,
- UseLargePages, addr);
+ use_large_pages, addr);
total_rs = total_rs1;
} else {
total_rs = total_rs0;
@@ -923,28 +914,17 @@
return total_rs;
}
- // Split the reserved space into main Java heap and a space for
- // classes so that they can be compressed using the same algorithm
- // as compressed oops. If compress oops and compress klass ptrs are
- // used we need the meta space first: if the alignment used for
- // compressed oops is greater than the one used for compressed klass
- // ptrs, a metadata space on top of the heap could become
- // unreachable.
- ReservedSpace class_rs = total_rs.first_part(Universe::class_metaspace_size());
- ReservedSpace heap_rs = total_rs.last_part(Universe::class_metaspace_size(), alignment);
- Metaspace::initialize_class_space(class_rs);
-
if (UseCompressedOops) {
// Universe::initialize_heap() will reset this to NULL if unscaled
// or zero-based narrow oops are actually used.
address base = (address)(total_rs.base() - os::vm_page_size());
Universe::set_narrow_oop_base(base);
}
- return heap_rs;
+ return total_rs;
}
-// It's the caller's repsonsibility to ensure glitch-freedom
+// It's the caller's responsibility to ensure glitch-freedom
// (if required).
void Universe::update_heap_info_at_gc() {
_heap_capacity_at_last_gc = heap()->capacity();
@@ -1135,6 +1115,8 @@
// Initialize performance counters for metaspaces
MetaspaceCounters::initialize_performance_counters();
+ CompressedClassSpaceCounters::initialize_performance_counters();
+
MemoryService::add_metaspace_memory_pools();
GC_locker::unlock(); // allow gc after bootstrapping
--- a/hotspot/src/share/vm/memory/universe.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/memory/universe.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -75,10 +75,10 @@
};
-// For UseCompressedOops and UseCompressedKlassPointers.
+// For UseCompressedOops.
struct NarrowPtrStruct {
- // Base address for oop/klass-within-java-object materialization.
- // NULL if using wide oops/klasses or zero based narrow oops/klasses.
+ // Base address for oop-within-java-object materialization.
+ // NULL if using wide oops or zero based narrow oops.
address _base;
// Number of shift bits for encoding/decoding narrow ptrs.
// 0 if using wide ptrs or zero based unscaled narrow ptrs,
@@ -106,6 +106,7 @@
friend class SystemDictionary;
friend class VMStructs;
friend class VM_PopulateDumpSharedSpace;
+ friend class Metaspace;
friend jint universe_init();
friend void universe2_init();
@@ -184,9 +185,6 @@
static struct NarrowPtrStruct _narrow_klass;
static address _narrow_ptrs_base;
- // Aligned size of the metaspace.
- static size_t _class_metaspace_size;
-
// array of dummy objects used with +FullGCAlot
debug_only(static objArrayOop _fullgc_alot_dummy_array;)
// index of next entry to clear
@@ -238,15 +236,6 @@
assert(UseCompressedOops, "no compressed ptrs?");
_narrow_oop._use_implicit_null_checks = use;
}
- static bool reserve_metaspace_helper(bool with_base = false);
- static ReservedHeapSpace reserve_heap_metaspace(size_t heap_size, size_t alignment, bool& contiguous);
-
- static size_t class_metaspace_size() {
- return _class_metaspace_size;
- }
- static void set_class_metaspace_size(size_t metaspace_size) {
- _class_metaspace_size = metaspace_size;
- }
// Debugging
static int _verify_count; // number of verifies done
@@ -357,7 +346,7 @@
};
static NARROW_OOP_MODE narrow_oop_mode();
static const char* narrow_oop_mode_to_string(NARROW_OOP_MODE mode);
- static char* preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode);
+ static char* preferred_heap_base(size_t heap_size, size_t alignment, NARROW_OOP_MODE mode);
static char* preferred_metaspace_base(size_t heap_size, NARROW_OOP_MODE mode);
static address narrow_oop_base() { return _narrow_oop._base; }
static bool is_narrow_oop_base(void* addr) { return (narrow_oop_base() == (address)addr); }
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -269,7 +269,7 @@
set_fields(NULL, 0);
set_constants(NULL);
set_class_loader_data(NULL);
- set_source_file_name(NULL);
+ set_source_file_name_index(0);
set_source_debug_extension(NULL, 0);
set_array_name(NULL);
set_inner_classes(NULL);
@@ -284,7 +284,7 @@
set_osr_nmethods_head(NULL);
set_breakpoints(NULL);
init_previous_versions();
- set_generic_signature(NULL);
+ set_generic_signature_index(0);
release_set_methods_jmethod_ids(NULL);
release_set_methods_cached_itable_indices(NULL);
set_annotations(NULL);
@@ -2368,18 +2368,12 @@
// unreference array name derived from this class name (arrays of an unloaded
// class can't be referenced anymore).
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) {
- _source_file_name = n;
- if (_source_file_name != NULL) _source_file_name->increment_refcount();
-}
-
void InstanceKlass::set_source_debug_extension(char* array, int length) {
if (array == NULL) {
_source_debug_extension = NULL;
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -201,14 +201,10 @@
// number_of_inner_classes * 4 + enclosing_method_attribute_size.
Array<jushort>* _inner_classes;
- // Name of source file containing this klass, NULL if not specified.
- Symbol* _source_file_name;
// the source debug extension for this klass, NULL if not specified.
// Specified as UTF-8 string without terminating zero byte in the classfile,
// it is stored in the instanceklass as a NULL-terminated UTF-8 string
char* _source_debug_extension;
- // Generic signature, or null if none.
- Symbol* _generic_signature;
// Array name derived from this class which needs unreferencing
// if this class is unloaded.
Symbol* _array_name;
@@ -217,6 +213,12 @@
// (including inherited fields but after header_size()).
int _nonstatic_field_size;
int _static_field_size; // number words used by static fields (oop and non-oop) in this klass
+ // Constant pool index to the utf8 entry of the Generic signature,
+ // or 0 if none.
+ u2 _generic_signature_index;
+ // Constant pool index to the utf8 entry for the name of source file
+ // containing this klass, 0 if not specified.
+ u2 _source_file_name_index;
u2 _static_oop_field_count;// number of static oop fields in this klass
u2 _java_fields_count; // The number of declared Java fields
int _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks
@@ -570,8 +572,16 @@
}
// source file name
- Symbol* source_file_name() const { return _source_file_name; }
- void set_source_file_name(Symbol* n);
+ Symbol* source_file_name() const {
+ return (_source_file_name_index == 0) ?
+ (Symbol*)NULL : _constants->symbol_at(_source_file_name_index);
+ }
+ u2 source_file_name_index() const {
+ return _source_file_name_index;
+ }
+ void set_source_file_name_index(u2 sourcefile_index) {
+ _source_file_name_index = sourcefile_index;
+ }
// minor and major version numbers of class file
u2 minor_version() const { return _minor_version; }
@@ -648,8 +658,16 @@
void set_initial_method_idnum(u2 value) { _idnum_allocated_count = value; }
// generics support
- Symbol* generic_signature() const { return _generic_signature; }
- void set_generic_signature(Symbol* sig) { _generic_signature = sig; }
+ Symbol* generic_signature() const {
+ return (_generic_signature_index == 0) ?
+ (Symbol*)NULL : _constants->symbol_at(_generic_signature_index);
+ }
+ u2 generic_signature_index() const {
+ return _generic_signature_index;
+ }
+ void set_generic_signature_index(u2 sig_index) {
+ _generic_signature_index = sig_index;
+ }
u2 enclosing_method_data(int offset);
u2 enclosing_method_class_index() {
--- a/hotspot/src/share/vm/oops/klass.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/oops/klass.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -352,7 +352,8 @@
static int layout_helper_log2_element_size(jint lh) {
assert(lh < (jint)_lh_neutral_value, "must be array");
int l2esz = (lh >> _lh_log2_element_size_shift) & _lh_log2_element_size_mask;
- assert(l2esz <= LogBitsPerLong, "sanity");
+ assert(l2esz <= LogBitsPerLong,
+ err_msg("sanity. l2esz: 0x%x for lh: 0x%x", (uint)l2esz, (uint)lh));
return l2esz;
}
static jint array_layout_helper(jint tag, int hsize, BasicType etype, int log2_esize) {
@@ -703,6 +704,16 @@
virtual void oop_verify_on(oop obj, outputStream* st);
+ static bool is_null(narrowKlass obj);
+ static bool is_null(Klass* obj);
+
+ // klass encoding for klass pointer in objects.
+ static narrowKlass encode_klass_not_null(Klass* v);
+ static narrowKlass encode_klass(Klass* v);
+
+ static Klass* decode_klass_not_null(narrowKlass v);
+ static Klass* decode_klass(narrowKlass v);
+
private:
// barriers used by klass_oop_store
void klass_update_barrier_set(oop v);
--- a/hotspot/src/share/vm/oops/klass.inline.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/oops/klass.inline.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -25,6 +25,7 @@
#ifndef SHARE_VM_OOPS_KLASS_INLINE_HPP
#define SHARE_VM_OOPS_KLASS_INLINE_HPP
+#include "memory/universe.hpp"
#include "oops/klass.hpp"
#include "oops/markOop.hpp"
@@ -33,4 +34,41 @@
_prototype_header = header;
}
+inline bool Klass::is_null(Klass* obj) { return obj == NULL; }
+inline bool Klass::is_null(narrowKlass obj) { return obj == 0; }
+
+// Encoding and decoding for klass field.
+
+inline bool check_klass_alignment(Klass* obj) {
+ return (intptr_t)obj % KlassAlignmentInBytes == 0;
+}
+
+inline narrowKlass Klass::encode_klass_not_null(Klass* v) {
+ assert(!is_null(v), "klass value can never be zero");
+ assert(check_klass_alignment(v), "Address not aligned");
+ int shift = Universe::narrow_klass_shift();
+ uint64_t pd = (uint64_t)(pointer_delta((void*)v, Universe::narrow_klass_base(), 1));
+ assert(KlassEncodingMetaspaceMax > pd, "change encoding max if new encoding");
+ uint64_t result = pd >> shift;
+ assert((result & CONST64(0xffffffff00000000)) == 0, "narrow klass pointer overflow");
+ assert(decode_klass(result) == v, "reversibility");
+ return (narrowKlass)result;
+}
+
+inline narrowKlass Klass::encode_klass(Klass* v) {
+ return is_null(v) ? (narrowKlass)0 : encode_klass_not_null(v);
+}
+
+inline Klass* Klass::decode_klass_not_null(narrowKlass v) {
+ assert(!is_null(v), "narrow klass value can never be zero");
+ int shift = Universe::narrow_klass_shift();
+ Klass* result = (Klass*)(void*)((uintptr_t)Universe::narrow_klass_base() + ((uintptr_t)v << shift));
+ assert(check_klass_alignment(result), err_msg("address not aligned: " PTR_FORMAT, (void*) result));
+ return result;
+}
+
+inline Klass* Klass::decode_klass(narrowKlass v) {
+ return is_null(v) ? (Klass*)NULL : decode_klass_not_null(v);
+}
+
#endif // SHARE_VM_OOPS_KLASS_INLINE_HPP
--- a/hotspot/src/share/vm/oops/method.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/oops/method.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -747,6 +747,7 @@
set_not_c2_compilable();
}
CompilationPolicy::policy()->disable_compilation(this);
+ assert(!CompilationPolicy::can_be_compiled(this, comp_level), "sanity check");
}
bool Method::is_not_osr_compilable(int comp_level) const {
@@ -773,6 +774,7 @@
set_not_c2_osr_compilable();
}
CompilationPolicy::policy()->disable_compilation(this);
+ assert(!CompilationPolicy::can_be_osr_compiled(this, comp_level), "sanity check");
}
// Revert to using the interpreter and clear out the nmethod
--- a/hotspot/src/share/vm/oops/oop.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/oops/oop.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -62,7 +62,7 @@
volatile markOop _mark;
union _metadata {
Klass* _klass;
- narrowOop _compressed_klass;
+ narrowKlass _compressed_klass;
} _metadata;
// Fast access to barrier set. Must be initialized.
@@ -84,7 +84,7 @@
Klass* klass() const;
Klass* klass_or_null() const volatile;
Klass** klass_addr();
- narrowOop* compressed_klass_addr();
+ narrowKlass* compressed_klass_addr();
void set_klass(Klass* k);
@@ -189,13 +189,6 @@
oop compare_value,
bool prebarrier = false);
- // klass encoding for klass pointer in objects.
- static narrowOop encode_klass_not_null(Klass* v);
- static narrowOop encode_klass(Klass* v);
-
- static Klass* decode_klass_not_null(narrowOop v);
- static Klass* decode_klass(narrowOop v);
-
// Access to fields in a instanceOop through these methods.
oop obj_field(int offset) const;
volatile oop obj_field_volatile(int offset) const;
--- a/hotspot/src/share/vm/oops/oop.inline.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -35,7 +35,7 @@
#include "memory/specialized_oop_closures.hpp"
#include "oops/arrayKlass.hpp"
#include "oops/arrayOop.hpp"
-#include "oops/klass.hpp"
+#include "oops/klass.inline.hpp"
#include "oops/markOop.inline.hpp"
#include "oops/oop.hpp"
#include "runtime/atomic.hpp"
@@ -70,7 +70,7 @@
inline Klass* oopDesc::klass() const {
if (UseCompressedKlassPointers) {
- return decode_klass_not_null(_metadata._compressed_klass);
+ return Klass::decode_klass_not_null(_metadata._compressed_klass);
} else {
return _metadata._klass;
}
@@ -79,7 +79,7 @@
inline Klass* oopDesc::klass_or_null() const volatile {
// can be NULL in CMS
if (UseCompressedKlassPointers) {
- return decode_klass(_metadata._compressed_klass);
+ return Klass::decode_klass(_metadata._compressed_klass);
} else {
return _metadata._klass;
}
@@ -87,7 +87,7 @@
inline int oopDesc::klass_gap_offset_in_bytes() {
assert(UseCompressedKlassPointers, "only applicable to compressed klass pointers");
- return oopDesc::klass_offset_in_bytes() + sizeof(narrowOop);
+ return oopDesc::klass_offset_in_bytes() + sizeof(narrowKlass);
}
inline Klass** oopDesc::klass_addr() {
@@ -97,9 +97,9 @@
return (Klass**) &_metadata._klass;
}
-inline narrowOop* oopDesc::compressed_klass_addr() {
+inline narrowKlass* oopDesc::compressed_klass_addr() {
assert(UseCompressedKlassPointers, "only called by compressed klass pointers");
- return (narrowOop*) &_metadata._compressed_klass;
+ return &_metadata._compressed_klass;
}
inline void oopDesc::set_klass(Klass* k) {
@@ -107,7 +107,7 @@
assert(Universe::is_bootstrapping() || k != NULL, "must be a real Klass*");
assert(Universe::is_bootstrapping() || k->is_klass(), "not a Klass*");
if (UseCompressedKlassPointers) {
- *compressed_klass_addr() = encode_klass_not_null(k);
+ *compressed_klass_addr() = Klass::encode_klass_not_null(k);
} else {
*klass_addr() = k;
}
@@ -127,7 +127,7 @@
// This is only to be used during GC, for from-space objects, so no
// barrier is needed.
if (UseCompressedKlassPointers) {
- _metadata._compressed_klass = encode_heap_oop(k); // may be null (parnew overflow handling)
+ _metadata._compressed_klass = (narrowKlass)encode_heap_oop(k); // may be null (parnew overflow handling)
} else {
_metadata._klass = (Klass*)(address)k;
}
@@ -136,7 +136,7 @@
inline oop oopDesc::list_ptr_from_klass() {
// This is only to be used during GC, for from-space objects.
if (UseCompressedKlassPointers) {
- return decode_heap_oop(_metadata._compressed_klass);
+ return decode_heap_oop((narrowOop)_metadata._compressed_klass);
} else {
// Special case for GC
return (oop)(address)_metadata._klass;
@@ -176,7 +176,6 @@
// the right type and inlines the appopriate code).
inline bool oopDesc::is_null(oop obj) { return obj == NULL; }
-inline bool oopDesc::is_null(Klass* obj) { return obj == NULL; }
inline bool oopDesc::is_null(narrowOop obj) { return obj == 0; }
// Algorithm for encoding and decoding oops from 64 bit pointers to 32 bit
@@ -186,9 +185,6 @@
inline bool check_obj_alignment(oop obj) {
return (intptr_t)obj % MinObjAlignmentInBytes == 0;
}
-inline bool check_klass_alignment(Klass* obj) {
- return (intptr_t)obj % KlassAlignmentInBytes == 0;
-}
inline narrowOop oopDesc::encode_heap_oop_not_null(oop v) {
assert(!is_null(v), "oop value can never be zero");
@@ -224,39 +220,6 @@
inline oop oopDesc::decode_heap_oop_not_null(oop v) { return v; }
inline oop oopDesc::decode_heap_oop(oop v) { return v; }
-// Encoding and decoding for klass field. It is copied code, but someday
-// might not be the same as oop.
-
-inline narrowOop oopDesc::encode_klass_not_null(Klass* v) {
- assert(!is_null(v), "klass value can never be zero");
- assert(check_klass_alignment(v), "Address not aligned");
- address base = Universe::narrow_klass_base();
- int shift = Universe::narrow_klass_shift();
- uint64_t pd = (uint64_t)(pointer_delta((void*)v, (void*)base, 1));
- assert(KlassEncodingMetaspaceMax > pd, "change encoding max if new encoding");
- uint64_t result = pd >> shift;
- assert((result & CONST64(0xffffffff00000000)) == 0, "narrow klass pointer overflow");
- assert(decode_klass(result) == v, "reversibility");
- return (narrowOop)result;
-}
-
-inline narrowOop oopDesc::encode_klass(Klass* v) {
- return (is_null(v)) ? (narrowOop)0 : encode_klass_not_null(v);
-}
-
-inline Klass* oopDesc::decode_klass_not_null(narrowOop v) {
- assert(!is_null(v), "narrow oop value can never be zero");
- address base = Universe::narrow_klass_base();
- int shift = Universe::narrow_klass_shift();
- Klass* result = (Klass*)(void*)((uintptr_t)base + ((uintptr_t)v << shift));
- assert(check_klass_alignment(result), err_msg("address not aligned: " PTR_FORMAT, (void*) result));
- return result;
-}
-
-inline Klass* oopDesc::decode_klass(narrowOop v) {
- return is_null(v) ? (Klass*)NULL : decode_klass_not_null(v);
-}
-
// Load an oop out of the Java heap as is without decoding.
// Called by GC to check for null before decoding.
inline oop oopDesc::load_heap_oop(oop* p) { return *p; }
--- a/hotspot/src/share/vm/oops/oopsHierarchy.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/oops/oopsHierarchy.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -33,6 +33,10 @@
// of B, A's representation is a prefix of B's representation.
typedef juint narrowOop; // Offset instead of address for an oop within a java object
+
+// If compressed klass pointers then use narrowKlass.
+typedef juint narrowKlass;
+
typedef void* OopOrNarrowOopStar;
typedef class markOopDesc* markOop;
--- a/hotspot/src/share/vm/opto/block.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/block.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -35,10 +35,6 @@
#include "opto/rootnode.hpp"
#include "utilities/copy.hpp"
-// Optimization - Graph Style
-
-
-//-----------------------------------------------------------------------------
void Block_Array::grow( uint i ) {
assert(i >= Max(), "must be an overflow");
debug_only(_limit = i+1);
@@ -54,7 +50,6 @@
Copy::zero_to_bytes( &_blocks[old], (_size-old)*sizeof(Block*) );
}
-//=============================================================================
void Block_List::remove(uint i) {
assert(i < _cnt, "index out of bounds");
Copy::conjoint_words_to_lower((HeapWord*)&_blocks[i+1], (HeapWord*)&_blocks[i], ((_cnt-i-1)*sizeof(Block*)));
@@ -76,8 +71,6 @@
}
#endif
-//=============================================================================
-
uint Block::code_alignment() {
// Check for Root block
if (_pre_order == 0) return CodeEntryAlignment;
@@ -113,7 +106,6 @@
return unit_sz; // no particular alignment
}
-//-----------------------------------------------------------------------------
// Compute the size of first 'inst_cnt' instructions in this block.
// Return the number of instructions left to compute if the block has
// less then 'inst_cnt' instructions. Stop, and return 0 if sum_size
@@ -138,7 +130,6 @@
return inst_cnt;
}
-//-----------------------------------------------------------------------------
uint Block::find_node( const Node *n ) const {
for( uint i = 0; i < _nodes.size(); i++ ) {
if( _nodes[i] == n )
@@ -153,7 +144,6 @@
_nodes.remove(find_node(n));
}
-//------------------------------is_Empty---------------------------------------
// Return empty status of a block. Empty blocks contain only the head, other
// ideal nodes, and an optional trailing goto.
int Block::is_Empty() const {
@@ -192,7 +182,6 @@
return not_empty;
}
-//------------------------------has_uncommon_code------------------------------
// Return true if the block's code implies that it is likely to be
// executed infrequently. Check to see if the block ends in a Halt or
// a low probability call.
@@ -218,7 +207,6 @@
return op == Op_Halt;
}
-//------------------------------is_uncommon------------------------------------
// True if block is low enough frequency or guarded by a test which
// mostly does not go here.
bool Block::is_uncommon(PhaseCFG* cfg) const {
@@ -271,7 +259,6 @@
return false;
}
-//------------------------------dump-------------------------------------------
#ifndef PRODUCT
void Block::dump_bidx(const Block* orig, outputStream* st) const {
if (_pre_order) st->print("B%d",_pre_order);
@@ -364,13 +351,12 @@
}
#endif
-//=============================================================================
-//------------------------------PhaseCFG---------------------------------------
PhaseCFG::PhaseCFG(Arena* arena, RootNode* root, Matcher& matcher)
: Phase(CFG)
, _block_arena(arena)
+, _root(root)
+, _matcher(matcher)
, _node_to_block_mapping(arena)
-, _root(root)
, _node_latency(NULL)
#ifndef PRODUCT
, _trace_opto_pipelining(TraceOptoPipelining || C->method_has_option("TraceOptoPipelining"))
@@ -390,11 +376,10 @@
_goto->set_req(0,_goto);
// Build the CFG in Reverse Post Order
- _num_blocks = build_cfg();
- _broot = get_block_for_node(_root);
+ _number_of_blocks = build_cfg();
+ _root_block = get_block_for_node(_root);
}
-//------------------------------build_cfg--------------------------------------
// Build a proper looking CFG. Make every block begin with either a StartNode
// or a RegionNode. Make every block end with either a Goto, If or Return.
// The RootNode both starts and ends it's own block. Do this with a recursive
@@ -496,13 +481,12 @@
return sum;
}
-//------------------------------insert_goto_at---------------------------------
// Inserts a goto & corresponding basic block between
// block[block_no] and its succ_no'th successor block
void PhaseCFG::insert_goto_at(uint block_no, uint succ_no) {
// get block with block_no
- assert(block_no < _num_blocks, "illegal block number");
- Block* in = _blocks[block_no];
+ assert(block_no < number_of_blocks(), "illegal block number");
+ Block* in = get_block(block_no);
// get successor block succ_no
assert(succ_no < in->_num_succs, "illegal successor number");
Block* out = in->_succs[succ_no];
@@ -537,11 +521,9 @@
// Set the frequency of the new block
block->_freq = freq;
// add new basic block to basic block list
- _blocks.insert(block_no + 1, block);
- _num_blocks++;
+ add_block_at(block_no + 1, block);
}
-//------------------------------no_flip_branch---------------------------------
// Does this block end in a multiway branch that cannot have the default case
// flipped for another case?
static bool no_flip_branch( Block *b ) {
@@ -560,7 +542,6 @@
return false;
}
-//------------------------------convert_NeverBranch_to_Goto--------------------
// Check for NeverBranch at block end. This needs to become a GOTO to the
// true target. NeverBranch are treated as a conditional branch that always
// goes the same direction for most of the optimizer and are used to give a
@@ -598,7 +579,6 @@
dead->_nodes[k]->del_req(j);
}
-//------------------------------move_to_next-----------------------------------
// Helper function to move block bx to the slot following b_index. Return
// true if the move is successful, otherwise false
bool PhaseCFG::move_to_next(Block* bx, uint b_index) {
@@ -606,20 +586,22 @@
// Return false if bx is already scheduled.
uint bx_index = bx->_pre_order;
- if ((bx_index <= b_index) && (_blocks[bx_index] == bx)) {
+ if ((bx_index <= b_index) && (get_block(bx_index) == bx)) {
return false;
}
// Find the current index of block bx on the block list
bx_index = b_index + 1;
- while( bx_index < _num_blocks && _blocks[bx_index] != bx ) bx_index++;
- assert(_blocks[bx_index] == bx, "block not found");
+ while (bx_index < number_of_blocks() && get_block(bx_index) != bx) {
+ bx_index++;
+ }
+ assert(get_block(bx_index) == bx, "block not found");
// If the previous block conditionally falls into bx, return false,
// because moving bx will create an extra jump.
for(uint k = 1; k < bx->num_preds(); k++ ) {
Block* pred = get_block_for_node(bx->pred(k));
- if (pred == _blocks[bx_index-1]) {
+ if (pred == get_block(bx_index - 1)) {
if (pred->_num_succs != 1) {
return false;
}
@@ -632,7 +614,6 @@
return true;
}
-//------------------------------move_to_end------------------------------------
// Move empty and uncommon blocks to the end.
void PhaseCFG::move_to_end(Block *b, uint i) {
int e = b->is_Empty();
@@ -650,31 +631,31 @@
_blocks.push(b);
}
-//---------------------------set_loop_alignment--------------------------------
// Set loop alignment for every block
void PhaseCFG::set_loop_alignment() {
- uint last = _num_blocks;
- assert( _blocks[0] == _broot, "" );
+ uint last = number_of_blocks();
+ assert(get_block(0) == get_root_block(), "");
- for (uint i = 1; i < last; i++ ) {
- Block *b = _blocks[i];
- if (b->head()->is_Loop()) {
- b->set_loop_alignment(b);
+ for (uint i = 1; i < last; i++) {
+ Block* block = get_block(i);
+ if (block->head()->is_Loop()) {
+ block->set_loop_alignment(block);
}
}
}
-//-----------------------------remove_empty------------------------------------
// Make empty basic blocks to be "connector" blocks, Move uncommon blocks
// to the end.
-void PhaseCFG::remove_empty() {
+void PhaseCFG::remove_empty_blocks() {
// Move uncommon blocks to the end
- uint last = _num_blocks;
- assert( _blocks[0] == _broot, "" );
+ uint last = number_of_blocks();
+ assert(get_block(0) == get_root_block(), "");
for (uint i = 1; i < last; i++) {
- Block *b = _blocks[i];
- if (b->is_connector()) break;
+ Block* block = get_block(i);
+ if (block->is_connector()) {
+ break;
+ }
// Check for NeverBranch at block end. This needs to become a GOTO to the
// true target. NeverBranch are treated as a conditional branch that
@@ -682,124 +663,127 @@
// to give a fake exit path to infinite loops. At this late stage they
// need to turn into Goto's so that when you enter the infinite loop you
// indeed hang.
- if( b->_nodes[b->end_idx()]->Opcode() == Op_NeverBranch )
- convert_NeverBranch_to_Goto(b);
+ if (block->_nodes[block->end_idx()]->Opcode() == Op_NeverBranch) {
+ convert_NeverBranch_to_Goto(block);
+ }
// Look for uncommon blocks and move to end.
if (!C->do_freq_based_layout()) {
- if (b->is_uncommon(this)) {
- move_to_end(b, i);
+ if (block->is_uncommon(this)) {
+ move_to_end(block, i);
last--; // No longer check for being uncommon!
- if( no_flip_branch(b) ) { // Fall-thru case must follow?
- b = _blocks[i]; // Find the fall-thru block
- move_to_end(b, i);
+ if (no_flip_branch(block)) { // Fall-thru case must follow?
+ // Find the fall-thru block
+ block = get_block(i);
+ move_to_end(block, i);
last--;
}
- i--; // backup block counter post-increment
+ // backup block counter post-increment
+ i--;
}
}
}
// Move empty blocks to the end
- last = _num_blocks;
+ last = number_of_blocks();
for (uint i = 1; i < last; i++) {
- Block *b = _blocks[i];
- if (b->is_Empty() != Block::not_empty) {
- move_to_end(b, i);
+ Block* block = get_block(i);
+ if (block->is_Empty() != Block::not_empty) {
+ move_to_end(block, i);
last--;
i--;
}
} // End of for all blocks
}
-//-----------------------------fixup_flow--------------------------------------
// Fix up the final control flow for basic blocks.
void PhaseCFG::fixup_flow() {
// Fixup final control flow for the blocks. Remove jump-to-next
// block. If neither arm of a IF follows the conditional branch, we
// have to add a second jump after the conditional. We place the
// TRUE branch target in succs[0] for both GOTOs and IFs.
- for (uint i=0; i < _num_blocks; i++) {
- Block *b = _blocks[i];
- b->_pre_order = i; // turn pre-order into block-index
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* block = get_block(i);
+ block->_pre_order = i; // turn pre-order into block-index
// Connector blocks need no further processing.
- if (b->is_connector()) {
- assert((i+1) == _num_blocks || _blocks[i+1]->is_connector(),
- "All connector blocks should sink to the end");
+ if (block->is_connector()) {
+ assert((i+1) == number_of_blocks() || get_block(i + 1)->is_connector(), "All connector blocks should sink to the end");
continue;
}
- assert(b->is_Empty() != Block::completely_empty,
- "Empty blocks should be connectors");
+ assert(block->is_Empty() != Block::completely_empty, "Empty blocks should be connectors");
- Block *bnext = (i < _num_blocks-1) ? _blocks[i+1] : NULL;
- Block *bs0 = b->non_connector_successor(0);
+ Block* bnext = (i < number_of_blocks() - 1) ? get_block(i + 1) : NULL;
+ Block* bs0 = block->non_connector_successor(0);
// Check for multi-way branches where I cannot negate the test to
// exchange the true and false targets.
- if( no_flip_branch( b ) ) {
+ if (no_flip_branch(block)) {
// Find fall through case - if must fall into its target
- int branch_idx = b->_nodes.size() - b->_num_succs;
- for (uint j2 = 0; j2 < b->_num_succs; j2++) {
- const ProjNode* p = b->_nodes[branch_idx + j2]->as_Proj();
+ int branch_idx = block->_nodes.size() - block->_num_succs;
+ for (uint j2 = 0; j2 < block->_num_succs; j2++) {
+ const ProjNode* p = block->_nodes[branch_idx + j2]->as_Proj();
if (p->_con == 0) {
// successor j2 is fall through case
- if (b->non_connector_successor(j2) != bnext) {
+ if (block->non_connector_successor(j2) != bnext) {
// but it is not the next block => insert a goto
insert_goto_at(i, j2);
}
// Put taken branch in slot 0
- if( j2 == 0 && b->_num_succs == 2) {
+ if (j2 == 0 && block->_num_succs == 2) {
// Flip targets in succs map
- Block *tbs0 = b->_succs[0];
- Block *tbs1 = b->_succs[1];
- b->_succs.map( 0, tbs1 );
- b->_succs.map( 1, tbs0 );
+ Block *tbs0 = block->_succs[0];
+ Block *tbs1 = block->_succs[1];
+ block->_succs.map(0, tbs1);
+ block->_succs.map(1, tbs0);
}
break;
}
}
+
// Remove all CatchProjs
- for (uint j1 = 0; j1 < b->_num_succs; j1++) b->_nodes.pop();
+ for (uint j = 0; j < block->_num_succs; j++) {
+ block->_nodes.pop();
+ }
- } else if (b->_num_succs == 1) {
+ } else if (block->_num_succs == 1) {
// Block ends in a Goto?
if (bnext == bs0) {
// We fall into next block; remove the Goto
- b->_nodes.pop();
+ block->_nodes.pop();
}
- } else if( b->_num_succs == 2 ) { // Block ends in a If?
+ } else if(block->_num_succs == 2) { // Block ends in a If?
// Get opcode of 1st projection (matches _succs[0])
// Note: Since this basic block has 2 exits, the last 2 nodes must
// be projections (in any order), the 3rd last node must be
// the IfNode (we have excluded other 2-way exits such as
// CatchNodes already).
- MachNode *iff = b->_nodes[b->_nodes.size()-3]->as_Mach();
- ProjNode *proj0 = b->_nodes[b->_nodes.size()-2]->as_Proj();
- ProjNode *proj1 = b->_nodes[b->_nodes.size()-1]->as_Proj();
+ MachNode* iff = block->_nodes[block->_nodes.size() - 3]->as_Mach();
+ ProjNode* proj0 = block->_nodes[block->_nodes.size() - 2]->as_Proj();
+ ProjNode* proj1 = block->_nodes[block->_nodes.size() - 1]->as_Proj();
// Assert that proj0 and succs[0] match up. Similarly for proj1 and succs[1].
- assert(proj0->raw_out(0) == b->_succs[0]->head(), "Mismatch successor 0");
- assert(proj1->raw_out(0) == b->_succs[1]->head(), "Mismatch successor 1");
+ assert(proj0->raw_out(0) == block->_succs[0]->head(), "Mismatch successor 0");
+ assert(proj1->raw_out(0) == block->_succs[1]->head(), "Mismatch successor 1");
- Block *bs1 = b->non_connector_successor(1);
+ Block* bs1 = block->non_connector_successor(1);
// Check for neither successor block following the current
// block ending in a conditional. If so, move one of the
// successors after the current one, provided that the
// successor was previously unscheduled, but moveable
// (i.e., all paths to it involve a branch).
- if( !C->do_freq_based_layout() && bnext != bs0 && bnext != bs1 ) {
+ if (!C->do_freq_based_layout() && bnext != bs0 && bnext != bs1) {
// Choose the more common successor based on the probability
// of the conditional branch.
- Block *bx = bs0;
- Block *by = bs1;
+ Block* bx = bs0;
+ Block* by = bs1;
// _prob is the probability of taking the true path. Make
// p the probability of taking successor #1.
float p = iff->as_MachIf()->_prob;
- if( proj0->Opcode() == Op_IfTrue ) {
+ if (proj0->Opcode() == Op_IfTrue) {
p = 1.0 - p;
}
@@ -826,14 +810,16 @@
// succs[1].
if (bnext == bs0) {
// Fall-thru case in succs[0], so flip targets in succs map
- Block *tbs0 = b->_succs[0];
- Block *tbs1 = b->_succs[1];
- b->_succs.map( 0, tbs1 );
- b->_succs.map( 1, tbs0 );
+ Block* tbs0 = block->_succs[0];
+ Block* tbs1 = block->_succs[1];
+ block->_succs.map(0, tbs1);
+ block->_succs.map(1, tbs0);
// Flip projection for each target
- { ProjNode *tmp = proj0; proj0 = proj1; proj1 = tmp; }
+ ProjNode* tmp = proj0;
+ proj0 = proj1;
+ proj1 = tmp;
- } else if( bnext != bs1 ) {
+ } else if(bnext != bs1) {
// Need a double-branch
// The existing conditional branch need not change.
// Add a unconditional branch to the false target.
@@ -843,12 +829,12 @@
}
// Make sure we TRUE branch to the target
- if( proj0->Opcode() == Op_IfFalse ) {
+ if (proj0->Opcode() == Op_IfFalse) {
iff->as_MachIf()->negate();
}
- b->_nodes.pop(); // Remove IfFalse & IfTrue projections
- b->_nodes.pop();
+ block->_nodes.pop(); // Remove IfFalse & IfTrue projections
+ block->_nodes.pop();
} else {
// Multi-exit block, e.g. a switch statement
@@ -858,7 +844,6 @@
}
-//------------------------------dump-------------------------------------------
#ifndef PRODUCT
void PhaseCFG::_dump_cfg( const Node *end, VectorSet &visited ) const {
const Node *x = end->is_block_proj();
@@ -884,10 +869,11 @@
}
void PhaseCFG::dump( ) const {
- tty->print("\n--- CFG --- %d BBs\n",_num_blocks);
+ tty->print("\n--- CFG --- %d BBs\n", number_of_blocks());
if (_blocks.size()) { // Did we do basic-block layout?
- for (uint i = 0; i < _num_blocks; i++) {
- _blocks[i]->dump(this);
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ const Block* block = get_block(i);
+ block->dump(this);
}
} else { // Else do it with a DFS
VectorSet visited(_block_arena);
@@ -896,27 +882,26 @@
}
void PhaseCFG::dump_headers() {
- for( uint i = 0; i < _num_blocks; i++ ) {
- if (_blocks[i]) {
- _blocks[i]->dump_head(this);
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* block = get_block(i);
+ if (block != NULL) {
+ block->dump_head(this);
}
}
}
-void PhaseCFG::verify( ) const {
+void PhaseCFG::verify() const {
#ifdef ASSERT
// Verify sane CFG
- for (uint i = 0; i < _num_blocks; i++) {
- Block *b = _blocks[i];
- uint cnt = b->_nodes.size();
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* block = get_block(i);
+ uint cnt = block->_nodes.size();
uint j;
for (j = 0; j < cnt; j++) {
- Node *n = b->_nodes[j];
- assert(get_block_for_node(n) == b, "");
- if (j >= 1 && n->is_Mach() &&
- n->as_Mach()->ideal_Opcode() == Op_CreateEx) {
- assert(j == 1 || b->_nodes[j-1]->is_Phi(),
- "CreateEx must be first instruction in block");
+ Node *n = block->_nodes[j];
+ assert(get_block_for_node(n) == block, "");
+ if (j >= 1 && n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_CreateEx) {
+ assert(j == 1 || block->_nodes[j-1]->is_Phi(), "CreateEx must be first instruction in block");
}
for (uint k = 0; k < n->req(); k++) {
Node *def = n->in(k);
@@ -926,8 +911,7 @@
// Uses must follow their definition if they are at the same block.
// Mostly done to check that MachSpillCopy nodes are placed correctly
// when CreateEx node is moved in build_ifg_physical().
- if (get_block_for_node(def) == b &&
- !(b->head()->is_Loop() && n->is_Phi()) &&
+ if (get_block_for_node(def) == block && !(block->head()->is_Loop() && n->is_Phi()) &&
// See (+++) comment in reg_split.cpp
!(n->jvms() != NULL && n->jvms()->is_monitor_use(k))) {
bool is_loop = false;
@@ -939,29 +923,29 @@
}
}
}
- assert(is_loop || b->find_node(def) < j, "uses must follow definitions");
+ assert(is_loop || block->find_node(def) < j, "uses must follow definitions");
}
}
}
}
- j = b->end_idx();
- Node *bp = (Node*)b->_nodes[b->_nodes.size()-1]->is_block_proj();
- assert( bp, "last instruction must be a block proj" );
- assert( bp == b->_nodes[j], "wrong number of successors for this block" );
+ j = block->end_idx();
+ Node* bp = (Node*)block->_nodes[block->_nodes.size() - 1]->is_block_proj();
+ assert(bp, "last instruction must be a block proj");
+ assert(bp == block->_nodes[j], "wrong number of successors for this block");
if (bp->is_Catch()) {
- while (b->_nodes[--j]->is_MachProj()) ;
- assert(b->_nodes[j]->is_MachCall(), "CatchProj must follow call");
+ while (block->_nodes[--j]->is_MachProj()) {
+ ;
+ }
+ assert(block->_nodes[j]->is_MachCall(), "CatchProj must follow call");
} else if (bp->is_Mach() && bp->as_Mach()->ideal_Opcode() == Op_If) {
- assert(b->_num_succs == 2, "Conditional branch must have two targets");
+ assert(block->_num_succs == 2, "Conditional branch must have two targets");
}
}
#endif
}
#endif
-//=============================================================================
-//------------------------------UnionFind--------------------------------------
UnionFind::UnionFind( uint max ) : _cnt(max), _max(max), _indices(NEW_RESOURCE_ARRAY(uint,max)) {
Copy::zero_to_bytes( _indices, sizeof(uint)*max );
}
@@ -986,7 +970,6 @@
for( uint i=0; i<max; i++ ) map(i,i);
}
-//------------------------------Find_compress----------------------------------
// Straight out of Tarjan's union-find algorithm
uint UnionFind::Find_compress( uint idx ) {
uint cur = idx;
@@ -1006,7 +989,6 @@
return idx;
}
-//------------------------------Find_const-------------------------------------
// Like Find above, but no path compress, so bad asymptotic behavior
uint UnionFind::Find_const( uint idx ) const {
if( idx == 0 ) return idx; // Ignore the zero idx
@@ -1021,7 +1003,6 @@
return next;
}
-//------------------------------Union------------------------------------------
// union 2 sets together.
void UnionFind::Union( uint idx1, uint idx2 ) {
uint src = Find(idx1);
@@ -1070,9 +1051,6 @@
}
#endif
-//=============================================================================
-
-//------------------------------edge_order-------------------------------------
// Comparison function for edges
static int edge_order(CFGEdge **e0, CFGEdge **e1) {
float freq0 = (*e0)->freq();
@@ -1087,7 +1065,6 @@
return dist1 - dist0;
}
-//------------------------------trace_frequency_order--------------------------
// Comparison function for edges
extern "C" int trace_frequency_order(const void *p0, const void *p1) {
Trace *tr0 = *(Trace **) p0;
@@ -1113,17 +1090,15 @@
return diff;
}
-//------------------------------find_edges-------------------------------------
// Find edges of interest, i.e, those which can fall through. Presumes that
// edges which don't fall through are of low frequency and can be generally
// ignored. Initialize the list of traces.
-void PhaseBlockLayout::find_edges()
-{
+void PhaseBlockLayout::find_edges() {
// Walk the blocks, creating edges and Traces
uint i;
Trace *tr = NULL;
- for (i = 0; i < _cfg._num_blocks; i++) {
- Block *b = _cfg._blocks[i];
+ for (i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* b = _cfg.get_block(i);
tr = new Trace(b, next, prev);
traces[tr->id()] = tr;
@@ -1147,7 +1122,7 @@
if (n->num_preds() != 1) break;
i++;
- assert(n = _cfg._blocks[i], "expecting next block");
+ assert(n = _cfg.get_block(i), "expecting next block");
tr->append(n);
uf->map(n->_pre_order, tr->id());
traces[n->_pre_order] = NULL;
@@ -1171,8 +1146,8 @@
}
// Group connector blocks into one trace
- for (i++; i < _cfg._num_blocks; i++) {
- Block *b = _cfg._blocks[i];
+ for (i++; i < _cfg.number_of_blocks(); i++) {
+ Block *b = _cfg.get_block(i);
assert(b->is_connector(), "connector blocks at the end");
tr->append(b);
uf->map(b->_pre_order, tr->id());
@@ -1180,10 +1155,8 @@
}
}
-//------------------------------union_traces----------------------------------
// Union two traces together in uf, and null out the trace in the list
-void PhaseBlockLayout::union_traces(Trace* updated_trace, Trace* old_trace)
-{
+void PhaseBlockLayout::union_traces(Trace* updated_trace, Trace* old_trace) {
uint old_id = old_trace->id();
uint updated_id = updated_trace->id();
@@ -1207,10 +1180,8 @@
traces[hi_id] = NULL;
}
-//------------------------------grow_traces-------------------------------------
// Append traces together via the most frequently executed edges
-void PhaseBlockLayout::grow_traces()
-{
+void PhaseBlockLayout::grow_traces() {
// Order the edges, and drive the growth of Traces via the most
// frequently executed edges.
edges->sort(edge_order);
@@ -1252,11 +1223,9 @@
}
}
-//------------------------------merge_traces-----------------------------------
// Embed one trace into another, if the fork or join points are sufficiently
// balanced.
-void PhaseBlockLayout::merge_traces(bool fall_thru_only)
-{
+void PhaseBlockLayout::merge_traces(bool fall_thru_only) {
// Walk the edge list a another time, looking at unprocessed edges.
// Fold in diamonds
for (int i = 0; i < edges->length(); i++) {
@@ -1310,7 +1279,7 @@
src_trace->insert_after(src_block, targ_trace);
union_traces(src_trace, targ_trace);
} else if (src_at_tail) {
- if (src_trace != trace(_cfg._broot)) {
+ if (src_trace != trace(_cfg.get_root_block())) {
e->set_state(CFGEdge::connected);
targ_trace->insert_before(targ_block, src_trace);
union_traces(targ_trace, src_trace);
@@ -1319,7 +1288,7 @@
} else if (e->state() == CFGEdge::open) {
// Append traces, even without a fall-thru connection.
// But leave root entry at the beginning of the block list.
- if (targ_trace != trace(_cfg._broot)) {
+ if (targ_trace != trace(_cfg.get_root_block())) {
e->set_state(CFGEdge::connected);
src_trace->append(targ_trace);
union_traces(src_trace, targ_trace);
@@ -1328,11 +1297,9 @@
}
}
-//----------------------------reorder_traces-----------------------------------
// Order the sequence of the traces in some desirable way, and fixup the
// jumps at the end of each block.
-void PhaseBlockLayout::reorder_traces(int count)
-{
+void PhaseBlockLayout::reorder_traces(int count) {
ResourceArea *area = Thread::current()->resource_area();
Trace ** new_traces = NEW_ARENA_ARRAY(area, Trace *, count);
Block_List worklist;
@@ -1347,15 +1314,14 @@
}
// The entry block should be first on the new trace list.
- Trace *tr = trace(_cfg._broot);
+ Trace *tr = trace(_cfg.get_root_block());
assert(tr == new_traces[0], "entry trace misplaced");
// Sort the new trace list by frequency
qsort(new_traces + 1, new_count - 1, sizeof(new_traces[0]), trace_frequency_order);
// Patch up the successor blocks
- _cfg._blocks.reset();
- _cfg._num_blocks = 0;
+ _cfg.clear_blocks();
for (int i = 0; i < new_count; i++) {
Trace *tr = new_traces[i];
if (tr != NULL) {
@@ -1364,17 +1330,15 @@
}
}
-//------------------------------PhaseBlockLayout-------------------------------
// Order basic blocks based on frequency
-PhaseBlockLayout::PhaseBlockLayout(PhaseCFG &cfg) :
- Phase(BlockLayout),
- _cfg(cfg)
-{
+PhaseBlockLayout::PhaseBlockLayout(PhaseCFG &cfg)
+: Phase(BlockLayout)
+, _cfg(cfg) {
ResourceMark rm;
ResourceArea *area = Thread::current()->resource_area();
// List of traces
- int size = _cfg._num_blocks + 1;
+ int size = _cfg.number_of_blocks() + 1;
traces = NEW_ARENA_ARRAY(area, Trace *, size);
memset(traces, 0, size*sizeof(Trace*));
next = NEW_ARENA_ARRAY(area, Block *, size);
@@ -1407,11 +1371,10 @@
// Re-order all the remaining traces by frequency
reorder_traces(size);
- assert(_cfg._num_blocks >= (uint) (size - 1), "number of blocks can not shrink");
+ assert(_cfg.number_of_blocks() >= (uint) (size - 1), "number of blocks can not shrink");
}
-//------------------------------backedge---------------------------------------
// Edge e completes a loop in a trace. If the target block is head of the
// loop, rotate the loop block so that the loop ends in a conditional branch.
bool Trace::backedge(CFGEdge *e) {
@@ -1463,14 +1426,12 @@
return loop_rotated;
}
-//------------------------------fixup_blocks-----------------------------------
// push blocks onto the CFG list
// ensure that blocks have the correct two-way branch sense
void Trace::fixup_blocks(PhaseCFG &cfg) {
Block *last = last_block();
for (Block *b = first_block(); b != NULL; b = next(b)) {
- cfg._blocks.push(b);
- cfg._num_blocks++;
+ cfg.add_block(b);
if (!b->is_connector()) {
int nfallthru = b->num_fall_throughs();
if (b != last) {
--- a/hotspot/src/share/vm/opto/block.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/block.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -348,20 +348,77 @@
class PhaseCFG : public Phase {
friend class VMStructs;
private:
+
+ // Root of whole program
+ RootNode* _root;
+
+ // The block containing the root node
+ Block* _root_block;
+
+ // List of basic blocks that are created during CFG creation
+ Block_List _blocks;
+
+ // Count of basic blocks
+ uint _number_of_blocks;
+
// Arena for the blocks to be stored in
Arena* _block_arena;
+ // The matcher for this compilation
+ Matcher& _matcher;
+
// Map nodes to owning basic block
Block_Array _node_to_block_mapping;
+ // Loop from the root
+ CFGLoop* _root_loop;
+
+ // Outmost loop frequency
+ float _outer_loop_frequency;
+
+ // Per node latency estimation, valid only during GCM
+ GrowableArray<uint>* _node_latency;
+
// Build a proper looking cfg. Return count of basic blocks
uint build_cfg();
- // Perform DFS search.
+ // Build the dominator tree so that we know where we can move instructions
+ void build_dominator_tree();
+
+ // Estimate block frequencies based on IfNode probabilities, so that we know where we want to move instructions
+ void estimate_block_frequency();
+
+ // Global Code Motion. See Click's PLDI95 paper. Place Nodes in specific
+ // basic blocks; i.e. _node_to_block_mapping now maps _idx for all Nodes to some Block.
+ // Move nodes to ensure correctness from GVN and also try to move nodes out of loops.
+ void global_code_motion();
+
+ // Schedule Nodes early in their basic blocks.
+ bool schedule_early(VectorSet &visited, Node_List &roots);
+
+ // For each node, find the latest block it can be scheduled into
+ // and then select the cheapest block between the latest and earliest
+ // block to place the node.
+ void schedule_late(VectorSet &visited, Node_List &stack);
+
+ // Compute the (backwards) latency of a node from a single use
+ int latency_from_use(Node *n, const Node *def, Node *use);
+
+ // Compute the (backwards) latency of a node from the uses of this instruction
+ void partial_latency_of_defs(Node *n);
+
+ // Compute the instruction global latency with a backwards walk
+ void compute_latencies_backwards(VectorSet &visited, Node_List &stack);
+
+ // Pick a block between early and late that is a cheaper alternative
+ // to late. Helper for schedule_late.
+ Block* hoist_to_cheaper_block(Block* LCA, Block* early, Node* self);
+
+ // Perform a Depth First Search (DFS).
// Setup 'vertex' as DFS to vertex mapping.
// Setup 'semi' as vertex to DFS mapping.
// Set 'parent' to DFS parent.
- uint DFS( Tarjan *tarjan );
+ uint do_DFS(Tarjan* tarjan, uint rpo_counter);
// Helper function to insert a node into a block
void schedule_node_into_block( Node *n, Block *b );
@@ -372,7 +429,8 @@
void schedule_pinned_nodes( VectorSet &visited );
// I'll need a few machine-specific GotoNodes. Clone from this one.
- MachNode *_goto;
+ // Used when building the CFG and creating end nodes for blocks.
+ MachNode* _goto;
Block* insert_anti_dependences(Block* LCA, Node* load, bool verify = false);
void verify_anti_dependences(Block* LCA, Node* load) {
@@ -380,17 +438,77 @@
insert_anti_dependences(LCA, load, true);
}
+ bool move_to_next(Block* bx, uint b_index);
+ void move_to_end(Block* bx, uint b_index);
+
+ void insert_goto_at(uint block_no, uint succ_no);
+
+ // Check for NeverBranch at block end. This needs to become a GOTO to the
+ // true target. NeverBranch are treated as a conditional branch that always
+ // goes the same direction for most of the optimizer and are used to give a
+ // fake exit path to infinite loops. At this late stage they need to turn
+ // into Goto's so that when you enter the infinite loop you indeed hang.
+ void convert_NeverBranch_to_Goto(Block *b);
+
+ CFGLoop* create_loop_tree();
+
+ #ifndef PRODUCT
+ bool _trace_opto_pipelining; // tracing flag
+ #endif
+
public:
PhaseCFG(Arena* arena, RootNode* root, Matcher& matcher);
- uint _num_blocks; // Count of basic blocks
- Block_List _blocks; // List of basic blocks
- RootNode *_root; // Root of whole program
- Block *_broot; // Basic block of root
- uint _rpo_ctr;
- CFGLoop* _root_loop;
- float _outer_loop_freq; // Outmost loop frequency
+ void set_latency_for_node(Node* node, int latency) {
+ _node_latency->at_put_grow(node->_idx, latency);
+ }
+
+ uint get_latency_for_node(Node* node) {
+ return _node_latency->at_grow(node->_idx);
+ }
+
+ // Get the outer most frequency
+ float get_outer_loop_frequency() const {
+ return _outer_loop_frequency;
+ }
+
+ // Get the root node of the CFG
+ RootNode* get_root_node() const {
+ return _root;
+ }
+
+ // Get the block of the root node
+ Block* get_root_block() const {
+ return _root_block;
+ }
+ // Add a block at a position and moves the later ones one step
+ void add_block_at(uint pos, Block* block) {
+ _blocks.insert(pos, block);
+ _number_of_blocks++;
+ }
+
+ // Adds a block to the top of the block list
+ void add_block(Block* block) {
+ _blocks.push(block);
+ _number_of_blocks++;
+ }
+
+ // Clear the list of blocks
+ void clear_blocks() {
+ _blocks.reset();
+ _number_of_blocks = 0;
+ }
+
+ // Get the block at position pos in _blocks
+ Block* get_block(uint pos) const {
+ return _blocks[pos];
+ }
+
+ // Number of blocks
+ uint number_of_blocks() const {
+ return _number_of_blocks;
+ }
// set which block this node should reside in
void map_node_to_block(const Node* node, Block* block) {
@@ -412,72 +530,26 @@
return (_node_to_block_mapping.lookup(node->_idx) != NULL);
}
- // Per node latency estimation, valid only during GCM
- GrowableArray<uint> *_node_latency;
-
-#ifndef PRODUCT
- bool _trace_opto_pipelining; // tracing flag
-#endif
-
#ifdef ASSERT
Unique_Node_List _raw_oops;
#endif
- // Build dominators
- void Dominators();
-
- // Estimate block frequencies based on IfNode probabilities
- void Estimate_Block_Frequency();
-
- // Global Code Motion. See Click's PLDI95 paper. Place Nodes in specific
- // basic blocks; i.e. _node_to_block_mapping now maps _idx for all Nodes to some Block.
- void GlobalCodeMotion( Matcher &m, uint unique, Node_List &proj_list );
+ // Do global code motion by first building dominator tree and estimate block frequency
+ // Returns true on success
+ bool do_global_code_motion();
// Compute the (backwards) latency of a node from the uses
void latency_from_uses(Node *n);
- // Compute the (backwards) latency of a node from a single use
- int latency_from_use(Node *n, const Node *def, Node *use);
-
- // Compute the (backwards) latency of a node from the uses of this instruction
- void partial_latency_of_defs(Node *n);
-
- // Schedule Nodes early in their basic blocks.
- bool schedule_early(VectorSet &visited, Node_List &roots);
-
- // For each node, find the latest block it can be scheduled into
- // and then select the cheapest block between the latest and earliest
- // block to place the node.
- void schedule_late(VectorSet &visited, Node_List &stack);
-
- // Pick a block between early and late that is a cheaper alternative
- // to late. Helper for schedule_late.
- Block* hoist_to_cheaper_block(Block* LCA, Block* early, Node* self);
-
- // Compute the instruction global latency with a backwards walk
- void ComputeLatenciesBackwards(VectorSet &visited, Node_List &stack);
-
// Set loop alignment
void set_loop_alignment();
// Remove empty basic blocks
- void remove_empty();
+ void remove_empty_blocks();
void fixup_flow();
- bool move_to_next(Block* bx, uint b_index);
- void move_to_end(Block* bx, uint b_index);
- void insert_goto_at(uint block_no, uint succ_no);
- // Check for NeverBranch at block end. This needs to become a GOTO to the
- // true target. NeverBranch are treated as a conditional branch that always
- // goes the same direction for most of the optimizer and are used to give a
- // fake exit path to infinite loops. At this late stage they need to turn
- // into Goto's so that when you enter the infinite loop you indeed hang.
- void convert_NeverBranch_to_Goto(Block *b);
-
- CFGLoop* create_loop_tree();
-
- // Insert a node into a block, and update the _bbs
- void insert( Block *b, uint idx, Node *n ) {
+ // Insert a node into a block at index and map the node to the block
+ void insert(Block *b, uint idx, Node *n) {
b->_nodes.insert( idx, n );
map_node_to_block(n, b);
}
--- a/hotspot/src/share/vm/opto/buildOopMap.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/buildOopMap.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -87,7 +87,6 @@
// OptoReg::Bad for not-callee-saved.
-//------------------------------OopFlow----------------------------------------
// Structure to pass around
struct OopFlow : public ResourceObj {
short *_callees; // Array mapping register to callee-saved
@@ -119,7 +118,6 @@
OopMap *build_oop_map( Node *n, int max_reg, PhaseRegAlloc *regalloc, int* live );
};
-//------------------------------compute_reach----------------------------------
// Given reaching-defs for this block start, compute it for this block end
void OopFlow::compute_reach( PhaseRegAlloc *regalloc, int max_reg, Dict *safehash ) {
@@ -177,7 +175,6 @@
}
}
-//------------------------------merge------------------------------------------
// Merge the given flow into the 'this' flow
void OopFlow::merge( OopFlow *flow, int max_reg ) {
assert( _b == NULL, "merging into a happy flow" );
@@ -197,14 +194,12 @@
}
-//------------------------------clone------------------------------------------
void OopFlow::clone( OopFlow *flow, int max_size ) {
_b = flow->_b;
memcpy( _callees, flow->_callees, sizeof(short)*max_size);
memcpy( _defs , flow->_defs , sizeof(Node*)*max_size);
}
-//------------------------------make-------------------------------------------
OopFlow *OopFlow::make( Arena *A, int max_size, Compile* C ) {
short *callees = NEW_ARENA_ARRAY(A,short,max_size+1);
Node **defs = NEW_ARENA_ARRAY(A,Node*,max_size+1);
@@ -215,7 +210,6 @@
return flow;
}
-//------------------------------bit twiddlers----------------------------------
static int get_live_bit( int *live, int reg ) {
return live[reg>>LogBitsPerInt] & (1<<(reg&(BitsPerInt-1))); }
static void set_live_bit( int *live, int reg ) {
@@ -223,7 +217,6 @@
static void clr_live_bit( int *live, int reg ) {
live[reg>>LogBitsPerInt] &= ~(1<<(reg&(BitsPerInt-1))); }
-//------------------------------build_oop_map----------------------------------
// Build an oopmap from the current flow info
OopMap *OopFlow::build_oop_map( Node *n, int max_reg, PhaseRegAlloc *regalloc, int* live ) {
int framesize = regalloc->_framesize;
@@ -412,19 +405,18 @@
return omap;
}
-//------------------------------do_liveness------------------------------------
// Compute backwards liveness on registers
-static void do_liveness( PhaseRegAlloc *regalloc, PhaseCFG *cfg, Block_List *worklist, int max_reg_ints, Arena *A, Dict *safehash ) {
- int *live = NEW_ARENA_ARRAY(A, int, (cfg->_num_blocks+1) * max_reg_ints);
- int *tmp_live = &live[cfg->_num_blocks * max_reg_ints];
- Node *root = cfg->C->root();
+static void do_liveness(PhaseRegAlloc* regalloc, PhaseCFG* cfg, Block_List* worklist, int max_reg_ints, Arena* A, Dict* safehash) {
+ int* live = NEW_ARENA_ARRAY(A, int, (cfg->number_of_blocks() + 1) * max_reg_ints);
+ int* tmp_live = &live[cfg->number_of_blocks() * max_reg_ints];
+ Node* root = cfg->get_root_node();
// On CISC platforms, get the node representing the stack pointer that regalloc
// used for spills
Node *fp = NodeSentinel;
if (UseCISCSpill && root->req() > 1) {
fp = root->in(1)->in(TypeFunc::FramePtr);
}
- memset( live, 0, cfg->_num_blocks * (max_reg_ints<<LogBytesPerInt) );
+ memset(live, 0, cfg->number_of_blocks() * (max_reg_ints << LogBytesPerInt));
// Push preds onto worklist
for (uint i = 1; i < root->req(); i++) {
Block* block = cfg->get_block_for_node(root->in(i));
@@ -549,29 +541,32 @@
// Scan for any missing safepoints. Happens to infinite loops
// ala ZKM.jar
uint i;
- for( i=1; i<cfg->_num_blocks; i++ ) {
- Block *b = cfg->_blocks[i];
+ for (i = 1; i < cfg->number_of_blocks(); i++) {
+ Block* block = cfg->get_block(i);
uint j;
- for( j=1; j<b->_nodes.size(); j++ )
- if( b->_nodes[j]->jvms() &&
- (*safehash)[b->_nodes[j]] == NULL )
+ for (j = 1; j < block->_nodes.size(); j++) {
+ if (block->_nodes[j]->jvms() && (*safehash)[block->_nodes[j]] == NULL) {
break;
- if( j<b->_nodes.size() ) break;
+ }
+ }
+ if (j < block->_nodes.size()) {
+ break;
+ }
}
- if( i == cfg->_num_blocks )
+ if (i == cfg->number_of_blocks()) {
break; // Got 'em all
+ }
#ifndef PRODUCT
if( PrintOpto && Verbose )
tty->print_cr("retripping live calc");
#endif
// Force the issue (expensively): recheck everybody
- for( i=1; i<cfg->_num_blocks; i++ )
- worklist->push(cfg->_blocks[i]);
+ for (i = 1; i < cfg->number_of_blocks(); i++) {
+ worklist->push(cfg->get_block(i));
+ }
}
-
}
-//------------------------------BuildOopMaps-----------------------------------
// Collect GC mask info - where are all the OOPs?
void Compile::BuildOopMaps() {
NOT_PRODUCT( TracePhase t3("bldOopMaps", &_t_buildOopMaps, TimeCompiler); )
@@ -592,12 +587,12 @@
OopFlow *free_list = NULL; // Free, unused
// Array mapping blocks to completed oopflows
- OopFlow **flows = NEW_ARENA_ARRAY(A, OopFlow*, _cfg->_num_blocks);
- memset( flows, 0, _cfg->_num_blocks*sizeof(OopFlow*) );
+ OopFlow **flows = NEW_ARENA_ARRAY(A, OopFlow*, _cfg->number_of_blocks());
+ memset( flows, 0, _cfg->number_of_blocks() * sizeof(OopFlow*) );
// Do the first block 'by hand' to prime the worklist
- Block *entry = _cfg->_blocks[1];
+ Block *entry = _cfg->get_block(1);
OopFlow *rootflow = OopFlow::make(A,max_reg,this);
// Initialize to 'bottom' (not 'top')
memset( rootflow->_callees, OptoReg::Bad, max_reg*sizeof(short) );
@@ -623,7 +618,9 @@
Block *b = worklist.pop();
// Ignore root block
- if( b == _cfg->_broot ) continue;
+ if (b == _cfg->get_root_block()) {
+ continue;
+ }
// Block is already done? Happens if block has several predecessors,
// he can get on the worklist more than once.
if( flows[b->_pre_order] ) continue;
--- a/hotspot/src/share/vm/opto/chaitin.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/chaitin.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -40,10 +40,8 @@
#include "opto/opcodes.hpp"
#include "opto/rootnode.hpp"
-//=============================================================================
-
#ifndef PRODUCT
-void LRG::dump( ) const {
+void LRG::dump() const {
ttyLocker ttyl;
tty->print("%d ",num_regs());
_mask.dump();
@@ -94,7 +92,6 @@
}
#endif
-//------------------------------score------------------------------------------
// Compute score from cost and area. Low score is best to spill.
static double raw_score( double cost, double area ) {
return cost - (area*RegisterCostAreaRatio) * 1.52588e-5;
@@ -125,7 +122,6 @@
return score;
}
-//------------------------------LRG_List---------------------------------------
LRG_List::LRG_List( uint max ) : _cnt(max), _max(max), _lidxs(NEW_RESOURCE_ARRAY(uint,max)) {
memset( _lidxs, 0, sizeof(uint)*max );
}
@@ -211,7 +207,6 @@
return next;
}
-//------------------------------Chaitin----------------------------------------
PhaseChaitin::PhaseChaitin(uint unique, PhaseCFG &cfg, Matcher &matcher)
: PhaseRegAlloc(unique, cfg, matcher,
#ifndef PRODUCT
@@ -232,31 +227,31 @@
{
NOT_PRODUCT( Compile::TracePhase t3("ctorChaitin", &_t_ctorChaitin, TimeCompiler); )
- _high_frequency_lrg = MIN2(float(OPTO_LRG_HIGH_FREQ), _cfg._outer_loop_freq);
+ _high_frequency_lrg = MIN2(float(OPTO_LRG_HIGH_FREQ), _cfg.get_outer_loop_frequency());
// Build a list of basic blocks, sorted by frequency
- _blks = NEW_RESOURCE_ARRAY( Block *, _cfg._num_blocks );
+ _blks = NEW_RESOURCE_ARRAY(Block *, _cfg.number_of_blocks());
// Experiment with sorting strategies to speed compilation
double cutoff = BLOCK_FREQUENCY(1.0); // Cutoff for high frequency bucket
Block **buckets[NUMBUCKS]; // Array of buckets
uint buckcnt[NUMBUCKS]; // Array of bucket counters
double buckval[NUMBUCKS]; // Array of bucket value cutoffs
for (uint i = 0; i < NUMBUCKS; i++) {
- buckets[i] = NEW_RESOURCE_ARRAY(Block *, _cfg._num_blocks);
+ buckets[i] = NEW_RESOURCE_ARRAY(Block *, _cfg.number_of_blocks());
buckcnt[i] = 0;
// Bump by three orders of magnitude each time
cutoff *= 0.001;
buckval[i] = cutoff;
- for (uint j = 0; j < _cfg._num_blocks; j++) {
+ for (uint j = 0; j < _cfg.number_of_blocks(); j++) {
buckets[i][j] = NULL;
}
}
// Sort blocks into buckets
- for (uint i = 0; i < _cfg._num_blocks; i++) {
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
for (uint j = 0; j < NUMBUCKS; j++) {
- if ((j == NUMBUCKS - 1) || (_cfg._blocks[i]->_freq > buckval[j])) {
+ if ((j == NUMBUCKS - 1) || (_cfg.get_block(i)->_freq > buckval[j])) {
// Assign block to end of list for appropriate bucket
- buckets[j][buckcnt[j]++] = _cfg._blocks[i];
+ buckets[j][buckcnt[j]++] = _cfg.get_block(i);
break; // kick out of inner loop
}
}
@@ -269,10 +264,9 @@
}
}
- assert(blkcnt == _cfg._num_blocks, "Block array not totally filled");
+ assert(blkcnt == _cfg.number_of_blocks(), "Block array not totally filled");
}
-//------------------------------Union------------------------------------------
// union 2 sets together.
void PhaseChaitin::Union( const Node *src_n, const Node *dst_n ) {
uint src = _lrg_map.find(src_n);
@@ -285,7 +279,6 @@
_lrg_map.uf_map(dst, src);
}
-//------------------------------new_lrg----------------------------------------
void PhaseChaitin::new_lrg(const Node *x, uint lrg) {
// Make the Node->LRG mapping
_lrg_map.extend(x->_idx,lrg);
@@ -294,24 +287,28 @@
}
-bool PhaseChaitin::clone_projs_shared(Block *b, uint idx, Node *con, Node *copy, uint max_lrg_id) {
- Block* bcon = _cfg.get_block_for_node(con);
- uint cindex = bcon->find_node(con);
- Node *con_next = bcon->_nodes[cindex+1];
- if (con_next->in(0) != con || !con_next->is_MachProj()) {
- return false; // No MachProj's follow
+int PhaseChaitin::clone_projs(Block* b, uint idx, Node* orig, Node* copy, uint& max_lrg_id) {
+ assert(b->find_node(copy) == (idx - 1), "incorrect insert index for copy kill projections");
+ DEBUG_ONLY( Block* borig = _cfg.get_block_for_node(orig); )
+ int found_projs = 0;
+ uint cnt = orig->outcnt();
+ for (uint i = 0; i < cnt; i++) {
+ Node* proj = orig->raw_out(i);
+ if (proj->is_MachProj()) {
+ assert(proj->outcnt() == 0, "only kill projections are expected here");
+ assert(_cfg.get_block_for_node(proj) == borig, "incorrect block for kill projections");
+ found_projs++;
+ // Copy kill projections after the cloned node
+ Node* kills = proj->clone();
+ kills->set_req(0, copy);
+ b->_nodes.insert(idx++, kills);
+ _cfg.map_node_to_block(kills, b);
+ new_lrg(kills, max_lrg_id++);
+ }
}
-
- // Copy kills after the cloned constant
- Node *kills = con_next->clone();
- kills->set_req(0, copy);
- b->_nodes.insert(idx, kills);
- _cfg.map_node_to_block(kills, b);
- new_lrg(kills, max_lrg_id);
- return true;
+ return found_projs;
}
-//------------------------------compact----------------------------------------
// Renumber the live ranges to compact them. Makes the IFG smaller.
void PhaseChaitin::compact() {
// Current the _uf_map contains a series of short chains which are headed
@@ -677,20 +674,19 @@
C->set_indexSet_arena(NULL); // ResourceArea is at end of scope
}
-//------------------------------de_ssa-----------------------------------------
void PhaseChaitin::de_ssa() {
// Set initial Names for all Nodes. Most Nodes get the virtual register
// number. A few get the ZERO live range number. These do not
// get allocated, but instead rely on correct scheduling to ensure that
// only one instance is simultaneously live at a time.
uint lr_counter = 1;
- for( uint i = 0; i < _cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
- uint cnt = b->_nodes.size();
+ for( uint i = 0; i < _cfg.number_of_blocks(); i++ ) {
+ Block* block = _cfg.get_block(i);
+ uint cnt = block->_nodes.size();
// Handle all the normal Nodes in the block
for( uint j = 0; j < cnt; j++ ) {
- Node *n = b->_nodes[j];
+ Node *n = block->_nodes[j];
// Pre-color to the zero live range, or pick virtual register
const RegMask &rm = n->out_RegMask();
_lrg_map.map(n->_idx, rm.is_NotEmpty() ? lr_counter++ : 0);
@@ -701,52 +697,55 @@
}
-//------------------------------gather_lrg_masks-------------------------------
// Gather LiveRanGe information, including register masks. Modification of
// cisc spillable in_RegMasks should not be done before AggressiveCoalesce.
void PhaseChaitin::gather_lrg_masks( bool after_aggressive ) {
// Nail down the frame pointer live range
- uint fp_lrg = _lrg_map.live_range_id(_cfg._root->in(1)->in(TypeFunc::FramePtr));
+ uint fp_lrg = _lrg_map.live_range_id(_cfg.get_root_node()->in(1)->in(TypeFunc::FramePtr));
lrgs(fp_lrg)._cost += 1e12; // Cost is infinite
// For all blocks
- for( uint i = 0; i < _cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* block = _cfg.get_block(i);
// For all instructions
- for( uint j = 1; j < b->_nodes.size(); j++ ) {
- Node *n = b->_nodes[j];
+ for (uint j = 1; j < block->_nodes.size(); j++) {
+ Node* n = block->_nodes[j];
uint input_edge_start =1; // Skip control most nodes
- if( n->is_Mach() ) input_edge_start = n->as_Mach()->oper_input_base();
+ if (n->is_Mach()) {
+ input_edge_start = n->as_Mach()->oper_input_base();
+ }
uint idx = n->is_Copy();
// Get virtual register number, same as LiveRanGe index
uint vreg = _lrg_map.live_range_id(n);
- LRG &lrg = lrgs(vreg);
- if( vreg ) { // No vreg means un-allocable (e.g. memory)
+ LRG& lrg = lrgs(vreg);
+ if (vreg) { // No vreg means un-allocable (e.g. memory)
// Collect has-copy bit
- if( idx ) {
+ if (idx) {
lrg._has_copy = 1;
uint clidx = _lrg_map.live_range_id(n->in(idx));
- LRG ©_src = lrgs(clidx);
+ LRG& copy_src = lrgs(clidx);
copy_src._has_copy = 1;
}
// Check for float-vs-int live range (used in register-pressure
// calculations)
const Type *n_type = n->bottom_type();
- if (n_type->is_floatingpoint())
+ if (n_type->is_floatingpoint()) {
lrg._is_float = 1;
+ }
// Check for twice prior spilling. Once prior spilling might have
// spilled 'soft', 2nd prior spill should have spilled 'hard' and
// further spilling is unlikely to make progress.
- if( _spilled_once.test(n->_idx) ) {
+ if (_spilled_once.test(n->_idx)) {
lrg._was_spilled1 = 1;
- if( _spilled_twice.test(n->_idx) )
+ if (_spilled_twice.test(n->_idx)) {
lrg._was_spilled2 = 1;
+ }
}
#ifndef PRODUCT
@@ -783,16 +782,18 @@
// Check for bound register masks
const RegMask &lrgmask = lrg.mask();
- if (lrgmask.is_bound(ireg))
+ if (lrgmask.is_bound(ireg)) {
lrg._is_bound = 1;
+ }
// Check for maximum frequency value
- if (lrg._maxfreq < b->_freq)
- lrg._maxfreq = b->_freq;
+ if (lrg._maxfreq < block->_freq) {
+ lrg._maxfreq = block->_freq;
+ }
// Check for oop-iness, or long/double
// Check for multi-kill projection
- switch( ireg ) {
+ switch (ireg) {
case MachProjNode::fat_proj:
// Fat projections have size equal to number of registers killed
lrg.set_num_regs(rm.Size());
@@ -962,7 +963,7 @@
// AggressiveCoalesce. This effectively pre-virtual-splits
// around uncommon uses of common defs.
const RegMask &rm = n->in_RegMask(k);
- if (!after_aggressive && _cfg.get_block_for_node(n->in(k))->_freq > 1000 * b->_freq) {
+ if (!after_aggressive && _cfg.get_block_for_node(n->in(k))->_freq > 1000 * block->_freq) {
// Since we are BEFORE aggressive coalesce, leave the register
// mask untrimmed by the call. This encourages more coalescing.
// Later, AFTER aggressive, this live range will have to spill
@@ -1006,8 +1007,9 @@
}
// Check for maximum frequency value
- if( lrg._maxfreq < b->_freq )
- lrg._maxfreq = b->_freq;
+ if (lrg._maxfreq < block->_freq) {
+ lrg._maxfreq = block->_freq;
+ }
} // End for all allocated inputs
} // end for all instructions
@@ -1029,7 +1031,6 @@
}
}
-//------------------------------set_was_low------------------------------------
// Set the was-lo-degree bit. Conservative coalescing should not change the
// colorability of the graph. If any live range was of low-degree before
// coalescing, it should Simplify. This call sets the was-lo-degree bit.
@@ -1066,7 +1067,6 @@
#define REGISTER_CONSTRAINED 16
-//------------------------------cache_lrg_info---------------------------------
// Compute cost/area ratio, in case we spill. Build the lo-degree list.
void PhaseChaitin::cache_lrg_info( ) {
@@ -1100,7 +1100,6 @@
}
}
-//------------------------------Pre-Simplify-----------------------------------
// Simplify the IFG by removing LRGs of low degree that have NO copies
void PhaseChaitin::Pre_Simplify( ) {
@@ -1151,7 +1150,6 @@
// No more lo-degree no-copy live ranges to simplify
}
-//------------------------------Simplify---------------------------------------
// Simplify the IFG by removing LRGs of low degree.
void PhaseChaitin::Simplify( ) {
@@ -1288,7 +1286,6 @@
}
-//------------------------------is_legal_reg-----------------------------------
// Is 'reg' register legal for 'lrg'?
static bool is_legal_reg(LRG &lrg, OptoReg::Name reg, int chunk) {
if (reg >= chunk && reg < (chunk + RegMask::CHUNK_SIZE) &&
@@ -1315,7 +1312,6 @@
return false;
}
-//------------------------------bias_color-------------------------------------
// Choose a color using the biasing heuristic
OptoReg::Name PhaseChaitin::bias_color( LRG &lrg, int chunk ) {
@@ -1377,7 +1373,6 @@
return OptoReg::add( reg, chunk );
}
-//------------------------------choose_color-----------------------------------
// Choose a color in the current chunk
OptoReg::Name PhaseChaitin::choose_color( LRG &lrg, int chunk ) {
assert( C->in_preserve_stack_slots() == 0 || chunk != 0 || lrg._is_bound || lrg.mask().is_bound1() || !lrg.mask().Member(OptoReg::Name(_matcher._old_SP-1)), "must not allocate stack0 (inside preserve area)");
@@ -1399,7 +1394,6 @@
return lrg.mask().find_last_elem();
}
-//------------------------------Select-----------------------------------------
// Select colors by re-inserting LRGs back into the IFG. LRGs are re-inserted
// in reverse order of removal. As long as nothing of hi-degree was yanked,
// everything going back is guaranteed a color. Select that color. If some
@@ -1574,8 +1568,6 @@
return spill_reg-LRG::SPILL_REG; // Return number of spills
}
-
-//------------------------------copy_was_spilled-------------------------------
// Copy 'was_spilled'-edness from the source Node to the dst Node.
void PhaseChaitin::copy_was_spilled( Node *src, Node *dst ) {
if( _spilled_once.test(src->_idx) ) {
@@ -1588,14 +1580,12 @@
}
}
-//------------------------------set_was_spilled--------------------------------
// Set the 'spilled_once' or 'spilled_twice' flag on a node.
void PhaseChaitin::set_was_spilled( Node *n ) {
if( _spilled_once.test_set(n->_idx) )
_spilled_twice.set(n->_idx);
}
-//------------------------------fixup_spills-----------------------------------
// Convert Ideal spill instructions into proper FramePtr + offset Loads and
// Stores. Use-def chains are NOT preserved, but Node->LRG->reg maps are.
void PhaseChaitin::fixup_spills() {
@@ -1605,16 +1595,16 @@
NOT_PRODUCT( Compile::TracePhase t3("fixupSpills", &_t_fixupSpills, TimeCompiler); )
// Grab the Frame Pointer
- Node *fp = _cfg._broot->head()->in(1)->in(TypeFunc::FramePtr);
+ Node *fp = _cfg.get_root_block()->head()->in(1)->in(TypeFunc::FramePtr);
// For all blocks
- for( uint i = 0; i < _cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* block = _cfg.get_block(i);
// For all instructions in block
- uint last_inst = b->end_idx();
- for( uint j = 1; j <= last_inst; j++ ) {
- Node *n = b->_nodes[j];
+ uint last_inst = block->end_idx();
+ for (uint j = 1; j <= last_inst; j++) {
+ Node* n = block->_nodes[j];
// Dead instruction???
assert( n->outcnt() != 0 ||// Nothing dead after post alloc
@@ -1651,7 +1641,7 @@
assert( cisc->oper_input_base() == 2, "Only adding one edge");
cisc->ins_req(1,src); // Requires a memory edge
}
- b->_nodes.map(j,cisc); // Insert into basic block
+ block->_nodes.map(j,cisc); // Insert into basic block
n->subsume_by(cisc, C); // Correct graph
//
++_used_cisc_instructions;
@@ -1677,7 +1667,6 @@
} // End of for all blocks
}
-//------------------------------find_base_for_derived--------------------------
// Helper to stretch above; recursively discover the base Node for a
// given derived Node. Easy for AddP-related machine nodes, but needs
// to be recursive for derived Phis.
@@ -1707,7 +1696,7 @@
// Initialize it once and make it shared:
// set control to _root and place it into Start block
// (where top() node is placed).
- base->init_req(0, _cfg._root);
+ base->init_req(0, _cfg.get_root_node());
Block *startb = _cfg.get_block_for_node(C->top());
startb->_nodes.insert(startb->find_node(C->top()), base );
_cfg.map_node_to_block(base, startb);
@@ -1716,7 +1705,7 @@
if (_lrg_map.live_range_id(base) == 0) {
new_lrg(base, maxlrg++);
}
- assert(base->in(0) == _cfg._root && _cfg.get_block_for_node(base) == _cfg.get_block_for_node(C->top()), "base NULL should be shared");
+ assert(base->in(0) == _cfg.get_root_node() && _cfg.get_block_for_node(base) == _cfg.get_block_for_node(C->top()), "base NULL should be shared");
derived_base_map[derived->_idx] = base;
return base;
}
@@ -1779,8 +1768,6 @@
return base;
}
-
-//------------------------------stretch_base_pointer_live_ranges---------------
// At each Safepoint, insert extra debug edges for each pair of derived value/
// base pointer that is live across the Safepoint for oopmap building. The
// edge pairs get added in after sfpt->jvmtail()->oopoff(), but are in the
@@ -1792,14 +1779,14 @@
memset( derived_base_map, 0, sizeof(Node*)*C->unique() );
// For all blocks in RPO do...
- for( uint i=0; i<_cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* block = _cfg.get_block(i);
// Note use of deep-copy constructor. I cannot hammer the original
// liveout bits, because they are needed by the following coalesce pass.
- IndexSet liveout(_live->live(b));
+ IndexSet liveout(_live->live(block));
- for( uint j = b->end_idx() + 1; j > 1; j-- ) {
- Node *n = b->_nodes[j-1];
+ for (uint j = block->end_idx() + 1; j > 1; j--) {
+ Node* n = block->_nodes[j - 1];
// Pre-split compares of loop-phis. Loop-phis form a cycle we would
// like to see in the same register. Compare uses the loop-phi and so
@@ -1814,7 +1801,7 @@
Node *phi = n->in(1);
if( phi->is_Phi() && phi->as_Phi()->region()->is_Loop() ) {
Block *phi_block = _cfg.get_block_for_node(phi);
- if (_cfg.get_block_for_node(phi_block->pred(2)) == b) {
+ if (_cfg.get_block_for_node(phi_block->pred(2)) == block) {
const RegMask *mask = C->matcher()->idealreg2spillmask[Op_RegI];
Node *spill = new (C) MachSpillCopyNode( phi, *mask, *mask );
insert_proj( phi_block, 1, spill, maxlrg++ );
@@ -1868,7 +1855,7 @@
if ((_lrg_map.live_range_id(base) >= _lrg_map.max_lrg_id() || // (Brand new base (hence not live) or
!liveout.member(_lrg_map.live_range_id(base))) && // not live) AND
(_lrg_map.live_range_id(base) > 0) && // not a constant
- _cfg.get_block_for_node(base) != b) { // base not def'd in blk)
+ _cfg.get_block_for_node(base) != block) { // base not def'd in blk)
// Base pointer is not currently live. Since I stretched
// the base pointer to here and it crosses basic-block
// boundaries, the global live info is now incorrect.
@@ -1903,15 +1890,12 @@
return must_recompute_live != 0;
}
-
-//------------------------------add_reference----------------------------------
// Extend the node to LRG mapping
void PhaseChaitin::add_reference(const Node *node, const Node *old_node) {
_lrg_map.extend(node->_idx, _lrg_map.live_range_id(old_node));
}
-//------------------------------dump-------------------------------------------
#ifndef PRODUCT
void PhaseChaitin::dump(const Node *n) const {
uint r = (n->_idx < _lrg_map.size()) ? _lrg_map.find_const(n) : 0;
@@ -2017,8 +2001,9 @@
_matcher._new_SP, _framesize );
// For all blocks
- for( uint i = 0; i < _cfg._num_blocks; i++ )
- dump(_cfg._blocks[i]);
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ dump(_cfg.get_block(i));
+ }
// End of per-block dump
tty->print("\n");
@@ -2059,7 +2044,6 @@
tty->print_cr("");
}
-//------------------------------dump_degree_lists------------------------------
void PhaseChaitin::dump_degree_lists() const {
// Dump lo-degree list
tty->print("Lo degree: ");
@@ -2080,7 +2064,6 @@
tty->print_cr("");
}
-//------------------------------dump_simplified--------------------------------
void PhaseChaitin::dump_simplified() const {
tty->print("Simplified: ");
for( uint i = _simplified; i; i = lrgs(i)._next )
@@ -2099,7 +2082,6 @@
return buf+strlen(buf);
}
-//------------------------------dump_register----------------------------------
// Dump a register name into a buffer. Be intelligent if we get called
// before allocation is complete.
char *PhaseChaitin::dump_register( const Node *n, char *buf ) const {
@@ -2133,7 +2115,6 @@
return buf+strlen(buf);
}
-//----------------------dump_for_spill_split_recycle--------------------------
void PhaseChaitin::dump_for_spill_split_recycle() const {
if( WizardMode && (PrintCompilation || PrintOpto) ) {
// Display which live ranges need to be split and the allocator's state
@@ -2149,7 +2130,6 @@
}
}
-//------------------------------dump_frame------------------------------------
void PhaseChaitin::dump_frame() const {
const char *fp = OptoReg::regname(OptoReg::c_frame_pointer);
const TypeTuple *domain = C->tf()->domain();
@@ -2255,17 +2235,16 @@
tty->print_cr("#");
}
-//------------------------------dump_bb----------------------------------------
void PhaseChaitin::dump_bb( uint pre_order ) const {
tty->print_cr("---dump of B%d---",pre_order);
- for( uint i = 0; i < _cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
- if( b->_pre_order == pre_order )
- dump(b);
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* block = _cfg.get_block(i);
+ if (block->_pre_order == pre_order) {
+ dump(block);
+ }
}
}
-//------------------------------dump_lrg---------------------------------------
void PhaseChaitin::dump_lrg( uint lidx, bool defs_only ) const {
tty->print_cr("---dump of L%d---",lidx);
@@ -2287,17 +2266,17 @@
tty->cr();
}
// For all blocks
- for( uint i = 0; i < _cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* block = _cfg.get_block(i);
int dump_once = 0;
// For all instructions
- for( uint j = 0; j < b->_nodes.size(); j++ ) {
- Node *n = b->_nodes[j];
+ for( uint j = 0; j < block->_nodes.size(); j++ ) {
+ Node *n = block->_nodes[j];
if (_lrg_map.find_const(n) == lidx) {
if (!dump_once++) {
tty->cr();
- b->dump_head(&_cfg);
+ block->dump_head(&_cfg);
}
dump(n);
continue;
@@ -2312,7 +2291,7 @@
if (_lrg_map.find_const(m) == lidx) {
if (!dump_once++) {
tty->cr();
- b->dump_head(&_cfg);
+ block->dump_head(&_cfg);
}
dump(n);
}
@@ -2324,7 +2303,6 @@
}
#endif // not PRODUCT
-//------------------------------print_chaitin_statistics-------------------------------
int PhaseChaitin::_final_loads = 0;
int PhaseChaitin::_final_stores = 0;
int PhaseChaitin::_final_memoves= 0;
--- a/hotspot/src/share/vm/opto/chaitin.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/chaitin.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -412,33 +412,22 @@
uint split_DEF( Node *def, Block *b, int loc, uint max, Node **Reachblock, Node **debug_defs, GrowableArray<uint> splits, int slidx );
uint split_USE( Node *def, Block *b, Node *use, uint useidx, uint max, bool def_down, bool cisc_sp, GrowableArray<uint> splits, int slidx );
- bool clone_projs(Block *b, uint idx, Node *con, Node *copy, LiveRangeMap &lrg_map) {
- bool found_projs = clone_projs_shared(b, idx, con, copy, lrg_map.max_lrg_id());
-
- if(found_projs) {
- uint max_lrg_id = lrg_map.max_lrg_id();
- lrg_map.set_max_lrg_id(max_lrg_id + 1);
- }
-
- return found_projs;
- }
-
//------------------------------clone_projs------------------------------------
// After cloning some rematerialized instruction, clone any MachProj's that
// follow it. Example: Intel zero is XOR, kills flags. Sparc FP constants
// use G3 as an address temp.
- bool clone_projs(Block *b, uint idx, Node *con, Node *copy, uint &max_lrg_id) {
- bool found_projs = clone_projs_shared(b, idx, con, copy, max_lrg_id);
+ int clone_projs(Block* b, uint idx, Node* orig, Node* copy, uint& max_lrg_id);
- if(found_projs) {
- max_lrg_id++;
+ int clone_projs(Block* b, uint idx, Node* orig, Node* copy, LiveRangeMap& lrg_map) {
+ uint max_lrg_id = lrg_map.max_lrg_id();
+ int found_projs = clone_projs(b, idx, orig, copy, max_lrg_id);
+ if (found_projs > 0) {
+ // max_lrg_id is updated during call above
+ lrg_map.set_max_lrg_id(max_lrg_id);
}
-
return found_projs;
}
- bool clone_projs_shared(Block *b, uint idx, Node *con, Node *copy, uint max_lrg_id);
-
Node *split_Rematerialize(Node *def, Block *b, uint insidx, uint &maxlrg, GrowableArray<uint> splits,
int slidx, uint *lrg2reach, Node **Reachblock, bool walkThru);
// True if lidx is used before any real register is def'd in the block
--- a/hotspot/src/share/vm/opto/coalesce.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/coalesce.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -34,8 +34,6 @@
#include "opto/matcher.hpp"
#include "opto/regmask.hpp"
-//=============================================================================
-//------------------------------Dump-------------------------------------------
#ifndef PRODUCT
void PhaseCoalesce::dump(Node *n) const {
// Being a const function means I cannot use 'Find'
@@ -43,12 +41,11 @@
tty->print("L%d/N%d ",r,n->_idx);
}
-//------------------------------dump-------------------------------------------
void PhaseCoalesce::dump() const {
// I know I have a block layout now, so I can print blocks in a loop
- for( uint i=0; i<_phc._cfg._num_blocks; i++ ) {
+ for( uint i=0; i<_phc._cfg.number_of_blocks(); i++ ) {
uint j;
- Block *b = _phc._cfg._blocks[i];
+ Block* b = _phc._cfg.get_block(i);
// Print a nice block header
tty->print("B%d: ",b->_pre_order);
for( j=1; j<b->num_preds(); j++ )
@@ -85,7 +82,6 @@
}
#endif
-//------------------------------combine_these_two------------------------------
// Combine the live ranges def'd by these 2 Nodes. N2 is an input to N1.
void PhaseCoalesce::combine_these_two(Node *n1, Node *n2) {
uint lr1 = _phc._lrg_map.find(n1);
@@ -127,18 +123,15 @@
}
}
-//------------------------------coalesce_driver--------------------------------
// Copy coalescing
-void PhaseCoalesce::coalesce_driver( ) {
-
+void PhaseCoalesce::coalesce_driver() {
verify();
// Coalesce from high frequency to low
- for( uint i=0; i<_phc._cfg._num_blocks; i++ )
- coalesce( _phc._blks[i] );
-
+ for (uint i = 0; i < _phc._cfg.number_of_blocks(); i++) {
+ coalesce(_phc._blks[i]);
+ }
}
-//------------------------------insert_copy_with_overlap-----------------------
// I am inserting copies to come out of SSA form. In the general case, I am
// doing a parallel renaming. I'm in the Named world now, so I can't do a
// general parallel renaming. All the copies now use "names" (live-ranges)
@@ -216,7 +209,6 @@
b->_nodes.insert(last_use_idx+1,copy);
}
-//------------------------------insert_copies----------------------------------
void PhaseAggressiveCoalesce::insert_copies( Matcher &matcher ) {
// We do LRGs compressing and fix a liveout data only here since the other
// place in Split() is guarded by the assert which we never hit.
@@ -225,8 +217,8 @@
for (uint lrg = 1; lrg < _phc._lrg_map.max_lrg_id(); lrg++) {
uint compressed_lrg = _phc._lrg_map.find(lrg);
if (lrg != compressed_lrg) {
- for (uint bidx = 0; bidx < _phc._cfg._num_blocks; bidx++) {
- IndexSet *liveout = _phc._live->live(_phc._cfg._blocks[bidx]);
+ for (uint bidx = 0; bidx < _phc._cfg.number_of_blocks(); bidx++) {
+ IndexSet *liveout = _phc._live->live(_phc._cfg.get_block(bidx));
if (liveout->member(lrg)) {
liveout->remove(lrg);
liveout->insert(compressed_lrg);
@@ -239,10 +231,10 @@
// Nodes with index less than '_unique' are original, non-virtual Nodes.
_unique = C->unique();
- for( uint i=0; i<_phc._cfg._num_blocks; i++ ) {
+ for (uint i = 0; i < _phc._cfg.number_of_blocks(); i++) {
C->check_node_count(NodeLimitFudgeFactor, "out of nodes in coalesce");
if (C->failing()) return;
- Block *b = _phc._cfg._blocks[i];
+ Block *b = _phc._cfg.get_block(i);
uint cnt = b->num_preds(); // Number of inputs to the Phi
for( uint l = 1; l<b->_nodes.size(); l++ ) {
@@ -330,9 +322,7 @@
copy = m->clone();
// Insert the copy in the basic block, just before us
b->_nodes.insert(l++, copy);
- if(_phc.clone_projs(b, l, m, copy, _phc._lrg_map)) {
- l++;
- }
+ l += _phc.clone_projs(b, l, m, copy, _phc._lrg_map);
} else {
const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
copy = new (C) MachSpillCopyNode(m, *rm, *rm);
@@ -403,8 +393,7 @@
} // End of for all blocks
}
-//=============================================================================
-//------------------------------coalesce---------------------------------------
+
// Aggressive (but pessimistic) copy coalescing of a single block
// The following coalesce pass represents a single round of aggressive
@@ -464,20 +453,16 @@
} // End of for all instructions in block
}
-//=============================================================================
-//------------------------------PhaseConservativeCoalesce----------------------
PhaseConservativeCoalesce::PhaseConservativeCoalesce(PhaseChaitin &chaitin) : PhaseCoalesce(chaitin) {
_ulr.initialize(_phc._lrg_map.max_lrg_id());
}
-//------------------------------verify-----------------------------------------
void PhaseConservativeCoalesce::verify() {
#ifdef ASSERT
_phc.set_was_low();
#endif
}
-//------------------------------union_helper-----------------------------------
void PhaseConservativeCoalesce::union_helper( Node *lr1_node, Node *lr2_node, uint lr1, uint lr2, Node *src_def, Node *dst_copy, Node *src_copy, Block *b, uint bindex ) {
// Join live ranges. Merge larger into smaller. Union lr2 into lr1 in the
// union-find tree
@@ -520,7 +505,6 @@
}
}
-//------------------------------compute_separating_interferences---------------
// Factored code from copy_copy that computes extra interferences from
// lengthening a live range by double-coalescing.
uint PhaseConservativeCoalesce::compute_separating_interferences(Node *dst_copy, Node *src_copy, Block *b, uint bindex, RegMask &rm, uint reg_degree, uint rm_size, uint lr1, uint lr2 ) {
@@ -586,7 +570,6 @@
return reg_degree;
}
-//------------------------------update_ifg-------------------------------------
void PhaseConservativeCoalesce::update_ifg(uint lr1, uint lr2, IndexSet *n_lr1, IndexSet *n_lr2) {
// Some original neighbors of lr1 might have gone away
// because the constrained register mask prevented them.
@@ -616,7 +599,6 @@
lrgs(neighbor).inc_degree( lrg1.compute_degree(lrgs(neighbor)) );
}
-//------------------------------record_bias------------------------------------
static void record_bias( const PhaseIFG *ifg, int lr1, int lr2 ) {
// Tag copy bias here
if( !ifg->lrgs(lr1)._copy_bias )
@@ -625,7 +607,6 @@
ifg->lrgs(lr2)._copy_bias = lr1;
}
-//------------------------------copy_copy--------------------------------------
// See if I can coalesce a series of multiple copies together. I need the
// final dest copy and the original src copy. They can be the same Node.
// Compute the compatible register masks.
@@ -785,7 +766,6 @@
return true;
}
-//------------------------------coalesce---------------------------------------
// Conservative (but pessimistic) copy coalescing of a single block
void PhaseConservativeCoalesce::coalesce( Block *b ) {
// Bail out on infrequent blocks
--- a/hotspot/src/share/vm/opto/compile.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/compile.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -2136,7 +2136,9 @@
//------------------------------Code_Gen---------------------------------------
// Given a graph, generate code for it
void Compile::Code_Gen() {
- if (failing()) return;
+ if (failing()) {
+ return;
+ }
// Perform instruction selection. You might think we could reclaim Matcher
// memory PDQ, but actually the Matcher is used in generating spill code.
@@ -2148,12 +2150,11 @@
// nodes. Mapping is only valid at the root of each matched subtree.
NOT_PRODUCT( verify_graph_edges(); )
- Node_List proj_list;
- Matcher m(proj_list);
- _matcher = &m;
+ Matcher matcher;
+ _matcher = &matcher;
{
TracePhase t2("matcher", &_t_matcher, true);
- m.match();
+ matcher.match();
}
// In debug mode can dump m._nodes.dump() for mapping of ideal to machine
// nodes. Mapping is only valid at the root of each matched subtree.
@@ -2161,31 +2162,26 @@
// If you have too many nodes, or if matching has failed, bail out
check_node_count(0, "out of nodes matching instructions");
- if (failing()) return;
+ if (failing()) {
+ return;
+ }
// Build a proper-looking CFG
- PhaseCFG cfg(node_arena(), root(), m);
+ PhaseCFG cfg(node_arena(), root(), matcher);
_cfg = &cfg;
{
NOT_PRODUCT( TracePhase t2("scheduler", &_t_scheduler, TimeCompiler); )
- cfg.Dominators();
- if (failing()) return;
-
- NOT_PRODUCT( verify_graph_edges(); )
-
- cfg.Estimate_Block_Frequency();
- cfg.GlobalCodeMotion(m,unique(),proj_list);
- if (failing()) return;
+ bool success = cfg.do_global_code_motion();
+ if (!success) {
+ return;
+ }
print_method(PHASE_GLOBAL_CODE_MOTION, 2);
-
NOT_PRODUCT( verify_graph_edges(); )
-
debug_only( cfg.verify(); )
}
- NOT_PRODUCT( verify_graph_edges(); )
-
- PhaseChaitin regalloc(unique(), cfg, m);
+
+ PhaseChaitin regalloc(unique(), cfg, matcher);
_regalloc = ®alloc;
{
TracePhase t2("regalloc", &_t_registerAllocation, true);
@@ -2206,7 +2202,7 @@
// can now safely remove it.
{
NOT_PRODUCT( TracePhase t2("blockOrdering", &_t_blockOrdering, TimeCompiler); )
- cfg.remove_empty();
+ cfg.remove_empty_blocks();
if (do_freq_based_layout()) {
PhaseBlockLayout layout(cfg);
} else {
@@ -2253,38 +2249,50 @@
_regalloc->dump_frame();
Node *n = NULL;
- for( uint i=0; i<_cfg->_num_blocks; i++ ) {
- if (VMThread::should_terminate()) { cut_short = true; break; }
- Block *b = _cfg->_blocks[i];
- if (b->is_connector() && !Verbose) continue;
- n = b->_nodes[0];
- if (pcs && n->_idx < pc_limit)
+ for (uint i = 0; i < _cfg->number_of_blocks(); i++) {
+ if (VMThread::should_terminate()) {
+ cut_short = true;
+ break;
+ }
+ Block* block = _cfg->get_block(i);
+ if (block->is_connector() && !Verbose) {
+ continue;
+ }
+ n = block->_nodes[0];
+ if (pcs && n->_idx < pc_limit) {
tty->print("%3.3x ", pcs[n->_idx]);
- else
+ } else {
tty->print(" ");
- b->dump_head(_cfg);
- if (b->is_connector()) {
+ }
+ block->dump_head(_cfg);
+ if (block->is_connector()) {
tty->print_cr(" # Empty connector block");
- } else if (b->num_preds() == 2 && b->pred(1)->is_CatchProj() && b->pred(1)->as_CatchProj()->_con == CatchProjNode::fall_through_index) {
+ } else if (block->num_preds() == 2 && block->pred(1)->is_CatchProj() && block->pred(1)->as_CatchProj()->_con == CatchProjNode::fall_through_index) {
tty->print_cr(" # Block is sole successor of call");
}
// For all instructions
Node *delay = NULL;
- for( uint j = 0; j<b->_nodes.size(); j++ ) {
- if (VMThread::should_terminate()) { cut_short = true; break; }
- n = b->_nodes[j];
+ for (uint j = 0; j < block->_nodes.size(); j++) {
+ if (VMThread::should_terminate()) {
+ cut_short = true;
+ break;
+ }
+ n = block->_nodes[j];
if (valid_bundle_info(n)) {
- Bundle *bundle = node_bundling(n);
+ Bundle* bundle = node_bundling(n);
if (bundle->used_in_unconditional_delay()) {
delay = n;
continue;
}
- if (bundle->starts_bundle())
+ if (bundle->starts_bundle()) {
starts_bundle = '+';
+ }
}
- if (WizardMode) n->dump();
+ if (WizardMode) {
+ n->dump();
+ }
if( !n->is_Region() && // Dont print in the Assembly
!n->is_Phi() && // a few noisely useless nodes
--- a/hotspot/src/share/vm/opto/domgraph.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/domgraph.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -32,9 +32,6 @@
// Portions of code courtesy of Clifford Click
-// Optimization - Graph Style
-
-//------------------------------Tarjan-----------------------------------------
// A data structure that holds all the information needed to find dominators.
struct Tarjan {
Block *_block; // Basic block for this info
@@ -60,23 +57,21 @@
};
-//------------------------------Dominator--------------------------------------
// Compute the dominator tree of the CFG. The CFG must already have been
// constructed. This is the Lengauer & Tarjan O(E-alpha(E,V)) algorithm.
-void PhaseCFG::Dominators( ) {
+void PhaseCFG::build_dominator_tree() {
// Pre-grow the blocks array, prior to the ResourceMark kicking in
- _blocks.map(_num_blocks,0);
+ _blocks.map(number_of_blocks(), 0);
ResourceMark rm;
// Setup mappings from my Graph to Tarjan's stuff and back
// Note: Tarjan uses 1-based arrays
- Tarjan *tarjan = NEW_RESOURCE_ARRAY(Tarjan,_num_blocks+1);
+ Tarjan* tarjan = NEW_RESOURCE_ARRAY(Tarjan, number_of_blocks() + 1);
// Tarjan's algorithm, almost verbatim:
// Step 1:
- _rpo_ctr = _num_blocks;
- uint dfsnum = DFS( tarjan );
- if( dfsnum-1 != _num_blocks ) {// Check for unreachable loops!
+ uint dfsnum = do_DFS(tarjan, number_of_blocks());
+ if (dfsnum - 1 != number_of_blocks()) { // Check for unreachable loops!
// If the returned dfsnum does not match the number of blocks, then we
// must have some unreachable loops. These can be made at any time by
// IterGVN. They are cleaned up by CCP or the loop opts, but the last
@@ -93,14 +88,13 @@
C->record_method_not_compilable("unreachable loop");
return;
}
- _blocks._cnt = _num_blocks;
+ _blocks._cnt = number_of_blocks();
// Tarjan is using 1-based arrays, so these are some initialize flags
tarjan[0]._size = tarjan[0]._semi = 0;
tarjan[0]._label = &tarjan[0];
- uint i;
- for( i=_num_blocks; i>=2; i-- ) { // For all vertices in DFS order
+ for (uint i = number_of_blocks(); i >= 2; i--) { // For all vertices in DFS order
Tarjan *w = &tarjan[i]; // Get vertex from DFS
// Step 2:
@@ -130,19 +124,19 @@
}
// Step 4:
- for( i=2; i <= _num_blocks; i++ ) {
+ for (uint i = 2; i <= number_of_blocks(); i++) {
Tarjan *w = &tarjan[i];
if( w->_dom != &tarjan[w->_semi] )
w->_dom = w->_dom->_dom;
w->_dom_next = w->_dom_child = NULL; // Initialize for building tree later
}
// No immediate dominator for the root
- Tarjan *w = &tarjan[_broot->_pre_order];
+ Tarjan *w = &tarjan[get_root_block()->_pre_order];
w->_dom = NULL;
w->_dom_next = w->_dom_child = NULL; // Initialize for building tree later
// Convert the dominator tree array into my kind of graph
- for( i=1; i<=_num_blocks;i++){// For all Tarjan vertices
+ for(uint i = 1; i <= number_of_blocks(); i++){ // For all Tarjan vertices
Tarjan *t = &tarjan[i]; // Handy access
Tarjan *tdom = t->_dom; // Handy access to immediate dominator
if( tdom ) { // Root has no immediate dominator
@@ -152,11 +146,10 @@
} else
t->_block->_idom = NULL; // Root
}
- w->setdepth( _num_blocks+1 ); // Set depth in dominator tree
+ w->setdepth(number_of_blocks() + 1); // Set depth in dominator tree
}
-//----------------------------Block_Stack--------------------------------------
class Block_Stack {
private:
struct Block_Descr {
@@ -214,7 +207,6 @@
}
};
-//-------------------------most_frequent_successor-----------------------------
// Find the index into the b->succs[] array of the most frequent successor.
uint Block_Stack::most_frequent_successor( Block *b ) {
uint freq_idx = 0;
@@ -258,40 +250,38 @@
return freq_idx;
}
-//------------------------------DFS--------------------------------------------
// Perform DFS search. Setup 'vertex' as DFS to vertex mapping. Setup
// 'semi' as vertex to DFS mapping. Set 'parent' to DFS parent.
-uint PhaseCFG::DFS( Tarjan *tarjan ) {
- Block *b = _broot;
+uint PhaseCFG::do_DFS(Tarjan *tarjan, uint rpo_counter) {
+ Block* root_block = get_root_block();
uint pre_order = 1;
- // Allocate stack of size _num_blocks+1 to avoid frequent realloc
- Block_Stack bstack(tarjan, _num_blocks+1);
+ // Allocate stack of size number_of_blocks() + 1 to avoid frequent realloc
+ Block_Stack bstack(tarjan, number_of_blocks() + 1);
// Push on stack the state for the first block
- bstack.push(pre_order, b);
+ bstack.push(pre_order, root_block);
++pre_order;
while (bstack.is_nonempty()) {
if (!bstack.last_successor()) {
// Walk over all successors in pre-order (DFS).
- Block *s = bstack.next_successor();
- if (s->_pre_order == 0) { // Check for no-pre-order, not-visited
+ Block* next_block = bstack.next_successor();
+ if (next_block->_pre_order == 0) { // Check for no-pre-order, not-visited
// Push on stack the state of successor
- bstack.push(pre_order, s);
+ bstack.push(pre_order, next_block);
++pre_order;
}
}
else {
// Build a reverse post-order in the CFG _blocks array
Block *stack_top = bstack.pop();
- stack_top->_rpo = --_rpo_ctr;
+ stack_top->_rpo = --rpo_counter;
_blocks.map(stack_top->_rpo, stack_top);
}
}
return pre_order;
}
-//------------------------------COMPRESS---------------------------------------
void Tarjan::COMPRESS()
{
assert( _ancestor != 0, "" );
@@ -303,14 +293,12 @@
}
}
-//------------------------------EVAL-------------------------------------------
Tarjan *Tarjan::EVAL() {
if( !_ancestor ) return _label;
COMPRESS();
return (_ancestor->_label->_semi >= _label->_semi) ? _label : _ancestor->_label;
}
-//------------------------------LINK-------------------------------------------
void Tarjan::LINK( Tarjan *w, Tarjan *tarjan0 ) {
Tarjan *s = w;
while( w->_label->_semi < s->_child->_label->_semi ) {
@@ -333,7 +321,6 @@
}
}
-//------------------------------setdepth---------------------------------------
void Tarjan::setdepth( uint stack_size ) {
Tarjan **top = NEW_RESOURCE_ARRAY(Tarjan*, stack_size);
Tarjan **next = top;
@@ -362,8 +349,7 @@
} while (last < top);
}
-//*********************** DOMINATORS ON THE SEA OF NODES***********************
-//------------------------------NTarjan----------------------------------------
+// Compute dominators on the Sea of Nodes form
// A data structure that holds all the information needed to find dominators.
struct NTarjan {
Node *_control; // Control node associated with this info
@@ -396,7 +382,6 @@
#endif
};
-//------------------------------Dominator--------------------------------------
// Compute the dominator tree of the sea of nodes. This version walks all CFG
// nodes (using the is_CFG() call) and places them in a dominator tree. Thus,
// it needs a count of the CFG nodes for the mapping table. This is the
@@ -517,7 +502,6 @@
}
}
-//------------------------------DFS--------------------------------------------
// Perform DFS search. Setup 'vertex' as DFS to vertex mapping. Setup
// 'semi' as vertex to DFS mapping. Set 'parent' to DFS parent.
int NTarjan::DFS( NTarjan *ntarjan, VectorSet &visited, PhaseIdealLoop *pil, uint *dfsorder) {
@@ -560,7 +544,6 @@
return dfsnum;
}
-//------------------------------COMPRESS---------------------------------------
void NTarjan::COMPRESS()
{
assert( _ancestor != 0, "" );
@@ -572,14 +555,12 @@
}
}
-//------------------------------EVAL-------------------------------------------
NTarjan *NTarjan::EVAL() {
if( !_ancestor ) return _label;
COMPRESS();
return (_ancestor->_label->_semi >= _label->_semi) ? _label : _ancestor->_label;
}
-//------------------------------LINK-------------------------------------------
void NTarjan::LINK( NTarjan *w, NTarjan *ntarjan0 ) {
NTarjan *s = w;
while( w->_label->_semi < s->_child->_label->_semi ) {
@@ -602,7 +583,6 @@
}
}
-//------------------------------setdepth---------------------------------------
void NTarjan::setdepth( uint stack_size, uint *dom_depth ) {
NTarjan **top = NEW_RESOURCE_ARRAY(NTarjan*, stack_size);
NTarjan **next = top;
@@ -631,7 +611,6 @@
} while (last < top);
}
-//------------------------------dump-------------------------------------------
#ifndef PRODUCT
void NTarjan::dump(int offset) const {
// Dump the data from this node
--- a/hotspot/src/share/vm/opto/gcm.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/gcm.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -121,27 +121,30 @@
//------------------------------schedule_pinned_nodes--------------------------
// Set the basic block for Nodes pinned into blocks
-void PhaseCFG::schedule_pinned_nodes( VectorSet &visited ) {
+void PhaseCFG::schedule_pinned_nodes(VectorSet &visited) {
// Allocate node stack of size C->unique()+8 to avoid frequent realloc
- GrowableArray <Node *> spstack(C->unique()+8);
+ GrowableArray <Node *> spstack(C->unique() + 8);
spstack.push(_root);
- while ( spstack.is_nonempty() ) {
- Node *n = spstack.pop();
- if( !visited.test_set(n->_idx) ) { // Test node and flag it as visited
- if( n->pinned() && !has_block(n)) { // Pinned? Nail it down!
- assert( n->in(0), "pinned Node must have Control" );
+ while (spstack.is_nonempty()) {
+ Node* node = spstack.pop();
+ if (!visited.test_set(node->_idx)) { // Test node and flag it as visited
+ if (node->pinned() && !has_block(node)) { // Pinned? Nail it down!
+ assert(node->in(0), "pinned Node must have Control");
// Before setting block replace block_proj control edge
- replace_block_proj_ctrl(n);
- Node *input = n->in(0);
+ replace_block_proj_ctrl(node);
+ Node* input = node->in(0);
while (!input->is_block_start()) {
input = input->in(0);
}
- Block *b = get_block_for_node(input); // Basic block of controlling input
- schedule_node_into_block(n, b);
+ Block* block = get_block_for_node(input); // Basic block of controlling input
+ schedule_node_into_block(node, block);
}
- for( int i = n->req() - 1; i >= 0; --i ) { // For all inputs
- if( n->in(i) != NULL )
- spstack.push(n->in(i));
+
+ // process all inputs that are non NULL
+ for (int i = node->req() - 1; i >= 0; --i) {
+ if (node->in(i) != NULL) {
+ spstack.push(node->in(i));
+ }
}
}
}
@@ -205,32 +208,29 @@
// which all their inputs occur.
bool PhaseCFG::schedule_early(VectorSet &visited, Node_List &roots) {
// Allocate stack with enough space to avoid frequent realloc
- Node_Stack nstack(roots.Size() + 8); // (unique >> 1) + 24 from Java2D stats
- // roots.push(_root); _root will be processed among C->top() inputs
+ Node_Stack nstack(roots.Size() + 8);
+ // _root will be processed among C->top() inputs
roots.push(C->top());
visited.set(C->top()->_idx);
while (roots.size() != 0) {
// Use local variables nstack_top_n & nstack_top_i to cache values
// on stack's top.
- Node *nstack_top_n = roots.pop();
- uint nstack_top_i = 0;
-//while_nstack_nonempty:
+ Node* parent_node = roots.pop();
+ uint input_index = 0;
+
while (true) {
- // Get parent node and next input's index from stack's top.
- Node *n = nstack_top_n;
- uint i = nstack_top_i;
-
- if (i == 0) {
+ if (input_index == 0) {
// Fixup some control. Constants without control get attached
// to root and nodes that use is_block_proj() nodes should be attached
// to the region that starts their block.
- const Node *in0 = n->in(0);
- if (in0 != NULL) { // Control-dependent?
- replace_block_proj_ctrl(n);
- } else { // n->in(0) == NULL
- if (n->req() == 1) { // This guy is a constant with NO inputs?
- n->set_req(0, _root);
+ const Node* control_input = parent_node->in(0);
+ if (control_input != NULL) {
+ replace_block_proj_ctrl(parent_node);
+ } else {
+ // Is a constant with NO inputs?
+ if (parent_node->req() == 1) {
+ parent_node->set_req(0, _root);
}
}
}
@@ -239,37 +239,47 @@
// input is already in a block we quit following inputs (to avoid
// cycles). Instead we put that Node on a worklist to be handled
// later (since IT'S inputs may not have a block yet).
- bool done = true; // Assume all n's inputs will be processed
- while (i < n->len()) { // For all inputs
- Node *in = n->in(i); // Get input
- ++i;
- if (in == NULL) continue; // Ignore NULL, missing inputs
+
+ // Assume all n's inputs will be processed
+ bool done = true;
+
+ while (input_index < parent_node->len()) {
+ Node* in = parent_node->in(input_index++);
+ if (in == NULL) {
+ continue;
+ }
+
int is_visited = visited.test_set(in->_idx);
- if (!has_block(in)) { // Missing block selection?
+ if (!has_block(in)) {
if (is_visited) {
- // assert( !visited.test(in->_idx), "did not schedule early" );
return false;
}
- nstack.push(n, i); // Save parent node and next input's index.
- nstack_top_n = in; // Process current input now.
- nstack_top_i = 0;
- done = false; // Not all n's inputs processed.
- break; // continue while_nstack_nonempty;
- } else if (!is_visited) { // Input not yet visited?
- roots.push(in); // Visit this guy later, using worklist
+ // Save parent node and next input's index.
+ nstack.push(parent_node, input_index);
+ // Process current input now.
+ parent_node = in;
+ input_index = 0;
+ // Not all n's inputs processed.
+ done = false;
+ break;
+ } else if (!is_visited) {
+ // Visit this guy later, using worklist
+ roots.push(in);
}
}
+
if (done) {
// All of n's inputs have been processed, complete post-processing.
// Some instructions are pinned into a block. These include Region,
// Phi, Start, Return, and other control-dependent instructions and
// any projections which depend on them.
- if (!n->pinned()) {
+ if (!parent_node->pinned()) {
// Set earliest legal block.
- map_node_to_block(n, find_deepest_input(n, this));
+ Block* earliest_block = find_deepest_input(parent_node, this);
+ map_node_to_block(parent_node, earliest_block);
} else {
- assert(get_block_for_node(n) == get_block_for_node(n->in(0)), "Pinned Node should be at the same block as its control edge");
+ assert(get_block_for_node(parent_node) == get_block_for_node(parent_node->in(0)), "Pinned Node should be at the same block as its control edge");
}
if (nstack.is_empty()) {
@@ -278,12 +288,12 @@
break;
}
// Get saved parent node and next input's index.
- nstack_top_n = nstack.node();
- nstack_top_i = nstack.index();
+ parent_node = nstack.node();
+ input_index = nstack.index();
nstack.pop();
- } // if (done)
- } // while (true)
- } // while (roots.size() != 0)
+ }
+ }
+ }
return true;
}
@@ -847,7 +857,7 @@
//------------------------------ComputeLatenciesBackwards----------------------
// Compute the latency of all the instructions.
-void PhaseCFG::ComputeLatenciesBackwards(VectorSet &visited, Node_List &stack) {
+void PhaseCFG::compute_latencies_backwards(VectorSet &visited, Node_List &stack) {
#ifndef PRODUCT
if (trace_opto_pipelining())
tty->print("\n#---- ComputeLatenciesBackwards ----\n");
@@ -870,31 +880,34 @@
// Set the latency for this instruction
#ifndef PRODUCT
if (trace_opto_pipelining()) {
- tty->print("# latency_to_inputs: node_latency[%d] = %d for node",
- n->_idx, _node_latency->at_grow(n->_idx));
+ tty->print("# latency_to_inputs: node_latency[%d] = %d for node", n->_idx, get_latency_for_node(n));
dump();
}
#endif
- if (n->is_Proj())
+ if (n->is_Proj()) {
n = n->in(0);
+ }
- if (n->is_Root())
+ if (n->is_Root()) {
return;
+ }
uint nlen = n->len();
- uint use_latency = _node_latency->at_grow(n->_idx);
+ uint use_latency = get_latency_for_node(n);
uint use_pre_order = get_block_for_node(n)->_pre_order;
- for ( uint j=0; j<nlen; j++ ) {
+ for (uint j = 0; j < nlen; j++) {
Node *def = n->in(j);
- if (!def || def == n)
+ if (!def || def == n) {
continue;
+ }
// Walk backwards thru projections
- if (def->is_Proj())
+ if (def->is_Proj()) {
def = def->in(0);
+ }
#ifndef PRODUCT
if (trace_opto_pipelining()) {
@@ -907,22 +920,20 @@
Block *def_block = get_block_for_node(def);
uint def_pre_order = def_block ? def_block->_pre_order : 0;
- if ( (use_pre_order < def_pre_order) ||
- (use_pre_order == def_pre_order && n->is_Phi()) )
+ if ((use_pre_order < def_pre_order) || (use_pre_order == def_pre_order && n->is_Phi())) {
continue;
+ }
uint delta_latency = n->latency(j);
uint current_latency = delta_latency + use_latency;
- if (_node_latency->at_grow(def->_idx) < current_latency) {
- _node_latency->at_put_grow(def->_idx, current_latency);
+ if (get_latency_for_node(def) < current_latency) {
+ set_latency_for_node(def, current_latency);
}
#ifndef PRODUCT
if (trace_opto_pipelining()) {
- tty->print_cr("# %d + edge_latency(%d) == %d -> %d, node_latency[%d] = %d",
- use_latency, j, delta_latency, current_latency, def->_idx,
- _node_latency->at_grow(def->_idx));
+ tty->print_cr("# %d + edge_latency(%d) == %d -> %d, node_latency[%d] = %d", use_latency, j, delta_latency, current_latency, def->_idx, get_latency_for_node(def));
}
#endif
}
@@ -957,7 +968,7 @@
return 0;
uint nlen = use->len();
- uint nl = _node_latency->at_grow(use->_idx);
+ uint nl = get_latency_for_node(use);
for ( uint j=0; j<nlen; j++ ) {
if (use->in(j) == n) {
@@ -992,8 +1003,7 @@
// Set the latency for this instruction
#ifndef PRODUCT
if (trace_opto_pipelining()) {
- tty->print("# latency_from_outputs: node_latency[%d] = %d for node",
- n->_idx, _node_latency->at_grow(n->_idx));
+ tty->print("# latency_from_outputs: node_latency[%d] = %d for node", n->_idx, get_latency_for_node(n));
dump();
}
#endif
@@ -1006,7 +1016,7 @@
if (latency < l) latency = l;
}
- _node_latency->at_put_grow(n->_idx, latency);
+ set_latency_for_node(n, latency);
}
//------------------------------hoist_to_cheaper_block-------------------------
@@ -1016,9 +1026,9 @@
const double delta = 1+PROB_UNLIKELY_MAG(4);
Block* least = LCA;
double least_freq = least->_freq;
- uint target = _node_latency->at_grow(self->_idx);
- uint start_latency = _node_latency->at_grow(LCA->_nodes[0]->_idx);
- uint end_latency = _node_latency->at_grow(LCA->_nodes[LCA->end_idx()]->_idx);
+ uint target = get_latency_for_node(self);
+ uint start_latency = get_latency_for_node(LCA->_nodes[0]);
+ uint end_latency = get_latency_for_node(LCA->_nodes[LCA->end_idx()]);
bool in_latency = (target <= start_latency);
const Block* root_block = get_block_for_node(_root);
@@ -1035,8 +1045,7 @@
#ifndef PRODUCT
if (trace_opto_pipelining()) {
- tty->print("# Find cheaper block for latency %d: ",
- _node_latency->at_grow(self->_idx));
+ tty->print("# Find cheaper block for latency %d: ", get_latency_for_node(self));
self->dump();
tty->print_cr("# B%d: start latency for [%4d]=%d, end latency for [%4d]=%d, freq=%g",
LCA->_pre_order,
@@ -1065,9 +1074,9 @@
if (mach && LCA == root_block)
break;
- uint start_lat = _node_latency->at_grow(LCA->_nodes[0]->_idx);
+ uint start_lat = get_latency_for_node(LCA->_nodes[0]);
uint end_idx = LCA->end_idx();
- uint end_lat = _node_latency->at_grow(LCA->_nodes[end_idx]->_idx);
+ uint end_lat = get_latency_for_node(LCA->_nodes[end_idx]);
double LCA_freq = LCA->_freq;
#ifndef PRODUCT
if (trace_opto_pipelining()) {
@@ -1109,7 +1118,7 @@
tty->print_cr("# Change latency for [%4d] from %d to %d", self->_idx, target, end_latency);
}
#endif
- _node_latency->at_put_grow(self->_idx, end_latency);
+ set_latency_for_node(self, end_latency);
partial_latency_of_defs(self);
}
@@ -1255,7 +1264,7 @@
} // end ScheduleLate
//------------------------------GlobalCodeMotion-------------------------------
-void PhaseCFG::GlobalCodeMotion( Matcher &matcher, uint unique, Node_List &proj_list ) {
+void PhaseCFG::global_code_motion() {
ResourceMark rm;
#ifndef PRODUCT
@@ -1265,21 +1274,22 @@
#endif
// Initialize the node to block mapping for things on the proj_list
- for (uint i = 0; i < proj_list.size(); i++) {
- unmap_node_from_block(proj_list[i]);
+ for (uint i = 0; i < _matcher.number_of_projections(); i++) {
+ unmap_node_from_block(_matcher.get_projection(i));
}
// Set the basic block for Nodes pinned into blocks
- Arena *a = Thread::current()->resource_area();
- VectorSet visited(a);
- schedule_pinned_nodes( visited );
+ Arena* arena = Thread::current()->resource_area();
+ VectorSet visited(arena);
+ schedule_pinned_nodes(visited);
// Find the earliest Block any instruction can be placed in. Some
// instructions are pinned into Blocks. Unpinned instructions can
// appear in last block in which all their inputs occur.
visited.Clear();
- Node_List stack(a);
- stack.map( (unique >> 1) + 16, NULL); // Pre-grow the list
+ Node_List stack(arena);
+ // Pre-grow the list
+ stack.map((C->unique() >> 1) + 16, NULL);
if (!schedule_early(visited, stack)) {
// Bailout without retry
C->record_method_not_compilable("early schedule failed");
@@ -1287,29 +1297,25 @@
}
// Build Def-Use edges.
- proj_list.push(_root); // Add real root as another root
- proj_list.pop();
-
// Compute the latency information (via backwards walk) for all the
// instructions in the graph
_node_latency = new GrowableArray<uint>(); // resource_area allocation
- if( C->do_scheduling() )
- ComputeLatenciesBackwards(visited, stack);
+ if (C->do_scheduling()) {
+ compute_latencies_backwards(visited, stack);
+ }
// Now schedule all codes as LATE as possible. This is the LCA in the
// dominator tree of all USES of a value. Pick the block with the least
// loop nesting depth that is lowest in the dominator tree.
// ( visited.Clear() called in schedule_late()->Node_Backward_Iterator() )
schedule_late(visited, stack);
- if( C->failing() ) {
+ if (C->failing()) {
// schedule_late fails only when graph is incorrect.
assert(!VerifyGraphEdges, "verification should have failed");
return;
}
- unique = C->unique();
-
#ifndef PRODUCT
if (trace_opto_pipelining()) {
tty->print("\n---- Detect implicit null checks ----\n");
@@ -1332,10 +1338,11 @@
// By reversing the loop direction we get a very minor gain on mpegaudio.
// Feel free to revert to a forward loop for clarity.
// for( int i=0; i < (int)matcher._null_check_tests.size(); i+=2 ) {
- for( int i= matcher._null_check_tests.size()-2; i>=0; i-=2 ) {
- Node *proj = matcher._null_check_tests[i ];
- Node *val = matcher._null_check_tests[i+1];
- get_block_for_node(proj)->implicit_null_check(this, proj, val, allowed_reasons);
+ for (int i = _matcher._null_check_tests.size() - 2; i >= 0; i -= 2) {
+ Node* proj = _matcher._null_check_tests[i];
+ Node* val = _matcher._null_check_tests[i + 1];
+ Block* block = get_block_for_node(proj);
+ block->implicit_null_check(this, proj, val, allowed_reasons);
// The implicit_null_check will only perform the transformation
// if the null branch is truly uncommon, *and* it leads to an
// uncommon trap. Combined with the too_many_traps guards
@@ -1352,11 +1359,11 @@
// Schedule locally. Right now a simple topological sort.
// Later, do a real latency aware scheduler.
- uint max_idx = C->unique();
- GrowableArray<int> ready_cnt(max_idx, max_idx, -1);
+ GrowableArray<int> ready_cnt(C->unique(), C->unique(), -1);
visited.Clear();
- for (uint i = 0; i < _num_blocks; i++) {
- if (!_blocks[i]->schedule_local(this, matcher, ready_cnt, visited)) {
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* block = get_block(i);
+ if (!block->schedule_local(this, _matcher, ready_cnt, visited)) {
if (!C->failure_reason_is(C2Compiler::retry_no_subsuming_loads())) {
C->record_method_not_compilable("local schedule failed");
}
@@ -1366,15 +1373,17 @@
// If we inserted any instructions between a Call and his CatchNode,
// clone the instructions on all paths below the Catch.
- for (uint i = 0; i < _num_blocks; i++) {
- _blocks[i]->call_catch_cleanup(this, C);
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* block = get_block(i);
+ block->call_catch_cleanup(this, C);
}
#ifndef PRODUCT
if (trace_opto_pipelining()) {
tty->print("\n---- After GlobalCodeMotion ----\n");
- for (uint i = 0; i < _num_blocks; i++) {
- _blocks[i]->dump();
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* block = get_block(i);
+ block->dump();
}
}
#endif
@@ -1382,10 +1391,29 @@
_node_latency = (GrowableArray<uint> *)0xdeadbeef;
}
+bool PhaseCFG::do_global_code_motion() {
+
+ build_dominator_tree();
+ if (C->failing()) {
+ return false;
+ }
+
+ NOT_PRODUCT( C->verify_graph_edges(); )
+
+ estimate_block_frequency();
+
+ global_code_motion();
+
+ if (C->failing()) {
+ return false;
+ }
+
+ return true;
+}
//------------------------------Estimate_Block_Frequency-----------------------
// Estimate block frequencies based on IfNode probabilities.
-void PhaseCFG::Estimate_Block_Frequency() {
+void PhaseCFG::estimate_block_frequency() {
// Force conditional branches leading to uncommon traps to be unlikely,
// not because we get to the uncommon_trap with less relative frequency,
@@ -1393,7 +1421,7 @@
// there once.
if (C->do_freq_based_layout()) {
Block_List worklist;
- Block* root_blk = _blocks[0];
+ Block* root_blk = get_block(0);
for (uint i = 1; i < root_blk->num_preds(); i++) {
Block *pb = get_block_for_node(root_blk->pred(i));
if (pb->has_uncommon_code()) {
@@ -1402,7 +1430,9 @@
}
while (worklist.size() > 0) {
Block* uct = worklist.pop();
- if (uct == _broot) continue;
+ if (uct == get_root_block()) {
+ continue;
+ }
for (uint i = 1; i < uct->num_preds(); i++) {
Block *pb = get_block_for_node(uct->pred(i));
if (pb->_num_succs == 1) {
@@ -1426,12 +1456,12 @@
_root_loop->scale_freq();
// Save outmost loop frequency for LRG frequency threshold
- _outer_loop_freq = _root_loop->outer_loop_freq();
+ _outer_loop_frequency = _root_loop->outer_loop_freq();
// force paths ending at uncommon traps to be infrequent
if (!C->do_freq_based_layout()) {
Block_List worklist;
- Block* root_blk = _blocks[0];
+ Block* root_blk = get_block(0);
for (uint i = 1; i < root_blk->num_preds(); i++) {
Block *pb = get_block_for_node(root_blk->pred(i));
if (pb->has_uncommon_code()) {
@@ -1451,8 +1481,8 @@
}
#ifdef ASSERT
- for (uint i = 0; i < _num_blocks; i++ ) {
- Block *b = _blocks[i];
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* b = get_block(i);
assert(b->_freq >= MIN_BLOCK_FREQUENCY, "Register Allocator requires meaningful block frequency");
}
#endif
@@ -1476,16 +1506,16 @@
CFGLoop* PhaseCFG::create_loop_tree() {
#ifdef ASSERT
- assert( _blocks[0] == _broot, "" );
- for (uint i = 0; i < _num_blocks; i++ ) {
- Block *b = _blocks[i];
+ assert(get_block(0) == get_root_block(), "first block should be root block");
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* block = get_block(i);
// Check that _loop field are clear...we could clear them if not.
- assert(b->_loop == NULL, "clear _loop expected");
+ assert(block->_loop == NULL, "clear _loop expected");
// Sanity check that the RPO numbering is reflected in the _blocks array.
// It doesn't have to be for the loop tree to be built, but if it is not,
// then the blocks have been reordered since dom graph building...which
// may question the RPO numbering
- assert(b->_rpo == i, "unexpected reverse post order number");
+ assert(block->_rpo == i, "unexpected reverse post order number");
}
#endif
@@ -1495,11 +1525,11 @@
Block_List worklist;
// Assign blocks to loops
- for(uint i = _num_blocks - 1; i > 0; i-- ) { // skip Root block
- Block *b = _blocks[i];
+ for(uint i = number_of_blocks() - 1; i > 0; i-- ) { // skip Root block
+ Block* block = get_block(i);
- if (b->head()->is_Loop()) {
- Block* loop_head = b;
+ if (block->head()->is_Loop()) {
+ Block* loop_head = block;
assert(loop_head->num_preds() - 1 == 2, "loop must have 2 predecessors");
Node* tail_n = loop_head->pred(LoopNode::LoopBackControl);
Block* tail = get_block_for_node(tail_n);
@@ -1533,23 +1563,23 @@
// Create a member list for each loop consisting
// of both blocks and (immediate child) loops.
- for (uint i = 0; i < _num_blocks; i++) {
- Block *b = _blocks[i];
- CFGLoop* lp = b->_loop;
+ for (uint i = 0; i < number_of_blocks(); i++) {
+ Block* block = get_block(i);
+ CFGLoop* lp = block->_loop;
if (lp == NULL) {
// Not assigned to a loop. Add it to the method's pseudo loop.
- b->_loop = root_loop;
+ block->_loop = root_loop;
lp = root_loop;
}
- if (lp == root_loop || b != lp->head()) { // loop heads are already members
- lp->add_member(b);
+ if (lp == root_loop || block != lp->head()) { // loop heads are already members
+ lp->add_member(block);
}
if (lp != root_loop) {
if (lp->parent() == NULL) {
// Not a nested loop. Make it a child of the method's pseudo loop.
root_loop->add_nested_loop(lp);
}
- if (b == lp->head()) {
+ if (block == lp->head()) {
// Add nested loop to member list of parent loop.
lp->parent()->add_member(lp);
}
--- a/hotspot/src/share/vm/opto/idealGraphPrinter.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/idealGraphPrinter.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -416,7 +416,7 @@
if (C->cfg() != NULL) {
Block* block = C->cfg()->get_block_for_node(node);
if (block == NULL) {
- print_prop("block", C->cfg()->_blocks[0]->_pre_order);
+ print_prop("block", C->cfg()->get_block(0)->_pre_order);
} else {
print_prop("block", block->_pre_order);
}
@@ -637,10 +637,10 @@
if (C->cfg() != NULL) {
// once we have a CFG there are some nodes that aren't really
// reachable but are in the CFG so add them here.
- for (uint i = 0; i < C->cfg()->_blocks.size(); i++) {
- Block *b = C->cfg()->_blocks[i];
- for (uint s = 0; s < b->_nodes.size(); s++) {
- nodeStack.push(b->_nodes[s]);
+ for (uint i = 0; i < C->cfg()->number_of_blocks(); i++) {
+ Block* block = C->cfg()->get_block(i);
+ for (uint s = 0; s < block->_nodes.size(); s++) {
+ nodeStack.push(block->_nodes[s]);
}
}
}
@@ -698,24 +698,24 @@
tail(EDGES_ELEMENT);
if (C->cfg() != NULL) {
head(CONTROL_FLOW_ELEMENT);
- for (uint i = 0; i < C->cfg()->_blocks.size(); i++) {
- Block *b = C->cfg()->_blocks[i];
+ for (uint i = 0; i < C->cfg()->number_of_blocks(); i++) {
+ Block* block = C->cfg()->get_block(i);
begin_head(BLOCK_ELEMENT);
- print_attr(BLOCK_NAME_PROPERTY, b->_pre_order);
+ print_attr(BLOCK_NAME_PROPERTY, block->_pre_order);
end_head();
head(SUCCESSORS_ELEMENT);
- for (uint s = 0; s < b->_num_succs; s++) {
+ for (uint s = 0; s < block->_num_succs; s++) {
begin_elem(SUCCESSOR_ELEMENT);
- print_attr(BLOCK_NAME_PROPERTY, b->_succs[s]->_pre_order);
+ print_attr(BLOCK_NAME_PROPERTY, block->_succs[s]->_pre_order);
end_elem();
}
tail(SUCCESSORS_ELEMENT);
head(NODES_ELEMENT);
- for (uint s = 0; s < b->_nodes.size(); s++) {
+ for (uint s = 0; s < block->_nodes.size(); s++) {
begin_elem(NODE_ELEMENT);
- print_attr(NODE_ID_PROPERTY, get_node_id(b->_nodes[s]));
+ print_attr(NODE_ID_PROPERTY, get_node_id(block->_nodes[s]));
end_elem();
}
tail(NODES_ELEMENT);
--- a/hotspot/src/share/vm/opto/ifg.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/ifg.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -37,12 +37,9 @@
#include "opto/memnode.hpp"
#include "opto/opcodes.hpp"
-//=============================================================================
-//------------------------------IFG--------------------------------------------
PhaseIFG::PhaseIFG( Arena *arena ) : Phase(Interference_Graph), _arena(arena) {
}
-//------------------------------init-------------------------------------------
void PhaseIFG::init( uint maxlrg ) {
_maxlrg = maxlrg;
_yanked = new (_arena) VectorSet(_arena);
@@ -59,7 +56,6 @@
}
}
-//------------------------------add--------------------------------------------
// Add edge between vertices a & b. These are sorted (triangular matrix),
// then the smaller number is inserted in the larger numbered array.
int PhaseIFG::add_edge( uint a, uint b ) {
@@ -71,7 +67,6 @@
return _adjs[a].insert( b );
}
-//------------------------------add_vector-------------------------------------
// Add an edge between 'a' and everything in the vector.
void PhaseIFG::add_vector( uint a, IndexSet *vec ) {
// IFG is triangular, so do the inserts where 'a' < 'b'.
@@ -86,7 +81,6 @@
}
}
-//------------------------------test-------------------------------------------
// Is there an edge between a and b?
int PhaseIFG::test_edge( uint a, uint b ) const {
// Sort a and b, so that a is larger
@@ -95,7 +89,6 @@
return _adjs[a].member(b);
}
-//------------------------------SquareUp---------------------------------------
// Convert triangular matrix to square matrix
void PhaseIFG::SquareUp() {
assert( !_is_square, "only on triangular" );
@@ -111,7 +104,6 @@
_is_square = true;
}
-//------------------------------Compute_Effective_Degree-----------------------
// Compute effective degree in bulk
void PhaseIFG::Compute_Effective_Degree() {
assert( _is_square, "only on square" );
@@ -120,7 +112,6 @@
lrgs(i).set_degree(effective_degree(i));
}
-//------------------------------test_edge_sq-----------------------------------
int PhaseIFG::test_edge_sq( uint a, uint b ) const {
assert( _is_square, "only on square" );
// Swap, so that 'a' has the lesser count. Then binary search is on
@@ -130,7 +121,6 @@
return _adjs[a].member(b);
}
-//------------------------------Union------------------------------------------
// Union edges of B into A
void PhaseIFG::Union( uint a, uint b ) {
assert( _is_square, "only on square" );
@@ -146,7 +136,6 @@
}
}
-//------------------------------remove_node------------------------------------
// Yank a Node and all connected edges from the IFG. Return a
// list of neighbors (edges) yanked.
IndexSet *PhaseIFG::remove_node( uint a ) {
@@ -165,7 +154,6 @@
return neighbors(a);
}
-//------------------------------re_insert--------------------------------------
// Re-insert a yanked Node.
void PhaseIFG::re_insert( uint a ) {
assert( _is_square, "only on square" );
@@ -180,7 +168,6 @@
}
}
-//------------------------------compute_degree---------------------------------
// Compute the degree between 2 live ranges. If both live ranges are
// aligned-adjacent powers-of-2 then we use the MAX size. If either is
// mis-aligned (or for Fat-Projections, not-adjacent) then we have to
@@ -196,7 +183,6 @@
return tmp;
}
-//------------------------------effective_degree-------------------------------
// Compute effective degree for this live range. If both live ranges are
// aligned-adjacent powers-of-2 then we use the MAX size. If either is
// mis-aligned (or for Fat-Projections, not-adjacent) then we have to
@@ -221,7 +207,6 @@
#ifndef PRODUCT
-//------------------------------dump-------------------------------------------
void PhaseIFG::dump() const {
tty->print_cr("-- Interference Graph --%s--",
_is_square ? "square" : "triangular" );
@@ -260,7 +245,6 @@
tty->print("\n");
}
-//------------------------------stats------------------------------------------
void PhaseIFG::stats() const {
ResourceMark rm;
int *h_cnt = NEW_RESOURCE_ARRAY(int,_maxlrg*2);
@@ -276,7 +260,6 @@
tty->print_cr("");
}
-//------------------------------verify-----------------------------------------
void PhaseIFG::verify( const PhaseChaitin *pc ) const {
// IFG is square, sorted and no need for Find
for( uint i = 0; i < _maxlrg; i++ ) {
@@ -298,7 +281,6 @@
}
#endif
-//------------------------------interfere_with_live----------------------------
// Interfere this register with everything currently live. Use the RegMasks
// to trim the set of possible interferences. Return a count of register-only
// interferences as an estimate of register pressure.
@@ -315,7 +297,6 @@
_ifg->add_edge( r, l );
}
-//------------------------------build_ifg_virtual------------------------------
// Actually build the interference graph. Uses virtual registers only, no
// physical register masks. This allows me to be very aggressive when
// coalescing copies. Some of this aggressiveness will have to be undone
@@ -325,9 +306,9 @@
void PhaseChaitin::build_ifg_virtual( ) {
// For all blocks (in any order) do...
- for( uint i=0; i<_cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
- IndexSet *liveout = _live->live(b);
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* block = _cfg.get_block(i);
+ IndexSet* liveout = _live->live(block);
// The IFG is built by a single reverse pass over each basic block.
// Starting with the known live-out set, we remove things that get
@@ -337,8 +318,8 @@
// The defined value interferes with everything currently live. The
// value is then removed from the live-ness set and it's inputs are
// added to the live-ness set.
- for( uint j = b->end_idx() + 1; j > 1; j-- ) {
- Node *n = b->_nodes[j-1];
+ for (uint j = block->end_idx() + 1; j > 1; j--) {
+ Node* n = block->_nodes[j - 1];
// Get value being defined
uint r = _lrg_map.live_range_id(n);
@@ -408,7 +389,6 @@
} // End of forall blocks
}
-//------------------------------count_int_pressure-----------------------------
uint PhaseChaitin::count_int_pressure( IndexSet *liveout ) {
IndexSetIterator elements(liveout);
uint lidx;
@@ -424,7 +404,6 @@
return cnt;
}
-//------------------------------count_float_pressure---------------------------
uint PhaseChaitin::count_float_pressure( IndexSet *liveout ) {
IndexSetIterator elements(liveout);
uint lidx;
@@ -438,7 +417,6 @@
return cnt;
}
-//------------------------------lower_pressure---------------------------------
// Adjust register pressure down by 1. Capture last hi-to-low transition,
static void lower_pressure( LRG *lrg, uint where, Block *b, uint *pressure, uint *hrp_index ) {
if (lrg->mask().is_UP() && lrg->mask_size()) {
@@ -460,40 +438,41 @@
}
}
-//------------------------------build_ifg_physical-----------------------------
// Build the interference graph using physical registers when available.
// That is, if 2 live ranges are simultaneously alive but in their acceptable
// register sets do not overlap, then they do not interfere.
uint PhaseChaitin::build_ifg_physical( ResourceArea *a ) {
NOT_PRODUCT( Compile::TracePhase t3("buildIFG", &_t_buildIFGphysical, TimeCompiler); )
- uint spill_reg = LRG::SPILL_REG;
uint must_spill = 0;
// For all blocks (in any order) do...
- for( uint i = 0; i < _cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* block = _cfg.get_block(i);
// Clone (rather than smash in place) the liveout info, so it is alive
// for the "collect_gc_info" phase later.
- IndexSet liveout(_live->live(b));
- uint last_inst = b->end_idx();
+ IndexSet liveout(_live->live(block));
+ uint last_inst = block->end_idx();
// Compute first nonphi node index
uint first_inst;
- for( first_inst = 1; first_inst < last_inst; first_inst++ )
- if( !b->_nodes[first_inst]->is_Phi() )
+ for (first_inst = 1; first_inst < last_inst; first_inst++) {
+ if (!block->_nodes[first_inst]->is_Phi()) {
break;
+ }
+ }
// Spills could be inserted before CreateEx node which should be
// first instruction in block after Phis. Move CreateEx up.
- for( uint insidx = first_inst; insidx < last_inst; insidx++ ) {
- Node *ex = b->_nodes[insidx];
- if( ex->is_SpillCopy() ) continue;
- if( insidx > first_inst && ex->is_Mach() &&
- ex->as_Mach()->ideal_Opcode() == Op_CreateEx ) {
+ for (uint insidx = first_inst; insidx < last_inst; insidx++) {
+ Node *ex = block->_nodes[insidx];
+ if (ex->is_SpillCopy()) {
+ continue;
+ }
+ if (insidx > first_inst && ex->is_Mach() && ex->as_Mach()->ideal_Opcode() == Op_CreateEx) {
// If the CreateEx isn't above all the MachSpillCopies
// then move it to the top.
- b->_nodes.remove(insidx);
- b->_nodes.insert(first_inst, ex);
+ block->_nodes.remove(insidx);
+ block->_nodes.insert(first_inst, ex);
}
// Stop once a CreateEx or any other node is found
break;
@@ -503,12 +482,12 @@
uint pressure[2], hrp_index[2];
pressure[0] = pressure[1] = 0;
hrp_index[0] = hrp_index[1] = last_inst+1;
- b->_reg_pressure = b->_freg_pressure = 0;
+ block->_reg_pressure = block->_freg_pressure = 0;
// Liveout things are presumed live for the whole block. We accumulate
// 'area' accordingly. If they get killed in the block, we'll subtract
// the unused part of the block from the area.
int inst_count = last_inst - first_inst;
- double cost = (inst_count <= 0) ? 0.0 : b->_freq * double(inst_count);
+ double cost = (inst_count <= 0) ? 0.0 : block->_freq * double(inst_count);
assert(!(cost < 0.0), "negative spill cost" );
IndexSetIterator elements(&liveout);
uint lidx;
@@ -519,13 +498,15 @@
if (lrg.mask().is_UP() && lrg.mask_size()) {
if (lrg._is_float || lrg._is_vector) { // Count float pressure
pressure[1] += lrg.reg_pressure();
- if( pressure[1] > b->_freg_pressure )
- b->_freg_pressure = pressure[1];
+ if (pressure[1] > block->_freg_pressure) {
+ block->_freg_pressure = pressure[1];
+ }
// Count int pressure, but do not count the SP, flags
- } else if( lrgs(lidx).mask().overlap(*Matcher::idealreg2regmask[Op_RegI]) ) {
+ } else if(lrgs(lidx).mask().overlap(*Matcher::idealreg2regmask[Op_RegI])) {
pressure[0] += lrg.reg_pressure();
- if( pressure[0] > b->_reg_pressure )
- b->_reg_pressure = pressure[0];
+ if (pressure[0] > block->_reg_pressure) {
+ block->_reg_pressure = pressure[0];
+ }
}
}
}
@@ -541,8 +522,8 @@
// value is then removed from the live-ness set and it's inputs are added
// to the live-ness set.
uint j;
- for( j = last_inst + 1; j > 1; j-- ) {
- Node *n = b->_nodes[j - 1];
+ for (j = last_inst + 1; j > 1; j--) {
+ Node* n = block->_nodes[j - 1];
// Get value being defined
uint r = _lrg_map.live_range_id(n);
@@ -551,7 +532,7 @@
if(r) {
// A DEF normally costs block frequency; rematerialized values are
// removed from the DEF sight, so LOWER costs here.
- lrgs(r)._cost += n->rematerialize() ? 0 : b->_freq;
+ lrgs(r)._cost += n->rematerialize() ? 0 : block->_freq;
// If it is not live, then this instruction is dead. Probably caused
// by spilling and rematerialization. Who cares why, yank this baby.
@@ -560,7 +541,7 @@
if( !n->is_Proj() ||
// Could also be a flags-projection of a dead ADD or such.
(_lrg_map.live_range_id(def) && !liveout.member(_lrg_map.live_range_id(def)))) {
- b->_nodes.remove(j - 1);
+ block->_nodes.remove(j - 1);
if (lrgs(r)._def == n) {
lrgs(r)._def = 0;
}
@@ -580,21 +561,21 @@
RegMask itmp = lrgs(r).mask();
itmp.AND(*Matcher::idealreg2regmask[Op_RegI]);
int iregs = itmp.Size();
- if( pressure[0]+iregs > b->_reg_pressure )
- b->_reg_pressure = pressure[0]+iregs;
- if( pressure[0] <= (uint)INTPRESSURE &&
- pressure[0]+iregs > (uint)INTPRESSURE ) {
- hrp_index[0] = j-1;
+ if (pressure[0]+iregs > block->_reg_pressure) {
+ block->_reg_pressure = pressure[0] + iregs;
+ }
+ if (pressure[0] <= (uint)INTPRESSURE && pressure[0] + iregs > (uint)INTPRESSURE) {
+ hrp_index[0] = j - 1;
}
// Count the float-only registers
RegMask ftmp = lrgs(r).mask();
ftmp.AND(*Matcher::idealreg2regmask[Op_RegD]);
int fregs = ftmp.Size();
- if( pressure[1]+fregs > b->_freg_pressure )
- b->_freg_pressure = pressure[1]+fregs;
- if( pressure[1] <= (uint)FLOATPRESSURE &&
- pressure[1]+fregs > (uint)FLOATPRESSURE ) {
- hrp_index[1] = j-1;
+ if (pressure[1] + fregs > block->_freg_pressure) {
+ block->_freg_pressure = pressure[1] + fregs;
+ }
+ if(pressure[1] <= (uint)FLOATPRESSURE && pressure[1]+fregs > (uint)FLOATPRESSURE) {
+ hrp_index[1] = j - 1;
}
}
@@ -607,7 +588,7 @@
if( n->is_SpillCopy()
&& lrgs(r).is_singledef() // MultiDef live range can still split
&& n->outcnt() == 1 // and use must be in this block
- && _cfg.get_block_for_node(n->unique_out()) == b ) {
+ && _cfg.get_block_for_node(n->unique_out()) == block) {
// All single-use MachSpillCopy(s) that immediately precede their
// use must color early. If a longer live range steals their
// color, the spill copy will split and may push another spill copy
@@ -617,14 +598,16 @@
//
Node *single_use = n->unique_out();
- assert( b->find_node(single_use) >= j, "Use must be later in block");
+ assert(block->find_node(single_use) >= j, "Use must be later in block");
// Use can be earlier in block if it is a Phi, but then I should be a MultiDef
// Find first non SpillCopy 'm' that follows the current instruction
// (j - 1) is index for current instruction 'n'
Node *m = n;
- for( uint i = j; i <= last_inst && m->is_SpillCopy(); ++i ) { m = b->_nodes[i]; }
- if( m == single_use ) {
+ for (uint i = j; i <= last_inst && m->is_SpillCopy(); ++i) {
+ m = block->_nodes[i];
+ }
+ if (m == single_use) {
lrgs(r)._area = 0.0;
}
}
@@ -633,7 +616,7 @@
if( liveout.remove(r) ) {
// Adjust register pressure.
// Capture last hi-to-lo pressure transition
- lower_pressure( &lrgs(r), j-1, b, pressure, hrp_index );
+ lower_pressure(&lrgs(r), j - 1, block, pressure, hrp_index);
assert( pressure[0] == count_int_pressure (&liveout), "" );
assert( pressure[1] == count_float_pressure(&liveout), "" );
}
@@ -646,7 +629,7 @@
if (liveout.remove(x)) {
lrgs(x)._area -= cost;
// Adjust register pressure.
- lower_pressure(&lrgs(x), j-1, b, pressure, hrp_index);
+ lower_pressure(&lrgs(x), j - 1, block, pressure, hrp_index);
assert( pressure[0] == count_int_pressure (&liveout), "" );
assert( pressure[1] == count_float_pressure(&liveout), "" );
}
@@ -718,7 +701,7 @@
// Area remaining in the block
inst_count--;
- cost = (inst_count <= 0) ? 0.0 : b->_freq * double(inst_count);
+ cost = (inst_count <= 0) ? 0.0 : block->_freq * double(inst_count);
// Make all inputs live
if( !n->is_Phi() ) { // Phi function uses come from prior block
@@ -743,7 +726,7 @@
if (k < debug_start) {
// A USE costs twice block frequency (once for the Load, once
// for a Load-delay). Rematerialized uses only cost once.
- lrg._cost += (def->rematerialize() ? b->_freq : (b->_freq + b->_freq));
+ lrg._cost += (def->rematerialize() ? block->_freq : (block->_freq + block->_freq));
}
// It is live now
if (liveout.insert(x)) {
@@ -753,12 +736,14 @@
if (lrg.mask().is_UP() && lrg.mask_size()) {
if (lrg._is_float || lrg._is_vector) {
pressure[1] += lrg.reg_pressure();
- if( pressure[1] > b->_freg_pressure )
- b->_freg_pressure = pressure[1];
+ if (pressure[1] > block->_freg_pressure) {
+ block->_freg_pressure = pressure[1];
+ }
} else if( lrg.mask().overlap(*Matcher::idealreg2regmask[Op_RegI]) ) {
pressure[0] += lrg.reg_pressure();
- if( pressure[0] > b->_reg_pressure )
- b->_reg_pressure = pressure[0];
+ if (pressure[0] > block->_reg_pressure) {
+ block->_reg_pressure = pressure[0];
+ }
}
}
assert( pressure[0] == count_int_pressure (&liveout), "" );
@@ -772,44 +757,47 @@
// If we run off the top of the block with high pressure and
// never see a hi-to-low pressure transition, just record that
// the whole block is high pressure.
- if( pressure[0] > (uint)INTPRESSURE ) {
+ if (pressure[0] > (uint)INTPRESSURE) {
hrp_index[0] = 0;
- if( pressure[0] > b->_reg_pressure )
- b->_reg_pressure = pressure[0];
+ if (pressure[0] > block->_reg_pressure) {
+ block->_reg_pressure = pressure[0];
+ }
}
- if( pressure[1] > (uint)FLOATPRESSURE ) {
+ if (pressure[1] > (uint)FLOATPRESSURE) {
hrp_index[1] = 0;
- if( pressure[1] > b->_freg_pressure )
- b->_freg_pressure = pressure[1];
+ if (pressure[1] > block->_freg_pressure) {
+ block->_freg_pressure = pressure[1];
+ }
}
// Compute high pressure indice; avoid landing in the middle of projnodes
j = hrp_index[0];
- if( j < b->_nodes.size() && j < b->end_idx()+1 ) {
- Node *cur = b->_nodes[j];
- while( cur->is_Proj() || (cur->is_MachNullCheck()) || cur->is_Catch() ) {
+ if (j < block->_nodes.size() && j < block->end_idx() + 1) {
+ Node* cur = block->_nodes[j];
+ while (cur->is_Proj() || (cur->is_MachNullCheck()) || cur->is_Catch()) {
j--;
- cur = b->_nodes[j];
+ cur = block->_nodes[j];
}
}
- b->_ihrp_index = j;
+ block->_ihrp_index = j;
j = hrp_index[1];
- if( j < b->_nodes.size() && j < b->end_idx()+1 ) {
- Node *cur = b->_nodes[j];
- while( cur->is_Proj() || (cur->is_MachNullCheck()) || cur->is_Catch() ) {
+ if (j < block->_nodes.size() && j < block->end_idx() + 1) {
+ Node* cur = block->_nodes[j];
+ while (cur->is_Proj() || (cur->is_MachNullCheck()) || cur->is_Catch()) {
j--;
- cur = b->_nodes[j];
+ cur = block->_nodes[j];
}
}
- b->_fhrp_index = j;
+ block->_fhrp_index = j;
#ifndef PRODUCT
// Gather Register Pressure Statistics
if( PrintOptoStatistics ) {
- if( b->_reg_pressure > (uint)INTPRESSURE || b->_freg_pressure > (uint)FLOATPRESSURE )
+ if (block->_reg_pressure > (uint)INTPRESSURE || block->_freg_pressure > (uint)FLOATPRESSURE) {
_high_pressure++;
- else
+ } else {
_low_pressure++;
+ }
}
#endif
} // End of for all blocks
--- a/hotspot/src/share/vm/opto/lcm.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/lcm.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -501,7 +501,7 @@
n_choice = 1;
}
- uint n_latency = cfg->_node_latency->at_grow(n->_idx);
+ uint n_latency = cfg->get_latency_for_node(n);
uint n_score = n->req(); // Many inputs get high score to break ties
// Keep best latency found
@@ -797,7 +797,7 @@
Node *n = _nodes[j];
int idx = n->_idx;
tty->print("# ready cnt:%3d ", ready_cnt.at(idx));
- tty->print("latency:%3d ", cfg->_node_latency->at_grow(idx));
+ tty->print("latency:%3d ", cfg->get_latency_for_node(n));
tty->print("%4d: %s\n", idx, n->Name());
}
}
@@ -825,7 +825,7 @@
#ifndef PRODUCT
if (cfg->trace_opto_pipelining()) {
tty->print("# select %d: %s", n->_idx, n->Name());
- tty->print(", latency:%d", cfg->_node_latency->at_grow(n->_idx));
+ tty->print(", latency:%d", cfg->get_latency_for_node(n));
n->dump();
if (Verbose) {
tty->print("# ready list:");
--- a/hotspot/src/share/vm/opto/library_call.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/library_call.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -213,6 +213,7 @@
void insert_pre_barrier(Node* base_oop, Node* offset, Node* pre_val, bool need_mem_bar);
bool inline_unsafe_access(bool is_native_ptr, bool is_store, BasicType type, bool is_volatile);
bool inline_unsafe_prefetch(bool is_native_ptr, bool is_store, bool is_static);
+ static bool klass_needs_init_guard(Node* kls);
bool inline_unsafe_allocate();
bool inline_unsafe_copyMemory();
bool inline_native_currentThread();
@@ -2892,8 +2893,21 @@
}
}
+bool LibraryCallKit::klass_needs_init_guard(Node* kls) {
+ if (!kls->is_Con()) {
+ return true;
+ }
+ const TypeKlassPtr* klsptr = kls->bottom_type()->isa_klassptr();
+ if (klsptr == NULL) {
+ return true;
+ }
+ ciInstanceKlass* ik = klsptr->klass()->as_instance_klass();
+ // don't need a guard for a klass that is already initialized
+ return !ik->is_initialized();
+}
+
//----------------------------inline_unsafe_allocate---------------------------
-// public native Object sun.mics.Unsafe.allocateInstance(Class<?> cls);
+// public native Object sun.misc.Unsafe.allocateInstance(Class<?> cls);
bool LibraryCallKit::inline_unsafe_allocate() {
if (callee()->is_static()) return false; // caller must have the capability!
@@ -2905,16 +2919,19 @@
kls = null_check(kls);
if (stopped()) return true; // argument was like int.class
- // Note: The argument might still be an illegal value like
- // Serializable.class or Object[].class. The runtime will handle it.
- // But we must make an explicit check for initialization.
- Node* insp = basic_plus_adr(kls, in_bytes(InstanceKlass::init_state_offset()));
- // Use T_BOOLEAN for InstanceKlass::_init_state so the compiler
- // can generate code to load it as unsigned byte.
- Node* inst = make_load(NULL, insp, TypeInt::UBYTE, T_BOOLEAN);
- Node* bits = intcon(InstanceKlass::fully_initialized);
- Node* test = _gvn.transform(new (C) SubINode(inst, bits));
- // The 'test' is non-zero if we need to take a slow path.
+ Node* test = NULL;
+ if (LibraryCallKit::klass_needs_init_guard(kls)) {
+ // Note: The argument might still be an illegal value like
+ // Serializable.class or Object[].class. The runtime will handle it.
+ // But we must make an explicit check for initialization.
+ Node* insp = basic_plus_adr(kls, in_bytes(InstanceKlass::init_state_offset()));
+ // Use T_BOOLEAN for InstanceKlass::_init_state so the compiler
+ // can generate code to load it as unsigned byte.
+ Node* inst = make_load(NULL, insp, TypeInt::UBYTE, T_BOOLEAN);
+ Node* bits = intcon(InstanceKlass::fully_initialized);
+ test = _gvn.transform(new (C) SubINode(inst, bits));
+ // The 'test' is non-zero if we need to take a slow path.
+ }
Node* obj = new_instance(kls, test);
set_result(obj);
--- a/hotspot/src/share/vm/opto/live.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/live.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -30,9 +30,6 @@
#include "opto/machnode.hpp"
-
-//=============================================================================
-//------------------------------PhaseLive--------------------------------------
// Compute live-in/live-out. We use a totally incremental algorithm. The LIVE
// problem is monotonic. The steady-state solution looks like this: pull a
// block from the worklist. It has a set of delta's - values which are newly
@@ -53,9 +50,9 @@
// Init the sparse live arrays. This data is live on exit from here!
// The _live info is the live-out info.
- _live = (IndexSet*)_arena->Amalloc(sizeof(IndexSet)*_cfg._num_blocks);
+ _live = (IndexSet*)_arena->Amalloc(sizeof(IndexSet) * _cfg.number_of_blocks());
uint i;
- for( i=0; i<_cfg._num_blocks; i++ ) {
+ for (i = 0; i < _cfg.number_of_blocks(); i++) {
_live[i].initialize(_maxlrg);
}
@@ -65,14 +62,14 @@
// Does the memory used by _defs and _deltas get reclaimed? Does it matter? TT
// Array of values defined locally in blocks
- _defs = NEW_RESOURCE_ARRAY(IndexSet,_cfg._num_blocks);
- for( i=0; i<_cfg._num_blocks; i++ ) {
+ _defs = NEW_RESOURCE_ARRAY(IndexSet,_cfg.number_of_blocks());
+ for (i = 0; i < _cfg.number_of_blocks(); i++) {
_defs[i].initialize(_maxlrg);
}
// Array of delta-set pointers, indexed by block pre_order-1.
- _deltas = NEW_RESOURCE_ARRAY(IndexSet*,_cfg._num_blocks);
- memset( _deltas, 0, sizeof(IndexSet*)* _cfg._num_blocks);
+ _deltas = NEW_RESOURCE_ARRAY(IndexSet*,_cfg.number_of_blocks());
+ memset( _deltas, 0, sizeof(IndexSet*)* _cfg.number_of_blocks());
_free_IndexSet = NULL;
@@ -80,31 +77,32 @@
VectorSet first_pass(Thread::current()->resource_area());
// Outer loop: must compute local live-in sets and push into predecessors.
- uint iters = _cfg._num_blocks; // stat counters
- for( uint j=_cfg._num_blocks; j>0; j-- ) {
- Block *b = _cfg._blocks[j-1];
+ for (uint j = _cfg.number_of_blocks(); j > 0; j--) {
+ Block* block = _cfg.get_block(j - 1);
// Compute the local live-in set. Start with any new live-out bits.
- IndexSet *use = getset( b );
- IndexSet *def = &_defs[b->_pre_order-1];
+ IndexSet* use = getset(block);
+ IndexSet* def = &_defs[block->_pre_order-1];
DEBUG_ONLY(IndexSet *def_outside = getfreeset();)
uint i;
- for( i=b->_nodes.size(); i>1; i-- ) {
- Node *n = b->_nodes[i-1];
- if( n->is_Phi() ) break;
+ for (i = block->_nodes.size(); i > 1; i--) {
+ Node* n = block->_nodes[i-1];
+ if (n->is_Phi()) {
+ break;
+ }
uint r = _names[n->_idx];
assert(!def_outside->member(r), "Use of external LRG overlaps the same LRG defined in this block");
def->insert( r );
use->remove( r );
uint cnt = n->req();
- for( uint k=1; k<cnt; k++ ) {
+ for (uint k = 1; k < cnt; k++) {
Node *nk = n->in(k);
uint nkidx = nk->_idx;
- if (_cfg.get_block_for_node(nk) != b) {
+ if (_cfg.get_block_for_node(nk) != block) {
uint u = _names[nkidx];
- use->insert( u );
- DEBUG_ONLY(def_outside->insert( u );)
+ use->insert(u);
+ DEBUG_ONLY(def_outside->insert(u);)
}
}
}
@@ -113,41 +111,38 @@
_free_IndexSet = def_outside; // Drop onto free list
#endif
// Remove anything defined by Phis and the block start instruction
- for( uint k=i; k>0; k-- ) {
- uint r = _names[b->_nodes[k-1]->_idx];
- def->insert( r );
- use->remove( r );
+ for (uint k = i; k > 0; k--) {
+ uint r = _names[block->_nodes[k - 1]->_idx];
+ def->insert(r);
+ use->remove(r);
}
// Push these live-in things to predecessors
- for( uint l=1; l<b->num_preds(); l++ ) {
- Block *p = _cfg.get_block_for_node(b->pred(l));
- add_liveout( p, use, first_pass );
+ for (uint l = 1; l < block->num_preds(); l++) {
+ Block* p = _cfg.get_block_for_node(block->pred(l));
+ add_liveout(p, use, first_pass);
// PhiNode uses go in the live-out set of prior blocks.
- for( uint k=i; k>0; k-- )
- add_liveout( p, _names[b->_nodes[k-1]->in(l)->_idx], first_pass );
+ for (uint k = i; k > 0; k--) {
+ add_liveout(p, _names[block->_nodes[k-1]->in(l)->_idx], first_pass);
+ }
}
- freeset( b );
- first_pass.set(b->_pre_order);
+ freeset(block);
+ first_pass.set(block->_pre_order);
// Inner loop: blocks that picked up new live-out values to be propagated
- while( _worklist->size() ) {
- // !!!!!
-// #ifdef ASSERT
- iters++;
-// #endif
- Block *b = _worklist->pop();
- IndexSet *delta = getset(b);
+ while (_worklist->size()) {
+ Block* block = _worklist->pop();
+ IndexSet *delta = getset(block);
assert( delta->count(), "missing delta set" );
// Add new-live-in to predecessors live-out sets
- for (uint l = 1; l < b->num_preds(); l++) {
- Block* block = _cfg.get_block_for_node(b->pred(l));
- add_liveout(block, delta, first_pass);
+ for (uint l = 1; l < block->num_preds(); l++) {
+ Block* predecessor = _cfg.get_block_for_node(block->pred(l));
+ add_liveout(predecessor, delta, first_pass);
}
- freeset(b);
+ freeset(block);
} // End of while-worklist-not-empty
} // End of for-all-blocks-outer-loop
@@ -155,7 +150,7 @@
// We explicitly clear all of the IndexSets which we are about to release.
// This allows us to recycle their internal memory into IndexSet's free list.
- for( i=0; i<_cfg._num_blocks; i++ ) {
+ for (i = 0; i < _cfg.number_of_blocks(); i++) {
_defs[i].clear();
if (_deltas[i]) {
// Is this always true?
@@ -171,13 +166,11 @@
}
-//------------------------------stats------------------------------------------
#ifndef PRODUCT
void PhaseLive::stats(uint iters) const {
}
#endif
-//------------------------------getset-----------------------------------------
// Get an IndexSet for a block. Return existing one, if any. Make a new
// empty one if a prior one does not exist.
IndexSet *PhaseLive::getset( Block *p ) {
@@ -188,7 +181,6 @@
return delta; // Return set of new live-out items
}
-//------------------------------getfreeset-------------------------------------
// Pull from free list, or allocate. Internal allocation on the returned set
// is always from thread local storage.
IndexSet *PhaseLive::getfreeset( ) {
@@ -207,7 +199,6 @@
return f;
}
-//------------------------------freeset----------------------------------------
// Free an IndexSet from a block.
void PhaseLive::freeset( const Block *p ) {
IndexSet *f = _deltas[p->_pre_order-1];
@@ -216,7 +207,6 @@
_deltas[p->_pre_order-1] = NULL;
}
-//------------------------------add_liveout------------------------------------
// Add a live-out value to a given blocks live-out set. If it is new, then
// also add it to the delta set and stick the block on the worklist.
void PhaseLive::add_liveout( Block *p, uint r, VectorSet &first_pass ) {
@@ -233,8 +223,6 @@
}
}
-
-//------------------------------add_liveout------------------------------------
// Add a vector of live-out values to a given blocks live-out set.
void PhaseLive::add_liveout( Block *p, IndexSet *lo, VectorSet &first_pass ) {
IndexSet *live = &_live[p->_pre_order-1];
@@ -262,7 +250,6 @@
}
#ifndef PRODUCT
-//------------------------------dump-------------------------------------------
// Dump the live-out set for a block
void PhaseLive::dump( const Block *b ) const {
tty->print("Block %d: ",b->_pre_order);
@@ -275,18 +262,19 @@
tty->print("\n");
}
-//------------------------------verify_base_ptrs-------------------------------
// Verify that base pointers and derived pointers are still sane.
void PhaseChaitin::verify_base_ptrs( ResourceArea *a ) const {
#ifdef ASSERT
Unique_Node_List worklist(a);
- for( uint i = 0; i < _cfg._num_blocks; i++ ) {
- Block *b = _cfg._blocks[i];
- for( uint j = b->end_idx() + 1; j > 1; j-- ) {
- Node *n = b->_nodes[j-1];
- if( n->is_Phi() ) break;
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
+ Block* block = _cfg.get_block(i);
+ for (uint j = block->end_idx() + 1; j > 1; j--) {
+ Node* n = block->_nodes[j-1];
+ if (n->is_Phi()) {
+ break;
+ }
// Found a safepoint?
- if( n->is_MachSafePoint() ) {
+ if (n->is_MachSafePoint()) {
MachSafePointNode *sfpt = n->as_MachSafePoint();
JVMState* jvms = sfpt->jvms();
if (jvms != NULL) {
@@ -358,7 +346,6 @@
#endif
}
-//------------------------------verify-------------------------------------
// Verify that graphs and base pointers are still sane.
void PhaseChaitin::verify( ResourceArea *a, bool verify_ifg ) const {
#ifdef ASSERT
--- a/hotspot/src/share/vm/opto/matcher.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/matcher.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -67,8 +67,8 @@
const uint Matcher::_end_rematerialize = _END_REMATERIALIZE;
//---------------------------Matcher-------------------------------------------
-Matcher::Matcher( Node_List &proj_list ) :
- PhaseTransform( Phase::Ins_Select ),
+Matcher::Matcher()
+: PhaseTransform( Phase::Ins_Select ),
#ifdef ASSERT
_old2new_map(C->comp_arena()),
_new2old_map(C->comp_arena()),
@@ -78,7 +78,7 @@
_swallowed(swallowed),
_begin_inst_chain_rule(_BEGIN_INST_CHAIN_RULE),
_end_inst_chain_rule(_END_INST_CHAIN_RULE),
- _must_clone(must_clone), _proj_list(proj_list),
+ _must_clone(must_clone),
_register_save_policy(register_save_policy),
_c_reg_save_policy(c_reg_save_policy),
_register_save_type(register_save_type),
@@ -1304,8 +1304,9 @@
for (int i = begin_out_arg_area; i < out_arg_limit_per_call; i++)
proj->_rout.Insert(OptoReg::Name(i));
}
- if( proj->_rout.is_NotEmpty() )
- _proj_list.push(proj);
+ if (proj->_rout.is_NotEmpty()) {
+ push_projection(proj);
+ }
}
// Transfer the safepoint information from the call to the mcall
// Move the JVMState list
@@ -1685,14 +1686,15 @@
}
// If the _leaf is an AddP, insert the base edge
- if( leaf->is_AddP() )
+ if (leaf->is_AddP()) {
mach->ins_req(AddPNode::Base,leaf->in(AddPNode::Base));
+ }
- uint num_proj = _proj_list.size();
+ uint number_of_projections_prior = number_of_projections();
// Perform any 1-to-many expansions required
- MachNode *ex = mach->Expand(s,_proj_list, mem);
- if( ex != mach ) {
+ MachNode *ex = mach->Expand(s, _projection_list, mem);
+ if (ex != mach) {
assert(ex->ideal_reg() == mach->ideal_reg(), "ideal types should match");
if( ex->in(1)->is_Con() )
ex->in(1)->set_req(0, C->root());
@@ -1713,7 +1715,7 @@
// generated belatedly during spill code generation.
if (_allocation_started) {
guarantee(ex == mach, "no expand rules during spill generation");
- guarantee(_proj_list.size() == num_proj, "no allocation during spill generation");
+ guarantee(number_of_projections_prior == number_of_projections(), "no allocation during spill generation");
}
if (leaf->is_Con() || leaf->is_DecodeNarrowPtr()) {
--- a/hotspot/src/share/vm/opto/matcher.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/matcher.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -88,7 +88,7 @@
Node *transform( Node *dummy );
- Node_List &_proj_list; // For Machine nodes killing many values
+ Node_List _projection_list; // For Machine nodes killing many values
Node_Array _shared_nodes;
@@ -183,10 +183,30 @@
void collect_null_checks( Node *proj, Node *orig_proj );
void validate_null_checks( );
- Matcher( Node_List &proj_list );
+ Matcher();
+
+ // Get a projection node at position pos
+ Node* get_projection(uint pos) {
+ return _projection_list[pos];
+ }
+
+ // Push a projection node onto the projection list
+ void push_projection(Node* node) {
+ _projection_list.push(node);
+ }
+
+ Node* pop_projection() {
+ return _projection_list.pop();
+ }
+
+ // Number of nodes in the projection list
+ uint number_of_projections() const {
+ return _projection_list.size();
+ }
// Select instructions for entire method
- void match( );
+ void match();
+
// Helper for match
OptoReg::Name warp_incoming_stk_arg( VMReg reg );
--- a/hotspot/src/share/vm/opto/output.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/output.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -54,11 +54,10 @@
extern int emit_exception_handler(CodeBuffer &cbuf);
extern int emit_deopt_handler(CodeBuffer &cbuf);
-//------------------------------Output-----------------------------------------
// Convert Nodes to instruction bits and pass off to the VM
void Compile::Output() {
// RootNode goes
- assert( _cfg->_broot->_nodes.size() == 0, "" );
+ assert( _cfg->get_root_block()->_nodes.size() == 0, "" );
// The number of new nodes (mostly MachNop) is proportional to
// the number of java calls and inner loops which are aligned.
@@ -68,8 +67,8 @@
return;
}
// Make sure I can find the Start Node
- Block *entry = _cfg->_blocks[1];
- Block *broot = _cfg->_broot;
+ Block *entry = _cfg->get_block(1);
+ Block *broot = _cfg->get_root_block();
const StartNode *start = entry->_nodes[0]->as_Start();
@@ -109,40 +108,44 @@
}
// Insert epilogs before every return
- for( uint i=0; i<_cfg->_num_blocks; i++ ) {
- Block *b = _cfg->_blocks[i];
- if( !b->is_connector() && b->non_connector_successor(0) == _cfg->_broot ) { // Found a program exit point?
- Node *m = b->end();
- if( m->is_Mach() && m->as_Mach()->ideal_Opcode() != Op_Halt ) {
- MachEpilogNode *epilog = new (this) MachEpilogNode(m->as_Mach()->ideal_Opcode() == Op_Return);
- b->add_inst( epilog );
- _cfg->map_node_to_block(epilog, b);
+ for (uint i = 0; i < _cfg->number_of_blocks(); i++) {
+ Block* block = _cfg->get_block(i);
+ if (!block->is_connector() && block->non_connector_successor(0) == _cfg->get_root_block()) { // Found a program exit point?
+ Node* m = block->end();
+ if (m->is_Mach() && m->as_Mach()->ideal_Opcode() != Op_Halt) {
+ MachEpilogNode* epilog = new (this) MachEpilogNode(m->as_Mach()->ideal_Opcode() == Op_Return);
+ block->add_inst(epilog);
+ _cfg->map_node_to_block(epilog, block);
}
}
}
# ifdef ENABLE_ZAP_DEAD_LOCALS
- if ( ZapDeadCompiledLocals ) Insert_zap_nodes();
+ if (ZapDeadCompiledLocals) {
+ Insert_zap_nodes();
+ }
# endif
- uint* blk_starts = NEW_RESOURCE_ARRAY(uint,_cfg->_num_blocks+1);
- blk_starts[0] = 0;
+ uint* blk_starts = NEW_RESOURCE_ARRAY(uint, _cfg->number_of_blocks() + 1);
+ blk_starts[0] = 0;
// Initialize code buffer and process short branches.
CodeBuffer* cb = init_buffer(blk_starts);
- if (cb == NULL || failing()) return;
+ if (cb == NULL || failing()) {
+ return;
+ }
ScheduleAndBundle();
#ifndef PRODUCT
if (trace_opto_output()) {
tty->print("\n---- After ScheduleAndBundle ----\n");
- for (uint i = 0; i < _cfg->_num_blocks; i++) {
+ for (uint i = 0; i < _cfg->number_of_blocks(); i++) {
tty->print("\nBB#%03d:\n", i);
- Block *bb = _cfg->_blocks[i];
- for (uint j = 0; j < bb->_nodes.size(); j++) {
- Node *n = bb->_nodes[j];
+ Block* block = _cfg->get_block(i);
+ for (uint j = 0; j < block->_nodes.size(); j++) {
+ Node* n = block->_nodes[j];
OptoReg::Name reg = _regalloc->get_reg_first(n);
tty->print(" %-6s ", reg >= 0 && reg < REG_COUNT ? Matcher::regName[reg] : "");
n->dump();
@@ -151,11 +154,15 @@
}
#endif
- if (failing()) return;
+ if (failing()) {
+ return;
+ }
BuildOopMaps();
- if (failing()) return;
+ if (failing()) {
+ return;
+ }
fill_buffer(cb, blk_starts);
}
@@ -217,8 +224,8 @@
return; // no safepoints/oopmaps emitted for calls in stubs,so we don't care
// Insert call to zap runtime stub before every node with an oop map
- for( uint i=0; i<_cfg->_num_blocks; i++ ) {
- Block *b = _cfg->_blocks[i];
+ for( uint i=0; i<_cfg->number_of_blocks(); i++ ) {
+ Block *b = _cfg->get_block(i);
for ( uint j = 0; j < b->_nodes.size(); ++j ) {
Node *n = b->_nodes[j];
@@ -275,7 +282,6 @@
return _matcher->match_sfpt(ideal_node);
}
-//------------------------------is_node_getting_a_safepoint--------------------
bool Compile::is_node_getting_a_safepoint( Node* n) {
// This code duplicates the logic prior to the call of add_safepoint
// below in this file.
@@ -285,7 +291,6 @@
# endif // ENABLE_ZAP_DEAD_LOCALS
-//------------------------------compute_loop_first_inst_sizes------------------
// Compute the size of first NumberOfLoopInstrToAlign instructions at the top
// of a loop. When aligning a loop we need to provide enough instructions
// in cpu's fetch buffer to feed decoders. The loop alignment could be
@@ -302,42 +307,39 @@
// or alignment padding is larger then MaxLoopPad. By default, MaxLoopPad
// is equal to OptoLoopAlignment-1 except on new Intel cpus, where it is
// equal to 11 bytes which is the largest address NOP instruction.
- if( MaxLoopPad < OptoLoopAlignment-1 ) {
- uint last_block = _cfg->_num_blocks-1;
- for( uint i=1; i <= last_block; i++ ) {
- Block *b = _cfg->_blocks[i];
+ if (MaxLoopPad < OptoLoopAlignment - 1) {
+ uint last_block = _cfg->number_of_blocks() - 1;
+ for (uint i = 1; i <= last_block; i++) {
+ Block* block = _cfg->get_block(i);
// Check the first loop's block which requires an alignment.
- if( b->loop_alignment() > (uint)relocInfo::addr_unit() ) {
+ if (block->loop_alignment() > (uint)relocInfo::addr_unit()) {
uint sum_size = 0;
uint inst_cnt = NumberOfLoopInstrToAlign;
- inst_cnt = b->compute_first_inst_size(sum_size, inst_cnt, _regalloc);
+ inst_cnt = block->compute_first_inst_size(sum_size, inst_cnt, _regalloc);
// Check subsequent fallthrough blocks if the loop's first
// block(s) does not have enough instructions.
- Block *nb = b;
- while( inst_cnt > 0 &&
- i < last_block &&
- !_cfg->_blocks[i+1]->has_loop_alignment() &&
- !nb->has_successor(b) ) {
+ Block *nb = block;
+ while(inst_cnt > 0 &&
+ i < last_block &&
+ !_cfg->get_block(i + 1)->has_loop_alignment() &&
+ !nb->has_successor(block)) {
i++;
- nb = _cfg->_blocks[i];
+ nb = _cfg->get_block(i);
inst_cnt = nb->compute_first_inst_size(sum_size, inst_cnt, _regalloc);
} // while( inst_cnt > 0 && i < last_block )
- b->set_first_inst_size(sum_size);
+ block->set_first_inst_size(sum_size);
} // f( b->head()->is_Loop() )
} // for( i <= last_block )
} // if( MaxLoopPad < OptoLoopAlignment-1 )
}
-//----------------------shorten_branches---------------------------------------
// The architecture description provides short branch variants for some long
// branch instructions. Replace eligible long branches with short branches.
void Compile::shorten_branches(uint* blk_starts, int& code_size, int& reloc_size, int& stub_size) {
-
- // ------------------
// Compute size of each block, method size, and relocation information size
- uint nblocks = _cfg->_num_blocks;
+ uint nblocks = _cfg->number_of_blocks();
uint* jmp_offset = NEW_RESOURCE_ARRAY(uint,nblocks);
uint* jmp_size = NEW_RESOURCE_ARRAY(uint,nblocks);
@@ -364,7 +366,7 @@
uint last_avoid_back_to_back_adr = max_uint;
uint nop_size = (new (this) MachNopNode())->size(_regalloc);
for (uint i = 0; i < nblocks; i++) { // For all blocks
- Block *b = _cfg->_blocks[i];
+ Block* block = _cfg->get_block(i);
// During short branch replacement, we store the relative (to blk_starts)
// offset of jump in jmp_offset, rather than the absolute offset of jump.
@@ -377,10 +379,10 @@
DEBUG_ONLY( jmp_rule[i] = 0; )
// Sum all instruction sizes to compute block size
- uint last_inst = b->_nodes.size();
+ uint last_inst = block->_nodes.size();
uint blk_size = 0;
for (uint j = 0; j < last_inst; j++) {
- Node* nj = b->_nodes[j];
+ Node* nj = block->_nodes[j];
// Handle machine instruction nodes
if (nj->is_Mach()) {
MachNode *mach = nj->as_Mach();
@@ -441,8 +443,8 @@
// When the next block starts a loop, we may insert pad NOP
// instructions. Since we cannot know our future alignment,
// assume the worst.
- if (i< nblocks-1) {
- Block *nb = _cfg->_blocks[i+1];
+ if (i < nblocks - 1) {
+ Block* nb = _cfg->get_block(i + 1);
int max_loop_pad = nb->code_alignment()-relocInfo::addr_unit();
if (max_loop_pad > 0) {
assert(is_power_of_2(max_loop_pad+relocInfo::addr_unit()), "");
@@ -473,26 +475,26 @@
has_short_branch_candidate = false;
int adjust_block_start = 0;
for (uint i = 0; i < nblocks; i++) {
- Block *b = _cfg->_blocks[i];
+ Block* block = _cfg->get_block(i);
int idx = jmp_nidx[i];
- MachNode* mach = (idx == -1) ? NULL: b->_nodes[idx]->as_Mach();
+ MachNode* mach = (idx == -1) ? NULL: block->_nodes[idx]->as_Mach();
if (mach != NULL && mach->may_be_short_branch()) {
#ifdef ASSERT
assert(jmp_size[i] > 0 && mach->is_MachBranch(), "sanity");
int j;
// Find the branch; ignore trailing NOPs.
- for (j = b->_nodes.size()-1; j>=0; j--) {
- Node* n = b->_nodes[j];
+ for (j = block->_nodes.size()-1; j>=0; j--) {
+ Node* n = block->_nodes[j];
if (!n->is_Mach() || n->as_Mach()->ideal_Opcode() != Op_Con)
break;
}
- assert(j >= 0 && j == idx && b->_nodes[j] == (Node*)mach, "sanity");
+ assert(j >= 0 && j == idx && block->_nodes[j] == (Node*)mach, "sanity");
#endif
int br_size = jmp_size[i];
int br_offs = blk_starts[i] + jmp_offset[i];
// This requires the TRUE branch target be in succs[0]
- uint bnum = b->non_connector_successor(0)->_pre_order;
+ uint bnum = block->non_connector_successor(0)->_pre_order;
int offset = blk_starts[bnum] - br_offs;
if (bnum > i) { // adjust following block's offset
offset -= adjust_block_start;
@@ -520,7 +522,7 @@
diff -= nop_size;
}
adjust_block_start += diff;
- b->_nodes.map(idx, replacement);
+ block->_nodes.map(idx, replacement);
mach->subsume_by(replacement, C);
mach = replacement;
progress = true;
@@ -1083,8 +1085,8 @@
if (has_mach_constant_base_node()) {
// Fill the constant table.
// Note: This must happen before shorten_branches.
- for (uint i = 0; i < _cfg->_num_blocks; i++) {
- Block* b = _cfg->_blocks[i];
+ for (uint i = 0; i < _cfg->number_of_blocks(); i++) {
+ Block* b = _cfg->get_block(i);
for (uint j = 0; j < b->_nodes.size(); j++) {
Node* n = b->_nodes[j];
@@ -1170,7 +1172,7 @@
// !!!!! This preserves old handling of oopmaps for now
debug_info()->set_oopmaps(_oop_map_set);
- uint nblocks = _cfg->_num_blocks;
+ uint nblocks = _cfg->number_of_blocks();
// Count and start of implicit null check instructions
uint inct_cnt = 0;
uint *inct_starts = NEW_RESOURCE_ARRAY(uint, nblocks+1);
@@ -1218,21 +1220,21 @@
// Now fill in the code buffer
Node *delay_slot = NULL;
- for (uint i=0; i < nblocks; i++) {
- Block *b = _cfg->_blocks[i];
-
- Node *head = b->head();
+ for (uint i = 0; i < nblocks; i++) {
+ Block* block = _cfg->get_block(i);
+ Node* head = block->head();
// If this block needs to start aligned (i.e, can be reached other
// than by falling-thru from the previous block), then force the
// start of a new bundle.
- if (Pipeline::requires_bundling() && starts_bundle(head))
+ if (Pipeline::requires_bundling() && starts_bundle(head)) {
cb->flush_bundle(true);
+ }
#ifdef ASSERT
- if (!b->is_connector()) {
+ if (!block->is_connector()) {
stringStream st;
- b->dump_head(_cfg, &st);
+ block->dump_head(_cfg, &st);
MacroAssembler(cb).block_comment(st.as_string());
}
jmp_target[i] = 0;
@@ -1243,16 +1245,16 @@
int blk_offset = current_offset;
// Define the label at the beginning of the basic block
- MacroAssembler(cb).bind(blk_labels[b->_pre_order]);
-
- uint last_inst = b->_nodes.size();
+ MacroAssembler(cb).bind(blk_labels[block->_pre_order]);
+
+ uint last_inst = block->_nodes.size();
// Emit block normally, except for last instruction.
// Emit means "dump code bits into code buffer".
for (uint j = 0; j<last_inst; j++) {
// Get the node
- Node* n = b->_nodes[j];
+ Node* n = block->_nodes[j];
// See if delay slots are supported
if (valid_bundle_info(n) &&
@@ -1306,9 +1308,9 @@
assert((padding % nop_size) == 0, "padding is not a multiple of NOP size");
int nops_cnt = padding / nop_size;
MachNode *nop = new (this) MachNopNode(nops_cnt);
- b->_nodes.insert(j++, nop);
+ block->_nodes.insert(j++, nop);
last_inst++;
- _cfg->map_node_to_block(nop, b);
+ _cfg->map_node_to_block(nop, block);
nop->emit(*cb, _regalloc);
cb->flush_bundle(true);
current_offset = cb->insts_size();
@@ -1322,7 +1324,7 @@
mcall->method_set((intptr_t)mcall->entry_point());
// Save the return address
- call_returns[b->_pre_order] = current_offset + mcall->ret_addr_offset();
+ call_returns[block->_pre_order] = current_offset + mcall->ret_addr_offset();
if (mcall->is_MachCallLeaf()) {
is_mcall = false;
@@ -1359,7 +1361,7 @@
// If this is a branch, then fill in the label with the target BB's label
else if (mach->is_MachBranch()) {
// This requires the TRUE branch target be in succs[0]
- uint block_num = b->non_connector_successor(0)->_pre_order;
+ uint block_num = block->non_connector_successor(0)->_pre_order;
// Try to replace long branch if delay slot is not used,
// it is mostly for back branches since forward branch's
@@ -1392,8 +1394,8 @@
// Insert padding between avoid_back_to_back branches.
if (needs_padding && replacement->avoid_back_to_back()) {
MachNode *nop = new (this) MachNopNode();
- b->_nodes.insert(j++, nop);
- _cfg->map_node_to_block(nop, b);
+ block->_nodes.insert(j++, nop);
+ _cfg->map_node_to_block(nop, block);
last_inst++;
nop->emit(*cb, _regalloc);
cb->flush_bundle(true);
@@ -1405,7 +1407,7 @@
jmp_size[i] = new_size;
jmp_rule[i] = mach->rule();
#endif
- b->_nodes.map(j, replacement);
+ block->_nodes.map(j, replacement);
mach->subsume_by(replacement, C);
n = replacement;
mach = replacement;
@@ -1413,8 +1415,8 @@
}
mach->as_MachBranch()->label_set( &blk_labels[block_num], block_num );
} else if (mach->ideal_Opcode() == Op_Jump) {
- for (uint h = 0; h < b->_num_succs; h++) {
- Block* succs_block = b->_succs[h];
+ for (uint h = 0; h < block->_num_succs; h++) {
+ Block* succs_block = block->_succs[h];
for (uint j = 1; j < succs_block->num_preds(); j++) {
Node* jpn = succs_block->pred(j);
if (jpn->is_JumpProj() && jpn->in(0) == mach) {
@@ -1425,7 +1427,6 @@
}
}
}
-
#ifdef ASSERT
// Check that oop-store precedes the card-mark
else if (mach->ideal_Opcode() == Op_StoreCM) {
@@ -1436,17 +1437,18 @@
if (oop_store == NULL) continue;
count++;
uint i4;
- for( i4 = 0; i4 < last_inst; ++i4 ) {
- if( b->_nodes[i4] == oop_store ) break;
+ for (i4 = 0; i4 < last_inst; ++i4) {
+ if (block->_nodes[i4] == oop_store) {
+ break;
+ }
}
// Note: This test can provide a false failure if other precedence
// edges have been added to the storeCMNode.
- assert( i4 == last_inst || i4 < storeCM_idx, "CM card-mark executes before oop-store");
+ assert(i4 == last_inst || i4 < storeCM_idx, "CM card-mark executes before oop-store");
}
assert(count > 0, "storeCM expects at least one precedence edge");
}
#endif
-
else if (!n->is_Proj()) {
// Remember the beginning of the previous instruction, in case
// it's followed by a flag-kill and a null-check. Happens on
@@ -1542,12 +1544,12 @@
// If the next block is the top of a loop, pad this block out to align
// the loop top a little. Helps prevent pipe stalls at loop back branches.
if (i < nblocks-1) {
- Block *nb = _cfg->_blocks[i+1];
+ Block *nb = _cfg->get_block(i + 1);
int padding = nb->alignment_padding(current_offset);
if( padding > 0 ) {
MachNode *nop = new (this) MachNopNode(padding / nop_size);
- b->_nodes.insert( b->_nodes.size(), nop );
- _cfg->map_node_to_block(nop, b);
+ block->_nodes.insert(block->_nodes.size(), nop);
+ _cfg->map_node_to_block(nop, block);
nop->emit(*cb, _regalloc);
current_offset = cb->insts_size();
}
@@ -1587,8 +1589,6 @@
}
#endif
- // ------------------
-
#ifndef PRODUCT
// Information on the size of the method, without the extraneous code
Scheduling::increment_method_size(cb->insts_size());
@@ -1649,52 +1649,55 @@
_inc_table.set_size(cnt);
uint inct_cnt = 0;
- for( uint i=0; i<_cfg->_num_blocks; i++ ) {
- Block *b = _cfg->_blocks[i];
+ for (uint i = 0; i < _cfg->number_of_blocks(); i++) {
+ Block* block = _cfg->get_block(i);
Node *n = NULL;
int j;
// Find the branch; ignore trailing NOPs.
- for( j = b->_nodes.size()-1; j>=0; j-- ) {
- n = b->_nodes[j];
- if( !n->is_Mach() || n->as_Mach()->ideal_Opcode() != Op_Con )
+ for (j = block->_nodes.size() - 1; j >= 0; j--) {
+ n = block->_nodes[j];
+ if (!n->is_Mach() || n->as_Mach()->ideal_Opcode() != Op_Con) {
break;
+ }
}
// If we didn't find anything, continue
- if( j < 0 ) continue;
+ if (j < 0) {
+ continue;
+ }
// Compute ExceptionHandlerTable subtable entry and add it
// (skip empty blocks)
- if( n->is_Catch() ) {
+ if (n->is_Catch()) {
// Get the offset of the return from the call
- uint call_return = call_returns[b->_pre_order];
+ uint call_return = call_returns[block->_pre_order];
#ifdef ASSERT
assert( call_return > 0, "no call seen for this basic block" );
- while( b->_nodes[--j]->is_MachProj() ) ;
- assert( b->_nodes[j]->is_MachCall(), "CatchProj must follow call" );
+ while (block->_nodes[--j]->is_MachProj()) ;
+ assert(block->_nodes[j]->is_MachCall(), "CatchProj must follow call");
#endif
// last instruction is a CatchNode, find it's CatchProjNodes
- int nof_succs = b->_num_succs;
+ int nof_succs = block->_num_succs;
// allocate space
GrowableArray<intptr_t> handler_bcis(nof_succs);
GrowableArray<intptr_t> handler_pcos(nof_succs);
// iterate through all successors
for (int j = 0; j < nof_succs; j++) {
- Block* s = b->_succs[j];
+ Block* s = block->_succs[j];
bool found_p = false;
- for( uint k = 1; k < s->num_preds(); k++ ) {
- Node *pk = s->pred(k);
- if( pk->is_CatchProj() && pk->in(0) == n ) {
+ for (uint k = 1; k < s->num_preds(); k++) {
+ Node* pk = s->pred(k);
+ if (pk->is_CatchProj() && pk->in(0) == n) {
const CatchProjNode* p = pk->as_CatchProj();
found_p = true;
// add the corresponding handler bci & pco information
- if( p->_con != CatchProjNode::fall_through_index ) {
+ if (p->_con != CatchProjNode::fall_through_index) {
// p leads to an exception handler (and is not fall through)
- assert(s == _cfg->_blocks[s->_pre_order],"bad numbering");
+ assert(s == _cfg->get_block(s->_pre_order), "bad numbering");
// no duplicates, please
- if( !handler_bcis.contains(p->handler_bci()) ) {
+ if (!handler_bcis.contains(p->handler_bci())) {
uint block_num = s->non_connector()->_pre_order;
handler_bcis.append(p->handler_bci());
handler_pcos.append(blk_labels[block_num].loc_pos());
@@ -1713,9 +1716,9 @@
}
// Handle implicit null exception table updates
- if( n->is_MachNullCheck() ) {
- uint block_num = b->non_connector_successor(0)->_pre_order;
- _inc_table.append( inct_starts[inct_cnt++], blk_labels[block_num].loc_pos() );
+ if (n->is_MachNullCheck()) {
+ uint block_num = block->non_connector_successor(0)->_pre_order;
+ _inc_table.append(inct_starts[inct_cnt++], blk_labels[block_num].loc_pos());
continue;
}
} // End of for all blocks fill in exception table entries
@@ -1774,14 +1777,12 @@
memset(_current_latency, 0, node_max * sizeof(unsigned short));
// Clear the bundling information
- memcpy(_bundle_use_elements,
- Pipeline_Use::elaborated_elements,
- sizeof(Pipeline_Use::elaborated_elements));
+ memcpy(_bundle_use_elements, Pipeline_Use::elaborated_elements, sizeof(Pipeline_Use::elaborated_elements));
// Get the last node
- Block *bb = _cfg->_blocks[_cfg->_blocks.size()-1];
-
- _next_node = bb->_nodes[bb->_nodes.size()-1];
+ Block* block = _cfg->get_block(_cfg->number_of_blocks() - 1);
+
+ _next_node = block->_nodes[block->_nodes.size() - 1];
}
#ifndef PRODUCT
@@ -1831,7 +1832,6 @@
sizeof(Pipeline_Use::elaborated_elements));
}
-//------------------------------ScheduleAndBundle------------------------------
// Perform instruction scheduling and bundling over the sequence of
// instructions in backwards order.
void Compile::ScheduleAndBundle() {
@@ -1858,7 +1858,6 @@
scheduling.DoScheduling();
}
-//------------------------------ComputeLocalLatenciesForward-------------------
// Compute the latency of all the instructions. This is fairly simple,
// because we already have a legal ordering. Walk over the instructions
// from first to last, and compute the latency of the instruction based
@@ -2028,7 +2027,6 @@
return _available[0];
}
-//------------------------------AddNodeToAvailableList-------------------------
void Scheduling::AddNodeToAvailableList(Node *n) {
assert( !n->is_Proj(), "projections never directly made available" );
#ifndef PRODUCT
@@ -2074,7 +2072,6 @@
#endif
}
-//------------------------------DecrementUseCounts-----------------------------
void Scheduling::DecrementUseCounts(Node *n, const Block *bb) {
for ( uint i=0; i < n->len(); i++ ) {
Node *def = n->in(i);
@@ -2097,7 +2094,6 @@
}
}
-//------------------------------AddNodeToBundle--------------------------------
void Scheduling::AddNodeToBundle(Node *n, const Block *bb) {
#ifndef PRODUCT
if (_cfg->C->trace_opto_output()) {
@@ -2312,7 +2308,6 @@
DecrementUseCounts(n,bb);
}
-//------------------------------ComputeUseCount--------------------------------
// This method sets the use count within a basic block. We will ignore all
// uses outside the current basic block. As we are doing a backwards walk,
// any node we reach that has a use count of 0 may be scheduled. This also
@@ -2397,20 +2392,22 @@
Block *bb;
// Walk over all the basic blocks in reverse order
- for( int i=_cfg->_num_blocks-1; i >= 0; succ_bb = bb, i-- ) {
- bb = _cfg->_blocks[i];
+ for (int i = _cfg->number_of_blocks() - 1; i >= 0; succ_bb = bb, i--) {
+ bb = _cfg->get_block(i);
#ifndef PRODUCT
if (_cfg->C->trace_opto_output()) {
tty->print("# Schedule BB#%03d (initial)\n", i);
- for (uint j = 0; j < bb->_nodes.size(); j++)
+ for (uint j = 0; j < bb->_nodes.size(); j++) {
bb->_nodes[j]->dump();
+ }
}
#endif
// On the head node, skip processing
- if( bb == _cfg->_broot )
+ if (bb == _cfg->get_root_block()) {
continue;
+ }
// Skip empty, connector blocks
if (bb->is_connector())
@@ -2547,7 +2544,6 @@
} // end DoScheduling
-//------------------------------verify_good_schedule---------------------------
// Verify that no live-range used in the block is killed in the block by a
// wrong DEF. This doesn't verify live-ranges that span blocks.
@@ -2560,7 +2556,6 @@
}
#ifdef ASSERT
-//------------------------------verify_do_def----------------------------------
void Scheduling::verify_do_def( Node *n, OptoReg::Name def, const char *msg ) {
// Check for bad kills
if( OptoReg::is_valid(def) ) { // Ignore stores & control flow
@@ -2576,7 +2571,6 @@
}
}
-//------------------------------verify_good_schedule---------------------------
void Scheduling::verify_good_schedule( Block *b, const char *msg ) {
// Zap to something reasonable for the verify code
@@ -2636,7 +2630,6 @@
from->add_prec(to);
}
-//------------------------------anti_do_def------------------------------------
void Scheduling::anti_do_def( Block *b, Node *def, OptoReg::Name def_reg, int is_def ) {
if( !OptoReg::is_valid(def_reg) ) // Ignore stores & control flow
return;
@@ -2706,7 +2699,6 @@
add_prec_edge_from_to(kill,pinch);
}
-//------------------------------anti_do_use------------------------------------
void Scheduling::anti_do_use( Block *b, Node *use, OptoReg::Name use_reg ) {
if( !OptoReg::is_valid(use_reg) ) // Ignore stores & control flow
return;
@@ -2727,7 +2719,6 @@
}
}
-//------------------------------ComputeRegisterAntidependences-----------------
// We insert antidependences between the reads and following write of
// allocated registers to prevent illegal code motion. Hopefully, the
// number of added references should be fairly small, especially as we
@@ -2861,8 +2852,6 @@
}
}
-//------------------------------garbage_collect_pinch_nodes-------------------------------
-
// Garbage collect pinch nodes for reuse by other blocks.
//
// The block scheduler's insertion of anti-dependence
@@ -2937,7 +2926,6 @@
pinch->set_req(0, NULL);
}
-//------------------------------print_statistics-------------------------------
#ifndef PRODUCT
void Scheduling::dump_available() const {
--- a/hotspot/src/share/vm/opto/phaseX.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/phaseX.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -1643,8 +1643,8 @@
bool method_name_not_printed = true;
// Examine each basic block
- for( uint block_number = 1; block_number < _cfg._num_blocks; ++block_number ) {
- Block *block = _cfg._blocks[block_number];
+ for (uint block_number = 1; block_number < _cfg.number_of_blocks(); ++block_number) {
+ Block* block = _cfg.get_block(block_number);
bool block_not_printed = true;
// and each instruction within a block
--- a/hotspot/src/share/vm/opto/postaloc.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/postaloc.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -405,28 +405,29 @@
// Need a mapping from basic block Node_Lists. We need a Node_List to
// map from register number to value-producing Node.
- Node_List **blk2value = NEW_RESOURCE_ARRAY( Node_List *, _cfg._num_blocks+1);
- memset( blk2value, 0, sizeof(Node_List*)*(_cfg._num_blocks+1) );
+ Node_List **blk2value = NEW_RESOURCE_ARRAY( Node_List *, _cfg.number_of_blocks() + 1);
+ memset(blk2value, 0, sizeof(Node_List*) * (_cfg.number_of_blocks() + 1));
// Need a mapping from basic block Node_Lists. We need a Node_List to
// map from register number to register-defining Node.
- Node_List **blk2regnd = NEW_RESOURCE_ARRAY( Node_List *, _cfg._num_blocks+1);
- memset( blk2regnd, 0, sizeof(Node_List*)*(_cfg._num_blocks+1) );
+ Node_List **blk2regnd = NEW_RESOURCE_ARRAY( Node_List *, _cfg.number_of_blocks() + 1);
+ memset(blk2regnd, 0, sizeof(Node_List*) * (_cfg.number_of_blocks() + 1));
// We keep unused Node_Lists on a free_list to avoid wasting
// memory.
GrowableArray<Node_List*> free_list = GrowableArray<Node_List*>(16);
// For all blocks
- for( uint i = 0; i < _cfg._num_blocks; i++ ) {
+ for (uint i = 0; i < _cfg.number_of_blocks(); i++) {
uint j;
- Block *b = _cfg._blocks[i];
+ Block* block = _cfg.get_block(i);
// Count of Phis in block
uint phi_dex;
- for( phi_dex = 1; phi_dex < b->_nodes.size(); phi_dex++ ) {
- Node *phi = b->_nodes[phi_dex];
- if( !phi->is_Phi() )
+ for (phi_dex = 1; phi_dex < block->_nodes.size(); phi_dex++) {
+ Node* phi = block->_nodes[phi_dex];
+ if (!phi->is_Phi()) {
break;
+ }
}
// If any predecessor has not been visited, we do not know the state
@@ -434,21 +435,23 @@
// along Phi input edges
bool missing_some_inputs = false;
Block *freed = NULL;
- for( j = 1; j < b->num_preds(); j++ ) {
- Block *pb = _cfg.get_block_for_node(b->pred(j));
+ for (j = 1; j < block->num_preds(); j++) {
+ Block* pb = _cfg.get_block_for_node(block->pred(j));
// Remove copies along phi edges
- for( uint k=1; k<phi_dex; k++ )
- elide_copy( b->_nodes[k], j, b, *blk2value[pb->_pre_order], *blk2regnd[pb->_pre_order], false );
- if( blk2value[pb->_pre_order] ) { // Have a mapping on this edge?
+ for (uint k = 1; k < phi_dex; k++) {
+ elide_copy(block->_nodes[k], j, block, *blk2value[pb->_pre_order], *blk2regnd[pb->_pre_order], false);
+ }
+ if (blk2value[pb->_pre_order]) { // Have a mapping on this edge?
// See if this predecessor's mappings have been used by everybody
// who wants them. If so, free 'em.
uint k;
- for( k=0; k<pb->_num_succs; k++ ) {
- Block *pbsucc = pb->_succs[k];
- if( !blk2value[pbsucc->_pre_order] && pbsucc != b )
+ for (k = 0; k < pb->_num_succs; k++) {
+ Block* pbsucc = pb->_succs[k];
+ if (!blk2value[pbsucc->_pre_order] && pbsucc != block) {
break; // Found a future user
+ }
}
- if( k >= pb->_num_succs ) { // No more uses, free!
+ if (k >= pb->_num_succs) { // No more uses, free!
freed = pb; // Record last block freed
free_list.push(blk2value[pb->_pre_order]);
free_list.push(blk2regnd[pb->_pre_order]);
@@ -467,20 +470,20 @@
value.map(_max_reg,NULL);
regnd.map(_max_reg,NULL);
// Set mappings as OUR mappings
- blk2value[b->_pre_order] = &value;
- blk2regnd[b->_pre_order] = ®nd;
+ blk2value[block->_pre_order] = &value;
+ blk2regnd[block->_pre_order] = ®nd;
// Initialize value & regnd for this block
- if( missing_some_inputs ) {
+ if (missing_some_inputs) {
// Some predecessor has not yet been visited; zap map to empty
- for( uint k = 0; k < (uint)_max_reg; k++ ) {
+ for (uint k = 0; k < (uint)_max_reg; k++) {
value.map(k,NULL);
regnd.map(k,NULL);
}
} else {
if( !freed ) { // Didn't get a freebie prior block
// Must clone some data
- freed = _cfg.get_block_for_node(b->pred(1));
+ freed = _cfg.get_block_for_node(block->pred(1));
Node_List &f_value = *blk2value[freed->_pre_order];
Node_List &f_regnd = *blk2regnd[freed->_pre_order];
for( uint k = 0; k < (uint)_max_reg; k++ ) {
@@ -489,9 +492,11 @@
}
}
// Merge all inputs together, setting to NULL any conflicts.
- for( j = 1; j < b->num_preds(); j++ ) {
- Block *pb = _cfg.get_block_for_node(b->pred(j));
- if( pb == freed ) continue; // Did self already via freelist
+ for (j = 1; j < block->num_preds(); j++) {
+ Block* pb = _cfg.get_block_for_node(block->pred(j));
+ if (pb == freed) {
+ continue; // Did self already via freelist
+ }
Node_List &p_regnd = *blk2regnd[pb->_pre_order];
for( uint k = 0; k < (uint)_max_reg; k++ ) {
if( regnd[k] != p_regnd[k] ) { // Conflict on reaching defs?
@@ -503,9 +508,9 @@
}
// For all Phi's
- for( j = 1; j < phi_dex; j++ ) {
+ for (j = 1; j < phi_dex; j++) {
uint k;
- Node *phi = b->_nodes[j];
+ Node *phi = block->_nodes[j];
uint pidx = _lrg_map.live_range_id(phi);
OptoReg::Name preg = lrgs(_lrg_map.live_range_id(phi)).reg();
@@ -516,8 +521,8 @@
if( phi != x && u != x ) // Found a different input
u = u ? NodeSentinel : x; // Capture unique input, or NodeSentinel for 2nd input
}
- if( u != NodeSentinel ) { // Junk Phi. Remove
- b->_nodes.remove(j--);
+ if (u != NodeSentinel) { // Junk Phi. Remove
+ block->_nodes.remove(j--);
phi_dex--;
_cfg.unmap_node_from_block(phi);
phi->replace_by(u);
@@ -547,13 +552,13 @@
}
// For all remaining instructions
- for( j = phi_dex; j < b->_nodes.size(); j++ ) {
- Node *n = b->_nodes[j];
+ for (j = phi_dex; j < block->_nodes.size(); j++) {
+ Node* n = block->_nodes[j];
- if( n->outcnt() == 0 && // Dead?
- n != C->top() && // (ignore TOP, it has no du info)
- !n->is_Proj() ) { // fat-proj kills
- j -= yank_if_dead(n,b,&value,®nd);
+ if(n->outcnt() == 0 && // Dead?
+ n != C->top() && // (ignore TOP, it has no du info)
+ !n->is_Proj() ) { // fat-proj kills
+ j -= yank_if_dead(n, block, &value, ®nd);
continue;
}
@@ -598,8 +603,9 @@
const uint two_adr = n->is_Mach() ? n->as_Mach()->two_adr() : 0;
// Remove copies along input edges
- for( k = 1; k < n->req(); k++ )
- j -= elide_copy( n, k, b, value, regnd, two_adr!=k );
+ for (k = 1; k < n->req(); k++) {
+ j -= elide_copy(n, k, block, value, regnd, two_adr != k);
+ }
// Unallocated Nodes define no registers
uint lidx = _lrg_map.live_range_id(n);
@@ -630,8 +636,8 @@
// then 'n' is a useless copy. Do not update the register->node
// mapping so 'n' will go dead.
if( value[nreg] != val ) {
- if (eliminate_copy_of_constant(val, n, b, value, regnd, nreg, OptoReg::Bad)) {
- j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
+ if (eliminate_copy_of_constant(val, n, block, value, regnd, nreg, OptoReg::Bad)) {
+ j -= replace_and_yank_if_dead(n, nreg, block, value, regnd);
} else {
// Update the mapping: record new Node defined by the register
regnd.map(nreg,n);
@@ -640,8 +646,8 @@
value.map(nreg,val);
}
} else if( !may_be_copy_of_callee(n) ) {
- assert( n->is_Copy(), "" );
- j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
+ assert(n->is_Copy(), "");
+ j -= replace_and_yank_if_dead(n, nreg, block, value, regnd);
}
} else if (RegMask::is_vector(n_ideal_reg)) {
// If Node 'n' does not change the value mapped by the register,
@@ -660,7 +666,7 @@
}
} else if (n->is_Copy()) {
// Note: vector can't be constant and can't be copy of calee.
- j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
+ j -= replace_and_yank_if_dead(n, nreg, block, value, regnd);
}
} else {
// If the value occupies a register pair, record same info
@@ -674,18 +680,18 @@
tmp.Remove(nreg);
nreg_lo = tmp.find_first_elem();
}
- if( value[nreg] != val || value[nreg_lo] != val ) {
- if (eliminate_copy_of_constant(val, n, b, value, regnd, nreg, nreg_lo)) {
- j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
+ if (value[nreg] != val || value[nreg_lo] != val) {
+ if (eliminate_copy_of_constant(val, n, block, value, regnd, nreg, nreg_lo)) {
+ j -= replace_and_yank_if_dead(n, nreg, block, value, regnd);
} else {
regnd.map(nreg , n );
regnd.map(nreg_lo, n );
value.map(nreg ,val);
value.map(nreg_lo,val);
}
- } else if( !may_be_copy_of_callee(n) ) {
- assert( n->is_Copy(), "" );
- j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
+ } else if (!may_be_copy_of_callee(n)) {
+ assert(n->is_Copy(), "");
+ j -= replace_and_yank_if_dead(n, nreg, block, value, regnd);
}
}
--- a/hotspot/src/share/vm/opto/reg_split.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/opto/reg_split.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -397,10 +397,15 @@
#endif
// See if the cloned def kills any flags, and copy those kills as well
uint i = insidx+1;
- if( clone_projs( b, i, def, spill, maxlrg) ) {
+ int found_projs = clone_projs( b, i, def, spill, maxlrg);
+ if (found_projs > 0) {
// Adjust the point where we go hi-pressure
- if( i <= b->_ihrp_index ) b->_ihrp_index++;
- if( i <= b->_fhrp_index ) b->_fhrp_index++;
+ if (i <= b->_ihrp_index) {
+ b->_ihrp_index += found_projs;
+ }
+ if (i <= b->_fhrp_index) {
+ b->_fhrp_index += found_projs;
+ }
}
return spill;
@@ -529,13 +534,13 @@
// a Def is UP or DOWN. UP means that it should get a register (ie -
// it is always in LRP regions), and DOWN means that it is probably
// on the stack (ie - it crosses HRP regions).
- Node ***Reaches = NEW_SPLIT_ARRAY( Node**, _cfg._num_blocks+1 );
- bool **UP = NEW_SPLIT_ARRAY( bool*, _cfg._num_blocks+1 );
+ Node ***Reaches = NEW_SPLIT_ARRAY( Node**, _cfg.number_of_blocks() + 1);
+ bool **UP = NEW_SPLIT_ARRAY( bool*, _cfg.number_of_blocks() + 1);
Node **debug_defs = NEW_SPLIT_ARRAY( Node*, spill_cnt );
VectorSet **UP_entry= NEW_SPLIT_ARRAY( VectorSet*, spill_cnt );
// Initialize Reaches & UP
- for( bidx = 0; bidx < _cfg._num_blocks+1; bidx++ ) {
+ for (bidx = 0; bidx < _cfg.number_of_blocks() + 1; bidx++) {
Reaches[bidx] = NEW_SPLIT_ARRAY( Node*, spill_cnt );
UP[bidx] = NEW_SPLIT_ARRAY( bool, spill_cnt );
Node **Reachblock = Reaches[bidx];
@@ -555,13 +560,13 @@
//----------PASS 1----------
//----------Propagation & Node Insertion Code----------
// Walk the Blocks in RPO for DEF & USE info
- for( bidx = 0; bidx < _cfg._num_blocks; bidx++ ) {
+ for( bidx = 0; bidx < _cfg.number_of_blocks(); bidx++ ) {
if (C->check_node_count(spill_cnt, out_of_nodes)) {
return 0;
}
- b = _cfg._blocks[bidx];
+ b = _cfg.get_block(bidx);
// Reaches & UP arrays for this block
Reachblock = Reaches[b->_pre_order];
UPblock = UP[b->_pre_order];
@@ -1394,8 +1399,8 @@
// DEBUG
#ifdef ASSERT
// Validate all live range index assignments
- for (bidx = 0; bidx < _cfg._num_blocks; bidx++) {
- b = _cfg._blocks[bidx];
+ for (bidx = 0; bidx < _cfg.number_of_blocks(); bidx++) {
+ b = _cfg.get_block(bidx);
for (insidx = 0; insidx <= b->end_idx(); insidx++) {
Node *n = b->_nodes[insidx];
uint defidx = _lrg_map.find(n);
--- a/hotspot/src/share/vm/prims/jni.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/prims/jni.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -3234,19 +3234,22 @@
HOTSPOT_JNI_GETSTRINGCHARS_ENTRY(
env, string, (uintptr_t *) isCopy);
#endif /* USDT2 */
- //%note jni_5
- if (isCopy != NULL) {
- *isCopy = JNI_TRUE;
- }
oop s = JNIHandles::resolve_non_null(string);
int s_len = java_lang_String::length(s);
typeArrayOop s_value = java_lang_String::value(s);
int s_offset = java_lang_String::offset(s);
- jchar* buf = NEW_C_HEAP_ARRAY(jchar, s_len + 1, mtInternal); // add one for zero termination
- if (s_len > 0) {
- memcpy(buf, s_value->char_at_addr(s_offset), sizeof(jchar)*s_len);
+ jchar* buf = NEW_C_HEAP_ARRAY_RETURN_NULL(jchar, s_len + 1, mtInternal); // add one for zero termination
+ /* JNI Specification states return NULL on OOM */
+ if (buf != NULL) {
+ if (s_len > 0) {
+ memcpy(buf, s_value->char_at_addr(s_offset), sizeof(jchar)*s_len);
+ }
+ buf[s_len] = 0;
+ //%note jni_5
+ if (isCopy != NULL) {
+ *isCopy = JNI_TRUE;
+ }
}
- buf[s_len] = 0;
#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringChars__return, buf);
#else /* USDT2 */
@@ -3335,9 +3338,14 @@
#endif /* USDT2 */
oop java_string = JNIHandles::resolve_non_null(string);
size_t length = java_lang_String::utf8_length(java_string);
- char* result = AllocateHeap(length + 1, mtInternal);
- java_lang_String::as_utf8_string(java_string, result, (int) length + 1);
- if (isCopy != NULL) *isCopy = JNI_TRUE;
+ /* JNI Specification states return NULL on OOM */
+ char* result = AllocateHeap(length + 1, mtInternal, 0, AllocFailStrategy::RETURN_NULL);
+ if (result != NULL) {
+ java_lang_String::as_utf8_string(java_string, result, (int) length + 1);
+ if (isCopy != NULL) {
+ *isCopy = JNI_TRUE;
+ }
+ }
#ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringUTFChars__return, result);
#else /* USDT2 */
@@ -3591,11 +3599,16 @@
* Avoid asserts in typeArrayOop. */ \
result = (ElementType*)get_bad_address(); \
} else { \
- result = NEW_C_HEAP_ARRAY(ElementType, len, mtInternal); \
- /* copy the array to the c chunk */ \
- memcpy(result, a->Tag##_at_addr(0), sizeof(ElementType)*len); \
+ /* JNI Specification states return NULL on OOM */ \
+ result = NEW_C_HEAP_ARRAY_RETURN_NULL(ElementType, len, mtInternal); \
+ if (result != NULL) { \
+ /* copy the array to the c chunk */ \
+ memcpy(result, a->Tag##_at_addr(0), sizeof(ElementType)*len); \
+ if (isCopy) { \
+ *isCopy = JNI_TRUE; \
+ } \
+ } \
} \
- if (isCopy) *isCopy = JNI_TRUE; \
DTRACE_PROBE1(hotspot_jni, Get##Result##ArrayElements__return, result);\
return result; \
JNI_END
@@ -3628,11 +3641,16 @@
* Avoid asserts in typeArrayOop. */ \
result = (ElementType*)get_bad_address(); \
} else { \
- result = NEW_C_HEAP_ARRAY(ElementType, len, mtInternal); \
- /* copy the array to the c chunk */ \
- memcpy(result, a->Tag##_at_addr(0), sizeof(ElementType)*len); \
+ /* JNI Specification states return NULL on OOM */ \
+ result = NEW_C_HEAP_ARRAY_RETURN_NULL(ElementType, len, mtInternal); \
+ if (result != NULL) { \
+ /* copy the array to the c chunk */ \
+ memcpy(result, a->Tag##_at_addr(0), sizeof(ElementType)*len); \
+ if (isCopy) { \
+ *isCopy = JNI_TRUE; \
+ } \
+ } \
} \
- if (isCopy) *isCopy = JNI_TRUE; \
ReturnProbe; \
return result; \
JNI_END
@@ -5027,9 +5045,15 @@
tty->print_cr("Running test: " #unit_test_function_call); \
unit_test_function_call
+// Forward declaration
+void TestReservedSpace_test();
+void TestReserveMemorySpecial_test();
+
void execute_internal_vm_tests() {
if (ExecuteInternalVMTests) {
tty->print_cr("Running internal VM tests");
+ run_unit_test(TestReservedSpace_test());
+ run_unit_test(TestReserveMemorySpecial_test());
run_unit_test(GlobalDefinitions::test_globals());
run_unit_test(GCTimerAllTest::all());
run_unit_test(arrayOopDesc::test_max_array_length());
--- a/hotspot/src/share/vm/prims/jvmti.xml Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/prims/jvmti.xml Fri Sep 06 15:09:44 2013 -0700
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="jvmti.xsl"?>
<!--
- 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
@@ -358,7 +358,7 @@
<specification label="JVM(TM) Tool Interface"
majorversion="1"
minorversion="2"
- microversion="2">
+ microversion="3">
<title subtitle="Version">
<tm>JVM</tm> Tool Interface
</title>
@@ -431,12 +431,46 @@
On the <tm>Solaris</tm> Operating Environment, an agent library is a shared
object (<code>.so</code> file).
<p/>
+
An agent may be started at VM startup by specifying the agent library
name using a <internallink id="starting">command line option</internallink>.
Some implementations may support a mechanism to <internallink id="onattach">
start agents</internallink> in the live <functionlink id="GetPhase">phase</functionlink>.
The details of how this is initiated are implementation specific.
</intro>
+
+ <intro id="entry point" label="Statically Linked Agents (since version 1.2.3)">
+
+ A native JVMTI Agent may be <i>statically linked</i> with the VM.
+ The manner in which the library and VM image are combined is
+ implementation-dependent.
+ An agent L whose image has been combined with the VM is defined as
+ <i>statically linked</i> if and only if the agent exports a function
+ called Agent_OnLoad_L.
+<p/>
+ If a <i>statically linked</i> agent L exports a function called
+ Agent_OnLoad_L and a function called Agent_OnLoad, the Agent_OnLoad
+ function will be ignored.
+ If an agent L is <i>statically linked</i>, an Agent_OnLoad_L
+ function will be invoked with the same arguments and expected return
+ value as specified for the Agent_OnLoad function.
+ An agent L that is <i>statically linked</i> will prohibit an agent of
+ the same name from being loaded dynamically.
+<p/>
+ The VM will invoke the Agent_OnUnload_L function of the agent, if such
+ a function is exported, at the same point during startup as it would
+ have called the dynamic entry point Agent_OnUnLoad.
+ If a <i>statically linked</i> agent L exports a function called
+ Agent_OnUnLoad_L and a function called Agent_OnUnLoad, the Agent_OnUnLoad
+ function will be ignored.
+<p/>
+ If an agent L is <i>statically linked</i>, an Agent_OnAttach_L function
+ will be invoked with the same arguments and expected return value as
+ specified for the Agent_OnAttach function.
+ If a <i>statically linked</i> agent L exports a function called
+ Agent_OnAttach_L and a function called Agent_OnAttach, the Agent_OnAttach
+ function will be ignored.
+</intro>
<intro id="starting" label="Agent Command Line Options">
The term "command-line option" is used below to
@@ -455,7 +489,7 @@
<dd>
The name following <code>-agentlib:</code> is the name of the
library to load. Lookup of the library, both its full name and location,
- proceeds in a platform-specific manner.
+ proceeds in a platform-specific manner.
Typically, the <i><agent-lib-name></i> is expanded to an
operating system specific file name.
The <i><options></i> will be passed to the agent on start-up.
@@ -463,7 +497,11 @@
<code>-agentlib:foo=opt1,opt2</code> is specified, the VM will attempt to
load the shared library <code>foo.dll</code> from the system <code>PATH</code>
under <tm>Windows</tm> or <code>libfoo.so</code> from the
- <code>LD_LIBRARY_PATH</code> under the <tm>Solaris</tm> operating environment.
+ <code>LD_LIBRARY_PATH</code> under the <tm>Solaris</tm> operating
+ environment.
+ If the agent library is statically linked into the executable
+ then no actual loading takes place.
+ <p/>
</dd>
<dt><code>-agentpath:</code><i><path-to-agent></i><code>=</code><i><options></i></dt>
<dd>
@@ -473,11 +511,20 @@
The <i><options></i> will be passed to the agent on start-up.
For example, if the option
<code>-agentpath:c:\myLibs\foo.dll=opt1,opt2</code> is specified, the VM will attempt to
- load the shared library <code>c:\myLibs\foo.dll</code>.
+ load the shared library <code>c:\myLibs\foo.dll</code>. If the agent
+ library is statically linked into the executable
+ then no actual loading takes place.
+ <p/>
</dd>
</dl>
- The start-up routine <internallink id="onload"><code>Agent_OnLoad</code></internallink>
- in the library will be invoked.
+ For a dynamic shared library agent, the start-up routine
+ <internallink id="onload"><code>Agent_OnLoad</code></internallink>
+ in the library will be invoked. If the agent library is statically linked
+ into the executable then the system will attempt to invoke the
+ <code>Agent_OnLoad_<agent-lib-name></code> entry point where
+ <agent-lib-name> is the basename of the
+ agent. In the above example <code>-agentpath:c:\myLibs\foo.dll=opt1,opt2</code>,
+ the system will attempt to find and call the <code>Agent_OnLoad_foo</code> start-up routine.
<p/>
Libraries loaded with <code>-agentlib:</code> or <code>-agentpath:</code>
will be searched for JNI native method implementations to facilitate the
@@ -502,11 +549,13 @@
If the agent is started in the <code>OnLoad</code>
<functionlink id="GetPhase">phase</functionlink> the function
<internallink id="onload"><code>Agent_OnLoad</code></internallink>
- will be invoked.
+ or <internallink id="onload"><code>Agent_OnLoad_L</code></internallink>
+ for statically linked agents will be invoked.
If the agent is started in the live
<functionlink id="GetPhase">phase</functionlink> the function
<internallink id="onattach"><code>Agent_OnAttach</code></internallink>
- will be invoked.
+ or <internallink id="onattach"><code>Agent_OnAttach_L</code></internallink>
+ for statically linked agents will be invoked.
Exactly one call to a start-up function is made per agent.
</intro>
@@ -516,6 +565,11 @@
<example>
JNIEXPORT jint JNICALL
Agent_OnLoad(JavaVM *vm, char *options, void *reserved)</example>
+ Or for a statically linked agent named 'L':
+ <example>
+JNIEXPORT jint JNICALL
+Agent_OnLoad_L(JavaVM *vm, char *options, void *reserved)</example>
+
The VM will start the agent by calling this function.
It will be called early enough in VM initialization that:
<ul>
@@ -531,7 +585,8 @@
<li>no objects have been created</li>
</ul>
<p/>
- The VM will call the <code>Agent_OnLoad</code> function with
+ The VM will call the <code>Agent_OnLoad</code> or
+ <code>Agent_OnLoad_<agent-lib-name></code> function with
<i><options></i> as the second argument -
that is, using the command-line option examples,
<code>"opt1,opt2"</code> will be passed to the <code>char *options</code>
@@ -540,7 +595,8 @@
<internallink id="mUTF">modified UTF-8</internallink> string.
If <i>=<options></i> is not specified,
a zero length string is passed to <code>options</code>.
- The lifespan of the <code>options</code> string is the <code>Agent_OnLoad</code>
+ The lifespan of the <code>options</code> string is the
+ <code>Agent_OnLoad</code> or <code>Agent_OnLoad_<agent-lib-name></code>
call. If needed beyond this time the string or parts of the string must
be copied.
The period between when <code>Agent_OnLoad</code> is called and when it
@@ -570,7 +626,8 @@
their functionality.
</rationale>
<p/>
- The return value from <code>Agent_OnLoad</code> is used to indicate an error.
+ The return value from <code>Agent_OnLoad</code> or
+ <code>Agent_OnLoad_<agent-lib-name></code> is used to indicate an error.
Any value other than zero indicates an error and causes termination of the VM.
</intro>
@@ -587,6 +644,11 @@
<example>
JNIEXPORT jint JNICALL
Agent_OnAttach(JavaVM* vm, char *options, void *reserved)</example>
+Or for a statically linked agent named 'L':
+ <example>
+JNIEXPORT jint JNICALL
+Agent_OnAttach_L(JavaVM* vm, char *options, void *reserved)</example>
+
<p/>
The VM will start the agent by calling this function.
It will be called in the context of a thread
@@ -596,13 +658,14 @@
</internallink> string.
If startup options were not provided, a zero length string is passed to
<code>options</code>. The lifespan of the <code>options</code> string is the
- <code>Agent_OnAttach</code> call. If needed beyond this time the string or parts of
- the string must be copied.
+ <code>Agent_OnAttach</code> or <code>Agent_OnAttach_<agent-lib-name></code> call.
+ If needed beyond this time the string or parts of the string must be copied.
<p/>
Note that some <internallink id="capability">capabilities</internallink>
may not be available in the live phase.
<p/>
- The <code>Agent_OnAttach</code> function initializes the agent and returns a value
+ The <code>Agent_OnAttach</code> or <code>Agent_OnAttach_<agent-lib-name
+ ></code> function initializes the agent and returns a value
to the VM to indicate if an error occurred. Any value other than zero indicates an error.
An error does not cause the VM to terminate. Instead the VM ignores the error, or takes
some implementation specific action -- for example it might print an error to standard error,
@@ -615,8 +678,14 @@
<example>
JNIEXPORT void JNICALL
Agent_OnUnload(JavaVM *vm)</example>
+ Or for a statically linked agent named 'L':
+ <example>
+JNIEXPORT void JNICALL
+Agent_OnUnload_L(JavaVM *vm)</example>
+
This function will be called by the VM when the library is about to be unloaded.
- The library will be unloaded and this function will be called if some platform specific
+ The library will be unloaded (unless it is statically linked into the
+ executable) and this function will be called if some platform specific
mechanism causes the unload (an unload mechanism is not specified in this document)
or the library is (in effect) unloaded by the termination of the VM whether through
normal termination or VM failure, including start-up failure.
@@ -625,8 +694,9 @@
<eventlink id="VMDeath">VM Death event</eventlink>: for the VM Death event
to be sent, the VM must have run at least to the point of initialization and a valid
<jvmti/> environment must exist which has set a callback for VMDeath
- and enabled the event
- None of these are required for <code>Agent_OnUnload</code> and this function
+ and enabled the event.
+ None of these are required for <code>Agent_OnUnload</code> or
+ <code>Agent_OnUnload_<agent-lib-name></code> and this function
is also called if the library is unloaded for other reasons.
In the case that a VM Death event is sent, it will be sent before this
function is called (assuming this function is called due to VM termination).
@@ -10701,10 +10771,14 @@
<constants id="jvmtiPhase" label="Phases of execution" kind="enum">
<constant id="JVMTI_PHASE_ONLOAD" num="1">
<code>OnLoad</code> phase: while in the
- <internallink id="onload"><code>Agent_OnLoad</code></internallink> function.
+ <internallink id="onload"><code>Agent_OnLoad</code></internallink>
+ or, for statically linked agents, the <internallink id="onload">
+ <code>Agent_OnLoad_<agent-lib-name>
+ </code></internallink> function.
</constant>
<constant id="JVMTI_PHASE_PRIMORDIAL" num="2">
- Primordial phase: between return from <code>Agent_OnLoad</code> and the
+ Primordial phase: between return from <code>Agent_OnLoad</code>
+ or <code>Agent_OnLoad_<agent-lib-name></code> and the
<code>VMStart</code> event.
</constant>
<constant id="JVMTI_PHASE_START" num="6">
@@ -14261,6 +14335,9 @@
<change date="11 October 2012" version="1.2.2">
Fixed the "HTTP" and "Missing Anchor" errors reported by the LinkCheck tool.
</change>
+ <change date="19 June 2013" version="1.2.3">
+ Added support for statically linked agents.
+ </change>
</changehistory>
</specification>
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -2191,6 +2191,8 @@
char buffer[JVM_MAXPATHLEN];
void* library = NULL;
jint result = JNI_ERR;
+ const char *on_attach_symbols[] = AGENT_ONATTACH_SYMBOLS;
+ size_t num_symbol_entries = ARRAY_SIZE(on_attach_symbols);
// get agent name and options
const char* agent = op->arg(0);
@@ -2200,43 +2202,48 @@
// The abs paramter should be "true" or "false"
bool is_absolute_path = (absParam != NULL) && (strcmp(absParam,"true")==0);
+ // Initially marked as invalid. It will be set to valid if we can find the agent
+ AgentLibrary *agent_lib = new AgentLibrary(agent, options, is_absolute_path, NULL);
- // If the path is absolute we attempt to load the library. Otherwise we try to
- // load it from the standard dll directory.
+ // Check for statically linked in agent. If not found then if the path is
+ // absolute we attempt to load the library. Otherwise we try to load it
+ // from the standard dll directory.
- if (is_absolute_path) {
- library = os::dll_load(agent, ebuf, sizeof ebuf);
- } else {
- // Try to load the agent from the standard dll directory
- if (os::dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(),
- agent)) {
- library = os::dll_load(buffer, ebuf, sizeof ebuf);
- }
- if (library == NULL) {
- // not found - try local path
- char ns[1] = {0};
- if (os::dll_build_name(buffer, sizeof(buffer), ns, agent)) {
+ if (!os::find_builtin_agent(agent_lib, on_attach_symbols, num_symbol_entries)) {
+ if (is_absolute_path) {
+ library = os::dll_load(agent, ebuf, sizeof ebuf);
+ } else {
+ // Try to load the agent from the standard dll directory
+ if (os::dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(),
+ agent)) {
library = os::dll_load(buffer, ebuf, sizeof ebuf);
}
+ if (library == NULL) {
+ // not found - try local path
+ char ns[1] = {0};
+ if (os::dll_build_name(buffer, sizeof(buffer), ns, agent)) {
+ library = os::dll_load(buffer, ebuf, sizeof ebuf);
+ }
+ }
}
+ if (library != NULL) {
+ agent_lib->set_os_lib(library);
+ agent_lib->set_valid();
+ }
}
-
// If the library was loaded then we attempt to invoke the Agent_OnAttach
// function
- if (library != NULL) {
-
+ if (agent_lib->valid()) {
// Lookup the Agent_OnAttach function
OnAttachEntry_t on_attach_entry = NULL;
- const char *on_attach_symbols[] = AGENT_ONATTACH_SYMBOLS;
- for (uint symbol_index = 0; symbol_index < ARRAY_SIZE(on_attach_symbols); symbol_index++) {
- on_attach_entry =
- CAST_TO_FN_PTR(OnAttachEntry_t, os::dll_lookup(library, on_attach_symbols[symbol_index]));
- if (on_attach_entry != NULL) break;
- }
-
+ on_attach_entry = CAST_TO_FN_PTR(OnAttachEntry_t,
+ os::find_agent_function(agent_lib, false, on_attach_symbols, num_symbol_entries));
if (on_attach_entry == NULL) {
// Agent_OnAttach missing - unload library
- os::dll_unload(library);
+ if (!agent_lib->is_static_lib()) {
+ os::dll_unload(library);
+ }
+ delete agent_lib;
} else {
// Invoke the Agent_OnAttach function
JavaThread* THREAD = JavaThread::current();
@@ -2256,7 +2263,9 @@
// If OnAttach returns JNI_OK then we add it to the list of
// agent libraries so that we can call Agent_OnUnload later.
if (result == JNI_OK) {
- Arguments::add_loaded_agent(agent, (char*)options, is_absolute_path, library);
+ Arguments::add_loaded_agent(agent_lib);
+ } else {
+ delete agent_lib;
}
// Agent_OnAttach executed so completion status is JNI_OK
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -1554,6 +1554,24 @@
return false;
}
+ // rewrite source file name index:
+ u2 source_file_name_idx = scratch_class->source_file_name_index();
+ if (source_file_name_idx != 0) {
+ u2 new_source_file_name_idx = find_new_index(source_file_name_idx);
+ if (new_source_file_name_idx != 0) {
+ scratch_class->set_source_file_name_index(new_source_file_name_idx);
+ }
+ }
+
+ // rewrite class generic signature index:
+ u2 generic_signature_index = scratch_class->generic_signature_index();
+ if (generic_signature_index != 0) {
+ u2 new_generic_signature_index = find_new_index(generic_signature_index);
+ if (new_generic_signature_index != 0) {
+ scratch_class->set_generic_signature_index(new_generic_signature_index);
+ }
+ }
+
return true;
} // end rewrite_cp_refs()
@@ -1723,7 +1741,10 @@
for (int i = 0; i < len; i++) {
const u2 cp_index = elem[i].name_cp_index;
- elem[i].name_cp_index = find_new_index(cp_index);
+ const u2 new_cp_index = find_new_index(cp_index);
+ if (new_cp_index != 0) {
+ elem[i].name_cp_index = new_cp_index;
+ }
}
}
} // end rewrite_cp_refs_in_method()
@@ -3370,7 +3391,8 @@
// Leave arrays of jmethodIDs and itable index cache unchanged
// Copy the "source file name" attribute from new class version
- the_class->set_source_file_name(scratch_class->source_file_name());
+ the_class->set_source_file_name_index(
+ scratch_class->source_file_name_index());
// Copy the "source debug extension" attribute from new class version
the_class->set_source_debug_extension(
--- a/hotspot/src/share/vm/prims/whitebox.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/prims/whitebox.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -128,7 +128,7 @@
WB_END
#endif // INCLUDE_ALL_GCS
-#ifdef INCLUDE_NMT
+#if INCLUDE_NMT
// Alloc memory using the test memory type so that we can use that to see if
// NMT picks it up correctly
WB_ENTRY(jlong, WB_NMTMalloc(JNIEnv* env, jobject o, jlong size))
@@ -181,6 +181,10 @@
return MemTracker::wbtest_wait_for_data_merge();
WB_END
+WB_ENTRY(jboolean, WB_NMTIsDetailSupported(JNIEnv* env))
+ return MemTracker::tracking_level() == MemTracker::NMT_detail;
+WB_END
+
#endif // INCLUDE_NMT
static jmethodID reflected_method_to_jmid(JavaThread* thread, JNIEnv* env, jobject method) {
@@ -196,12 +200,22 @@
VMThread::execute(&op);
WB_END
-WB_ENTRY(jint, WB_DeoptimizeMethod(JNIEnv* env, jobject o, jobject method))
+WB_ENTRY(jint, WB_DeoptimizeMethod(JNIEnv* env, jobject o, jobject method, jboolean is_osr))
jmethodID jmid = reflected_method_to_jmid(thread, env, method);
MutexLockerEx mu(Compile_lock);
methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
int result = 0;
- nmethod* code = mh->code();
+ nmethod* code;
+ if (is_osr) {
+ int bci = InvocationEntryBci;
+ while ((code = mh->lookup_osr_nmethod_for(bci, CompLevel_none, false)) != NULL) {
+ code->mark_for_deoptimization();
+ ++result;
+ bci = code->osr_entry_bci() + 1;
+ }
+ } else {
+ code = mh->code();
+ }
if (code != NULL) {
code->mark_for_deoptimization();
++result;
@@ -214,22 +228,26 @@
return result;
WB_END
-WB_ENTRY(jboolean, WB_IsMethodCompiled(JNIEnv* env, jobject o, jobject method))
+WB_ENTRY(jboolean, WB_IsMethodCompiled(JNIEnv* env, jobject o, jobject method, jboolean is_osr))
jmethodID jmid = reflected_method_to_jmid(thread, env, method);
MutexLockerEx mu(Compile_lock);
methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
- nmethod* code = mh->code();
+ nmethod* code = is_osr ? mh->lookup_osr_nmethod_for(InvocationEntryBci, CompLevel_none, false) : mh->code();
if (code == NULL) {
return JNI_FALSE;
}
return (code->is_alive() && !code->is_marked_for_deoptimization());
WB_END
-WB_ENTRY(jboolean, WB_IsMethodCompilable(JNIEnv* env, jobject o, jobject method, jint comp_level))
+WB_ENTRY(jboolean, WB_IsMethodCompilable(JNIEnv* env, jobject o, jobject method, jint comp_level, jboolean is_osr))
jmethodID jmid = reflected_method_to_jmid(thread, env, method);
MutexLockerEx mu(Compile_lock);
methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
- return CompilationPolicy::can_be_compiled(mh, comp_level);
+ if (is_osr) {
+ return CompilationPolicy::can_be_osr_compiled(mh, comp_level);
+ } else {
+ return CompilationPolicy::can_be_compiled(mh, comp_level);
+ }
WB_END
WB_ENTRY(jboolean, WB_IsMethodQueuedForCompilation(JNIEnv* env, jobject o, jobject method))
@@ -239,18 +257,28 @@
return mh->queued_for_compilation();
WB_END
-WB_ENTRY(jint, WB_GetMethodCompilationLevel(JNIEnv* env, jobject o, jobject method))
+WB_ENTRY(jint, WB_GetMethodCompilationLevel(JNIEnv* env, jobject o, jobject method, jboolean is_osr))
jmethodID jmid = reflected_method_to_jmid(thread, env, method);
methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
- nmethod* code = mh->code();
+ nmethod* code = is_osr ? mh->lookup_osr_nmethod_for(InvocationEntryBci, CompLevel_none, false) : mh->code();
return (code != NULL ? code->comp_level() : CompLevel_none);
WB_END
-
-WB_ENTRY(void, WB_MakeMethodNotCompilable(JNIEnv* env, jobject o, jobject method, jint comp_level))
+WB_ENTRY(void, WB_MakeMethodNotCompilable(JNIEnv* env, jobject o, jobject method, jint comp_level, jboolean is_osr))
jmethodID jmid = reflected_method_to_jmid(thread, env, method);
methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
- mh->set_not_compilable(comp_level, true /* report */, "WhiteBox");
+ if (is_osr) {
+ mh->set_not_osr_compilable(comp_level, true /* report */, "WhiteBox");
+ } else {
+ mh->set_not_compilable(comp_level, true /* report */, "WhiteBox");
+ }
+WB_END
+
+WB_ENTRY(jint, WB_GetMethodEntryBci(JNIEnv* env, jobject o, jobject method))
+ jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+ methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
+ nmethod* code = mh->lookup_osr_nmethod_for(InvocationEntryBci, CompLevel_none, false);
+ return (code != NULL && code->is_osr_method() ? code->osr_entry_bci() : InvocationEntryBci);
WB_END
WB_ENTRY(jboolean, WB_TestSetDontInlineMethod(JNIEnv* env, jobject o, jobject method, jboolean value))
@@ -261,12 +289,15 @@
return result;
WB_END
-WB_ENTRY(jint, WB_GetCompileQueuesSize(JNIEnv* env, jobject o))
- return CompileBroker::queue_size(CompLevel_full_optimization) /* C2 */ +
- CompileBroker::queue_size(CompLevel_full_profile) /* C1 */;
+WB_ENTRY(jint, WB_GetCompileQueueSize(JNIEnv* env, jobject o, jint comp_level))
+ if (comp_level == CompLevel_any) {
+ return CompileBroker::queue_size(CompLevel_full_optimization) /* C2 */ +
+ CompileBroker::queue_size(CompLevel_full_profile) /* C1 */;
+ } else {
+ return CompileBroker::queue_size(comp_level);
+ }
WB_END
-
WB_ENTRY(jboolean, WB_TestSetForceInlineMethod(JNIEnv* env, jobject o, jobject method, jboolean value))
jmethodID jmid = reflected_method_to_jmid(thread, env, method);
methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
@@ -275,10 +306,10 @@
return result;
WB_END
-WB_ENTRY(jboolean, WB_EnqueueMethodForCompilation(JNIEnv* env, jobject o, jobject method, jint comp_level))
+WB_ENTRY(jboolean, WB_EnqueueMethodForCompilation(JNIEnv* env, jobject o, jobject method, jint comp_level, jint bci))
jmethodID jmid = reflected_method_to_jmid(thread, env, method);
methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
- nmethod* nm = CompileBroker::compile_method(mh, InvocationEntryBci, comp_level, mh, mh->invocation_count(), "WhiteBox", THREAD);
+ nmethod* nm = CompileBroker::compile_method(mh, bci, comp_level, mh, mh->invocation_count(), "WhiteBox", THREAD);
MutexLockerEx mu(Compile_lock);
return (mh->queued_for_compilation() || nm != NULL);
WB_END
@@ -324,7 +355,6 @@
return (StringTable::lookup(name, len) != NULL);
WB_END
-
WB_ENTRY(void, WB_FullGC(JNIEnv* env, jobject o))
Universe::heap()->collector_policy()->set_should_clear_all_soft_refs(true);
Universe::heap()->collect(GCCause::_last_ditch_collection);
@@ -413,7 +443,7 @@
{CC"g1NumFreeRegions", CC"()J", (void*)&WB_G1NumFreeRegions },
{CC"g1RegionSize", CC"()I", (void*)&WB_G1RegionSize },
#endif // INCLUDE_ALL_GCS
-#ifdef INCLUDE_NMT
+#if INCLUDE_NMT
{CC"NMTMalloc", CC"(J)J", (void*)&WB_NMTMalloc },
{CC"NMTFree", CC"(J)V", (void*)&WB_NMTFree },
{CC"NMTReserveMemory", CC"(J)J", (void*)&WB_NMTReserveMemory },
@@ -421,33 +451,35 @@
{CC"NMTUncommitMemory", CC"(JJ)V", (void*)&WB_NMTUncommitMemory },
{CC"NMTReleaseMemory", CC"(JJ)V", (void*)&WB_NMTReleaseMemory },
{CC"NMTWaitForDataMerge", CC"()Z", (void*)&WB_NMTWaitForDataMerge},
+ {CC"NMTIsDetailSupported",CC"()Z", (void*)&WB_NMTIsDetailSupported},
#endif // INCLUDE_NMT
{CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll },
- {CC"deoptimizeMethod", CC"(Ljava/lang/reflect/Executable;)I",
+ {CC"deoptimizeMethod", CC"(Ljava/lang/reflect/Executable;Z)I",
(void*)&WB_DeoptimizeMethod },
- {CC"isMethodCompiled", CC"(Ljava/lang/reflect/Executable;)Z",
+ {CC"isMethodCompiled", CC"(Ljava/lang/reflect/Executable;Z)Z",
(void*)&WB_IsMethodCompiled },
- {CC"isMethodCompilable", CC"(Ljava/lang/reflect/Executable;I)Z",
+ {CC"isMethodCompilable", CC"(Ljava/lang/reflect/Executable;IZ)Z",
(void*)&WB_IsMethodCompilable},
{CC"isMethodQueuedForCompilation",
CC"(Ljava/lang/reflect/Executable;)Z", (void*)&WB_IsMethodQueuedForCompilation},
{CC"makeMethodNotCompilable",
- CC"(Ljava/lang/reflect/Executable;I)V", (void*)&WB_MakeMethodNotCompilable},
+ CC"(Ljava/lang/reflect/Executable;IZ)V", (void*)&WB_MakeMethodNotCompilable},
{CC"testSetDontInlineMethod",
CC"(Ljava/lang/reflect/Executable;Z)Z", (void*)&WB_TestSetDontInlineMethod},
{CC"getMethodCompilationLevel",
- CC"(Ljava/lang/reflect/Executable;)I", (void*)&WB_GetMethodCompilationLevel},
- {CC"getCompileQueuesSize",
- CC"()I", (void*)&WB_GetCompileQueuesSize},
+ CC"(Ljava/lang/reflect/Executable;Z)I", (void*)&WB_GetMethodCompilationLevel},
+ {CC"getMethodEntryBci",
+ CC"(Ljava/lang/reflect/Executable;)I", (void*)&WB_GetMethodEntryBci},
+ {CC"getCompileQueueSize",
+ CC"(I)I", (void*)&WB_GetCompileQueueSize},
{CC"testSetForceInlineMethod",
CC"(Ljava/lang/reflect/Executable;Z)Z", (void*)&WB_TestSetForceInlineMethod},
{CC"enqueueMethodForCompilation",
- CC"(Ljava/lang/reflect/Executable;I)Z", (void*)&WB_EnqueueMethodForCompilation},
+ CC"(Ljava/lang/reflect/Executable;II)Z", (void*)&WB_EnqueueMethodForCompilation},
{CC"clearMethodState",
CC"(Ljava/lang/reflect/Executable;)V", (void*)&WB_ClearMethodState},
{CC"isInStringTable", CC"(Ljava/lang/String;)Z", (void*)&WB_IsInStringTable },
{CC"fullGC", CC"()V", (void*)&WB_FullGC },
-
{CC"readReservedMemory", CC"()V", (void*)&WB_ReadReservedMemory },
};
--- a/hotspot/src/share/vm/runtime/arguments.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -1393,10 +1393,8 @@
inline uintx max_heap_for_compressed_oops() {
// Avoid sign flip.
- if (OopEncodingHeapMax < ClassMetaspaceSize + os::vm_page_size()) {
- return 0;
- }
- LP64_ONLY(return OopEncodingHeapMax - ClassMetaspaceSize - os::vm_page_size());
+ assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size");
+ LP64_ONLY(return OopEncodingHeapMax - os::vm_page_size());
NOT_LP64(ShouldNotReachHere(); return 0);
}
@@ -1448,6 +1446,35 @@
#endif // ZERO
}
+
+// NOTE: set_use_compressed_klass_ptrs() must be called after calling
+// set_use_compressed_oops().
+void Arguments::set_use_compressed_klass_ptrs() {
+#ifndef ZERO
+#ifdef _LP64
+ // UseCompressedOops must be on for UseCompressedKlassPointers to be on.
+ if (!UseCompressedOops) {
+ if (UseCompressedKlassPointers) {
+ warning("UseCompressedKlassPointers requires UseCompressedOops");
+ }
+ FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
+ } else {
+ // Turn on UseCompressedKlassPointers too
+ if (FLAG_IS_DEFAULT(UseCompressedKlassPointers)) {
+ FLAG_SET_ERGO(bool, UseCompressedKlassPointers, true);
+ }
+ // Check the ClassMetaspaceSize to make sure we use compressed klass ptrs.
+ if (UseCompressedKlassPointers) {
+ if (ClassMetaspaceSize > KlassEncodingMetaspaceMax) {
+ warning("Class metaspace size is too large for UseCompressedKlassPointers");
+ FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
+ }
+ }
+ }
+#endif // _LP64
+#endif // !ZERO
+}
+
void Arguments::set_ergonomics_flags() {
if (os::is_server_class_machine()) {
@@ -1470,7 +1497,8 @@
// server performance. On server class machines, keep the default
// off unless it is asked for. Future work: either add bytecode rewriting
// at link time, or rewrite bytecodes in non-shared methods.
- if (!DumpSharedSpaces && !RequireSharedSpaces) {
+ if (!DumpSharedSpaces && !RequireSharedSpaces &&
+ (FLAG_IS_DEFAULT(UseSharedSpaces) || !UseSharedSpaces)) {
no_shared_spaces();
}
}
@@ -1478,33 +1506,11 @@
#ifndef ZERO
#ifdef _LP64
set_use_compressed_oops();
- // UseCompressedOops must be on for UseCompressedKlassPointers to be on.
- if (!UseCompressedOops) {
- if (UseCompressedKlassPointers) {
- warning("UseCompressedKlassPointers requires UseCompressedOops");
- }
- FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
- } else {
- // Turn on UseCompressedKlassPointers too
- if (FLAG_IS_DEFAULT(UseCompressedKlassPointers)) {
- FLAG_SET_ERGO(bool, UseCompressedKlassPointers, true);
- }
- // Set the ClassMetaspaceSize to something that will not need to be
- // expanded, since it cannot be expanded.
- if (UseCompressedKlassPointers) {
- if (ClassMetaspaceSize > KlassEncodingMetaspaceMax) {
- warning("Class metaspace size is too large for UseCompressedKlassPointers");
- FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
- } else if (FLAG_IS_DEFAULT(ClassMetaspaceSize)) {
- // 100,000 classes seems like a good size, so 100M assumes around 1K
- // per klass. The vtable and oopMap is embedded so we don't have a fixed
- // size per klass. Eventually, this will be parameterized because it
- // would also be useful to determine the optimal size of the
- // systemDictionary.
- FLAG_SET_ERGO(uintx, ClassMetaspaceSize, 100*M);
- }
- }
- }
+
+ // set_use_compressed_klass_ptrs() must be called after calling
+ // set_use_compressed_oops().
+ set_use_compressed_klass_ptrs();
+
// Also checks that certain machines are slower with compressed oops
// in vm_version initialization code.
#endif // _LP64
@@ -2153,7 +2159,7 @@
status = status && verify_object_alignment();
- status = status && verify_min_value(ClassMetaspaceSize, 1*M,
+ status = status && verify_interval(ClassMetaspaceSize, 1*M, 3*G,
"ClassMetaspaceSize");
status = status && verify_interval(MarkStackSizeMax,
@@ -3273,33 +3279,22 @@
}
void Arguments::set_shared_spaces_flags() {
-#ifdef _LP64
- const bool must_share = DumpSharedSpaces || RequireSharedSpaces;
-
- // CompressedOops cannot be used with CDS. The offsets of oopmaps and
- // static fields are incorrect in the archive. With some more clever
- // initialization, this restriction can probably be lifted.
- if (UseCompressedOops) {
- if (must_share) {
- warning("disabling compressed oops because of %s",
- DumpSharedSpaces ? "-Xshare:dump" : "-Xshare:on");
- FLAG_SET_CMDLINE(bool, UseCompressedOops, false);
- FLAG_SET_CMDLINE(bool, UseCompressedKlassPointers, false);
- } else {
- // Prefer compressed oops to class data sharing
- if (UseSharedSpaces && Verbose) {
- warning("turning off use of shared archive because of compressed oops");
- }
- no_shared_spaces();
- }
- }
-#endif
-
if (DumpSharedSpaces) {
if (RequireSharedSpaces) {
warning("cannot dump shared archive while using shared archive");
}
UseSharedSpaces = false;
+#ifdef _LP64
+ if (!UseCompressedOops || !UseCompressedKlassPointers) {
+ vm_exit_during_initialization(
+ "Cannot dump shared archive when UseCompressedOops or UseCompressedKlassPointers is off.", NULL);
+ }
+ } else {
+ // UseCompressedOops and UseCompressedKlassPointers must be on for UseSharedSpaces.
+ if (!UseCompressedOops || !UseCompressedKlassPointers) {
+ no_shared_spaces();
+ }
+#endif
}
}
--- a/hotspot/src/share/vm/runtime/arguments.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/arguments.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -118,11 +118,21 @@
// For use by -agentlib, -agentpath and -Xrun
class AgentLibrary : public CHeapObj<mtInternal> {
friend class AgentLibraryList;
+public:
+ // Is this library valid or not. Don't rely on os_lib == NULL as statically
+ // linked lib could have handle of RTLD_DEFAULT which == 0 on some platforms
+ enum AgentState {
+ agent_invalid = 0,
+ agent_valid = 1
+ };
+
private:
char* _name;
char* _options;
void* _os_lib;
bool _is_absolute_path;
+ bool _is_static_lib;
+ AgentState _state;
AgentLibrary* _next;
public:
@@ -133,6 +143,11 @@
void* os_lib() const { return _os_lib; }
void set_os_lib(void* os_lib) { _os_lib = os_lib; }
AgentLibrary* next() const { return _next; }
+ bool is_static_lib() const { return _is_static_lib; }
+ void set_static_lib(bool static_lib) { _is_static_lib = static_lib; }
+ bool valid() { return (_state == agent_valid); }
+ void set_valid() { _state = agent_valid; }
+ void set_invalid() { _state = agent_invalid; }
// Constructor
AgentLibrary(const char* name, const char* options, bool is_absolute_path, void* os_lib) {
@@ -147,6 +162,8 @@
_is_absolute_path = is_absolute_path;
_os_lib = os_lib;
_next = NULL;
+ _state = agent_invalid;
+ _is_static_lib = false;
}
};
@@ -276,6 +293,8 @@
{ _agentList.add(new AgentLibrary(name, options, absolute_path, NULL)); }
// Late-binding agents not started via arguments
+ static void add_loaded_agent(AgentLibrary *agentLib)
+ { _agentList.add(agentLib); }
static void add_loaded_agent(const char* name, char* options, bool absolute_path, void* os_lib)
{ _agentList.add(new AgentLibrary(name, options, absolute_path, os_lib)); }
@@ -309,6 +328,7 @@
static void set_g1_gc_flags();
// GC ergonomics
static void set_use_compressed_oops();
+ static void set_use_compressed_klass_ptrs();
static void set_ergonomics_flags();
static void set_shared_spaces_flags();
// limits the given memory size by the maximum amount of memory this process is
--- a/hotspot/src/share/vm/runtime/compilationPolicy.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/compilationPolicy.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -138,6 +138,23 @@
return false;
}
+// Returns true if m is allowed to be osr compiled
+bool CompilationPolicy::can_be_osr_compiled(methodHandle m, int comp_level) {
+ bool result = false;
+ if (comp_level == CompLevel_all) {
+ if (TieredCompilation) {
+ // enough to be osr compilable at any level for tiered
+ result = !m->is_not_osr_compilable(CompLevel_simple) || !m->is_not_osr_compilable(CompLevel_full_optimization);
+ } else {
+ // must be osr compilable at available level for non-tiered
+ result = !m->is_not_osr_compilable(CompLevel_highest_tier);
+ }
+ } else if (is_compile(comp_level)) {
+ result = !m->is_not_osr_compilable(comp_level);
+ }
+ return (result && can_be_compiled(m, comp_level));
+}
+
bool CompilationPolicy::is_compilation_enabled() {
// NOTE: CompileBroker::should_compile_new_jobs() checks for UseCompiler
return !delay_compilation_during_startup() && CompileBroker::should_compile_new_jobs();
@@ -458,7 +475,7 @@
const int hot_count = m->backedge_count();
const char* comment = "backedge_count";
- if (is_compilation_enabled() && !m->is_not_osr_compilable(comp_level) && can_be_compiled(m, comp_level)) {
+ if (is_compilation_enabled() && can_be_osr_compiled(m, comp_level)) {
CompileBroker::compile_method(m, bci, comp_level, m, hot_count, comment, thread);
NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(bci, comp_level, true));)
}
@@ -514,7 +531,7 @@
const int hot_count = m->backedge_count();
const char* comment = "backedge_count";
- if (is_compilation_enabled() && !m->is_not_osr_compilable(comp_level) && can_be_compiled(m, comp_level)) {
+ if (is_compilation_enabled() && can_be_osr_compiled(m, comp_level)) {
CompileBroker::compile_method(m, bci, comp_level, m, hot_count, comment, thread);
NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(bci, comp_level, true));)
}
--- a/hotspot/src/share/vm/runtime/compilationPolicy.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/compilationPolicy.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -52,6 +52,8 @@
static bool must_be_compiled(methodHandle m, int comp_level = CompLevel_all);
// m is allowed to be compiled
static bool can_be_compiled(methodHandle m, int comp_level = CompLevel_all);
+ // m is allowed to be osr compiled
+ static bool can_be_osr_compiled(methodHandle m, int comp_level = CompLevel_all);
static bool is_compilation_enabled();
static void set_policy(CompilationPolicy* policy) { _policy = policy; }
static CompilationPolicy* policy() { return _policy; }
--- a/hotspot/src/share/vm/runtime/frame.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/frame.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "compiler/abstractCompiler.hpp"
#include "compiler/disassembler.hpp"
#include "gc_interface/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
@@ -559,7 +560,7 @@
st->print("%s frame (sp=" INTPTR_FORMAT " unextended sp=" INTPTR_FORMAT, print_name(), sp(), unextended_sp());
if (sp() != NULL)
- st->print(", fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, fp(), pc());
+ st->print(", fp=" INTPTR_FORMAT ", real_fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, fp(), real_fp(), pc());
if (StubRoutines::contains(pc())) {
st->print_cr(")");
@@ -720,11 +721,14 @@
} else if (_cb->is_buffer_blob()) {
st->print("v ~BufferBlob::%s", ((BufferBlob *)_cb)->name());
} else if (_cb->is_nmethod()) {
- Method* m = ((nmethod *)_cb)->method();
+ nmethod* nm = (nmethod*)_cb;
+ Method* m = nm->method();
if (m != NULL) {
m->name_and_sig_as_C_string(buf, buflen);
- st->print("J %s @ " PTR_FORMAT " [" PTR_FORMAT "+" SIZE_FORMAT "]",
- buf, _pc, _cb->code_begin(), _pc - _cb->code_begin());
+ st->print("J %d%s %s %s (%d bytes) @ " PTR_FORMAT " [" PTR_FORMAT "+0x%x]",
+ nm->compile_id(), (nm->is_osr_method() ? "%" : ""),
+ ((nm->compiler() != NULL) ? nm->compiler()->name() : ""),
+ buf, m->code_size(), _pc, _cb->code_begin(), _pc - _cb->code_begin());
} else {
st->print("J " PTR_FORMAT, pc());
}
--- a/hotspot/src/share/vm/runtime/globals.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/globals.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -1933,6 +1933,9 @@
notproduct(bool, ExecuteInternalVMTests, false, \
"Enable execution of internal VM tests.") \
\
+ notproduct(bool, VerboseInternalVMTests, false, \
+ "Turn on logging for internal VM tests.") \
+ \
product_pd(bool, UseTLAB, "Use thread-local object allocation") \
\
product_pd(bool, ResizeTLAB, \
@@ -3036,7 +3039,7 @@
product(uintx, MaxMetaspaceSize, max_uintx, \
"Maximum size of Metaspaces (in bytes)") \
\
- product(uintx, ClassMetaspaceSize, 2*M, \
+ product(uintx, ClassMetaspaceSize, 1*G, \
"Maximum size of InstanceKlass area in Metaspace used for " \
"UseCompressedKlassPointers") \
\
--- a/hotspot/src/share/vm/runtime/init.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/init.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -95,7 +95,6 @@
management_init();
bytecodes_init();
classLoader_init();
- Metaspace::global_initialize(); // must be before codeCache
codeCache_init();
VM_Version_init();
os_init_globals();
--- a/hotspot/src/share/vm/runtime/mutexLocker.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -124,13 +124,15 @@
Mutex* Management_lock = NULL;
Monitor* Service_lock = NULL;
-Mutex* Stacktrace_lock = NULL;
+Monitor* PeriodicTask_lock = NULL;
-Monitor* JfrQuery_lock = NULL;
+#ifdef INCLUDE_TRACE
+Mutex* JfrStacktrace_lock = NULL;
Monitor* JfrMsg_lock = NULL;
Mutex* JfrBuffer_lock = NULL;
Mutex* JfrStream_lock = NULL;
-Monitor* PeriodicTask_lock = NULL;
+Mutex* JfrThreadGroups_lock = NULL;
+#endif
#define MAX_NUM_MUTEX 128
static Monitor * _mutex_array[MAX_NUM_MUTEX];
@@ -206,7 +208,6 @@
def(Patching_lock , Mutex , special, true ); // used for safepointing and code patching.
def(ObjAllocPost_lock , Monitor, special, false);
def(Service_lock , Monitor, special, true ); // used for service thread operations
- def(Stacktrace_lock , Mutex, special, true ); // used for JFR stacktrace database
def(JmethodIdCreation_lock , Mutex , leaf, true ); // used for creating jmethodIDs.
def(SystemDictionary_lock , Monitor, leaf, true ); // lookups done by VM thread
@@ -272,11 +273,16 @@
def(Debug3_lock , Mutex , nonleaf+4, true );
def(ProfileVM_lock , Monitor, special, false); // used for profiling of the VMThread
def(CompileThread_lock , Monitor, nonleaf+5, false );
+ def(PeriodicTask_lock , Monitor, nonleaf+5, true);
+#ifdef INCLUDE_TRACE
def(JfrMsg_lock , Monitor, leaf, true);
def(JfrBuffer_lock , Mutex, nonleaf+1, true);
+ def(JfrThreadGroups_lock , Mutex, nonleaf+1, true);
def(JfrStream_lock , Mutex, nonleaf+2, true);
- def(PeriodicTask_lock , Monitor, nonleaf+5, true);
+ def(JfrStacktrace_lock , Mutex, special, true );
+#endif
+
}
GCMutexLocker::GCMutexLocker(Monitor * mutex) {
--- a/hotspot/src/share/vm/runtime/mutexLocker.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/mutexLocker.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -137,13 +137,15 @@
extern Mutex* Management_lock; // a lock used to serialize JVM management
extern Monitor* Service_lock; // a lock used for service thread operation
-extern Mutex* Stacktrace_lock; // used to guard access to the stacktrace table
+extern Monitor* PeriodicTask_lock; // protects the periodic task structure
-extern Monitor* JfrQuery_lock; // protects JFR use
+#ifdef INCLUDE_TRACE
+extern Mutex* JfrStacktrace_lock; // used to guard access to the JFR stacktrace table
extern Monitor* JfrMsg_lock; // protects JFR messaging
extern Mutex* JfrBuffer_lock; // protects JFR buffer operations
extern Mutex* JfrStream_lock; // protects JFR stream access
-extern Monitor* PeriodicTask_lock; // protects the periodic task structure
+extern Mutex* JfrThreadGroups_lock; // protects JFR access to Thread Groups
+#endif
// A MutexLocker provides mutual exclusion with respect to a given mutex
// for the scope which contains the locker. The lock is an OS lock, not
--- a/hotspot/src/share/vm/runtime/os.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/os.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -443,6 +443,67 @@
return _native_java_library;
}
+/*
+ * Support for finding Agent_On(Un)Load/Attach<_lib_name> if it exists.
+ * If check_lib == true then we are looking for an
+ * Agent_OnLoad_lib_name or Agent_OnAttach_lib_name function to determine if
+ * this library is statically linked into the image.
+ * If check_lib == false then we will look for the appropriate symbol in the
+ * executable if agent_lib->is_static_lib() == true or in the shared library
+ * referenced by 'handle'.
+ */
+void* os::find_agent_function(AgentLibrary *agent_lib, bool check_lib,
+ const char *syms[], size_t syms_len) {
+ const char *lib_name;
+ void *handle = agent_lib->os_lib();
+ void *entryName = NULL;
+ char *agent_function_name;
+ size_t i;
+
+ // If checking then use the agent name otherwise test is_static_lib() to
+ // see how to process this lookup
+ lib_name = ((check_lib || agent_lib->is_static_lib()) ? agent_lib->name() : NULL);
+ for (i = 0; i < syms_len; i++) {
+ agent_function_name = build_agent_function_name(syms[i], lib_name, agent_lib->is_absolute_path());
+ if (agent_function_name == NULL) {
+ break;
+ }
+ entryName = dll_lookup(handle, agent_function_name);
+ FREE_C_HEAP_ARRAY(char, agent_function_name, mtThread);
+ if (entryName != NULL) {
+ break;
+ }
+ }
+ return entryName;
+}
+
+// See if the passed in agent is statically linked into the VM image.
+bool os::find_builtin_agent(AgentLibrary *agent_lib, const char *syms[],
+ size_t syms_len) {
+ void *ret;
+ void *proc_handle;
+ void *save_handle;
+
+ if (agent_lib->name() == NULL) {
+ return false;
+ }
+ proc_handle = get_default_process_handle();
+ // Check for Agent_OnLoad/Attach_lib_name function
+ save_handle = agent_lib->os_lib();
+ // We want to look in this process' symbol table.
+ agent_lib->set_os_lib(proc_handle);
+ ret = find_agent_function(agent_lib, true, syms, syms_len);
+ agent_lib->set_os_lib(save_handle);
+ if (ret != NULL) {
+ // Found an entry point like Agent_OnLoad_lib_name so we have a static agent
+ agent_lib->set_os_lib(proc_handle);
+ agent_lib->set_valid();
+ agent_lib->set_static_lib(true);
+ return true;
+ }
+ return false;
+}
+
// --------------------- heap allocation utilities ---------------------
char *os::strdup(const char *str, MEMFLAGS flags) {
--- a/hotspot/src/share/vm/runtime/os.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/os.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -46,6 +46,8 @@
# include <setjmp.h>
#endif
+class AgentLibrary;
+
// os defines the interface to operating system; this includes traditional
// OS services (time, I/O) as well as other functionality with system-
// dependent code.
@@ -328,8 +330,8 @@
static char* non_memory_address_word();
// reserve, commit and pin the entire memory region
- static char* reserve_memory_special(size_t size, char* addr = NULL,
- bool executable = false);
+ static char* reserve_memory_special(size_t size, size_t alignment,
+ char* addr, bool executable);
static bool release_memory_special(char* addr, size_t bytes);
static void large_page_init();
static size_t large_page_size();
@@ -537,6 +539,17 @@
// Unload library
static void dll_unload(void *lib);
+ // Return the handle of this process
+ static void* get_default_process_handle();
+
+ // Check for static linked agent library
+ static bool find_builtin_agent(AgentLibrary *agent_lib, const char *syms[],
+ size_t syms_len);
+
+ // Find agent entry point
+ static void *find_agent_function(AgentLibrary *agent_lib, bool check_lib,
+ const char *syms[], size_t syms_len);
+
// Print out system information; they are called by fatal error handler.
// Output format may be different on different platforms.
static void print_os_info(outputStream* st);
@@ -806,6 +819,11 @@
// ResumeThread call)
static void pause();
+ // Builds a platform dependent Agent_OnLoad_<libname> function name
+ // which is used to find statically linked in agents.
+ static char* build_agent_function_name(const char *sym, const char *cname,
+ bool is_absolute_path);
+
class SuspendedThreadTaskContext {
public:
SuspendedThreadTaskContext(Thread* thread, void *ucontext) : _thread(thread), _ucontext(ucontext) {}
--- a/hotspot/src/share/vm/runtime/sweeper.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/sweeper.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -83,6 +83,7 @@
static jlong peak_disconnect_time() { return _peak_disconnect_time; }
#ifdef ASSERT
+ static bool is_sweeping(nmethod* which) { return _current == which; }
// Keep track of sweeper activity in the ring buffer
static void record_sweep(nmethod* nm, int line);
static void report_events(int id, address entry);
--- a/hotspot/src/share/vm/runtime/thread.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/thread.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -3696,15 +3696,18 @@
// num_symbol_entries must be passed-in since only the caller knows the number of symbols in the array.
static OnLoadEntry_t lookup_on_load(AgentLibrary* agent, const char *on_load_symbols[], size_t num_symbol_entries) {
OnLoadEntry_t on_load_entry = NULL;
- void *library = agent->os_lib(); // check if we have looked it up before
-
- if (library == NULL) {
+ void *library = NULL;
+
+ if (!agent->valid()) {
char buffer[JVM_MAXPATHLEN];
char ebuf[1024];
const char *name = agent->name();
const char *msg = "Could not find agent library ";
- if (agent->is_absolute_path()) {
+ // First check to see if agent is statcally linked into executable
+ if (os::find_builtin_agent(agent, on_load_symbols, num_symbol_entries)) {
+ library = agent->os_lib();
+ } else if (agent->is_absolute_path()) {
library = os::dll_load(name, ebuf, sizeof ebuf);
if (library == NULL) {
const char *sub_msg = " in absolute path, with error: ";
@@ -3738,13 +3741,15 @@
}
}
agent->set_os_lib(library);
+ agent->set_valid();
}
// Find the OnLoad function.
- for (size_t symbol_index = 0; symbol_index < num_symbol_entries; symbol_index++) {
- on_load_entry = CAST_TO_FN_PTR(OnLoadEntry_t, os::dll_lookup(library, on_load_symbols[symbol_index]));
- if (on_load_entry != NULL) break;
- }
+ on_load_entry =
+ CAST_TO_FN_PTR(OnLoadEntry_t, os::find_agent_function(agent,
+ false,
+ on_load_symbols,
+ num_symbol_entries));
return on_load_entry;
}
@@ -3819,22 +3824,23 @@
void Threads::shutdown_vm_agents() {
// Send any Agent_OnUnload notifications
const char *on_unload_symbols[] = AGENT_ONUNLOAD_SYMBOLS;
+ size_t num_symbol_entries = ARRAY_SIZE(on_unload_symbols);
extern struct JavaVM_ main_vm;
for (AgentLibrary* agent = Arguments::agents(); agent != NULL; agent = agent->next()) {
// Find the Agent_OnUnload function.
- for (uint symbol_index = 0; symbol_index < ARRAY_SIZE(on_unload_symbols); symbol_index++) {
- Agent_OnUnload_t unload_entry = CAST_TO_FN_PTR(Agent_OnUnload_t,
- os::dll_lookup(agent->os_lib(), on_unload_symbols[symbol_index]));
-
- // Invoke the Agent_OnUnload function
- if (unload_entry != NULL) {
- JavaThread* thread = JavaThread::current();
- ThreadToNativeFromVM ttn(thread);
- HandleMark hm(thread);
- (*unload_entry)(&main_vm);
- break;
- }
+ Agent_OnUnload_t unload_entry = CAST_TO_FN_PTR(Agent_OnUnload_t,
+ os::find_agent_function(agent,
+ false,
+ on_unload_symbols,
+ num_symbol_entries));
+
+ // Invoke the Agent_OnUnload function
+ if (unload_entry != NULL) {
+ JavaThread* thread = JavaThread::current();
+ ThreadToNativeFromVM ttn(thread);
+ HandleMark hm(thread);
+ (*unload_entry)(&main_vm);
}
}
}
--- a/hotspot/src/share/vm/runtime/virtualspace.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/virtualspace.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -42,8 +42,19 @@
// ReservedSpace
+
+// Dummy constructor
+ReservedSpace::ReservedSpace() : _base(NULL), _size(0), _noaccess_prefix(0),
+ _alignment(0), _special(false), _executable(false) {
+}
+
ReservedSpace::ReservedSpace(size_t size) {
- initialize(size, 0, false, NULL, 0, false);
+ size_t page_size = os::page_size_for_region(size, size, 1);
+ bool large_pages = page_size != (size_t)os::vm_page_size();
+ // Don't force the alignment to be large page aligned,
+ // since that will waste memory.
+ size_t alignment = os::vm_allocation_granularity();
+ initialize(size, alignment, large_pages, NULL, 0, false);
}
ReservedSpace::ReservedSpace(size_t size, size_t alignment,
@@ -129,16 +140,18 @@
if (special) {
- base = os::reserve_memory_special(size, requested_address, executable);
+ base = os::reserve_memory_special(size, alignment, requested_address, executable);
if (base != NULL) {
if (failed_to_reserve_as_requested(base, requested_address, size, true)) {
// OS ignored requested address. Try different address.
return;
}
- // Check alignment constraints
+ // Check alignment constraints.
assert((uintptr_t) base % alignment == 0,
- "Large pages returned a non-aligned address");
+ err_msg("Large pages returned a non-aligned address, base: "
+ PTR_FORMAT " alignment: " PTR_FORMAT,
+ base, (void*)(uintptr_t)alignment));
_special = true;
} else {
// failed; try to reserve regular memory below
@@ -715,4 +728,188 @@
tty->print_cr(" - [low_b, high_b]: [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", low_boundary(), high_boundary());
}
+
+/////////////// Unit tests ///////////////
+
+#ifndef PRODUCT
+
+#define test_log(...) \
+ do {\
+ if (VerboseInternalVMTests) { \
+ tty->print_cr(__VA_ARGS__); \
+ tty->flush(); \
+ }\
+ } while (false)
+
+class TestReservedSpace : AllStatic {
+ public:
+ static void small_page_write(void* addr, size_t size) {
+ size_t page_size = os::vm_page_size();
+
+ char* end = (char*)addr + size;
+ for (char* p = (char*)addr; p < end; p += page_size) {
+ *p = 1;
+ }
+ }
+
+ static void release_memory_for_test(ReservedSpace rs) {
+ if (rs.special()) {
+ guarantee(os::release_memory_special(rs.base(), rs.size()), "Shouldn't fail");
+ } else {
+ guarantee(os::release_memory(rs.base(), rs.size()), "Shouldn't fail");
+ }
+ }
+
+ static void test_reserved_space1(size_t size, size_t alignment) {
+ test_log("test_reserved_space1(%p)", (void*) (uintptr_t) size);
+
+ assert(is_size_aligned(size, alignment), "Incorrect input parameters");
+
+ ReservedSpace rs(size, // size
+ alignment, // alignment
+ UseLargePages, // large
+ NULL, // requested_address
+ 0); // noacces_prefix
+
+ test_log(" rs.special() == %d", rs.special());
+
+ assert(rs.base() != NULL, "Must be");
+ assert(rs.size() == size, "Must be");
+
+ assert(is_ptr_aligned(rs.base(), alignment), "aligned sizes should always give aligned addresses");
+ assert(is_size_aligned(rs.size(), alignment), "aligned sizes should always give aligned addresses");
+
+ if (rs.special()) {
+ small_page_write(rs.base(), size);
+ }
+
+ release_memory_for_test(rs);
+ }
+
+ static void test_reserved_space2(size_t size) {
+ test_log("test_reserved_space2(%p)", (void*)(uintptr_t)size);
+
+ assert(is_size_aligned(size, os::vm_allocation_granularity()), "Must be at least AG aligned");
+
+ ReservedSpace rs(size);
+
+ test_log(" rs.special() == %d", rs.special());
+
+ assert(rs.base() != NULL, "Must be");
+ assert(rs.size() == size, "Must be");
+
+ if (rs.special()) {
+ small_page_write(rs.base(), size);
+ }
+
+ release_memory_for_test(rs);
+ }
+
+ static void test_reserved_space3(size_t size, size_t alignment, bool maybe_large) {
+ test_log("test_reserved_space3(%p, %p, %d)",
+ (void*)(uintptr_t)size, (void*)(uintptr_t)alignment, maybe_large);
+
+ assert(is_size_aligned(size, os::vm_allocation_granularity()), "Must be at least AG aligned");
+ assert(is_size_aligned(size, alignment), "Must be at least aligned against alignment");
+
+ bool large = maybe_large && UseLargePages && size >= os::large_page_size();
+
+ ReservedSpace rs(size, alignment, large, false);
+
+ test_log(" rs.special() == %d", rs.special());
+
+ assert(rs.base() != NULL, "Must be");
+ assert(rs.size() == size, "Must be");
+
+ if (rs.special()) {
+ small_page_write(rs.base(), size);
+ }
+
+ release_memory_for_test(rs);
+ }
+
+
+ static void test_reserved_space1() {
+ size_t size = 2 * 1024 * 1024;
+ size_t ag = os::vm_allocation_granularity();
+
+ test_reserved_space1(size, ag);
+ test_reserved_space1(size * 2, ag);
+ test_reserved_space1(size * 10, ag);
+ }
+
+ static void test_reserved_space2() {
+ size_t size = 2 * 1024 * 1024;
+ size_t ag = os::vm_allocation_granularity();
+
+ test_reserved_space2(size * 1);
+ test_reserved_space2(size * 2);
+ test_reserved_space2(size * 10);
+ test_reserved_space2(ag);
+ test_reserved_space2(size - ag);
+ test_reserved_space2(size);
+ test_reserved_space2(size + ag);
+ test_reserved_space2(size * 2);
+ test_reserved_space2(size * 2 - ag);
+ test_reserved_space2(size * 2 + ag);
+ test_reserved_space2(size * 3);
+ test_reserved_space2(size * 3 - ag);
+ test_reserved_space2(size * 3 + ag);
+ test_reserved_space2(size * 10);
+ test_reserved_space2(size * 10 + size / 2);
+ }
+
+ static void test_reserved_space3() {
+ size_t ag = os::vm_allocation_granularity();
+
+ test_reserved_space3(ag, ag , false);
+ test_reserved_space3(ag * 2, ag , false);
+ test_reserved_space3(ag * 3, ag , false);
+ test_reserved_space3(ag * 2, ag * 2, false);
+ test_reserved_space3(ag * 4, ag * 2, false);
+ test_reserved_space3(ag * 8, ag * 2, false);
+ test_reserved_space3(ag * 4, ag * 4, false);
+ test_reserved_space3(ag * 8, ag * 4, false);
+ test_reserved_space3(ag * 16, ag * 4, false);
+
+ if (UseLargePages) {
+ size_t lp = os::large_page_size();
+
+ // Without large pages
+ test_reserved_space3(lp, ag * 4, false);
+ test_reserved_space3(lp * 2, ag * 4, false);
+ test_reserved_space3(lp * 4, ag * 4, false);
+ test_reserved_space3(lp, lp , false);
+ test_reserved_space3(lp * 2, lp , false);
+ test_reserved_space3(lp * 3, lp , false);
+ test_reserved_space3(lp * 2, lp * 2, false);
+ test_reserved_space3(lp * 4, lp * 2, false);
+ test_reserved_space3(lp * 8, lp * 2, false);
+
+ // With large pages
+ test_reserved_space3(lp, ag * 4 , true);
+ test_reserved_space3(lp * 2, ag * 4, true);
+ test_reserved_space3(lp * 4, ag * 4, true);
+ test_reserved_space3(lp, lp , true);
+ test_reserved_space3(lp * 2, lp , true);
+ test_reserved_space3(lp * 3, lp , true);
+ test_reserved_space3(lp * 2, lp * 2, true);
+ test_reserved_space3(lp * 4, lp * 2, true);
+ test_reserved_space3(lp * 8, lp * 2, true);
+ }
+ }
+
+ static void test_reserved_space() {
+ test_reserved_space1();
+ test_reserved_space2();
+ test_reserved_space3();
+ }
+};
+
+void TestReservedSpace_test() {
+ TestReservedSpace::test_reserved_space();
+}
+
+#endif // PRODUCT
+
#endif
--- a/hotspot/src/share/vm/runtime/virtualspace.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/virtualspace.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -53,6 +53,7 @@
public:
// Constructor
+ ReservedSpace();
ReservedSpace(size_t size);
ReservedSpace(size_t size, size_t alignment, bool large,
char* requested_address = NULL,
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -294,7 +294,7 @@
nonstatic_field(InstanceKlass, _java_fields_count, u2) \
nonstatic_field(InstanceKlass, _constants, ConstantPool*) \
nonstatic_field(InstanceKlass, _class_loader_data, ClassLoaderData*) \
- nonstatic_field(InstanceKlass, _source_file_name, Symbol*) \
+ nonstatic_field(InstanceKlass, _source_file_name_index, u2) \
nonstatic_field(InstanceKlass, _source_debug_extension, char*) \
nonstatic_field(InstanceKlass, _inner_classes, Array<jushort>*) \
nonstatic_field(InstanceKlass, _nonstatic_field_size, int) \
@@ -313,7 +313,7 @@
nonstatic_field(InstanceKlass, _jni_ids, JNIid*) \
nonstatic_field(InstanceKlass, _osr_nmethods_head, nmethod*) \
nonstatic_field(InstanceKlass, _breakpoints, BreakpointInfo*) \
- nonstatic_field(InstanceKlass, _generic_signature, Symbol*) \
+ nonstatic_field(InstanceKlass, _generic_signature_index, u2) \
nonstatic_field(InstanceKlass, _methods_jmethod_ids, jmethodID*) \
nonstatic_field(InstanceKlass, _methods_cached_itable_indices, int*) \
volatile_nonstatic_field(InstanceKlass, _idnum_allocated_count, u2) \
@@ -1096,10 +1096,10 @@
\
c2_nonstatic_field(MachCallRuntimeNode, _name, const char*) \
\
- c2_nonstatic_field(PhaseCFG, _num_blocks, uint) \
+ c2_nonstatic_field(PhaseCFG, _number_of_blocks, uint) \
c2_nonstatic_field(PhaseCFG, _blocks, Block_List) \
c2_nonstatic_field(PhaseCFG, _node_to_block_mapping, Block_Array) \
- c2_nonstatic_field(PhaseCFG, _broot, Block*) \
+ c2_nonstatic_field(PhaseCFG, _root_block, Block*) \
\
c2_nonstatic_field(PhaseRegAlloc, _node_regs, OptoRegPair*) \
c2_nonstatic_field(PhaseRegAlloc, _node_regs_max_index, uint) \
--- a/hotspot/src/share/vm/runtime/vm_version.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -231,6 +231,8 @@
#define HOTSPOT_BUILD_COMPILER "Workshop 5.9"
#elif __SUNPRO_CC == 0x5100
#define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1"
+ #elif __SUNPRO_CC == 0x5120
+ #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3"
#else
#define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
#endif
--- a/hotspot/src/share/vm/services/management.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/services/management.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -876,8 +876,6 @@
total_used += u.used();
total_committed += u.committed();
- // if any one of the memory pool has undefined init_size or max_size,
- // set it to -1
if (u.init_size() == (size_t)-1) {
has_undefined_init_size = true;
}
@@ -894,6 +892,15 @@
}
}
+ // if any one of the memory pool has undefined init_size or max_size,
+ // set it to -1
+ if (has_undefined_init_size) {
+ total_init = (size_t)-1;
+ }
+ if (has_undefined_max_size) {
+ total_max = (size_t)-1;
+ }
+
MemoryUsage usage((heap ? InitialHeapSize : total_init),
total_used,
total_committed,
--- a/hotspot/src/share/vm/services/memTracker.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/services/memTracker.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -87,6 +87,8 @@
MEMFLAGS flags, address pc = 0, Thread* thread = NULL) { }
static inline void record_virtual_memory_commit(address addr, size_t size,
address pc = 0, Thread* thread = NULL) { }
+ static inline void record_virtual_memory_release(address addr, size_t size,
+ Thread* thread = NULL) { }
static inline void record_virtual_memory_type(address base, MEMFLAGS flags,
Thread* thread = NULL) { }
static inline Tracker get_realloc_tracker() { return _tkr; }
@@ -372,6 +374,13 @@
tkr.record(addr, size, flags, pc);
}
+ static inline void record_virtual_memory_release(address addr, size_t size,
+ Thread* thread = NULL) {
+ if (is_on()) {
+ Tracker tkr(Tracker::Release, thread);
+ tkr.record(addr, size);
+ }
+ }
// record memory type on virtual memory base address
static inline void record_virtual_memory_type(address base, MEMFLAGS flags,
--- a/hotspot/src/share/vm/services/memoryPool.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/services/memoryPool.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -268,11 +268,11 @@
}
size_t MetaspacePool::used_in_bytes() {
- return MetaspaceAux::allocated_used_bytes(Metaspace::NonClassType);
+ return MetaspaceAux::allocated_used_bytes();
}
size_t MetaspacePool::capacity_in_bytes() const {
- return MetaspaceAux::allocated_capacity_bytes(Metaspace::NonClassType);
+ return MetaspaceAux::allocated_capacity_bytes();
}
size_t MetaspacePool::calculate_max_size() const {
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -362,6 +362,8 @@
// Klass encoding metaspace max size
const uint64_t KlassEncodingMetaspaceMax = (uint64_t(max_juint) + 1) << LogKlassAlignmentInBytes;
+const jlong CompressedKlassPointersBase = NOT_LP64(0) LP64_ONLY(CONST64(0x800000000)); // 32*G
+
// Machine dependent stuff
#ifdef TARGET_ARCH_x86
@@ -400,6 +402,14 @@
#define align_size_up_(size, alignment) (((size) + ((alignment) - 1)) & ~((alignment) - 1))
+inline bool is_size_aligned(size_t size, size_t alignment) {
+ return align_size_up_(size, alignment) == size;
+}
+
+inline bool is_ptr_aligned(void* ptr, size_t alignment) {
+ return align_size_up_((intptr_t)ptr, (intptr_t)alignment) == (intptr_t)ptr;
+}
+
inline intptr_t align_size_up(intptr_t size, intptr_t alignment) {
return align_size_up_(size, alignment);
}
@@ -412,6 +422,14 @@
#define is_size_aligned_(size, alignment) ((size) == (align_size_up_(size, alignment)))
+inline void* align_ptr_up(void* ptr, size_t alignment) {
+ return (void*)align_size_up((intptr_t)ptr, (intptr_t)alignment);
+}
+
+inline void* align_ptr_down(void* ptr, size_t alignment) {
+ return (void*)align_size_down((intptr_t)ptr, (intptr_t)alignment);
+}
+
// Align objects by rounding up their size, in HeapWord units.
#define align_object_size_(size) align_size_up_(size, MinObjAlignment)
--- a/hotspot/src/share/vm/utilities/growableArray.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/utilities/growableArray.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -194,6 +194,7 @@
void clear() { _len = 0; }
int length() const { return _len; }
+ int max_length() const { return _max; }
void trunc_to(int l) { assert(l <= _len,"cannot increase length"); _len = l; }
bool is_empty() const { return _len == 0; }
bool is_nonempty() const { return _len != 0; }
--- a/hotspot/src/share/vm/utilities/taskqueue.hpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/utilities/taskqueue.hpp Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -132,6 +132,8 @@
}
#endif // TASKQUEUE_STATS
+// TaskQueueSuper collects functionality common to all GenericTaskQueue instances.
+
template <unsigned int N, MEMFLAGS F>
class TaskQueueSuper: public CHeapObj<F> {
protected:
@@ -249,7 +251,36 @@
TASKQUEUE_STATS_ONLY(TaskQueueStats stats;)
};
-
+//
+// GenericTaskQueue implements an ABP, Aurora-Blumofe-Plaxton, double-
+// ended-queue (deque), intended for use in work stealing. Queue operations
+// are non-blocking.
+//
+// A queue owner thread performs push() and pop_local() operations on one end
+// of the queue, while other threads may steal work using the pop_global()
+// method.
+//
+// The main difference to the original algorithm is that this
+// implementation allows wrap-around at the end of its allocated
+// storage, which is an array.
+//
+// The original paper is:
+//
+// Arora, N. S., Blumofe, R. D., and Plaxton, C. G.
+// Thread scheduling for multiprogrammed multiprocessors.
+// Theory of Computing Systems 34, 2 (2001), 115-144.
+//
+// The following paper provides an correctness proof and an
+// implementation for weakly ordered memory models including (pseudo-)
+// code containing memory barriers for a Chase-Lev deque. Chase-Lev is
+// similar to ABP, with the main difference that it allows resizing of the
+// underlying storage:
+//
+// Le, N. M., Pop, A., Cohen A., and Nardell, F. Z.
+// Correct and efficient work-stealing for weak memory models
+// Proceedings of the 18th ACM SIGPLAN symposium on Principles and
+// practice of parallel programming (PPoPP 2013), 69-80
+//
template <class E, MEMFLAGS F, unsigned int N = TASKQUEUE_SIZE>
class GenericTaskQueue: public TaskQueueSuper<N, F> {
--- a/hotspot/src/share/vm/utilities/vmError.cpp Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/src/share/vm/utilities/vmError.cpp Fri Sep 06 15:09:44 2013 -0700
@@ -586,6 +586,13 @@
while (count++ < StackPrintLimit) {
fr.print_on_error(st, buf, sizeof(buf));
st->cr();
+ // Compiled code may use EBP register on x86 so it looks like
+ // non-walkable C frame. Use frame.sender() for java frames.
+ if (_thread && _thread->is_Java_thread() && fr.is_java_frame()) {
+ RegisterMap map((JavaThread*)_thread, false); // No update
+ fr = fr.sender(&map);
+ continue;
+ }
if (os::is_first_C_frame(&fr)) break;
fr = os::get_sender_for_C_frame(&fr);
}
--- a/hotspot/test/Makefile Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/Makefile Fri Sep 06 15:09:44 2013 -0700
@@ -210,9 +210,7 @@
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -help
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -X
$(RM) $(PRODUCT_HOME)/jre/lib/*/client/classes.jsa
- $(RM) $(PRODUCT_HOME)/jre/lib/*/client/classes_g.jsa
$(RM) $(PRODUCT_HOME)/jre/bin/client/classes.jsa
- $(RM) $(PRODUCT_HOME)/jre/bin/client/classes_g.jsa
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -Xshare:dump
PHONY_LIST += clienttest
--- a/hotspot/test/TEST.ROOT Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/TEST.ROOT Fri Sep 06 15:09:44 2013 -0700
@@ -25,7 +25,8 @@
# This file identifies the root of the test-suite hierarchy.
# It also contains test-suite configuration information.
-# DO NOT EDIT without first contacting hotspot-regtest@sun.com
# The list of keywords supported in this test suite
keys=cte_test jcmd nmt regression gc
+
+groups=TEST.groups [closed/TEST.groups]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/TEST.groups Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,192 @@
+#
+# 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.
+#
+
+# Profile-based Test Group Definitions
+#
+# These groups define the tests that cover the different possible runtimes:
+# - compact1, compact2, compact3, full JRE, JDK
+#
+# In addition they support testing of the minimal VM on compact1 and compact2.
+# Essentially this defines groups based around the specified API's and VM
+# services available in the runtime.
+#
+# The groups are defined hierarchically in two forms:
+# - The need_xxx groups list all the tests that have a dependency on
+# a specific profile. This is either because it tests a feature in
+# that profile, or the test infrastructure uses a feature in that
+# profile.
+# - The primary groups are defined in terms of the other primary groups
+# combined with the needs_xxx groups (including and excluding them as
+# appropriate). For example the jre can run all tests from compact3, plus
+# those from needs_jre, but excluding those from need_jdk.
+#
+# The bottom group defines all the actual tests to be considered, simply
+# by listing the top-level test directories.
+#
+# To use a group simply list it on the jtreg command line eg:
+# jtreg :jdk
+# runs all tests. While
+# jtreg :compact2
+# runs those tests that only require compact1 and compact2 API's.
+#
+
+# Full JDK can run all tests
+#
+jdk = \
+ :jre \
+ :needs_jdk
+
+# Tests that require a full JDK to execute. Either they test a feature
+# only in the JDK or they use tools that are only in the JDK. The latter
+# can be resolved in some cases by using tools from the compile-jdk.
+#
+needs_jdk = \
+ gc/TestG1ZeroPGCTJcmdThreadPrint.java \
+ gc/metaspace/ClassMetaspaceSizeInJmapHeap.java \
+ gc/metaspace/TestMetaspacePerfCounters.java \
+ runtime/6819213/TestBootNativeLibraryPath.java \
+ runtime/6878713/Test6878713.sh \
+ runtime/6925573/SortMethodsTest.java \
+ runtime/7107135/Test7107135.sh \
+ runtime/7158988/FieldMonitor.java \
+ runtime/7194254/Test7194254.java \
+ runtime/jsig/Test8017498.sh \
+ runtime/Metaspace/FragmentMetaspace.java \
+ runtime/NMT/BaselineWithParameter.java \
+ runtime/NMT/JcmdScale.java \
+ runtime/NMT/JcmdWithNMTDisabled.java \
+ runtime/NMT/MallocTestType.java \
+ runtime/NMT/ReleaseCommittedMemory.java \
+ runtime/NMT/ShutdownTwice.java \
+ runtime/NMT/SummaryAfterShutdown.java \
+ runtime/NMT/SummarySanityCheck.java \
+ runtime/NMT/ThreadedMallocTestType.java \
+ runtime/NMT/ThreadedVirtualAllocTestType.java \
+ runtime/NMT/VirtualAllocTestType.java \
+ runtime/RedefineObject/TestRedefineObject.java \
+ serviceability/attach/AttachWithStalePidFile.java
+
+# JRE adds further tests to compact3
+#
+jre = \
+ :compact3 \
+ :needs_jre \
+ -:needs_jdk
+
+# Tests that require the full JRE
+#
+needs_jre = \
+ compiler/6852078/Test6852078.java \
+ compiler/7047069/Test7047069.java \
+ runtime/6294277/SourceDebugExtension.java
+
+# Compact 3 adds further tests to compact2
+#
+compact3 = \
+ :compact2 \
+ :needs_compact3 \
+ -:needs_jre \
+ -:needs_jdk
+
+
+# Tests that require compact3 API's
+#
+needs_compact3 = \
+ compiler/whitebox/DeoptimizeMethodTest.java \
+ compiler/whitebox/SetForceInlineMethodTest.java \
+ compiler/whitebox/SetDontInlineMethodTest.java \
+ compiler/whitebox/DeoptimizeAllTest.java \
+ compiler/whitebox/MakeMethodNotCompilableTest.java \
+ compiler/whitebox/ClearMethodStateTest.java \
+ compiler/whitebox/EnqueueMethodForCompilationTest.java \
+ compiler/whitebox/IsMethodCompilableTest.java \
+ gc/6581734/Test6581734.java \
+ gc/7072527/TestFullGCCount.java \
+ gc/7168848/HumongousAlloc.java \
+ gc/arguments/TestG1HeapRegionSize.java \
+ gc/metaspace/TestMetaspaceMemoryPool.java \
+ runtime/InternalApi/ThreadCpuTimesDeadlock.java \
+ serviceability/threads/TestFalseDeadLock.java
+
+# Compact 2 adds full VM tests
+compact2 = \
+ :compact2_minimal \
+ :compact1 \
+ :needs_full_vm_compact2 \
+ -:needs_compact3 \
+ -:needs_jre \
+ -:needs_jdk
+
+# Tests that require compact2 API's and a full VM
+#
+needs_full_vm_compact2 =
+
+# Compact 1 adds full VM tests
+#
+compact1 = \
+ :compact1_minimal \
+ :needs_full_vm_compact1 \
+ -:needs_compact2 \
+ -:needs_full_vm_compact2 \
+ -:needs_compact3 \
+ -:needs_jre \
+ -:needs_jdk
+
+# Tests that require compact1 API's and a full VM
+#
+needs_full_vm_compact1 = \
+ runtime/NMT \
+ gc/g1/TestRegionAlignment.java \
+ gc/g1/TestShrinkToOneRegion.java \
+ gc/metaspace/G1AddMetaspaceDependency.java \
+ runtime/6929067/Test6929067.sh
+
+# Minimal VM on Compact 2 adds in some compact2 tests
+#
+compact2_minimal = \
+ :compact1_minimal \
+ :needs_compact2 \
+ -:needs_full_vm_compact2 \
+ -:needs_compact3 \
+ -:needs_jre \
+ -:needs_jdk
+
+# Tests that require compact2 API's
+#
+needs_compact2 = \
+ compiler/6589834/Test_ia32.java
+
+# All tests that run on the most minimal configuration: Minimal VM on Compact 1
+compact1_minimal = \
+ serviceability/ \
+ compiler/ \
+ testlibrary/ \
+ sanity/ \
+ runtime/ \
+ gc/ \
+ -:needs_full_vm_compact1 \
+ -:needs_full_vm_compact2 \
+ -:needs_compact2 \
+ -:needs_compact3 \
+ -:needs_jre \
+ -:needs_jdk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8004051/Test8004051.java Fri Sep 06 15:09:44 2013 -0700
@@ -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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8004051
+ * @bug 8005722
+ * @summary assert(_oprs_len[mode] < maxNumberOfOperands) failed: array overflow
+ *
+ * @run main/othervm -Xcomp -client Test8004051
+ */
+
+public class Test8004051 {
+ public static void main(String[] argv) {
+ Object o = new Object();
+ fillPrimRect(1.1f, 1.2f, 1.3f, 1.4f,
+ o, o,
+ 1.5f, 1.6f, 1.7f, 1.8f,
+ 2.0f, 2.1f, 2.2f, 2.3f,
+ 2.4f, 2.5f, 2.6f, 2.7f,
+ 100, 101);
+ System.out.println("Test passed, test did not assert");
+ }
+
+ static boolean fillPrimRect(float x, float y, float w, float h,
+ Object rectTex, Object wrapTex,
+ float bx, float by, float bw, float bh,
+ float f1, float f2, float f3, float f4,
+ float f5, float f6, float f7, float f8,
+ int i1, int i2 ) {
+ System.out.println(x + " " + y + " " + w + " " + h + " " +
+ bx + " " + by + " " + bw + " " + bh);
+ return true;
+ }
+}
--- a/hotspot/test/compiler/ciReplay/common.sh Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/ciReplay/common.sh Fri Sep 06 15:09:44 2013 -0700
@@ -89,7 +89,10 @@
# $1 - initial error_code
common_tests() {
positive_test $1 "COMMON :: THE SAME FLAGS"
- positive_test `expr $1 + 1` "COMMON :: TIERED" -XX:+TieredCompilation
+ if [ $tiered_available -eq 1 ]
+ then
+ positive_test `expr $1 + 1` "COMMON :: TIERED" -XX:+TieredCompilation
+ fi
}
# $1 - initial error_code
@@ -115,8 +118,11 @@
then
negative_test $1 "SERVER :: NON-TIERED" -XX:-TieredCompilation \
-server
- positive_test `expr $1 + 1` "SERVER :: TIERED" -XX:+TieredCompilation \
- -server
+ if [ $tiered_available -eq 1 ]
+ then
+ positive_test `expr $1 + 1` "SERVER :: TIERED" -XX:+TieredCompilation \
+ -server
+ fi
fi
nontiered_tests `expr $1 + 2` $client_level
}
@@ -167,6 +173,9 @@
grep -c Client`
server_available=`${JAVA} ${TESTVMOPTS} -server -Xinternalversion 2>&1 | \
grep -c Server`
+tiered_available=`${JAVA} ${TESTVMOPTS} -XX:+TieredCompilation -XX:+PrintFlagsFinal -version | \
+ grep TieredCompilation | \
+ grep -c true`
is_tiered=`${JAVA} ${TESTVMOPTS} -XX:+PrintFlagsFinal -version | \
grep TieredCompilation | \
grep -c true`
@@ -177,6 +186,7 @@
echo "client_available=$client_available"
echo "server_available=$server_available"
+echo "tiered_available=$tiered_available"
echo "is_tiered=$is_tiered"
# crash vm in compiler thread with generation replay data and 'small' dump-file
@@ -186,6 +196,11 @@
then
# enable core dump
ulimit -c unlimited
+
+ if [ $VM_OS = "solaris" ]
+ then
+ coreadm -p core $$
+ fi
fi
cmd="${JAVA} ${TESTVMOPTS} $@ \
--- a/hotspot/test/compiler/whitebox/ClearMethodStateTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/ClearMethodStateTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,6 +23,7 @@
/*
* @test ClearMethodStateTest
+ * @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build ClearMethodStateTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
@@ -59,16 +60,19 @@
WHITE_BOX.clearMethodState(method);
checkCompiled();
WHITE_BOX.clearMethodState(method);
- WHITE_BOX.deoptimizeMethod(method);
+ deoptimize();
checkNotCompiled();
-
+ if (testCase.isOsr) {
+ // part test isn't applicable for OSR test case
+ return;
+ }
if (!TIERED_COMPILATION) {
WHITE_BOX.clearMethodState(method);
compile(COMPILE_THRESHOLD);
checkCompiled();
- WHITE_BOX.deoptimizeMethod(method);
+ deoptimize();
checkNotCompiled();
WHITE_BOX.clearMethodState(method);
--- a/hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -44,8 +44,14 @@
protected static int COMP_LEVEL_ANY = -1;
/** {@code CompLevel::CompLevel_simple} -- C1 */
protected static int COMP_LEVEL_SIMPLE = 1;
+ /** {@code CompLevel::CompLevel_limited_profile} -- C1, invocation & backedge counters */
+ protected static int COMP_LEVEL_LIMITED_PROFILE = 2;
+ /** {@code CompLevel::CompLevel_full_profile} -- C1, invocation & backedge counters + mdo */
+ protected static int COMP_LEVEL_FULL_PROFILE = 3;
/** {@code CompLevel::CompLevel_full_optimization} -- C2 or Shark */
protected static int COMP_LEVEL_FULL_OPTIMIZATION = 4;
+ /** Maximal value for CompLeveL */
+ protected static int COMP_LEVEL_MAX = COMP_LEVEL_FULL_OPTIMIZATION;
/** Instance of WhiteBox */
protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
@@ -64,6 +70,21 @@
/** Flag for verbose output, true if {@code -Dverbose} specified */
protected static final boolean IS_VERBOSE
= System.getProperty("verbose") != null;
+ /** count of invocation to triger compilation */
+ protected static final int THRESHOLD;
+ /** count of invocation to triger OSR compilation */
+ protected static final long BACKEDGE_THRESHOLD;
+
+ static {
+ if (TIERED_COMPILATION) {
+ THRESHOLD = 150000;
+ BACKEDGE_THRESHOLD = 0xFFFFFFFFL;
+ } else {
+ THRESHOLD = COMPILE_THRESHOLD;
+ BACKEDGE_THRESHOLD = COMPILE_THRESHOLD * Long.parseLong(getVMOption(
+ "OnStackReplacePercentage"));
+ }
+ }
/**
* Returns value of VM option.
@@ -112,7 +133,7 @@
/** tested method */
protected final Executable method;
- private final Callable<Integer> callable;
+ protected final TestCase testCase;
/**
* Constructor.
@@ -123,7 +144,7 @@
Objects.requireNonNull(testCase);
System.out.println("TEST CASE:" + testCase.name());
method = testCase.executable;
- callable = testCase.callable;
+ this.testCase = testCase;
}
/**
@@ -169,12 +190,18 @@
if (WHITE_BOX.isMethodQueuedForCompilation(method)) {
throw new RuntimeException(method + " must not be in queue");
}
- if (WHITE_BOX.isMethodCompiled(method)) {
+ if (WHITE_BOX.isMethodCompiled(method, false)) {
throw new RuntimeException(method + " must be not compiled");
}
- if (WHITE_BOX.getMethodCompilationLevel(method) != 0) {
+ if (WHITE_BOX.getMethodCompilationLevel(method, false) != 0) {
throw new RuntimeException(method + " comp_level must be == 0");
}
+ if (WHITE_BOX.isMethodCompiled(method, true)) {
+ throw new RuntimeException(method + " must be not osr_compiled");
+ }
+ if (WHITE_BOX.getMethodCompilationLevel(method, true) != 0) {
+ throw new RuntimeException(method + " osr_comp_level must be == 0");
+ }
}
/**
@@ -192,12 +219,44 @@
method, System.currentTimeMillis() - start);
return;
}
- if (!WHITE_BOX.isMethodCompiled(method)) {
- throw new RuntimeException(method + " must be compiled");
+ if (!WHITE_BOX.isMethodCompiled(method, testCase.isOsr)) {
+ throw new RuntimeException(method + " must be "
+ + (testCase.isOsr ? "osr_" : "") + "compiled");
+ }
+ if (WHITE_BOX.getMethodCompilationLevel(method, testCase.isOsr) == 0) {
+ throw new RuntimeException(method
+ + (testCase.isOsr ? " osr_" : " ")
+ + "comp_level must be != 0");
+ }
+ }
+
+ protected final void deoptimize() {
+ WHITE_BOX.deoptimizeMethod(method, testCase.isOsr);
+ if (testCase.isOsr) {
+ WHITE_BOX.deoptimizeMethod(method, false);
}
- if (WHITE_BOX.getMethodCompilationLevel(method) == 0) {
- throw new RuntimeException(method + " comp_level must be != 0");
- }
+ }
+
+ protected final int getCompLevel() {
+ return WHITE_BOX.getMethodCompilationLevel(method, testCase.isOsr);
+ }
+
+ protected final boolean isCompilable() {
+ return WHITE_BOX.isMethodCompilable(method, COMP_LEVEL_ANY,
+ testCase.isOsr);
+ }
+
+ protected final boolean isCompilable(int compLevel) {
+ return WHITE_BOX.isMethodCompilable(method, compLevel, testCase.isOsr);
+ }
+
+ protected final void makeNotCompilable() {
+ WHITE_BOX.makeMethodNotCompilable(method, COMP_LEVEL_ANY,
+ testCase.isOsr);
+ }
+
+ protected final void makeNotCompilable(int compLevel) {
+ WHITE_BOX.makeMethodNotCompilable(method, compLevel, testCase.isOsr);
}
/**
@@ -226,12 +285,18 @@
protected final void printInfo() {
System.out.printf("%n%s:%n", method);
System.out.printf("\tcompilable:\t%b%n",
- WHITE_BOX.isMethodCompilable(method));
+ WHITE_BOX.isMethodCompilable(method, COMP_LEVEL_ANY, false));
System.out.printf("\tcompiled:\t%b%n",
- WHITE_BOX.isMethodCompiled(method));
+ WHITE_BOX.isMethodCompiled(method, false));
System.out.printf("\tcomp_level:\t%d%n",
- WHITE_BOX.getMethodCompilationLevel(method));
- System.out.printf("\tin_queue:\t%b%n",
+ WHITE_BOX.getMethodCompilationLevel(method, false));
+ System.out.printf("\tosr_compilable:\t%b%n",
+ WHITE_BOX.isMethodCompilable(method, COMP_LEVEL_ANY, true));
+ System.out.printf("\tosr_compiled:\t%b%n",
+ WHITE_BOX.isMethodCompiled(method, true));
+ System.out.printf("\tosr_comp_level:\t%d%n",
+ WHITE_BOX.getMethodCompilationLevel(method, true));
+ System.out.printf("\tin_queue:\t%b%n",
WHITE_BOX.isMethodQueuedForCompilation(method));
System.out.printf("compile_queues_size:\t%d%n%n",
WHITE_BOX.getCompileQueuesSize());
@@ -244,18 +309,22 @@
/**
* Tries to trigger compilation of {@linkplain #method} by call
- * {@linkplain #callable} enough times.
+ * {@linkplain #testCase.callable} enough times.
*
* @return accumulated result
* @see #compile(int)
*/
protected final int compile() {
- return compile(Math.max(COMPILE_THRESHOLD, 150000));
+ if (testCase.isOsr) {
+ return compile(1);
+ } else {
+ return compile(THRESHOLD);
+ }
}
/**
* Tries to trigger compilation of {@linkplain #method} by call
- * {@linkplain #callable} specified times.
+ * {@linkplain #testCase.callable} specified times.
*
* @param count invocation count
* @return accumulated result
@@ -265,7 +334,7 @@
Integer tmp;
for (int i = 0; i < count; ++i) {
try {
- tmp = callable.call();
+ tmp = testCase.callable.call();
} catch (Exception e) {
tmp = null;
}
@@ -283,23 +352,36 @@
*/
enum TestCase {
/** constructor test case */
- CONSTRUCTOR_TEST(Helper.CONSTRUCTOR, Helper.CONSTRUCTOR_CALLABLE),
+ CONSTRUCTOR_TEST(Helper.CONSTRUCTOR, Helper.CONSTRUCTOR_CALLABLE, false),
/** method test case */
- METOD_TEST(Helper.METHOD, Helper.METHOD_CALLABLE),
+ METOD_TEST(Helper.METHOD, Helper.METHOD_CALLABLE, false),
/** static method test case */
- STATIC_TEST(Helper.STATIC, Helper.STATIC_CALLABLE);
+ STATIC_TEST(Helper.STATIC, Helper.STATIC_CALLABLE, false),
+
+ /** OSR constructor test case */
+ OSR_CONSTRUCTOR_TEST(Helper.OSR_CONSTRUCTOR,
+ Helper.OSR_CONSTRUCTOR_CALLABLE, true),
+ /** OSR method test case */
+ OSR_METOD_TEST(Helper.OSR_METHOD, Helper.OSR_METHOD_CALLABLE, true),
+ /** OSR static method test case */
+ OSR_STATIC_TEST(Helper.OSR_STATIC, Helper.OSR_STATIC_CALLABLE, true);
/** tested method */
final Executable executable;
/** object to invoke {@linkplain #executable} */
final Callable<Integer> callable;
+ /** flag for OSR test case */
+ final boolean isOsr;
- private TestCase(Executable executable, Callable<Integer> callable) {
+ private TestCase(Executable executable, Callable<Integer> callable,
+ boolean isOsr) {
this.executable = executable;
this.callable = callable;
+ this.isOsr = isOsr;
}
private static class Helper {
+
private static final Callable<Integer> CONSTRUCTOR_CALLABLE
= new Callable<Integer>() {
@Override
@@ -326,9 +408,39 @@
}
};
+ private static final Callable<Integer> OSR_CONSTRUCTOR_CALLABLE
+ = new Callable<Integer>() {
+ @Override
+ public Integer call() throws Exception {
+ return new Helper(null).hashCode();
+ }
+ };
+
+ private static final Callable<Integer> OSR_METHOD_CALLABLE
+ = new Callable<Integer>() {
+ private final Helper helper = new Helper();
+
+ @Override
+ public Integer call() throws Exception {
+ return helper.osrMethod();
+ }
+ };
+
+ private static final Callable<Integer> OSR_STATIC_CALLABLE
+ = new Callable<Integer>() {
+ @Override
+ public Integer call() throws Exception {
+ return osrStaticMethod();
+ }
+ };
+
+
private static final Constructor CONSTRUCTOR;
+ private static final Constructor OSR_CONSTRUCTOR;
private static final Method METHOD;
private static final Method STATIC;
+ private static final Method OSR_METHOD;
+ private static final Method OSR_STATIC;
static {
try {
@@ -338,17 +450,26 @@
"exception on getting method Helper.<init>(int)", e);
}
try {
- METHOD = Helper.class.getDeclaredMethod("method");
+ OSR_CONSTRUCTOR = Helper.class.getDeclaredConstructor(
+ Object.class);
} catch (NoSuchMethodException | SecurityException e) {
throw new RuntimeException(
- "exception on getting method Helper.method()", e);
+ "exception on getting method Helper.<init>(Object)", e);
}
+ METHOD = getMethod("method");
+ STATIC = getMethod("staticMethod");
+ OSR_METHOD = getMethod("osrMethod");
+ OSR_STATIC = getMethod("osrStaticMethod");
+ }
+
+ private static Method getMethod(String name) {
try {
- STATIC = Helper.class.getDeclaredMethod("staticMethod");
+ return Helper.class.getDeclaredMethod(name);
} catch (NoSuchMethodException | SecurityException e) {
throw new RuntimeException(
- "exception on getting method Helper.staticMethod()", e);
+ "exception on getting method Helper." + name, e);
}
+
}
private static int staticMethod() {
@@ -359,12 +480,39 @@
return 42;
}
+ private static int osrStaticMethod() {
+ int result = 0;
+ for (long i = 0; i < CompilerWhiteBoxTest.BACKEDGE_THRESHOLD; ++i) {
+ result += staticMethod();
+ }
+ return result;
+ }
+
+ private int osrMethod() {
+ int result = 0;
+ for (long i = 0; i < CompilerWhiteBoxTest.BACKEDGE_THRESHOLD; ++i) {
+ result += method();
+ }
+ return result;
+ }
+
private final int x;
+ // for method and OSR method test case
public Helper() {
x = 0;
}
+ // for OSR constructor test case
+ private Helper(Object o) {
+ int result = 0;
+ for (long i = 0; i < CompilerWhiteBoxTest.BACKEDGE_THRESHOLD; ++i) {
+ result += method();
+ }
+ x = result;
+ }
+
+ // for constructor test case
private Helper(int x) {
this.x = x;
}
--- a/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,6 +23,7 @@
/*
* @test DeoptimizeAllTest
+ * @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build DeoptimizeAllTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,6 +23,7 @@
/*
* @test DeoptimizeMethodTest
+ * @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build DeoptimizeMethodTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
@@ -54,7 +55,7 @@
protected void test() throws Exception {
compile();
checkCompiled();
- WHITE_BOX.deoptimizeMethod(method);
+ deoptimize();
checkNotCompiled();
}
}
--- a/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,10 +23,11 @@
/*
* @test EnqueueMethodForCompilationTest
+ * @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build EnqueueMethodForCompilationTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,TestCase$Helper::* EnqueueMethodForCompilationTest
+ * @run main/othervm/timeout=600 -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,TestCase$Helper::* EnqueueMethodForCompilationTest
* @summary testing of WB::enqueueMethodForCompilation()
* @author igor.ignatyev@oracle.com
*/
@@ -50,7 +51,7 @@
// method can not be compiled on level 'none'
WHITE_BOX.enqueueMethodForCompilation(method, COMP_LEVEL_NONE);
- if (WHITE_BOX.isMethodCompilable(method, COMP_LEVEL_NONE)) {
+ if (isCompilable(COMP_LEVEL_NONE)) {
throw new RuntimeException(method
+ " is compilable at level COMP_LEVEL_NONE");
}
@@ -60,27 +61,29 @@
WHITE_BOX.enqueueMethodForCompilation(method, COMP_LEVEL_ANY);
checkNotCompiled();
- WHITE_BOX.enqueueMethodForCompilation(method, 5);
- if (!WHITE_BOX.isMethodCompilable(method, 5)) {
- checkNotCompiled();
- compile();
- checkCompiled();
- } else {
- checkCompiled();
- }
-
- int compLevel = WHITE_BOX.getMethodCompilationLevel(method);
- WHITE_BOX.deoptimizeMethod(method);
- checkNotCompiled();
-
- WHITE_BOX.enqueueMethodForCompilation(method, compLevel);
- checkCompiled();
- WHITE_BOX.deoptimizeMethod(method);
+ // not existing comp level
+ WHITE_BOX.enqueueMethodForCompilation(method, 42);
checkNotCompiled();
compile();
checkCompiled();
- WHITE_BOX.deoptimizeMethod(method);
+
+ int compLevel = getCompLevel();
+ int bci = WHITE_BOX.getMethodEntryBci(method);
+ System.out.println("bci = " + bci);
+ printInfo();
+ deoptimize();
+ printInfo();
+ checkNotCompiled();
+ printInfo();
+ WHITE_BOX.enqueueMethodForCompilation(method, compLevel, bci);
+ checkCompiled();
+ deoptimize();
+ checkNotCompiled();
+
+ compile();
+ checkCompiled();
+ deoptimize();
checkNotCompiled();
}
}
--- a/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,11 +23,11 @@
/*
* @test IsMethodCompilableTest
- * @bug 8007270
+ * @bug 8007270 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build IsMethodCompilableTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,TestCase$Helper::* IsMethodCompilableTest
+ * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,TestCase$Helper::* IsMethodCompilableTest
* @summary testing of WB::isMethodCompilable()
* @author igor.ignatyev@oracle.com
*/
@@ -68,7 +68,7 @@
*/
@Override
protected void test() throws Exception {
- if (!WHITE_BOX.isMethodCompilable(method)) {
+ if (!isCompilable()) {
throw new RuntimeException(method + " must be compilable");
}
System.out.println("PerMethodRecompilationCutoff = "
@@ -83,7 +83,8 @@
for (long i = 0L, n = PER_METHOD_RECOMPILATION_CUTOFF - 1; i < n; ++i) {
compileAndDeoptimize();
}
- if (!WHITE_BOX.isMethodCompilable(method)) {
+ if (!testCase.isOsr && !isCompilable()) {
+ // in osr test case count of deopt maybe more than iterations
throw new RuntimeException(method + " is not compilable after "
+ (PER_METHOD_RECOMPILATION_CUTOFF - 1) + " iterations");
}
@@ -92,15 +93,16 @@
// deoptimize 'PerMethodRecompilationCutoff' + 1 times
long i;
for (i = 0L; i < PER_METHOD_RECOMPILATION_CUTOFF
- && WHITE_BOX.isMethodCompilable(method); ++i) {
+ && isCompilable(); ++i) {
compileAndDeoptimize();
}
- if (i != PER_METHOD_RECOMPILATION_CUTOFF) {
+ if (!testCase.isOsr && i != PER_METHOD_RECOMPILATION_CUTOFF) {
+ // in osr test case count of deopt maybe more than iterations
throw new RuntimeException(method + " is not compilable after "
+ i + " iterations, but must only after "
+ PER_METHOD_RECOMPILATION_CUTOFF);
}
- if (WHITE_BOX.isMethodCompilable(method)) {
+ if (isCompilable()) {
throw new RuntimeException(method + " is still compilable after "
+ PER_METHOD_RECOMPILATION_CUTOFF + " iterations");
}
@@ -109,7 +111,7 @@
// WB.clearMethodState() must reset no-compilable flags
WHITE_BOX.clearMethodState(method);
- if (!WHITE_BOX.isMethodCompilable(method)) {
+ if (!isCompilable()) {
throw new RuntimeException(method
+ " is not compilable after clearMethodState()");
}
@@ -120,6 +122,6 @@
private void compileAndDeoptimize() throws Exception {
compile();
waitBackgroundCompilation();
- WHITE_BOX.deoptimizeMethod(method);
+ deoptimize();
}
}
--- a/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,16 +23,16 @@
/*
* @test MakeMethodNotCompilableTest
- * @bug 8012322
+ * @bug 8012322 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build MakeMethodNotCompilableTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,TestCase$Helper::* MakeMethodNotCompilableTest
+ * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,TestCase$Helper::* MakeMethodNotCompilableTest
* @summary testing of WB::makeMethodNotCompilable()
* @author igor.ignatyev@oracle.com
*/
public class MakeMethodNotCompilableTest extends CompilerWhiteBoxTest {
-
+ private int bci;
public static void main(String[] args) throws Exception {
if (args.length == 0) {
for (TestCase test : TestCase.values()) {
@@ -63,25 +63,27 @@
@Override
protected void test() throws Exception {
checkNotCompiled();
- if (!WHITE_BOX.isMethodCompilable(method)) {
+ if (!isCompilable()) {
throw new RuntimeException(method + " must be compilable");
}
+ bci = getBci();
+
if (TIERED_COMPILATION) {
final int tierLimit = TIERED_STOP_AT_LEVEL + 1;
for (int testedTier = 1; testedTier < tierLimit; ++testedTier) {
testTier(testedTier);
}
for (int testedTier = 1; testedTier < tierLimit; ++testedTier) {
- WHITE_BOX.makeMethodNotCompilable(method, testedTier);
- if (WHITE_BOX.isMethodCompilable(method, testedTier)) {
+ makeNotCompilable(testedTier);
+ if (isCompilable(testedTier)) {
throw new RuntimeException(method
+ " must be not compilable at level" + testedTier);
}
- WHITE_BOX.enqueueMethodForCompilation(method, testedTier);
+ WHITE_BOX.enqueueMethodForCompilation(method, testedTier, bci);
checkNotCompiled();
- if (!WHITE_BOX.isMethodCompilable(method)) {
+ if (!isCompilable()) {
System.out.println(method
+ " is not compilable after level " + testedTier);
}
@@ -89,15 +91,20 @@
} else {
compile();
checkCompiled();
- int compLevel = WHITE_BOX.getMethodCompilationLevel(method);
- WHITE_BOX.deoptimizeMethod(method);
- WHITE_BOX.makeMethodNotCompilable(method, compLevel);
- if (WHITE_BOX.isMethodCompilable(method, COMP_LEVEL_ANY)) {
+ int compLevel = getCompLevel();
+ deoptimize();
+ makeNotCompilable(compLevel);
+ if (isCompilable(COMP_LEVEL_ANY)) {
throw new RuntimeException(method
+ " must be not compilable at CompLevel::CompLevel_any,"
+ " after it is not compilable at " + compLevel);
}
+
WHITE_BOX.clearMethodState(method);
+ if (!isCompilable()) {
+ throw new RuntimeException(method
+ + " is not compilable after clearMethodState()");
+ }
// nocompilable at opposite level must make no sense
int oppositeLevel;
@@ -106,16 +113,16 @@
} else {
oppositeLevel = COMP_LEVEL_SIMPLE;
}
- WHITE_BOX.makeMethodNotCompilable(method, oppositeLevel);
+ makeNotCompilable(oppositeLevel);
- if (!WHITE_BOX.isMethodCompilable(method, COMP_LEVEL_ANY)) {
+ if (!isCompilable(COMP_LEVEL_ANY)) {
throw new RuntimeException(method
+ " must be compilable at CompLevel::CompLevel_any,"
+ " even it is not compilable at opposite level ["
+ compLevel + "]");
}
- if (!WHITE_BOX.isMethodCompilable(method, compLevel)) {
+ if (!isCompilable(compLevel)) {
throw new RuntimeException(method
+ " must be compilable at level " + compLevel
+ ", even it is not compilable at opposite level ["
@@ -126,24 +133,24 @@
// clearing after tiered/non-tiered tests
// WB.clearMethodState() must reset no-compilable flags
WHITE_BOX.clearMethodState(method);
- if (!WHITE_BOX.isMethodCompilable(method)) {
+ if (!isCompilable()) {
throw new RuntimeException(method
+ " is not compilable after clearMethodState()");
}
- WHITE_BOX.makeMethodNotCompilable(method);
- if (WHITE_BOX.isMethodCompilable(method)) {
+ makeNotCompilable();
+ if (isCompilable()) {
throw new RuntimeException(method + " must be not compilable");
}
compile();
checkNotCompiled();
- if (WHITE_BOX.isMethodCompilable(method)) {
+ if (isCompilable()) {
throw new RuntimeException(method + " must be not compilable");
}
// WB.clearMethodState() must reset no-compilable flags
WHITE_BOX.clearMethodState(method);
- if (!WHITE_BOX.isMethodCompilable(method)) {
+ if (!isCompilable()) {
throw new RuntimeException(method
+ " is not compilable after clearMethodState()");
}
@@ -153,24 +160,23 @@
// separately tests each tier
private void testTier(int testedTier) {
- if (!WHITE_BOX.isMethodCompilable(method, testedTier)) {
+ if (!isCompilable(testedTier)) {
throw new RuntimeException(method
+ " is not compilable on start");
}
- WHITE_BOX.makeMethodNotCompilable(method, testedTier);
+ makeNotCompilable(testedTier);
// tests for all other tiers
for (int anotherTier = 1, tierLimit = TIERED_STOP_AT_LEVEL + 1;
anotherTier < tierLimit; ++anotherTier) {
- boolean isCompilable = WHITE_BOX.isMethodCompilable(method,
- anotherTier);
+ boolean isCompilable = isCompilable(anotherTier);
if (sameCompile(testedTier, anotherTier)) {
if (isCompilable) {
throw new RuntimeException(method
+ " must be not compilable at level " + anotherTier
+ ", if it is not compilable at " + testedTier);
}
- WHITE_BOX.enqueueMethodForCompilation(method, anotherTier);
+ WHITE_BOX.enqueueMethodForCompilation(method, anotherTier, bci);
checkNotCompiled();
} else {
if (!isCompilable) {
@@ -179,12 +185,12 @@
+ ", even if it is not compilable at "
+ testedTier);
}
- WHITE_BOX.enqueueMethodForCompilation(method, anotherTier);
+ WHITE_BOX.enqueueMethodForCompilation(method, anotherTier, bci);
checkCompiled();
- WHITE_BOX.deoptimizeMethod(method);
+ deoptimize();
}
- if (!WHITE_BOX.isMethodCompilable(method, COMP_LEVEL_ANY)) {
+ if (!isCompilable(COMP_LEVEL_ANY)) {
throw new RuntimeException(method
+ " must be compilable at 'CompLevel::CompLevel_any'"
+ ", if it is not compilable only at " + testedTier);
@@ -193,7 +199,7 @@
// clear state after test
WHITE_BOX.clearMethodState(method);
- if (!WHITE_BOX.isMethodCompilable(method, testedTier)) {
+ if (!isCompilable(testedTier)) {
throw new RuntimeException(method
+ " is not compilable after clearMethodState()");
}
@@ -211,4 +217,13 @@
}
return false;
}
+
+ private int getBci() {
+ compile();
+ checkCompiled();
+ int result = WHITE_BOX.getMethodEntryBci(method);
+ deoptimize();
+ WHITE_BOX.clearMethodState(method);
+ return result;
+ }
}
--- a/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,6 +23,7 @@
/*
* @test SetDontInlineMethodTest
+ * @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build SetDontInlineMethodTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,6 +23,7 @@
/*
* @test SetForceInlineMethodTest
+ * @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build SetForceInlineMethodTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/metaspace/TestMetaspacePerfCounters.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,104 @@
+/*
+ * 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.List;
+import java.util.ArrayList;
+
+import com.oracle.java.testlibrary.*;
+import static com.oracle.java.testlibrary.Asserts.*;
+
+/* @test TestMetaspacePerfCounters
+ * @bug 8014659
+ * @library /testlibrary
+ * @summary Tests that performance counters for metaspace and compressed class
+ * space exists and works.
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedKlassPointers -XX:+UsePerfData -XX:+UseSerialGC TestMetaspacePerfCounters
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedKlassPointers -XX:+UsePerfData -XX:+UseParallelGC -XX:+UseParallelOldGC TestMetaspacePerfCounters
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedKlassPointers -XX:+UsePerfData -XX:+UseG1GC TestMetaspacePerfCounters
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedKlassPointers -XX:+UsePerfData -XX:+UseSerialGC TestMetaspacePerfCounters
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedKlassPointers -XX:+UsePerfData -XX:+UseParallelGC -XX:+UseParallelOldGC TestMetaspacePerfCounters
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedKlassPointers -XX:+UsePerfData -XX:+UseG1GC TestMetaspacePerfCounters
+ */
+public class TestMetaspacePerfCounters {
+ public static Class fooClass = null;
+ private static final String[] counterNames = {"minCapacity", "maxCapacity", "capacity", "used"};
+
+ public static void main(String[] args) throws Exception {
+ String metaspace = "sun.gc.metaspace";
+ String ccs = "sun.gc.compressedclassspace";
+
+ checkPerfCounters(metaspace);
+
+ if (isUsingCompressedClassPointers()) {
+ checkPerfCounters(ccs);
+ checkUsedIncreasesWhenLoadingClass(ccs);
+ } else {
+ checkEmptyPerfCounters(ccs);
+ checkUsedIncreasesWhenLoadingClass(metaspace);
+ }
+ }
+
+ private static void checkPerfCounters(String ns) throws Exception {
+ for (PerfCounter counter : countersInNamespace(ns)) {
+ String msg = "Expected " + counter.getName() + " to be larger than 0";
+ assertGT(counter.longValue(), 0L, msg);
+ }
+ }
+
+ private static void checkEmptyPerfCounters(String ns) throws Exception {
+ for (PerfCounter counter : countersInNamespace(ns)) {
+ String msg = "Expected " + counter.getName() + " to equal 0";
+ assertEQ(counter.longValue(), 0L, msg);
+ }
+ }
+
+ private static void checkUsedIncreasesWhenLoadingClass(String ns) throws Exception {
+ PerfCounter used = PerfCounters.findByName(ns + ".used");
+
+ long before = used.longValue();
+ fooClass = compileAndLoad("Foo", "public class Foo { }");
+ System.gc();
+ long after = used.longValue();
+
+ assertGT(after, before);
+ }
+
+ private static List<PerfCounter> countersInNamespace(String ns) throws Exception {
+ List<PerfCounter> counters = new ArrayList<>();
+ for (String name : counterNames) {
+ counters.add(PerfCounters.findByName(ns + "." + name));
+ }
+ return counters;
+ }
+
+ private static Class<?> compileAndLoad(String name, String source) throws Exception {
+ byte[] byteCode = InMemoryJavaCompiler.compile(name, source);
+ return ByteCodeLoader.load(name, byteCode);
+ }
+
+ private static boolean isUsingCompressedClassPointers() {
+ return Platform.is64bit() && InputArguments.contains("-XX:+UseCompressedKlassPointers");
+ }
+}
--- a/hotspot/test/runtime/7051189/Xchecksig.sh Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +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.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 Xchecksig.sh
-# @bug 7051189
-# @summary Need to suppress info message if -xcheck:jni used with libjsig.so
-# @run shell Xchecksig.sh
-#
-
-if [ "${TESTSRC}" = "" ]
-then
- TESTSRC=${PWD}
- echo "TESTSRC not set. Using "${TESTSRC}" as default"
-fi
-echo "TESTSRC=${TESTSRC}"
-## Adding common setup Variables for running shell tests.
-. ${TESTSRC}/../../test_env.sh
-
-OS=`uname -s`
-case "$OS" in
- Windows_* | CYGWIN_* )
- printf "Not testing libjsig.so on Windows. PASSED.\n "
- exit 0
- ;;
-esac
-
-JAVA=${TESTJAVA}${FS}bin${FS}java
-
-# LD_PRELOAD arch needs to match the binary we run, so run the java
-# 64-bit binary directly if we are testing 64-bit (bin/ARCH/java).
-# Check if TESTVMOPS contains -d64, but cannot use
-# java ${TESTVMOPS} to run "java -d64" with LD_PRELOAD.
-
-if [ ${OS} -eq "SunOS" ]
-then
- printf "SunOS test TESTVMOPTS = ${TESTVMOPTS}"
- printf ${TESTVMOPTS} | grep d64 > /dev/null
- if [ $? -eq 0 ]
- then
- printf "SunOS 64-bit test\n"
- BIT_FLAG=-d64
- fi
-fi
-
-ARCH=`uname -p`
-case $ARCH in
- i386)
- if [ X${BIT_FLAG} != "X" ]
- then
- ARCH=amd64
- JAVA=${TESTJAVA}${FS}bin${FS}${ARCH}${FS}java
- fi
- ;;
- sparc)
- if [ X${BIT_FLAG} != "X" ]
- then
- ARCH=sparcv9
- JAVA=${TESTJAVA}${FS}bin${FS}${ARCH}${FS}java
- fi
- ;;
- * )
- printf "Not testing architecture $ARCH, skipping test.\n"
- exit 0
- ;;
-esac
-
-LIBJSIG=${COMPILEJAVA}${FS}jre${FS}lib${FS}${ARCH}${FS}libjsig.so
-
-# If libjsig and binary do not match, skip test.
-
-A=`file ${LIBJSIG} | awk '{ print $3 }'`
-B=`file ${JAVA} | awk '{ print $3 }'`
-
-if [ $A -ne $B ]
-then
- printf "Mismatching binary and library to preload, skipping test.\n"
- exit 0
-fi
-
-if [ ! -f ${LIBJSIG} ]
-then
- printf "Skipping test: libjsig missing for given architecture: ${LIBJSIG}\n"
- exit 0
-fi
-# Use java -version to test, java version info appears on stderr,
-# the libjsig message we are removing appears on stdout.
-
-# grep returns zero meaning found, non-zero means not found:
-
-LD_PRELOAD=${LIBJSIG} ${JAVA} ${TESTVMOPTS} -Xcheck:jni -version 2>&1 | grep "libjsig is activated"
-if [ $? -eq 0 ]; then
- printf "Failed: -Xcheck:jni prints message when libjsig.so is loaded.\n"
- exit 1
-fi
-
-
-LD_PRELOAD=${LIBJSIG} ${JAVA} ${TESTVMOPTS} -Xcheck:jni -verbose:jni -version 2>&1 | grep "libjsig is activated"
-if [ $? != 0 ]; then
- printf "Failed: -Xcheck:jni does not print message when libjsig.so is loaded and -verbose:jni is set.\n"
- exit 1
-fi
-
-printf "PASSED\n"
-exit 0
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,61 @@
+/*
+ * 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 8003424
+ * @summary Testing UseCompressedKlassPointers with CDS
+ * @library /testlibrary
+ * @run main CDSCompressedKPtrs
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class CDSCompressedKPtrs {
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb;
+ if (Platform.is64bit()) {
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UseCompressedKlassPointers", "-XX:+UseCompressedOops",
+ "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:dump");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ try {
+ output.shouldContain("Loading classes to share");
+ output.shouldHaveExitValue(0);
+
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UseCompressedKlassPointers", "-XX:+UseCompressedOops",
+ "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:on", "-version");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("sharing");
+ output.shouldHaveExitValue(0);
+
+ } catch (RuntimeException e) {
+ // Report 'passed' if CDS was turned off because we could not allocate
+ // the klass metaspace at an address that would work with CDS.
+ output.shouldContain("Could not allocate metaspace at a compatible address");
+ output.shouldHaveExitValue(1);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,93 @@
+/*
+ * 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 8003424
+ * @summary Test that cannot use CDS if UseCompressedKlassPointers is turned off.
+ * @library /testlibrary
+ * @run main CDSCompressedKPtrsError
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class CDSCompressedKPtrsError {
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb;
+ if (Platform.is64bit()) {
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UseCompressedOops", "-XX:+UseCompressedKlassPointers", "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:dump");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ try {
+ output.shouldContain("Loading classes to share");
+ output.shouldHaveExitValue(0);
+
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:-UseCompressedKlassPointers", "-XX:-UseCompressedOops",
+ "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:on", "-version");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Unable to use shared archive");
+ output.shouldHaveExitValue(0);
+
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:-UseCompressedKlassPointers", "-XX:+UseCompressedOops",
+ "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:on", "-version");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Unable to use shared archive");
+ output.shouldHaveExitValue(0);
+
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UseCompressedKlassPointers", "-XX:-UseCompressedOops",
+ "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:on", "-version");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Unable to use shared archive");
+ output.shouldHaveExitValue(0);
+
+ } catch (RuntimeException e) {
+ output.shouldContain("Unable to use shared archive");
+ output.shouldHaveExitValue(1);
+ }
+
+ // Test bad options with -Xshare:dump.
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:-UseCompressedOops", "-XX:+UseCompressedKlassPointers", "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:dump");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Cannot dump shared archive");
+
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UseCompressedOops", "-XX:-UseCompressedKlassPointers", "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:dump");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Cannot dump shared archive");
+
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:-UseCompressedOops", "-XX:-UseCompressedKlassPointers", "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:dump");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Cannot dump shared archive");
+
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java Fri Sep 06 15:09:44 2013 -0700
@@ -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.
+ */
+
+/*
+ * @test
+ * @bug 8005933
+ * @summary Test that -Xshare:auto uses CDS when explicitly specified with -server.
+ * @library /testlibrary
+ * @run main XShareAuto
+ */
+
+import com.oracle.java.testlibrary.*;
+
+public class XShareAuto {
+ public static void main(String[] args) throws Exception {
+ if (!Platform.is64bit()) {
+ System.out.println("ObjectAlignmentInBytes for CDS is only " +
+ "supported on 64bit platforms; this plaform is " +
+ System.getProperty("sun.arch.data.model"));
+ System.out.println("Skipping the test");
+ return;
+ }
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./sample.jsa",
+ "-Xshare:dump");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Loading classes to share");
+ output.shouldHaveExitValue(0);
+
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-server", "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:SharedArchiveFile=./sample.jsa", "-version");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("sharing");
+ output.shouldHaveExitValue(0);
+
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-server", "-Xshare:auto", "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:SharedArchiveFile=./sample.jsa", "-version");
+ output = new OutputAnalyzer(pb.start());
+ try {
+ output.shouldContain("sharing");
+ output.shouldHaveExitValue(0);
+ } catch (RuntimeException e) {
+ // If this failed then check that it would also be unable
+ // to share even if -Xshare:on is specified. If so, then
+ // return a success status.
+ pb = ProcessTools.createJavaProcessBuilder(
+ "-server", "-Xshare:on", "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:SharedArchiveFile=./sample.jsa", "-version");
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Could not allocate metaspace at a compatible address");
+ output.shouldHaveExitValue(1);
+ }
+ }
+}
--- a/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java Fri Sep 06 15:09:44 2013 -0700
@@ -45,6 +45,13 @@
String pid = Integer.toString(ProcessTools.getProcessId());
ProcessBuilder pb = new ProcessBuilder();
+ boolean has_nmt_detail = wb.NMTIsDetailSupported();
+ if (has_nmt_detail) {
+ System.out.println("NMT detail support detected.");
+ } else {
+ System.out.println("NMT detail support not detected.");
+ }
+
Thread reserveThread = new Thread() {
public void run() {
addr = wb.NMTReserveMemory(reserveSize);
@@ -58,7 +65,9 @@
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=512KB, committed=0KB)");
- output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved 512KB for Test");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved 512KB for Test");
+ }
Thread commitThread = new Thread() {
public void run() {
@@ -72,7 +81,9 @@
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=512KB, committed=128KB)");
- output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed 128KB");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed 128KB");
+ }
Thread uncommitThread = new Thread() {
public void run() {
--- a/hotspot/test/runtime/NMT/VirtualAllocTestType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/runtime/NMT/VirtualAllocTestType.java Fri Sep 06 15:09:44 2013 -0700
@@ -46,13 +46,22 @@
String pid = Integer.toString(ProcessTools.getProcessId());
ProcessBuilder pb = new ProcessBuilder();
+ boolean has_nmt_detail = wb.NMTIsDetailSupported();
+ if (has_nmt_detail) {
+ System.out.println("NMT detail support detected.");
+ } else {
+ System.out.println("NMT detail support not detected.");
+ }
+
addr = wb.NMTReserveMemory(reserveSize);
mergeData();
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
- pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=256KB, committed=0KB)");
- output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved 256KB for Test");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved 256KB for Test");
+ }
wb.NMTCommitMemory(addr, commitSize);
@@ -60,7 +69,9 @@
output = new OutputAnalyzer(pb.start());
output.shouldContain("Test (reserved=256KB, committed=128KB)");
- output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed 128KB");
+ if (has_nmt_detail) {
+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed 128KB");
+ }
wb.NMTUncommitMemory(addr, commitSize);
@@ -71,7 +82,6 @@
output.shouldNotMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed");
wb.NMTReleaseMemory(addr, reserveSize);
-
mergeData();
output = new OutputAnalyzer(pb.start());
--- a/hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java Fri Sep 06 15:09:44 2013 -0700
@@ -84,8 +84,7 @@
// there is a chance such reservation will fail
// If it does, it is NOT considered a failure of the feature,
// rather a possible expected outcome, though not likely
- output.shouldContain(
- "Unable to reserve shared space at required address");
+ output.shouldContain("Could not allocate metaspace at a compatible address");
output.shouldHaveExitValue(1);
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,82 @@
+/*
+ * 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 7051189 8023393
+ * @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so
+ * @library /testlibrary
+ * @run main XCheckJSig
+ */
+
+import java.util.*;
+import com.oracle.java.testlibrary.*;
+
+public class XCheckJSig {
+ public static void main(String args[]) throws Throwable {
+
+ System.out.println("Regression test for bugs 7051189 and 8023393");
+ if (!Platform.isSolaris() && !Platform.isLinux() && !Platform.isOSX()) {
+ System.out.println("Test only applicable on Solaris, Linux, and Mac OSX, skipping");
+ return;
+ }
+
+ String jdk_path = System.getProperty("test.jdk");
+ String os_arch = Platform.getOsArch();
+ String libjsig;
+ String env_var;
+ if (Platform.isOSX()) {
+ libjsig = jdk_path + "/jre/lib/server/libjsig.dylib";
+ env_var = "DYLD_INSERT_LIBRARIES";
+ } else {
+ libjsig = jdk_path + "/jre/lib/" + os_arch + "/libjsig.so";
+ env_var = "LD_PRELOAD";
+ }
+ String java_program;
+ if (Platform.isSolaris()) {
+ // On Solaris, need to call the 64-bit Java directly in order for
+ // LD_PRELOAD to work because libjsig.so is 64-bit.
+ java_program = jdk_path + "/jre/bin/" + os_arch + "/java";
+ } else {
+ java_program = JDKToolFinder.getJDKTool("java");
+ }
+ // If this test fails, these might be useful to know.
+ System.out.println("libjsig: " + libjsig);
+ System.out.println("osArch: " + os_arch);
+ System.out.println("java_program: " + java_program);
+
+ ProcessBuilder pb = new ProcessBuilder(java_program, "-Xcheck:jni", "-version");
+ Map<String, String> env = pb.environment();
+ env.put(env_var, libjsig);
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("libjsig is activated");
+ output.shouldHaveExitValue(0);
+
+ pb = new ProcessBuilder(java_program, "-Xcheck:jni", "-verbose:jni", "-version");
+ env = pb.environment();
+ env.put(env_var, libjsig);
+ output = new OutputAnalyzer(pb.start());
+ output.shouldContain("libjsig is activated");
+ output.shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/AssertsTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,237 @@
+/*
+ * 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.oracle.java.testlibrary.Asserts.*;
+
+/* @test
+ * @summary Tests the different assertions in the Assert class
+ * @library /testlibrary
+ */
+public class AssertsTest {
+ private static class Foo implements Comparable<Foo> {
+ final int id;
+ public Foo(int id) {
+ this.id = id;
+ }
+
+ public int compareTo(Foo f) {
+ return new Integer(id).compareTo(new Integer(f.id));
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ testLessThan();
+ testLessThanOrEqual();
+ testEquals();
+ testGreaterThanOrEqual();
+ testGreaterThan();
+ testNotEquals();
+ testNull();
+ testNotNull();
+ testTrue();
+ testFalse();
+ }
+
+ private static void testLessThan() throws Exception {
+ expectPass(Assertion.LT, 1, 2);
+
+ expectFail(Assertion.LT, 2, 2);
+ expectFail(Assertion.LT, 2, 1);
+ expectFail(Assertion.LT, null, 2);
+ expectFail(Assertion.LT, 2, null);
+ }
+
+ private static void testLessThanOrEqual() throws Exception {
+ expectPass(Assertion.LTE, 1, 2);
+ expectPass(Assertion.LTE, 2, 2);
+
+ expectFail(Assertion.LTE, 3, 2);
+ expectFail(Assertion.LTE, null, 2);
+ expectFail(Assertion.LTE, 2, null);
+ }
+
+ private static void testEquals() throws Exception {
+ expectPass(Assertion.EQ, 1, 1);
+ expectPass(Assertion.EQ, null, null);
+
+ Foo f1 = new Foo(1);
+ expectPass(Assertion.EQ, f1, f1);
+
+ Foo f2 = new Foo(1);
+ expectFail(Assertion.EQ, f1, f2);
+ expectFail(Assertion.LTE, null, 2);
+ expectFail(Assertion.LTE, 2, null);
+ }
+
+ private static void testGreaterThanOrEqual() throws Exception {
+ expectPass(Assertion.GTE, 1, 1);
+ expectPass(Assertion.GTE, 2, 1);
+
+ expectFail(Assertion.GTE, 1, 2);
+ expectFail(Assertion.GTE, null, 2);
+ expectFail(Assertion.GTE, 2, null);
+ }
+
+ private static void testGreaterThan() throws Exception {
+ expectPass(Assertion.GT, 2, 1);
+
+ expectFail(Assertion.GT, 1, 1);
+ expectFail(Assertion.GT, 1, 2);
+ expectFail(Assertion.GT, null, 2);
+ expectFail(Assertion.GT, 2, null);
+ }
+
+ private static void testNotEquals() throws Exception {
+ expectPass(Assertion.NE, null, 1);
+ expectPass(Assertion.NE, 1, null);
+
+ Foo f1 = new Foo(1);
+ Foo f2 = new Foo(1);
+ expectPass(Assertion.NE, f1, f2);
+
+ expectFail(Assertion.NE, null, null);
+ expectFail(Assertion.NE, f1, f1);
+ expectFail(Assertion.NE, 1, 1);
+ }
+
+ private static void testNull() throws Exception {
+ expectPass(Assertion.NULL, null);
+
+ expectFail(Assertion.NULL, 1);
+ }
+
+ private static void testNotNull() throws Exception {
+ expectPass(Assertion.NOTNULL, 1);
+
+ expectFail(Assertion.NOTNULL, null);
+ }
+
+ private static void testTrue() throws Exception {
+ expectPass(Assertion.TRUE, true);
+
+ expectFail(Assertion.TRUE, false);
+ }
+
+ private static void testFalse() throws Exception {
+ expectPass(Assertion.FALSE, false);
+
+ expectFail(Assertion.FALSE, true);
+ }
+
+ private static <T extends Comparable<T>> void expectPass(Assertion assertion, T ... args)
+ throws Exception {
+ Assertion.run(assertion, args);
+ }
+
+ private static <T extends Comparable<T>> void expectFail(Assertion assertion, T ... args)
+ throws Exception {
+ try {
+ Assertion.run(assertion, args);
+ } catch (RuntimeException e) {
+ return;
+ }
+ throw new Exception("Expected " + Assertion.format(assertion, (Object[]) args) +
+ " to throw a RuntimeException");
+ }
+
+}
+
+enum Assertion {
+ LT, LTE, EQ, GTE, GT, NE, NULL, NOTNULL, FALSE, TRUE;
+
+ public static <T extends Comparable<T>> void run(Assertion assertion, T ... args) {
+ String msg = "Expected " + format(assertion, args) + " to pass";
+ switch (assertion) {
+ case LT:
+ assertLessThan(args[0], args[1], msg);
+ break;
+ case LTE:
+ assertLessThanOrEqual(args[0], args[1], msg);
+ break;
+ case EQ:
+ assertEquals(args[0], args[1], msg);
+ break;
+ case GTE:
+ assertGreaterThanOrEqual(args[0], args[1], msg);
+ break;
+ case GT:
+ assertGreaterThan(args[0], args[1], msg);
+ break;
+ case NE:
+ assertNotEquals(args[0], args[1], msg);
+ break;
+ case NULL:
+ assertNull(args == null ? args : args[0], msg);
+ break;
+ case NOTNULL:
+ assertNotNull(args == null ? args : args[0], msg);
+ break;
+ case FALSE:
+ assertFalse((Boolean) args[0], msg);
+ break;
+ case TRUE:
+ assertTrue((Boolean) args[0], msg);
+ break;
+ default:
+ // do nothing
+ }
+ }
+
+ public static String format(Assertion assertion, Object ... args) {
+ switch (assertion) {
+ case LT:
+ return asString("assertLessThan", args);
+ case LTE:
+ return asString("assertLessThanOrEqual", args);
+ case EQ:
+ return asString("assertEquals", args);
+ case GTE:
+ return asString("assertGreaterThanOrEquals", args);
+ case GT:
+ return asString("assertGreaterThan", args);
+ case NE:
+ return asString("assertNotEquals", args);
+ case NULL:
+ return asString("assertNull", args);
+ case NOTNULL:
+ return asString("assertNotNull", args);
+ case FALSE:
+ return asString("assertFalse", args);
+ case TRUE:
+ return asString("assertTrue", args);
+ default:
+ return "";
+ }
+ }
+
+ private static String asString(String assertion, Object ... args) {
+ if (args == null) {
+ return String.format("%s(null)", assertion);
+ }
+ if (args.length == 1) {
+ return String.format("%s(%s)", assertion, args[0]);
+ } else {
+ return String.format("%s(%s, %s)", assertion, args[0], args[1]);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/Asserts.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,395 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.java.testlibrary;
+
+/**
+ * Asserts that can be used for verifying assumptions in tests.
+ *
+ * An assertion will throw a {@link RuntimeException} if the assertion isn't
+ * valid. All the asserts can be imported into a test by using a static
+ * import:
+ *
+ * <pre>
+ * {@code
+ * import static com.oracle.java.testlibrary.Asserts.*;
+ * }
+ *
+ * Always provide a message describing the assumption if the line number of the
+ * failing assertion isn't enough to understand why the assumption failed. For
+ * example, if the assertion is in a loop or in a method that is called
+ * multiple times, then the line number won't provide enough context to
+ * understand the failure.
+ * </pre>
+ */
+public class Asserts {
+
+ /**
+ * Shorthand for {@link #assertLessThan(T, T)}.
+ *
+ * @see #assertLessThan(T, T)
+ */
+ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) {
+ assertLessThan(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertLessThan(T, T, String)}.
+ *
+ * @see #assertLessThan(T, T, String)
+ */
+ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) {
+ assertLessThan(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertLessThan(T, T, String)} with a default message.
+ *
+ * @see #assertLessThan(T, T, String)
+ */
+ public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) {
+ String msg = "Expected that " + format(lhs) + " < " + format(rhs);
+ assertLessThan(lhs, rhs, msg);
+ }
+
+ /**
+ * Asserts that {@code lhs} is less than {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) {
+ assertTrue(compare(lhs, rhs, msg) < 0, msg);
+ }
+
+ /**
+ * Shorthand for {@link #assertLessThanOrEqual(T, T)}.
+ *
+ * @see #assertLessThanOrEqual(T, T)
+ */
+ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) {
+ assertLessThanOrEqual(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertLessThanOrEqual(T, T, String)}.
+ *
+ * @see #assertLessThanOrEqual(T, T, String)
+ */
+ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) {
+ assertLessThanOrEqual(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertLessThanOrEqual(T, T, String)} with a default message.
+ *
+ * @see #assertLessThanOrEqual(T, T, String)
+ */
+ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) {
+ String msg = "Expected that " + format(lhs) + " <= " + format(rhs);
+ assertLessThanOrEqual(lhs, rhs, msg);
+ }
+
+ /**
+ * Asserts that {@code lhs} is less than or equal to {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) {
+ assertTrue(compare(lhs, rhs, msg) <= 0, msg);
+ }
+
+ /**
+ * Shorthand for {@link #assertEquals(T, T)}.
+ *
+ * @see #assertEquals(T, T)
+ */
+ public static void assertEQ(Object lhs, Object rhs) {
+ assertEquals(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertEquals(T, T, String)}.
+ *
+ * @see #assertEquals(T, T, String)
+ */
+ public static void assertEQ(Object lhs, Object rhs, String msg) {
+ assertEquals(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertEquals(T, T, String)} with a default message.
+ *
+ * @see #assertEquals(T, T, String)
+ */
+ public static void assertEquals(Object lhs, Object rhs) {
+ String msg = "Expected " + format(lhs) + " to equal " + format(rhs);
+ assertEquals(lhs, rhs, msg);
+ }
+
+ /**
+ * Asserts that {@code lhs} is equal to {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static void assertEquals(Object lhs, Object rhs, String msg) {
+ if (lhs == null) {
+ if (rhs != null) {
+ error(msg);
+ }
+ } else {
+ assertTrue(lhs.equals(rhs), msg);
+ }
+ }
+
+ /**
+ * Shorthand for {@link #assertGreaterThanOrEqual(T, T)}.
+ *
+ * @see #assertGreaterThanOrEqual(T, T)
+ */
+ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) {
+ assertGreaterThanOrEqual(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertGreaterThanOrEqual(T, T, String)}.
+ *
+ * @see #assertGreaterThanOrEqual(T, T, String)
+ */
+ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) {
+ assertGreaterThanOrEqual(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertGreaterThanOrEqual(T, T, String)} with a default message.
+ *
+ * @see #assertGreaterThanOrEqual(T, T, String)
+ */
+ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) {
+ String msg = "Expected that " + format(lhs) + " >= " + format(rhs);
+ assertGreaterThanOrEqual(lhs, rhs, msg);
+ }
+
+ /**
+ * Asserts that {@code lhs} is greater than or equal to {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) {
+ assertTrue(compare(lhs, rhs, msg) >= 0, msg);
+ }
+
+ /**
+ * Shorthand for {@link #assertGreaterThan(T, T)}.
+ *
+ * @see #assertGreaterThan(T, T)
+ */
+ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) {
+ assertGreaterThan(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertGreaterThan(T, T, String)}.
+ *
+ * @see #assertGreaterThan(T, T, String)
+ */
+ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) {
+ assertGreaterThan(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertGreaterThan(T, T, String)} with a default message.
+ *
+ * @see #assertGreaterThan(T, T, String)
+ */
+ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) {
+ String msg = "Expected that " + format(lhs) + " > " + format(rhs);
+ assertGreaterThan(lhs, rhs, msg);
+ }
+
+ /**
+ * Asserts that {@code lhs} is greater than {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) {
+ assertTrue(compare(lhs, rhs, msg) > 0, msg);
+ }
+
+ /**
+ * Shorthand for {@link #assertNotEquals(T, T)}.
+ *
+ * @see #assertNotEquals(T, T)
+ */
+ public static void assertNE(Object lhs, Object rhs) {
+ assertNotEquals(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertNotEquals(T, T, String)}.
+ *
+ * @see #assertNotEquals(T, T, String)
+ */
+ public static void assertNE(Object lhs, Object rhs, String msg) {
+ assertNotEquals(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertNotEquals(T, T, String)} with a default message.
+ *
+ * @see #assertNotEquals(T, T, String)
+ */
+ public static void assertNotEquals(Object lhs, Object rhs) {
+ String msg = "Expected " + format(lhs) + " to not equal " + format(rhs);
+ assertNotEquals(lhs, rhs, msg);
+ }
+
+ /**
+ * Asserts that {@code lhs} is not equal to {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static void assertNotEquals(Object lhs, Object rhs, String msg) {
+ if (lhs == null) {
+ if (rhs == null) {
+ error(msg);
+ }
+ } else {
+ assertFalse(lhs.equals(rhs), msg);
+ }
+ }
+
+ /**
+ * Calls {@link #assertNull(Object, String)} with a default message.
+ *
+ * @see #assertNull(Object, String)
+ */
+ public static void assertNull(Object o) {
+ assertNull(o, "Expected " + format(o) + " to be null");
+ }
+
+ /**
+ * Asserts that {@code o} is null.
+ *
+ * @param o The reference assumed to be null.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static void assertNull(Object o, String msg) {
+ assertEquals(o, null, msg);
+ }
+
+ /**
+ * Calls {@link #assertNotNull(Object, String)} with a default message.
+ *
+ * @see #assertNotNull(Object, String)
+ */
+ public static void assertNotNull(Object o) {
+ assertNotNull(o, "Expected non null reference");
+ }
+
+ /**
+ * Asserts that {@code o} is <i>not</i> null.
+ *
+ * @param o The reference assumed <i>not</i> to be null,
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static void assertNotNull(Object o, String msg) {
+ assertNotEquals(o, null, msg);
+ }
+
+ /**
+ * Calls {@link #assertFalse(boolean, String)} with a default message.
+ *
+ * @see #assertFalse(boolean, String)
+ */
+ public static void assertFalse(boolean value) {
+ assertFalse(value, "Expected value to be false");
+ }
+
+ /**
+ * Asserts that {@code value} is {@code false}.
+ *
+ * @param value The value assumed to be false.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static void assertFalse(boolean value, String msg) {
+ assertTrue(!value, msg);
+ }
+
+ /**
+ * Calls {@link #assertTrue(boolean, String)} with a default message.
+ *
+ * @see #assertTrue(boolean, String)
+ */
+ public static void assertTrue(boolean value) {
+ assertTrue(value, "Expected value to be true");
+ }
+
+ /**
+ * Asserts that {@code value} is {@code true}.
+ *
+ * @param value The value assumed to be true.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if the assertion isn't valid.
+ */
+ public static void assertTrue(boolean value, String msg) {
+ if (!value) {
+ error(msg);
+ }
+ }
+
+ private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) {
+ assertNotNull(lhs, msg);
+ assertNotNull(rhs, msg);
+ return lhs.compareTo(rhs);
+ }
+
+ private static String format(Object o) {
+ return o == null? "null" : o.toString();
+ }
+
+ private static void error(String msg) {
+ throw new RuntimeException(msg);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/ByteCodeLoader.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.java.testlibrary;
+
+import java.security.SecureClassLoader;
+
+/**
+ * {@code ByteCodeLoader} can be used for easy loading of byte code already
+ * present in memory.
+ *
+ * {@code InMemoryCompiler} can be used for compiling source code in a string
+ * into byte code, which then can be loaded with {@code ByteCodeLoader}.
+ *
+ * @see InMemoryCompiler
+ */
+public class ByteCodeLoader extends SecureClassLoader {
+ private final String className;
+ private final byte[] byteCode;
+
+ /**
+ * Creates a new {@code ByteCodeLoader} ready to load a class with the
+ * given name and the given byte code.
+ *
+ * @param className The name of the class
+ * @param byteCode The byte code of the class
+ */
+ public ByteCodeLoader(String className, byte[] byteCode) {
+ this.className = className;
+ this.byteCode = byteCode;
+ }
+
+ @Override
+ protected Class<?> findClass(String name) throws ClassNotFoundException {
+ if (!name.equals(className)) {
+ throw new ClassNotFoundException(name);
+ }
+
+ return defineClass(name, byteCode, 0, byteCode.length);
+ }
+
+ /**
+ * Utility method for creating a new {@code ByteCodeLoader} and then
+ * directly load the given byte code.
+ *
+ * @param className The name of the class
+ * @param byteCode The byte code for the class
+ * @throws ClassNotFoundException if the class can't be loaded
+ * @return A {@see Class} object representing the class
+ */
+ public static Class<?> load(String className, byte[] byteCode) throws ClassNotFoundException {
+ return new ByteCodeLoader(className, byteCode).loadClass(className);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/InMemoryJavaCompiler.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.java.testlibrary;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import java.net.URI;
+import java.util.Arrays;
+
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.FileObject;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+/**
+ * {@code InMemoryJavaCompiler} can be used for compiling a {@link
+ * CharSequence} to a {@code byte[]}.
+ *
+ * The compiler will not use the file system at all, instead using a {@link
+ * ByteArrayOutputStream} for storing the byte code. For the source code, any
+ * kind of {@link CharSequence} can be used, e.g. {@link String}, {@link
+ * StringBuffer} or {@link StringBuilder}.
+ *
+ * The {@code InMemoryCompiler} can easily be used together with a {@code
+ * ByteClassLoader} to easily compile and load source code in a {@link String}:
+ *
+ * <pre>
+ * {@code
+ * import com.oracle.java.testlibrary.InMemoryJavaCompiler;
+ * import com.oracle.java.testlibrary.ByteClassLoader;
+ *
+ * class Example {
+ * public static void main(String[] args) {
+ * String className = "Foo";
+ * String sourceCode = "public class " + className + " {" +
+ * " public void bar() {" +
+ * " System.out.println("Hello from bar!");" +
+ * " }" +
+ * "}";
+ * byte[] byteCode = InMemoryJavaCompiler.compile(className, sourceCode);
+ * Class fooClass = ByteClassLoader.load(className, byteCode);
+ * }
+ * }
+ * }
+ * </pre>
+ */
+public class InMemoryJavaCompiler {
+ private static class MemoryJavaFileObject extends SimpleJavaFileObject {
+ private final String className;
+ private final CharSequence sourceCode;
+ private final ByteArrayOutputStream byteCode;
+
+ public MemoryJavaFileObject(String className, CharSequence sourceCode) {
+ super(URI.create("string:///" + className.replace('.','/') + Kind.SOURCE.extension), Kind.SOURCE);
+ this.className = className;
+ this.sourceCode = sourceCode;
+ this.byteCode = new ByteArrayOutputStream();
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return sourceCode;
+ }
+
+ @Override
+ public OutputStream openOutputStream() throws IOException {
+ return byteCode;
+ }
+
+ public byte[] getByteCode() {
+ return byteCode.toByteArray();
+ }
+
+ public String getClassName() {
+ return className;
+ }
+ }
+
+ private static class FileManagerWrapper extends ForwardingJavaFileManager {
+ private MemoryJavaFileObject file;
+
+ public FileManagerWrapper(MemoryJavaFileObject file) {
+ super(getCompiler().getStandardFileManager(null, null, null));
+ this.file = file;
+ }
+
+ @Override
+ public JavaFileObject getJavaFileForOutput(Location location, String className,
+ Kind kind, FileObject sibling)
+ throws IOException {
+ if (!file.getClassName().equals(className)) {
+ throw new IOException("Expected class with name " + file.getClassName() +
+ ", but got " + className);
+ }
+ return file;
+ }
+ }
+
+ /**
+ * Compiles the class with the given name and source code.
+ *
+ * @param className The name of the class
+ * @param sourceCode The source code for the class with name {@code className}
+ * @throws RuntimeException if the compilation did not succeed
+ * @return The resulting byte code from the compilation
+ */
+ public static byte[] compile(String className, CharSequence sourceCode) {
+ MemoryJavaFileObject file = new MemoryJavaFileObject(className, sourceCode);
+ CompilationTask task = getCompilationTask(file);
+
+ if(!task.call()) {
+ throw new RuntimeException("Could not compile " + className + " with source code " + sourceCode);
+ }
+
+ return file.getByteCode();
+ }
+
+ private static JavaCompiler getCompiler() {
+ return ToolProvider.getSystemJavaCompiler();
+ }
+
+ private static CompilationTask getCompilationTask(MemoryJavaFileObject file) {
+ return getCompiler().getTask(null, new FileManagerWrapper(file), null, null, null, Arrays.asList(file));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/InputArguments.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.java.testlibrary;
+
+import java.lang.management.RuntimeMXBean;
+import java.lang.management.ManagementFactory;
+import java.util.List;
+
+/**
+ * This class provides access to the input arguments to the VM.
+ */
+public class InputArguments {
+ private static final List<String> args;
+
+ static {
+ RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
+ args = runtimeMxBean.getInputArguments();
+ }
+
+ /**
+ * Returns true if {@code arg} is an input argument to the VM.
+ *
+ * @param arg The name of the argument.
+ * @return {@code true} if the given argument is an input argument,
+ * otherwise {@code false}.
+ */
+ public static boolean contains(String arg) {
+ return args.contains(arg);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounter.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.java.testlibrary;
+
+import sun.jvmstat.monitor.Monitor;
+
+/**
+ * Represents a performance counter in the JVM.
+ *
+ * See http://openjdk.java.net/groups/hotspot/docs/Serviceability.html#bjvmstat
+ * for more details about performance counters.
+ */
+public class PerfCounter {
+ private final Monitor monitor;
+ private final String name;
+
+ PerfCounter(Monitor monitor, String name) {
+ this.monitor = monitor;
+ this.name = name;
+ }
+
+ /**
+ * Returns the value of this performance counter as a long.
+ *
+ * @return The long value of this performance counter
+ * @throws RuntimeException If the value of the performance counter isn't a long
+ */
+ public long longValue() {
+ Object value = monitor.getValue();
+ if (value instanceof Long) {
+ return ((Long) value).longValue();
+ }
+ throw new RuntimeException("Expected " + monitor.getName() + " to have a long value");
+ }
+
+ /**
+ * Returns the name of the performance counter.
+ *
+ * @return The name of the performance counter.
+ */
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounters.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.java.testlibrary;
+
+import sun.jvmstat.monitor.Monitor;
+import sun.jvmstat.monitor.MonitorException;
+import sun.jvmstat.monitor.MonitoredHost;
+import sun.jvmstat.monitor.MonitoredVm;
+import sun.jvmstat.monitor.VmIdentifier;
+
+/**
+ * PerfCounters can be used to get a performance counter from the currently
+ * executing VM.
+ *
+ * Throws a runtime exception if an error occurs while communicating with the
+ * currently executing VM.
+ */
+public class PerfCounters {
+ private final static MonitoredVm vm;
+
+ static {
+ try {
+ String pid = Integer.toString(ProcessTools.getProcessId());
+ VmIdentifier vmId = new VmIdentifier(pid);
+ MonitoredHost host = MonitoredHost.getMonitoredHost(vmId);
+ vm = host.getMonitoredVm(vmId);
+ } catch (Exception e) {
+ throw new RuntimeException("Could not connect to the VM");
+ }
+ }
+
+ /**
+ * Returns the performance counter with the given name.
+ *
+ * @param name The name of the performance counter.
+ * @throws IllegalArgumentException If no counter with the given name exists.
+ * @throws MonitorException If an error occurs while communicating with the VM.
+ * @return The performance counter with the given name.
+ */
+ public static PerfCounter findByName(String name)
+ throws MonitorException, IllegalArgumentException {
+ Monitor m = vm.findByName(name);
+ if (m == null) {
+ throw new IllegalArgumentException("Did not find a performance counter with name " + name);
+ }
+ return new PerfCounter(m, name);
+ }
+}
--- a/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Thu Sep 05 15:37:40 2013 +0400
+++ b/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Fri Sep 06 15:09:44 2013 -0700
@@ -90,26 +90,49 @@
public native void NMTUncommitMemory(long addr, long size);
public native void NMTReleaseMemory(long addr, long size);
public native boolean NMTWaitForDataMerge();
+ public native boolean NMTIsDetailSupported();
// Compiler
public native void deoptimizeAll();
- public native boolean isMethodCompiled(Executable method);
- public boolean isMethodCompilable(Executable method) {
- return isMethodCompilable(method, -1 /*any*/);
+ public boolean isMethodCompiled(Executable method) {
+ return isMethodCompiled(method, false /*not osr*/);
}
- public native boolean isMethodCompilable(Executable method, int compLevel);
+ public native boolean isMethodCompiled(Executable method, boolean isOsr);
+ public boolean isMethodCompilable(Executable method) {
+ return isMethodCompilable(method, -1 /*any*/);
+ }
+ public boolean isMethodCompilable(Executable method, int compLevel) {
+ return isMethodCompilable(method, compLevel, false /*not osr*/);
+ }
+ public native boolean isMethodCompilable(Executable method, int compLevel, boolean isOsr);
public native boolean isMethodQueuedForCompilation(Executable method);
- public native int deoptimizeMethod(Executable method);
- public void makeMethodNotCompilable(Executable method) {
- makeMethodNotCompilable(method, -1 /*any*/);
+ public int deoptimizeMethod(Executable method) {
+ return deoptimizeMethod(method, false /*not osr*/);
+ }
+ public native int deoptimizeMethod(Executable method, boolean isOsr);
+ public void makeMethodNotCompilable(Executable method) {
+ makeMethodNotCompilable(method, -1 /*any*/);
+ }
+ public void makeMethodNotCompilable(Executable method, int compLevel) {
+ makeMethodNotCompilable(method, compLevel, false /*not osr*/);
+ }
+ public native void makeMethodNotCompilable(Executable method, int compLevel, boolean isOsr);
+ public int getMethodCompilationLevel(Executable method) {
+ return getMethodCompilationLevel(method, false /*not ost*/);
}
- public native void makeMethodNotCompilable(Executable method, int compLevel);
- public native int getMethodCompilationLevel(Executable method);
+ public native int getMethodCompilationLevel(Executable method, boolean isOsr);
public native boolean testSetDontInlineMethod(Executable method, boolean value);
- public native int getCompileQueuesSize();
+ public int getCompileQueuesSize() {
+ return getCompileQueueSize(-1 /*any*/);
+ }
+ public native int getCompileQueueSize(int compLevel);
public native boolean testSetForceInlineMethod(Executable method, boolean value);
- public native boolean enqueueMethodForCompilation(Executable method, int compLevel);
+ public boolean enqueueMethodForCompilation(Executable method, int compLevel) {
+ return enqueueMethodForCompilation(method, compLevel, -1 /*InvocationEntryBci*/);
+ }
+ public native boolean enqueueMethodForCompilation(Executable method, int compLevel, int entry_bci);
public native void clearMethodState(Executable method);
+ public native int getMethodEntryBci(Executable method);
// Intered strings
public native boolean isInStringTable(String str);
--- a/jaxp/.hgtags Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxp/.hgtags Fri Sep 06 15:09:44 2013 -0700
@@ -225,3 +225,5 @@
0a7432f898e579ea35e8c51e3edab37f949168e4 jdk8-b101
7cffafa606e9fb865e7b5e6a56e0a681ce5cf617 jdk8-b102
b1ceab582fc6d795b20aaa8a3fde2eba34af9399 jdk8-b103
+a22fe9bd01e6c7e7ddc7995dfc9471711692b8d1 jdk8-b104
+09a46ec11f880154886c70be03aff5ab2ddf0ab7 jdk8-b105
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java Fri Sep 06 15:09:44 2013 -0700
@@ -38,6 +38,7 @@
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XMLLocator;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -184,6 +185,10 @@
protected static final String LOCALE =
Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
+ /** Property identifier: Security property manager. */
+ protected static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
// debugging
/** Set to true and recompile to print exception stack trace. */
@@ -328,7 +333,8 @@
VALIDATION_MANAGER,
JAXP_SCHEMA_SOURCE,
JAXP_SCHEMA_LANGUAGE,
- LOCALE
+ LOCALE,
+ XML_SECURITY_PROPERTY_MANAGER
};
addRecognizedProperties(recognizedProperties);
@@ -406,6 +412,7 @@
// REVISIT: What is the right thing to do? -Ac
}
+ setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
} // <init>(SymbolTable,XMLGrammarPool)
//
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,6 +36,7 @@
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XMLLocator;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -157,6 +158,10 @@
protected static final String LOCALE =
Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
+ /** Property identifier: Security property manager. */
+ protected static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
// debugging
/** Set to true and recompile to print exception stack trace. */
@@ -310,7 +315,8 @@
XMLGRAMMAR_POOL,
DATATYPE_VALIDATOR_FACTORY,
VALIDATION_MANAGER,
- LOCALE
+ LOCALE,
+ XML_SECURITY_PROPERTY_MANAGER
};
addRecognizedProperties(recognizedProperties);
@@ -367,6 +373,7 @@
// REVISIT: What is the right thing to do? -Ac
}
+ setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
} // <init>(SymbolTable,XMLGrammarPool)
//
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java Fri Sep 06 15:09:44 2013 -0700
@@ -76,6 +76,7 @@
XMLGRAMMAR_POOL,
};
+ XMLSecurityPropertyManager securityPropertyManager;
//
// Constructors
//
@@ -129,16 +130,19 @@
*/
public void setProperty(String name, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
- XMLSecurityPropertyManager spm = new XMLSecurityPropertyManager();
- int index = spm.getIndex(name);
+ if (securityPropertyManager == null) {
+ securityPropertyManager = new XMLSecurityPropertyManager();
+ }
+ int index = securityPropertyManager.getIndex(name);
+
if (index > -1) {
/**
* this is a direct call to this parser, not a subclass since
* internally the support of this property is done through
* XMLSecurityPropertyManager
*/
- spm.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
- super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, spm);
+ securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
+ super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
} else {
super.setProperty(name, value);
}
--- a/jaxws/.hgtags Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/.hgtags Fri Sep 06 15:09:44 2013 -0700
@@ -225,3 +225,5 @@
60b623a361642a0f5aef5f06dad9e5f279b9d9a9 jdk8-b101
988a5f2ac559dcab05698b8a8633aa453e012260 jdk8-b102
6cdc6ed987801c175a1217d0d3e53c3bd69ba52e jdk8-b103
+42211ab0ab1cca51a050d184634cf1db7ef81fbf jdk8-b104
+88390df7ed2cf128298a02c5e6d978f0a603cd58 jdk8-b105
--- a/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -211,6 +211,7 @@
throw new ClassNotFoundException("Loaded outside a jar "+url);
url = url.substring(4); // cut off jar:
url = url.substring(0,url.lastIndexOf('!')); // cut off everything after '!'
+ url = url.replaceAll(" ", "%20"); // support white spaces in path
return new URL(url);
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,5 +47,8 @@
public boolean self() default false;
public String providerName() default "";
public String moduleName() default "";
-
+ public boolean stateful() default false;
+ public String profileNames() default "";
+ public boolean statefulReturn() default false;
+ public boolean statefulException() default false;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 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,6 @@
package com.sun.org.glassfish.external.statistics.impl;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
import com.sun.org.glassfish.external.statistics.AverageRangeStatistic;
@@ -139,6 +138,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ checkMethod(method);
+
Object result;
try {
result = method.invoke(this, args);
@@ -147,7 +148,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 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,6 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.BoundaryStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -81,6 +80,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -89,7 +90,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 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
@@ -26,8 +26,8 @@
package com.sun.org.glassfish.external.statistics.impl;
+
import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -145,6 +145,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -153,7 +155,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 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
@@ -26,7 +26,6 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.CountStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -103,6 +102,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -111,7 +112,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 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,6 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.RangeStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -125,6 +124,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -133,7 +134,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 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
@@ -26,8 +26,8 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.Statistic;
-import java.io.Serializable;
-import java.util.concurrent.atomic.AtomicLong;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -133,4 +133,13 @@
protected static boolean isValidString(String str) {
return (str!=null && str.length()>0);
}
+
+ protected void checkMethod(Method method) {
+ if (method == null || method.getDeclaringClass() == null
+ || !Statistic.class.isAssignableFrom(method.getDeclaringClass())
+ || Modifier.isStatic(method.getModifiers())) {
+ throw new RuntimeException("Invalid method on invoke");
+ }
+ }
+
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 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
@@ -90,6 +90,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -98,7 +100,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 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
@@ -28,7 +28,6 @@
package com.sun.org.glassfish.external.statistics.impl;
import com.sun.org.glassfish.external.statistics.TimeStatistic;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.Map;
import java.lang.reflect.*;
@@ -145,6 +144,8 @@
// todo: equals implementation
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+ checkMethod(m);
+
Object result;
try {
result = m.invoke(this, args);
@@ -153,7 +154,6 @@
} catch (Exception e) {
throw new RuntimeException("unexpected invocation exception: " +
e.getMessage());
- } finally {
}
return result;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties Fri Sep 06 15:09:44 2013 -0700
@@ -30,10 +30,10 @@
Non-existent directory: {0}
VERSION = \
- schemagen 2.2.8-b01
+ schemagen 2.2.8-b20130806.1801
FULLVERSION = \
- schemagen full version "2.2.8-b01"
+ schemagen full version "2.2.8-b20130806.1801"
USAGE = \
Usage: schemagen [-options ...] <java files> \n\
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_de.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = Nicht vorhandenes Verzeichnis: {0}
-VERSION = schemagen 2.2.8-b01
+VERSION = schemagen 2.2.8-b20130806.1801
-FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.8-b01"
+FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.8-b20130806.1801"
USAGE = Verwendung: schemagen [-options ...] <java files> \nOptionen: \n\\ \\ \\ \\ -d <path> : Gibt an, wo die von Prozessor und javac generierten Klassendateien gespeichert werden sollen\n\\ \\ \\ \\ -cp <path> : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -classpath <path> : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -encoding <encoding> : Gibt die Codierung f\u00FCr die Annotationsverarbeitung/den javac-Aufruf an \n\\ \\ \\ \\ -episode <file> : Generiert Episodendatei f\u00FCr separate Kompilierung\n\\ \\ \\ \\ -version : Zeigt Versionsinformation an\n\\ \\ \\ \\ -fullversion : Zeigt vollst\u00E4ndige Versionsinformationen an\n\\ \\ \\ \\ -help : Zeigt diese Verwendungsmeldung an
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_es.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = Directorio no existente: {0}
-VERSION = schemagen 2.2.8-b01
+VERSION = schemagen 2.2.8-b20130806.1801
-FULLVERSION = versi\u00F3n completa de schemagen "2.2.8-b01"
+FULLVERSION = versi\u00F3n completa de schemagen "2.2.8-b20130806.1801"
USAGE = Sintaxis: schemagen [-options ...] <archivos java> \nOpciones: \n\\ \\ \\ \\ -d <ruta de acceso> : especifique d\u00F3nde se colocan los archivos de clase generados por javac y el procesador\n\\ \\ \\ \\ -cp <ruta de acceso> : especifique d\u00F3nde se encuentran los archivos especificados por el usuario\n\\ \\ \\ \\ -encoding <codificaci\u00F3n> : especifique la codificaci\u00F3n que se va a utilizar para el procesamiento de anotaciones/llamada de javac\n\\ \\ \\ \\ -episode <archivo> : genera un archivo de episodio para una compilaci\u00F3n diferente\n\\ \\ \\ \\ -version : muestra la informaci\u00F3n de la versi\u00F3n\n\\ \\ \\ \\ -fullversion : muestra la informaci\u00F3n completa de la versi\u00F3n\n\\ \\ \\ \\ -help : muestra este mensaje de sintaxis
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = R\u00E9pertoire {0} inexistant
-VERSION = schemagen 2.2.8-b01
+VERSION = schemagen 2.2.8-b20130806.1801
-FULLVERSION = version compl\u00E8te de schemagen "2.2.8-b01"
+FULLVERSION = version compl\u00E8te de schemagen "2.2.8-b20130806.1801"
USAGE = Syntaxe : schemagen [-options ...] <java files> \nOptions : \n\ \ \ \ -d <path> : indiquez o\u00F9 placer les fichiers de classe g\u00E9n\u00E9r\u00E9s par le processeur et le compilateur javac\n\ \ \ \ -cp <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -classpath <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -encoding <encoding> : indiquez l'encodage \u00E0 utiliser pour l'appel de javac/traitement de l'annotation \n\ \ \ \ -episode <file> : g\u00E9n\u00E9rez un fichier d'\u00E9pisode pour la compilation s\u00E9par\u00E9e\n\ \ \ \ -version : affichez les informations de version\n\ \ \ \ -fullversion : affichez les informations compl\u00E8tes de version\n\ \ \ \ -help : affichez ce message de syntaxe
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_it.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = Directory non esistente: {0}
-VERSION = schemagen 2.2.8-b01
+VERSION = schemagen 2.2.8-b20130806.1801
-FULLVERSION = versione completa schemagen "2.2.8-b01"
+FULLVERSION = versione completa schemagen "2.2.8-b20130806.1801"
USAGE = Uso: schemagen [-options ...] <java files> \nOpzioni: \n\ \ \ \ -d <path> : specifica dove posizionare il processore e i file della classe generata javac\n\ \ \ \ -cp <path> : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -classpath <path> : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -encoding <encoding> : specifica la codifica da usare per l'elaborazione dell'annotazione/richiamo javac \n\ \ \ \ -episode <file> : genera il file di episodio per la compilazione separata\n\ \ \ \ -version : visualizza le informazioni sulla versione\n\ \ \ \ -fullversion : visualizza le informazioni sulla versione completa\n\ \ \ \ -help : visualizza questo messaggio sull'uso
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
-VERSION = schemagen 2.2.8-b01
+VERSION = schemagen 2.2.8-b20130806.1801
-FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.8-b01"
+FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.8-b20130806.1801"
USAGE = \u4F7F\u7528\u65B9\u6CD5: schemagen [-options ...] <java files> \n\u30AA\u30D7\u30B7\u30E7\u30F3: \n\ \ \ \ -d <path> : \u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -cp <path> : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -classpath <path> : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -encoding <encoding> : \u6CE8\u91C8\u51E6\u7406/javac\u547C\u51FA\u3057\u306B\u4F7F\u7528\u3059\u308B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -episode <file> : \u30B3\u30F3\u30D1\u30A4\u30EB\u3054\u3068\u306B\u30A8\u30D4\u30BD\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\n\ \ \ \ -version : \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -fullversion : \u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -help : \u3053\u306E\u4F7F\u7528\u4F8B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uB514\uB809\uD1A0\uB9AC: {0}
-VERSION = schemagen 2.2.8-b01
+VERSION = schemagen 2.2.8-b20130806.1801
-FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.8-b01"
+FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.8-b20130806.1801"
USAGE = \uC0AC\uC6A9\uBC95: schemagen [-options ...] <java files> \n\uC635\uC158: \n\ \ \ \ -d <path> : \uD504\uB85C\uC138\uC11C \uBC0F javac\uC5D0\uC11C \uC0DD\uC131\uD55C \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uBC30\uCE58\uD560 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -cp <path> : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -classpath <path> : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -encoding <encoding> : \uC8FC\uC11D \uCC98\uB9AC/javac \uD638\uCD9C\uC5D0 \uC0AC\uC6A9\uD560 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4. \n\ \ \ \ -episode <file> : \uBCC4\uB3C4 \uCEF4\uD30C\uC77C\uC744 \uC704\uD574 episode \uD30C\uC77C\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \ \ \ -version : \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -fullversion : \uC815\uC2DD \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -help : \uC774 \uC0AC\uC6A9\uBC95 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = Diret\u00F3rio n\u00E3o existente: {0}
-VERSION = gera\u00E7\u00E3o do esquema 2.2.8-b01
+VERSION = gera\u00E7\u00E3o do esquema 2.2.8-b20130806.1801
-FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.8-b01"
+FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.8-b20130806.1801"
USAGE = Uso: gera\u00E7\u00E3o do esquema [-options ...] <java files> \nOp\u00E7\u00F5es: \n\\ \\ \\ \\ -d <path> : especificar onde colocar o processador e os arquivos da classe gerados por javac\n\\ \\ \\ \\ -cp <path> : especificar onde localizar arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -classpath <path> : especificar onde localizar os arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -encoding <encoding> : especificar codifica\u00E7\u00E3o a ser usada para processamento de anota\u00E7\u00E3o/chamada javac \n\\ \\ \\ \\ -episode <file> : gerar arquivo do epis\u00F3dio para compila\u00E7\u00E3o separada\n\\ \\ \\ \\ -version : exibir informa\u00E7\u00F5es da vers\u00E3o\n\\ \\ \\ \\ -fullversion : exibir informa\u00E7\u00F5es da vers\u00E3o completa\n\\ \\ \\ \\ -help : exibir esta mensagem de uso
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u5F55: {0}
-VERSION = schemagen 2.2.8-b01
+VERSION = schemagen 2.2.8-b20130806.1801
-FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.8-b01"
+FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801"
USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9009\u9879: \n\ \ \ \ -d <path> : \u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -cp <path> : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -classpath <path> : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -encoding <encoding> : \u6307\u5B9A\u7528\u4E8E\u6CE8\u91CA\u5904\u7406/javac \u8C03\u7528\u7684\u7F16\u7801\n\ \ \ \ -episode <file> : \u751F\u6210\u7247\u6BB5\u6587\u4EF6\u4EE5\u4F9B\u5355\u72EC\u7F16\u8BD1\n\ \ \ \ -version : \u663E\u793A\u7248\u672C\u4FE1\u606F\n\ \ \ \ -fullversion : \u663E\u793A\u5B8C\u6574\u7684\u7248\u672C\u4FE1\u606F\n\ \ \ \ -help : \u663E\u793A\u6B64\u7528\u6CD5\u6D88\u606F
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,8 @@
BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u9304: {0}
-VERSION = schemagen 2.2.8-b01
+VERSION = schemagen 2.2.8-b20130806.1801
-FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.8-b01"
+FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801"
USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9078\u9805: \n\\ \\ \\ \\ -d <path> : \u6307\u5B9A\u8655\u7406\u5668\u4EE5\u53CA javac \u7522\u751F\u7684\u985E\u5225\u6A94\u6848\u653E\u7F6E\u4F4D\u7F6E\n\\ \\ \\ \\ -cp <path> : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -classpath <path> : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -encoding <encoding> : \u6307\u5B9A\u8981\u7528\u65BC\u8A3B\u89E3\u8655\u7406/javac \u547C\u53EB\u7684\u7DE8\u78BC \n\\ \\ \\ \\ -episode <file> : \u7522\u751F\u7368\u7ACB\u7DE8\u8B6F\u7684\u4E8B\u4EF6 (episode) \u6A94\u6848\n\\ \\ \\ \\ -version : \u986F\u793A\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -fullversion : \u986F\u793A\u5B8C\u6574\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -help : \u986F\u793A\u6B64\u7528\u6CD5\u8A0A\u606F
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -64,6 +64,9 @@
* AttributeList} interface, it also includes a much more efficient
* implementation using a single array rather than a set of Vectors.</p>
*
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,7 +33,11 @@
import java.util.List;
import java.util.ArrayList;
-
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public class Classes extends NGCCHandler {
private String __text;
private String exclude_content;
@@ -78,17 +82,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 4:
+ case 12:
{
- $_ngcc_current_state = 3;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 11:
- {
- if(($__uri.equals("") && $__local.equals("includes"))) {
+ if(($__uri.equals("") && $__local.equals("classes"))) {
$runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 10;
+ $_ngcc_current_state = 11;
}
else {
unexpectedEnterElement($__qname);
@@ -107,22 +105,28 @@
}
}
break;
- case 0:
+ case 4:
{
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 3;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
- case 12:
+ case 11:
{
- if(($__uri.equals("") && $__local.equals("classes"))) {
+ if(($__uri.equals("") && $__local.equals("includes"))) {
$runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 11;
+ $_ngcc_current_state = 10;
}
else {
unexpectedEnterElement($__qname);
}
}
break;
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -137,12 +141,29 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 1:
+ {
+ if(($__uri.equals("") && $__local.equals("classes"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 3:
{
if(($__uri.equals("") && $__local.equals("excludes"))) {
@@ -154,15 +175,9 @@
}
}
break;
- case 1:
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("classes"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
+ revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
case 8:
@@ -176,17 +191,6 @@
}
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveElement($__qname);
@@ -201,18 +205,18 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
@@ -232,18 +236,18 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 4:
{
$_ngcc_current_state = 3;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
@@ -260,6 +264,12 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
case 4:
{
exclude_content = $value;
@@ -267,6 +277,13 @@
action0();
}
break;
+ case 10:
+ {
+ __text = $value;
+ $_ngcc_current_state = 9;
+ action3();
+ }
+ break;
case 3:
{
exclude_content = $value;
@@ -274,6 +291,18 @@
action0();
}
break;
+ case 6:
+ {
+ __text = $value;
+ $_ngcc_current_state = 4;
+ action1();
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromText(this, super._cookie, $value);
+ }
+ break;
case 9:
{
include_content = $value;
@@ -281,20 +310,6 @@
action2();
}
break;
- case 10:
- {
- __text = $value;
- $_ngcc_current_state = 9;
- action3();
- }
- break;
- case 6:
- {
- __text = $value;
- $_ngcc_current_state = 4;
- action1();
- }
- break;
case 8:
{
include_content = $value;
@@ -302,17 +317,6 @@
action2();
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 0:
- {
- revertToParentFromText(this, super._cookie, $value);
- }
- break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,7 +36,11 @@
import java.util.ArrayList;
import java.io.File;
-
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public class Config extends NGCCHandler {
private String bd;
private Schema _schema;
@@ -74,15 +78,19 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 1:
{
if(($__uri.equals("") && $__local.equals("schema"))) {
- NGCCHandler h = new Schema(this, super._source, $runtime, 16, baseDir);
+ NGCCHandler h = new Schema(this, super._source, $runtime, 19, baseDir);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ unexpectedEnterElement($__qname);
}
}
break;
@@ -100,7 +108,7 @@
case 4:
{
if(($__uri.equals("") && $__local.equals("classes"))) {
- NGCCHandler h = new Classes(this, super._source, $runtime, 18);
+ NGCCHandler h = new Classes(this, super._source, $runtime, 22);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -108,19 +116,15 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 1:
+ case 2:
{
if(($__uri.equals("") && $__local.equals("schema"))) {
- NGCCHandler h = new Schema(this, super._source, $runtime, 15, baseDir);
+ NGCCHandler h = new Schema(this, super._source, $runtime, 20, baseDir);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- unexpectedEnterElement($__qname);
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
@@ -149,12 +153,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
@@ -171,6 +169,12 @@
}
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 7:
{
if(($ai = $runtime.getAttributeIndex("","baseDir"))>=0) {
@@ -196,17 +200,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 7:
{
if(($__uri.equals("") && $__local.equals("baseDir"))) {
@@ -231,10 +235,9 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
+ case 0:
{
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
case 5:
@@ -247,9 +250,10 @@
}
}
break;
- case 0:
+ case 2:
{
- revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -263,10 +267,9 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 2:
+ case 0:
{
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
+ revertToParentFromText(this, super._cookie, $value);
}
break;
case 6:
@@ -276,9 +279,10 @@
action1();
}
break;
- case 0:
+ case 2:
{
- revertToParentFromText(this, super._cookie, $value);
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
}
break;
case 7:
@@ -294,20 +298,20 @@
public void onChildCompleted(Object result, int cookie, boolean needAttCheck)throws SAXException {
switch(cookie) {
- case 16:
+ case 19:
{
this._schema = ((Schema)result);
action0();
$_ngcc_current_state = 1;
}
break;
- case 18:
+ case 22:
{
this.classes = ((Classes)result);
$_ngcc_current_state = 2;
}
break;
- case 15:
+ case 20:
{
this._schema = ((Schema)result);
action0();
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,7 +29,9 @@
import org.xml.sax.SAXException;
/**
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
*
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,7 +29,9 @@
import org.xml.sax.SAXException;
/**
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
*
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,7 +29,9 @@
import org.xml.sax.SAXException;
/**
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
*
* @version $Id: NGCCHandler.java,v 1.9 2002/09/29 02:55:48 okajima Exp $
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,6 +32,9 @@
* Dispatches incoming events into sub handlers appropriately
* so that the interleaving semantics will be correctly realized.
*
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
public abstract class NGCCInterleaveFilter implements NGCCEventSource, NGCCEventReceiver {
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java Fri Sep 06 15:09:44 2013 -0700
@@ -50,7 +50,9 @@
* <li>manage mapping between namespace URIs and prefixes.
*
* <li>TODO: provide support for interleaving.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* @version $Id: NGCCRuntime.java,v 1.15 2002/09/29 02:55:48 okajima Exp $
* @author Kohsuke Kawaguchi (kk@kohsuke.org)
*/
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,7 +32,11 @@
import java.io.File;
-
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public class Schema extends NGCCHandler {
private File baseDir;
private String loc;
@@ -72,6 +76,18 @@
revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
+ case 2:
+ {
+ if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
@@ -84,18 +100,6 @@
}
}
break;
- case 2:
- {
- if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 10:
{
if(($__uri.equals("") && $__local.equals("schema"))) {
@@ -121,23 +125,22 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ if(($__uri.equals("") && $__local.equals("schema"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 0:
{
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
case 2:
{
if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
@@ -150,14 +153,15 @@
}
}
break;
- case 1:
+ case 6:
{
- if(($__uri.equals("") && $__local.equals("schema"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
- unexpectedLeaveElement($__qname);
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
}
break;
@@ -180,6 +184,17 @@
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 2:
+ {
+ if(($__uri.equals("") && $__local.equals("location"))) {
+ $_ngcc_current_state = 4;
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
case 6:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
@@ -191,17 +206,6 @@
}
}
break;
- case 2:
- {
- if(($__uri.equals("") && $__local.equals("location"))) {
- $_ngcc_current_state = 4;
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -221,6 +225,16 @@
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 3:
+ {
+ if(($__uri.equals("") && $__local.equals("location"))) {
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
case 7:
{
if(($__uri.equals("") && $__local.equals("namespace"))) {
@@ -231,25 +245,15 @@
}
}
break;
- case 6:
+ case 2:
{
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 3:
+ case 6:
{
- if(($__uri.equals("") && $__local.equals("location"))) {
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 2:
- {
- $_ngcc_current_state = 1;
+ $_ngcc_current_state = 2;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -270,11 +274,30 @@
$_ngcc_current_state = 7;
}
break;
+ case 4:
+ {
+ loc = $value;
+ $_ngcc_current_state = 3;
+ action0();
+ }
+ break;
case 0:
{
revertToParentFromText(this, super._cookie, $value);
}
break;
+ case 2:
+ {
+ if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
case 6:
{
if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
@@ -287,25 +310,6 @@
}
}
break;
- case 4:
- {
- loc = $value;
- $_ngcc_current_state = 3;
- action0();
- }
- break;
- case 2:
- {
- if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties Fri Sep 06 15:09:44 2013 -0700
@@ -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,7 @@
# questions.
#
-build-id=2.2.9-b14027
-build-version=JAX-WS RI 2.2.9-b14027
+build-id=2.2.9-b14140
+build-version=JAX-WS RI 2.2.9-b14140
major-version=2.2.9
-svn-revision=14027
+svn-revision=14140
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties Fri Sep 06 15:09:44 2013 -0700
@@ -171,23 +171,23 @@
Driver.FailedToGenerateCode = \
Failed to produce code.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
Driver.FilePrologComment = \
- This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b01 \n\
+ This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b20130806.1801 \n\
See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\
Any modifications to this file will be lost upon recompilation of the source schema. \n\
Generated on: {0} \n
Driver.Version = \
- xjc 2.2.8-b01
+ xjc 2.2.8-b20130806.1801
Driver.FullVersion = \
- xjc full version "2.2.8-b01-b28"
+ xjc full version "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_de.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b01 generiert \nSiehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b20130806.1801 generiert \nSiehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = xjc vollst\u00e4ndige Version "2.2.8-b01-b28"
+Driver.FullVersion = xjc vollst\u00E4ndige Version "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_es.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.8-b01 \nVisite <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.8-b20130806.1801 \nVisite <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = versi\u00f3n completa de xjc "2.2.8-b01-b28"
+Driver.FullVersion = versi\u00F3n completa de xjc "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Echec de la production du code.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.2.8-b01 \nVoir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.2.8-b20130806.1801 \nVoir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = version compl\u00e8te xjc "2.2.8-b01-b28"
+Driver.FullVersion = version compl\u00E8te xjc "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_it.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Produzione del codice non riuscita.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.8-b01 \nVedere <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.8-b20130806.1801 \nVedere <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = versione completa xjc "2.2.8-b01-b28"
+Driver.FullVersion = versione completa xjc "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = \u30b3\u30fc\u30c9\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.8-b01\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.8-b20130806.1801\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = xjc\u30d5\u30eb\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3"2.2.8-b01-b28"
+Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = \ucf54\ub4dc \uc0dd\uc131\uc744 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.8-b01 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.8-b20130806.1801 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
-Driver.Version = XJC 2.2.8-b01
+Driver.Version = XJC 2.2.8-b20130806.1801
-Driver.FullVersion = XJC \uc815\uc2dd \ubc84\uc804 "2.2.8-b01-b28"
+Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.8-b01 \nConsulte <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.8-b20130806.1801 \nConsulte <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = vers\u00e3o completa de xjc "2.2.8-b01-b28"
+Driver.FullVersion = vers\u00E3o completa de xjc "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = \u65e0\u6cd5\u751f\u6210\u4ee3\u7801\u3002
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.8-b01 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.8-b20130806.1801 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = xjc \u5b8c\u6574\u7248\u672c "2.2.8-b01-b28"
+Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties Fri Sep 06 15:09:44 2013 -0700
@@ -96,17 +96,17 @@
Driver.FailedToGenerateCode = \u7121\u6cd5\u7522\u751f\u7a0b\u5f0f\u78bc.
-# DO NOT localize the 2.2.8-b01 string - it is a token for an ant <replaceFilter>
-Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b01 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
+# DO NOT localize the 2.2.8-b20130806.1801 string - it is a token for an ant <replaceFilter>
+Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b20130806.1801 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
-Driver.Version = xjc 2.2.8-b01
+Driver.Version = xjc 2.2.8-b20130806.1801
-Driver.FullVersion = xjc \u5b8c\u6574\u7248\u672c "2.2.8-b01-b28"
+Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.8-b20130806.1801"
-Driver.BuildID = 2.2.8-b01
+Driver.BuildID = 2.2.8-b20130806.1801
# for JDK integration - include version in source zip
-jaxb.jdk.version=2.2.8-b01
+jaxb.jdk.version=@@JAXB_JDK_VERSION@@
# see java.text.SimpleDateFormat for format syntax
# DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -35,6 +35,8 @@
import javax.xml.XMLConstants;
import org.xml.sax.SAXException;
+import static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess;
+
/**
* Wraps a JAXP {@link Schema} object and lazily instantiate it.
*
@@ -59,7 +61,7 @@
try {
// do not disable secure processing - these are well-known schemas
SchemaFactory sf = XmlFactory.createSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI, false);
- schema = sf.newSchema(source);
+ schema = allowFileAccess(sf, false).newSchema(source);
} catch (SAXException e) {
// we make sure that the schema is correct before we ship.
throw new AssertionError(e);
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import javax.xml.bind.annotation.XmlAccessorOrder;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlAccessorOrderWriter
extends JAnnotationWriter<XmlAccessorOrder>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import javax.xml.bind.annotation.XmlAccessorType;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlAccessorTypeWriter
extends JAnnotationWriter<XmlAccessorType>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlAnyAttribute;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlAnyAttributeWriter
extends JAnnotationWriter<XmlAnyAttribute>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlAnyElementWriter
extends JAnnotationWriter<XmlAnyElement>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlAttachmentRef;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlAttachmentRefWriter
extends JAnnotationWriter<XmlAttachmentRef>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlAttribute;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlAttributeWriter
extends JAnnotationWriter<XmlAttribute>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlElementDeclWriter
extends JAnnotationWriter<XmlElementDecl>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlElementRefWriter
extends JAnnotationWriter<XmlElementRef>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlElementRefs;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlElementRefsWriter
extends JAnnotationWriter<XmlElementRefs>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlElementWrapperWriter
extends JAnnotationWriter<XmlElementWrapper>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlElementWriter
extends JAnnotationWriter<XmlElement>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlElements;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlElementsWriter
extends JAnnotationWriter<XmlElements>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlEnumValue;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlEnumValueWriter
extends JAnnotationWriter<XmlEnumValue>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlEnumWriter
extends JAnnotationWriter<XmlEnum>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlIDREF;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlIDREFWriter
extends JAnnotationWriter<XmlIDREF>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlID;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlIDWriter
extends JAnnotationWriter<XmlID>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlInlineBinaryData;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlInlineBinaryDataWriter
extends JAnnotationWriter<XmlInlineBinaryData>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlJavaTypeAdapterWriter
extends JAnnotationWriter<XmlJavaTypeAdapter>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlList;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlListWriter
extends JAnnotationWriter<XmlList>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlMimeType;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlMimeTypeWriter
extends JAnnotationWriter<XmlMimeType>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlMixed;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlMixedWriter
extends JAnnotationWriter<XmlMixed>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlNs;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlNsWriter
extends JAnnotationWriter<XmlNs>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlRegistry;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlRegistryWriter
extends JAnnotationWriter<XmlRegistry>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlRootElement;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlRootElementWriter
extends JAnnotationWriter<XmlRootElement>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlSchemaTypeWriter
extends JAnnotationWriter<XmlSchemaType>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlSchemaTypes;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlSchemaTypesWriter
extends JAnnotationWriter<XmlSchemaTypes>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import javax.xml.bind.annotation.XmlSchema;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlSchemaWriter
extends JAnnotationWriter<XmlSchema>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlSeeAlsoWriter
extends JAnnotationWriter<XmlSeeAlso>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlTransient;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlTransientWriter
extends JAnnotationWriter<XmlTransient>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.codemodel.internal.JAnnotationWriter;
import com.sun.codemodel.internal.JType;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlTypeWriter
extends JAnnotationWriter<XmlType>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import javax.xml.bind.annotation.XmlValue;
import com.sun.codemodel.internal.JAnnotationWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface XmlValueWriter
extends JAnnotationWriter<XmlValue>
{
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties Fri Sep 06 15:09:44 2013 -0700
@@ -26,7 +26,7 @@
METHOD_COLLISION = \
The "{0}" method is defined on both "{1}" and "{2}" and is causing a collision.
-# {0} - enumeration constant value (but something that couldn?t be translated to a valid java identifier e.g. starting special character, number, ..) e.g. Cannot derive a valid Java identifier from "5.6.0". Specify a customization to change the name.
+# {0} - enumeration constant value (but something that couldn�t be translated to a valid java identifier e.g. starting special character, number, ..) e.g. Cannot derive a valid Java identifier from "5.6.0". Specify a customization to change the name.
ERR_UNUSABLE_NAME = \
Cannot derive a valid Java identifier from "{0}". Specify a customization to change the name.
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,7 @@
import java.util.Collection;
import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
@@ -298,7 +299,7 @@
// this is anonymous type. can't have @XmlSchemaType
return false;
- if(!typeName.getNamespaceURI().equals(WellKnownNamespace.XML_SCHEMA))
+ if(!XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(typeName.getNamespaceURI()))
// if we put application-defined type name, it will be undefined
// by the time we generate a schema.
return false;
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,6 +25,7 @@
package com.sun.tools.internal.xjc.model;
+import javax.xml.XMLConstants;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
@@ -34,6 +35,7 @@
import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
import com.sun.xml.internal.bind.v2.model.core.TypeRef;
import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil;
+import com.sun.xml.internal.xsom.XSType;
import com.sun.xml.internal.xsom.XmlString;
import com.sun.xml.internal.xsom.XSElementDecl;
import com.sun.istack.internal.Nullable;
@@ -74,11 +76,34 @@
}
public static QName getSimpleTypeName(XSElementDecl decl) {
- if(decl==null) return null;
- QName typeName = null;
- if(decl.getType().isSimpleType())
- typeName = BGMBuilder.getName(decl.getType());
- return typeName;
+ if(decl==null || !decl.getType().isSimpleType())
+ return null; // null if not simple type
+ return resolveSimpleTypeName(decl.getType());
+ }
+
+ /**
+ * Recursively search for type name.
+ *
+ * This is needed to find correct type for refs like:
+ *
+ *<xs:simpleType name="parent">
+ * <xs:restriction base="xs:date"/>
+ *</xs:simpleType>
+ *<xs:simpleType name="child">
+ * <xs:restriction base="parent"/>
+ *</xs:simpleType>
+ *
+ *<xs:element name="testField" type="child"/>
+ *
+ * @param declType given type
+ * @return simpleTypeName or null
+ */
+ private static QName resolveSimpleTypeName(XSType declType) {
+ QName name = BGMBuilder.getName(declType);
+ if (name != null && !XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(name.getNamespaceURI()))
+ return resolveSimpleTypeName(declType.getBaseType());
+ else
+ return name;
}
public CTypeRef(CNonElement type, QName elementName, QName typeName, boolean nillable, XmlString defaultValue) {
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -55,7 +55,3 @@
* </dl>
*/
package com.sun.tools.internal.xjc.model;
-
-import com.sun.xml.internal.xsom.XSComponent;
-
-import org.xml.sax.Locator;
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,29 +25,27 @@
package com.sun.tools.internal.xjc.reader.internalizer;
-import java.io.IOException;
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-
import com.sun.istack.internal.SAXParseException2;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.XMLFilterImpl;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
/**
* XMLFilter that finds references to other schema files from
* SAX events.
- *
+ * <p/>
* This implementation is a base implementation for typical case
* where we just need to look for a particular attribute which
* contains an URL to another schema file.
*
- * @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
*/
public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl {
@@ -61,12 +59,9 @@
* IF the given element contains a reference to an external resource,
* return its URL.
*
- * @param nsURI
- * Namespace URI of the current element
- * @param localName
- * Local name of the current element
- * @return
- * It's OK to return a relative URL.
+ * @param nsURI Namespace URI of the current element
+ * @param localName Local name of the current element
+ * @return It's OK to return a relative URL.
*/
protected abstract String findExternalResource(String nsURI, String localName, Attributes atts);
@@ -83,16 +78,21 @@
// absolutize URL.
String lsi = locator.getSystemId();
String ref;
- if (lsi.startsWith("jar:")) {
- int bangIdx = lsi.indexOf('!');
- if (bangIdx > 0) {
- ref = lsi.substring(0, bangIdx + 1)
- + new URI(lsi.substring(bangIdx + 1)).resolve(new URI(relativeRef)).toString();
+ URI relRefURI = new URI(relativeRef);
+ if (relRefURI.isAbsolute())
+ ref = relativeRef;
+ else {
+ if (lsi.startsWith("jar:")) {
+ int bangIdx = lsi.indexOf('!');
+ if (bangIdx > 0) {
+ ref = lsi.substring(0, bangIdx + 1)
+ + new URI(lsi.substring(bangIdx + 1)).resolve(new URI(relativeRef)).toString();
+ } else {
+ ref = relativeRef;
+ }
} else {
- ref = relativeRef;
+ ref = new URI(lsi).resolve(new URI(relativeRef)).toString();
}
- } else {
- ref = new URI(lsi).resolve(new URI(relativeRef)).toString();
}
// then parse this schema as well,
@@ -121,6 +121,7 @@
throw spe;
}
}
+
private Locator locator;
@Override
@@ -128,4 +129,4 @@
super.setDocumentLocator(locator);
this.locator = locator;
}
-};
+}
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,18 +25,21 @@
package com.sun.tools.internal.xjc.reader.internalizer;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.XMLStreamReaderToContentHandler;
+import com.sun.tools.internal.xjc.ErrorReceiver;
+import com.sun.tools.internal.xjc.Options;
+import com.sun.tools.internal.xjc.reader.Const;
+import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
+import com.sun.xml.internal.bind.marshaller.DataWriter;
+import com.sun.xml.internal.bind.v2.util.XmlFactory;
+import com.sun.xml.internal.xsom.parser.JAXPParser;
+import com.sun.xml.internal.xsom.parser.XMLParser;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.*;
+import org.xml.sax.helpers.XMLFilterImpl;
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -51,27 +54,13 @@
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.SAXSource;
import javax.xml.validation.SchemaFactory;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.*;
-import com.sun.istack.internal.NotNull;
-import com.sun.istack.internal.XMLStreamReaderToContentHandler;
-import com.sun.tools.internal.xjc.ErrorReceiver;
-import com.sun.tools.internal.xjc.Options;
-import com.sun.tools.internal.xjc.reader.Const;
-import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
-import com.sun.xml.internal.bind.marshaller.DataWriter;
-import com.sun.xml.internal.bind.v2.util.XmlFactory;
-import com.sun.xml.internal.xsom.parser.JAXPParser;
-import com.sun.xml.internal.xsom.parser.XMLParser;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
+import static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess;
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
/**
@@ -471,7 +460,7 @@
}
try {
- sf.newSchema(sources.toArray(new SAXSource[0]));
+ allowFileAccess(sf, options.disableXmlSecurity).newSchema(sources.toArray(new SAXSource[0]));
} catch (SAXException e) {
// error should have been reported.
} catch (RuntimeException re) {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,7 +30,7 @@
/**
* @author Kohsuke Kawaguchi
*/
-public abstract class Util {
+public final class Util {
private Util() {} // no instanciation
/**
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -40,6 +40,8 @@
NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS, // 1 arg
INVALID_TYPE_IN_MAP, // 0args
INVALID_JAXP_IMPLEMENTATION, // 1 arg
+ JAXP_SUPPORTED_PROPERTY, // 1 arg
+ JAXP_UNSUPPORTED_PROPERTY, // 1 arg
;
private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -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,3 +50,9 @@
INVALID_JAXP_IMPLEMENTATION = \
You are running with invalid JAXP api or implementation. JAXP api/implementation of version 1.3.1 (included in JDK6) or higher is required. In case you are using ant, make sure ant 1.7.0 or higher is used - older versions of ant contain JAXP api/impl version 1.2 (in xml-apis.jar). If you want to keep using older ant versions, you have to configure it to use higher the JAXP api/impl versions.
+
+JAXP_SUPPORTED_PROPERTY =\
+ Property "{0}" is supported and has been successfully set by used JAXP implementation.
+
+JAXP_UNSUPPORTED_PROPERTY =\
+ Property "{0}" is not supported by used JAXP implementation.
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,7 +25,10 @@
package com.sun.xml.internal.bind.v2.model.annotation;
-
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
class Init {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlAttribute;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlAttributeQuick
extends Quick
implements XmlAttribute
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElementDecl;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlElementDeclQuick
extends Quick
implements XmlElementDecl
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlElementQuick
extends Quick
implements XmlElement
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlElementRef;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlElementRefQuick
extends Quick
implements XmlElementRef
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlElementRefsQuick
extends Quick
implements XmlElementRefs
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlEnumQuick
extends Quick
implements XmlEnum
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlRootElementQuick
extends Quick
implements XmlRootElement
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,11 @@
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlSchemaQuick
extends Quick
implements XmlSchema
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlSchemaType;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlSchemaTypeQuick
extends Quick
implements XmlSchemaType
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlTransient;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlTransientQuick
extends Quick
implements XmlTransient
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlTypeQuick
extends Quick
implements XmlType
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import java.lang.annotation.Annotation;
import javax.xml.bind.annotation.XmlValue;
+
+/**
+ * <p><b>Auto-generated, do not edit.</b></p>
+ *
+ */
final class XmlValueQuick
extends Quick
implements XmlValue
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -59,10 +59,6 @@
@XmlSchema(namespace="http://jaxb.dev.java.net/xjc/model",elementFormDefault=QUALIFIED)
package com.sun.xml.internal.bind.v2.model.core;
-import java.lang.reflect.Type;
-import java.lang.reflect.Method;
-import java.lang.reflect.Field;
-
import javax.xml.bind.annotation.XmlSchema;
import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED;
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -91,6 +91,9 @@
import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
import com.sun.xml.internal.bind.v2.util.ByteArrayOutputStreamEx;
import com.sun.xml.internal.bind.v2.util.DataSourceSource;
+import java.util.logging.Logger;
+import com.sun.xml.internal.bind.Util;
+import java.util.logging.Level;
import org.xml.sax.SAXException;
@@ -105,6 +108,8 @@
public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<Type,Class>
implements RuntimeBuiltinLeafInfo, Transducer<T> {
+ private static final Logger logger = Util.getClassLogger();
+
private RuntimeBuiltinLeafInfoImpl(Class type, QName... typeNames) {
super(type, typeNames);
LEAVES.put(type,this);
@@ -196,6 +201,7 @@
public static final List<RuntimeBuiltinLeafInfoImpl<?>> builtinBeanInfos;
public static final String MAP_ANYURI_TO_URI = "mapAnyUriToUri";
+ public static final String USE_OLD_GMONTH_MAPPING = "jaxb.ri.useOldGmonthMapping";
static {
@@ -960,7 +966,14 @@
m.put(DatatypeConstants.DATETIME, "%Y-%M-%DT%h:%m:%s"+ "%z");
m.put(DatatypeConstants.DATE, "%Y-%M-%D" +"%z");
m.put(DatatypeConstants.TIME, "%h:%m:%s"+ "%z");
- m.put(DatatypeConstants.GMONTH, "--%M--%z");
+ if (System.getProperty(USE_OLD_GMONTH_MAPPING) == null) {
+ m.put(DatatypeConstants.GMONTH, "--%M%z"); // E2-12 Error. http://www.w3.org/2001/05/xmlschema-errata#e2-12
+ } else { // backw. compatibility
+ if (logger.isLoggable(Level.FINE)) {
+ logger.log(Level.FINE, "Old GMonth mapping used.");
+ }
+ m.put(DatatypeConstants.GMONTH, "--%M--%z");
+ }
m.put(DatatypeConstants.GDAY, "---%D" + "%z");
m.put(DatatypeConstants.GYEAR, "%Y" + "%z");
m.put(DatatypeConstants.GYEARMONTH, "%Y-%M" + "%z");
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java Fri Sep 06 15:09:44 2013 -0700
@@ -180,7 +180,3 @@
* @ArchitectureDocument
*/
package com.sun.xml.internal.bind.v2;
-
-import javax.xml.bind.JAXBContext;
-
-import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java Fri Sep 06 15:09:44 2013 -0700
@@ -88,13 +88,11 @@
private OnWire adaptM(Marshaller m,InMemory v) throws JAXBException {
XMLSerializer serializer = ((MarshallerImpl)m).serializer;
- serializer.setThreadAffinity();
serializer.pushCoordinator();
try {
return _adaptM(serializer, v);
} finally {
serializer.popCoordinator();
- serializer.resetThreadAffinity();
}
}
@@ -132,7 +130,6 @@
private @NotNull InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException {
UnmarshallerImpl u = (UnmarshallerImpl) _u;
XmlAdapter<OnWire,InMemory> a = u.coordinator.getAdapter(adapter);
- u.coordinator.setThreadAffinity();
u.coordinator.pushCoordinator();
try {
return a.unmarshal(v);
@@ -140,7 +137,6 @@
throw new UnmarshalException(e);
} finally {
u.coordinator.popCoordinator();
- u.coordinator.resetThreadAffinity();
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java Fri Sep 06 15:09:44 2013 -0700
@@ -94,75 +94,37 @@
return adapters.containsKey(type);
}
+ // this much is necessary to avoid calling get and set twice when we push.
+ private static final ThreadLocal<Coordinator> activeTable = new ThreadLocal<Coordinator>();
+
/**
* The {@link Coordinator} in charge before this {@link Coordinator}.
*/
- private Object old;
-
- /**
- * A 'pointer' to a {@link Coordinator} that keeps track of the currently active {@link Coordinator}.
- * Having this improves the runtime performance.
- */
- private Object[] table;
-
- /**
- * When we set {@link #table} to null, record who did it.
- * This is for trouble-shooting a possible concurrency issue reported at:
- * http://forums.java.net/jive/thread.jspa?threadID=15132
- */
- public Exception guyWhoSetTheTableToNull;
-
- /**
- * Associates this {@link Coordinator} with the current thread.
- * Should be called at the very beginning of the episode.
- */
- protected final void setThreadAffinity() {
- table = activeTable.get();
- assert table!=null;
- }
-
- /**
- * Dis-associate this {@link Coordinator} with the current thread.
- * Sohuld be called at the end of the episode to avoid memory leak.
- */
- protected final void resetThreadAffinity() {
- if (activeTable != null) {
- activeTable.remove();
- }
- if(debugTableNPE)
- guyWhoSetTheTableToNull = new Exception(); // remember that we set it to null
- table = null;
- }
+ private Coordinator old;
/**
* Called whenever an execution flow enters the realm of this {@link Coordinator}.
*/
protected final void pushCoordinator() {
- old = table[0];
- table[0] = this;
+ old = activeTable.get();
+ activeTable.set(this);
}
/**
* Called whenever an execution flow exits the realm of this {@link Coordinator}.
*/
protected final void popCoordinator() {
- assert table[0]==this;
- table[0] = old;
+ if (old != null)
+ activeTable.set(old);
+ else
+ activeTable.remove();
old = null; // avoid memory leak
}
public static Coordinator _getInstance() {
- return (Coordinator) activeTable.get()[0];
+ return activeTable.get();
}
- // this much is necessary to avoid calling get and set twice when we push.
- private static final ThreadLocal<Object[]> activeTable = new ThreadLocal<Object[]>() {
- @Override
- public Object[] initialValue() {
- return new Object[1];
- }
- };
-
//
//
// ErrorHandler implementation
@@ -207,13 +169,4 @@
throw saxException;
}
}
-
- public static boolean debugTableNPE;
-
- static {
- try {
- debugTableNPE = Boolean.getBoolean(Coordinator.class.getName()+".debugTableNPE");
- } catch (SecurityException t) {
- }
- }
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java Fri Sep 06 15:09:44 2013 -0700
@@ -812,7 +812,6 @@
* Similar to 'schemaLocation' but this one works for xsi:noNamespaceSchemaLocation
*/
public void startDocument(XmlOutput out,boolean fragment,String schemaLocation,String noNsSchemaLocation) throws IOException, SAXException, XMLStreamException {
- setThreadAffinity();
pushCoordinator();
nsContext.reset();
nse = nsContext.getCurrent();
@@ -841,7 +840,6 @@
out = null;
clearCurrentProperty();
popCoordinator();
- resetThreadAffinity();
}
/**
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ * </p>
*/
final class PrimitiveArrayListerBoolean<BeanT> extends Lister<BeanT,boolean[],Boolean,PrimitiveArrayListerBoolean.BooleanArrayPack> {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ * </p>
*/
final class PrimitiveArrayListerCharacter<BeanT> extends Lister<BeanT,char[],Character,PrimitiveArrayListerCharacter.CharacterArrayPack> {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ * </p>
*/
final class PrimitiveArrayListerDouble<BeanT> extends Lister<BeanT,double[],Double,PrimitiveArrayListerDouble.DoubleArrayPack> {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ * </p>
*/
final class PrimitiveArrayListerFloat<BeanT> extends Lister<BeanT,float[],Float,PrimitiveArrayListerFloat.FloatArrayPack> {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ * </p>
*/
final class PrimitiveArrayListerInteger<BeanT> extends Lister<BeanT,int[],Integer,PrimitiveArrayListerInteger.IntegerArrayPack> {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ * </p>
*/
final class PrimitiveArrayListerLong<BeanT> extends Lister<BeanT,long[],Long,PrimitiveArrayListerLong.LongArrayPack> {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,10 +30,13 @@
/**
* {@link Lister} for primitive type arrays.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * B y t e ArrayLister is used as the master to generate the rest of the
- * lister classes. Do not modify the generated copies.
+ * B y t e ArrayLister is used as the master to generate the rest of the
+ * lister classes. Do not modify the generated copies.
+ * </p>
*/
final class PrimitiveArrayListerShort<BeanT> extends Lister<BeanT,short[],Short,PrimitiveArrayListerShort.ShortArrayPack> {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean fields.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
- *
+ * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Boolean extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for char fields.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
- *
+ * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Character extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for double fields.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
- *
+ * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Double extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for float fields.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
- *
+ * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Float extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for int fields.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
- *
+ * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Integer extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for long fields.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
- *
+ * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Long extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for short fields.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
- *
+ * All the FieldAccessors are generated from <code>FieldAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class FieldAccessor_Short extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
- *
+ * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Boolean extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
- *
+ * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Character extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
- *
+ * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Double extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
- *
+ * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Float extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
- *
+ * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Integer extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
- *
+ * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Long extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,10 +29,12 @@
/**
* Template {@link Accessor} for boolean getter/setter.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
- *
+ * All the MethodAccessors are generated from <code>MethodAccessor_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*/
public class MethodAccessor_Short extends Accessor {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a double field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a float field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a long field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a short field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a boolean field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a double field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a float field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a long field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,10 +31,12 @@
/**
* Template {@link TransducedAccessor} for a short field.
- *
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
* <p>
- * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
- *
+ * All the TransducedAccessor_field are generated from <code>TransducedAccessor_field_B y t e</code>
+ * </p>
* @author Kohsuke Kawaguchi
*
* @see TransducedAccessor#get
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java Fri Sep 06 15:09:44 2013 -0700
@@ -94,11 +94,15 @@
@SuppressWarnings({"StringEquality"})
protected final void reportUnexpectedChildElement(TagName ea, boolean canRecover) throws SAXException {
- if(canRecover && !UnmarshallingContext.getInstance().parent.hasEventHandler())
+ if (canRecover) {
// this error happens particurly often (when input documents contain a lot of unexpected elements to be ignored),
// so don't bother computing all the messages and etc if we know that
// there's no event handler to receive the error in the end. See #286
- return;
+ UnmarshallingContext context = UnmarshallingContext.getInstance();
+ if (!context.parent.hasEventHandler() // is somebody listening?
+ || !context.shouldErrorBeReported()) // should we report error?
+ return;
+ }
if(ea.uri!=ea.uri.intern() || ea.local!=ea.local.intern())
reportError(Messages.UNINTERNED_STRINGS.format(), canRecover );
else
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java Fri Sep 06 15:09:44 2013 -0700
@@ -40,6 +40,7 @@
UNRECOGNIZED_TYPE_NAME_MAYBE, // 2 args
UNABLE_TO_CREATE_MAP, // 1 arg
UNINTERNED_STRINGS, // no args
+ ERRORS_LIMIT_EXCEEDED, // no arg
;
private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -50,3 +50,7 @@
UNINTERNED_STRINGS = \
Namespace URIs and local names to the unmarshaller needs to be interned.
+
+# user have to set Logger.getLogger("com.sun.xml.internal.bind").setLevel(Level.FINEST)
+ERRORS_LIMIT_EXCEEDED = \
+ Errors limit exceeded. To receive all errors set 'com.sun.xml.internal.bind' logger to FINEST level.
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -25,11 +25,14 @@
package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
+import com.sun.xml.internal.bind.Util;
import javax.xml.bind.JAXBException;
import javax.xml.bind.UnmarshallerHandler;
import com.sun.xml.internal.bind.WhiteSpaceProcessor;
import com.sun.xml.internal.bind.v2.runtime.ClassBeanInfoImpl;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -44,6 +47,8 @@
private LocatorEx loc;
+ private static final Logger logger = Util.getClassLogger();
+
/**
* SAX may fire consecutive characters event, but we don't allow it.
* so use this buffer to perform buffering.
@@ -56,6 +61,7 @@
private static final class TagNameImpl extends TagName {
String qname;
+ @Override
public String getQname() {
return qname;
}
@@ -76,6 +82,7 @@
this.loc = externalLocator;
}
+ @Override
public Object getResult() throws JAXBException, IllegalStateException {
return context.getResult();
}
@@ -84,6 +91,7 @@
return context;
}
+ @Override
public void setDocumentLocator(final Locator locator) {
if(loc!=null)
return; // we already have an external locator. ignore.
@@ -91,23 +99,43 @@
this.loc = new LocatorExWrapper(locator);
}
+ @Override
public void startDocument() throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.startDocument");
+ }
next.startDocument(loc,null);
}
+ @Override
public void endDocument() throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.endDocument");
+ }
next.endDocument();
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.startPrefixMapping: {0}:{1}", new Object[]{prefix, uri});
+ }
next.startPrefixMapping(prefix,uri);
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.endPrefixMapping: {0}", new Object[]{prefix});
+ }
next.endPrefixMapping(prefix);
}
+ @Override
public void startElement(String uri, String local, String qname, Attributes atts) throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.startElement: {0}:{1}:{2}, attrs: {3}", new Object[]{uri, local, qname, atts});
+ }
// work gracefully with misconfigured parsers that don't support namespaces
if( uri==null || uri.length()==0 )
uri="";
@@ -135,7 +163,11 @@
next.startElement(tagName);
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "SAXConnector.startElement: {0}:{1}:{2}", new Object[]{uri, localName, qName});
+ }
processText(false);
tagName.uri = uri;
tagName.local = localName;
@@ -144,19 +176,29 @@
}
+ @Override
public final void characters( char[] buf, int start, int len ) {
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "SAXConnector.characters: {0}", buf);
+ }
if( predictor.expectText() )
buffer.append(buf,start,len);
}
+ @Override
public final void ignorableWhitespace( char[] buf, int start, int len ) {
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "SAXConnector.characters{0}", buf);
+ }
characters(buf,start,len);
}
+ @Override
public void processingInstruction(String target, String data) {
// nop
}
+ @Override
public void skippedEntity(String name) {
// nop
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -35,6 +35,8 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.XMLConstants;
import javax.xml.bind.JAXBElement;
@@ -51,6 +53,7 @@
import com.sun.istack.internal.Nullable;
import com.sun.istack.internal.SAXParseException2;
import com.sun.xml.internal.bind.IDResolver;
+import com.sun.xml.internal.bind.Util;
import com.sun.xml.internal.bind.api.AccessorException;
import com.sun.xml.internal.bind.api.ClassResolver;
import com.sun.xml.internal.bind.unmarshaller.InfosetScanner;
@@ -59,6 +62,8 @@
import com.sun.xml.internal.bind.v2.runtime.Coordinator;
import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
@@ -76,6 +81,8 @@
public final class UnmarshallingContext extends Coordinator
implements NamespaceContext, ValidationEventHandler, ErrorHandler, XmlVisitor, XmlVisitor.TextPredictor {
+ private static final Logger logger = Logger.getLogger(UnmarshallingContext.class.getName());
+
/**
* Root state.
*/
@@ -177,6 +184,14 @@
public @Nullable ClassLoader classLoader;
/**
+ * The variable introduced to avoid reporting n^10 similar errors.
+ * After error is reported counter is decremented. When it became 0 - errors should not be reported any more.
+ *
+ * volatile is required to ensure that concurrent threads will see changed value
+ */
+ private static volatile int errorsCounter = 10;
+
+ /**
* State information for each element.
*/
public final class State {
@@ -260,21 +275,32 @@
return UnmarshallingContext.this;
}
+ @SuppressWarnings("LeakingThisInConstructor")
private State(State prev) {
this.prev = prev;
- if(prev!=null)
+ if (prev!=null) {
prev.next = this;
+ }
}
private void push() {
- if(next==null)
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "State.push");
+ }
+ if (next==null) {
+ assert current == this;
allocateMoreStates();
+ }
+ nil = false;
State n = next;
n.numNsDecl = nsLen;
current = n;
}
private void pop() {
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINEST, "State.pop");
+ }
assert prev!=null;
loader = null;
nil = false;
@@ -381,8 +407,9 @@
assert current.next==null;
State s = current;
- for( int i=0; i<8; i++ )
+ for (int i=0; i<8; i++) {
s = new State(s);
+ }
}
public void clearStates() {
@@ -436,6 +463,7 @@
}
}
+ @Override
public void startDocument(LocatorEx locator, NamespaceContext nsContext) throws SAXException {
if(locator!=null)
this.locator = locator;
@@ -449,8 +477,6 @@
isUnmarshalInProgress = true;
nsLen=0;
- setThreadAffinity();
-
if(expectedType!=null)
root.loader = EXPECTED_TYPE_ROOT_LOADER;
else
@@ -459,6 +485,7 @@
idResolver.startDocument(this);
}
+ @Override
public void startElement(TagName tagName) throws SAXException {
pushCoordinator();
try {
@@ -486,6 +513,7 @@
current.loader.startElement(current,tagName);
}
+ @Override
public void text(CharSequence pcdata) throws SAXException {
State cur = current;
pushCoordinator();
@@ -502,6 +530,7 @@
}
}
+ @Override
public final void endElement(TagName tagName) throws SAXException {
pushCoordinator();
try {
@@ -526,6 +555,7 @@
}
}
+ @Override
public void endDocument() throws SAXException {
runPatchers();
idResolver.endDocument();
@@ -537,14 +567,13 @@
// at the successful completion, scope must be all closed
assert root==current;
-
- resetThreadAffinity();
}
/**
* You should be always calling this through {@link TextPredictor}.
*/
@Deprecated
+ @Override
public boolean expectText() {
return current.loader.expectText;
}
@@ -553,10 +582,12 @@
* You should be always getting {@link TextPredictor} from {@link XmlVisitor}.
*/
@Deprecated
+ @Override
public TextPredictor getPredictor() {
return this;
}
+ @Override
public UnmarshallingContext getContext() {
return this;
}
@@ -650,6 +681,7 @@
event.getLinkedException() ) );
}
+ @Override
public boolean handleEvent(ValidationEvent event) {
try {
// if the handler says "abort", we will not return the object.
@@ -680,6 +712,7 @@
handleEvent(new ValidationEventImpl(ValidationEvent.ERROR,msg,locator.getLocation()));
}
+ @Override
protected ValidationEventLocator getLocation() {
return locator.getLocation();
}
@@ -801,6 +834,7 @@
private String[] nsBind = new String[16];
private int nsLen=0;
+ @Override
public void startPrefixMapping( String prefix, String uri ) {
if(nsBind.length==nsLen) {
// expand the buffer
@@ -811,6 +845,7 @@
nsBind[nsLen++] = prefix;
nsBind[nsLen++] = uri;
}
+ @Override
public void endPrefixMapping( String prefix ) {
nsLen-=2;
}
@@ -868,6 +903,7 @@
// NamespaceContext2 implementation
//
+ @Override
public Iterator<String> getPrefixes(String uri) {
// TODO: could be implemented much faster
// wrap it into unmodifiable list so that the remove method
@@ -899,6 +935,7 @@
return a;
}
+ @Override
public String getPrefix(String uri) {
if( uri==null )
throw new IllegalArgumentException();
@@ -919,6 +956,7 @@
return null;
}
+ @Override
public String getNamespaceURI(String prefix) {
if (prefix == null)
throw new IllegalArgumentException();
@@ -1059,6 +1097,7 @@
return getInstance().getJAXBContext().getValidRootNames();
}
+ @Override
public void receive(State state, Object o) {
if(state.backup!=null) {
((JAXBElement<Object>)state.backup).setValue(o);
@@ -1095,6 +1134,7 @@
state.loader = new XsiNilLoader(context.expectedType.getLoader(null,true));
}
+ @Override
public void receive(State state, Object o) {
JAXBElement e = (JAXBElement)state.target;
e.setValue(o);
@@ -1233,4 +1273,27 @@
return null;
}
+ /**
+ * Based on current {@link Logger} {@link Level} and errorCounter value determines if error should be reported.
+ *
+ * If the method called and return true it is expected that error will be reported. And that's why
+ * errorCounter is automatically decremented during the check.
+ *
+ * NOT THREAD SAFE!!! In case of heave concurrency access several additional errors could be reported. It's not expected to be the
+ * problem. Otherwise add synchronization here.
+ *
+ * @return true in case if {@link Level#FINEST} is set OR we haven't exceed errors reporting limit.
+ */
+ public boolean shouldErrorBeReported() throws SAXException {
+ if (logger.isLoggable(Level.FINEST))
+ return true;
+
+ if (errorsCounter >= 0) {
+ --errorsCounter;
+ if (errorsCounter == 0) // it's possible to miss this because of concurrency. If required add synchronization here
+ handleEvent(new ValidationEventImpl(ValidationEvent.WARNING, Messages.ERRORS_LIMIT_EXCEEDED.format(),
+ getLocator().getLocation(), null), true);
+ }
+ return errorsCounter >= 0;
+ }
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java Fri Sep 06 15:09:44 2013 -0700
@@ -92,12 +92,15 @@
return defaultBeanInfo;
beanInfo = context.getJAXBContext().getGlobalType(type);
- if(beanInfo==null) {
- String nearest = context.getJAXBContext().getNearestTypeName(type);
- if(nearest!=null)
- reportError(Messages.UNRECOGNIZED_TYPE_NAME_MAYBE.format(type,nearest),true);
- else
- reportError(Messages.UNRECOGNIZED_TYPE_NAME.format(type),true);
+ if(beanInfo==null) { // let's report an error
+ if (context.parent.hasEventHandler() // is somebody listening?
+ && context.shouldErrorBeReported()) { // should we report error?
+ String nearest = context.getJAXBContext().getNearestTypeName(type);
+ if(nearest!=null)
+ reportError(Messages.UNRECOGNIZED_TYPE_NAME_MAYBE.format(type,nearest),true);
+ else
+ reportError(Messages.UNRECOGNIZED_TYPE_NAME.format(type),true);
+ }
}
// TODO: resurrect the following check
// else
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface Annotated
extends TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("annotation")
public interface Annotation
extends TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("any")
public interface Any
extends Occurs, Wildcard, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("appinfo")
public interface Appinfo
extends TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface AttrDecls
extends TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface AttributeType
extends SimpleTypeHost, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("complexContent")
public interface ComplexContent
extends Annotated, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("extension")
public interface ComplexExtension
extends AttrDecls, ExtensionType, TypeDefParticle, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("restriction")
public interface ComplexRestriction
extends Annotated, AttrDecls, TypeDefParticle, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("complexType")
public interface ComplexType
extends Annotated, ComplexTypeModel, TypedXmlWriter
@@ -36,17 +41,17 @@
@XmlAttribute("final")
+ public ComplexType _final(String[] value);
+
+ @XmlAttribute("final")
public ComplexType _final(String value);
- @XmlAttribute("final")
- public ComplexType _final(String[] value);
+ @XmlAttribute
+ public ComplexType block(String[] value);
@XmlAttribute
public ComplexType block(String value);
- @XmlAttribute
- public ComplexType block(String[] value);
-
@XmlAttribute("abstract")
public ComplexType _abstract(boolean value);
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface ComplexTypeHost
extends TypeHost, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface ComplexTypeModel
extends AttrDecls, TypeDefParticle, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("documentation")
public interface Documentation
extends TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface Element
extends Annotated, ComplexTypeHost, FixedOrDefault, SimpleTypeHost, TypedXmlWriter
{
@@ -38,10 +43,10 @@
public Element type(QName value);
@XmlAttribute
- public Element block(String value);
+ public Element block(String[] value);
@XmlAttribute
- public Element block(String[] value);
+ public Element block(String value);
@XmlAttribute
public Element nillable(boolean value);
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,6 +27,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface ExplicitGroup
extends Annotated, NestedParticle, Occurs, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface ExtensionType
extends Annotated, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface FixedOrDefault
extends TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("import")
public interface Import
extends Annotated, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("list")
public interface List
extends Annotated, SimpleTypeHost, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("attribute")
public interface LocalAttribute
extends Annotated, AttributeType, FixedOrDefault, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("element")
public interface LocalElement
extends Element, Occurs, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface NestedParticle
extends TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface NoFixedFacet
extends Annotated, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface Occurs
extends TypedXmlWriter
{
@@ -37,9 +42,9 @@
public Occurs minOccurs(int value);
@XmlAttribute
- public Occurs maxOccurs(int value);
+ public Occurs maxOccurs(String value);
@XmlAttribute
- public Occurs maxOccurs(String value);
+ public Occurs maxOccurs(int value);
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,6 +27,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface Redefinable
extends ComplexTypeHost, SimpleTypeHost, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("schema")
public interface Schema
extends SchemaTop, TypedXmlWriter
@@ -57,18 +62,18 @@
public Schema attributeFormDefault(String value);
@XmlAttribute
+ public Schema blockDefault(String[] value);
+
+ @XmlAttribute
public Schema blockDefault(String value);
@XmlAttribute
- public Schema blockDefault(String[] value);
+ public Schema finalDefault(String[] value);
@XmlAttribute
public Schema finalDefault(String value);
@XmlAttribute
- public Schema finalDefault(String[] value);
-
- @XmlAttribute
public Schema version(String value);
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface SchemaTop
extends Redefinable, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("simpleContent")
public interface SimpleContent
extends Annotated, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface SimpleDerivation
extends TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("extension")
public interface SimpleExtension
extends AttrDecls, ExtensionType, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("restriction")
public interface SimpleRestriction
extends Annotated, AttrDecls, SimpleRestrictionModel, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface SimpleRestrictionModel
extends SimpleTypeHost, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("simpleType")
public interface SimpleType
extends Annotated, SimpleDerivation, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface SimpleTypeHost
extends TypeHost, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("attribute")
public interface TopLevelAttribute
extends Annotated, AttributeType, FixedOrDefault, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("element")
public interface TopLevelElement
extends Element, TypedXmlWriter
@@ -37,10 +42,10 @@
@XmlAttribute("final")
- public TopLevelElement _final(String value);
+ public TopLevelElement _final(String[] value);
@XmlAttribute("final")
- public TopLevelElement _final(String[] value);
+ public TopLevelElement _final(String value);
@XmlAttribute("abstract")
public TopLevelElement _abstract(boolean value);
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface TypeDefParticle
extends TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,6 +27,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface TypeHost
extends TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,11 @@
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
import com.sun.xml.internal.txw2.annotation.XmlElement;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
@XmlElement("union")
public interface Union
extends Annotated, SimpleTypeHost, TypedXmlWriter
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,11 @@
import com.sun.xml.internal.txw2.TypedXmlWriter;
import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+/**
+ * <p><b>
+ * Auto-generated, do not edit.
+ * </b></p>
+ */
public interface Wildcard
extends Annotated, TypedXmlWriter
{
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,8 +25,10 @@
package com.sun.xml.internal.bind.v2.util;
+import java.util.AbstractMap;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Arrays;
+import java.util.WeakHashMap;
/**
* Computes the string edit distance.
@@ -41,13 +43,29 @@
public class EditDistance {
/**
+ * Weak results cache to avoid additional computations.
+ * Because of high complexity caching is required.
+ */
+ private static final WeakHashMap<AbstractMap.SimpleEntry<String,String>, Integer> CACHE = new WeakHashMap<AbstractMap.SimpleEntry<String, String>, Integer>();
+
+ /**
* Computes the edit distance between two strings.
*
* <p>
* The complexity is O(nm) where n=a.length() and m=b.length().
*/
public static int editDistance( String a, String b ) {
- return new EditDistance(a,b).calc();
+ // let's check cache
+ AbstractMap.SimpleEntry<String,String> entry = new AbstractMap.SimpleEntry<String, String>(a, b); // using this class to avoid creation of my own which will handle PAIR of values
+ Integer result = null;
+ if (CACHE.containsKey(entry))
+ result = CACHE.get(entry); // looks like we have it
+
+ if (result == null) {
+ result = new EditDistance(a, b).calc();
+ CACHE.put(entry, result); // cache the result
+ }
+ return result;
}
/**
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * 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
@@ -38,6 +38,8 @@
import javax.xml.validation.SchemaFactory;
import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathFactoryConfigurationException;
+
+import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
@@ -49,6 +51,9 @@
*/
public class XmlFactory {
+ // not in older JDK, so must be duplicated here, otherwise javax.xml.XMLConstants should be used
+ public static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";
+
private static final Logger LOGGER = Logger.getLogger(XmlFactory.class.getName());
/**
@@ -186,4 +191,22 @@
}
}
+ public static SchemaFactory allowFileAccess(SchemaFactory sf, boolean disableSecureProcessing) {
+
+ // if feature secure processing enabled, nothing to do, file is allowed,
+ // or user is able to control access by standard JAXP mechanisms
+ if (disableSecureProcessing) {
+ return sf;
+ }
+
+ try {
+ sf.setProperty(ACCESS_EXTERNAL_SCHEMA, "file");
+ LOGGER.log(Level.FINE, Messages.JAXP_SUPPORTED_PROPERTY.format(ACCESS_EXTERNAL_SCHEMA));
+ } catch (SAXException ignored) {
+ // nothing to do; support depends on version JDK or SAX implementation
+ LOGGER.log(Level.CONFIG, Messages.JAXP_UNSUPPORTED_PROPERTY.format(ACCESS_EXTERNAL_SCHEMA), ignored);
+ }
+ return sf;
+ }
+
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -57,7 +57,7 @@
* @author David Brownell
* @author Janet Koenig
* @author Kohsuke KAWAGUCHI
- * @version $Id: DTDParser.java,v 1.2 2009-04-16 15:25:49 snajper Exp $
+ * @version $Id: DTDParser.java,v 1.2 2009/04/16 15:25:49 snajper Exp $
*/
public class DTDParser {
public final static String TYPE_CDATA = "CDATA";
@@ -215,25 +215,25 @@
*/
public void parse(String uri)
throws IOException, SAXException {
- InputSource inSource;
+ InputSource in;
init();
// System.out.println ("parse (\"" + uri + "\")");
- inSource = resolver.resolveEntity(null, uri);
+ in = resolver.resolveEntity(null, uri);
// If custom resolver punts resolution to parser, handle it ...
- if (inSource == null) {
- inSource = Resolver.createInputSource(new java.net.URL(uri), false);
+ if (in == null) {
+ in = Resolver.createInputSource(new java.net.URL(uri), false);
// ... or if custom resolver doesn't correctly construct the
// input entity, patch it up enough so relative URIs work, and
// issue a warning to minimize later confusion.
- } else if (inSource.getSystemId() == null) {
+ } else if (in.getSystemId() == null) {
warning("P-065", null);
- inSource.setSystemId(uri);
+ in.setSystemId(uri);
}
- parseInternal(inSource);
+ parseInternal(in);
}
// makes sure the parser is reset to "before a document"
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -86,7 +86,7 @@
//
/**
- * Constructs the reader from an input stream, auto-detecting
+ * Constructs the reader from an input stream, autodetecting
* the encoding to use according to the heuristic specified
* in the XML 1.0 recommendation.
*
@@ -104,7 +104,7 @@
*
* @param in the input stream from which the reader is constructed
* @param encoding the IETF standard name of the encoding to use;
- * if null, auto-detection is used.
+ * if null, autodetection is used.
* @throws IOException on error, including unrecognized encoding
*/
public static Reader createReader(InputStream in, String encoding)
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# 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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
package com.sun.xml.internal.stream.buffer;
+@SuppressWarnings("PointlessBitwiseExpression")
public abstract class AbstractCreatorProcessor {
/**
* Flag on a T_DOCUMENT to indicate if a fragment
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,19 +35,19 @@
*/
@SuppressWarnings({"PointlessArithmeticExpression"})
public final class AttributesHolder implements Attributes {
- protected static final int DEFAULT_CAPACITY = 8;
- protected static final int ITEM_SIZE = 1 << 3;
+ private static final int DEFAULT_CAPACITY = 8;
+ private static final int ITEM_SIZE = 1 << 3;
- protected static final int PREFIX = 0;
- protected static final int URI = 1;
- protected static final int LOCAL_NAME = 2;
- protected static final int QNAME = 3;
- protected static final int TYPE = 4;
- protected static final int VALUE = 5;
+ private static final int PREFIX = 0;
+ private static final int URI = 1;
+ private static final int LOCAL_NAME = 2;
+ private static final int QNAME = 3;
+ private static final int TYPE = 4;
+ private static final int VALUE = 5;
- protected int _attributeCount;
+ private int _attributeCount;
- protected String[] _strings;
+ private String[] _strings;
public AttributesHolder() {
_strings = new String[DEFAULT_CAPACITY * ITEM_SIZE];
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,10 @@
package com.sun.xml.internal.stream.buffer;
-class FragmentedArray<T> {
- protected T _item;
- protected FragmentedArray<T> _next;
- protected FragmentedArray<T> _previous;
+final class FragmentedArray<T> {
+ private T _item;
+ private FragmentedArray<T> _next;
+ private FragmentedArray<T> _previous;
FragmentedArray(T item) {
this(item, null);
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -215,7 +215,8 @@
CharSequence c = reader.getPCDATA();
if (c instanceof Base64Data) {
storeStructure(T_TEXT_AS_OBJECT);
- storeContentObject(((Base64Data)c).clone());
+ //Instead of clone the Base64Data, the original Base64Data instance is used here to preserve the DataHandler
+ storeContentObject(c);
} else {
storeContentCharacters(T_TEXT_AS_CHAR_ARRAY,
reader.getTextCharacters(), reader.getTextStart(),
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -932,7 +932,7 @@
write("<![CDATA[");
inCDATA = true;
} catch (IOException e) {
- new SAXException(e);
+ throw new SAXException(e);
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java Fri Sep 06 15:09:44 2013 -0700
@@ -1423,6 +1423,9 @@
if (getMtomRequest() != null && getMtomRequest() && getState().equals(State.ServerResponse)) {
return true;
}
+ if (getMtomRequest() != null && getMtomRequest() && getState().equals(State.ClientRequest)) {
+ return true;
+ }
}
}
return false;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,32 @@
+/*
+ * 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 com.sun.xml.internal.ws.api.message;
+
+import javax.xml.stream.XMLStreamReader;
+
+public interface StreamingSOAP {
+ public XMLStreamReader readEnvelope();
+}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -27,7 +27,6 @@
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -91,6 +90,7 @@
}
public <S> S getSPI(Class<S> spiType) {
+ if (components == null) return null;
for (Component c : components) {
S s = c.getSPI(spiType);
if (s != null)
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -46,7 +46,7 @@
* @since 2.2.7
*/
public class ThreadLocalContainerResolver extends ContainerResolver {
- private ThreadLocal<Container> containers = new ThreadLocal<Container>() {
+ private ThreadLocal<Container> containerThreadLocal = new ThreadLocal<Container>() {
@Override
protected Container initialValue() {
return Container.NONE;
@@ -54,7 +54,7 @@
};
public Container getContainer() {
- return containers.get();
+ return containerThreadLocal.get();
}
/**
@@ -63,8 +63,8 @@
* @return Previous container; must be remembered and passed to exitContainer
*/
public Container enterContainer(Container container) {
- Container old = containers.get();
- containers.set(container);
+ Container old = containerThreadLocal.get();
+ containerThreadLocal.set(container);
return old;
}
@@ -73,7 +73,7 @@
* @param old Container returned from enterContainer
*/
public void exitContainer(Container old) {
- containers.set(old);
+ containerThreadLocal.set(old);
}
/**
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -34,7 +34,12 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
@@ -42,6 +47,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import com.sun.xml.internal.ws.resources.StreamingMessages;
+
/**
* Factory for {@link XMLStreamReader}.
*
@@ -61,6 +68,8 @@
*/
private static volatile @NotNull XMLStreamReaderFactory theInstance;
+ private static final String CLASS_NAME_OF_WSTXINPUTFACTORY = "com.ctc.wstx.stax.WstxInputFactory";
+
static {
XMLInputFactory xif = getXMLInputFactory();
XMLStreamReaderFactory f=null;
@@ -73,7 +82,7 @@
if(f==null) {
// is this Woodstox?
- if (xif.getClass().getName().equals("com.ctc.wstx.stax.WstxInputFactory")) {
+ if (xif.getClass().getName().equals(CLASS_NAME_OF_WSTXINPUTFACTORY)) {
f = new Woodstox(xif);
}
}
@@ -83,7 +92,9 @@
}
theInstance = f;
- LOGGER.log(Level.FINE, "XMLStreamReaderFactory instance is = {0}", theInstance);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "XMLStreamReaderFactory instance is = {0}", theInstance);
+ }
}
private static XMLInputFactory getXMLInputFactory() {
@@ -92,7 +103,9 @@
try {
xif = (XMLInputFactory)Class.forName("com.ctc.wstx.stax.WstxInputFactory").newInstance();
} catch (Exception e) {
- // Ignore and fallback to default XMLInputFactory
+ if (LOGGER.isLoggable(Level.WARNING)) {
+ LOGGER.log(Level.WARNING, StreamingMessages.WOODSTOX_CANT_LOAD(CLASS_NAME_OF_WSTXINPUTFACTORY), e);
+ }
}
}
if (xif == null) {
@@ -101,10 +114,10 @@
xif.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
xif.setProperty(XMLInputFactory.IS_COALESCING, true);
+
return xif;
}
-
/**
* Overrides the singleton {@link XMLStreamReaderFactory} instance that
* the JAX-WS RI uses.
@@ -168,7 +181,7 @@
* it takes to recycle vs the possible performance gain by doing so.
*
* <p>
- * This method may be invked by multiple threads concurrently.
+ * This method may be invoked by multiple threads concurrently.
*
* @param r
* The {@link XMLStreamReader} instance that the caller finished using.
@@ -282,11 +295,13 @@
return sr;
}
+ @Override
public void doRecycle(XMLStreamReader r) {
if(zephyrClass.isInstance(r))
pool.set(r);
}
+ @Override
public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
try {
XMLStreamReader xsr = fetch();
@@ -307,6 +322,7 @@
}
}
+ @Override
public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
try {
XMLStreamReader xsr = fetch();
@@ -345,7 +361,7 @@
* {@link XMLInputFactory} is not required to be thread-safe, but
* if the create method on this implementation is synchronized,
* it may run into (see <a href="https://jax-ws.dev.java.net/issues/show_bug.cgi?id=555">
- * race condition</a>). Hence, using a XMLInputFactory per theread.
+ * race condition</a>). Hence, using a XMLInputFactory per thread.
*/
public static final class Default extends XMLStreamReaderFactory {
@@ -356,6 +372,7 @@
}
};
+ @Override
public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
try {
return xif.get().createXMLStreamReader(systemId,in);
@@ -364,6 +381,7 @@
}
}
+ @Override
public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
try {
return xif.get().createXMLStreamReader(systemId,in);
@@ -372,6 +390,7 @@
}
}
+ @Override
public void doRecycle(XMLStreamReader r) {
// there's no way to recycle with the default StAX API.
}
@@ -391,6 +410,7 @@
this.xif = xif;
}
+ @Override
public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
try {
return xif.createXMLStreamReader(systemId,in);
@@ -399,6 +419,7 @@
}
}
+ @Override
public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
try {
return xif.createXMLStreamReader(systemId,in);
@@ -407,33 +428,182 @@
}
}
+ @Override
public void doRecycle(XMLStreamReader r) {
// there's no way to recycle with the default StAX API.
}
}
/**
- * Handles Woodstox's XIF but set properties to do the string interning.
+ * Handles Woodstox's XIF, but sets properties to do the string interning, sets various limits, ...
* Woodstox {@link XMLInputFactory} is thread safe.
*/
public static final class Woodstox extends NoLock {
+
+ public final static String PROPERTY_MAX_ATTRIBUTES_PER_ELEMENT = "xml.ws.maximum.AttributesPerElement";
+ public final static String PROPERTY_MAX_ATTRIBUTE_SIZE = "xml.ws.maximum.AttributeSize";
+ public final static String PROPERTY_MAX_CHILDREN_PER_ELEMENT = "xml.ws.maximum.ChildrenPerElement";
+ public final static String PROPERTY_MAX_ELEMENT_COUNT = "xml.ws.maximum.ElementCount";
+ public final static String PROPERTY_MAX_ELEMENT_DEPTH = "xml.ws.maximum.ElementDepth";
+ public final static String PROPERTY_MAX_CHARACTERS = "xml.ws.maximum.Characters";
+
+ private static final int DEFAULT_MAX_ATTRIBUTES_PER_ELEMENT = 500;
+ private static final int DEFAULT_MAX_ATTRIBUTE_SIZE = 65536 * 8;
+ private static final int DEFAULT_MAX_CHILDREN_PER_ELEMENT = Integer.MAX_VALUE;
+ private static final int DEFAULT_MAX_ELEMENT_DEPTH = 500;
+ private static final long DEFAULT_MAX_ELEMENT_COUNT = Integer.MAX_VALUE;
+ private static final long DEFAULT_MAX_CHARACTERS = Long.MAX_VALUE;
+
+ /* Woodstox default setting:
+ int mMaxAttributesPerElement = 1000;
+ int mMaxAttributeSize = 65536 * 8;
+ int mMaxChildrenPerElement = Integer.MAX_VALUE;
+ int mMaxElementDepth = 1000;
+ long mMaxElementCount = Long.MAX_VALUE;
+ long mMaxCharacters = Long.MAX_VALUE;
+ */
+
+ private int maxAttributesPerElement = DEFAULT_MAX_ATTRIBUTES_PER_ELEMENT;
+ private int maxAttributeSize = DEFAULT_MAX_ATTRIBUTE_SIZE;
+ private int maxChildrenPerElement = DEFAULT_MAX_CHILDREN_PER_ELEMENT;
+ private int maxElementDepth = DEFAULT_MAX_ELEMENT_DEPTH;
+ private long maxElementCount = DEFAULT_MAX_ELEMENT_COUNT;
+ private long maxCharacters = DEFAULT_MAX_CHARACTERS;
+
+ // Note: this is a copy from com.ctc.wstx.api.WstxInputProperties, to be removed in the future
+ private static final java.lang.String P_MAX_ATTRIBUTES_PER_ELEMENT = "com.ctc.wstx.maxAttributesPerElement";
+ private static final java.lang.String P_MAX_ATTRIBUTE_SIZE = "com.ctc.wstx.maxAttributeSize";
+ private static final java.lang.String P_MAX_CHILDREN_PER_ELEMENT = "com.ctc.wstx.maxChildrenPerElement";
+ private static final java.lang.String P_MAX_ELEMENT_COUNT = "com.ctc.wstx.maxElementCount";
+ private static final java.lang.String P_MAX_ELEMENT_DEPTH = "com.ctc.wstx.maxElementDepth";
+ private static final java.lang.String P_MAX_CHARACTERS = "com.ctc.wstx.maxCharacters";
+ private static final java.lang.String P_INTERN_NSURIS = "org.codehaus.stax2.internNsUris";
+
public Woodstox(XMLInputFactory xif) {
super(xif);
- xif.setProperty("org.codehaus.stax2.internNsUris",true);
+
+ if (xif.isPropertySupported(P_INTERN_NSURIS)) {
+ xif.setProperty(P_INTERN_NSURIS, true);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, P_INTERN_NSURIS + " is {0}", true);
+ }
+ }
+
+ if (xif.isPropertySupported(P_MAX_ATTRIBUTES_PER_ELEMENT)) {
+ maxAttributesPerElement = Integer.valueOf(buildIntegerValue(
+ PROPERTY_MAX_ATTRIBUTES_PER_ELEMENT, DEFAULT_MAX_ATTRIBUTES_PER_ELEMENT)
+ );
+ xif.setProperty(P_MAX_ATTRIBUTES_PER_ELEMENT, maxAttributesPerElement);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, P_MAX_ATTRIBUTES_PER_ELEMENT + " is {0}", maxAttributesPerElement);
+ }
+ }
+
+ if (xif.isPropertySupported(P_MAX_ATTRIBUTE_SIZE)) {
+ maxAttributeSize = Integer.valueOf(buildIntegerValue(
+ PROPERTY_MAX_ATTRIBUTE_SIZE, DEFAULT_MAX_ATTRIBUTE_SIZE)
+ );
+ xif.setProperty(P_MAX_ATTRIBUTE_SIZE, maxAttributeSize);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, P_MAX_ATTRIBUTE_SIZE + " is {0}", maxAttributeSize);
+ }
+ }
+
+ if (xif.isPropertySupported(P_MAX_CHILDREN_PER_ELEMENT)) {
+ maxChildrenPerElement = Integer.valueOf(buildIntegerValue(
+ PROPERTY_MAX_CHILDREN_PER_ELEMENT, DEFAULT_MAX_CHILDREN_PER_ELEMENT)
+ );
+ xif.setProperty(P_MAX_CHILDREN_PER_ELEMENT, maxChildrenPerElement);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, P_MAX_CHILDREN_PER_ELEMENT + " is {0}", maxChildrenPerElement);
+ }
+ }
+
+ if (xif.isPropertySupported(P_MAX_ELEMENT_DEPTH)) {
+ maxElementDepth = Integer.valueOf(buildIntegerValue(
+ PROPERTY_MAX_ELEMENT_DEPTH, DEFAULT_MAX_ELEMENT_DEPTH)
+ );
+ xif.setProperty(P_MAX_ELEMENT_DEPTH, maxElementDepth);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, P_MAX_ELEMENT_DEPTH + " is {0}", maxElementDepth);
+ }
+ }
+
+ if (xif.isPropertySupported(P_MAX_ELEMENT_COUNT)) {
+ maxElementCount = Long.valueOf(buildLongValue(
+ PROPERTY_MAX_ELEMENT_COUNT, DEFAULT_MAX_ELEMENT_COUNT)
+ );
+ xif.setProperty(P_MAX_ELEMENT_COUNT, maxElementCount);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, P_MAX_ELEMENT_COUNT + " is {0}", maxElementCount);
+ }
+ }
+
+ if (xif.isPropertySupported(P_MAX_CHARACTERS)) {
+ maxCharacters = Long.valueOf(buildLongValue(
+ PROPERTY_MAX_CHARACTERS, DEFAULT_MAX_CHARACTERS)
+ );
+ xif.setProperty(P_MAX_CHARACTERS, maxCharacters);
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, P_MAX_CHARACTERS + " is {0}", maxCharacters);
+ }
+ }
}
+ @Override
public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
return super.doCreate(systemId, in, rejectDTDs);
}
+ @Override
public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
return super.doCreate(systemId, in, rejectDTDs);
}
}
+ private static int buildIntegerValue(String propertyName, int defaultValue) {
+ String propVal = System.getProperty(propertyName);
+ if (propVal != null && propVal.length() > 0) {
+ try {
+ Integer value = Integer.parseInt(propVal);
+ if (value > 0) {
+ // return with the value in System property
+ return value;
+ }
+ } catch (NumberFormatException nfe) {
+ if (LOGGER.isLoggable(Level.WARNING)) {
+ LOGGER.log(Level.WARNING, StreamingMessages.INVALID_PROPERTY_VALUE_INTEGER(propertyName, propVal, Integer.toString(defaultValue)), nfe);
+ }
+ }
+ }
+ // return with the default value
+ return defaultValue;
+ }
+
+ private static long buildLongValue(String propertyName, long defaultValue) {
+ String propVal = System.getProperty(propertyName);
+ if (propVal != null && propVal.length() > 0) {
+ try {
+ long value = Long.parseLong(propVal);
+ if (value > 0L) {
+ // return with the value in System property
+ return value;
+ }
+ } catch (NumberFormatException nfe) {
+ // defult will be returned
+ if (LOGGER.isLoggable(Level.WARNING)) {
+ LOGGER.log(Level.WARNING, StreamingMessages.INVALID_PROPERTY_VALUE_LONG(propertyName, propVal, Long.toString(defaultValue)), nfe);
+ }
+ }
+ }
+ // return with the default value
+ return defaultValue;
+ }
+
private static Boolean getProperty(final String prop) {
return AccessController.doPrivileged(
new java.security.PrivilegedAction<Boolean>() {
+ @Override
public Boolean run() {
String value = System.getProperty(prop);
return value != null ? Boolean.valueOf(value) : Boolean.FALSE;
@@ -441,4 +611,5 @@
}
);
}
+
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -42,7 +42,7 @@
* <p/>
* The JAX-WS WSDLGenerator uses TXW to serialize the WSDL out to XML.
* More information about TXW can be located at
- * <a href="http://txw.dev.java.net">http://txw.dev.java.net</a>.
+ * <a href="http://txw.java.net">http://txw.java.net</a>.
*/
public abstract class WSDLGeneratorExtension {
/**
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java Fri Sep 06 15:09:44 2013 -0700
@@ -81,10 +81,27 @@
}
return toString(packet.getMessage());
+ }
+ public static String toStringNoIndent(Packet packet) {
+ if (packet == null) {
+ return "[ Null packet ]";
+ } else if (packet.getMessage() == null) {
+ return "[ Empty packet ]";
+ }
+
+ return toStringNoIndent(packet.getMessage());
}
public static String toString(Message message) {
+ return toString(message, true);
+ }
+
+ public static String toStringNoIndent(Message message) {
+ return toString(message, false);
+ }
+
+ private static String toString(Message message, boolean createIndenter) {
if (message == null) {
return "[ Null message ]";
}
@@ -94,7 +111,9 @@
XMLStreamWriter writer = null;
try {
writer = xmlOutputFactory.createXMLStreamWriter(stringOut);
- writer = createIndenter(writer);
+ if (createIndenter) {
+ writer = createIndenter(writer);
+ }
message.copy().writeTo(writer);
} catch (Exception e) { // WSIT-1596 - Message Dumping should not affect other processing
LOGGER.log(Level.WARNING, "Unexpected exception occured while dumping message", e);
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java Fri Sep 06 15:09:44 2013 -0700
@@ -41,6 +41,7 @@
import com.sun.xml.internal.ws.message.MimeAttachmentSet;
import com.sun.xml.internal.ws.streaming.XMLStreamWriterUtil;
import com.sun.xml.internal.ws.util.ByteArrayDataSource;
+import com.sun.xml.internal.ws.util.xml.NamespaceContextExAdaper;
import com.sun.xml.internal.ws.util.xml.XMLStreamReaderFilter;
import com.sun.xml.internal.ws.util.xml.XMLStreamWriterFilter;
import com.sun.xml.internal.ws.streaming.MtomStreamWriter;
@@ -374,8 +375,11 @@
private void writeBinary(ByteArrayBuffer bab) {
try {
mtomAttachments.add(bab);
- writer.setPrefix("xop", XOP_NAMESPACEURI);
- writer.writeNamespace("xop", XOP_NAMESPACEURI);
+ String prefix = writer.getPrefix(XOP_NAMESPACEURI);
+ if (prefix == null || !prefix.equals("xop")) {
+ writer.setPrefix("xop", XOP_NAMESPACEURI);
+ writer.writeNamespace("xop", XOP_NAMESPACEURI);
+ }
writer.writeStartElement(XOP_NAMESPACEURI, XOP_LOCALNAME);
writer.writeAttribute("href", "cid:"+bab.contentId);
writer.writeEndElement();
@@ -513,8 +517,7 @@
@Override
public NamespaceContextEx getNamespaceContext() {
- NamespaceContext nsContext = reader.getNamespaceContext();
- return new MtomNamespaceContextEx(nsContext);
+ return new NamespaceContextExAdaper(reader.getNamespaceContext());
}
@Override
@@ -522,35 +525,6 @@
throw new UnsupportedOperationException();
}
- private static class MtomNamespaceContextEx implements NamespaceContextEx {
- private final NamespaceContext nsContext;
-
- public MtomNamespaceContextEx(NamespaceContext nsContext) {
- this.nsContext = nsContext;
- }
-
- @Override
- public Iterator<Binding> iterator() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getNamespaceURI(String prefix) {
- return nsContext.getNamespaceURI(prefix);
- }
-
- @Override
- public String getPrefix(String namespaceURI) {
- return nsContext.getPrefix(namespaceURI);
- }
-
- @Override
- public Iterator getPrefixes(String namespaceURI) {
- return nsContext.getPrefixes(namespaceURI);
- }
-
- }
-
@Override
public int getTextLength() {
if (xopReferencePresent) {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java Fri Sep 06 15:09:44 2013 -0700
@@ -44,12 +44,6 @@
* @author Paul.Sandoz@Sun.Com
*/
final class StreamSOAP11Codec extends StreamSOAPCodec {
- static final StreamHeaderDecoder SOAP11StreamHeaderDecoder = new StreamHeaderDecoder() {
- @Override
- public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark) {
- return new StreamHeader11(reader, mark);
- }
- };
public static final String SOAP11_MIME_TYPE = "text/xml";
public static final String DEFAULT_SOAP11_CONTENT_TYPE =
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java Fri Sep 06 15:09:44 2013 -0700
@@ -47,12 +47,6 @@
* @author Paul.Sandoz@Sun.Com
*/
final class StreamSOAP12Codec extends StreamSOAPCodec {
- static final StreamHeaderDecoder SOAP12StreamHeaderDecoder = new StreamHeaderDecoder() {
- @Override
- public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark) {
- return new StreamHeader12(reader, mark);
- }
- };
public static final String SOAP12_MIME_TYPE = "application/soap+xml";
public static final String DEFAULT_SOAP12_CONTENT_TYPE =
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java Fri Sep 06 15:09:44 2013 -0700
@@ -194,9 +194,7 @@
return decode(soapVersion, reader, attachmentSet);
}
- public static final Message decode(SOAPVersion soapVersion, XMLStreamReader reader,
- @NotNull AttachmentSet attachmentSet) {
-
+ public static final Message decode(SOAPVersion soapVersion, XMLStreamReader reader, @NotNull AttachmentSet attachmentSet) {
// Move to soap:Envelope and verify
if(reader.getEventType()!=XMLStreamConstants.START_ELEMENT)
XMLStreamReaderUtil.nextElementContent(reader);
@@ -205,61 +203,7 @@
throw new VersionMismatchException(soapVersion, soapVersion.nsUri, reader.getNamespaceURI());
}
XMLStreamReaderUtil.verifyTag(reader, soapVersion.nsUri, SOAP_ENVELOPE);
-
- TagInfoset envelopeTag = new TagInfoset(reader);
-
- // Collect namespaces on soap:Envelope
- Map<String,String> namespaces = new HashMap<String,String>();
- for(int i=0; i< reader.getNamespaceCount();i++){
- namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
- }
-
- // Move to next element
- XMLStreamReaderUtil.nextElementContent(reader);
- XMLStreamReaderUtil.verifyReaderState(reader,
- javax.xml.stream.XMLStreamConstants.START_ELEMENT);
-
- HeaderList headers = null;
- TagInfoset headerTag = null;
-
- if (reader.getLocalName().equals(SOAP_HEADER)
- && reader.getNamespaceURI().equals(soapVersion.nsUri)) {
- headerTag = new TagInfoset(reader);
-
- // Collect namespaces on soap:Header
- for(int i=0; i< reader.getNamespaceCount();i++){
- namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
- }
- // skip <soap:Header>
- XMLStreamReaderUtil.nextElementContent(reader);
-
- // If SOAP header blocks are present (i.e. not <soap:Header/>)
- if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
- headers = new HeaderList(soapVersion);
-
- try {
- // Cache SOAP header blocks
- StreamHeaderDecoder headerDecoder = SOAPVersion.SOAP_11.equals(soapVersion) ? StreamSOAP11Codec.SOAP11StreamHeaderDecoder : StreamSOAP12Codec.SOAP12StreamHeaderDecoder;
- cacheHeaders(reader, namespaces, headers, headerDecoder);
- } catch (XMLStreamException e) {
- // TODO need to throw more meaningful exception
- throw new WebServiceException(e);
- }
- }
-
- // Move to soap:Body
- XMLStreamReaderUtil.nextElementContent(reader);
- }
-
- // Verify that <soap:Body> is present
- XMLStreamReaderUtil.verifyTag(reader, soapVersion.nsUri, SOAP_BODY);
- TagInfoset bodyTag = new TagInfoset(reader);
-
- String bodyPrologue = XMLStreamReaderUtil.nextWhiteSpaceContent(reader);
- return new StreamMessage(envelopeTag,headerTag,attachmentSet,headers,bodyPrologue,bodyTag,null,reader,soapVersion);
- // when there's no payload,
- // it's tempting to use EmptyMessageImpl, but it doesn't preserve the infoset
- // of <envelope>,<header>, and <body>, so we need to stick to StreamMessage.
+ return new StreamMessage(soapVersion, reader, attachmentSet);
}
public void decode(ReadableByteChannel in, String contentType, Packet packet ) {
@@ -270,56 +214,6 @@
return this;
}
- private static XMLStreamBuffer cacheHeaders(XMLStreamReader reader,
- Map<String, String> namespaces, HeaderList headers,
- StreamHeaderDecoder headerDecoder) throws XMLStreamException {
- MutableXMLStreamBuffer buffer = createXMLStreamBuffer();
- StreamReaderBufferCreator creator = new StreamReaderBufferCreator();
- creator.setXMLStreamBuffer(buffer);
-
- // Reader is positioned at the first header block
- while(reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT) {
- Map<String,String> headerBlockNamespaces = namespaces;
-
- // Collect namespaces on SOAP header block
- if (reader.getNamespaceCount() > 0) {
- headerBlockNamespaces = new HashMap<String,String>(namespaces);
- for (int i = 0; i < reader.getNamespaceCount(); i++) {
- headerBlockNamespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
- }
- }
-
- // Mark
- XMLStreamBuffer mark = new XMLStreamBufferMark(headerBlockNamespaces, creator);
- // Create Header
- headers.add(headerDecoder.decodeHeader(reader, mark));
-
-
- // Cache the header block
- // After caching Reader will be positioned at next header block or
- // the end of the </soap:header>
- creator.createElementFragment(reader, false);
- if (reader.getEventType() != XMLStreamConstants.START_ELEMENT &&
- reader.getEventType() != XMLStreamConstants.END_ELEMENT) {
- XMLStreamReaderUtil.nextElementContent(reader);
- }
- }
-
- return buffer;
- }
-
- protected interface StreamHeaderDecoder {
- public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark);
- }
-
- private static MutableXMLStreamBuffer createXMLStreamBuffer() {
- // TODO: Decode should own one MutableXMLStreamBuffer for reuse
- // since it is more efficient. ISSUE: possible issue with
- // lifetime of information in the buffer if accessed beyond
- // the pipe line.
- return new MutableXMLStreamBuffer();
- }
-
public void decode(InputStream in, String contentType, Packet packet, AttachmentSet att ) throws IOException {
List<String> expectedContentTypes = getExpectedContentTypes();
if (contentType != null && !isContentTypeSupported(contentType,expectedContentTypes)) {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java Fri Sep 06 15:09:44 2013 -0700
@@ -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.xml.internal.ws.encoding;
+import java.util.List;
+
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -221,4 +223,35 @@
private static final String[] EMPTY_ARRAY = new String[0];
private static final AttributesImpl EMPTY_ATTRIBUTES = new AttributesImpl();
+
+ public String getNamespaceURI(String prefix) {
+ int size = ns.length/2;
+ for(int i=0; i<size; i++){
+ String p = ns[i*2 ];
+ String n = ns[i*2+1];
+ if (prefix.equals(p)) return n;
+ }
+ return null;
+ }
+
+ public String getPrefix(String namespaceURI) {
+ int size = ns.length/2;
+ for(int i=0; i<size; i++){
+ String p = ns[i*2 ];
+ String n = ns[i*2+1];
+ if (namespaceURI.equals(n)) return p;
+ }
+ return null;
+ }
+ //Who wants this?
+ public List<String> allPrefixes(String namespaceURI) {
+ int size = ns.length/2;
+ List<String> l = new java.util.ArrayList<String>();
+ for(int i=0; i<size; i++){
+ String p = ns[i*2 ];
+ String n = ns[i*2+1];
+ if (namespaceURI.equals(n)) l.add(p);
+ }
+ return l;
+ }
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,6 +25,7 @@
package com.sun.xml.internal.ws.message;
+import com.sun.istack.internal.NotNull;
import com.sun.xml.internal.bind.api.Bridge;
import com.sun.xml.internal.ws.api.SOAPVersion;
import com.sun.xml.internal.ws.api.message.Header;
@@ -33,8 +34,11 @@
import com.sun.xml.internal.ws.api.message.MessageWritable;
import com.sun.xml.internal.ws.api.message.Packet;
import com.sun.xml.internal.ws.api.message.saaj.SAAJFactory;
+import com.sun.xml.internal.ws.encoding.TagInfoset;
import com.sun.xml.internal.ws.message.saaj.SAAJMessage;
import com.sun.xml.internal.ws.spi.db.XMLBridge;
+import java.util.ArrayList;
+import java.util.Collections;
import org.xml.sax.ContentHandler;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
@@ -80,10 +84,34 @@
*/
protected final SOAPVersion soapVersion;
+ protected @NotNull TagInfoset envelopeTag;
+ protected @NotNull TagInfoset headerTag;
+ protected @NotNull TagInfoset bodyTag;
+
+ protected static final AttributesImpl EMPTY_ATTS;
+ protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
+ protected static final List<TagInfoset> DEFAULT_TAGS;
+
+ static void create(SOAPVersion v, List c) {
+ int base = v.ordinal()*3;
+ c.add(base, new TagInfoset(v.nsUri, "Envelope", "S", EMPTY_ATTS,"S", v.nsUri));
+ c.add(base+1, new TagInfoset(v.nsUri, "Header", "S", EMPTY_ATTS));
+ c.add(base+2, new TagInfoset(v.nsUri, "Body", "S", EMPTY_ATTS));
+ }
+
+ static {
+ EMPTY_ATTS = new AttributesImpl();
+ List<TagInfoset> tagList = new ArrayList<TagInfoset>();
+ create(SOAPVersion.SOAP_11, tagList);
+ create(SOAPVersion.SOAP_12, tagList);
+ DEFAULT_TAGS = Collections.unmodifiableList(tagList);
+ }
+
protected AbstractMessageImpl(SOAPVersion soapVersion) {
this.soapVersion = soapVersion;
}
+ @Override
public SOAPVersion getSOAPVersion() {
return soapVersion;
}
@@ -94,10 +122,12 @@
this.soapVersion = that.soapVersion;
}
+ @Override
public Source readEnvelopeAsSource() {
return new SAXSource(new XMLReaderImpl(this), XMLReaderImpl.THE_SOURCE);
}
+ @Override
public <T> T readPayloadAsJAXB(Unmarshaller unmarshaller) throws JAXBException {
if(hasAttachments())
unmarshaller.setAttachmentUnmarshaller(new AttachmentUnmarshallerImpl(getAttachments()));
@@ -108,11 +138,13 @@
}
}
/** @deprecated */
+ @Override
public <T> T readPayloadAsJAXB(Bridge<T> bridge) throws JAXBException {
return bridge.unmarshal(readPayloadAsSource(),
hasAttachments()? new AttachmentUnmarshallerImpl(getAttachments()) : null );
}
+ @Override
public <T> T readPayloadAsJAXB(XMLBridge<T> bridge) throws JAXBException {
return bridge.unmarshal(readPayloadAsSource(),
hasAttachments()? new AttachmentUnmarshallerImpl(getAttachments()) : null );
@@ -121,6 +153,7 @@
/**
* Default implementation that relies on {@link #writePayloadTo(XMLStreamWriter)}
*/
+ @Override
public void writeTo(XMLStreamWriter w) throws XMLStreamException {
String soapNsUri = soapVersion.nsUri;
w.writeStartDocument();
@@ -147,6 +180,7 @@
/**
* Writes the whole envelope as SAX events.
*/
+ @Override
public void writeTo( ContentHandler contentHandler, ErrorHandler errorHandler ) throws SAXException {
String soapNsUri = soapVersion.nsUri;
@@ -191,13 +225,12 @@
/**
* Default implementation that uses {@link #writeTo(ContentHandler, ErrorHandler)}
*/
+ @Override
public SOAPMessage readAsSOAPMessage() throws SOAPException {
return SAAJFactory.read(soapVersion, this);
}
- /**
- *
- */
+ @Override
public SOAPMessage readAsSOAPMessage(Packet packet, boolean inbound) throws SOAPException {
SOAPMessage msg = SAAJFactory.read(soapVersion, this, packet);
transportHeaders(packet, inbound, msg);
@@ -211,7 +244,4 @@
}
if (msg.saveRequired()) msg.saveChanges();
}
-
- protected static final AttributesImpl EMPTY_ATTS = new AttributesImpl();
- protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java Fri Sep 06 15:09:44 2013 -0700
@@ -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,6 +28,7 @@
import com.sun.istack.internal.NotNull;
import com.sun.istack.internal.XMLStreamException2;
import com.sun.xml.internal.bind.api.Bridge;
+import com.sun.xml.internal.stream.buffer.MutableXMLStreamBuffer;
import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
import com.sun.xml.internal.stream.buffer.XMLStreamBufferResult;
import com.sun.xml.internal.ws.api.message.Header;
@@ -142,16 +143,12 @@
}
public XMLStreamReader readHeader() throws XMLStreamException {
- try {
- if(infoset==null) {
- XMLStreamBufferResult sbr = new XMLStreamBufferResult();
- bridge.marshal(jaxbObject,sbr);
- infoset = sbr.getXMLStreamBuffer();
- }
- return infoset.readAsXMLStreamReader();
- } catch (JAXBException e) {
- throw new XMLStreamException2(e);
+ if(infoset==null) {
+ MutableXMLStreamBuffer buffer = new MutableXMLStreamBuffer();
+ writeTo(buffer.createFromXMLStreamWriter());
+ infoset = buffer;
}
+ return infoset.readAsXMLStreamReader();
}
public <T> T readAsJAXB(Unmarshaller unmarshaller) throws JAXBException {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,9 +31,11 @@
import com.sun.xml.internal.stream.buffer.XMLStreamBufferResult;
import com.sun.xml.internal.ws.api.SOAPVersion;
import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Header;
import com.sun.xml.internal.ws.api.message.HeaderList;
import com.sun.xml.internal.ws.api.message.Message;
import com.sun.xml.internal.ws.api.message.MessageHeaders;
+import com.sun.xml.internal.ws.api.message.StreamingSOAP;
import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
import com.sun.xml.internal.ws.message.AbstractMessageImpl;
import com.sun.xml.internal.ws.message.AttachmentSetImpl;
@@ -45,6 +47,9 @@
import com.sun.xml.internal.ws.streaming.XMLStreamWriterUtil;
import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
import com.sun.xml.internal.ws.streaming.MtomStreamWriter;
+import com.sun.xml.internal.ws.util.xml.XMLReaderComposite;
+import com.sun.xml.internal.ws.util.xml.XMLReaderComposite.ElemInfo;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
@@ -65,13 +70,14 @@
import javax.xml.transform.Source;
import javax.xml.ws.WebServiceException;
import java.io.OutputStream;
+import java.util.List;
/**
* {@link Message} backed by a JAXB bean.
*
* @author Kohsuke Kawaguchi
*/
-public final class JAXBMessage extends AbstractMessageImpl {
+public final class JAXBMessage extends AbstractMessageImpl implements StreamingSOAP {
private MessageHeaders headers;
/**
@@ -319,14 +325,17 @@
public XMLStreamReader readPayload() throws XMLStreamException {
try {
if(infoset==null) {
- XMLStreamBufferResult sbr = new XMLStreamBufferResult();
if (rawContext != null) {
+ XMLStreamBufferResult sbr = new XMLStreamBufferResult();
Marshaller m = rawContext.createMarshaller();
m.setProperty("jaxb.fragment", Boolean.TRUE);
m.marshal(jaxbObject, sbr);
- } else
- bridge.marshal(jaxbObject, sbr);
- infoset = sbr.getXMLStreamBuffer();
+ infoset = sbr.getXMLStreamBuffer();
+ } else {
+ MutableXMLStreamBuffer buffer = new MutableXMLStreamBuffer();
+ writePayloadTo(buffer.createFromXMLStreamWriter());
+ infoset = buffer;
+ }
}
XMLStreamReader reader = infoset.readAsXMLStreamReader();
if(reader.getEventType()== START_DOCUMENT)
@@ -376,21 +385,22 @@
// Get output stream and use JAXB UTF-8 writer
OutputStream os = bridge.supportOutputStream() ? XMLStreamWriterUtil.getOutputStream(sw) : null;
- if (rawContext != null) {
- Marshaller m = rawContext.createMarshaller();
- m.setProperty("jaxb.fragment", Boolean.TRUE);
- m.setAttachmentMarshaller(am);
- if (os != null)
- m.marshal(jaxbObject, os);
- else
- m.marshal(jaxbObject, sw);
- } else {
- if (os != null && encoding != null && encoding.equalsIgnoreCase(SOAPBindingCodec.UTF8_ENCODING)) {
- bridge.marshal(jaxbObject, os, sw.getNamespaceContext(), am);
- } else {
- bridge.marshal(jaxbObject, sw, am);
- }
- }
+ if (rawContext != null) {
+ Marshaller m = rawContext.createMarshaller();
+ m.setProperty("jaxb.fragment", Boolean.TRUE);
+ m.setAttachmentMarshaller(am);
+ if (os != null) {
+ m.marshal(jaxbObject, os);
+ } else {
+ m.marshal(jaxbObject, sw);
+ }
+ } else {
+ if (os != null && encoding != null && encoding.equalsIgnoreCase(SOAPBindingCodec.UTF8_ENCODING)) {
+ bridge.marshal(jaxbObject, os, sw.getNamespaceContext(), am);
+ } else {
+ bridge.marshal(jaxbObject, sw, am);
+ }
+ }
//cleanup() is not needed since JAXB doesn't keep ref to AttachmentMarshaller
//am.cleanup();
} catch (JAXBException e) {
@@ -404,4 +414,33 @@
return new JAXBMessage(this);
}
+ public XMLStreamReader readEnvelope() {
+ int base = soapVersion.ordinal()*3;
+ this.envelopeTag = DEFAULT_TAGS.get(base);
+ this.bodyTag = DEFAULT_TAGS.get(base+2);
+ List<XMLStreamReader> hReaders = new java.util.ArrayList<XMLStreamReader>();
+ ElemInfo envElem = new ElemInfo(envelopeTag, null);
+ ElemInfo bdyElem = new ElemInfo(bodyTag, envElem);
+ for (Header h : getHeaders().asList()) {
+ try {
+ hReaders.add(h.readHeader());
+ } catch (XMLStreamException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ XMLStreamReader soapHeader = null;
+ if(hReaders.size()>0) {
+ headerTag = DEFAULT_TAGS.get(base+1);
+ ElemInfo hdrElem = new ElemInfo(headerTag, envElem);
+ soapHeader = new XMLReaderComposite(hdrElem, hReaders.toArray(new XMLStreamReader[hReaders.size()]));
+ }
+ try {
+ XMLStreamReader payload= readPayload();
+ XMLStreamReader soapBody = new XMLReaderComposite(bdyElem, new XMLStreamReader[]{payload});
+ XMLStreamReader[] soapContent = (soapHeader != null) ? new XMLStreamReader[]{soapHeader, soapBody} : new XMLStreamReader[]{soapBody};
+ return new XMLReaderComposite(envElem, soapContent);
+ } catch (XMLStreamException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java Fri Sep 06 15:09:44 2013 -0700
@@ -175,7 +175,7 @@
*/
@Override
public @NotNull AttachmentSet getAttachments() {
- parse();
+ if (attachmentSet == null) attachmentSet = new SAAJAttachmentSet(sm);
return attachmentSet;
}
@@ -185,23 +185,21 @@
*/
@Override
protected boolean hasAttachments() {
- parse();
- return attachmentSet!=null;
+ return !getAttachments().isEmpty();
}
public @Nullable String getPayloadLocalPart() {
- access();
+ soapBodyFirstChild();
return payloadLocalName;
}
public String getPayloadNamespaceURI() {
- access();
+ soapBodyFirstChild();
return payloadNamespace;
}
public boolean hasPayload() {
- access();
- return payloadNamespace != null;
+ return soapBodyFirstChild() != null;
}
private void addAttributes(Element e, NamedNodeMap attrs) {
@@ -327,15 +325,7 @@
}
public XMLStreamReader readPayload() throws XMLStreamException {
- access();
- if (payload != null) {
- DOMStreamReader dss = new DOMStreamReader();
- dss.setCurrentNode(payload);
- dss.nextTag();
- assert dss.getEventType() == XMLStreamReader.START_ELEMENT;
- return dss;
- }
- return null;
+ return soapBodyFirstChildReader();
}
public void writePayloadTo(XMLStreamWriter sw) throws XMLStreamException {
@@ -522,7 +512,7 @@
private static final AttributesImpl EMPTY_ATTS = new AttributesImpl();
private static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
- private static class SAAJAttachment implements AttachmentEx {
+ protected static class SAAJAttachment implements AttachmentEx {
final AttachmentPart ap;
@@ -651,7 +641,7 @@
* SAAJ wants '<' and '>' for the content ID, but {@link AttachmentSet}
* doesn't. S this class also does the conversion between them.
*/
- private static class SAAJAttachmentSet implements AttachmentSet {
+ protected static class SAAJAttachmentSet implements AttachmentSet {
private Map<String, Attachment> attMap;
private Iterator attIter;
@@ -715,4 +705,74 @@
public SOAPVersion getSOAPVersion() {
return soapVersion;
}
+
+ private XMLStreamReader soapBodyFirstChildReader;
+
+ /**
+ * This allow the subclass to retain the XMLStreamReader.
+ */
+ protected XMLStreamReader getXMLStreamReader(SOAPElement soapElement) {
+ return null;
+ }
+
+ protected XMLStreamReader createXMLStreamReader(SOAPElement soapElement) {
+ DOMStreamReader dss = new DOMStreamReader();
+ dss.setCurrentNode(soapElement);
+ return dss;
+ }
+
+ protected XMLStreamReader soapBodyFirstChildReader() {
+ if (soapBodyFirstChildReader != null) return soapBodyFirstChildReader;
+ soapBodyFirstChild();
+ if (soapBodyFirstChild != null) {
+ soapBodyFirstChildReader = getXMLStreamReader(soapBodyFirstChild);
+ if (soapBodyFirstChildReader == null) soapBodyFirstChildReader =
+ createXMLStreamReader(soapBodyFirstChild);
+ if (soapBodyFirstChildReader.getEventType() == XMLStreamReader.START_DOCUMENT) {
+ try {
+ while(soapBodyFirstChildReader.getEventType() != XMLStreamReader.START_ELEMENT)
+ soapBodyFirstChildReader.next();
+ } catch (XMLStreamException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return soapBodyFirstChildReader;
+ } else {
+ payloadLocalName = null;
+ payloadNamespace = null;
+ return null;
+ }
+ }
+
+ private SOAPElement soapBodyFirstChild;
+
+ SOAPElement soapBodyFirstChild() {
+ if (soapBodyFirstChild != null) return soapBodyFirstChild;
+ try {
+ boolean foundElement = false;
+ for (Node n = sm.getSOAPBody().getFirstChild(); n != null && !foundElement; n = n.getNextSibling()) {
+ if (n.getNodeType() == Node.ELEMENT_NODE) {
+ foundElement = true;
+ if (n instanceof SOAPElement) {
+ soapBodyFirstChild = (SOAPElement) n;
+ payloadLocalName = soapBodyFirstChild.getLocalName();
+ payloadNamespace = soapBodyFirstChild.getNamespaceURI();
+ return soapBodyFirstChild;
+ }
+ }
+ }
+ if(foundElement) for(Iterator i = sm.getSOAPBody().getChildElements(); i.hasNext();){
+ Object o = i.next();
+ if (o instanceof SOAPElement) {
+ soapBodyFirstChild = (SOAPElement)o;
+ payloadLocalName = soapBodyFirstChild.getLocalName();
+ payloadNamespace = soapBodyFirstChild.getNamespaceURI();
+ return soapBodyFirstChild;
+ }
+ }
+ } catch (SOAPException e) {
+ throw new RuntimeException(e);
+ }
+ return soapBodyFirstChild;
+ }
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,8 @@
import com.sun.istack.internal.XMLStreamReaderToContentHandler;
import com.sun.xml.internal.bind.api.Bridge;
import com.sun.xml.internal.stream.buffer.MutableXMLStreamBuffer;
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.stream.buffer.XMLStreamBufferMark;
import com.sun.xml.internal.stream.buffer.stax.StreamReaderBufferCreator;
import com.sun.xml.internal.ws.api.SOAPVersion;
import com.sun.xml.internal.ws.api.message.AttachmentSet;
@@ -37,15 +39,20 @@
import com.sun.xml.internal.ws.api.message.HeaderList;
import com.sun.xml.internal.ws.api.message.Message;
import com.sun.xml.internal.ws.api.message.MessageHeaders;
+import com.sun.xml.internal.ws.api.message.StreamingSOAP;
import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
import com.sun.xml.internal.ws.encoding.TagInfoset;
import com.sun.xml.internal.ws.message.AbstractMessageImpl;
import com.sun.xml.internal.ws.message.AttachmentUnmarshallerImpl;
+import com.sun.xml.internal.ws.protocol.soap.VersionMismatchException;
import com.sun.xml.internal.ws.spi.db.XMLBridge;
import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
import com.sun.xml.internal.ws.util.xml.DummyLocation;
import com.sun.xml.internal.ws.util.xml.StAXSource;
+import com.sun.xml.internal.ws.util.xml.XMLReaderComposite;
import com.sun.xml.internal.ws.util.xml.XMLStreamReaderToXMLStreamWriter;
+import com.sun.xml.internal.ws.util.xml.XMLReaderComposite.ElemInfo;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
@@ -55,6 +62,7 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.stream.*;
+
import static javax.xml.stream.XMLStreamConstants.START_DOCUMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
@@ -62,7 +70,9 @@
import javax.xml.ws.WebServiceException;
import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* {@link Message} implementation backed by {@link XMLStreamReader}.
@@ -70,7 +80,7 @@
* TODO: we need another message class that keeps {@link XMLStreamReader} that points
* at the start of the envelope element.
*/
-public class StreamMessage extends AbstractMessageImpl {
+public class StreamMessage extends AbstractMessageImpl implements StreamingSOAP {
/**
* The reader will be positioned at
* the first child of the SOAP body
@@ -93,44 +103,51 @@
*/
private String bodyEpilogue = null;
- private final String payloadLocalName;
-
- private final String payloadNamespaceURI;
+ private String payloadLocalName;
- /**
- * infoset about the SOAP envelope, header, and body.
- *
- * <p>
- * If the creater of this object didn't care about those,
- * we use stock values.
- */
- private @NotNull TagInfoset envelopeTag;
- private @NotNull TagInfoset headerTag;
- private @NotNull TagInfoset bodyTag;
+ private String payloadNamespaceURI;
/**
* Used only for debugging. This records where the message was consumed.
*/
private Throwable consumedAt;
- /**
- * Default s:Envelope, s:Header, and s:Body tag infoset definitions.
- *
- * We need 3 for SOAP 1.1, 3 for SOAP 1.2.
- */
- private static final TagInfoset[] DEFAULT_TAGS;
-
- static {
- DEFAULT_TAGS = new TagInfoset[6];
- create(SOAPVersion.SOAP_11);
- create(SOAPVersion.SOAP_12);
- }
+ private XMLStreamReader envelopeReader;
public StreamMessage(SOAPVersion v) {
super(v);
payloadLocalName = null;
payloadNamespaceURI = null;
}
+
+ public StreamMessage(SOAPVersion v, @NotNull XMLStreamReader envelope, @NotNull AttachmentSet attachments) {
+ super(v);
+ envelopeReader = envelope;
+ attachmentSet = attachments;
+ }
+
+ public XMLStreamReader readEnvelope() {
+ if (envelopeReader == null) {
+ List<XMLStreamReader> hReaders = new java.util.ArrayList<XMLStreamReader>();
+ ElemInfo envElem = new ElemInfo(envelopeTag, null);
+ ElemInfo hdrElem = (headerTag != null) ? new ElemInfo(headerTag, envElem) : null;
+ ElemInfo bdyElem = new ElemInfo(bodyTag, envElem);
+ for (Header h : getHeaders().asList()) {
+ try {
+ hReaders.add(h.readHeader());
+ } catch (XMLStreamException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ XMLStreamReader soapHeader = (hdrElem != null) ? new XMLReaderComposite(hdrElem, hReaders.toArray(new XMLStreamReader[hReaders.size()])) : null;
+ XMLStreamReader[] payload = {readPayload()};
+ XMLStreamReader soapBody = new XMLReaderComposite(bdyElem, payload);
+ XMLStreamReader[] soapContent = (soapHeader != null) ? new XMLStreamReader[]{soapHeader, soapBody} : new XMLStreamReader[]{soapBody};
+ return new XMLReaderComposite(envElem, soapContent);
+ }
+ return envelopeReader;
+ }
+
/**
* Creates a {@link StreamMessage} from a {@link XMLStreamReader}
* that points at the start element of the payload, and headers.
@@ -147,6 +164,10 @@
*/
public StreamMessage(@Nullable MessageHeaders headers, @NotNull AttachmentSet attachmentSet, @NotNull XMLStreamReader reader, @NotNull SOAPVersion soapVersion) {
super(soapVersion);
+ init(headers, attachmentSet, reader, soapVersion);
+ }
+
+ private void init(@Nullable MessageHeaders headers, @NotNull AttachmentSet attachmentSet, @NotNull XMLStreamReader reader, @NotNull SOAPVersion soapVersion) {
this.headers = headers;
this.attachmentSet = attachmentSet;
this.reader = reader;
@@ -175,9 +196,9 @@
// use the default infoset representation for headers
int base = soapVersion.ordinal()*3;
- this.envelopeTag = DEFAULT_TAGS[base];
- this.headerTag = DEFAULT_TAGS[base+1];
- this.bodyTag = DEFAULT_TAGS[base+2];
+ this.envelopeTag = DEFAULT_TAGS.get(base);
+ this.headerTag = DEFAULT_TAGS.get(base+1);
+ this.bodyTag = DEFAULT_TAGS.get(base+2);
}
/**
@@ -197,7 +218,12 @@
}
public StreamMessage(@NotNull TagInfoset envelopeTag, @Nullable TagInfoset headerTag, @NotNull AttachmentSet attachmentSet, @Nullable MessageHeaders headers, @Nullable String bodyPrologue, @NotNull TagInfoset bodyTag, @Nullable String bodyEpilogue, @NotNull XMLStreamReader reader, @NotNull SOAPVersion soapVersion) {
- this(headers,attachmentSet,reader,soapVersion);
+ super(soapVersion);
+ init(envelopeTag, headerTag, attachmentSet, headers, bodyPrologue, bodyTag, bodyEpilogue, reader, soapVersion);
+ }
+
+ private void init(@NotNull TagInfoset envelopeTag, @Nullable TagInfoset headerTag, @NotNull AttachmentSet attachmentSet, @Nullable MessageHeaders headers, @Nullable String bodyPrologue, @NotNull TagInfoset bodyTag, @Nullable String bodyEpilogue, @NotNull XMLStreamReader reader, @NotNull SOAPVersion soapVersion) {
+ init(headers,attachmentSet,reader,soapVersion);
if(envelopeTag == null ) {
throw new IllegalArgumentException("EnvelopeTag TagInfoset cannot be null");
}
@@ -212,10 +238,12 @@
}
public boolean hasHeaders() {
+ if ( envelopeReader != null ) readEnvelope(this);
return headers!=null && headers.hasHeaders();
}
public MessageHeaders getHeaders() {
+ if ( envelopeReader != null ) readEnvelope(this);
if (headers == null) {
headers = new HeaderList(getSOAPVersion());
}
@@ -223,14 +251,17 @@
}
public String getPayloadLocalPart() {
+ if ( envelopeReader != null ) readEnvelope(this);
return payloadLocalName;
}
public String getPayloadNamespaceURI() {
+ if ( envelopeReader != null ) readEnvelope(this);
return payloadNamespaceURI;
}
public boolean hasPayload() {
+ if ( envelopeReader != null ) readEnvelope(this);
return payloadLocalName!=null;
}
@@ -329,6 +360,7 @@
}
public void writePayloadTo(XMLStreamWriter writer)throws XMLStreamException {
+ if ( envelopeReader != null ) readEnvelope(this);
assert unconsumed();
if(payloadLocalName==null) {
@@ -379,6 +411,7 @@
}
public void writeTo(XMLStreamWriter sw) throws XMLStreamException{
+ if ( envelopeReader != null ) readEnvelope(this);
writeEnvelope(sw);
}
@@ -387,6 +420,7 @@
* @param writer
*/
private void writeEnvelope(XMLStreamWriter writer) throws XMLStreamException {
+ if ( envelopeReader != null ) readEnvelope(this);
writer.writeStartDocument();
envelopeTag.writeStart(writer);
@@ -411,6 +445,7 @@
}
public void writePayloadTo(ContentHandler contentHandler, ErrorHandler errorHandler, boolean fragment) throws SAXException {
+ if ( envelopeReader != null ) readEnvelope(this);
assert unconsumed();
try {
@@ -465,8 +500,10 @@
}
}
- // TODO: this method should be probably rewritten to respect spaces between eelements; is it used at all?
+ // TODO: this method should be probably rewritten to respect spaces between elements; is it used at all?
+ @Override
public Message copy() {
+ if ( envelopeReader != null ) readEnvelope(this);
try {
assert unconsumed();
consumedAt = null; // but we don't want to mark it as consumed
@@ -528,6 +565,7 @@
}
public void writeTo(ContentHandler contentHandler, ErrorHandler errorHandler ) throws SAXException {
+ if ( envelopeReader != null ) readEnvelope(this);
contentHandler.setDocumentLocator(NULL_LOCATOR);
contentHandler.startDocument();
envelopeTag.writeStart(contentHandler);
@@ -570,23 +608,159 @@
return true;
}
- private static void create(SOAPVersion v) {
- int base = v.ordinal()*3;
- DEFAULT_TAGS[base ] = new TagInfoset(v.nsUri,"Envelope","S",EMPTY_ATTS,"S",v.nsUri);
- DEFAULT_TAGS[base+1] = new TagInfoset(v.nsUri,"Header","S",EMPTY_ATTS);
- DEFAULT_TAGS[base+2] = new TagInfoset(v.nsUri,"Body","S",EMPTY_ATTS);
- }
-
public String getBodyPrologue() {
+ if ( envelopeReader != null ) readEnvelope(this);
return bodyPrologue;
}
public String getBodyEpilogue() {
+ if ( envelopeReader != null ) readEnvelope(this);
return bodyEpilogue;
}
public XMLStreamReader getReader() {
+ if ( envelopeReader != null ) readEnvelope(this);
assert unconsumed();
return reader;
}
+
+
+ private static final String SOAP_ENVELOPE = "Envelope";
+ private static final String SOAP_HEADER = "Header";
+ private static final String SOAP_BODY = "Body";
+
+ protected interface StreamHeaderDecoder {
+ public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark);
+ }
+
+ static final StreamHeaderDecoder SOAP12StreamHeaderDecoder = new StreamHeaderDecoder() {
+ @Override
+ public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark) {
+ return new StreamHeader12(reader, mark);
+ }
+ };
+
+ static final StreamHeaderDecoder SOAP11StreamHeaderDecoder = new StreamHeaderDecoder() {
+ @Override
+ public Header decodeHeader(XMLStreamReader reader, XMLStreamBuffer mark) {
+ return new StreamHeader11(reader, mark);
+ }
+ };
+
+ static private void readEnvelope(StreamMessage message) {
+ if ( message.envelopeReader == null ) return;
+ XMLStreamReader reader = message.envelopeReader;
+ message.envelopeReader = null;
+ SOAPVersion soapVersion = message.soapVersion;
+ // Move to soap:Envelope and verify
+ if(reader.getEventType()!=XMLStreamConstants.START_ELEMENT)
+ XMLStreamReaderUtil.nextElementContent(reader);
+ XMLStreamReaderUtil.verifyReaderState(reader,XMLStreamConstants.START_ELEMENT);
+ if (SOAP_ENVELOPE.equals(reader.getLocalName()) && !soapVersion.nsUri.equals(reader.getNamespaceURI())) {
+ throw new VersionMismatchException(soapVersion, soapVersion.nsUri, reader.getNamespaceURI());
+ }
+ XMLStreamReaderUtil.verifyTag(reader, soapVersion.nsUri, SOAP_ENVELOPE);
+
+ TagInfoset envelopeTag = new TagInfoset(reader);
+
+ // Collect namespaces on soap:Envelope
+ Map<String,String> namespaces = new HashMap<String,String>();
+ for(int i=0; i< reader.getNamespaceCount();i++){
+ namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
+ }
+
+ // Move to next element
+ XMLStreamReaderUtil.nextElementContent(reader);
+ XMLStreamReaderUtil.verifyReaderState(reader,
+ javax.xml.stream.XMLStreamConstants.START_ELEMENT);
+
+ HeaderList headers = null;
+ TagInfoset headerTag = null;
+
+ if (reader.getLocalName().equals(SOAP_HEADER)
+ && reader.getNamespaceURI().equals(soapVersion.nsUri)) {
+ headerTag = new TagInfoset(reader);
+
+ // Collect namespaces on soap:Header
+ for(int i=0; i< reader.getNamespaceCount();i++){
+ namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
+ }
+ // skip <soap:Header>
+ XMLStreamReaderUtil.nextElementContent(reader);
+
+ // If SOAP header blocks are present (i.e. not <soap:Header/>)
+ if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
+ headers = new HeaderList(soapVersion);
+
+ try {
+ // Cache SOAP header blocks
+ StreamHeaderDecoder headerDecoder = SOAPVersion.SOAP_11.equals(soapVersion) ? SOAP11StreamHeaderDecoder : SOAP12StreamHeaderDecoder;
+ cacheHeaders(reader, namespaces, headers, headerDecoder);
+ } catch (XMLStreamException e) {
+ // TODO need to throw more meaningful exception
+ throw new WebServiceException(e);
+ }
+ }
+
+ // Move to soap:Body
+ XMLStreamReaderUtil.nextElementContent(reader);
+ }
+
+ // Verify that <soap:Body> is present
+ XMLStreamReaderUtil.verifyTag(reader, soapVersion.nsUri, SOAP_BODY);
+ TagInfoset bodyTag = new TagInfoset(reader);
+
+ String bodyPrologue = XMLStreamReaderUtil.nextWhiteSpaceContent(reader);
+ message.init(envelopeTag,headerTag,message.attachmentSet,headers,bodyPrologue,bodyTag,null,reader,soapVersion);
+ // when there's no payload,
+ // it's tempting to use EmptyMessageImpl, but it doesn't preserve the infoset
+ // of <envelope>,<header>, and <body>, so we need to stick to StreamMessage.
+ }
+
+
+ private static XMLStreamBuffer cacheHeaders(XMLStreamReader reader,
+ Map<String, String> namespaces, HeaderList headers,
+ StreamHeaderDecoder headerDecoder) throws XMLStreamException {
+ MutableXMLStreamBuffer buffer = createXMLStreamBuffer();
+ StreamReaderBufferCreator creator = new StreamReaderBufferCreator();
+ creator.setXMLStreamBuffer(buffer);
+
+ // Reader is positioned at the first header block
+ while(reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT) {
+ Map<String,String> headerBlockNamespaces = namespaces;
+
+ // Collect namespaces on SOAP header block
+ if (reader.getNamespaceCount() > 0) {
+ headerBlockNamespaces = new HashMap<String,String>(namespaces);
+ for (int i = 0; i < reader.getNamespaceCount(); i++) {
+ headerBlockNamespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
+ }
+ }
+
+ // Mark
+ XMLStreamBuffer mark = new XMLStreamBufferMark(headerBlockNamespaces, creator);
+ // Create Header
+ headers.add(headerDecoder.decodeHeader(reader, mark));
+
+
+ // Cache the header block
+ // After caching Reader will be positioned at next header block or
+ // the end of the </soap:header>
+ creator.createElementFragment(reader, false);
+ if (reader.getEventType() != XMLStreamConstants.START_ELEMENT &&
+ reader.getEventType() != XMLStreamConstants.END_ELEMENT) {
+ XMLStreamReaderUtil.nextElementContent(reader);
+ }
+ }
+
+ return buffer;
+ }
+
+ private static MutableXMLStreamBuffer createXMLStreamBuffer() {
+ // TODO: Decode should own one MutableXMLStreamBuffer for reuse
+ // since it is more efficient. ISSUE: possible issue with
+ // lifetime of information in the buffer if accessed beyond
+ // the pipe line.
+ return new MutableXMLStreamBuffer();
+ }
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java Fri Sep 06 15:09:44 2013 -0700
@@ -99,6 +99,18 @@
return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE(arg0, arg1));
}
+ public static Localizable localizableWOODSTOX_CANT_LOAD(Object arg0) {
+ return messageFactory.getMessage("woodstox.cant.load", arg0);
+ }
+
+ /**
+ * Unable to load Woodstox class {0}
+ *
+ */
+ public static String WOODSTOX_CANT_LOAD(Object arg0) {
+ return localizer.localize(localizableWOODSTOX_CANT_LOAD(arg0));
+ }
+
public static Localizable localizableXMLREADER_IO_EXCEPTION(Object arg0) {
return messageFactory.getMessage("xmlreader.ioException", arg0);
}
@@ -123,6 +135,18 @@
return localizer.localize(localizableFASTINFOSET_NO_IMPLEMENTATION());
}
+ public static Localizable localizableINVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
+ return messageFactory.getMessage("invalid.property.value.integer", arg0, arg1, arg2);
+ }
+
+ /**
+ * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid integer. Using default value "{2}".
+ *
+ */
+ public static String INVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
+ return localizer.localize(localizableINVALID_PROPERTY_VALUE_INTEGER(arg0, arg1, arg2));
+ }
+
public static Localizable localizableXMLWRITER_IO_EXCEPTION(Object arg0) {
return messageFactory.getMessage("xmlwriter.ioException", arg0);
}
@@ -183,6 +207,18 @@
return localizer.localize(localizableXMLREADER_NESTED_ERROR(arg0));
}
+ public static Localizable localizableINVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
+ return messageFactory.getMessage("invalid.property.value.long", arg0, arg1, arg2);
+ }
+
+ /**
+ * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid long. Using default value "{2}".
+ *
+ */
+ public static String INVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
+ return localizer.localize(localizableINVALID_PROPERTY_VALUE_LONG(arg0, arg1, arg2));
+ }
+
public static Localizable localizableSTAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
return messageFactory.getMessage("staxreader.xmlstreamexception", arg0);
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -48,3 +48,8 @@
fastinfoset.noImplementation=Unable to locate compatible implementation of Fast Infoset in classpath
sourcereader.invalidSource=Unable to create reader from source \"{0}\"
+
+woodstox.cant.load=Unable to load Woodstox class {0}
+
+invalid.property.value.integer=Ignoring system property \"{0}\" as value \"{1}\" is invalid, property value must be a valid integer. Using default value \"{2}\".
+invalid.property.value.long=Ignoring system property \"{0}\" as value \"{1}\" is invalid, property value must be a valid long. Using default value \"{2}\".
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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 @@
private static final QName SCHEMA_IMPORT_QNAME = new QName(NS_XSD, "import");
private static final QName SCHEMA_REDEFINE_QNAME = new QName(NS_XSD, "redefine");
private static final String VERSION_COMMENT =
- " Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is "+RuntimeVersion.VERSION+". ";
+ " Published by JAX-WS RI (http://jax-ws.java.net). RI's version is "+RuntimeVersion.VERSION+". ";
private final QName rootName;
private final SDDocumentSource source;
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -36,13 +36,9 @@
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlAttachmentRef;
import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
import com.sun.istack.internal.NotNull;
import com.sun.istack.internal.Nullable;
-//import com.sun.xml.internal.bind.api.BridgeContext;
-//import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
-//import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet;
/**
* {@link JAXBContext} enhanced with JAXB RI specific functionalities.
@@ -222,32 +218,6 @@
public abstract @NotNull String getBuildId();
/**
- * Generates the episode file that represents the binding known to this {@link JAXBContext},
- * so that XJC can later do separate compilation.
- *
- * <p>
- * Episode file is really just a JAXB customization file, except that currently
- * we use the RI-specific SCD to refer to schema components.
- *
- * @param output
- * This receives the generated episode file.
- *
- * @since 2.1
- */
-// public abstract void generateEpisode(Result output);
-
- /**
- * Allows you to access the runtime model information of the JAXB XML/Java binding.
- *
- * <p>
- * This is useful for doing a deeper integration with the JAXB RI.
- * For more information about the model, see https://jaxb2-reflection.dev.java.net/
- *
- * @since 2.1.10
- */
-// public abstract RuntimeTypeInfoSet getRuntimeTypeInfoSet();
-
- /**
* The property that you can specify to {@link JAXBContext#newInstance}
* to reassign the default namespace URI to something else at the runtime.
*
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -72,6 +72,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import static com.sun.xml.internal.ws.util.xml.XmlUtil.allowFileAccess;
+
/**
* {@link Tube} that does the schema validation.
*
@@ -90,7 +92,7 @@
super(next);
this.binding = binding;
feature = binding.getFeature(SchemaValidationFeature.class);
- sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ sf = allowFileAccess(SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI), false);
}
protected AbstractSchemaValidationTube(AbstractSchemaValidationTube that, TubeCloner cloner) {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties Fri Sep 06 15:09:44 2013 -0700
@@ -274,7 +274,7 @@
V-030 = Attribute value "{0}" does not name a notation
V-031 = Attribute value "{0}" does not name an unparsed entity
V-032 = NMTOKENS attributes must have at least one value
-# Empty content model is a special type of XML element. I?d leave the message in English as is (also libraries from outside of Oracle use this exact message) but the word EMPTY can be translated.
+# Empty content model is a special type of XML element. I�d leave the message in English as is (also libraries from outside of Oracle use this exact message) but the word EMPTY can be translated.
V-033 = Empty content models must have no content
# Usage not found. TODO Remove
#V-034 = Element "{0}" does not allow "{1}" -- {2}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties Fri Sep 06 15:09:44 2013 -0700
@@ -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,7 @@
# questions.
#
-build-id=2.2.9-b14027
-build-version=JAX-WS RI 2.2.9-b14027
+build-id=2.2.9-b14140
+build-version=JAX-WS RI 2.2.9-b14140
major-version=2.2.9
-svn-revision=14027
+svn-revision=14140
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,61 @@
+/*
+ * 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 com.sun.xml.internal.ws.util.xml;
+
+import java.util.Iterator;
+
+import javax.xml.namespace.NamespaceContext;
+
+import com.sun.xml.internal.org.jvnet.staxex.NamespaceContextEx;
+
+public class NamespaceContextExAdaper implements NamespaceContextEx {
+
+ private final NamespaceContext nsContext;
+
+ public NamespaceContextExAdaper(NamespaceContext nsContext) {
+ this.nsContext = nsContext;
+ }
+
+ @Override //Who wants this?
+ public Iterator<Binding> iterator() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getNamespaceURI(String prefix) {
+ return nsContext.getNamespaceURI(prefix);
+ }
+
+ @Override
+ public String getPrefix(String namespaceURI) {
+ return nsContext.getPrefix(namespaceURI);
+ }
+
+ @Override
+ public Iterator getPrefixes(String namespaceURI) {
+ return nsContext.getPrefixes(namespaceURI);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,662 @@
+/*
+ * 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 com.sun.xml.internal.ws.util.xml;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import com.sun.xml.internal.org.jvnet.staxex.NamespaceContextEx;
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
+
+import com.sun.xml.internal.ws.encoding.TagInfoset;
+
+/**
+ * XMLReaderComposite
+ *
+ * @author shih-chang.chen@oracle.com
+ */
+public class XMLReaderComposite implements XMLStreamReaderEx {
+
+ static public enum State { StartTag, Payload, EndTag }
+
+ protected State state = State.StartTag;
+ protected ElemInfo elemInfo;
+ protected TagInfoset tagInfo;
+ protected XMLStreamReader[] children;
+ protected int payloadIndex = -1;
+ protected XMLStreamReader payloadReader;
+
+ static public class ElemInfo implements NamespaceContext {
+ ElemInfo ancestor;
+ TagInfoset tagInfo;
+ public ElemInfo(TagInfoset tag, ElemInfo parent) { tagInfo = tag; ancestor = parent; }
+ public String getNamespaceURI(String prefix) {
+ String n = tagInfo.getNamespaceURI(prefix);
+ return (n != null) ? n : (ancestor != null) ? ancestor.getNamespaceURI(prefix) : null;
+ }
+ public String getPrefix(String uri) {
+ String p = tagInfo.getPrefix(uri);
+ return (p != null) ? p : (ancestor != null) ? ancestor.getPrefix(uri) : null;
+ }
+ //Who wants this?
+ public List<String> allPrefixes(String namespaceURI) {
+ List<String> l = tagInfo.allPrefixes(namespaceURI);
+ if (ancestor != null) {
+ List<String> p = ancestor.allPrefixes(namespaceURI);
+ p.addAll(l);
+ return p;
+ }
+ return l;
+ }
+ public Iterator<String> getPrefixes(String namespaceURI) {
+ return allPrefixes(namespaceURI).iterator();
+ }
+ }
+
+ public XMLReaderComposite(final ElemInfo elem, XMLStreamReader[] wrapees) {
+ elemInfo = elem;
+ tagInfo = elem.tagInfo;
+ children = wrapees;
+ if (children != null && children.length > 0) {
+ payloadIndex = 0;
+ payloadReader = children[payloadIndex];
+ }
+ }
+
+
+ @Override
+ public int next() throws XMLStreamException {
+ switch (state) {
+ case StartTag:
+ if (payloadReader != null) {
+ state = State.Payload;
+ return payloadReader.getEventType();
+ } else {
+ state = State.EndTag;
+ return XMLStreamReader.END_ELEMENT;
+ }
+ case EndTag: return XMLStreamReader.END_DOCUMENT;
+ case Payload:
+ default:
+ int next = XMLStreamReader.END_DOCUMENT;
+ if (payloadReader != null && payloadReader.hasNext()) {
+ next = payloadReader.next();
+ }
+ if (next != XMLStreamReader.END_DOCUMENT) return next;
+ else {
+ if (payloadIndex+1 < children.length ) {
+ payloadIndex++;
+ payloadReader = children[payloadIndex];
+ return payloadReader.getEventType();
+ } else {
+ state = State.EndTag;
+ return XMLStreamReader.END_ELEMENT;
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean hasNext() throws XMLStreamException {
+ switch (state) {
+ case EndTag: return false;
+ case StartTag:
+ case Payload:
+ default: return true;
+ }
+ }
+
+ @Override
+ public String getElementText() throws XMLStreamException {
+ switch (state) {
+ case StartTag:
+ if (payloadReader.isCharacters()) return payloadReader.getText();
+ return "";
+ case Payload:
+ default:
+ return payloadReader.getElementText();
+ }
+ }
+
+ @Override
+ public int nextTag() throws XMLStreamException {
+ int e = next();
+ if (e == XMLStreamReader.END_DOCUMENT) return e;
+ while (e != XMLStreamReader.END_DOCUMENT) {
+ if (e == XMLStreamReader.START_ELEMENT) return e;
+ if (e == XMLStreamReader.END_ELEMENT) return e;
+ e = next();
+ }
+ return e;
+ }
+
+ @Override
+ public Object getProperty(String name) throws IllegalArgumentException {
+ return (payloadReader != null) ? payloadReader.getProperty(name) : null;
+ }
+
+ @Override
+ public void require(int type, String namespaceURI, String localName) throws XMLStreamException {
+ if (payloadReader!=null) payloadReader.require(type, namespaceURI, localName);
+ }
+
+ @Override
+ public void close() throws XMLStreamException {
+ if (payloadReader!=null) payloadReader.close();
+ }
+
+ @Override
+ public String getNamespaceURI(String prefix) {
+ switch (state) {
+ case StartTag:
+ case EndTag:
+ return elemInfo.getNamespaceURI(prefix);
+ case Payload:
+ default:
+ return payloadReader.getNamespaceURI(prefix);
+ }
+ }
+
+ @Override
+ public boolean isStartElement() {
+ switch (state) {
+ case StartTag: return true;
+ case EndTag: return false;
+ case Payload:
+ default:
+ return payloadReader.isStartElement();
+ }
+ }
+
+ @Override
+ public boolean isEndElement() {
+ switch (state) {
+ case StartTag: return false;
+ case EndTag: return true;
+ case Payload:
+ default:
+ return payloadReader.isEndElement();
+ }
+ }
+
+ @Override
+ public boolean isCharacters() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return false;
+ case Payload:
+ default:
+ return payloadReader.isCharacters();
+ }
+ }
+
+ @Override
+ public boolean isWhiteSpace() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return false;
+ case Payload:
+ default:
+ return payloadReader.isWhiteSpace();
+ }
+ }
+
+ @Override
+ public String getAttributeValue(String uri, String localName) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.atts.getValue(uri, localName);
+ case Payload:
+ default:
+ return payloadReader.getAttributeValue(uri, localName);
+ }
+ }
+
+ @Override
+ public int getAttributeCount() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.atts.getLength();
+ case Payload:
+ default:
+ return payloadReader.getAttributeCount();
+ }
+ }
+
+ @Override
+ public QName getAttributeName(int i) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return new QName(tagInfo.atts.getURI(i),tagInfo.atts.getLocalName(i),getPrfix(tagInfo.atts.getQName(i)));
+ case Payload:
+ default:
+ return payloadReader.getAttributeName(i);
+ }
+ }
+
+ @Override
+ public String getAttributeNamespace(int index) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.atts.getURI(index);
+ case Payload:
+ default:
+ return payloadReader.getAttributeNamespace(index);
+ }
+ }
+
+ @Override
+ public String getAttributeLocalName(int index) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.atts.getLocalName(index);
+ case Payload:
+ default:
+ return payloadReader.getAttributeLocalName(index);
+ }
+ }
+
+ @Override
+ public String getAttributePrefix(int index) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return getPrfix(tagInfo.atts.getQName(index));
+ case Payload:
+ default:
+ return payloadReader.getAttributePrefix(index);
+ }
+ }
+
+ static private String getPrfix(String qName) {
+ if (qName == null) return null;
+ int i = qName.indexOf(":");
+ return (i > 0)? qName.substring(0, i) : "";
+ }
+
+
+ @Override
+ public String getAttributeType(int index) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.atts.getType(index);
+ case Payload:
+ default:
+ return payloadReader.getAttributeType(index);
+ }
+ }
+
+ @Override
+ public String getAttributeValue(int index) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.atts.getValue(index);
+ case Payload:
+ default:
+ return payloadReader.getAttributeValue(index);
+ }
+ }
+
+ @Override
+ public boolean isAttributeSpecified(int index) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return (index < tagInfo.atts.getLength()) ? tagInfo.atts.getLocalName(index) != null : false;
+ case Payload:
+ default:
+ return payloadReader.isAttributeSpecified(index);
+ }
+ }
+
+ @Override
+ public int getNamespaceCount() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return (tagInfo.ns.length/2);
+ case Payload:
+ default:
+ return payloadReader.getNamespaceCount();
+ }
+ }
+
+ @Override
+ public String getNamespacePrefix(int index) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.ns[2*index];
+ case Payload:
+ default:
+ return payloadReader.getNamespacePrefix(index);
+ }
+ }
+
+ @Override
+ public String getNamespaceURI(int index) {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.ns[2*index+1];
+ case Payload:
+ default:
+ return payloadReader.getNamespaceURI(index);
+ }
+ }
+
+ @Override
+ public NamespaceContextEx getNamespaceContext() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return new NamespaceContextExAdaper(elemInfo);
+ case Payload:
+ default:
+ return isPayloadReaderEx()?
+ payloadReaderEx().getNamespaceContext() :
+ new NamespaceContextExAdaper(payloadReader.getNamespaceContext());
+ }
+ }
+
+ private boolean isPayloadReaderEx() { return (payloadReader instanceof XMLStreamReaderEx); }
+
+ private XMLStreamReaderEx payloadReaderEx() { return (XMLStreamReaderEx)payloadReader; }
+
+ @Override
+ public int getEventType() {
+ switch (state) {
+ case StartTag: return XMLStreamReader.START_ELEMENT;
+ case EndTag: return XMLStreamReader.END_ELEMENT;
+ case Payload:
+ default:
+ return payloadReader.getEventType();
+ }
+ }
+
+ @Override
+ public String getText() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return payloadReader.getText();
+ }
+ }
+
+ @Override
+ public char[] getTextCharacters() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return payloadReader.getTextCharacters();
+ }
+ }
+
+ @Override
+ public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) throws XMLStreamException {
+ switch (state) {
+ case StartTag:
+ case EndTag: return -1;
+ case Payload:
+ default:
+ return payloadReader.getTextCharacters(sourceStart, target, targetStart, length);
+ }
+ }
+
+ @Override
+ public int getTextStart() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return 0;
+ case Payload:
+ default:
+ return payloadReader.getTextStart();
+ }
+ }
+
+ @Override
+ public int getTextLength() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return 0;
+ case Payload:
+ default:
+ return payloadReader.getTextLength();
+ }
+ }
+
+ @Override
+ public String getEncoding() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return payloadReader.getEncoding();
+ }
+ }
+
+ @Override
+ public boolean hasText() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return false;
+ case Payload:
+ default:
+ return payloadReader.hasText();
+ }
+ }
+
+ @Override
+ public Location getLocation() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return new Location() {
+
+ @Override
+ public int getLineNumber() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public int getColumnNumber() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public int getCharacterOffset() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public String getPublicId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getSystemId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ };
+ case Payload:
+ default:
+ return payloadReader.getLocation();
+ }
+ }
+
+ @Override
+ public QName getName() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return new QName(tagInfo.nsUri, tagInfo.localName, tagInfo.prefix);
+ case Payload:
+ default:
+ return payloadReader.getName();
+ }
+ }
+
+ @Override
+ public String getLocalName() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.localName;
+ case Payload:
+ default:
+ return payloadReader.getLocalName();
+ }
+ }
+
+ @Override
+ public boolean hasName() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return true;
+ case Payload:
+ default:
+ return payloadReader.hasName();
+ }
+ }
+
+ @Override
+ public String getNamespaceURI() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.nsUri;
+ case Payload:
+ default:
+ return payloadReader.getNamespaceURI();
+ }
+ }
+
+ @Override
+ public String getPrefix() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return tagInfo.prefix;
+ case Payload:
+ default:
+ return payloadReader.getPrefix();
+ }
+ }
+
+ @Override
+ public String getVersion() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return payloadReader.getVersion();
+ }
+ }
+
+ @Override
+ public boolean isStandalone() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return true;
+ case Payload:
+ default:
+ return payloadReader.isStandalone();
+ }
+ }
+
+ @Override
+ public boolean standaloneSet() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return true;
+ case Payload:
+ default:
+ return payloadReader.standaloneSet();
+ }
+ }
+
+ @Override
+ public String getCharacterEncodingScheme() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return payloadReader.getCharacterEncodingScheme();
+ }
+ }
+
+ @Override
+ public String getPITarget() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return payloadReader.getPITarget();
+ }
+ }
+
+ @Override
+ public String getPIData() {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return payloadReader.getPIData();
+ }
+ }
+
+ @Override
+ public String getElementTextTrim() throws XMLStreamException {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return isPayloadReaderEx()? payloadReaderEx().getElementTextTrim() : payloadReader.getElementText().trim();
+ }
+ }
+
+ @Override
+ public CharSequence getPCDATA() throws XMLStreamException {
+ switch (state) {
+ case StartTag:
+ case EndTag: return null;
+ case Payload:
+ default:
+ return isPayloadReaderEx()? payloadReaderEx().getPCDATA() : payloadReader.getElementText();
+ }
+ }
+}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java Fri Sep 06 15:09:44 2013 -0700
@@ -54,6 +54,7 @@
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.SchemaFactory;
import javax.xml.ws.WebServiceException;
import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathFactoryConfigurationException;
@@ -74,6 +75,10 @@
* @author WS Development Team
*/
public class XmlUtil {
+
+ // not in older JDK, so must be duplicated here, otherwise javax.xml.XMLConstants should be used
+ private static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";
+
private final static String LEXICAL_HANDLER_PROPERTY =
"http://xml.org/sax/properties/lexical-handler";
@@ -414,4 +419,21 @@
return globalSecureXmlProcessingEnabled && localSecureXmlProcessingEnabled;
}
+ public static SchemaFactory allowFileAccess(SchemaFactory sf, boolean disableSecureProcessing) {
+
+ // if feature secure processing enabled, nothing to do, file is allowed,
+ // or user is able to control access by standard JAXP mechanisms
+ if (checkGlobalOverride(disableSecureProcessing)) {
+ return sf;
+ }
+
+ try {
+ sf.setProperty(ACCESS_EXTERNAL_SCHEMA, "file");
+ LOGGER.log(Level.FINE, "Property \"{}\" is supported and has been successfully set by used JAXP implementation.", new Object[]{ACCESS_EXTERNAL_SCHEMA});
+ } catch (SAXException ignored) {
+ // depending on JDK/SAX implementation used
+ LOGGER.log(Level.CONFIG, "Property \"{}\" is not supported by used JAXP implementation.", new Object[]{ACCESS_EXTERNAL_SCHEMA});
+ }
+ return sf;
+ }
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java Fri Sep 06 15:09:44 2013 -0700
@@ -329,7 +329,7 @@
private static class CommentFilter implements XmlSerializer {
final XmlSerializer serializer;
private static final String VERSION_COMMENT =
- " Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is " + RuntimeVersion.VERSION + ". ";
+ " Generated by JAX-WS RI (http://jax-ws.java.net). RI's version is " + RuntimeVersion.VERSION + ". ";
CommentFilter(XmlSerializer serializer) {
this.serializer = serializer;
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -77,4 +77,10 @@
public static final String ERR_SIMPLE_CONTENT_EXPECTED =
"SimpleContentExpected"; // arg:2
+
+ public static final String JAXP_UNSUPPORTED_PROPERTY =
+ "JAXPUnsupportedProperty"; // arg:1
+
+ public static final String JAXP_SUPPORTED_PROPERTY =
+ "JAXPSupportedProperty"; // arg:1
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -71,3 +71,9 @@
SimpleContentExpected = \
A complex type with a simple content or a simple type is expected but found ''{0}'':{1}
+
+JAXPUnsupportedProperty = \
+ Property "{0}" is not supported by used JAXP implementation.
+
+JAXPSupportedProperty = \
+ Property "{0}" is supported and has been successfuly set by used JAXP implementation.
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -42,6 +42,8 @@
* {@link SAXParserFactory} implementation that ultimately
* uses {@link XMLParser} to parse documents.
*
+ * @deprecated
+ *
* @author
* Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
*/
@@ -58,7 +60,7 @@
}
public void setFeature(String name, boolean value) {
- ;
+ throw new UnsupportedOperationException("XSOM parser does not support JAXP features.");
}
public boolean getFeature(String name) {
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java Fri Sep 06 15:09:44 2013 -0700
@@ -195,6 +195,70 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 49:
+ {
+ if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 45;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 36:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))))))))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 527, null);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 16:
+ {
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 12;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 53:
+ {
+ if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 49;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 37:
+ {
+ if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 36;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 12:
{
if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
@@ -207,103 +271,14 @@
}
}
break;
- case 36:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))))))))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 374, null);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 1:
+ case 45:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 351, anno,AnnotationContext.SCHEMA);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) {
- NGCCHandler h = new includeDecl(this, super._source, $runtime, 352);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) {
- NGCCHandler h = new importDecl(this, super._source, $runtime, 353);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
- NGCCHandler h = new redefine(this, super._source, $runtime, 354);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- action8();
- $_ngcc_current_state = 27;
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 356);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- NGCCHandler h = new complexType(this, super._source, $runtime, 357);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- action4();
- $_ngcc_current_state = 16;
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
- NGCCHandler h = new group(this, super._source, $runtime, 359);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
- NGCCHandler h = new notation(this, super._source, $runtime, 360);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
- NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 361);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- break;
- case 0:
- {
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 53:
- {
- if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 49;
+ $_ngcc_current_state = 41;
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
@@ -320,37 +295,25 @@
}
}
break;
- case 37:
- {
- if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 36;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 2:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 362, anno,AnnotationContext.SCHEMA);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 515, anno,AnnotationContext.SCHEMA);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) {
- NGCCHandler h = new includeDecl(this, super._source, $runtime, 363);
+ NGCCHandler h = new includeDecl(this, super._source, $runtime, 516);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) {
- NGCCHandler h = new importDecl(this, super._source, $runtime, 364);
+ NGCCHandler h = new importDecl(this, super._source, $runtime, 517);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
- NGCCHandler h = new redefine(this, super._source, $runtime, 365);
+ NGCCHandler h = new redefine(this, super._source, $runtime, 518);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -361,12 +324,12 @@
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 367);
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 520);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- NGCCHandler h = new complexType(this, super._source, $runtime, 368);
+ NGCCHandler h = new complexType(this, super._source, $runtime, 521);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -377,17 +340,17 @@
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
- NGCCHandler h = new group(this, super._source, $runtime, 370);
+ NGCCHandler h = new group(this, super._source, $runtime, 523);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
- NGCCHandler h = new notation(this, super._source, $runtime, 371);
+ NGCCHandler h = new notation(this, super._source, $runtime, 524);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
- NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 372);
+ NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 525);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -406,15 +369,14 @@
}
}
break;
- case 45:
+ case 27:
{
- if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 41;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ unexpectedEnterElement($__qname);
}
}
break;
@@ -430,21 +392,10 @@
}
}
break;
- case 27:
- {
- if((($ai = $runtime.getAttributeIndex("","name"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","default"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 11:
{
- if((($ai = $runtime.getAttributeIndex("","form"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0)) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue);
+ if((($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","form"))>=0)) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -452,27 +403,76 @@
}
}
break;
- case 49:
+ case 1:
{
- if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 504, anno,AnnotationContext.SCHEMA);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 45;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 16:
- {
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 12;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) {
+ NGCCHandler h = new includeDecl(this, super._source, $runtime, 505);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) {
+ NGCCHandler h = new importDecl(this, super._source, $runtime, 506);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
+ NGCCHandler h = new redefine(this, super._source, $runtime, 507);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ action8();
+ $_ngcc_current_state = 27;
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 509);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+ NGCCHandler h = new complexType(this, super._source, $runtime, 510);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ action4();
+ $_ngcc_current_state = 16;
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
+ NGCCHandler h = new group(this, super._source, $runtime, 512);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
+ NGCCHandler h = new notation(this, super._source, $runtime, 513);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+ NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 514);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
}
break;
@@ -490,6 +490,92 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 49:
+ {
+ if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 45;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 36:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 527, null);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 10:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 16:
+ {
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 12;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 53:
+ {
+ if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 49;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 26:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 37:
+ {
+ if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 36;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
case 12:
{
if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
@@ -502,10 +588,51 @@
}
}
break;
- case 36:
+ case 45:
+ {
+ if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 41;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 41:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 374, null);
+ if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 37;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 27:
+ {
+ if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 11:
+ {
+ if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -524,133 +651,6 @@
}
}
break;
- case 0:
- {
- revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 53:
- {
- if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 49;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 10:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 41:
- {
- if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 37;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 45:
- {
- if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 41;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 37:
- {
- if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 36;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 27:
- {
- if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 11:
- {
- if(((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 26:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 49:
- {
- if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 45;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 16:
- {
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 12;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
default:
{
unexpectedLeaveElement($__qname);
@@ -665,66 +665,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 12:
- {
- if(($__uri.equals("") && $__local.equals("fixed"))) {
- $_ngcc_current_state = 14;
- }
- else {
- $_ngcc_current_state = 11;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 27:
- {
- if((($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("default")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
- case 53:
- {
- if(($__uri.equals("") && $__local.equals("targetNamespace"))) {
- $_ngcc_current_state = 55;
- }
- else {
- $_ngcc_current_state = 49;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 11:
- {
- if((($__uri.equals("") && $__local.equals("form")) || ($__uri.equals("") && $__local.equals("name")))) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
- case 41:
- {
- if(($__uri.equals("") && $__local.equals("blockDefault"))) {
- $_ngcc_current_state = 43;
- }
- else {
- $_ngcc_current_state = 37;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
case 49:
{
if(($__uri.equals("") && $__local.equals("attributeFormDefault"))) {
@@ -747,12 +687,50 @@
}
}
break;
+ case 41:
+ {
+ if(($__uri.equals("") && $__local.equals("blockDefault"))) {
+ $_ngcc_current_state = 43;
+ }
+ else {
+ $_ngcc_current_state = 37;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 27:
+ {
+ if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 16:
+ {
+ if(($__uri.equals("") && $__local.equals("default"))) {
+ $_ngcc_current_state = 18;
+ }
+ else {
+ $_ngcc_current_state = 12;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
case 37:
{
if(($__uri.equals("") && $__local.equals("finalDefault"))) {
@@ -764,13 +742,35 @@
}
}
break;
- case 16:
+ case 53:
{
- if(($__uri.equals("") && $__local.equals("default"))) {
- $_ngcc_current_state = 18;
+ if(($__uri.equals("") && $__local.equals("targetNamespace"))) {
+ $_ngcc_current_state = 55;
}
else {
- $_ngcc_current_state = 12;
+ $_ngcc_current_state = 49;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 11:
+ {
+ if((($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("form")))) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
+ case 12:
+ {
+ if(($__uri.equals("") && $__local.equals("fixed"))) {
+ $_ngcc_current_state = 14;
+ }
+ else {
+ $_ngcc_current_state = 11;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
@@ -789,77 +789,33 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 12:
+ case 49:
{
- $_ngcc_current_state = 11;
+ $_ngcc_current_state = 45;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 38:
+ {
+ if(($__uri.equals("") && $__local.equals("finalDefault"))) {
+ $_ngcc_current_state = 36;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
case 0:
{
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
- case 53:
- {
- $_ngcc_current_state = 49;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 41:
- {
- $_ngcc_current_state = 37;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 45:
+ case 16:
{
- $_ngcc_current_state = 41;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 37:
- {
- $_ngcc_current_state = 36;
+ $_ngcc_current_state = 12;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 50:
- {
- if(($__uri.equals("") && $__local.equals("attributeFormDefault"))) {
- $_ngcc_current_state = 45;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 46:
- {
- if(($__uri.equals("") && $__local.equals("elementFormDefault"))) {
- $_ngcc_current_state = 41;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 54:
- {
- if(($__uri.equals("") && $__local.equals("targetNamespace"))) {
- $_ngcc_current_state = 49;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
case 13:
{
if(($__uri.equals("") && $__local.equals("fixed"))) {
@@ -870,6 +826,18 @@
}
}
break;
+ case 53:
+ {
+ $_ngcc_current_state = 49;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 37:
+ {
+ $_ngcc_current_state = 36;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 17:
{
if(($__uri.equals("") && $__local.equals("default"))) {
@@ -880,6 +848,22 @@
}
}
break;
+ case 12:
+ {
+ $_ngcc_current_state = 11;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 50:
+ {
+ if(($__uri.equals("") && $__local.equals("attributeFormDefault"))) {
+ $_ngcc_current_state = 45;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
case 42:
{
if(($__uri.equals("") && $__local.equals("blockDefault"))) {
@@ -890,26 +874,42 @@
}
}
break;
- case 38:
+ case 45:
+ {
+ $_ngcc_current_state = 41;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 41:
{
- if(($__uri.equals("") && $__local.equals("finalDefault"))) {
- $_ngcc_current_state = 36;
+ $_ngcc_current_state = 37;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 54:
+ {
+ if(($__uri.equals("") && $__local.equals("targetNamespace"))) {
+ $_ngcc_current_state = 49;
}
else {
unexpectedLeaveAttribute($__qname);
}
}
break;
- case 49:
+ case 46:
{
- $_ngcc_current_state = 45;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 16:
- {
- $_ngcc_current_state = 12;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("elementFormDefault"))) {
+ $_ngcc_current_state = 41;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
}
break;
default:
@@ -923,14 +923,14 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 12:
+ case 49:
{
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
- $_ngcc_current_state = 11;
+ $_ngcc_current_state = 45;
$runtime.sendText(super._cookie, $value);
}
}
@@ -940,6 +940,38 @@
revertToParentFromText(this, super._cookie, $value);
}
break;
+ case 47:
+ {
+ if($value.equals("unqualified")) {
+ NGCCHandler h = new qualification(this, super._source, $runtime, 539);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if($value.equals("qualified")) {
+ NGCCHandler h = new qualification(this, super._source, $runtime, 539);
+ spawnChildFromText(h, $value);
+ }
+ }
+ }
+ break;
+ case 43:
+ {
+ NGCCHandler h = new ersSet(this, super._source, $runtime, 534);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 16:
+ {
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 12;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
case 53:
{
if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
@@ -952,42 +984,6 @@
}
}
break;
- case 43:
- {
- NGCCHandler h = new ersSet(this, super._source, $runtime, 381);
- spawnChildFromText(h, $value);
- }
- break;
- case 41:
- {
- if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 37;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 45:
- {
- if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 41;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
case 37:
{
if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) {
@@ -1000,9 +996,16 @@
}
}
break;
- case 55:
+ case 12:
{
- $_ngcc_current_state = 54;
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 11;
+ $runtime.sendText(super._cookie, $value);
+ }
}
break;
case 14:
@@ -1011,60 +1014,75 @@
$_ngcc_current_state = 13;
}
break;
- case 47:
+ case 45:
{
- if($value.equals("unqualified")) {
- NGCCHandler h = new qualification(this, super._source, $runtime, 386);
- spawnChildFromText(h, $value);
+ if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
}
else {
- if($value.equals("qualified")) {
- NGCCHandler h = new qualification(this, super._source, $runtime, 386);
- spawnChildFromText(h, $value);
- }
+ $_ngcc_current_state = 41;
+ $runtime.sendText(super._cookie, $value);
}
}
break;
- case 39:
+ case 41:
{
- NGCCHandler h = new erSet(this, super._source, $runtime, 376);
- spawnChildFromText(h, $value);
+ if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 37;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
+ case 55:
+ {
+ $_ngcc_current_state = 54;
+ }
+ break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
}
break;
case 27:
{
if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
+ if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
+ if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
spawnChildFromText(h, $value);
}
else {
if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 286, locator,true);
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 439, locator,true);
spawnChildFromText(h, $value);
}
}
@@ -1075,15 +1093,21 @@
}
}
break;
- case 11:
+ case 39:
{
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue);
+ NGCCHandler h = new erSet(this, super._source, $runtime, 529);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 51:
+ {
+ if($value.equals("unqualified")) {
+ NGCCHandler h = new qualification(this, super._source, $runtime, 544);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 268, locator,false,defaultValue,fixedValue);
+ if($value.equals("qualified")) {
+ NGCCHandler h = new qualification(this, super._source, $runtime, 544);
spawnChildFromText(h, $value);
}
}
@@ -1095,206 +1119,182 @@
$_ngcc_current_state = 17;
}
break;
- case 51:
+ case 11:
{
- if($value.equals("unqualified")) {
- NGCCHandler h = new qualification(this, super._source, $runtime, 391);
+ if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue);
spawnChildFromText(h, $value);
}
else {
- if($value.equals("qualified")) {
- NGCCHandler h = new qualification(this, super._source, $runtime, 391);
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 421, locator,false,defaultValue,fixedValue);
spawnChildFromText(h, $value);
}
}
}
break;
- case 49:
- {
- if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 45;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 16:
- {
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 12;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 381:
+ case 527:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ action10();
+ $_ngcc_current_state = 2;
+ }
+ break;
+ case 534:
{
blockDefault = ((Integer)$__result__);
action12();
$_ngcc_current_state = 42;
}
break;
- case 268:
+ case 439:
+ {
+ e = ((ElementDecl)$__result__);
+ action7();
+ $_ngcc_current_state = 26;
+ }
+ break;
+ case 544:
+ {
+ afd = ((Boolean)$__result__).booleanValue();
+ action14();
+ $_ngcc_current_state = 50;
+ }
+ break;
+ case 421:
{
ad = ((AttributeDeclImpl)$__result__);
action3();
$_ngcc_current_state = 10;
}
break;
- case 391:
- {
- afd = ((Boolean)$__result__).booleanValue();
- action14();
- $_ngcc_current_state = 50;
- }
- break;
- case 386:
- {
- efd = ((Boolean)$__result__).booleanValue();
- action13();
- $_ngcc_current_state = 46;
- }
- break;
- case 351:
+ case 504:
{
anno = ((AnnotationImpl)$__result__);
action9();
$_ngcc_current_state = 1;
}
break;
- case 352:
+ case 505:
{
$_ngcc_current_state = 1;
}
break;
- case 353:
+ case 506:
{
$_ngcc_current_state = 1;
}
break;
- case 354:
+ case 507:
{
$_ngcc_current_state = 1;
}
break;
- case 356:
+ case 509:
{
st = ((SimpleTypeImpl)$__result__);
action6();
$_ngcc_current_state = 1;
}
break;
- case 357:
+ case 510:
{
ct = ((ComplexTypeImpl)$__result__);
action5();
$_ngcc_current_state = 1;
}
break;
- case 359:
+ case 512:
{
group = ((ModelGroupDeclImpl)$__result__);
action2();
$_ngcc_current_state = 1;
}
break;
- case 360:
+ case 513:
{
notation = ((XSNotation)$__result__);
action1();
$_ngcc_current_state = 1;
}
break;
- case 361:
+ case 514:
{
ag = ((AttGroupDeclImpl)$__result__);
action0();
$_ngcc_current_state = 1;
}
break;
- case 286:
+ case 539:
{
- e = ((ElementDecl)$__result__);
- action7();
- $_ngcc_current_state = 26;
+ efd = ((Boolean)$__result__).booleanValue();
+ action13();
+ $_ngcc_current_state = 46;
}
break;
- case 374:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- action10();
- $_ngcc_current_state = 2;
- }
- break;
- case 362:
+ case 515:
{
anno = ((AnnotationImpl)$__result__);
action9();
$_ngcc_current_state = 1;
}
break;
- case 363:
+ case 516:
{
$_ngcc_current_state = 1;
}
break;
- case 364:
+ case 517:
{
$_ngcc_current_state = 1;
}
break;
- case 365:
+ case 518:
{
$_ngcc_current_state = 1;
}
break;
- case 367:
+ case 520:
{
st = ((SimpleTypeImpl)$__result__);
action6();
$_ngcc_current_state = 1;
}
break;
- case 368:
+ case 521:
{
ct = ((ComplexTypeImpl)$__result__);
action5();
$_ngcc_current_state = 1;
}
break;
- case 370:
+ case 523:
{
group = ((ModelGroupDeclImpl)$__result__);
action2();
$_ngcc_current_state = 1;
}
break;
- case 371:
+ case 524:
{
notation = ((XSNotation)$__result__);
action1();
$_ngcc_current_state = 1;
}
break;
- case 372:
+ case 525:
{
ag = ((AttGroupDeclImpl)$__result__);
action0();
$_ngcc_current_state = 1;
}
break;
- case 376:
+ case 529:
{
finalDefault = ((Integer)$__result__);
action11();
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java Fri Sep 06 15:09:44 2013 -0700
@@ -99,10 +99,21 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 9:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
case 7:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 693, annotation,AnnotationContext.SIMPLETYPE_DECL);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 264, annotation,AnnotationContext.SIMPLETYPE_DECL);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -111,39 +122,6 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 2:
- {
- if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 687);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- }
- break;
- case 9:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (($ai = $runtime.getAttributeIndex("","itemType"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 10:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) {
@@ -156,6 +134,28 @@
}
}
break;
+ case 2:
+ {
+ if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 258);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -170,12 +170,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 1:
+ case 9:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
- action0();
+ if((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -188,11 +187,6 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
@@ -204,11 +198,17 @@
}
}
break;
- case 9:
+ case 0:
{
- if((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 1:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ action0();
}
else {
unexpectedLeaveElement($__qname);
@@ -229,17 +229,23 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 9:
+ {
+ if(($__uri.equals("") && $__local.equals("itemType"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
case 7:
{
$_ngcc_current_state = 2;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
if(($__uri.equals("") && $__local.equals("itemType"))) {
@@ -250,15 +256,9 @@
}
}
break;
- case 9:
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("itemType"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
+ revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -275,16 +275,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 4:
- {
- if(($__uri.equals("") && $__local.equals("itemType"))) {
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
case 7:
{
$_ngcc_current_state = 2;
@@ -296,6 +286,16 @@
revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 4:
+ {
+ if(($__uri.equals("") && $__local.equals("itemType"))) {
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -307,17 +307,20 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 9:
+ {
+ if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa);
+ spawnChildFromText(h, $value);
+ }
+ }
+ break;
case 7:
{
$_ngcc_current_state = 2;
$runtime.sendText(super._cookie, $value);
}
break;
- case 0:
- {
- revertToParentFromText(result, super._cookie, $value);
- }
- break;
case 2:
{
if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
@@ -326,17 +329,14 @@
}
}
break;
- case 9:
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa);
- spawnChildFromText(h, $value);
- }
+ revertToParentFromText(result, super._cookie, $value);
}
break;
case 5:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 689);
+ NGCCHandler h = new qname(this, super._source, $runtime, 260);
spawnChildFromText(h, $value);
}
break;
@@ -345,25 +345,25 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 693:
+ case 266:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 7;
+ }
+ break;
+ case 264:
{
annotation = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 2;
}
break;
- case 687:
+ case 258:
{
itemType = ((SimpleTypeImpl)$__result__);
$_ngcc_current_state = 1;
}
break;
- case 695:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 7;
- }
- break;
- case 689:
+ case 260:
{
itemTypeName = ((UName)$__result__);
action1();
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java Fri Sep 06 15:09:44 2013 -0700
@@ -105,15 +105,62 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 12:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","base"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 166, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 10:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 164, annotation,AnnotationContext.SIMPLETYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 5;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 4:
+ {
+ action1();
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
case 0:
{
revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
- case 12:
+ case 5:
{
- if(((($ai = $runtime.getAttributeIndex("","base"))>=0 && (((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 445, fa);
+ if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 158);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ }
+ break;
+ case 1:
+ {
+ if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
+ NGCCHandler h = new facet(this, super._source, $runtime, 153);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -121,6 +168,18 @@
}
}
break;
+ case 2:
+ {
+ if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
+ NGCCHandler h = new facet(this, super._source, $runtime, 154);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 13:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
@@ -133,65 +192,6 @@
}
}
break;
- case 5:
- {
- if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 437);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- }
- break;
- case 2:
- {
- if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
- NGCCHandler h = new facet(this, super._source, $runtime, 433);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 1:
- {
- if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
- NGCCHandler h = new facet(this, super._source, $runtime, 432);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 4:
- {
- action1();
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 10:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 443, annotation,AnnotationContext.SIMPLETYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 5;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
default:
{
unexpectedEnterElement($__qname);
@@ -206,15 +206,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
- {
- revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 12:
{
if((($ai = $runtime.getAttributeIndex("","base"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 445, fa);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 166, fa);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -222,6 +217,24 @@
}
}
break;
+ case 10:
+ {
+ $_ngcc_current_state = 5;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 4:
+ {
+ action1();
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 5:
{
if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
@@ -233,12 +246,6 @@
}
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
@@ -250,16 +257,9 @@
}
}
break;
- case 4:
+ case 2:
{
- action1();
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 10:
- {
- $_ngcc_current_state = 5;
+ $_ngcc_current_state = 1;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -277,15 +277,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
- {
- revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 12:
{
if(($__uri.equals("") && $__local.equals("base"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 445, fa);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 166, fa);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
@@ -293,6 +288,24 @@
}
}
break;
+ case 10:
+ {
+ $_ngcc_current_state = 5;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 4:
+ {
+ action1();
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 5:
{
if(($__uri.equals("") && $__local.equals("base"))) {
@@ -309,19 +322,6 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 4:
- {
- action1();
- $_ngcc_current_state = 2;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 10:
- {
- $_ngcc_current_state = 5;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -346,14 +346,9 @@
}
}
break;
- case 0:
+ case 10:
{
- revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 2:
- {
- $_ngcc_current_state = 1;
+ $_ngcc_current_state = 5;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -364,9 +359,14 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 10:
+ case 0:
{
- $_ngcc_current_state = 5;
+ revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -381,23 +381,36 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 0:
+ case 8:
{
- revertToParentFromText(result, super._cookie, $value);
+ NGCCHandler h = new qname(this, super._source, $runtime, 160);
+ spawnChildFromText(h, $value);
}
break;
case 12:
{
if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 445, fa);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 166, fa);
spawnChildFromText(h, $value);
}
}
break;
- case 8:
+ case 10:
+ {
+ $_ngcc_current_state = 5;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 4:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 439);
- spawnChildFromText(h, $value);
+ action1();
+ $_ngcc_current_state = 2;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromText(result, super._cookie, $value);
}
break;
case 5:
@@ -414,57 +427,44 @@
$runtime.sendText(super._cookie, $value);
}
break;
- case 4:
- {
- action1();
- $_ngcc_current_state = 2;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 10:
- {
- $_ngcc_current_state = 5;
- $runtime.sendText(super._cookie, $value);
- }
- break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 439:
+ case 160:
{
baseTypeName = ((UName)$__result__);
action2();
$_ngcc_current_state = 7;
}
break;
- case 445:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 10;
- }
- break;
- case 437:
- {
- baseType = ((SimpleTypeImpl)$__result__);
- $_ngcc_current_state = 4;
- }
- break;
- case 443:
+ case 164:
{
annotation = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 5;
}
break;
- case 433:
+ case 154:
{
facet = ((XSFacet)$__result__);
action0();
$_ngcc_current_state = 1;
}
break;
- case 432:
+ case 166:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 10;
+ }
+ break;
+ case 158:
+ {
+ baseType = ((SimpleTypeImpl)$__result__);
+ $_ngcc_current_state = 4;
+ }
+ break;
+ case 153:
{
facet = ((XSFacet)$__result__);
action0();
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java Fri Sep 06 15:09:44 2013 -0700
@@ -111,14 +111,15 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 6:
+ case 4:
{
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 665, fa);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 183, annotation,AnnotationContext.SIMPLETYPE_DECL);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- unexpectedEnterElement($__qname);
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
@@ -127,22 +128,10 @@
revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
- case 12:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- action4();
- $_ngcc_current_state = 7;
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 659);
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 179);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -162,22 +151,22 @@
}
}
break;
- case 4:
+ case 12:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 663, annotation,AnnotationContext.SIMPLETYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ action4();
+ $_ngcc_current_state = 7;
}
else {
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ unexpectedEnterElement($__qname);
}
}
break;
case 2:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 660);
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 180);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -186,6 +175,17 @@
}
}
break;
+ case 6:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 185, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -200,15 +200,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 6:
+ case 4:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 665, fa);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
case 0:
@@ -240,18 +235,23 @@
}
}
break;
- case 4:
- {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 6:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 185, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -266,6 +266,12 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 4:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 0:
{
revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
@@ -282,12 +288,6 @@
}
}
break;
- case 4:
- {
- $_ngcc_current_state = 2;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -308,11 +308,23 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 4:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 0:
{
revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 7:
+ {
+ $_ngcc_current_state = 6;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 8:
{
if(($__uri.equals("") && $__local.equals("memberTypes"))) {
@@ -323,18 +335,6 @@
}
}
break;
- case 7:
- {
- $_ngcc_current_state = 6;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 4:
- {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -352,14 +352,15 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 0:
+ case 4:
{
- revertToParentFromText(result, super._cookie, $value);
+ $_ngcc_current_state = 2;
+ $runtime.sendText(super._cookie, $value);
}
break;
- case 8:
+ case 9:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 668);
+ NGCCHandler h = new qname(this, super._source, $runtime, 187);
spawnChildFromText(h, $value);
}
break;
@@ -370,10 +371,9 @@
action3();
}
break;
- case 9:
+ case 0:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 667);
- spawnChildFromText(h, $value);
+ revertToParentFromText(result, super._cookie, $value);
}
break;
case 7:
@@ -388,10 +388,10 @@
}
}
break;
- case 4:
+ case 8:
{
- $_ngcc_current_state = 2;
- $runtime.sendText(super._cookie, $value);
+ NGCCHandler h = new qname(this, super._source, $runtime, 188);
+ spawnChildFromText(h, $value);
}
break;
case 2:
@@ -405,46 +405,46 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 665:
+ case 183:
{
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 4;
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 2;
}
break;
- case 660:
+ case 187:
+ {
+ memberTypeName = ((UName)$__result__);
+ action2();
+ $_ngcc_current_state = 8;
+ }
+ break;
+ case 179:
{
anonymousMemberType = ((SimpleTypeImpl)$__result__);
action1();
$_ngcc_current_state = 1;
}
break;
- case 663:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 2;
- }
- break;
- case 668:
+ case 188:
{
memberTypeName = ((UName)$__result__);
action2();
$_ngcc_current_state = 8;
}
break;
- case 659:
+ case 185:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 4;
+ }
+ break;
+ case 180:
{
anonymousMemberType = ((SimpleTypeImpl)$__result__);
action1();
$_ngcc_current_state = 1;
}
break;
- case 667:
- {
- memberTypeName = ((UName)$__result__);
- action2();
- $_ngcc_current_state = 8;
- }
- break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java Fri Sep 06 15:09:44 2013 -0700
@@ -118,11 +118,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
- {
- revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
@@ -134,6 +129,11 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java Fri Sep 06 15:09:44 2013 -0700
@@ -92,10 +92,26 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 12:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
case 7:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 210, null,AnnotationContext.ATTRIBUTE_DECL);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 388, null,AnnotationContext.ATTRIBUTE_DECL);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -104,9 +120,16 @@
}
}
break;
- case 0:
+ case 9:
{
- revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","type"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
}
break;
case 13:
@@ -121,29 +144,6 @@
}
}
break;
- case 9:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","type"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 12:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 1:
{
if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
@@ -152,7 +152,7 @@
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 201);
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 379);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -176,15 +176,38 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 12:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 7:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
+ case 9:
{
- revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
}
break;
case 13:
@@ -199,29 +222,6 @@
}
}
break;
- case 9:
- {
- if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- }
- break;
- case 12:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
case 1:
{
if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
@@ -248,15 +248,37 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 12:
+ {
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 11;
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
case 7:
{
$_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
+ case 9:
{
- revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("type"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
}
break;
case 13:
@@ -270,28 +292,6 @@
}
}
break;
- case 9:
- {
- if(($__uri.equals("") && $__local.equals("type"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- }
- break;
- case 12:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 11;
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
case 1:
{
if(($__uri.equals("") && $__local.equals("type"))) {
@@ -317,10 +317,15 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 10:
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 9;
+ revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 14:
+ {
+ if(($__uri.equals("") && $__local.equals("form"))) {
+ $_ngcc_current_state = 12;
}
else {
unexpectedLeaveAttribute($__qname);
@@ -333,9 +338,20 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
+ case 10:
{
- revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 9;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 9:
+ {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
}
break;
case 13:
@@ -344,20 +360,10 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 9:
+ case 1:
{
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
- spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
- }
- break;
- case 14:
- {
- if(($__uri.equals("") && $__local.equals("form"))) {
- $_ngcc_current_state = 12;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
+ $_ngcc_current_state = 0;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 4:
@@ -370,12 +376,6 @@
}
}
break;
- case 1:
- {
- $_ngcc_current_state = 0;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -387,21 +387,35 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromText(makeResult(), super._cookie, $value);
+ }
+ break;
+ case 12:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
case 7:
{
$_ngcc_current_state = 1;
$runtime.sendText(super._cookie, $value);
}
break;
- case 5:
+ case 9:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 203);
- spawnChildFromText(h, $value);
- }
- break;
- case 0:
- {
- revertToParentFromText(makeResult(), super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 390, fa);
+ spawnChildFromText(h, $value);
+ }
}
break;
case 13:
@@ -416,29 +430,17 @@
}
}
break;
- case 9:
+ case 15:
{
- if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
+ if($value.equals("unqualified")) {
+ NGCCHandler h = new qualification(this, super._source, $runtime, 395);
spawnChildFromText(h, $value);
}
else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
- spawnChildFromText(h, $value);
- }
- }
- break;
- case 11:
- {
- name = $value;
- $_ngcc_current_state = 10;
- }
- break;
- case 12:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
+ if($value.equals("qualified")) {
+ NGCCHandler h = new qualification(this, super._source, $runtime, 395);
+ spawnChildFromText(h, $value);
+ }
}
}
break;
@@ -454,18 +456,16 @@
}
}
break;
- case 15:
+ case 11:
{
- if($value.equals("unqualified")) {
- NGCCHandler h = new qualification(this, super._source, $runtime, 217);
- spawnChildFromText(h, $value);
- }
- else {
- if($value.equals("qualified")) {
- NGCCHandler h = new qualification(this, super._source, $runtime, 217);
- spawnChildFromText(h, $value);
- }
- }
+ name = $value;
+ $_ngcc_current_state = 10;
+ }
+ break;
+ case 5:
+ {
+ NGCCHandler h = new qname(this, super._source, $runtime, 381);
+ spawnChildFromText(h, $value);
}
break;
}
@@ -473,43 +473,43 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 210:
+ case 388:
{
annotation = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 1;
}
break;
- case 217:
+ case 379:
+ {
+ type = ((SimpleTypeImpl)$__result__);
+ $_ngcc_current_state = 0;
+ }
+ break;
+ case 390:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 7;
+ }
+ break;
+ case 395:
{
form = ((Boolean)$__result__).booleanValue();
action1();
$_ngcc_current_state = 14;
}
break;
- case 203:
+ case 381:
{
typeName = ((UName)$__result__);
action0();
$_ngcc_current_state = 4;
}
break;
- case 212:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 7;
- }
- break;
- case 201:
- {
- type = ((SimpleTypeImpl)$__result__);
- $_ngcc_current_state = 0;
- }
- break;
}
}
public boolean accepted() {
- return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 7))));
+ return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 7))));
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java Fri Sep 06 15:09:44 2013 -0700
@@ -83,11 +83,15 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 3:
+ case 6:
{
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 246, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
}
break;
case 13:
@@ -101,15 +105,38 @@
}
}
break;
- case 4:
+ case 0:
+ {
+ revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 7:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 525, null,AnnotationContext.ATTRIBUTE_GROUP);
+ if(($ai = $runtime.getAttributeIndex("","id"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 6;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 3:
+ {
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 2:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 241, result);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 3;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ unexpectedEnterElement($__qname);
}
}
break;
@@ -125,45 +152,18 @@
}
}
break;
- case 7:
+ case 4:
{
- if(($ai = $runtime.getAttributeIndex("","id"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 6;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 6:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 527, fa);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 244, null,AnnotationContext.ATTRIBUTE_GROUP);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- unexpectedEnterElement($__qname);
+ $_ngcc_current_state = 3;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
- case 2:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))) {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 522, result);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
default:
{
unexpectedEnterElement($__qname);
@@ -178,18 +178,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 3:
+ case 6:
{
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 13:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 246, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -207,10 +200,20 @@
}
}
break;
- case 4:
+ case 13:
{
- $_ngcc_current_state = 3;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
}
break;
case 7:
@@ -225,10 +228,17 @@
}
}
break;
- case 6:
+ case 3:
+ {
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 2:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 527, fa);
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 241, result);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -236,20 +246,10 @@
}
}
break;
- case 2:
+ case 4:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 522, result);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 3;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -266,13 +266,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 3:
- {
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 13:
{
if(($__uri.equals("") && $__local.equals("name"))) {
@@ -283,10 +276,9 @@
}
}
break;
- case 4:
+ case 0:
{
- $_ngcc_current_state = 3;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
}
break;
case 7:
@@ -300,9 +292,17 @@
}
}
break;
- case 0:
+ case 3:
{
- revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 4:
+ {
+ $_ngcc_current_state = 3;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -319,6 +319,24 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 7:
+ {
+ $_ngcc_current_state = 6;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 3:
+ {
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 8:
{
if(($__uri.equals("") && $__local.equals("id"))) {
@@ -329,13 +347,6 @@
}
}
break;
- case 3:
- {
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 11:
{
if(($__uri.equals("") && $__local.equals("name"))) {
@@ -352,17 +363,6 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 7:
- {
- $_ngcc_current_state = 6;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -374,13 +374,6 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 3:
- {
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendText(super._cookie, $value);
- }
- break;
case 13:
{
if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -389,21 +382,9 @@
}
}
break;
- case 12:
- {
- name = $value;
- $_ngcc_current_state = 11;
- }
- break;
- case 4:
+ case 0:
{
- $_ngcc_current_state = 3;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 9:
- {
- $_ngcc_current_state = 8;
+ revertToParentFromText(result, super._cookie, $value);
}
break;
case 7:
@@ -418,9 +399,28 @@
}
}
break;
- case 0:
+ case 12:
+ {
+ name = $value;
+ $_ngcc_current_state = 11;
+ }
+ break;
+ case 9:
{
- revertToParentFromText(result, super._cookie, $value);
+ $_ngcc_current_state = 8;
+ }
+ break;
+ case 3:
+ {
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 4:
+ {
+ $_ngcc_current_state = 3;
+ $runtime.sendText(super._cookie, $value);
}
break;
}
@@ -428,21 +428,21 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 525:
+ case 241:
{
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 3;
+ $_ngcc_current_state = 1;
}
break;
- case 527:
+ case 246:
{
fa = ((ForeignAttributesImpl)$__result__);
$_ngcc_current_state = 4;
}
break;
- case 522:
+ case 244:
{
- $_ngcc_current_state = 1;
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 3;
}
break;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java Fri Sep 06 15:09:44 2013 -0700
@@ -143,139 +143,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 29:
- {
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 25;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 3:
- {
- if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 13:
- {
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 9:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 455, null,AnnotationContext.ATTRIBUTE_USE);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 8;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 25:
- {
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 17;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 5:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- action7();
- $_ngcc_current_state = 33;
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- action3();
- $_ngcc_current_state = 13;
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- }
- break;
- case 33:
- {
- if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 29;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 16:
- {
- action4();
- $_ngcc_current_state = 15;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 19:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 466, null,AnnotationContext.ATTRIBUTE_USE);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 18;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 17:
- {
- if((($ai = $runtime.getAttributeIndex("","form"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0)) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- }
- break;
- case 8:
- {
- action2();
- $_ngcc_current_state = 7;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
@@ -303,6 +170,139 @@
}
}
break;
+ case 8:
+ {
+ action2();
+ $_ngcc_current_state = 7;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 3:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0))) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 17:
+ {
+ if((($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","form"))>=0)) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ }
+ break;
+ case 33:
+ {
+ if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 29;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 25:
+ {
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 17;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 29:
+ {
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 25;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 9:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 297, null,AnnotationContext.ATTRIBUTE_USE);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 8;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 16:
+ {
+ action4();
+ $_ngcc_current_state = 15;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 5:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ action7();
+ $_ngcc_current_state = 33;
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ action3();
+ $_ngcc_current_state = 13;
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ }
+ break;
+ case 13:
+ {
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 19:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 308, null,AnnotationContext.ATTRIBUTE_USE);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 18;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 0:
{
revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
@@ -322,22 +322,34 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 29:
+ case 1:
{
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 2:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
}
else {
- $_ngcc_current_state = 25;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ unexpectedLeaveElement($__qname);
}
}
break;
+ case 8:
+ {
+ action2();
+ $_ngcc_current_state = 7;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 3:
{
- if(((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc);
+ if(((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -345,49 +357,20 @@
}
}
break;
- case 13:
+ case 17:
{
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 9:
- {
- $_ngcc_current_state = 8;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 25:
- {
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 17;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 5:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 7:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveElement($__qname);
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
}
}
break;
@@ -414,6 +397,36 @@
}
}
break;
+ case 25:
+ {
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 17;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 29:
+ {
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 25;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 9:
+ {
+ $_ngcc_current_state = 8;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 16:
{
action4();
@@ -421,53 +434,40 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 5:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 13:
+ {
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 7:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 19:
{
$_ngcc_current_state = 18;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 17:
- {
- if(((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- }
- break;
- case 8:
- {
- action2();
- $_ngcc_current_state = 7;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 1:
- {
- $_ngcc_current_state = 0;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 2:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
case 0:
{
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
@@ -476,7 +476,7 @@
case 18:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 464, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 306, null);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -498,21 +498,23 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 29:
+ case 1:
{
- if(($__uri.equals("") && $__local.equals("default"))) {
- $_ngcc_current_state = 31;
- }
- else {
- $_ngcc_current_state = 25;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
+ $_ngcc_current_state = 0;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 8:
+ {
+ action2();
+ $_ngcc_current_state = 7;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 3:
{
- if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc);
+ if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
@@ -520,20 +522,31 @@
}
}
break;
- case 13:
+ case 17:
{
- if(($__uri.equals("") && $__local.equals("ref"))) {
- $_ngcc_current_state = 12;
+ if((($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("form")))) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
- unexpectedEnterAttribute($__qname);
+ if(($__uri.equals("") && $__local.equals("ref"))) {
+ $_ngcc_current_state = 22;
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
}
}
break;
- case 9:
+ case 33:
{
- $_ngcc_current_state = 8;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("use"))) {
+ $_ngcc_current_state = 35;
+ }
+ else {
+ $_ngcc_current_state = 29;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
}
break;
case 25:
@@ -547,21 +560,21 @@
}
}
break;
- case 5:
+ case 29:
{
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("default"))) {
+ $_ngcc_current_state = 31;
+ }
+ else {
+ $_ngcc_current_state = 25;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
}
break;
- case 33:
+ case 9:
{
- if(($__uri.equals("") && $__local.equals("use"))) {
- $_ngcc_current_state = 35;
- }
- else {
- $_ngcc_current_state = 29;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
+ $_ngcc_current_state = 8;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 16:
@@ -571,38 +584,25 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 19:
+ case 5:
{
- $_ngcc_current_state = 18;
+ $_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 17:
+ case 13:
{
- if((($__uri.equals("") && $__local.equals("form")) || ($__uri.equals("") && $__local.equals("name")))) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("ref"))) {
+ $_ngcc_current_state = 12;
}
else {
- if(($__uri.equals("") && $__local.equals("ref"))) {
- $_ngcc_current_state = 22;
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
+ unexpectedEnterAttribute($__qname);
}
}
break;
- case 8:
+ case 19:
{
- action2();
- $_ngcc_current_state = 7;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 1:
- {
- $_ngcc_current_state = 0;
+ $_ngcc_current_state = 18;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -625,9 +625,16 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 29:
+ case 1:
{
- $_ngcc_current_state = 25;
+ $_ngcc_current_state = 0;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 8:
+ {
+ action2();
+ $_ngcc_current_state = 7;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -641,22 +648,14 @@
}
}
break;
- case 9:
- {
- $_ngcc_current_state = 8;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 25:
+ case 26:
{
- $_ngcc_current_state = 17;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 5:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("fixed"))) {
+ $_ngcc_current_state = 17;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
}
break;
case 11:
@@ -675,29 +674,6 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 16:
- {
- action4();
- $_ngcc_current_state = 15;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 26:
- {
- if(($__uri.equals("") && $__local.equals("fixed"))) {
- $_ngcc_current_state = 17;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 19:
- {
- $_ngcc_current_state = 18;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 21:
{
if(($__uri.equals("") && $__local.equals("ref"))) {
@@ -708,24 +684,12 @@
}
}
break;
- case 8:
+ case 25:
{
- action2();
- $_ngcc_current_state = 7;
+ $_ngcc_current_state = 17;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
- {
- $_ngcc_current_state = 0;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 30:
{
if(($__uri.equals("") && $__local.equals("default"))) {
@@ -736,6 +700,42 @@
}
}
break;
+ case 29:
+ {
+ $_ngcc_current_state = 25;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 9:
+ {
+ $_ngcc_current_state = 8;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 16:
+ {
+ action4();
+ $_ngcc_current_state = 15;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 5:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 19:
+ {
+ $_ngcc_current_state = 18;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -747,62 +747,69 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 29:
- {
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 25;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 3:
- {
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 448, wloc);
- spawnChildFromText(h, $value);
- }
- }
- }
- break;
- case 27:
- {
- fixedValue = $value;
- $_ngcc_current_state = 26;
- }
- break;
- case 12:
- {
- NGCCHandler h = new qname(this, super._source, $runtime, 458);
- spawnChildFromText(h, $value);
- }
- break;
- case 13:
- {
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
case 31:
{
defaultValue = $value;
$_ngcc_current_state = 30;
}
break;
- case 9:
+ case 1:
+ {
+ $_ngcc_current_state = 0;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 8:
+ {
+ action2();
+ $_ngcc_current_state = 7;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 3:
+ {
+ if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 290, wloc);
+ spawnChildFromText(h, $value);
+ }
+ }
+ }
+ break;
+ case 17:
{
- $_ngcc_current_state = 8;
- $runtime.sendText(super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 315, locator,true,defaultValue,fixedValue);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ }
+ }
+ break;
+ case 33:
+ {
+ if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 29;
+ $runtime.sendText(super._cookie, $value);
+ }
}
break;
case 25:
@@ -817,24 +824,48 @@
}
}
break;
- case 5:
+ case 22:
{
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
+ NGCCHandler h = new qname(this, super._source, $runtime, 311);
+ spawnChildFromText(h, $value);
}
break;
- case 33:
+ case 29:
{
- if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
- $_ngcc_current_state = 29;
+ $_ngcc_current_state = 25;
$runtime.sendText(super._cookie, $value);
}
}
break;
+ case 12:
+ {
+ NGCCHandler h = new qname(this, super._source, $runtime, 300);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 35:
+ {
+ use = $value;
+ $_ngcc_current_state = 34;
+ }
+ break;
+ case 27:
+ {
+ fixedValue = $value;
+ $_ngcc_current_state = 26;
+ }
+ break;
+ case 9:
+ {
+ $_ngcc_current_state = 8;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
case 16:
{
action4();
@@ -842,57 +873,26 @@
$runtime.sendText(super._cookie, $value);
}
break;
+ case 5:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 13:
+ {
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
case 19:
{
$_ngcc_current_state = 18;
$runtime.sendText(super._cookie, $value);
}
break;
- case 17:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
- NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 473, locator,true,defaultValue,fixedValue);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- }
- }
- }
- break;
- case 8:
- {
- action2();
- $_ngcc_current_state = 7;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 1:
- {
- $_ngcc_current_state = 0;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 22:
- {
- NGCCHandler h = new qname(this, super._source, $runtime, 469);
- spawnChildFromText(h, $value);
- }
- break;
- case 35:
- {
- use = $value;
- $_ngcc_current_state = 34;
- }
- break;
case 0:
{
revertToParentFromText(this, super._cookie, $value);
@@ -903,50 +903,50 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 448:
+ case 300:
+ {
+ groupName = ((UName)$__result__);
+ $_ngcc_current_state = 11;
+ }
+ break;
+ case 297:
+ {
+ $_ngcc_current_state = 8;
+ }
+ break;
+ case 306:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 16;
+ }
+ break;
+ case 290:
{
wildcard = ((WildcardImpl)$__result__);
action0();
$_ngcc_current_state = 2;
}
break;
- case 466:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 18;
- }
- break;
- case 473:
+ case 315:
{
anonymousDecl = ((AttributeDeclImpl)$__result__);
action6();
$_ngcc_current_state = 16;
}
break;
- case 464:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 16;
- }
- break;
- case 458:
- {
- groupName = ((UName)$__result__);
- $_ngcc_current_state = 11;
- }
- break;
- case 455:
- {
- $_ngcc_current_state = 8;
- }
- break;
- case 469:
+ case 311:
{
attDeclName = ((UName)$__result__);
action5();
$_ngcc_current_state = 21;
}
break;
+ case 308:
+ {
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 18;
+ }
+ break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java Fri Sep 06 15:09:44 2013 -0700
@@ -189,26 +189,14 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 65:
+ case 54:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 81, null,AnnotationContext.COMPLEXTYPE_DECL);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 617, annotation,AnnotationContext.COMPLEXTYPE_DECL);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 29:
- {
- if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 28;
+ $_ngcc_current_state = 52;
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
@@ -225,64 +213,10 @@
}
}
break;
- case 88:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- action16();
- $_ngcc_current_state = 84;
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 2:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 63;
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 29;
- }
- else {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) {
- action1();
- NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 4, result);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- }
- }
- break;
- case 47:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))) {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 53, result);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 38:
- {
- action8();
- $_ngcc_current_state = 37;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
case 49:
{
if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
- NGCCHandler h = new facet(this, super._source, $runtime, 57);
+ NGCCHandler h = new facet(this, super._source, $runtime, 610);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -291,284 +225,6 @@
}
}
break;
- case 18:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) {
- NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 18, result);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 51:
- {
- action13();
- $_ngcc_current_state = 49;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 54:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 64, annotation,AnnotationContext.COMPLEXTYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 52;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 68:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 67;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 56:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 66, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 84:
- {
- if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 80;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 52:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 61);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 51;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 12:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 11, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 41:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 46, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 10:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 9, annotation,AnnotationContext.COMPLEXTYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 9;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 0:
- {
- revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 80:
- {
- if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 76;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 28:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 31, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 72:
- {
- if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 68;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 63:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 75, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 59:
- {
- if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 19:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 20, annotation,AnnotationContext.COMPLEXTYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 18;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 39:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 44, annotation,AnnotationContext.COMPLEXTYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 38;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 44:
- {
- if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 21:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 22, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 48:
- {
- if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
- NGCCHandler h = new facet(this, super._source, $runtime, 56);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- action11();
- $_ngcc_current_state = 47;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 61:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 73, annotation,AnnotationContext.COMPLEXTYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 35;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 26:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 29, annotation,AnnotationContext.COMPLEXTYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 7;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 37:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))) {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 41, result);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 67:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent")))))))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 83, fa);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 7:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
@@ -588,10 +244,33 @@
}
}
break;
- case 9:
+ case 61:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 626, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 35;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 18:
{
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) {
- NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 7, result);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))))))) {
+ NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 571, result);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 12:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 564, fa);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -599,6 +278,48 @@
}
}
break;
+ case 26:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 582, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 7;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 38:
+ {
+ action8();
+ $_ngcc_current_state = 37;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 44:
+ {
+ if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 68:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 67;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 35:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
@@ -618,6 +339,122 @@
}
}
break;
+ case 80:
+ {
+ if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 76;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 63:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 628, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 88:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ action16();
+ $_ngcc_current_state = 84;
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 84:
+ {
+ if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 80;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 37:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 594, result);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 9:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))))))) {
+ NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 560, result);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 19:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 573, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 18;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 15:
+ {
+ if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 48:
+ {
+ if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
+ NGCCHandler h = new facet(this, super._source, $runtime, 609);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ action11();
+ $_ngcc_current_state = 47;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 47:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 606, result);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
case 24:
{
if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
@@ -629,7 +466,134 @@
}
}
break;
- case 15:
+ case 28:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 584, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 29:
+ {
+ if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 28;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 67:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 636, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 10:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 562, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 9;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 41:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 599, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 2:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 63;
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 29;
+ }
+ else {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))))))) {
+ action1();
+ NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 557, result);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ }
+ }
+ break;
+ case 21:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 575, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 72:
+ {
+ if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 68;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 56:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 619, fa);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 39:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 597, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 38;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 59:
{
if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
$runtime.consumeAttribute($ai);
@@ -640,6 +604,42 @@
}
}
break;
+ case 52:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 614);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 51;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 51:
+ {
+ action13();
+ $_ngcc_current_state = 49;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 65:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 634, null,AnnotationContext.COMPLEXTYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -654,33 +654,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 65:
- {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 29:
+ case 54:
{
- if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 28;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 34:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
+ $_ngcc_current_state = 52;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
case 76:
@@ -695,18 +672,29 @@
}
}
break;
- case 2:
+ case 49:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- action1();
- NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 4, result);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 48;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 6:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
+ case 61:
+ {
+ $_ngcc_current_state = 35;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 46:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
@@ -718,10 +706,32 @@
}
}
break;
- case 47:
+ case 36:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 34;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 18:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 53, result);
+ NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 571, result);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 12:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 564, fa);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -729,6 +739,23 @@
}
}
break;
+ case 26:
+ {
+ $_ngcc_current_state = 7;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 34:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 38:
{
action8();
@@ -736,36 +763,17 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 49:
+ case 44:
{
- $_ngcc_current_state = 48;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 18:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
- NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 18, result);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
- case 51:
- {
- action13();
- $_ngcc_current_state = 49;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 54:
- {
- $_ngcc_current_state = 52;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 68:
{
if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -778,10 +786,33 @@
}
}
break;
- case 56:
+ case 1:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 80:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 66, fa);
+ if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 76;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 37:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 594, result);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -801,107 +832,11 @@
}
}
break;
- case 52:
- {
- $_ngcc_current_state = 51;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 12:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 11, fa);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 41:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 46, fa);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 36:
+ case 9:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 34;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 10:
- {
- $_ngcc_current_state = 9;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 80:
- {
- if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 76;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 72:
- {
- if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 68;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 59:
- {
- if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 6:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 1:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
+ NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 560, result);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -914,13 +849,7 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 39:
- {
- $_ngcc_current_state = 38;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 44:
+ case 15:
{
if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
$runtime.consumeAttribute($ai);
@@ -931,17 +860,6 @@
}
}
break;
- case 21:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 22, fa);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
case 48:
{
action11();
@@ -949,45 +867,11 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 61:
- {
- $_ngcc_current_state = 35;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 26:
- {
- $_ngcc_current_state = 7;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 37:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 41, result);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 67:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 83, fa);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 17:
+ case 47:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 6;
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 606, result);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -1005,17 +889,6 @@
}
}
break;
- case 9:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
- NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 7, result);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
case 24:
{
if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
@@ -1027,7 +900,99 @@
}
}
break;
- case 15:
+ case 29:
+ {
+ if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 28;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 67:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 636, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 10:
+ {
+ $_ngcc_current_state = 9;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 41:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 599, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 2:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+ action1();
+ NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 557, result);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 21:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 575, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 72:
+ {
+ if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 68;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 56:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 619, fa);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 39:
+ {
+ $_ngcc_current_state = 38;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 59:
{
if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
$runtime.consumeAttribute($ai);
@@ -1038,6 +1003,41 @@
}
}
break;
+ case 52:
+ {
+ $_ngcc_current_state = 51;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 17:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 6;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 51:
+ {
+ action13();
+ $_ngcc_current_state = 49;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 65:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -1052,9 +1052,49 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 65:
+ case 29:
+ {
+ if(($__uri.equals("") && $__local.equals("mixed"))) {
+ $_ngcc_current_state = 31;
+ }
+ else {
+ $_ngcc_current_state = 28;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 54:
+ {
+ $_ngcc_current_state = 52;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 10:
{
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 9;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 76:
+ {
+ if(($__uri.equals("") && $__local.equals("final"))) {
+ $_ngcc_current_state = 78;
+ }
+ else {
+ $_ngcc_current_state = 72;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 49:
+ {
+ $_ngcc_current_state = 48;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 61:
+ {
+ $_ngcc_current_state = 35;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -1069,26 +1109,10 @@
}
}
break;
- case 29:
+ case 39:
{
- if(($__uri.equals("") && $__local.equals("mixed"))) {
- $_ngcc_current_state = 31;
- }
- else {
- $_ngcc_current_state = 28;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 76:
- {
- if(($__uri.equals("") && $__local.equals("final"))) {
- $_ngcc_current_state = 78;
- }
- else {
- $_ngcc_current_state = 72;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
+ $_ngcc_current_state = 38;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 59:
@@ -1101,15 +1125,9 @@
}
}
break;
- case 19:
+ case 26:
{
- $_ngcc_current_state = 18;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 49:
- {
- $_ngcc_current_state = 48;
+ $_ngcc_current_state = 7;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -1120,12 +1138,6 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 39:
- {
- $_ngcc_current_state = 38;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 44:
{
if(($__uri.equals("") && $__local.equals("base"))) {
@@ -1136,17 +1148,26 @@
}
}
break;
- case 48:
+ case 68:
{
- action11();
- $_ngcc_current_state = 47;
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 70;
+ }
+ else {
+ $_ngcc_current_state = 67;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 52:
+ {
+ $_ngcc_current_state = 51;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 61:
+ case 0:
{
- $_ngcc_current_state = 35;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
}
break;
case 51:
@@ -1156,25 +1177,13 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 26:
- {
- $_ngcc_current_state = 7;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 54:
+ case 80:
{
- $_ngcc_current_state = 52;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 68:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 70;
+ if(($__uri.equals("") && $__local.equals("block"))) {
+ $_ngcc_current_state = 82;
}
else {
- $_ngcc_current_state = 67;
+ $_ngcc_current_state = 76;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
@@ -1190,32 +1199,33 @@
}
}
break;
- case 52:
+ case 19:
{
- $_ngcc_current_state = 51;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 10:
- {
- $_ngcc_current_state = 9;
+ $_ngcc_current_state = 18;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
+ case 15:
{
- revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("base"))) {
+ $_ngcc_current_state = 14;
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
}
break;
- case 80:
+ case 65:
{
- if(($__uri.equals("") && $__local.equals("block"))) {
- $_ngcc_current_state = 82;
- }
- else {
- $_ngcc_current_state = 76;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 48:
+ {
+ action11();
+ $_ngcc_current_state = 47;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 24:
@@ -1228,16 +1238,6 @@
}
}
break;
- case 15:
- {
- if(($__uri.equals("") && $__local.equals("base"))) {
- $_ngcc_current_state = 14;
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -1252,25 +1252,9 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 22:
+ case 54:
{
- if(($__uri.equals("") && $__local.equals("base"))) {
- $_ngcc_current_state = 21;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 65:
- {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 29:
- {
- $_ngcc_current_state = 28;
+ $_ngcc_current_state = 52;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -1280,64 +1264,12 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 38:
- {
- action8();
- $_ngcc_current_state = 37;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 49:
{
$_ngcc_current_state = 48;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 85:
- {
- if(($__uri.equals("") && $__local.equals("abstract"))) {
- $_ngcc_current_state = 80;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 13:
- {
- if(($__uri.equals("") && $__local.equals("base"))) {
- $_ngcc_current_state = 12;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 51:
- {
- action13();
- $_ngcc_current_state = 49;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 54:
- {
- $_ngcc_current_state = 52;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 68:
- {
- $_ngcc_current_state = 67;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 84:
- {
- $_ngcc_current_state = 80;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 30:
{
if(($__uri.equals("") && $__local.equals("mixed"))) {
@@ -1348,9 +1280,89 @@
}
}
break;
- case 52:
+ case 73:
+ {
+ if(($__uri.equals("") && $__local.equals("mixed"))) {
+ $_ngcc_current_state = 68;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 61:
+ {
+ $_ngcc_current_state = 35;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 26:
+ {
+ $_ngcc_current_state = 7;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 38:
+ {
+ action8();
+ $_ngcc_current_state = 37;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 68:
+ {
+ $_ngcc_current_state = 67;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 13:
{
- $_ngcc_current_state = 51;
+ if(($__uri.equals("") && $__local.equals("base"))) {
+ $_ngcc_current_state = 12;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 85:
+ {
+ if(($__uri.equals("") && $__local.equals("abstract"))) {
+ $_ngcc_current_state = 80;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 80:
+ {
+ $_ngcc_current_state = 76;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 84:
+ {
+ $_ngcc_current_state = 80;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 19:
+ {
+ $_ngcc_current_state = 18;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 48:
+ {
+ action11();
+ $_ngcc_current_state = 47;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 29:
+ {
+ $_ngcc_current_state = 28;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -1360,21 +1372,42 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
+ case 77:
{
- revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("final"))) {
+ $_ngcc_current_state = 72;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
}
break;
- case 80:
+ case 72:
{
- $_ngcc_current_state = 76;
+ $_ngcc_current_state = 68;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 57:
+ case 69:
+ {
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 67;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 39:
+ {
+ $_ngcc_current_state = 38;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 22:
{
if(($__uri.equals("") && $__local.equals("base"))) {
- $_ngcc_current_state = 56;
+ $_ngcc_current_state = 21;
}
else {
unexpectedLeaveAttribute($__qname);
@@ -1391,24 +1424,6 @@
}
}
break;
- case 72:
- {
- $_ngcc_current_state = 68;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 19:
- {
- $_ngcc_current_state = 18;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 39:
- {
- $_ngcc_current_state = 38;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 42:
{
if(($__uri.equals("") && $__local.equals("base"))) {
@@ -1419,55 +1434,40 @@
}
}
break;
- case 77:
+ case 52:
+ {
+ $_ngcc_current_state = 51;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("final"))) {
- $_ngcc_current_state = 72;
+ revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 51:
+ {
+ action13();
+ $_ngcc_current_state = 49;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 57:
+ {
+ if(($__uri.equals("") && $__local.equals("base"))) {
+ $_ngcc_current_state = 56;
}
else {
unexpectedLeaveAttribute($__qname);
}
}
break;
- case 48:
+ case 65:
{
- action11();
- $_ngcc_current_state = 47;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 61:
- {
- $_ngcc_current_state = 35;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 26:
- {
- $_ngcc_current_state = 7;
+ $_ngcc_current_state = 2;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 69:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 67;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 73:
- {
- if(($__uri.equals("") && $__local.equals("mixed"))) {
- $_ngcc_current_state = 68;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -1479,22 +1479,22 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 65:
+ case 58:
{
- $_ngcc_current_state = 2;
+ NGCCHandler h = new qname(this, super._source, $runtime, 621);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 54:
+ {
+ $_ngcc_current_state = 52;
$runtime.sendText(super._cookie, $value);
}
break;
- case 29:
+ case 31:
{
- if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 28;
- $runtime.sendText(super._cookie, $value);
- }
+ mixedValue = $value;
+ $_ngcc_current_state = 30;
}
break;
case 76:
@@ -1509,10 +1509,22 @@
}
}
break;
- case 23:
+ case 49:
+ {
+ $_ngcc_current_state = 48;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 61:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 24);
- spawnChildFromText(h, $value);
+ $_ngcc_current_state = 35;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 26:
+ {
+ $_ngcc_current_state = 7;
+ $runtime.sendText(super._cookie, $value);
}
break;
case 38:
@@ -1522,29 +1534,12 @@
$runtime.sendText(super._cookie, $value);
}
break;
- case 49:
- {
- $_ngcc_current_state = 48;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 43:
+ case 44:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 48);
- spawnChildFromText(h, $value);
- }
- break;
- case 51:
- {
- action13();
- $_ngcc_current_state = 49;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 54:
- {
- $_ngcc_current_state = 52;
- $runtime.sendText(super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
}
break;
case 68:
@@ -1559,6 +1554,18 @@
}
}
break;
+ case 80:
+ {
+ if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 76;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
case 84:
{
if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
@@ -1571,47 +1578,59 @@
}
}
break;
- case 52:
+ case 19:
+ {
+ $_ngcc_current_state = 18;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 15:
+ {
+ if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
+ case 86:
+ {
+ abstractValue = $value;
+ $_ngcc_current_state = 85;
+ }
+ break;
+ case 48:
{
- $_ngcc_current_state = 51;
+ action11();
+ $_ngcc_current_state = 47;
$runtime.sendText(super._cookie, $value);
}
break;
+ case 24:
+ {
+ if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
+ case 29:
+ {
+ if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 28;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
case 10:
{
$_ngcc_current_state = 9;
$runtime.sendText(super._cookie, $value);
}
break;
- case 0:
- {
- revertToParentFromText(result, super._cookie, $value);
- }
- break;
- case 80:
- {
- if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 76;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 58:
- {
- NGCCHandler h = new qname(this, super._source, $runtime, 68);
- spawnChildFromText(h, $value);
- }
- break;
- case 31:
- {
- mixedValue = $value;
- $_ngcc_current_state = 30;
- }
- break;
case 72:
{
if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
@@ -1624,16 +1643,16 @@
}
}
break;
- case 70:
+ case 43:
{
- name = $value;
- $_ngcc_current_state = 69;
+ NGCCHandler h = new qname(this, super._source, $runtime, 601);
+ spawnChildFromText(h, $value);
}
break;
- case 86:
+ case 39:
{
- abstractValue = $value;
- $_ngcc_current_state = 85;
+ $_ngcc_current_state = 38;
+ $runtime.sendText(super._cookie, $value);
}
break;
case 59:
@@ -1644,69 +1663,52 @@
}
}
break;
- case 19:
+ case 23:
{
- $_ngcc_current_state = 18;
- $runtime.sendText(super._cookie, $value);
+ NGCCHandler h = new qname(this, super._source, $runtime, 577);
+ spawnChildFromText(h, $value);
}
break;
- case 39:
+ case 52:
{
- $_ngcc_current_state = 38;
+ $_ngcc_current_state = 51;
$runtime.sendText(super._cookie, $value);
}
break;
- case 44:
+ case 78:
{
- if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 14:
- {
- NGCCHandler h = new qname(this, super._source, $runtime, 13);
+ NGCCHandler h = new erSet(this, super._source, $runtime, 648);
spawnChildFromText(h, $value);
}
break;
- case 48:
- {
- action11();
- $_ngcc_current_state = 47;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 61:
+ case 70:
{
- $_ngcc_current_state = 35;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 26:
- {
- $_ngcc_current_state = 7;
- $runtime.sendText(super._cookie, $value);
+ name = $value;
+ $_ngcc_current_state = 69;
}
break;
case 82:
{
- NGCCHandler h = new erSet(this, super._source, $runtime, 100);
+ NGCCHandler h = new erSet(this, super._source, $runtime, 653);
spawnChildFromText(h, $value);
}
break;
- case 78:
+ case 0:
{
- NGCCHandler h = new erSet(this, super._source, $runtime, 95);
- spawnChildFromText(h, $value);
+ revertToParentFromText(result, super._cookie, $value);
}
break;
- case 24:
+ case 51:
{
- if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
+ action13();
+ $_ngcc_current_state = 49;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 65:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendText(super._cookie, $value);
}
break;
case 74:
@@ -1715,12 +1717,10 @@
$_ngcc_current_state = 73;
}
break;
- case 15:
+ case 14:
{
- if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
+ NGCCHandler h = new qname(this, super._source, $runtime, 566);
+ spawnChildFromText(h, $value);
}
break;
}
@@ -1728,179 +1728,179 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 53:
+ case 573:
+ {
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 18;
+ }
+ break;
+ case 636:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 65;
+ }
+ break;
+ case 562:
{
- $_ngcc_current_state = 46;
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 9;
+ }
+ break;
+ case 577:
+ {
+ baseTypeName = ((UName)$__result__);
+ action6();
+ $_ngcc_current_state = 22;
+ }
+ break;
+ case 648:
+ {
+ finalValue = ((Integer)$__result__);
+ $_ngcc_current_state = 77;
+ }
+ break;
+ case 614:
+ {
+ baseContentType = ((SimpleTypeImpl)$__result__);
+ $_ngcc_current_state = 51;
}
break;
- case 18:
+ case 653:
+ {
+ blockValue = ((Integer)$__result__);
+ $_ngcc_current_state = 81;
+ }
+ break;
+ case 566:
+ {
+ baseTypeName = ((UName)$__result__);
+ action3();
+ $_ngcc_current_state = 13;
+ }
+ break;
+ case 621:
+ {
+ baseTypeName = ((UName)$__result__);
+ action14();
+ $_ngcc_current_state = 57;
+ }
+ break;
+ case 617:
+ {
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 52;
+ }
+ break;
+ case 610:
+ {
+ facet = ((XSFacet)$__result__);
+ action12();
+ $_ngcc_current_state = 48;
+ }
+ break;
+ case 626:
+ {
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 35;
+ }
+ break;
+ case 571:
{
explicitContent = ((ContentTypeImpl)$__result__);
action5();
$_ngcc_current_state = 17;
}
break;
- case 61:
- {
- baseContentType = ((SimpleTypeImpl)$__result__);
- $_ngcc_current_state = 51;
- }
- break;
- case 11:
+ case 564:
{
fa = ((ForeignAttributesImpl)$__result__);
$_ngcc_current_state = 10;
}
break;
- case 9:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 9;
- }
- break;
- case 44:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 38;
- }
- break;
- case 13:
- {
- baseTypeName = ((UName)$__result__);
- action3();
- $_ngcc_current_state = 13;
- }
- break;
- case 56:
- {
- facet = ((XSFacet)$__result__);
- action12();
- $_ngcc_current_state = 48;
- }
- break;
- case 29:
+ case 582:
{
annotation = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 7;
}
break;
- case 95:
+ case 628:
{
- finalValue = ((Integer)$__result__);
- $_ngcc_current_state = 77;
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 61;
}
break;
- case 83:
+ case 594:
{
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 65;
+ $_ngcc_current_state = 36;
}
break;
- case 7:
+ case 560:
{
explicitContent = ((ContentTypeImpl)$__result__);
action2();
$_ngcc_current_state = 8;
}
break;
- case 81:
+ case 606:
{
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 46;
+ }
+ break;
+ case 609:
+ {
+ facet = ((XSFacet)$__result__);
+ action12();
+ $_ngcc_current_state = 48;
}
break;
- case 24:
+ case 584:
{
- baseTypeName = ((UName)$__result__);
- action6();
- $_ngcc_current_state = 22;
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 26;
}
break;
- case 4:
+ case 599:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 39;
+ }
+ break;
+ case 557:
{
explicitContent = ((ContentTypeImpl)$__result__);
action0();
$_ngcc_current_state = 1;
}
break;
- case 57:
+ case 575:
{
- facet = ((XSFacet)$__result__);
- action12();
- $_ngcc_current_state = 48;
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 19;
}
break;
- case 48:
+ case 601:
{
baseTypeName = ((UName)$__result__);
action9();
$_ngcc_current_state = 42;
}
break;
- case 64:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 52;
- }
- break;
- case 66:
+ case 619:
{
fa = ((ForeignAttributesImpl)$__result__);
$_ngcc_current_state = 54;
}
break;
- case 46:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 39;
- }
- break;
- case 68:
+ case 597:
{
- baseTypeName = ((UName)$__result__);
- action14();
- $_ngcc_current_state = 57;
- }
- break;
- case 31:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 26;
- }
- break;
- case 75:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 61;
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 38;
}
break;
- case 20:
+ case 634:
{
annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 18;
- }
- break;
- case 22:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 19;
- }
- break;
- case 73:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 35;
- }
- break;
- case 100:
- {
- blockValue = ((Integer)$__result__);
- $_ngcc_current_state = 81;
- }
- break;
- case 41:
- {
- $_ngcc_current_state = 36;
+ $_ngcc_current_state = 2;
}
break;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java Fri Sep 06 15:09:44 2013 -0700
@@ -76,27 +76,27 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 0:
{
revertToParentFromEnterElement(particle, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
- case 1:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))) {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 2:
{
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
- NGCCHandler h = new particle(this, super._source, $runtime, 676);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")))))) {
+ NGCCHandler h = new particle(this, super._source, $runtime, 3);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -119,17 +119,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ break;
case 0:
{
revertToParentFromLeaveElement(particle, super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
- {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -150,17 +150,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ break;
case 0:
{
revertToParentFromEnterAttribute(particle, super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
- {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -181,17 +181,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner);
+ spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
+ }
+ break;
case 0:
{
revertToParentFromLeaveAttribute(particle, super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
- {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner);
- spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -209,17 +209,17 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ NGCCHandler h = new attributeUses(this, super._source, $runtime, 1, owner);
+ spawnChildFromText(h, $value);
+ }
+ break;
case 0:
{
revertToParentFromText(particle, super._cookie, $value);
}
break;
- case 1:
- {
- NGCCHandler h = new attributeUses(this, super._source, $runtime, 674, owner);
- spawnChildFromText(h, $value);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -231,13 +231,13 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 674:
+ case 1:
{
action0();
$_ngcc_current_state = 0;
}
break;
- case 676:
+ case 3:
{
particle = ((ParticleImpl)$__result__);
$_ngcc_current_state = 1;
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java Fri Sep 06 15:09:44 2013 -0700
@@ -107,51 +107,38 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 40:
+ case 17:
{
- if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 36;
+ $_ngcc_current_state = 13;
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
- case 1:
+ case 28:
{
- if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
- NGCCHandler h = new identityConstraint(this, super._source, $runtime, 112);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 0;
+ $_ngcc_current_state = 24;
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
- case 36:
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
+ NGCCHandler h = new identityConstraint(this, super._source, $runtime, 6);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 32;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 44:
- {
- if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 40;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
@@ -167,64 +154,6 @@
}
}
break;
- case 23:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 3:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 124);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- NGCCHandler h = new complexType(this, super._source, $runtime, 125);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- }
- }
- break;
- case 0:
- {
- if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
- NGCCHandler h = new identityConstraint(this, super._source, $runtime, 111);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 13:
- {
- if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 11;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 24:
{
if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
@@ -237,22 +166,57 @@
}
}
break;
- case 17:
+ case 11:
{
- if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 24, null,AnnotationContext.ELEMENT_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 3;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 23:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 13;
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 44:
+ {
+ if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 40;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 40:
+ {
+ if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 36;
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
case 48:
{
- if(((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","default"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -260,26 +224,62 @@
}
}
break;
- case 28:
+ case 1:
+ {
+ if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
+ NGCCHandler h = new identityConstraint(this, super._source, $runtime, 7);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 0;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 3:
{
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 19);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+ NGCCHandler h = new complexType(this, super._source, $runtime, 20);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ }
+ }
+ break;
+ case 13:
+ {
+ if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 24;
+ $_ngcc_current_state = 11;
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
- case 11:
+ case 36:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 129, null,AnnotationContext.ELEMENT_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 3;
+ $_ngcc_current_state = 32;
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
@@ -298,46 +298,33 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 40:
+ case 17:
{
- if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
- $_ngcc_current_state = 36;
+ $_ngcc_current_state = 13;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
}
break;
- case 1:
+ case 28:
{
- $_ngcc_current_state = 0;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 36:
- {
- if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
- $_ngcc_current_state = 32;
+ $_ngcc_current_state = 24;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
}
break;
- case 44:
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 40;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
+ revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
}
break;
case 32:
@@ -352,46 +339,6 @@
}
}
break;
- case 23:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 3:
- {
- if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 13:
- {
- if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 11;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
case 24:
{
if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
@@ -404,22 +351,51 @@
}
}
break;
- case 17:
+ case 11:
{
- if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
+ $_ngcc_current_state = 3;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 23:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
- $_ngcc_current_state = 13;
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 44:
+ {
+ if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 40;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 40:
+ {
+ if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 36;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
}
break;
case 48:
{
- if((($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 || ($ai = $runtime.getAttributeIndex("","default"))>=0))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -427,22 +403,46 @@
}
}
break;
- case 28:
+ case 1:
{
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ $_ngcc_current_state = 0;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 3:
+ {
+ if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
- $_ngcc_current_state = 24;
+ $_ngcc_current_state = 1;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
}
break;
- case 11:
+ case 13:
{
- $_ngcc_current_state = 3;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 11;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 36:
+ {
+ if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 32;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
}
break;
default:
@@ -459,43 +459,31 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 40:
+ case 17:
{
- if(($__uri.equals("") && $__local.equals("block"))) {
- $_ngcc_current_state = 42;
+ if(($__uri.equals("") && $__local.equals("nillable"))) {
+ $_ngcc_current_state = 19;
}
else {
- $_ngcc_current_state = 36;
+ $_ngcc_current_state = 13;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
break;
- case 1:
+ case 28:
{
- $_ngcc_current_state = 0;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 36:
- {
- if(($__uri.equals("") && $__local.equals("final"))) {
- $_ngcc_current_state = 38;
+ if(($__uri.equals("") && $__local.equals("fixed"))) {
+ $_ngcc_current_state = 30;
}
else {
- $_ngcc_current_state = 32;
+ $_ngcc_current_state = 24;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
break;
- case 44:
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("abstract"))) {
- $_ngcc_current_state = 46;
- }
- else {
- $_ngcc_current_state = 40;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
+ revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
}
break;
case 32:
@@ -509,43 +497,6 @@
}
}
break;
- case 23:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 22;
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
- case 3:
- {
- if(($__uri.equals("") && $__local.equals("type"))) {
- $_ngcc_current_state = 6;
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 13:
- {
- if(($__uri.equals("") && $__local.equals("substitutionGroup"))) {
- $_ngcc_current_state = 15;
- }
- else {
- $_ngcc_current_state = 11;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
case 24:
{
if(($__uri.equals("") && $__local.equals("form"))) {
@@ -557,21 +508,48 @@
}
}
break;
- case 17:
+ case 11:
{
- if(($__uri.equals("") && $__local.equals("nillable"))) {
- $_ngcc_current_state = 19;
+ $_ngcc_current_state = 3;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 23:
+ {
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 22;
}
else {
- $_ngcc_current_state = 13;
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
+ case 44:
+ {
+ if(($__uri.equals("") && $__local.equals("abstract"))) {
+ $_ngcc_current_state = 46;
+ }
+ else {
+ $_ngcc_current_state = 40;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 40:
+ {
+ if(($__uri.equals("") && $__local.equals("block"))) {
+ $_ngcc_current_state = 42;
+ }
+ else {
+ $_ngcc_current_state = 36;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
break;
case 48:
{
- if((($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("default"))))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
@@ -579,21 +557,43 @@
}
}
break;
- case 28:
+ case 1:
{
- if(($__uri.equals("") && $__local.equals("fixed"))) {
- $_ngcc_current_state = 30;
+ $_ngcc_current_state = 0;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 3:
+ {
+ if(($__uri.equals("") && $__local.equals("type"))) {
+ $_ngcc_current_state = 6;
}
else {
- $_ngcc_current_state = 24;
+ $_ngcc_current_state = 1;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
}
break;
- case 11:
+ case 13:
{
- $_ngcc_current_state = 3;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("substitutionGroup"))) {
+ $_ngcc_current_state = 15;
+ }
+ else {
+ $_ngcc_current_state = 11;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
+ case 36:
+ {
+ if(($__uri.equals("") && $__local.equals("final"))) {
+ $_ngcc_current_state = 38;
+ }
+ else {
+ $_ngcc_current_state = 32;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
}
break;
default:
@@ -610,16 +610,85 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 40:
+ case 21:
{
- $_ngcc_current_state = 36;
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 17;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 17:
+ {
+ $_ngcc_current_state = 13;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 14:
+ case 18:
+ {
+ if(($__uri.equals("") && $__local.equals("nillable"))) {
+ $_ngcc_current_state = 13;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 25:
+ {
+ if(($__uri.equals("") && $__local.equals("form"))) {
+ $_ngcc_current_state = 23;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 41:
+ {
+ if(($__uri.equals("") && $__local.equals("block"))) {
+ $_ngcc_current_state = 36;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 28:
{
- if(($__uri.equals("") && $__local.equals("substitutionGroup"))) {
- $_ngcc_current_state = 11;
+ $_ngcc_current_state = 24;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 32:
+ {
+ $_ngcc_current_state = 28;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 24:
+ {
+ $_ngcc_current_state = 23;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 11:
+ {
+ $_ngcc_current_state = 3;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 33:
+ {
+ if(($__uri.equals("") && $__local.equals("default"))) {
+ $_ngcc_current_state = 28;
}
else {
unexpectedLeaveAttribute($__qname);
@@ -636,89 +705,60 @@
}
}
break;
- case 1:
+ case 44:
{
- $_ngcc_current_state = 0;
+ $_ngcc_current_state = 40;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 33:
+ case 14:
{
- if(($__uri.equals("") && $__local.equals("default"))) {
- $_ngcc_current_state = 28;
+ if(($__uri.equals("") && $__local.equals("substitutionGroup"))) {
+ $_ngcc_current_state = 11;
}
else {
unexpectedLeaveAttribute($__qname);
}
}
break;
- case 21:
+ case 40:
{
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 17;
+ $_ngcc_current_state = 36;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 45:
+ {
+ if(($__uri.equals("") && $__local.equals("abstract"))) {
+ $_ngcc_current_state = 40;
}
else {
unexpectedLeaveAttribute($__qname);
}
}
break;
- case 36:
+ case 1:
{
- $_ngcc_current_state = 32;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 44:
- {
- $_ngcc_current_state = 40;
+ $_ngcc_current_state = 0;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 41:
- {
- if(($__uri.equals("") && $__local.equals("block"))) {
- $_ngcc_current_state = 36;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
case 3:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 32:
+ case 13:
{
- $_ngcc_current_state = 28;
+ $_ngcc_current_state = 11;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 29:
- {
- if(($__uri.equals("") && $__local.equals("fixed"))) {
- $_ngcc_current_state = 24;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 18:
+ case 36:
{
- if(($__uri.equals("") && $__local.equals("nillable"))) {
- $_ngcc_current_state = 13;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 32;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 5:
@@ -732,50 +772,10 @@
}
}
break;
- case 13:
- {
- $_ngcc_current_state = 11;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 25:
- {
- if(($__uri.equals("") && $__local.equals("form"))) {
- $_ngcc_current_state = 23;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 24:
+ case 29:
{
- $_ngcc_current_state = 23;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 28:
- {
- $_ngcc_current_state = 24;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 17:
- {
- $_ngcc_current_state = 13;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 11:
- {
- $_ngcc_current_state = 3;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 45:
- {
- if(($__uri.equals("") && $__local.equals("abstract"))) {
- $_ngcc_current_state = 40;
+ if(($__uri.equals("") && $__local.equals("fixed"))) {
+ $_ngcc_current_state = 24;
}
else {
unexpectedLeaveAttribute($__qname);
@@ -793,82 +793,38 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 40:
+ case 17:
{
- if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
- $_ngcc_current_state = 36;
+ $_ngcc_current_state = 13;
$runtime.sendText(super._cookie, $value);
}
}
break;
+ case 34:
+ {
+ defaultValue = $value;
+ $_ngcc_current_state = 33;
+ }
+ break;
case 22:
{
name = $value;
$_ngcc_current_state = 21;
}
break;
- case 1:
- {
- $_ngcc_current_state = 0;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 30:
+ case 28:
{
- fixedValue = $value;
- $_ngcc_current_state = 29;
- }
- break;
- case 46:
- {
- abstractValue = $value;
- $_ngcc_current_state = 45;
- }
- break;
- case 36:
- {
- if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
- $_ngcc_current_state = 32;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 44:
- {
- if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 40;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 3:
- {
- if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 23:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
+ $_ngcc_current_state = 24;
$runtime.sendText(super._cookie, $value);
}
}
@@ -885,53 +841,15 @@
}
}
break;
- case 42:
- {
- NGCCHandler h = new ersSet(this, super._source, $runtime, 165);
- spawnChildFromText(h, $value);
- }
- break;
- case 6:
- {
- NGCCHandler h = new qname(this, super._source, $runtime, 115);
- spawnChildFromText(h, $value);
- }
- break;
- case 19:
- {
- nillable = $value;
- $_ngcc_current_state = 18;
- }
- break;
case 0:
{
revertToParentFromText(makeResult(), super._cookie, $value);
}
break;
- case 13:
+ case 6:
{
- if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 11;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
- case 26:
- {
- if($value.equals("unqualified")) {
- NGCCHandler h = new qualification(this, super._source, $runtime, 145);
- spawnChildFromText(h, $value);
- }
- else {
- if($value.equals("qualified")) {
- NGCCHandler h = new qualification(this, super._source, $runtime, 145);
- spawnChildFromText(h, $value);
- }
- }
+ NGCCHandler h = new qname(this, super._source, $runtime, 10);
+ spawnChildFromText(h, $value);
}
break;
case 24:
@@ -946,64 +864,90 @@
}
}
break;
- case 28:
+ case 11:
+ {
+ $_ngcc_current_state = 3;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 23:
{
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
+ case 44:
+ {
+ if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
- $_ngcc_current_state = 24;
+ $_ngcc_current_state = 40;
$runtime.sendText(super._cookie, $value);
}
}
break;
- case 17:
+ case 46:
+ {
+ abstractValue = $value;
+ $_ngcc_current_state = 45;
+ }
+ break;
+ case 19:
{
- if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
+ nillable = $value;
+ $_ngcc_current_state = 18;
+ }
+ break;
+ case 40:
+ {
+ if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
$runtime.consumeAttribute($ai);
$runtime.sendText(super._cookie, $value);
}
else {
- $_ngcc_current_state = 13;
+ $_ngcc_current_state = 36;
$runtime.sendText(super._cookie, $value);
}
}
break;
case 48:
{
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromText(h, $value);
}
else {
if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromText(h, $value);
}
else {
if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 69, fa);
spawnChildFromText(h, $value);
}
}
@@ -1014,28 +958,84 @@
}
}
break;
- case 15:
+ case 30:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 132);
- spawnChildFromText(h, $value);
+ fixedValue = $value;
+ $_ngcc_current_state = 29;
+ }
+ break;
+ case 1:
+ {
+ $_ngcc_current_state = 0;
+ $runtime.sendText(super._cookie, $value);
}
break;
- case 11:
+ case 3:
{
- $_ngcc_current_state = 3;
- $runtime.sendText(super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
+ case 13:
+ {
+ if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 11;
+ $runtime.sendText(super._cookie, $value);
+ }
}
break;
case 38:
{
- NGCCHandler h = new erSet(this, super._source, $runtime, 160);
+ NGCCHandler h = new erSet(this, super._source, $runtime, 55);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 15:
+ {
+ NGCCHandler h = new qname(this, super._source, $runtime, 27);
spawnChildFromText(h, $value);
}
break;
- case 34:
+ case 26:
{
- defaultValue = $value;
- $_ngcc_current_state = 33;
+ if($value.equals("unqualified")) {
+ NGCCHandler h = new qualification(this, super._source, $runtime, 40);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if($value.equals("qualified")) {
+ NGCCHandler h = new qualification(this, super._source, $runtime, 40);
+ spawnChildFromText(h, $value);
+ }
+ }
+ }
+ break;
+ case 36:
+ {
+ if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 32;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
+ case 42:
+ {
+ NGCCHandler h = new ersSet(this, super._source, $runtime, 60);
+ spawnChildFromText(h, $value);
}
break;
}
@@ -1043,81 +1043,81 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 145:
+ case 24:
+ {
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 3;
+ }
+ break;
+ case 27:
+ {
+ substRef = ((UName)$__result__);
+ action2();
+ $_ngcc_current_state = 14;
+ }
+ break;
+ case 10:
+ {
+ typeName = ((UName)$__result__);
+ $_ngcc_current_state = 5;
+ }
+ break;
+ case 60:
+ {
+ blockValue = ((Integer)$__result__);
+ $_ngcc_current_state = 41;
+ }
+ break;
+ case 69:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 44;
+ }
+ break;
+ case 19:
+ {
+ type = ((SimpleTypeImpl)$__result__);
+ $_ngcc_current_state = 1;
+ }
+ break;
+ case 20:
+ {
+ type = ((ComplexTypeImpl)$__result__);
+ $_ngcc_current_state = 1;
+ }
+ break;
+ case 40:
{
form = ((Boolean)$__result__).booleanValue();
action3();
$_ngcc_current_state = 25;
}
break;
- case 174:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 44;
- }
- break;
- case 129:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 3;
- }
- break;
- case 115:
- {
- typeName = ((UName)$__result__);
- $_ngcc_current_state = 5;
- }
- break;
- case 165:
- {
- blockValue = ((Integer)$__result__);
- $_ngcc_current_state = 41;
- }
- break;
- case 111:
+ case 6:
{
idc = ((IdentityConstraintImpl)$__result__);
action0();
$_ngcc_current_state = 0;
}
break;
- case 132:
- {
- substRef = ((UName)$__result__);
- action2();
- $_ngcc_current_state = 14;
- }
- break;
- case 124:
- {
- type = ((SimpleTypeImpl)$__result__);
- $_ngcc_current_state = 1;
- }
- break;
- case 125:
- {
- type = ((ComplexTypeImpl)$__result__);
- $_ngcc_current_state = 1;
- }
- break;
- case 160:
- {
- finalValue = ((Integer)$__result__);
- $_ngcc_current_state = 37;
- }
- break;
- case 112:
+ case 7:
{
idc = ((IdentityConstraintImpl)$__result__);
action0();
$_ngcc_current_state = 0;
}
break;
+ case 55:
+ {
+ finalValue = ((Integer)$__result__);
+ $_ngcc_current_state = 37;
+ }
+ break;
}
}
public boolean accepted() {
- return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 3) || (($_ngcc_current_state == 0) || (($_ngcc_current_state == 11) || (($_ngcc_current_state == 17) || ($_ngcc_current_state == 13)))))));
+ return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 0) || (($_ngcc_current_state == 3) || (($_ngcc_current_state == 17) || (($_ngcc_current_state == 13) || ($_ngcc_current_state == 11)))))));
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java Fri Sep 06 15:09:44 2013 -0700
@@ -143,17 +143,17 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromText(makeResult(), super._cookie, $value);
+ }
+ break;
case 1:
{
v = $value;
$_ngcc_current_state = 0;
}
break;
- case 0:
- {
- revertToParentFromText(makeResult(), super._cookie, $value);
- }
- break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java Fri Sep 06 15:09:44 2013 -0700
@@ -143,17 +143,17 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromText(makeResult(), super._cookie, $value);
+ }
+ break;
case 1:
{
v = $value;
$_ngcc_current_state = 0;
}
break;
- case 0:
- {
- revertToParentFromText(makeResult(), super._cookie, $value);
- }
- break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java Fri Sep 06 15:09:44 2013 -0700
@@ -85,18 +85,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 418, null,AnnotationContext.SIMPLETYPE_DECL);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 12:
{
if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
@@ -109,26 +97,10 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 11:
- {
- if(($ai = $runtime.getAttributeIndex("","value"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 4:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 420, fa);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 230, fa);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -148,6 +120,34 @@
}
}
break;
+ case 11:
+ {
+ if(($ai = $runtime.getAttributeIndex("","value"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 2:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 228, null,AnnotationContext.SIMPLETYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -162,44 +162,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 1:
- {
- if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
- action0();
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 11:
- {
- if(($ai = $runtime.getAttributeIndex("","value"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
case 4:
{
if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 420, fa);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 230, fa);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -219,6 +185,40 @@
}
}
break;
+ case 1:
+ {
+ if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ action0();
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 11:
+ {
+ if(($ai = $runtime.getAttributeIndex("","value"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -233,15 +233,15 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
+ case 5:
{
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("fixed"))) {
+ $_ngcc_current_state = 7;
+ }
+ else {
+ $_ngcc_current_state = 4;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
}
break;
case 11:
@@ -254,15 +254,15 @@
}
}
break;
- case 5:
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("fixed"))) {
- $_ngcc_current_state = 7;
- }
- else {
- $_ngcc_current_state = 4;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
+ revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -279,10 +279,25 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
+ case 5:
+ {
+ $_ngcc_current_state = 4;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 9:
{
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("value"))) {
+ $_ngcc_current_state = 5;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
}
break;
case 6:
@@ -295,24 +310,9 @@
}
}
break;
- case 0:
- {
- revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 9:
+ case 2:
{
- if(($__uri.equals("") && $__local.equals("value"))) {
- $_ngcc_current_state = 5;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 5:
- {
- $_ngcc_current_state = 4;
+ $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -327,15 +327,16 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 2:
+ case 5:
{
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 0:
- {
- revertToParentFromText(result, super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 4;
+ $runtime.sendText(super._cookie, $value);
+ }
}
break;
case 7:
@@ -358,16 +359,15 @@
$_ngcc_current_state = 9;
}
break;
- case 5:
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 4;
- $runtime.sendText(super._cookie, $value);
- }
+ revertToParentFromText(result, super._cookie, $value);
+ }
+ break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
}
break;
}
@@ -375,18 +375,18 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 418:
+ case 230:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 2;
+ }
+ break;
+ case 228:
{
annotation = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 1;
}
break;
- case 420:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 2;
- }
- break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java Fri Sep 06 15:09:44 2013 -0700
@@ -95,34 +95,22 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 15:
+ case 10:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- action2();
- $_ngcc_current_state = 11;
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
else {
unexpectedEnterElement($__qname);
}
}
break;
- case 3:
- {
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) {
- NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 593, mloc,compositorName);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 4:
+ case 5:
{
if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 3;
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 357, null);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
unexpectedEnterElement($__qname);
@@ -141,32 +129,10 @@
}
}
break;
- case 5:
- {
- if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 595, null);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 10:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 6:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 597, null,AnnotationContext.MODELGROUP_DECL);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 359, null,AnnotationContext.MODELGROUP_DECL);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -180,6 +146,40 @@
revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
+ case 4:
+ {
+ if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 3;
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 15:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ action2();
+ $_ngcc_current_state = 11;
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 3:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))))))) {
+ NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 355, mloc,compositorName);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -194,22 +194,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 3:
+ case 10:
{
- if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
- NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 593, mloc,compositorName);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 2:
- {
- if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 1;
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -240,17 +229,6 @@
}
}
break;
- case 10:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
case 6:
{
$_ngcc_current_state = 5;
@@ -262,6 +240,28 @@
revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 2:
+ {
+ if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 3:
+ {
+ if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
+ NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 355, mloc,compositorName);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -276,6 +276,16 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 10:
+ {
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 9;
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
case 11:
{
if(($__uri.equals("") && $__local.equals("ID"))) {
@@ -287,16 +297,6 @@
}
}
break;
- case 10:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 9;
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
case 6:
{
$_ngcc_current_state = 5;
@@ -322,32 +322,12 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 12:
- {
- if(($__uri.equals("") && $__local.equals("ID"))) {
- $_ngcc_current_state = 10;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
case 11:
{
$_ngcc_current_state = 10;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 8:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 6;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
case 6:
{
$_ngcc_current_state = 5;
@@ -359,6 +339,26 @@
revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 12:
+ {
+ if(($__uri.equals("") && $__local.equals("ID"))) {
+ $_ngcc_current_state = 10;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 8:
+ {
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 6;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -370,15 +370,12 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 13:
+ case 10:
{
- $_ngcc_current_state = 12;
- }
- break;
- case 9:
- {
- name = $value;
- $_ngcc_current_state = 8;
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
}
break;
case 11:
@@ -393,14 +390,6 @@
}
}
break;
- case 10:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
case 6:
{
$_ngcc_current_state = 5;
@@ -412,30 +401,41 @@
revertToParentFromText(result, super._cookie, $value);
}
break;
+ case 9:
+ {
+ name = $value;
+ $_ngcc_current_state = 8;
+ }
+ break;
+ case 13:
+ {
+ $_ngcc_current_state = 12;
+ }
+ break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 593:
- {
- term = ((ModelGroupImpl)$__result__);
- $_ngcc_current_state = 2;
- }
- break;
- case 595:
+ case 357:
{
fa = ((ForeignAttributesImpl)$__result__);
action1();
$_ngcc_current_state = 4;
}
break;
- case 597:
+ case 359:
{
annotation = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 5;
}
break;
+ case 355:
+ {
+ term = ((ModelGroupImpl)$__result__);
+ $_ngcc_current_state = 2;
+ }
+ break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java Fri Sep 06 15:09:44 2013 -0700
@@ -96,6 +96,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 16:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
@@ -107,43 +118,15 @@
}
}
break;
- case 17:
+ case 0:
{
- if((($ai = $runtime.getAttributeIndex("","name"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 254, null);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
+ revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
- NGCCHandler h = new xpath(this, super._source, $runtime, 241);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 16:
+ case 17:
{
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 3:
- {
- if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
- NGCCHandler h = new xpath(this, super._source, $runtime, 237);
+ if((($ai = $runtime.getAttributeIndex("","name"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 287, null);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -162,6 +145,52 @@
}
}
break;
+ case 18:
+ {
+ if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ action2();
+ $_ngcc_current_state = 17;
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 3:
+ {
+ if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+ NGCCHandler h = new xpath(this, super._source, $runtime, 270);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 4:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
+ $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+ $_ngcc_current_state = 3;
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 8:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 277, null,AnnotationContext.IDENTITY_CONSTRAINT);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 7;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 10:
{
if(($ai = $runtime.getAttributeIndex("","refer"))>=0) {
@@ -174,42 +203,13 @@
}
}
break;
- case 0:
+ case 6:
{
- revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 8:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 244, null,AnnotationContext.IDENTITY_CONSTRAINT);
+ if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+ NGCCHandler h = new xpath(this, super._source, $runtime, 274);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 7;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 18:
- {
- if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- action2();
- $_ngcc_current_state = 17;
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 4:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
- $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 3;
- }
- else {
unexpectedEnterElement($__qname);
}
}
@@ -228,33 +228,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 1:
- {
- if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 17:
+ case 5:
{
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 254, null);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 6:
- {
- if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")))) {
- NGCCHandler h = new xpath(this, super._source, $runtime, 241);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 4;
}
else {
unexpectedLeaveElement($__qname);
@@ -272,10 +250,37 @@
}
}
break;
- case 3:
+ case 1:
+ {
+ if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 2:
{
- if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field")))) {
- NGCCHandler h = new xpath(this, super._source, $runtime, 237);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 17:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 287, null);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -283,6 +288,23 @@
}
}
break;
+ case 3:
+ {
+ if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field")))) {
+ NGCCHandler h = new xpath(this, super._source, $runtime, 270);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 8:
+ {
+ $_ngcc_current_state = 7;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 10:
{
if(($ai = $runtime.getAttributeIndex("","refer"))>=0) {
@@ -295,39 +317,17 @@
}
}
break;
- case 5:
+ case 6:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 4;
+ if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")))) {
+ NGCCHandler h = new xpath(this, super._source, $runtime, 274);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
- case 0:
- {
- revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 2:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 1;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 8:
- {
- $_ngcc_current_state = 7;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveElement($__qname);
@@ -342,28 +342,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 17:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 254, null);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
- case 6:
- {
- if(($__uri.equals("") && $__local.equals("xpath"))) {
- NGCCHandler h = new xpath(this, super._source, $runtime, 241);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
case 16:
{
if(($__uri.equals("") && $__local.equals("name"))) {
@@ -374,10 +352,15 @@
}
}
break;
- case 3:
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("xpath"))) {
- NGCCHandler h = new xpath(this, super._source, $runtime, 237);
+ revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 17:
+ {
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 287, null);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
@@ -385,6 +368,23 @@
}
}
break;
+ case 3:
+ {
+ if(($__uri.equals("") && $__local.equals("xpath"))) {
+ NGCCHandler h = new xpath(this, super._source, $runtime, 270);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
+ case 8:
+ {
+ $_ngcc_current_state = 7;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 10:
{
if(($__uri.equals("") && $__local.equals("refer"))) {
@@ -396,15 +396,15 @@
}
}
break;
- case 0:
+ case 6:
{
- revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 8:
- {
- $_ngcc_current_state = 7;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("xpath"))) {
+ NGCCHandler h = new xpath(this, super._source, $runtime, 274);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
}
break;
default:
@@ -421,6 +421,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 14:
{
if(($__uri.equals("") && $__local.equals("name"))) {
@@ -431,6 +436,18 @@
}
}
break;
+ case 8:
+ {
+ $_ngcc_current_state = 7;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 10:
+ {
+ $_ngcc_current_state = 8;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 11:
{
if(($__uri.equals("") && $__local.equals("refer"))) {
@@ -441,23 +458,6 @@
}
}
break;
- case 10:
- {
- $_ngcc_current_state = 8;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 8:
- {
- $_ngcc_current_state = 7;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -469,20 +469,10 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 17:
+ case 15:
{
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 254, null);
- spawnChildFromText(h, $value);
- }
- }
- break;
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
- NGCCHandler h = new xpath(this, super._source, $runtime, 241);
- spawnChildFromText(h, $value);
- }
+ name = $value;
+ $_ngcc_current_state = 14;
}
break;
case 16:
@@ -493,18 +483,37 @@
}
}
break;
- case 3:
+ case 0:
+ {
+ revertToParentFromText(makeResult(), super._cookie, $value);
+ }
+ break;
+ case 12:
{
- if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
- NGCCHandler h = new xpath(this, super._source, $runtime, 237);
+ NGCCHandler h = new qname(this, super._source, $runtime, 280);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 17:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 287, null);
spawnChildFromText(h, $value);
}
}
break;
- case 15:
+ case 3:
{
- name = $value;
- $_ngcc_current_state = 14;
+ if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+ NGCCHandler h = new xpath(this, super._source, $runtime, 270);
+ spawnChildFromText(h, $value);
+ }
+ }
+ break;
+ case 8:
+ {
+ $_ngcc_current_state = 7;
+ $runtime.sendText(super._cookie, $value);
}
break;
case 10:
@@ -519,21 +528,12 @@
}
}
break;
- case 0:
- {
- revertToParentFromText(makeResult(), super._cookie, $value);
- }
- break;
- case 12:
+ case 6:
{
- NGCCHandler h = new qname(this, super._source, $runtime, 247);
- spawnChildFromText(h, $value);
- }
- break;
- case 8:
- {
- $_ngcc_current_state = 7;
- $runtime.sendText(super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+ NGCCHandler h = new xpath(this, super._source, $runtime, 274);
+ spawnChildFromText(h, $value);
+ }
}
break;
}
@@ -541,36 +541,36 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 241:
- {
- selector = ((XPathImpl)$__result__);
- $_ngcc_current_state = 5;
- }
- break;
- case 237:
+ case 270:
{
field = ((XPathImpl)$__result__);
action0();
$_ngcc_current_state = 2;
}
break;
- case 244:
+ case 287:
{
- ann = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 7;
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 16;
}
break;
- case 247:
+ case 280:
{
ref = ((UName)$__result__);
action1();
$_ngcc_current_state = 11;
}
break;
- case 254:
+ case 277:
{
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 16;
+ ann = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 7;
+ }
+ break;
+ case 274:
+ {
+ selector = ((XPathImpl)$__result__);
+ $_ngcc_current_state = 5;
}
break;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java Fri Sep 06 15:09:44 2013 -0700
@@ -78,9 +78,16 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
+ case 4:
{
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
}
break;
case 8:
@@ -109,7 +116,7 @@
case 2:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 498, null,AnnotationContext.SCHEMA);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 340, null,AnnotationContext.SCHEMA);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -118,16 +125,9 @@
}
}
break;
- case 4:
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
default:
@@ -144,9 +144,16 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
+ case 4:
{
- revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+ if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
}
break;
case 8:
@@ -161,6 +168,12 @@
}
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) {
@@ -173,22 +186,9 @@
}
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 4:
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
+ revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -205,9 +205,15 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
+ case 4:
{
- revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
+ $_ngcc_current_state = 6;
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
}
break;
case 8:
@@ -227,15 +233,9 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 4:
+ case 0:
{
- if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
- $_ngcc_current_state = 6;
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
+ revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -262,9 +262,10 @@
}
}
break;
- case 0:
+ case 4:
{
- revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 8:
@@ -273,12 +274,6 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 5:
{
if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
@@ -289,12 +284,17 @@
}
}
break;
- case 4:
+ case 2:
{
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -306,9 +306,16 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 0:
+ case 4:
{
- revertToParentFromText(this, super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendText(super._cookie, $value);
+ }
}
break;
case 8:
@@ -323,10 +330,10 @@
}
}
break;
- case 6:
+ case 10:
{
- schemaLocation = $value;
- $_ngcc_current_state = 5;
+ ns = $value;
+ $_ngcc_current_state = 9;
}
break;
case 2:
@@ -335,22 +342,15 @@
$runtime.sendText(super._cookie, $value);
}
break;
- case 4:
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendText(super._cookie, $value);
- }
+ revertToParentFromText(this, super._cookie, $value);
}
break;
- case 10:
+ case 6:
{
- ns = $value;
- $_ngcc_current_state = 9;
+ schemaLocation = $value;
+ $_ngcc_current_state = 5;
}
break;
}
@@ -358,7 +358,7 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 498:
+ case 340:
{
$_ngcc_current_state = 1;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java Fri Sep 06 15:09:44 2013 -0700
@@ -74,21 +74,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 2:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 610, null,AnnotationContext.SCHEMA);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 372, null,AnnotationContext.SCHEMA);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -97,6 +86,11 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
case 7:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) {
@@ -108,9 +102,15 @@
}
}
break;
- case 0:
+ case 6:
{
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
}
break;
default:
@@ -127,17 +127,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) {
@@ -161,6 +150,17 @@
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 6:
+ {
+ if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -175,16 +175,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 6:
- {
- if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
- $_ngcc_current_state = 5;
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -196,6 +186,16 @@
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 6:
+ {
+ if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
+ $_ngcc_current_state = 5;
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -210,16 +210,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 4:
- {
- if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
- $_ngcc_current_state = 2;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
@@ -231,6 +221,16 @@
revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 4:
+ {
+ if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
+ $_ngcc_current_state = 2;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -242,6 +242,17 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromText(this, super._cookie, $value);
+ }
+ break;
case 5:
{
schemaLocation = $value;
@@ -256,23 +267,12 @@
}
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 0:
- {
- revertToParentFromText(this, super._cookie, $value);
- }
- break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 610:
+ case 372:
{
$_ngcc_current_state = 1;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java Fri Sep 06 15:09:44 2013 -0700
@@ -97,10 +97,27 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 4:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 174, null,AnnotationContext.MODELGROUP);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 2:
{
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
- NGCCHandler h = new particle(this, super._source, $runtime, 515);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")))))) {
+ NGCCHandler h = new particle(this, super._source, $runtime, 171);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -111,20 +128,20 @@
break;
case 6:
{
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
}
break;
case 1:
{
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
- NGCCHandler h = new particle(this, super._source, $runtime, 514);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")))))) {
+ NGCCHandler h = new particle(this, super._source, $runtime, 170);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -134,23 +151,6 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 4:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 518, null,AnnotationContext.MODELGROUP);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
default:
{
unexpectedEnterElement($__qname);
@@ -165,6 +165,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 4:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 2:
{
$_ngcc_current_state = 1;
@@ -173,7 +184,7 @@
break;
case 6:
{
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
break;
@@ -184,17 +195,6 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 4:
- {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveElement($__qname);
@@ -209,6 +209,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 4:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 2:
{
$_ngcc_current_state = 1;
@@ -217,7 +228,7 @@
break;
case 6:
{
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
break;
@@ -228,17 +239,6 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 4:
- {
- $_ngcc_current_state = 2;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -253,6 +253,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 4:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 2:
{
$_ngcc_current_state = 1;
@@ -261,7 +272,7 @@
break;
case 6:
{
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null);
spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
}
break;
@@ -272,17 +283,6 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 4:
- {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -294,25 +294,6 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 6:
- {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 520, null);
- spawnChildFromText(h, $value);
- }
- break;
- case 1:
- {
- action0();
- $_ngcc_current_state = 0;
- $runtime.sendText(super._cookie, $value);
- }
- break;
case 0:
{
revertToParentFromText(result, super._cookie, $value);
@@ -324,42 +305,61 @@
$runtime.sendText(super._cookie, $value);
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 6:
+ {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 176, null);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 1:
+ {
+ action0();
+ $_ngcc_current_state = 0;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 520:
+ case 174:
+ {
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 2;
+ }
+ break;
+ case 176:
{
fa = ((ForeignAttributesImpl)$__result__);
$_ngcc_current_state = 4;
}
break;
- case 515:
+ case 171:
{
childParticle = ((ParticleImpl)$__result__);
action1();
$_ngcc_current_state = 1;
}
break;
- case 514:
+ case 170:
{
childParticle = ((ParticleImpl)$__result__);
action1();
$_ngcc_current_state = 1;
}
break;
- case 518:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 2;
- }
- break;
}
}
public boolean accepted() {
- return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 4) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 2)))));
+ return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 2) || (($_ngcc_current_state == 4) || ($_ngcc_current_state == 0)))));
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java Fri Sep 06 15:09:44 2013 -0700
@@ -78,26 +78,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
- {
- revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 15:
- {
- if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
case 2:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 539, null,AnnotationContext.NOTATION);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 209, null,AnnotationContext.NOTATION);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -106,41 +90,6 @@
}
}
break;
- case 4:
- {
- if(($ai = $runtime.getAttributeIndex("","system"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 14:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 8:
- {
- if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 4;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 16:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
@@ -153,6 +102,57 @@
}
}
break;
+ case 14:
+ {
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 15:
+ {
+ if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 4:
+ {
+ if(($ai = $runtime.getAttributeIndex("","system"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 8:
+ {
+ if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 4;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -167,16 +167,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
+ case 2:
{
- revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
+ case 14:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -186,7 +187,7 @@
case 15:
{
if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -194,12 +195,6 @@
}
}
break;
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 4:
{
if(($ai = $runtime.getAttributeIndex("","system"))>=0) {
@@ -212,11 +207,11 @@
}
}
break;
- case 14:
+ case 1:
{
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
}
else {
unexpectedLeaveElement($__qname);
@@ -235,6 +230,11 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -249,26 +249,31 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
+ case 2:
{
- revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 15:
+ case 14:
{
if(($__uri.equals("") && $__local.equals("name"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 13;
}
else {
unexpectedEnterAttribute($__qname);
}
}
break;
- case 2:
+ case 15:
{
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
}
break;
case 4:
@@ -282,16 +287,6 @@
}
}
break;
- case 14:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 13;
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
case 8:
{
if(($__uri.equals("") && $__local.equals("public"))) {
@@ -303,6 +298,11 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -317,39 +317,12 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
- {
- revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 4:
- {
- $_ngcc_current_state = 2;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 5:
- {
- if(($__uri.equals("") && $__local.equals("system"))) {
- $_ngcc_current_state = 2;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 8:
- {
- $_ngcc_current_state = 4;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 9:
{
if(($__uri.equals("") && $__local.equals("public"))) {
@@ -370,6 +343,33 @@
}
}
break;
+ case 5:
+ {
+ if(($__uri.equals("") && $__local.equals("system"))) {
+ $_ngcc_current_state = 2;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 4:
+ {
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 8:
+ {
+ $_ngcc_current_state = 4;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -381,9 +381,10 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 0:
+ case 2:
{
- revertToParentFromText(makeResult(), super._cookie, $value);
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
}
break;
case 10:
@@ -392,24 +393,20 @@
$_ngcc_current_state = 9;
}
break;
- case 15:
+ case 14:
{
if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
- spawnChildFromText(h, $value);
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
}
}
break;
- case 2:
+ case 15:
{
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 13:
- {
- name = $value;
- $_ngcc_current_state = 12;
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null);
+ spawnChildFromText(h, $value);
+ }
}
break;
case 4:
@@ -424,20 +421,6 @@
}
}
break;
- case 6:
- {
- sys = $value;
- $_ngcc_current_state = 5;
- }
- break;
- case 14:
- {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
case 8:
{
if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
@@ -450,23 +433,40 @@
}
}
break;
+ case 13:
+ {
+ name = $value;
+ $_ngcc_current_state = 12;
+ }
+ break;
+ case 6:
+ {
+ sys = $value;
+ $_ngcc_current_state = 5;
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromText(makeResult(), super._cookie, $value);
+ }
+ break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 554:
+ case 209:
+ {
+ ann = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 1;
+ }
+ break;
+ case 224:
{
fa = ((ForeignAttributesImpl)$__result__);
$_ngcc_current_state = 14;
}
break;
- case 539:
- {
- ann = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 1;
- }
- break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java Fri Sep 06 15:09:44 2013 -0700
@@ -83,18 +83,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 5:
- {
- if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 1:
{
if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
@@ -112,6 +100,18 @@
revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
+ case 5:
+ {
+ if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
default:
{
unexpectedEnterElement($__qname);
@@ -126,18 +126,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 5:
- {
- if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
case 1:
{
if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
@@ -155,6 +143,18 @@
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 5:
+ {
+ if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -169,17 +169,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 5:
- {
- if(($__uri.equals("") && $__local.equals("maxOccurs"))) {
- $_ngcc_current_state = 7;
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
case 1:
{
if(($__uri.equals("") && $__local.equals("minOccurs"))) {
@@ -196,6 +185,17 @@
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 5:
+ {
+ if(($__uri.equals("") && $__local.equals("maxOccurs"))) {
+ $_ngcc_current_state = 7;
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -210,18 +210,33 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ $_ngcc_current_state = 0;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 2:
+ {
+ if(($__uri.equals("") && $__local.equals("minOccurs"))) {
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
case 5:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
- {
- $_ngcc_current_state = 0;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 6:
{
if(($__uri.equals("") && $__local.equals("maxOccurs"))) {
@@ -232,21 +247,6 @@
}
}
break;
- case 2:
- {
- if(($__uri.equals("") && $__local.equals("minOccurs"))) {
- $_ngcc_current_state = 0;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -258,18 +258,6 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 5:
- {
- if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
case 1:
{
if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
@@ -287,6 +275,25 @@
revertToParentFromText(this, super._cookie, $value);
}
break;
+ case 3:
+ {
+ v = $value;
+ $_ngcc_current_state = 2;
+ action0();
+ }
+ break;
+ case 5:
+ {
+ if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
case 7:
{
if($value.equals("unbounded")) {
@@ -300,13 +307,6 @@
}
}
break;
- case 3:
- {
- v = $value;
- $_ngcc_current_state = 2;
- action0();
- }
- break;
}
}
@@ -316,7 +316,7 @@
}
public boolean accepted() {
- return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 5))));
+ return((($_ngcc_current_state == 5) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 1))));
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java Fri Sep 06 15:09:44 2013 -0700
@@ -131,10 +131,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 4:
+ case 29:
{
- if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 618);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))))))) {
+ NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 136, loc,compositorName);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -142,21 +142,10 @@
}
}
break;
- case 3:
+ case 4:
{
- if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 30:
- {
- if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 648);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 107);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -166,8 +155,8 @@
break;
case 26:
{
- if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 643);
+ if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 132);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -175,25 +164,6 @@
}
}
break;
- case 11:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 626, null,AnnotationContext.PARTICLE);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 10;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
- case 10:
- {
- action3();
- $_ngcc_current_state = 7;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
case 1:
{
if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
@@ -227,14 +197,44 @@
}
}
break;
- case 29:
+ case 0:
+ {
+ revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 20:
+ {
+ action5();
+ $_ngcc_current_state = 19;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 8:
{
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) {
- NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 647, loc,compositorName);
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ }
+ break;
+ case 11:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 115, null,AnnotationContext.PARTICLE);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- unexpectedEnterElement($__qname);
+ $_ngcc_current_state = 10;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
@@ -249,10 +249,39 @@
}
}
break;
+ case 10:
+ {
+ action3();
+ $_ngcc_current_state = 7;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 3:
+ {
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0))) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 16:
+ {
+ if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))))))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
case 21:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 638, null,AnnotationContext.PARTICLE);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 127, null,AnnotationContext.PARTICLE);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -261,10 +290,10 @@
}
}
break;
- case 16:
+ case 30:
{
- if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && (((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))))))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))))))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 137);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -272,35 +301,6 @@
}
}
break;
- case 8:
- {
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if((($ai = $runtime.getAttributeIndex("","name"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","default"))>=0 || ($ai = $runtime.getAttributeIndex("","abstract"))>=0))))))) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- }
- break;
- case 20:
- {
- action5();
- $_ngcc_current_state = 19;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 0:
- {
- revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
default:
{
unexpectedEnterElement($__qname);
@@ -315,10 +315,32 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 29:
+ {
+ if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
+ NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 136, loc,compositorName);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 4:
{
- if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 618);
+ if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 107);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 26:
+ {
+ if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || (($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 132);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -326,11 +348,57 @@
}
}
break;
- case 3:
+ case 2:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 8:
{
- if(((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ }
+ break;
+ case 20:
+ {
+ action5();
+ $_ngcc_current_state = 19;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 11:
+ {
+ $_ngcc_current_state = 10;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 25:
+ {
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -348,34 +416,6 @@
}
}
break;
- case 30:
- {
- if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 648);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 26:
- {
- if(((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 643);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 11:
- {
- $_ngcc_current_state = 10;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 10:
{
action3();
@@ -383,17 +423,6 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 2:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
case 7:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) {
@@ -405,10 +434,10 @@
}
}
break;
- case 29:
+ case 3:
{
- if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
- NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 647, loc,compositorName);
+ if(((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -416,11 +445,11 @@
}
}
break;
- case 25:
+ case 16:
{
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
unexpectedLeaveElement($__qname);
@@ -433,10 +462,10 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 16:
+ case 30:
{
- if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 137);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
@@ -444,23 +473,6 @@
}
}
break;
- case 8:
- {
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- }
- break;
case 28:
{
if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
@@ -472,18 +484,6 @@
}
}
break;
- case 20:
- {
- action5();
- $_ngcc_current_state = 19;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveElement($__qname);
@@ -498,43 +498,9 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 4:
- {
- if((($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("processContents")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || ($__uri.equals("") && $__local.equals("namespace")))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 618);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
- case 21:
- {
- $_ngcc_current_state = 20;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 3:
+ case 0:
{
- if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
- case 16:
- {
- if((($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("ref")))))))))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
+ revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
}
break;
case 8:
@@ -543,8 +509,8 @@
$_ngcc_current_state = 14;
}
else {
- if((($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("default")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
+ if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("abstract"))))))))) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
@@ -553,15 +519,11 @@
}
}
break;
- case 30:
+ case 20:
{
- if((($__uri.equals("") && $__local.equals("minOccurs")) || ($__uri.equals("") && $__local.equals("maxOccurs")))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 648);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
+ action5();
+ $_ngcc_current_state = 19;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
case 11:
@@ -570,10 +532,20 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 26:
+ case 25:
{
- if((($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || ($__uri.equals("") && $__local.equals("ref"))))) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 643);
+ if(($__uri.equals("") && $__local.equals("ref"))) {
+ $_ngcc_current_state = 24;
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
+ case 4:
+ {
+ if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 107);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
@@ -588,22 +560,50 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 20:
+ case 26:
+ {
+ if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("ref")) || ($__uri.equals("") && $__local.equals("minOccurs"))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 132);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
+ case 3:
{
- action5();
- $_ngcc_current_state = 19;
+ if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
+ case 16:
+ {
+ if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("ref")) || (($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("abstract")))))))))))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
+ case 21:
+ {
+ $_ngcc_current_state = 20;
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
+ case 30:
{
- revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 25:
- {
- if(($__uri.equals("") && $__local.equals("ref"))) {
- $_ngcc_current_state = 24;
+ if((($__uri.equals("") && $__local.equals("maxOccurs")) || ($__uri.equals("") && $__local.equals("minOccurs")))) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 137);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
unexpectedEnterAttribute($__qname);
@@ -624,6 +624,41 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 23:
+ {
+ if(($__uri.equals("") && $__local.equals("ref"))) {
+ $_ngcc_current_state = 21;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 20:
+ {
+ action5();
+ $_ngcc_current_state = 19;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 11:
+ {
+ $_ngcc_current_state = 10;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 10:
+ {
+ action3();
+ $_ngcc_current_state = 7;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 21:
{
$_ngcc_current_state = 20;
@@ -640,41 +675,6 @@
}
}
break;
- case 11:
- {
- $_ngcc_current_state = 10;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 10:
- {
- action3();
- $_ngcc_current_state = 7;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 20:
- {
- action5();
- $_ngcc_current_state = 19;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 23:
- {
- if(($__uri.equals("") && $__local.equals("ref"))) {
- $_ngcc_current_state = 21;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -688,23 +688,23 @@
switch($_ngcc_current_state) {
case 4:
{
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 618);
+ if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 107);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 618);
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 107);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 618);
+ if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 107);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 618);
+ if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 107);
spawnChildFromText(h, $value);
}
}
@@ -712,50 +712,96 @@
}
}
break;
- case 3:
+ case 26:
{
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc);
+ if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 132);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
- NGCCHandler h = new wildcardBody(this, super._source, $runtime, 617, wloc);
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 132);
spawnChildFromText(h, $value);
}
+ else {
+ if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 132);
+ spawnChildFromText(h, $value);
+ }
+ }
}
}
break;
- case 30:
+ case 14:
+ {
+ NGCCHandler h = new qname(this, super._source, $runtime, 118);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 24:
+ {
+ NGCCHandler h = new qname(this, super._source, $runtime, 130);
+ spawnChildFromText(h, $value);
+ }
+ break;
+ case 0:
{
- if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 648);
- spawnChildFromText(h, $value);
+ revertToParentFromText(result, super._cookie, $value);
+ }
+ break;
+ case 20:
+ {
+ action5();
+ $_ngcc_current_state = 19;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 8:
+ {
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 648);
- spawnChildFromText(h, $value);
- }
- }
- }
- break;
- case 26:
- {
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 643);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 643);
+ if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 643);
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
spawnChildFromText(h, $value);
}
+ else {
+ if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 112, loc,false);
+ spawnChildFromText(h, $value);
+ }
+ }
+ }
+ }
+ }
+ }
}
}
}
@@ -766,19 +812,6 @@
$runtime.sendText(super._cookie, $value);
}
break;
- case 10:
- {
- action3();
- $_ngcc_current_state = 7;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 14:
- {
- NGCCHandler h = new qname(this, super._source, $runtime, 629);
- spawnChildFromText(h, $value);
- }
- break;
case 25:
{
if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
@@ -787,61 +820,76 @@
}
}
break;
- case 21:
+ case 10:
+ {
+ action3();
+ $_ngcc_current_state = 7;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 3:
{
- $_ngcc_current_state = 20;
- $runtime.sendText(super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ NGCCHandler h = new wildcardBody(this, super._source, $runtime, 106, wloc);
+ spawnChildFromText(h, $value);
+ }
+ }
}
break;
case 16:
{
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new occurs(this, super._source, $runtime, 632);
+ if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 121);
spawnChildFromText(h, $value);
}
}
@@ -855,72 +903,24 @@
}
}
break;
- case 8:
+ case 21:
{
- if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromText(h, $value);
- }
- else {
- if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
- NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 623, loc,false);
- spawnChildFromText(h, $value);
- }
- }
- }
- }
- }
- }
- }
- }
- }
- break;
- case 24:
- {
- NGCCHandler h = new qname(this, super._source, $runtime, 641);
- spawnChildFromText(h, $value);
- }
- break;
- case 20:
- {
- action5();
- $_ngcc_current_state = 19;
+ $_ngcc_current_state = 20;
$runtime.sendText(super._cookie, $value);
}
break;
- case 0:
+ case 30:
{
- revertToParentFromText(result, super._cookie, $value);
+ if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 137);
+ spawnChildFromText(h, $value);
+ }
+ else {
+ if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+ NGCCHandler h = new occurs(this, super._source, $runtime, 137);
+ spawnChildFromText(h, $value);
+ }
+ }
}
break;
}
@@ -928,73 +928,73 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 617:
- {
- wcBody = ((WildcardImpl)$__result__);
- action0();
- $_ngcc_current_state = 2;
- }
- break;
- case 647:
+ case 136:
{
term = ((ModelGroupImpl)$__result__);
action7();
$_ngcc_current_state = 28;
}
break;
- case 632:
+ case 107:
+ {
+ occurs = ((occurs)$__result__);
+ $_ngcc_current_state = 3;
+ }
+ break;
+ case 106:
+ {
+ wcBody = ((WildcardImpl)$__result__);
+ action0();
+ $_ngcc_current_state = 2;
+ }
+ break;
+ case 121:
{
occurs = ((occurs)$__result__);
$_ngcc_current_state = 8;
}
break;
- case 618:
+ case 127:
{
- occurs = ((occurs)$__result__);
- $_ngcc_current_state = 3;
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 20;
}
break;
- case 648:
+ case 137:
{
occurs = ((occurs)$__result__);
$_ngcc_current_state = 29;
}
break;
- case 643:
+ case 132:
{
occurs = ((occurs)$__result__);
$_ngcc_current_state = 25;
}
break;
- case 626:
- {
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 10;
- }
- break;
- case 629:
+ case 118:
{
elementTypeName = ((UName)$__result__);
$_ngcc_current_state = 13;
}
break;
- case 638:
+ case 130:
{
- annotation = ((AnnotationImpl)$__result__);
- $_ngcc_current_state = 20;
+ groupName = ((UName)$__result__);
+ $_ngcc_current_state = 23;
}
break;
- case 623:
+ case 112:
{
anonymousElementDecl = ((ElementDecl)$__result__);
action2();
$_ngcc_current_state = 7;
}
break;
- case 641:
+ case 115:
{
- groupName = ((UName)$__result__);
- $_ngcc_current_state = 23;
+ annotation = ((AnnotationImpl)$__result__);
+ $_ngcc_current_state = 10;
}
break;
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java Fri Sep 06 15:09:44 2013 -0700
@@ -143,17 +143,17 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromText($runtime.parseUName(qvalue), super._cookie, $value);
+ }
+ break;
case 1:
{
qvalue = $value;
$_ngcc_current_state = 0;
}
break;
- case 0:
- {
- revertToParentFromText($runtime.parseUName(qvalue), super._cookie, $value);
- }
- break;
}
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java Fri Sep 06 15:09:44 2013 -0700
@@ -118,30 +118,81 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 581, null,AnnotationContext.SCHEMA);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 684, null,AnnotationContext.SCHEMA);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 582);
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 685);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- NGCCHandler h = new complexType(this, super._source, $runtime, 583);
+ NGCCHandler h = new complexType(this, super._source, $runtime, 686);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
- NGCCHandler h = new group(this, super._source, $runtime, 584);
+ NGCCHandler h = new group(this, super._source, $runtime, 687);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
- NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 585);
+ NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 688);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ }
+ }
+ }
+ }
+ break;
+ case 14:
+ {
+ if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 2:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 689, null,AnnotationContext.SCHEMA);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+ NGCCHandler h = new simpleType(this, super._source, $runtime, 690);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+ NGCCHandler h = new complexType(this, super._source, $runtime, 691);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
+ NGCCHandler h = new group(this, super._source, $runtime, 692);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+ NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 693);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -165,57 +216,6 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 14:
- {
- if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 1:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 576, null,AnnotationContext.SCHEMA);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
- NGCCHandler h = new simpleType(this, super._source, $runtime, 577);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
- NGCCHandler h = new complexType(this, super._source, $runtime, 578);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
- NGCCHandler h = new group(this, super._source, $runtime, 579);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
- NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 580);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- }
- }
- }
- }
- break;
default:
{
unexpectedEnterElement($__qname);
@@ -230,17 +230,22 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 1:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
+ $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 14:
{
if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
@@ -252,15 +257,10 @@
}
}
break;
- case 1:
+ case 2:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
- $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
- }
- else {
- unexpectedLeaveElement($__qname);
- }
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -277,12 +277,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 0:
{
revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
@@ -298,6 +292,12 @@
}
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -312,10 +312,9 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
+ case 0:
{
- $_ngcc_current_state = 1;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
}
break;
case 12:
@@ -328,9 +327,10 @@
}
}
break;
- case 0:
+ case 2:
{
- revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ $_ngcc_current_state = 1;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
default:
@@ -344,19 +344,6 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 2:
- {
- $_ngcc_current_state = 1;
- $runtime.sendText(super._cookie, $value);
- }
- break;
- case 13:
- {
- schemaLocation = $value;
- $_ngcc_current_state = 12;
- action4();
- }
- break;
case 0:
{
revertToParentFromText(this, super._cookie, $value);
@@ -370,71 +357,84 @@
}
}
break;
+ case 2:
+ {
+ $_ngcc_current_state = 1;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 13:
+ {
+ schemaLocation = $value;
+ $_ngcc_current_state = 12;
+ action4();
+ }
+ break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 581:
+ case 689:
{
$_ngcc_current_state = 1;
}
break;
- case 582:
+ case 690:
{
newSt = ((SimpleTypeImpl)$__result__);
action3();
$_ngcc_current_state = 1;
}
break;
- case 583:
+ case 691:
{
newCt = ((ComplexTypeImpl)$__result__);
action2();
$_ngcc_current_state = 1;
}
break;
- case 584:
+ case 692:
{
newGrp = ((ModelGroupDeclImpl)$__result__);
action1();
$_ngcc_current_state = 1;
}
break;
- case 585:
+ case 693:
{
newAg = ((AttGroupDeclImpl)$__result__);
action0();
$_ngcc_current_state = 1;
}
break;
- case 576:
+ case 684:
{
$_ngcc_current_state = 1;
}
break;
- case 577:
+ case 685:
{
newSt = ((SimpleTypeImpl)$__result__);
action3();
$_ngcc_current_state = 1;
}
break;
- case 578:
+ case 686:
{
newCt = ((ComplexTypeImpl)$__result__);
action2();
$_ngcc_current_state = 1;
}
break;
- case 579:
+ case 687:
{
newGrp = ((ModelGroupDeclImpl)$__result__);
action1();
$_ngcc_current_state = 1;
}
break;
- case 580:
+ case 688:
{
newAg = ((AttGroupDeclImpl)$__result__);
action0();
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java Fri Sep 06 15:09:44 2013 -0700
@@ -81,36 +81,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 2:
- {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
- NGCCHandler h = new SimpleType_Restriction(this, super._source, $runtime, 182, annotation,locator,fa,name,finalSet);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) {
- NGCCHandler h = new SimpleType_List(this, super._source, $runtime, 183, annotation,locator,fa,name,finalSet);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
- NGCCHandler h = new SimpleType_Union(this, super._source, $runtime, 177, annotation,locator,fa,name,finalSet);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- }
- }
- break;
- case 7:
- {
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
case 15:
{
if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
@@ -123,11 +93,6 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
case 11:
{
if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -152,10 +117,22 @@
}
}
break;
+ case 8:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+ NGCCHandler h = new annotation(this, super._source, $runtime, 89, null,AnnotationContext.SIMPLETYPE_DECL);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 7;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 10:
{
- if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 188, fa);
+ if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 91, fa);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -163,15 +140,38 @@
}
}
break;
- case 8:
+ case 7:
{
- if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 186, null,AnnotationContext.SIMPLETYPE_DECL);
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 2:
+ {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+ NGCCHandler h = new SimpleType_Restriction(this, super._source, $runtime, 85, annotation,locator,fa,name,finalSet);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- $_ngcc_current_state = 7;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) {
+ NGCCHandler h = new SimpleType_List(this, super._source, $runtime, 86, annotation,locator,fa,name,finalSet);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
+ NGCCHandler h = new SimpleType_Union(this, super._source, $runtime, 80, annotation,locator,fa,name,finalSet);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
}
}
break;
@@ -189,13 +189,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 7:
- {
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 15:
{
if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
@@ -208,11 +201,6 @@
}
}
break;
- case 0:
- {
- revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 11:
{
if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -231,6 +219,13 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 7:
+ {
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
@@ -242,6 +237,11 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveElement($__qname);
@@ -256,13 +256,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 7:
- {
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 15:
{
if(($__uri.equals("") && $__local.equals("final"))) {
@@ -274,11 +267,6 @@
}
}
break;
- case 0:
- {
- revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 11:
{
if(($__uri.equals("") && $__local.equals("name"))) {
@@ -296,6 +284,18 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 7:
+ {
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -310,44 +310,12 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 7:
- {
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 15:
{
$_ngcc_current_state = 11;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 16:
- {
- if(($__uri.equals("") && $__local.equals("final"))) {
- $_ngcc_current_state = 11;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 12:
- {
- if(($__uri.equals("") && $__local.equals("name"))) {
- $_ngcc_current_state = 10;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 11:
{
$_ngcc_current_state = 10;
@@ -360,6 +328,38 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 7:
+ {
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 12:
+ {
+ if(($__uri.equals("") && $__local.equals("name"))) {
+ $_ngcc_current_state = 10;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 16:
+ {
+ if(($__uri.equals("") && $__local.equals("final"))) {
+ $_ngcc_current_state = 11;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -371,11 +371,10 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 7:
+ case 13:
{
- action0();
- $_ngcc_current_state = 2;
- $runtime.sendText(super._cookie, $value);
+ name = $value;
+ $_ngcc_current_state = 12;
}
break;
case 15:
@@ -390,17 +389,6 @@
}
}
break;
- case 13:
- {
- name = $value;
- $_ngcc_current_state = 12;
- }
- break;
- case 0:
- {
- revertToParentFromText(result, super._cookie, $value);
- }
- break;
case 11:
{
if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -413,16 +401,28 @@
}
}
break;
+ case 8:
+ {
+ $_ngcc_current_state = 7;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
+ case 7:
+ {
+ action0();
+ $_ngcc_current_state = 2;
+ $runtime.sendText(super._cookie, $value);
+ }
+ break;
case 17:
{
finalValue = $value;
$_ngcc_current_state = 16;
}
break;
- case 8:
+ case 0:
{
- $_ngcc_current_state = 7;
- $runtime.sendText(super._cookie, $value);
+ revertToParentFromText(result, super._cookie, $value);
}
break;
}
@@ -430,31 +430,31 @@
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 186:
+ case 89:
{
annotation = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 7;
}
break;
- case 188:
+ case 91:
{
fa = ((ForeignAttributesImpl)$__result__);
$_ngcc_current_state = 8;
}
break;
- case 182:
+ case 85:
{
result = ((RestrictionSimpleTypeImpl)$__result__);
$_ngcc_current_state = 1;
}
break;
- case 183:
+ case 86:
{
result = ((ListSimpleTypeImpl)$__result__);
$_ngcc_current_state = 1;
}
break;
- case 177:
+ case 80:
{
result = ((UnionSimpleTypeImpl)$__result__);
$_ngcc_current_state = 1;
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java Fri Sep 06 15:09:44 2013 -0700
@@ -77,6 +77,18 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ $_ngcc_current_state = 0;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ }
+ break;
case 5:
{
if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
@@ -91,12 +103,12 @@
break;
case 9:
{
- if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || ($ai = $runtime.getAttributeIndex("","namespace"))>=0)) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ if((($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0)) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
}
@@ -104,7 +116,7 @@
case 10:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 414, null,AnnotationContext.WILDCARD);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 411, null,AnnotationContext.WILDCARD);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -113,18 +125,6 @@
}
}
break;
- case 1:
- {
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- else {
- $_ngcc_current_state = 0;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- }
- break;
case 0:
{
revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
@@ -144,6 +144,18 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ else {
+ $_ngcc_current_state = 0;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
case 5:
{
if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
@@ -158,12 +170,12 @@
break;
case 9:
{
- if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || ($ai = $runtime.getAttributeIndex("","namespace"))>=0)) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ if((($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0)) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
}
}
@@ -174,18 +186,6 @@
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
- {
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- else {
- $_ngcc_current_state = 0;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
case 0:
{
revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
@@ -205,6 +205,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ if(($__uri.equals("") && $__local.equals("namespace"))) {
+ $_ngcc_current_state = 3;
+ }
+ else {
+ $_ngcc_current_state = 0;
+ $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ }
+ break;
case 5:
{
if(($__uri.equals("") && $__local.equals("processContents"))) {
@@ -218,12 +229,12 @@
break;
case 9:
{
- if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
}
}
@@ -234,17 +245,6 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
- {
- if(($__uri.equals("") && $__local.equals("namespace"))) {
- $_ngcc_current_state = 3;
- }
- else {
- $_ngcc_current_state = 0;
- $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- }
- break;
case 0:
{
revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
@@ -264,37 +264,15 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 5:
+ case 1:
{
- $_ngcc_current_state = 1;
+ $_ngcc_current_state = 0;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 9:
- {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
- spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
- }
- break;
- case 2:
+ case 5:
{
- if(($__uri.equals("") && $__local.equals("namespace"))) {
- $_ngcc_current_state = 0;
- }
- else {
- unexpectedLeaveAttribute($__qname);
- }
- }
- break;
- case 10:
- {
- $_ngcc_current_state = 9;
- $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
- }
- break;
- case 1:
- {
- $_ngcc_current_state = 0;
+ $_ngcc_current_state = 1;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
@@ -308,11 +286,33 @@
}
}
break;
+ case 9:
+ {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
+ spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
+ }
+ break;
+ case 10:
+ {
+ $_ngcc_current_state = 9;
+ $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 0:
{
revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
}
break;
+ case 2:
+ {
+ if(($__uri.equals("") && $__local.equals("namespace"))) {
+ $_ngcc_current_state = 0;
+ }
+ else {
+ unexpectedLeaveAttribute($__qname);
+ }
+ }
+ break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -324,6 +324,24 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 1:
+ {
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ $runtime.consumeAttribute($ai);
+ $runtime.sendText(super._cookie, $value);
+ }
+ else {
+ $_ngcc_current_state = 0;
+ $runtime.sendText(super._cookie, $value);
+ }
+ }
+ break;
+ case 3:
+ {
+ ns = $value;
+ $_ngcc_current_state = 2;
+ }
+ break;
case 5:
{
if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
@@ -336,71 +354,53 @@
}
}
break;
- case 7:
- {
- modeValue = $value;
- $_ngcc_current_state = 6;
- }
- break;
case 9:
{
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromText(h, $value);
}
else {
- if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromText(h, $value);
}
else {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 412, null);
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 409, null);
spawnChildFromText(h, $value);
}
}
}
break;
- case 3:
- {
- ns = $value;
- $_ngcc_current_state = 2;
- }
- break;
case 10:
{
$_ngcc_current_state = 9;
$runtime.sendText(super._cookie, $value);
}
break;
- case 1:
- {
- if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
- $runtime.consumeAttribute($ai);
- $runtime.sendText(super._cookie, $value);
- }
- else {
- $_ngcc_current_state = 0;
- $runtime.sendText(super._cookie, $value);
- }
- }
- break;
case 0:
{
revertToParentFromText(makeResult(), super._cookie, $value);
}
break;
+ case 7:
+ {
+ modeValue = $value;
+ $_ngcc_current_state = 6;
+ }
+ break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 412:
+ case 409:
{
fa = ((ForeignAttributesImpl)$__result__);
$_ngcc_current_state = 5;
}
break;
- case 414:
+ case 411:
{
annotation = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 9;
@@ -410,7 +410,7 @@
}
public boolean accepted() {
- return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 5))));
+ return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 5) || ($_ngcc_current_state == 1))));
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java Fri Sep 06 15:09:44 2013 -0700
@@ -72,10 +72,26 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
+ case 6:
+ {
+ if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 77, null);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
case 1:
{
if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
- NGCCHandler h = new annotation(this, super._source, $runtime, 679, null,AnnotationContext.XPATH);
+ NGCCHandler h = new annotation(this, super._source, $runtime, 72, null,AnnotationContext.XPATH);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -95,22 +111,6 @@
}
}
break;
- case 6:
- {
- if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 684, null);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
default:
{
unexpectedEnterElement($__qname);
@@ -125,6 +125,22 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 6:
+ {
+ if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 77, null);
+ spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedLeaveElement($__qname);
+ }
+ }
+ break;
case 1:
{
$_ngcc_current_state = 0;
@@ -142,22 +158,6 @@
}
}
break;
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 684, null);
- spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedLeaveElement($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveElement($__qname);
@@ -172,6 +172,22 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 6:
+ {
+ if(($__uri.equals("") && $__local.equals("xpath"))) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 77, null);
+ spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+ }
+ else {
+ unexpectedEnterAttribute($__qname);
+ }
+ }
+ break;
case 1:
{
$_ngcc_current_state = 0;
@@ -188,22 +204,6 @@
}
}
break;
- case 6:
- {
- if(($__uri.equals("") && $__local.equals("xpath"))) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 684, null);
- spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
- }
- else {
- unexpectedEnterAttribute($__qname);
- }
- }
- break;
- case 0:
- {
- revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -218,17 +218,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 1:
{
$_ngcc_current_state = 0;
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 3:
{
if(($__uri.equals("") && $__local.equals("xpath"))) {
@@ -250,6 +250,25 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
+ case 4:
+ {
+ xpath = $value;
+ $_ngcc_current_state = 3;
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromText(makeResult(), super._cookie, $value);
+ }
+ break;
+ case 6:
+ {
+ if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+ NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 77, null);
+ spawnChildFromText(h, $value);
+ }
+ }
+ break;
case 1:
{
$_ngcc_current_state = 0;
@@ -264,47 +283,28 @@
}
}
break;
- case 6:
- {
- if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
- NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 684, null);
- spawnChildFromText(h, $value);
- }
- }
- break;
- case 0:
- {
- revertToParentFromText(makeResult(), super._cookie, $value);
- }
- break;
- case 4:
- {
- xpath = $value;
- $_ngcc_current_state = 3;
- }
- break;
}
}
public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
switch($__cookie__) {
- case 679:
+ case 77:
+ {
+ fa = ((ForeignAttributesImpl)$__result__);
+ $_ngcc_current_state = 5;
+ }
+ break;
+ case 72:
{
ann = ((AnnotationImpl)$__result__);
$_ngcc_current_state = 0;
}
break;
- case 684:
- {
- fa = ((ForeignAttributesImpl)$__result__);
- $_ngcc_current_state = 5;
- }
- break;
}
}
public boolean accepted() {
- return((($_ngcc_current_state == 0) || ($_ngcc_current_state == 1)));
+ return((($_ngcc_current_state == 1) || ($_ngcc_current_state == 0)));
}
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -27,18 +27,14 @@
import java.io.IOException;
import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
+import org.xml.sax.*;
import org.xml.sax.helpers.XMLFilterImpl;
import com.sun.xml.internal.xsom.impl.parser.Messages;
@@ -51,6 +47,11 @@
*/
public class JAXPParser implements XMLParser {
+ // not in older JDK, so must be duplicated here, otherwise javax.xml.XMLConstants should be used
+ private static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema";
+
+ private static final Logger LOGGER = Logger.getLogger(JAXPParser.class.getName());
+
private final SAXParserFactory factory;
public JAXPParser( SAXParserFactory factory ) {
@@ -58,6 +59,11 @@
this.factory = factory;
}
+ /**
+ * @deprecated Unsafe, use JAXPParser(factory) instead with
+ * security features initialized by setting
+ * XMLConstants.FEATURE_SECURE_PROCESSING feature.
+ */
public JAXPParser() {
this( SAXParserFactory.newInstance());
}
@@ -68,8 +74,8 @@
throws SAXException, IOException {
try {
- XMLReader reader = factory.newSAXParser().getXMLReader();
- reader = new XMLReaderEx(reader);
+ SAXParser saxParser = allowFileAccess(factory.newSAXParser(), false);
+ XMLReader reader = new XMLReaderEx(saxParser.getXMLReader());
reader.setContentHandler(handler);
if(errorHandler!=null)
@@ -85,6 +91,24 @@
}
}
+ private static SAXParser allowFileAccess(SAXParser saxParser, boolean disableSecureProcessing) throws SAXException {
+
+ // if feature secure processing enabled, nothing to do, file is allowed,
+ // or user is able to control access by standard JAXP mechanisms
+ if (disableSecureProcessing) {
+ return saxParser;
+ }
+
+ try {
+ saxParser.setProperty(ACCESS_EXTERNAL_SCHEMA, "file");
+ LOGGER.log(Level.FINE, Messages.format(Messages.JAXP_SUPPORTED_PROPERTY, ACCESS_EXTERNAL_SCHEMA));
+ } catch (SAXException ignored) {
+ // nothing to do; support depends on version JDK or SAX implementation
+ LOGGER.log(Level.CONFIG, Messages.format(Messages.JAXP_UNSUPPORTED_PROPERTY, ACCESS_EXTERNAL_SCHEMA), ignored);
+ }
+ return saxParser;
+ }
+
/**
* XMLReader with improved error message for entity resolution failure.
*
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -64,6 +64,9 @@
/**
* Creates a new XSOMParser by using a SAX parser from JAXP.
+ * @deprecated Unsafe, use XSOMParser(factory) instead with
+ * security features initialized by setting
+ * XMLConstants.FEATURE_SECURE_PROCESSING feature.
*/
public XSOMParser() {
this(new JAXPParser());
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,6 +29,7 @@
import com.sun.xml.internal.xsom.parser.AnnotationContext;
import com.sun.xml.internal.xsom.parser.AnnotationParser;
import com.sun.xml.internal.xsom.parser.AnnotationParserFactory;
+import javax.xml.XMLConstants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -56,10 +57,15 @@
* @author Kohsuke Kawaguchi
*/
public class DomAnnotationParserFactory implements AnnotationParserFactory {
+
public AnnotationParser create() {
return new AnnotationParserImpl();
}
+ public AnnotationParser create(boolean disableSecureProcessing) {
+ return new AnnotationParserImpl();
+ }
+
private static final SAXTransformerFactory stf = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
private static class AnnotationParserImpl extends AnnotationParser {
@@ -71,8 +77,13 @@
private DOMResult result;
AnnotationParserImpl() {
+ this(false);
+ }
+
+ AnnotationParserImpl(boolean disableSecureProcessing) {
try {
transformer = stf.newTransformerHandler();
+ stf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, disableSecureProcessing);
} catch (TransformerConfigurationException e) {
throw new Error(e); // impossible
}
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -310,17 +310,16 @@
}
}
- if (getContextClassLoader() == classLoader) {
- Class factory = lookupUsingOSGiServiceLoader("javax.xml.bind.JAXBContext");
- if (factory != null) {
- logger.fine("OSGi environment detected");
- return newInstance(contextPath, factory, classLoader, properties);
- }
+ // OSGi search
+ Class jaxbContext = lookupJaxbContextUsingOsgiServiceLoader();
+ if (jaxbContext != null) {
+ logger.fine("OSGi environment detected");
+ return newInstance(contextPath, jaxbContext, classLoader, properties);
}
logger.fine("Searching META-INF/services");
// search META-INF services next
- BufferedReader r;
+ BufferedReader r = null;
try {
final StringBuilder resource = new StringBuilder().append("META-INF/services/").append(jaxbContextFQCN);
final InputStream resourceStream =
@@ -328,7 +327,10 @@
if (resourceStream != null) {
r = new BufferedReader(new InputStreamReader(resourceStream, "UTF-8"));
- factoryClassName = r.readLine().trim();
+ factoryClassName = r.readLine();
+ if (factoryClassName != null) {
+ factoryClassName = factoryClassName.trim();
+ }
r.close();
return newInstance(contextPath, factoryClassName, classLoader, properties);
} else {
@@ -339,6 +341,14 @@
throw new JAXBException(e);
} catch (IOException e) {
throw new JAXBException(e);
+ } finally {
+ try {
+ if (r != null) {
+ r.close();
+ }
+ } catch (IOException ex) {
+ Logger.getLogger(ContextFinder.class.getName()).log(Level.SEVERE, null, ex);
+ }
}
// else no provider found
@@ -402,15 +412,16 @@
}
}
- Class factory = lookupUsingOSGiServiceLoader("javax.xml.bind.JAXBContext");
- if (factory != null) {
+ // OSGi search
+ Class jaxbContext = lookupJaxbContextUsingOsgiServiceLoader();
+ if (jaxbContext != null) {
logger.fine("OSGi environment detected");
- return newInstance(classes, properties, factory);
+ return newInstance(classes, properties, jaxbContext);
}
// search META-INF services next
logger.fine("Checking META-INF/services");
- BufferedReader r;
+ BufferedReader r = null;
try {
final String resource = new StringBuilder("META-INF/services/").append(jaxbContextFQCN).toString();
ClassLoader classLoader = getContextClassLoader();
@@ -423,7 +434,10 @@
if (resourceURL != null) {
logger.log(Level.FINE, "Reading {0}", resourceURL);
r = new BufferedReader(new InputStreamReader(resourceURL.openStream(), "UTF-8"));
- factoryClassName = r.readLine().trim();
+ factoryClassName = r.readLine();
+ if (factoryClassName != null) {
+ factoryClassName = factoryClassName.trim();
+ }
return newInstance(classes, properties, factoryClassName);
} else {
logger.log(Level.FINE, "Unable to find: {0}", resource);
@@ -433,6 +447,14 @@
throw new JAXBException(e);
} catch (IOException e) {
throw new JAXBException(e);
+ } finally {
+ if (r != null) {
+ try {
+ r.close();
+ } catch (IOException ex) {
+ logger.log(Level.FINE, "Unable to close stream", ex);
+ }
+ }
}
// else no provider found
@@ -440,16 +462,15 @@
return newInstance(classes, properties, PLATFORM_DEFAULT_FACTORY_CLASS);
}
- private static Class lookupUsingOSGiServiceLoader(String factoryId) {
+ private static Class lookupJaxbContextUsingOsgiServiceLoader() {
try {
- // Use reflection to avoid having any dependendcy on ServiceLoader class
- Class serviceClass = Class.forName(factoryId);
+ // Use reflection to avoid having any dependency on ServiceLoader class
Class target = Class.forName("com.sun.org.glassfish.hk2.osgiresourcelocator.ServiceLoader");
Method m = target.getMethod("lookupProviderClasses", Class.class);
- Iterator iter = ((Iterable) m.invoke(null, serviceClass)).iterator();
+ Iterator iter = ((Iterable) m.invoke(null, JAXBContext.class)).iterator();
return iter.hasNext() ? (Class)iter.next() : null;
} catch(Exception e) {
- logger.log(Level.FINE, "Unable to find from OSGi: {0}", factoryId);
+ logger.log(Level.FINE, "Unable to find from OSGi: javax.xml.bind.JAXBContext");
return null;
}
}
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -94,7 +94,7 @@
final public class DatatypeConverter {
// delegate to this instance of DatatypeConverter
- private static DatatypeConverterInterface theConverter = null;
+ private static volatile DatatypeConverterInterface theConverter = null;
private final static JAXBPermission SET_DATATYPE_CONVERTER_PERMISSION =
new JAXBPermission("setDatatypeConverter");
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -64,7 +64,7 @@
// we now know that the input contains spaces.
// let's sit down and do the collapsing normally.
- StringBuffer result = new StringBuffer(len /*allocate enough size to avoid re-allocation*/ );
+ StringBuilder result = new StringBuilder(len /*allocate enough size to avoid re-allocation*/ );
if(s!=0) {
for( int i=0; i<s; i++ )
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
- 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/package.html Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/package.html Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
- Copyright (c) 2004, 2011, 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/package.html Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/package.html Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
- 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/package.html Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/package.html Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
- 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/package.html Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/package.html Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
- 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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java Fri Sep 06 15:09:44 2013 -0700
@@ -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 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.transform.sax.SAXSource;
+import org.xml.sax.XMLFilter;
/**
* JAXP {@link javax.xml.transform.Source} implementation
@@ -210,7 +211,7 @@
// SAX allows ContentHandler to be changed during the parsing,
// but JAXB doesn't. So this repeater will sit between those
// two components.
- private XMLFilterImpl repeater = new XMLFilterImpl();
+ private XMLFilter repeater = new XMLFilterImpl();
public void setContentHandler(ContentHandler handler) {
repeater.setContentHandler(handler);
@@ -240,7 +241,7 @@
// SAX events will be sent to the repeater, and the repeater
// will further forward it to an appropriate component.
try {
- marshaller.marshal( contentObject, repeater );
+ marshaller.marshal( contentObject, (XMLFilterImpl)repeater );
} catch( JAXBException e ) {
// wrap it to a SAXException
SAXParseException se =
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/package.html Thu Sep 05 15:37:40 2013 +0400
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/package.html Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
- 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
--- a/jdk/.hgtags Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/.hgtags Fri Sep 06 15:09:44 2013 -0700
@@ -226,3 +226,5 @@
8ed8e2b4b90e0ac9aa5b3efef51cd576a9db96a9 jdk8-b102
e0f6039c0290b7381042a6fec3100a69a5a67e37 jdk8-b103
f1d8d15bfcb5ada858a942f8a31f6598f23214d1 jdk8-b104
+1fe211ae3d2b8cc2dfc4f58d9a6eb96418679672 jdk8-b105
+c817276bd870dfe1dcc3a3dbbc092436b6907f75 jdk8-b106
--- a/jdk/make/com/sun/security/auth/FILES_java.gmk Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/make/com/sun/security/auth/FILES_java.gmk Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2006, 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
@@ -43,8 +43,6 @@
com/sun/security/auth/UserPrincipal.java \
com/sun/security/auth/LdapPrincipal.java \
com/sun/security/auth/PolicyFile.java \
- com/sun/security/auth/SubjectCodeSource.java \
- com/sun/security/auth/PolicyParser.java \
com/sun/security/auth/PrincipalComparator.java \
com/sun/security/auth/callback/TextCallbackHandler.java \
com/sun/security/auth/callback/DialogCallbackHandler.java
--- a/jdk/makefiles/CopyFiles.gmk Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/makefiles/CopyFiles.gmk Fri Sep 06 15:09:44 2013 -0700
@@ -292,8 +292,11 @@
JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
JVMCFG := $(JVMCFG_DIR)/jvm.cfg
+# To do: should this also support -zeroshark?
-ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
+ifeq ($(OPENJDK_TARGET_CPU_BITS),64)
+ COPY_JVM_CFG_FILE := true
+else
# On 32-bit machines we have three potential VMs: client, server and minimal.
# Historically we usually have both client and server and so that is what the
# committed jvm.cfg expects (including platform specific ergonomics switches
@@ -302,16 +305,21 @@
# The main problem is deciding whether to use aliases for the VMs that are not
# present and the current position is that we add aliases for client and server, but
# not for minimal.
- # To do: should this also support, -zero and -zeroshark?
-
CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
+ ifeq ($(CLIENT_AND_SERVER), true)
+ COPY_JVM_CFG_FILE := true
+ else
+ # For zero, the default jvm.cfg file is sufficient
+ ifeq ($(JVM_VARIANT_ZERO), true)
+ COPY_JVM_CFG_FILE := true
+ endif
+ endif
+endif
- ifeq ($(CLIENT_AND_SERVER), true)
- # Use the committed jvm.cfg for this 32 bit setup (the minimal
- # VM is already KNOWN on platforms that potentially support it)
+ifeq ($(COPY_JVM_CFG_FILE), true)
$(JVMCFG): $(JVMCFG_SRC)
$(call install-file)
- else
+else
$(JVMCFG):
$(MKDIR) -p $(@D)
$(RM) $(@)
@@ -338,12 +346,6 @@
endif
endif
endif
- endif
-
-else
- # Use the default jvm.cfg for this 64 bit setup.
- $(JVMCFG): $(JVMCFG_SRC)
- $(call install-file)
endif
COPY_FILES += $(JVMCFG)
--- a/jdk/makefiles/Profiles.gmk Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/makefiles/Profiles.gmk Fri Sep 06 15:09:44 2013 -0700
@@ -65,10 +65,6 @@
$(if $(PROFILE_2_JRE_JAR_FILES), $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(PROFILE_2_JRE_JAR_FILES))) \
$(PROFILE_1_JARS)
-ifneq ($(ENABLE_JFR), true)
- PROFILE_3_JRE_JAR_FILES := $(filter-out jfr.jar, $(PROFILE_3_JRE_JAR_FILES))
-endif
-
PROFILE_3_JARS := \
$(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(PROFILE_3_JRE_JAR_FILES)) \
$(PROFILE_2_JARS)
@@ -77,6 +73,10 @@
FULL_JRE_JAR_FILES := $(filter-out alt-rt.jar, $(FULL_JRE_JAR_FILES))
endif
+ifneq ($(ENABLE_JFR), true)
+ FULL_JRE_JAR_FILES := $(filter-out jfr.jar, $(FULL_JRE_JAR_FILES))
+endif
+
FULL_JRE_JARS := \
$(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(FULL_JRE_JAR_FILES)) \
$(PROFILE_3_JARS)
--- a/jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Fri Sep 06 15:09:44 2013 -0700
@@ -87,6 +87,7 @@
private int incomingInterruptFD;
static {
+ IOUtil.load();
initStructSizes();
String datamodel = java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("sun.arch.data.model")
--- a/jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -246,9 +246,4 @@
}
return this;
}
-
-
- static {
- Util.load();
- }
}
--- a/jdk/src/share/back/SDE.c Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/back/SDE.c Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,12 @@
#include "util.h"
#include "SDE.h"
+#ifdef __APPLE__
+/* use setjmp/longjmp versions that do not save/restore the signal mask */
+#define setjmp _setjmp
+#define longjmp _longjmp
+#endif
+
/**
* This SourceDebugExtension code does not
* allow concurrent translation - due to caching method.
--- a/jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -59,7 +59,7 @@
* {@link java.lang.instrument} for a detailed description on how these agents
* are loaded and started). The {@link #loadAgentLibrary loadAgentLibrary} and
* {@link #loadAgentPath loadAgentPath} methods are used to load agents that
- * are deployed in a dynamic library and make use of the <a
+ * are deployed either in a dynamic library or statically linked into the VM and make use of the <a
* href="../../../../../../../../technotes/guides/jvmti/index.html">JVM Tools
* Interface</a>. </p>
*
@@ -298,25 +298,29 @@
* <p> A <a href="../../../../../../../../technotes/guides/jvmti/index.html">JVM
* TI</a> client is called an <i>agent</i>. It is developed in a native language.
* A JVM TI agent is deployed in a platform specific manner but it is typically the
- * platform equivalent of a dynamic library. This method causes the given agent
- * library to be loaded into the target VM (if not already loaded).
+ * platform equivalent of a dynamic library. Alternatively, it may be statically linked into the VM.
+ * This method causes the given agent library to be loaded into the target
+ * VM (if not already loaded or if not statically linked into the VM).
* It then causes the target VM to invoke the <code>Agent_OnAttach</code> function
+ * or, for a statically linked agent named 'L', the <code>Agent_OnAttach_L</code> function
* as specified in the
* <a href="../../../../../../../../technotes/guides/jvmti/index.html"> JVM Tools
- * Interface</a> specification. Note that the <code>Agent_OnAttach</code>
+ * Interface</a> specification. Note that the <code>Agent_OnAttach[_L]</code>
* function is invoked even if the agent library was loaded prior to invoking
* this method.
*
* <p> The agent library provided is the name of the agent library. It is interpreted
* in the target virtual machine in an implementation-dependent manner. Typically an
* implementation will expand the library name into an operating system specific file
- * name. For example, on UNIX systems, the name <tt>foo</tt> might be expanded to
- * <tt>libfoo.so</tt>, and located using the search path specified by the
- * <tt>LD_LIBRARY_PATH</tt> environment variable.</p>
+ * name. For example, on UNIX systems, the name <tt>L</tt> might be expanded to
+ * <tt>libL.so</tt>, and located using the search path specified by the
+ * <tt>LD_LIBRARY_PATH</tt> environment variable. If the agent named 'L' is
+ * statically linked into the VM then the VM must export a function named
+ * <code>Agent_OnAttach_L</code>.</p>
*
- * <p> If the <code>Agent_OnAttach</code> function in the agent library returns
+ * <p> If the <code>Agent_OnAttach[_L]</code> function in the agent library returns
* an error then an {@link com.sun.tools.attach.AgentInitializationException} is
- * thrown. The return value from the <code>Agent_OnAttach</code> can then be
+ * thrown. The return value from the <code>Agent_OnAttach[_L]</code> can then be
* obtained by invoking the {@link
* com.sun.tools.attach.AgentInitializationException#returnValue() returnValue}
* method on the exception. </p>
@@ -325,15 +329,16 @@
* The name of the agent library.
*
* @param options
- * The options to provide to the <code>Agent_OnAttach</code>
+ * The options to provide to the <code>Agent_OnAttach[_L]</code>
* function (can be <code>null</code>).
*
* @throws AgentLoadException
- * If the agent library does not exist, or cannot be loaded for
- * another reason.
+ * If the agent library does not exist, the agent library is not
+ * statically linked with the VM, or the agent library cannot be
+ * loaded for another reason.
*
* @throws AgentInitializationException
- * If the <code>Agent_OnAttach</code> function returns an error
+ * If the <code>Agent_OnAttach[_L]</code> function returns an error.
*
* @throws IOException
* If an I/O error occurs
@@ -359,11 +364,12 @@
* The name of the agent library.
*
* @throws AgentLoadException
- * If the agent library does not exist, or cannot be loaded for
- * another reason.
+ * If the agent library does not exist, the agent library is not
+ * statically linked with the VM, or the agent library cannot be
+ * loaded for another reason.
*
* @throws AgentInitializationException
- * If the <code>Agent_OnAttach</code> function returns an error
+ * If the <code>Agent_OnAttach[_L]</code> function returns an error.
*
* @throws IOException
* If an I/O error occurs
@@ -383,12 +389,23 @@
* <p> A <a href="../../../../../../../../technotes/guides/jvmti/index.html">JVM
* TI</a> client is called an <i>agent</i>. It is developed in a native language.
* A JVM TI agent is deployed in a platform specific manner but it is typically the
- * platform equivalent of a dynamic library. This method causes the given agent
- * library to be loaded into the target VM (if not already loaded).
- * It then causes the target VM to invoke the <code>Agent_OnAttach</code> function
- * as specified in the
+ * platform equivalent of a dynamic library. Alternatively, the native
+ * library specified by the agentPath parameter may be statically
+ * linked with the VM. The parsing of the agentPath parameter into
+ * a statically linked library name is done in a platform
+ * specific manner in the VM. For example, in UNIX, an agentPath parameter
+ * of <code>/a/b/libL.so</code> would name a library 'L'.
+ *
+ * See the JVM TI Specification for more details.
+ *
+ * This method causes the given agent library to be loaded into the target
+ * VM (if not already loaded or if not statically linked into the VM).
+ * It then causes the target VM to invoke the <code>Agent_OnAttach</code>
+ * function or, for a statically linked agent named 'L', the
+ * <code>Agent_OnAttach_L</code> function as specified in the
* <a href="../../../../../../../../technotes/guides/jvmti/index.html"> JVM Tools
- * Interface</a> specification. Note that the <code>Agent_OnAttach</code>
+ * Interface</a> specification.
+ * Note that the <code>Agent_OnAttach[_L]</code>
* function is invoked even if the agent library was loaded prior to invoking
* this method.
*
@@ -396,9 +413,9 @@
* agent library. Unlike {@link #loadAgentLibrary loadAgentLibrary}, the library name
* is not expanded in the target virtual machine. </p>
*
- * <p> If the <code>Agent_OnAttach</code> function in the agent library returns
+ * <p> If the <code>Agent_OnAttach[_L]</code> function in the agent library returns
* an error then an {@link com.sun.tools.attach.AgentInitializationException} is
- * thrown. The return value from the <code>Agent_OnAttach</code> can then be
+ * thrown. The return value from the <code>Agent_OnAttach[_L]</code> can then be
* obtained by invoking the {@link
* com.sun.tools.attach.AgentInitializationException#returnValue() returnValue}
* method on the exception. </p>
@@ -407,15 +424,16 @@
* The full path of the agent library.
*
* @param options
- * The options to provide to the <code>Agent_OnAttach</code>
+ * The options to provide to the <code>Agent_OnAttach[_L]</code>
* function (can be <code>null</code>).
*
* @throws AgentLoadException
- * If the agent library does not exist, or cannot be loaded for
- * another reason.
+ * If the agent library does not exist, the agent library is not
+ * statically linked with the VM, or the agent library cannot be
+ * loaded for another reason.
*
* @throws AgentInitializationException
- * If the <code>Agent_OnAttach</code> function returns an error
+ * If the <code>Agent_OnAttach[_L]</code> function returns an error.
*
* @throws IOException
* If an I/O error occurs
@@ -441,11 +459,12 @@
* The full path to the agent library.
*
* @throws AgentLoadException
- * If the agent library does not exist, or cannot be loaded for
- * another reason.
+ * If the agent library does not exist, the agent library is not
+ * statically linked with the VM, or the agent library cannot be
+ * loaded for another reason.
*
* @throws AgentInitializationException
- * If the <code>Agent_OnAttach</code> function returns an error
+ * If the <code>Agent_OnAttach[_L]</code> function returns an error.
*
* @throws IOException
* If an I/O error occurs
--- a/jdk/src/share/classes/java/io/BufferedInputStream.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/io/BufferedInputStream.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,7 +50,15 @@
public
class BufferedInputStream extends FilterInputStream {
- private static int defaultBufferSize = 8192;
+ private static int DEFAULT_BUFFER_SIZE = 8192;
+
+ /**
+ * The maximum size of array to allocate.
+ * Some VMs reserve some header words in an array.
+ * Attempts to allocate larger arrays may result in
+ * OutOfMemoryError: Requested array size exceeds VM limit
+ */
+ private static int MAX_BUFFER_SIZE = Integer.MAX_VALUE - 8;
/**
* The internal buffer array where the data is stored. When necessary,
@@ -172,7 +180,7 @@
* @param in the underlying input stream.
*/
public BufferedInputStream(InputStream in) {
- this(in, defaultBufferSize);
+ this(in, DEFAULT_BUFFER_SIZE);
}
/**
@@ -215,8 +223,11 @@
} else if (buffer.length >= marklimit) {
markpos = -1; /* buffer got too big, invalidate mark */
pos = 0; /* drop buffer contents */
+ } else if (buffer.length >= MAX_BUFFER_SIZE) {
+ throw new OutOfMemoryError("Required array size too large");
} else { /* grow buffer */
- int nsz = pos * 2;
+ int nsz = (pos <= MAX_BUFFER_SIZE - pos) ?
+ pos * 2 : MAX_BUFFER_SIZE;
if (nsz > marklimit)
nsz = marklimit;
byte nbuf[] = new byte[nsz];
--- a/jdk/src/share/classes/java/lang/AbstractStringBuilder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/lang/AbstractStringBuilder.java Fri Sep 06 15:09:44 2013 -0700
@@ -1307,7 +1307,7 @@
* specified substring, starting at the specified index. The integer
* returned is the smallest value {@code k} for which:
* <blockquote><pre>
- * k >= Math.min(fromIndex, str.length()) &&
+ * k >= Math.min(fromIndex, this.length()) &&
* this.toString().startsWith(str, k)
* </pre></blockquote>
* If no such value of <i>k</i> exists, then -1 is returned.
@@ -1346,7 +1346,7 @@
* specified substring. The integer returned is the largest value <i>k</i>
* such that:
* <blockquote><pre>
- * k <= Math.min(fromIndex, str.length()) &&
+ * k <= Math.min(fromIndex, this.length()) &&
* this.toString().startsWith(str, k)
* </pre></blockquote>
* If no such value of <i>k</i> exists, then -1 is returned.
--- a/jdk/src/share/classes/java/lang/Class.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/lang/Class.java Fri Sep 06 15:09:44 2013 -0700
@@ -3338,8 +3338,16 @@
* @since 1.8
*/
public AnnotatedType getAnnotatedSuperclass() {
- return TypeAnnotationParser.buildAnnotatedSuperclass(getRawTypeAnnotations(), getConstantPool(), this);
-}
+ if (this == Object.class ||
+ isInterface() ||
+ isArray() ||
+ isPrimitive() ||
+ this == Void.TYPE) {
+ return null;
+ }
+
+ return TypeAnnotationParser.buildAnnotatedSuperclass(getRawTypeAnnotations(), getConstantPool(), this);
+ }
/**
* Returns an array of AnnotatedType objects that represent the use of types to
--- a/jdk/src/share/classes/java/lang/Math.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/lang/Math.java Fri Sep 06 15:09:44 2013 -0700
@@ -698,11 +698,8 @@
return 0;
}
- private static Random randomNumberGenerator;
-
- private static synchronized Random initRNG() {
- Random rnd = randomNumberGenerator;
- return (rnd == null) ? (randomNumberGenerator = new Random()) : rnd;
+ private static final class RandomNumberGeneratorHolder {
+ static final Random randomNumberGenerator = new Random();
}
/**
@@ -729,9 +726,7 @@
* @see Random#nextDouble()
*/
public static double random() {
- Random rnd = randomNumberGenerator;
- if (rnd == null) rnd = initRNG();
- return rnd.nextDouble();
+ return RandomNumberGeneratorHolder.randomNumberGenerator.nextDouble();
}
/**
--- a/jdk/src/share/classes/java/lang/ProcessBuilder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/lang/ProcessBuilder.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,7 +29,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.security.AccessControlException;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
@@ -1033,9 +1032,9 @@
// Can not disclose the fail reason for read-protected files.
try {
security.checkRead(prog);
- } catch (AccessControlException ace) {
+ } catch (SecurityException se) {
exceptionInfo = "";
- cause = ace;
+ cause = se;
}
}
// It's much easier for us to create a high-quality error
--- a/jdk/src/share/classes/java/lang/StrictMath.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/lang/StrictMath.java Fri Sep 06 15:09:44 2013 -0700
@@ -678,11 +678,8 @@
return Math.round(a);
}
- private static Random randomNumberGenerator;
-
- private static synchronized Random initRNG() {
- Random rnd = randomNumberGenerator;
- return (rnd == null) ? (randomNumberGenerator = new Random()) : rnd;
+ private static final class RandomNumberGeneratorHolder {
+ static final Random randomNumberGenerator = new Random();
}
/**
@@ -709,9 +706,7 @@
* @see Random#nextDouble()
*/
public static double random() {
- Random rnd = randomNumberGenerator;
- if (rnd == null) rnd = initRNG();
- return rnd.nextDouble();
+ return RandomNumberGeneratorHolder.randomNumberGenerator.nextDouble();
}
/**
--- a/jdk/src/share/classes/java/math/BigDecimal.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/math/BigDecimal.java Fri Sep 06 15:09:44 2013 -0700
@@ -2659,28 +2659,32 @@
if (ys == 0)
return 1;
- int sdiff = this.scale - val.scale;
+ long sdiff = (long)this.scale - val.scale;
if (sdiff != 0) {
// Avoid matching scales if the (adjusted) exponents differ
- int xae = this.precision() - this.scale; // [-1]
- int yae = val.precision() - val.scale; // [-1]
+ long xae = (long)this.precision() - this.scale; // [-1]
+ long yae = (long)val.precision() - val.scale; // [-1]
if (xae < yae)
return -1;
if (xae > yae)
return 1;
BigInteger rb = null;
if (sdiff < 0) {
- if ( (xs == INFLATED ||
- (xs = longMultiplyPowerTen(xs, -sdiff)) == INFLATED) &&
+ // The cases sdiff <= Integer.MIN_VALUE intentionally fall through.
+ if ( sdiff > Integer.MIN_VALUE &&
+ (xs == INFLATED ||
+ (xs = longMultiplyPowerTen(xs, (int)-sdiff)) == INFLATED) &&
ys == INFLATED) {
- rb = bigMultiplyPowerTen(-sdiff);
+ rb = bigMultiplyPowerTen((int)-sdiff);
return rb.compareMagnitude(val.intVal);
}
} else { // sdiff > 0
- if ( (ys == INFLATED ||
- (ys = longMultiplyPowerTen(ys, sdiff)) == INFLATED) &&
+ // The cases sdiff > Integer.MAX_VALUE intentionally fall through.
+ if ( sdiff <= Integer.MAX_VALUE &&
+ (ys == INFLATED ||
+ (ys = longMultiplyPowerTen(ys, (int)sdiff)) == INFLATED) &&
xs == INFLATED) {
- rb = val.bigMultiplyPowerTen(sdiff);
+ rb = val.bigMultiplyPowerTen((int)sdiff);
return this.intVal.compareMagnitude(rb);
}
}
@@ -4545,7 +4549,7 @@
if(cmp > 0) { // satisfy constraint (b)
yscale -= 1; // [that is, divisor *= 10]
int scl = checkScaleNonZero(preferredScale + yscale - xscale + mcp);
- if (checkScaleNonZero((long) mcp + yscale) > xscale) {
+ if (checkScaleNonZero((long) mcp + yscale - xscale) > 0) {
// assert newScale >= xscale
int raise = checkScaleNonZero((long) mcp + yscale - xscale);
long scaledXs;
@@ -4626,7 +4630,7 @@
// return BigDecimal object whose scale will be set to 'scl'.
int scl = checkScaleNonZero(preferredScale + yscale - xscale + mcp);
BigDecimal quotient;
- if (checkScaleNonZero((long) mcp + yscale) > xscale) {
+ if (checkScaleNonZero((long) mcp + yscale - xscale) > 0) {
int raise = checkScaleNonZero((long) mcp + yscale - xscale);
long scaledXs;
if ((scaledXs = longMultiplyPowerTen(xs, raise)) == INFLATED) {
@@ -4673,7 +4677,7 @@
// return BigDecimal object whose scale will be set to 'scl'.
BigDecimal quotient;
int scl = checkScaleNonZero(preferredScale + yscale - xscale + mcp);
- if (checkScaleNonZero((long) mcp + yscale) > xscale) {
+ if (checkScaleNonZero((long) mcp + yscale - xscale) > 0) {
int raise = checkScaleNonZero((long) mcp + yscale - xscale);
BigInteger rb = bigMultiplyPowerTen(xs,raise);
quotient = divideAndRound(rb, ys, scl, roundingMode, checkScaleNonZero(preferredScale));
@@ -4714,7 +4718,7 @@
// return BigDecimal object whose scale will be set to 'scl'.
BigDecimal quotient;
int scl = checkScaleNonZero(preferredScale + yscale - xscale + mcp);
- if (checkScaleNonZero((long) mcp + yscale) > xscale) {
+ if (checkScaleNonZero((long) mcp + yscale - xscale) > 0) {
int raise = checkScaleNonZero((long) mcp + yscale - xscale);
BigInteger rb = bigMultiplyPowerTen(xs,raise);
quotient = divideAndRound(rb, ys, scl, roundingMode, checkScaleNonZero(preferredScale));
@@ -4745,7 +4749,7 @@
// return BigDecimal object whose scale will be set to 'scl'.
BigDecimal quotient;
int scl = checkScaleNonZero(preferredScale + yscale - xscale + mcp);
- if (checkScaleNonZero((long) mcp + yscale) > xscale) {
+ if (checkScaleNonZero((long) mcp + yscale - xscale) > 0) {
int raise = checkScaleNonZero((long) mcp + yscale - xscale);
BigInteger rb = bigMultiplyPowerTen(xs,raise);
quotient = divideAndRound(rb, ys, scl, roundingMode, checkScaleNonZero(preferredScale));
--- a/jdk/src/share/classes/java/math/BigInteger.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/math/BigInteger.java Fri Sep 06 15:09:44 2013 -0700
@@ -2109,7 +2109,7 @@
// This is a quick way to approximate the size of the result,
// similar to doing log2[n] * exponent. This will give an upper bound
// of how big the result can be, and which algorithm to use.
- int scaleFactor = remainingBits * exponent;
+ long scaleFactor = (long)remainingBits * exponent;
// Use slightly different algorithms for small and large operands.
// See if the result will safely fit into a long. (Largest 2^63-1)
--- a/jdk/src/share/classes/java/rmi/server/RMISocketFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/rmi/server/RMISocketFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -50,13 +50,13 @@
* @implNote
* <p>You can use the {@code RMISocketFactory} class to create a server socket that
* is bound to a specific address, restricting the origin of requests. For example,
- * the following code implements a socket factory that binds server sockets to the
+ * the following code implements a socket factory that binds server sockets to an IPv4
* loopback address. This restricts RMI to processing requests only from the local host.
*
* <pre>{@code
* class LoopbackSocketFactory extends RMISocketFactory {
* public ServerSocket createServerSocket(int port) throws IOException {
- * return new ServerSocket(port, 5, InetAddress.getLoopbackAddress());
+ * return new ServerSocket(port, 5, InetAddress.getByName("127.0.0.1"));
* }
*
* public Socket createSocket(String host, int port) throws IOException {
@@ -72,8 +72,8 @@
* }</pre>
*
* Set the {@code java.rmi.server.hostname} system property
- * to a host name (typically {@code localhost}) that resolves to the loopback
- * interface to ensure that the generated stubs use the right network interface.
+ * to {@code 127.0.0.1} to ensure that the generated stubs connect to the right
+ * network interface.
*
* @author Ann Wollrath
* @author Peter Jones
--- a/jdk/src/share/classes/java/util/Collections.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/Collections.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,7 +27,6 @@
import java.io.Serializable;
import java.io.ObjectOutputStream;
import java.io.IOException;
-import java.io.InvalidObjectException;
import java.lang.reflect.Array;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
@@ -35,6 +34,7 @@
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@ -1148,7 +1148,16 @@
public Spliterator<E> spliterator() {
return (Spliterator<E>)c.spliterator();
}
-
+ @SuppressWarnings("unchecked")
+ @Override
+ public Stream<E> stream() {
+ return (Stream<E>)c.stream();
+ }
+ @SuppressWarnings("unchecked")
+ @Override
+ public Stream<E> parallelStream() {
+ return (Stream<E>)c.parallelStream();
+ }
}
/**
@@ -2009,8 +2018,8 @@
* through the returned collection.<p>
*
* It is imperative that the user manually synchronize on the returned
- * collection when traversing it via {@link Iterator} or
- * {@link Spliterator}:
+ * collection when traversing it via {@link Iterator}, {@link Spliterator}
+ * or {@link Stream}:
* <pre>
* Collection c = Collections.synchronizedCollection(myCollection);
* ...
@@ -2120,6 +2129,14 @@
public Spliterator<E> spliterator() {
return c.spliterator(); // Must be manually synched by user!
}
+ @Override
+ public Stream<E> stream() {
+ return c.stream(); // Must be manually synched by user!
+ }
+ @Override
+ public Stream<E> parallelStream() {
+ return c.parallelStream(); // Must be manually synched by user!
+ }
private void writeObject(ObjectOutputStream s) throws IOException {
synchronized (mutex) {s.defaultWriteObject();}
}
@@ -3172,6 +3189,10 @@
}
@Override
public Spliterator<E> spliterator() {return c.spliterator();}
+ @Override
+ public Stream<E> stream() {return c.stream();}
+ @Override
+ public Stream<E> parallelStream() {return c.parallelStream();}
}
/**
@@ -5096,6 +5117,22 @@
") > toIndex(" + toIndex + ")");
return new CopiesList<>(toIndex - fromIndex, element);
}
+
+ // Override default methods in Collection
+ @Override
+ public Stream<E> stream() {
+ return IntStream.range(0, n).mapToObj(i -> element);
+ }
+
+ @Override
+ public Stream<E> parallelStream() {
+ return IntStream.range(0, n).parallel().mapToObj(i -> element);
+ }
+
+ @Override
+ public Spliterator<E> spliterator() {
+ return stream().spliterator();
+ }
}
/**
@@ -5503,6 +5540,10 @@
@Override
public Spliterator<E> spliterator() {return s.spliterator();}
+ @Override
+ public Stream<E> stream() {return s.stream();}
+ @Override
+ public Stream<E> parallelStream() {return s.parallelStream();}
private static final long serialVersionUID = 2454657854757543876L;
@@ -5568,10 +5609,14 @@
@Override
public void forEach(Consumer<? super E> action) {q.forEach(action);}
@Override
- public Spliterator<E> spliterator() {return q.spliterator();}
- @Override
public boolean removeIf(Predicate<? super E> filter) {
return q.removeIf(filter);
}
+ @Override
+ public Spliterator<E> spliterator() {return q.spliterator();}
+ @Override
+ public Stream<E> stream() {return q.stream();}
+ @Override
+ public Stream<E> parallelStream() {return q.parallelStream();}
}
}
--- a/jdk/src/share/classes/java/util/ComparableTimSort.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/ComparableTimSort.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright 2009 Google Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -146,7 +147,7 @@
*/
int stackLen = (len < 120 ? 5 :
len < 1542 ? 10 :
- len < 119151 ? 19 : 40);
+ len < 119151 ? 24 : 40);
runBase = new int[stackLen];
runLen = new int[stackLen];
}
--- a/jdk/src/share/classes/java/util/Comparator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/Comparator.java Fri Sep 06 15:09:44 2013 -0700
@@ -199,7 +199,7 @@
* composed using following code,
*
* <pre>{@code
- * Comparator<String> cmp = Comparator.comparing(String::length)
+ * Comparator<String> cmp = Comparator.comparingInt(String::length)
* .thenComparing(String.CASE_INSENSITIVE_ORDER);
* }</pre>
*
@@ -270,18 +270,18 @@
* extracts a {@code int} sort key.
*
* @implSpec This default implementation behaves as if {@code
- * thenComparing(comparing(keyExtractor))}.
+ * thenComparing(comparingInt(keyExtractor))}.
*
* @param keyExtractor the function used to extract the integer sort key
* @return a lexicographic-order comparator composed of this and then the
* {@code int} sort key
* @throws NullPointerException if the argument is null.
- * @see #comparing(ToIntFunction)
+ * @see #comparingInt(ToIntFunction)
* @see #thenComparing(Comparator)
* @since 1.8
*/
- default Comparator<T> thenComparing(ToIntFunction<? super T> keyExtractor) {
- return thenComparing(comparing(keyExtractor));
+ default Comparator<T> thenComparingInt(ToIntFunction<? super T> keyExtractor) {
+ return thenComparing(comparingInt(keyExtractor));
}
/**
@@ -289,18 +289,18 @@
* extracts a {@code long} sort key.
*
* @implSpec This default implementation behaves as if {@code
- * thenComparing(comparing(keyExtractor))}.
+ * thenComparing(comparingLong(keyExtractor))}.
*
* @param keyExtractor the function used to extract the long sort key
* @return a lexicographic-order comparator composed of this and then the
* {@code long} sort key
* @throws NullPointerException if the argument is null.
- * @see #comparing(ToLongFunction)
+ * @see #comparingLong(ToLongFunction)
* @see #thenComparing(Comparator)
* @since 1.8
*/
- default Comparator<T> thenComparing(ToLongFunction<? super T> keyExtractor) {
- return thenComparing(comparing(keyExtractor));
+ default Comparator<T> thenComparingLong(ToLongFunction<? super T> keyExtractor) {
+ return thenComparing(comparingLong(keyExtractor));
}
/**
@@ -308,18 +308,18 @@
* extracts a {@code double} sort key.
*
* @implSpec This default implementation behaves as if {@code
- * thenComparing(comparing(keyExtractor))}.
+ * thenComparing(comparingDouble(keyExtractor))}.
*
* @param keyExtractor the function used to extract the double sort key
* @return a lexicographic-order comparator composed of this and then the
* {@code double} sort key
* @throws NullPointerException if the argument is null.
- * @see #comparing(ToDoubleFunction)
+ * @see #comparingDouble(ToDoubleFunction)
* @see #thenComparing(Comparator)
* @since 1.8
*/
- default Comparator<T> thenComparing(ToDoubleFunction<? super T> keyExtractor) {
- return thenComparing(comparing(keyExtractor));
+ default Comparator<T> thenComparingDouble(ToDoubleFunction<? super T> keyExtractor) {
+ return thenComparing(comparingDouble(keyExtractor));
}
/**
@@ -484,7 +484,7 @@
* @throws NullPointerException if the argument is null
* @since 1.8
*/
- public static <T> Comparator<T> comparing(ToIntFunction<? super T> keyExtractor) {
+ public static <T> Comparator<T> comparingInt(ToIntFunction<? super T> keyExtractor) {
Objects.requireNonNull(keyExtractor);
return (Comparator<T> & Serializable)
(c1, c2) -> Integer.compare(keyExtractor.applyAsInt(c1), keyExtractor.applyAsInt(c2));
@@ -505,7 +505,7 @@
* @throws NullPointerException if the argument is null
* @since 1.8
*/
- public static <T> Comparator<T> comparing(ToLongFunction<? super T> keyExtractor) {
+ public static <T> Comparator<T> comparingLong(ToLongFunction<? super T> keyExtractor) {
Objects.requireNonNull(keyExtractor);
return (Comparator<T> & Serializable)
(c1, c2) -> Long.compare(keyExtractor.applyAsLong(c1), keyExtractor.applyAsLong(c2));
@@ -526,7 +526,7 @@
* @throws NullPointerException if the argument is null
* @since 1.8
*/
- public static<T> Comparator<T> comparing(ToDoubleFunction<? super T> keyExtractor) {
+ public static<T> Comparator<T> comparingDouble(ToDoubleFunction<? super T> keyExtractor) {
Objects.requireNonNull(keyExtractor);
return (Comparator<T> & Serializable)
(c1, c2) -> Double.compare(keyExtractor.applyAsDouble(c1), keyExtractor.applyAsDouble(c2));
--- a/jdk/src/share/classes/java/util/Random.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/Random.java Fri Sep 06 15:09:44 2013 -0700
@@ -26,9 +26,13 @@
package java.util;
import java.io.*;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.LongConsumer;
import java.util.stream.DoubleStream;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
+import java.util.stream.StreamSupport;
import sun.misc.Unsafe;
@@ -85,6 +89,13 @@
private static final long addend = 0xBL;
private static final long mask = (1L << 48) - 1;
+ private static final double DOUBLE_UNIT = 1.0 / (1L << 53);
+
+ // IllegalArgumentException messages
+ static final String BadBound = "bound must be positive";
+ static final String BadRange = "bound must be greater than origin";
+ static final String BadSize = "size must be non-negative";
+
/**
* Creates a new random number generator. This constructor sets
* the seed of the random number generator to a value very likely
@@ -222,6 +233,82 @@
}
/**
+ * The form of nextLong used by LongStream Spliterators. If
+ * origin is greater than bound, acts as unbounded form of
+ * nextLong, else as bounded form.
+ *
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final long internalNextLong(long origin, long bound) {
+ long r = nextLong();
+ if (origin < bound) {
+ long n = bound - origin, m = n - 1;
+ if ((n & m) == 0L) // power of two
+ r = (r & m) + origin;
+ else if (n > 0L) { // reject over-represented candidates
+ for (long u = r >>> 1; // ensure nonnegative
+ u + m - (r = u % n) < 0L; // rejection check
+ u = nextLong() >>> 1) // retry
+ ;
+ r += origin;
+ }
+ else { // range not representable as long
+ while (r < origin || r >= bound)
+ r = nextLong();
+ }
+ }
+ return r;
+ }
+
+ /**
+ * The form of nextInt used by IntStream Spliterators.
+ * For the unbounded case: uses nextInt().
+ * For the bounded case with representable range: uses nextInt(int bound)
+ * For the bounded case with unrepresentable range: uses nextInt()
+ *
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final int internalNextInt(int origin, int bound) {
+ if (origin < bound) {
+ int n = bound - origin;
+ if (n > 0) {
+ return nextInt(n) + origin;
+ }
+ else { // range not representable as int
+ int r;
+ do {
+ r = nextInt();
+ } while (r < origin || r >= bound);
+ return r;
+ }
+ }
+ else {
+ return nextInt();
+ }
+ }
+
+ /**
+ * The form of nextDouble used by DoubleStream Spliterators.
+ *
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final double internalNextDouble(double origin, double bound) {
+ double r = nextDouble();
+ if (origin < bound) {
+ r = r * (bound - origin) + origin;
+ if (r >= bound) // correct for rounding
+ r = Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
+ }
+ return r;
+ }
+
+ /**
* Returns the next pseudorandom, uniformly distributed {@code int}
* value from this random number generator's sequence. The general
* contract of {@code nextInt} is that one {@code int} value is
@@ -247,23 +334,23 @@
* between 0 (inclusive) and the specified value (exclusive), drawn from
* this random number generator's sequence. The general contract of
* {@code nextInt} is that one {@code int} value in the specified range
- * is pseudorandomly generated and returned. All {@code n} possible
+ * is pseudorandomly generated and returned. All {@code bound} possible
* {@code int} values are produced with (approximately) equal
- * probability. The method {@code nextInt(int n)} is implemented by
+ * probability. The method {@code nextInt(int bound)} is implemented by
* class {@code Random} as if by:
* <pre> {@code
- * public int nextInt(int n) {
- * if (n <= 0)
- * throw new IllegalArgumentException("n must be positive");
+ * public int nextInt(int bound) {
+ * if (bound <= 0)
+ * throw new IllegalArgumentException("bound must be positive");
*
- * if ((n & -n) == n) // i.e., n is a power of 2
- * return (int)((n * (long)next(31)) >> 31);
+ * if ((bound & -bound) == bound) // i.e., bound is a power of 2
+ * return (int)((bound * (long)next(31)) >> 31);
*
* int bits, val;
* do {
* bits = next(31);
- * val = bits % n;
- * } while (bits - val + (n-1) < 0);
+ * val = bits % bound;
+ * } while (bits - val + (bound-1) < 0);
* return val;
* }}</pre>
*
@@ -289,28 +376,28 @@
* greatly increases the length of the sequence of values returned by
* successive calls to this method if n is a small power of two.
*
- * @param n the bound on the random number to be returned. Must be
- * positive.
+ * @param bound the upper bound (exclusive). Must be positive.
* @return the next pseudorandom, uniformly distributed {@code int}
- * value between {@code 0} (inclusive) and {@code n} (exclusive)
+ * value between zero (inclusive) and {@code bound} (exclusive)
* from this random number generator's sequence
- * @throws IllegalArgumentException if n is not positive
+ * @throws IllegalArgumentException if bound is not positive
* @since 1.2
*/
-
- public int nextInt(int n) {
- if (n <= 0)
- throw new IllegalArgumentException("n must be positive");
+ public int nextInt(int bound) {
+ if (bound <= 0)
+ throw new IllegalArgumentException(BadBound);
- if ((n & -n) == n) // i.e., n is a power of 2
- return (int)((n * (long)next(31)) >> 31);
-
- int bits, val;
- do {
- bits = next(31);
- val = bits % n;
- } while (bits - val + (n-1) < 0);
- return val;
+ int r = next(31);
+ int m = bound - 1;
+ if ((bound & m) == 0) // i.e., bound is a power of 2
+ r = (int)((bound * (long)r) >> 31);
+ else {
+ for (int u = r;
+ u - (r = u % bound) + m < 0;
+ u = next(31))
+ ;
+ }
+ return r;
}
/**
@@ -442,8 +529,7 @@
* @see Math#random
*/
public double nextDouble() {
- return (((long)(next(26)) << 27) + next(27))
- / (double)(1L << 53);
+ return (((long)(next(26)) << 27) + next(27)) * DOUBLE_UNIT;
}
private double nextNextGaussian;
@@ -513,57 +599,563 @@
}
}
+ // stream methods, coded in a way intended to better isolate for
+ // maintenance purposes the small differences across forms.
+
/**
- * Returns a stream of pseudorandom, uniformly distributed
- * {@code integer} values from this random number generator's
- * sequence. Values are obtained as needed by calling
- * {@link #nextInt()}.
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code int} values.
+ *
+ * <p>A pseudorandom {@code int} value is generated as if it's the result of
+ * calling the method {@link #nextInt()}.
*
- * @return an infinite stream of {@code integer} values
+ * @param streamSize the number of values to generate
+ * @return a stream of pseudorandom {@code int} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @since 1.8
+ */
+ public IntStream ints(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (this, 0L, streamSize, Integer.MAX_VALUE, 0),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code int}
+ * values.
+ *
+ * <p>A pseudorandom {@code int} value is generated as if it's the result of
+ * calling the method {@link #nextInt()}.
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * ints(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code int} values
* @since 1.8
*/
public IntStream ints() {
- return IntStream.generate(this::nextInt);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (this, 0L, Long.MAX_VALUE, Integer.MAX_VALUE, 0),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number
+ * of pseudorandom {@code int} values, each conforming to the given
+ * origin (inclusive) and bound (exclusive).
+ *
+ * <p>A pseudorandom {@code int} value is generated as if it's the result of
+ * calling the following method with the origin and bound:
+ * <pre> {@code
+ * int nextInt(int origin, int bound) {
+ * int n = bound - origin;
+ * if (n > 0) {
+ * return nextInt(n) + origin;
+ * }
+ * else { // range not representable as int
+ * int r;
+ * do {
+ * r = nextInt();
+ * } while (r < origin || r >= bound);
+ * return r;
+ * }
+ * }}</pre>
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code int} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero, or {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public IntStream ints(long streamSize, int randomNumberOrigin,
+ int randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
}
/**
- * Returns a stream of pseudorandom, uniformly distributed
- * {@code long} values from this random number generator's
- * sequence. Values are obtained as needed by calling
- * {@link #nextLong()}.
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * int} values, each conforming to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * <p>A pseudorandom {@code int} value is generated as if it's the result of
+ * calling the following method with the origin and bound:
+ * <pre> {@code
+ * int nextInt(int origin, int bound) {
+ * int n = bound - origin;
+ * if (n > 0) {
+ * return nextInt(n) + origin;
+ * }
+ * else { // range not representable as int
+ * int r;
+ * do {
+ * r = nextInt();
+ * } while (r < origin || r >= bound);
+ * return r;
+ * }
+ * }}</pre>
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * ints(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
*
- * @return an infinite stream of {@code long} values
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code int} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public IntStream ints(int randomNumberOrigin, int randomNumberBound) {
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code long} values.
+ *
+ * <p>A pseudorandom {@code long} value is generated as if it's the result
+ * of calling the method {@link #nextLong()}.
+ *
+ * @param streamSize the number of values to generate
+ * @return a stream of pseudorandom {@code long} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @since 1.8
+ */
+ public LongStream longs(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (this, 0L, streamSize, Long.MAX_VALUE, 0L),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code long}
+ * values.
+ *
+ * <p>A pseudorandom {@code long} value is generated as if it's the result
+ * of calling the method {@link #nextLong()}.
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * longs(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code long} values
* @since 1.8
*/
public LongStream longs() {
- return LongStream.generate(this::nextLong);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (this, 0L, Long.MAX_VALUE, Long.MAX_VALUE, 0L),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code long}, each conforming to the given origin
+ * (inclusive) and bound (exclusive).
+ *
+ * <p>A pseudorandom {@code long} value is generated as if it's the result
+ * of calling the following method with the origin and bound:
+ * <pre> {@code
+ * long nextLong(long origin, long bound) {
+ * long r = nextLong();
+ * long n = bound - origin, m = n - 1;
+ * if ((n & m) == 0L) // power of two
+ * r = (r & m) + origin;
+ * else if (n > 0L) { // reject over-represented candidates
+ * for (long u = r >>> 1; // ensure nonnegative
+ * u + m - (r = u % n) < 0L; // rejection check
+ * u = nextLong() >>> 1) // retry
+ * ;
+ * r += origin;
+ * }
+ * else { // range not representable as long
+ * while (r < origin || r >= bound)
+ * r = nextLong();
+ * }
+ * return r;
+ * }}</pre>
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code long} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero, or {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public LongStream longs(long streamSize, long randomNumberOrigin,
+ long randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
}
/**
- * Returns a stream of pseudorandom, uniformly distributed
- * {@code double} values between {@code 0.0} and {@code 1.0}
- * from this random number generator's sequence. Values are
- * obtained as needed by calling {@link #nextDouble()}.
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * long} values, each conforming to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * <p>A pseudorandom {@code long} value is generated as if it's the result
+ * of calling the following method with the origin and bound:
+ * <pre> {@code
+ * long nextLong(long origin, long bound) {
+ * long r = nextLong();
+ * long n = bound - origin, m = n - 1;
+ * if ((n & m) == 0L) // power of two
+ * r = (r & m) + origin;
+ * else if (n > 0L) { // reject over-represented candidates
+ * for (long u = r >>> 1; // ensure nonnegative
+ * u + m - (r = u % n) < 0L; // rejection check
+ * u = nextLong() >>> 1) // retry
+ * ;
+ * r += origin;
+ * }
+ * else { // range not representable as long
+ * while (r < origin || r >= bound)
+ * r = nextLong();
+ * }
+ * return r;
+ * }}</pre>
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * longs(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
*
- * @return an infinite stream of {@code double} values
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code long} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public LongStream longs(long randomNumberOrigin, long randomNumberBound) {
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code double} values, each between zero
+ * (inclusive) and one (exclusive).
+ *
+ * <p>A pseudorandom {@code double} value is generated as if it's the result
+ * of calling the method {@link #nextDouble()}}.
+ *
+ * @param streamSize the number of values to generate
+ * @return a stream of {@code double} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @since 1.8
+ */
+ public DoubleStream doubles(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (this, 0L, streamSize, Double.MAX_VALUE, 0.0),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * double} values, each between zero (inclusive) and one
+ * (exclusive).
+ *
+ * <p>A pseudorandom {@code double} value is generated as if it's the result
+ * of calling the method {@link #nextDouble()}}.
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * doubles(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code double} values
* @since 1.8
*/
public DoubleStream doubles() {
- return DoubleStream.generate(this::nextDouble);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (this, 0L, Long.MAX_VALUE, Double.MAX_VALUE, 0.0),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code double} values, each conforming to the given origin
+ * (inclusive) and bound (exclusive).
+ *
+ * <p>A pseudorandom {@code double} value is generated as if it's the result
+ * of calling the following method with the origin and bound:
+ * <pre> {@code
+ * double nextDouble(double origin, double bound) {
+ * double r = nextDouble();
+ * r = r * (bound - origin) + origin;
+ * if (r >= bound) // correct for rounding
+ * r = Math.nextDown(bound);
+ * return r;
+ * }}</pre>
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code double} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public DoubleStream doubles(long streamSize, double randomNumberOrigin,
+ double randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (!(randomNumberOrigin < randomNumberBound))
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * double} values, each conforming to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * <p>A pseudorandom {@code double} value is generated as if it's the result
+ * of calling the following method with the origin and bound:
+ * <pre> {@code
+ * double nextDouble(double origin, double bound) {
+ * double r = nextDouble();
+ * r = r * (bound - origin) + origin;
+ * if (r >= bound) // correct for rounding
+ * r = Math.nextDown(bound);
+ * return r;
+ * }}</pre>
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * doubles(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
+ *
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code double} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public DoubleStream doubles(double randomNumberOrigin, double randomNumberBound) {
+ if (!(randomNumberOrigin < randomNumberBound))
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
}
/**
- * Returns a stream of pseudorandom, Gaussian ("normally")
- * distributed {@code double} values with mean {@code 0.0}
- * and standard deviation {@code 1.0} from this random number
- * generator's sequence. Values are obtained as needed by
- * calling {@link #nextGaussian()}.
- *
- * @return an infinite stream of {@code double} values
- * @since 1.8
+ * Spliterator for int streams. We multiplex the four int
+ * versions into one class by treating a bound less than origin as
+ * unbounded, and also by treating "infinite" as equivalent to
+ * Long.MAX_VALUE. For splits, it uses the standard divide-by-two
+ * approach. The long and double versions of this class are
+ * identical except for types.
+ */
+ static final class RandomIntsSpliterator implements Spliterator.OfInt {
+ final Random rng;
+ long index;
+ final long fence;
+ final int origin;
+ final int bound;
+ RandomIntsSpliterator(Random rng, long index, long fence,
+ int origin, int bound) {
+ this.rng = rng; this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomIntsSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomIntsSpliterator(rng, i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(IntConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(rng.internalNextInt(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(IntConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ Random r = rng;
+ int o = origin, b = bound;
+ do {
+ consumer.accept(r.internalNextInt(o, b));
+ } while (++i < f);
+ }
+ }
+ }
+
+ /**
+ * Spliterator for long streams.
*/
- public DoubleStream gaussians() {
- return DoubleStream.generate(this::nextGaussian);
+ static final class RandomLongsSpliterator implements Spliterator.OfLong {
+ final Random rng;
+ long index;
+ final long fence;
+ final long origin;
+ final long bound;
+ RandomLongsSpliterator(Random rng, long index, long fence,
+ long origin, long bound) {
+ this.rng = rng; this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomLongsSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomLongsSpliterator(rng, i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(LongConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(rng.internalNextLong(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(LongConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ Random r = rng;
+ long o = origin, b = bound;
+ do {
+ consumer.accept(r.internalNextLong(o, b));
+ } while (++i < f);
+ }
+ }
+
+ }
+
+ /**
+ * Spliterator for double streams.
+ */
+ static final class RandomDoublesSpliterator implements Spliterator.OfDouble {
+ final Random rng;
+ long index;
+ final long fence;
+ final double origin;
+ final double bound;
+ RandomDoublesSpliterator(Random rng, long index, long fence,
+ double origin, double bound) {
+ this.rng = rng; this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomDoublesSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomDoublesSpliterator(rng, i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(DoubleConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(rng.internalNextDouble(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(DoubleConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ Random r = rng;
+ double o = origin, b = bound;
+ do {
+ consumer.accept(r.internalNextDouble(o, b));
+ } while (++i < f);
+ }
+ }
}
/**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/SplittableRandom.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,1002 @@
+/*
+ * 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 java.util;
+
+import java.security.SecureRandom;
+import java.net.InetAddress;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.IntConsumer;
+import java.util.function.LongConsumer;
+import java.util.function.DoubleConsumer;
+import java.util.stream.StreamSupport;
+import java.util.stream.IntStream;
+import java.util.stream.LongStream;
+import java.util.stream.DoubleStream;
+
+/**
+ * A generator of uniform pseudorandom values applicable for use in
+ * (among other contexts) isolated parallel computations that may
+ * generate subtasks. Class {@code SplittableRandom} supports methods for
+ * producing pseudorandom numbers of type {@code int}, {@code long},
+ * and {@code double} with similar usages as for class
+ * {@link java.util.Random} but differs in the following ways:
+ *
+ * <ul>
+ *
+ * <li>Series of generated values pass the DieHarder suite testing
+ * independence and uniformity properties of random number generators.
+ * (Most recently validated with <a
+ * href="http://www.phy.duke.edu/~rgb/General/dieharder.php"> version
+ * 3.31.1</a>.) These tests validate only the methods for certain
+ * types and ranges, but similar properties are expected to hold, at
+ * least approximately, for others as well. The <em>period</em>
+ * (length of any series of generated values before it repeats) is at
+ * least 2<sup>64</sup>. </li>
+ *
+ * <li> Method {@link #split} constructs and returns a new
+ * SplittableRandom instance that shares no mutable state with the
+ * current instance. However, with very high probability, the
+ * values collectively generated by the two objects have the same
+ * statistical properties as if the same quantity of values were
+ * generated by a single thread using a single {@code
+ * SplittableRandom} object. </li>
+ *
+ * <li>Instances of SplittableRandom are <em>not</em> thread-safe.
+ * They are designed to be split, not shared, across threads. For
+ * example, a {@link java.util.concurrent.ForkJoinTask
+ * fork/join-style} computation using random numbers might include a
+ * construction of the form {@code new
+ * Subtask(aSplittableRandom.split()).fork()}.
+ *
+ * <li>This class provides additional methods for generating random
+ * streams, that employ the above techniques when used in {@code
+ * stream.parallel()} mode.</li>
+ *
+ * </ul>
+ *
+ * <p>Instances of {@code SplittableRandom} are not cryptographically
+ * secure. Consider instead using {@link java.security.SecureRandom}
+ * in security-sensitive applications. Additionally,
+ * default-constructed instances do not use a cryptographically random
+ * seed unless the {@linkplain System#getProperty system property}
+ * {@code java.util.secureRandomSeed} is set to {@code true}.
+ *
+ * @author Guy Steele
+ * @author Doug Lea
+ * @since 1.8
+ */
+public final class SplittableRandom {
+
+ /*
+ * Implementation Overview.
+ *
+ * This algorithm was inspired by the "DotMix" algorithm by
+ * Leiserson, Schardl, and Sukha "Deterministic Parallel
+ * Random-Number Generation for Dynamic-Multithreading Platforms",
+ * PPoPP 2012, as well as those in "Parallel random numbers: as
+ * easy as 1, 2, 3" by Salmon, Morae, Dror, and Shaw, SC 2011. It
+ * differs mainly in simplifying and cheapening operations.
+ *
+ * The primary update step (method nextSeed()) is to add a
+ * constant ("gamma") to the current (64 bit) seed, forming a
+ * simple sequence. The seed and the gamma values for any two
+ * SplittableRandom instances are highly likely to be different.
+ *
+ * Methods nextLong, nextInt, and derivatives do not return the
+ * sequence (seed) values, but instead a hash-like bit-mix of
+ * their bits, producing more independently distributed sequences.
+ * For nextLong, the mix64 bit-mixing function computes the same
+ * value as the "64-bit finalizer" function in Austin Appleby's
+ * MurmurHash3 algorithm. See
+ * http://code.google.com/p/smhasher/wiki/MurmurHash3 , which
+ * comments: "The constants for the finalizers were generated by a
+ * simple simulated-annealing algorithm, and both avalanche all
+ * bits of 'h' to within 0.25% bias." The mix32 function is
+ * equivalent to (int)(mix64(seed) >>> 32), but faster because it
+ * omits a step that doesn't contribute to result.
+ *
+ * The split operation uses the current generator to form the seed
+ * and gamma for another SplittableRandom. To conservatively
+ * avoid potential correlations between seed and value generation,
+ * gamma selection (method nextGamma) uses the "Mix13" constants
+ * for MurmurHash3 described by David Stafford
+ * (http://zimbry.blogspot.com/2011/09/better-bit-mixing-improving-on.html)
+ * To avoid potential weaknesses in bit-mixing transformations, we
+ * restrict gammas to odd values with at least 12 and no more than
+ * 52 bits set. Rather than rejecting candidates with too few or
+ * too many bits set, method nextGamma flips some bits (which has
+ * the effect of mapping at most 4 to any given gamma value).
+ * This reduces the effective set of 64bit odd gamma values by
+ * about 2<sup>14</sup>, a very tiny percentage, and serves as an
+ * automated screening for sequence constant selection that is
+ * left as an empirical decision in some other hashing and crypto
+ * algorithms.
+ *
+ * The resulting generator thus transforms a sequence in which
+ * (typically) many bits change on each step, with an inexpensive
+ * mixer with good (but less than cryptographically secure)
+ * avalanching.
+ *
+ * The default (no-argument) constructor, in essence, invokes
+ * split() for a common "seeder" SplittableRandom. Unlike other
+ * cases, this split must be performed in a thread-safe manner, so
+ * we use an AtomicLong to represent the seed rather than use an
+ * explicit SplittableRandom. To bootstrap the seeder, we start
+ * off using a seed based on current time and host unless the
+ * java.util.secureRandomSeed property is set. This serves as a
+ * slimmed-down (and insecure) variant of SecureRandom that also
+ * avoids stalls that may occur when using /dev/random.
+ *
+ * It is a relatively simple matter to apply the basic design here
+ * to use 128 bit seeds. However, emulating 128bit arithmetic and
+ * carrying around twice the state add more overhead than appears
+ * warranted for current usages.
+ *
+ * File organization: First the non-public methods that constitute
+ * the main algorithm, then the main public methods, followed by
+ * some custom spliterator classes needed for stream methods.
+ */
+
+ /**
+ * The initial gamma value for (unsplit) SplittableRandoms. Must
+ * be odd with at least 12 and no more than 52 bits set. Currently
+ * set to the golden ratio scaled to 64bits.
+ */
+ private static final long INITIAL_GAMMA = 0x9e3779b97f4a7c15L;
+
+ /**
+ * The least non-zero value returned by nextDouble(). This value
+ * is scaled by a random value of 53 bits to produce a result.
+ */
+ private static final double DOUBLE_UNIT = 1.0 / (1L << 53);
+
+ /**
+ * The seed. Updated only via method nextSeed.
+ */
+ private long seed;
+
+ /**
+ * The step value.
+ */
+ private final long gamma;
+
+ /**
+ * Internal constructor used by all others except default constructor.
+ */
+ private SplittableRandom(long seed, long gamma) {
+ this.seed = seed;
+ this.gamma = gamma;
+ }
+
+ /**
+ * Computes MurmurHash3 64bit mix function.
+ */
+ private static long mix64(long z) {
+ z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL;
+ z = (z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L;
+ return z ^ (z >>> 33);
+ }
+
+ /**
+ * Returns the 32 high bits of mix64(z) as int.
+ */
+ private static int mix32(long z) {
+ z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL;
+ return (int)(((z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L) >>> 32);
+ }
+
+ /**
+ * Returns the gamma value to use for a new split instance.
+ */
+ private static long nextGamma(long z) {
+ z = (z ^ (z >>> 30)) * 0xbf58476d1ce4e5b9L; // Stafford "Mix13"
+ z = (z ^ (z >>> 27)) * 0x94d049bb133111ebL;
+ z = (z ^ (z >>> 31)) | 1L; // force to be odd
+ int n = Long.bitCount(z); // ensure enough 0 and 1 bits
+ return (n < 12 || n > 52) ? z ^ 0xaaaaaaaaaaaaaaaaL : z;
+ }
+
+ /**
+ * Adds gamma to seed.
+ */
+ private long nextSeed() {
+ return seed += gamma;
+ }
+
+ /**
+ * The seed generator for default constructors.
+ */
+ private static final AtomicLong seeder = new AtomicLong(initialSeed());
+
+ private static long initialSeed() {
+ String pp = java.security.AccessController.doPrivileged(
+ new sun.security.action.GetPropertyAction(
+ "java.util.secureRandomSeed"));
+ if (pp != null && pp.equalsIgnoreCase("true")) {
+ byte[] seedBytes = java.security.SecureRandom.getSeed(8);
+ long s = (long)(seedBytes[0]) & 0xffL;
+ for (int i = 1; i < 8; ++i)
+ s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
+ return s;
+ }
+ int hh = 0; // hashed host address
+ try {
+ hh = InetAddress.getLocalHost().hashCode();
+ } catch (Exception ignore) {
+ }
+ return (mix64((((long)hh) << 32) ^ System.currentTimeMillis()) ^
+ mix64(System.nanoTime()));
+ }
+
+ // IllegalArgumentException messages
+ static final String BadBound = "bound must be positive";
+ static final String BadRange = "bound must be greater than origin";
+ static final String BadSize = "size must be non-negative";
+
+ /*
+ * Internal versions of nextX methods used by streams, as well as
+ * the public nextX(origin, bound) methods. These exist mainly to
+ * avoid the need for multiple versions of stream spliterators
+ * across the different exported forms of streams.
+ */
+
+ /**
+ * The form of nextLong used by LongStream Spliterators. If
+ * origin is greater than bound, acts as unbounded form of
+ * nextLong, else as bounded form.
+ *
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final long internalNextLong(long origin, long bound) {
+ /*
+ * Four Cases:
+ *
+ * 1. If the arguments indicate unbounded form, act as
+ * nextLong().
+ *
+ * 2. If the range is an exact power of two, apply the
+ * associated bit mask.
+ *
+ * 3. If the range is positive, loop to avoid potential bias
+ * when the implicit nextLong() bound (2<sup>64</sup>) is not
+ * evenly divisible by the range. The loop rejects candidates
+ * computed from otherwise over-represented values. The
+ * expected number of iterations under an ideal generator
+ * varies from 1 to 2, depending on the bound. The loop itself
+ * takes an unlovable form. Because the first candidate is
+ * already available, we need a break-in-the-middle
+ * construction, which is concisely but cryptically performed
+ * within the while-condition of a body-less for loop.
+ *
+ * 4. Otherwise, the range cannot be represented as a positive
+ * long. The loop repeatedly generates unbounded longs until
+ * obtaining a candidate meeting constraints (with an expected
+ * number of iterations of less than two).
+ */
+
+ long r = mix64(nextSeed());
+ if (origin < bound) {
+ long n = bound - origin, m = n - 1;
+ if ((n & m) == 0L) // power of two
+ r = (r & m) + origin;
+ else if (n > 0L) { // reject over-represented candidates
+ for (long u = r >>> 1; // ensure nonnegative
+ u + m - (r = u % n) < 0L; // rejection check
+ u = mix64(nextSeed()) >>> 1) // retry
+ ;
+ r += origin;
+ }
+ else { // range not representable as long
+ while (r < origin || r >= bound)
+ r = mix64(nextSeed());
+ }
+ }
+ return r;
+ }
+
+ /**
+ * The form of nextInt used by IntStream Spliterators.
+ * Exactly the same as long version, except for types.
+ *
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final int internalNextInt(int origin, int bound) {
+ int r = mix32(nextSeed());
+ if (origin < bound) {
+ int n = bound - origin, m = n - 1;
+ if ((n & m) == 0)
+ r = (r & m) + origin;
+ else if (n > 0) {
+ for (int u = r >>> 1;
+ u + m - (r = u % n) < 0;
+ u = mix32(nextSeed()) >>> 1)
+ ;
+ r += origin;
+ }
+ else {
+ while (r < origin || r >= bound)
+ r = mix32(nextSeed());
+ }
+ }
+ return r;
+ }
+
+ /**
+ * The form of nextDouble used by DoubleStream Spliterators.
+ *
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final double internalNextDouble(double origin, double bound) {
+ double r = (nextLong() >>> 11) * DOUBLE_UNIT;
+ if (origin < bound) {
+ r = r * (bound - origin) + origin;
+ if (r >= bound) // correct for rounding
+ r = Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
+ }
+ return r;
+ }
+
+ /* ---------------- public methods ---------------- */
+
+ /**
+ * Creates a new SplittableRandom instance using the specified
+ * initial seed. SplittableRandom instances created with the same
+ * seed in the same program generate identical sequences of values.
+ *
+ * @param seed the initial seed
+ */
+ public SplittableRandom(long seed) {
+ this(seed, INITIAL_GAMMA);
+ }
+
+ /**
+ * Creates a new SplittableRandom instance that is likely to
+ * generate sequences of values that are statistically independent
+ * of those of any other instances in the current program; and
+ * may, and typically does, vary across program invocations.
+ */
+ public SplittableRandom() { // emulate seeder.split()
+ this.gamma = nextGamma(this.seed = seeder.addAndGet(INITIAL_GAMMA));
+ }
+
+ /**
+ * Constructs and returns a new SplittableRandom instance that
+ * shares no mutable state with this instance. However, with very
+ * high probability, the set of values collectively generated by
+ * the two objects has the same statistical properties as if the
+ * same quantity of values were generated by a single thread using
+ * a single SplittableRandom object. Either or both of the two
+ * objects may be further split using the {@code split()} method,
+ * and the same expected statistical properties apply to the
+ * entire set of generators constructed by such recursive
+ * splitting.
+ *
+ * @return the new SplittableRandom instance
+ */
+ public SplittableRandom split() {
+ long s = nextSeed();
+ return new SplittableRandom(s, nextGamma(s));
+ }
+
+ /**
+ * Returns a pseudorandom {@code int} value.
+ *
+ * @return a pseudorandom {@code int} value
+ */
+ public int nextInt() {
+ return mix32(nextSeed());
+ }
+
+ /**
+ * Returns a pseudorandom {@code int} value between zero (inclusive)
+ * and the specified bound (exclusive).
+ *
+ * @param bound the upper bound (exclusive). Must be positive.
+ * @return a pseudorandom {@code int} value between zero
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code bound} is not positive
+ */
+ public int nextInt(int bound) {
+ if (bound <= 0)
+ throw new IllegalArgumentException(BadBound);
+ // Specialize internalNextInt for origin 0
+ int r = mix32(nextSeed());
+ int m = bound - 1;
+ if ((bound & m) == 0) // power of two
+ r &= m;
+ else { // reject over-represented candidates
+ for (int u = r >>> 1;
+ u + m - (r = u % bound) < 0;
+ u = mix32(nextSeed()) >>> 1)
+ ;
+ }
+ return r;
+ }
+
+ /**
+ * Returns a pseudorandom {@code int} value between the specified
+ * origin (inclusive) and the specified bound (exclusive).
+ *
+ * @param origin the least value returned
+ * @param bound the upper bound (exclusive)
+ * @return a pseudorandom {@code int} value between the origin
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code origin} is greater than
+ * or equal to {@code bound}
+ */
+ public int nextInt(int origin, int bound) {
+ if (origin >= bound)
+ throw new IllegalArgumentException(BadRange);
+ return internalNextInt(origin, bound);
+ }
+
+ /**
+ * Returns a pseudorandom {@code long} value.
+ *
+ * @return a pseudorandom {@code long} value
+ */
+ public long nextLong() {
+ return mix64(nextSeed());
+ }
+
+ /**
+ * Returns a pseudorandom {@code long} value between zero (inclusive)
+ * and the specified bound (exclusive).
+ *
+ * @param bound the upper bound (exclusive). Must be positive.
+ * @return a pseudorandom {@code long} value between zero
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code bound} is not positive
+ */
+ public long nextLong(long bound) {
+ if (bound <= 0)
+ throw new IllegalArgumentException(BadBound);
+ // Specialize internalNextLong for origin 0
+ long r = mix64(nextSeed());
+ long m = bound - 1;
+ if ((bound & m) == 0L) // power of two
+ r &= m;
+ else { // reject over-represented candidates
+ for (long u = r >>> 1;
+ u + m - (r = u % bound) < 0L;
+ u = mix64(nextSeed()) >>> 1)
+ ;
+ }
+ return r;
+ }
+
+ /**
+ * Returns a pseudorandom {@code long} value between the specified
+ * origin (inclusive) and the specified bound (exclusive).
+ *
+ * @param origin the least value returned
+ * @param bound the upper bound (exclusive)
+ * @return a pseudorandom {@code long} value between the origin
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code origin} is greater than
+ * or equal to {@code bound}
+ */
+ public long nextLong(long origin, long bound) {
+ if (origin >= bound)
+ throw new IllegalArgumentException(BadRange);
+ return internalNextLong(origin, bound);
+ }
+
+ /**
+ * Returns a pseudorandom {@code double} value between zero
+ * (inclusive) and one (exclusive).
+ *
+ * @return a pseudorandom {@code double} value between zero
+ * (inclusive) and one (exclusive)
+ */
+ public double nextDouble() {
+ return (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT;
+ }
+
+ /**
+ * Returns a pseudorandom {@code double} value between 0.0
+ * (inclusive) and the specified bound (exclusive).
+ *
+ * @param bound the upper bound (exclusive). Must be positive.
+ * @return a pseudorandom {@code double} value between zero
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code bound} is not positive
+ */
+ public double nextDouble(double bound) {
+ if (!(bound > 0.0))
+ throw new IllegalArgumentException(BadBound);
+ double result = (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT * bound;
+ return (result < bound) ? result : // correct for rounding
+ Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
+ }
+
+ /**
+ * Returns a pseudorandom {@code double} value between the specified
+ * origin (inclusive) and bound (exclusive).
+ *
+ * @param origin the least value returned
+ * @param bound the upper bound (exclusive)
+ * @return a pseudorandom {@code double} value between the origin
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code origin} is greater than
+ * or equal to {@code bound}
+ */
+ public double nextDouble(double origin, double bound) {
+ if (!(origin < bound))
+ throw new IllegalArgumentException(BadRange);
+ return internalNextDouble(origin, bound);
+ }
+
+ /**
+ * Returns a pseudorandom {@code boolean} value.
+ *
+ * @return a pseudorandom {@code boolean} value
+ */
+ public boolean nextBoolean() {
+ return mix32(nextSeed()) < 0;
+ }
+
+ // stream methods, coded in a way intended to better isolate for
+ // maintenance purposes the small differences across forms.
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number
+ * of pseudorandom {@code int} values from this generator and/or
+ * one split from it.
+ *
+ * @param streamSize the number of values to generate
+ * @return a stream of pseudorandom {@code int} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ */
+ public IntStream ints(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (this, 0L, streamSize, Integer.MAX_VALUE, 0),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code int}
+ * values from this generator and/or one split from it.
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * ints(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code int} values
+ */
+ public IntStream ints() {
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (this, 0L, Long.MAX_VALUE, Integer.MAX_VALUE, 0),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number
+ * of pseudorandom {@code int} values from this generator and/or one split
+ * from it; each value conforms to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code int} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero, or {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ */
+ public IntStream ints(long streamSize, int randomNumberOrigin,
+ int randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * int} values from this generator and/or one split from it; each value
+ * conforms to the given origin (inclusive) and bound (exclusive).
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * ints(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
+ *
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code int} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ */
+ public IntStream ints(int randomNumberOrigin, int randomNumberBound) {
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number
+ * of pseudorandom {@code long} values from this generator and/or
+ * one split from it.
+ *
+ * @param streamSize the number of values to generate
+ * @return a stream of pseudorandom {@code long} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ */
+ public LongStream longs(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (this, 0L, streamSize, Long.MAX_VALUE, 0L),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * long} values from this generator and/or one split from it.
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * longs(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code long} values
+ */
+ public LongStream longs() {
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (this, 0L, Long.MAX_VALUE, Long.MAX_VALUE, 0L),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code long} values from this generator and/or one split
+ * from it; each value conforms to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code long} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero, or {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ */
+ public LongStream longs(long streamSize, long randomNumberOrigin,
+ long randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * long} values from this generator and/or one split from it; each value
+ * conforms to the given origin (inclusive) and bound (exclusive).
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * longs(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
+ *
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code long} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ */
+ public LongStream longs(long randomNumberOrigin, long randomNumberBound) {
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code double} values from this generator and/or one split
+ * from it; each value is between zero (inclusive) and one (exclusive).
+ *
+ * @param streamSize the number of values to generate
+ * @return a stream of {@code double} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ */
+ public DoubleStream doubles(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (this, 0L, streamSize, Double.MAX_VALUE, 0.0),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * double} values from this generator and/or one split from it; each value
+ * is between zero (inclusive) and one (exclusive).
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * doubles(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code double} values
+ */
+ public DoubleStream doubles() {
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (this, 0L, Long.MAX_VALUE, Double.MAX_VALUE, 0.0),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code double} values from this generator and/or one split
+ * from it; each value conforms to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code double} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ */
+ public DoubleStream doubles(long streamSize, double randomNumberOrigin,
+ double randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (!(randomNumberOrigin < randomNumberBound))
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * double} values from this generator and/or one split from it; each value
+ * conforms to the given origin (inclusive) and bound (exclusive).
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * doubles(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
+ *
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code double} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ */
+ public DoubleStream doubles(double randomNumberOrigin, double randomNumberBound) {
+ if (!(randomNumberOrigin < randomNumberBound))
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Spliterator for int streams. We multiplex the four int
+ * versions into one class by treating a bound less than origin as
+ * unbounded, and also by treating "infinite" as equivalent to
+ * Long.MAX_VALUE. For splits, it uses the standard divide-by-two
+ * approach. The long and double versions of this class are
+ * identical except for types.
+ */
+ static final class RandomIntsSpliterator implements Spliterator.OfInt {
+ final SplittableRandom rng;
+ long index;
+ final long fence;
+ final int origin;
+ final int bound;
+ RandomIntsSpliterator(SplittableRandom rng, long index, long fence,
+ int origin, int bound) {
+ this.rng = rng; this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomIntsSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomIntsSpliterator(rng.split(), i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(IntConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(rng.internalNextInt(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(IntConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ SplittableRandom r = rng;
+ int o = origin, b = bound;
+ do {
+ consumer.accept(r.internalNextInt(o, b));
+ } while (++i < f);
+ }
+ }
+ }
+
+ /**
+ * Spliterator for long streams.
+ */
+ static final class RandomLongsSpliterator implements Spliterator.OfLong {
+ final SplittableRandom rng;
+ long index;
+ final long fence;
+ final long origin;
+ final long bound;
+ RandomLongsSpliterator(SplittableRandom rng, long index, long fence,
+ long origin, long bound) {
+ this.rng = rng; this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomLongsSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomLongsSpliterator(rng.split(), i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(LongConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(rng.internalNextLong(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(LongConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ SplittableRandom r = rng;
+ long o = origin, b = bound;
+ do {
+ consumer.accept(r.internalNextLong(o, b));
+ } while (++i < f);
+ }
+ }
+
+ }
+
+ /**
+ * Spliterator for double streams.
+ */
+ static final class RandomDoublesSpliterator implements Spliterator.OfDouble {
+ final SplittableRandom rng;
+ long index;
+ final long fence;
+ final double origin;
+ final double bound;
+ RandomDoublesSpliterator(SplittableRandom rng, long index, long fence,
+ double origin, double bound) {
+ this.rng = rng; this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomDoublesSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomDoublesSpliterator(rng.split(), i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(DoubleConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(rng.internalNextDouble(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(DoubleConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ SplittableRandom r = rng;
+ double o = origin, b = bound;
+ do {
+ consumer.accept(r.internalNextDouble(o, b));
+ } while (++i < f);
+ }
+ }
+ }
+
+}
--- a/jdk/src/share/classes/java/util/TimSort.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/TimSort.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright 2009 Google Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -176,7 +177,7 @@
*/
int stackLen = (len < 120 ? 5 :
len < 1542 ? 10 :
- len < 119151 ? 19 : 40);
+ len < 119151 ? 24 : 40);
runBase = new int[stackLen];
runLen = new int[stackLen];
}
--- a/jdk/src/share/classes/java/util/TreeMap.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/TreeMap.java Fri Sep 06 15:09:44 2013 -0700
@@ -973,6 +973,27 @@
}
@Override
+ public boolean replace(K key, V oldValue, V newValue) {
+ Entry<K,V> p = getEntry(key);
+ if (p!=null && Objects.equals(oldValue, p.value)) {
+ p.value = newValue;
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public V replace(K key, V value) {
+ Entry<K,V> p = getEntry(key);
+ if (p!=null) {
+ V oldValue = p.value;
+ p.value = value;
+ return oldValue;
+ }
+ return null;
+ }
+
+ @Override
public void forEach(BiConsumer<? super K, ? super V> action) {
Objects.requireNonNull(action);
int expectedModCount = modCount;
--- a/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java Fri Sep 06 15:09:44 2013 -0700
@@ -37,11 +37,16 @@
import java.io.ObjectStreamField;
import java.util.Random;
+import java.util.Spliterator;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.LongConsumer;
import java.util.stream.DoubleStream;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
+import java.util.stream.StreamSupport;
/**
* A random number generator isolated to the current thread. Like the
@@ -64,6 +69,10 @@
* <p>This class also provides additional commonly used bounded random
* generation methods.
*
+ * <p>Instances of {@code ThreadLocalRandom} are not cryptographically
+ * secure. Consider instead using {@link java.security.SecureRandom}
+ * in security-sensitive applications.
+ *
* @since 1.7
* @author Doug Lea
*/
@@ -85,28 +94,26 @@
* application-level overhead and footprint of most concurrent
* programs.
*
+ * Even though this class subclasses java.util.Random, it uses the
+ * same basic algorithm as java.util.SplittableRandom. (See its
+ * internal documentation for explanations, which are not repeated
+ * here.) Because ThreadLocalRandoms are not splittable
+ * though, we use only a single 64bit gamma.
+ *
* Because this class is in a different package than class Thread,
* field access methods use Unsafe to bypass access control rules.
- * The base functionality of Random methods is conveniently
- * isolated in method next(bits), that just reads and writes the
- * Thread field rather than its own field. However, to conform to
- * the requirements of the Random superclass constructor, the
- * common static ThreadLocalRandom maintains an "initialized"
- * field for the sake of rejecting user calls to setSeed while
- * still allowing a call from constructor. Note that
- * serialization is completely unnecessary because there is only a
- * static singleton. But we generate a serial form containing
- * "rnd" and "initialized" fields to ensure compatibility across
- * versions.
+ * To conform to the requirements of the Random superclass
+ * constructor, the common static ThreadLocalRandom maintains an
+ * "initialized" field for the sake of rejecting user calls to
+ * setSeed while still allowing a call from constructor. Note
+ * that serialization is completely unnecessary because there is
+ * only a static singleton. But we generate a serial form
+ * containing "rnd" and "initialized" fields to ensure
+ * compatibility across versions.
*
- * Per-thread initialization is similar to that in the no-arg
- * Random constructor, but we avoid correlation among not only
- * initial seeds of those created in different threads, but also
- * those created using class Random itself; while at the same time
- * not changing any statistical properties. So we use the same
- * underlying multiplicative sequence, but start the sequence far
- * away from the base version, and then merge (xor) current time
- * and per-thread probe bits to generate initial values.
+ * Implementations of non-core methods are mostly the same as in
+ * SplittableRandom, that were in part derived from a previous
+ * version of this class.
*
* The nextLocalGaussian ThreadLocal supports the very rarely used
* nextGaussian method by providing a holder for the second of a
@@ -115,24 +122,51 @@
* but we provide identical statistical properties.
*/
- // same constants as Random, but must be redeclared because private
- private static final long multiplier = 0x5DEECE66DL;
- private static final long addend = 0xBL;
- private static final long mask = (1L << 48) - 1;
- private static final int PROBE_INCREMENT = 0x61c88647;
-
- /** Generates the basis for per-thread initial seed values */
- private static final AtomicLong seedGenerator =
- new AtomicLong(1269533684904616924L);
-
/** Generates per-thread initialization/probe field */
private static final AtomicInteger probeGenerator =
- new AtomicInteger(0xe80f8647);
+ new AtomicInteger();
+
+ /**
+ * The next seed for default constructors.
+ */
+ private static final AtomicLong seeder =
+ new AtomicLong(mix64(System.currentTimeMillis()) ^
+ mix64(System.nanoTime()));
+
+ /**
+ * The seed increment
+ */
+ private static final long GAMMA = 0x9e3779b97f4a7c15L;
+
+ /**
+ * The increment for generating probe values
+ */
+ private static final int PROBE_INCREMENT = 0x9e3779b9;
+
+ /**
+ * The increment of seeder per new instance
+ */
+ private static final long SEEDER_INCREMENT = 0xbb67ae8584caa73bL;
+
+ // Constants from SplittableRandom
+ private static final double DOUBLE_UNIT = 1.0 / (1L << 53);
+ private static final float FLOAT_UNIT = 1.0f / (1 << 24);
/** Rarely-used holder for the second of a pair of Gaussians */
private static final ThreadLocal<Double> nextLocalGaussian =
new ThreadLocal<Double>();
+ private static long mix64(long z) {
+ z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL;
+ z = (z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L;
+ return z ^ (z >>> 33);
+ }
+
+ private static int mix32(long z) {
+ z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL;
+ return (int)(((z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L) >>> 32);
+ }
+
/**
* Field used only during singleton initialization.
* True when constructor completes.
@@ -155,16 +189,11 @@
* rely on (static) atomic generators to initialize the values.
*/
static final void localInit() {
- int p = probeGenerator.getAndAdd(PROBE_INCREMENT);
+ int p = probeGenerator.addAndGet(PROBE_INCREMENT);
int probe = (p == 0) ? 1 : p; // skip 0
- long current, next;
- do { // same sequence as j.u.Random but different initial value
- current = seedGenerator.get();
- next = current * 181783497276652981L;
- } while (!seedGenerator.compareAndSet(current, next));
- long r = next ^ ((long)probe << 32) ^ System.nanoTime();
+ long seed = mix64(seeder.getAndAdd(SEEDER_INCREMENT));
Thread t = Thread.currentThread();
- UNSAFE.putLong(t, SEED, r);
+ UNSAFE.putLong(t, SEED, seed);
UNSAFE.putInt(t, PROBE, probe);
}
@@ -191,124 +220,264 @@
throw new UnsupportedOperationException();
}
- protected int next(int bits) {
+ final long nextSeed() {
Thread t; long r; // read and update per-thread seed
- UNSAFE.putLong
- (t = Thread.currentThread(), SEED,
- r = (UNSAFE.getLong(t, SEED) * multiplier + addend) & mask);
- return (int) (r >>> (48-bits));
+ UNSAFE.putLong(t = Thread.currentThread(), SEED,
+ r = UNSAFE.getLong(t, SEED) + GAMMA);
+ return r;
+ }
+
+ // We must define this, but never use it.
+ protected int next(int bits) {
+ return (int)(mix64(nextSeed()) >>> (64 - bits));
+ }
+
+ // IllegalArgumentException messages
+ static final String BadBound = "bound must be positive";
+ static final String BadRange = "bound must be greater than origin";
+ static final String BadSize = "size must be non-negative";
+
+ /**
+ * The form of nextLong used by LongStream Spliterators. If
+ * origin is greater than bound, acts as unbounded form of
+ * nextLong, else as bounded form.
+ *
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final long internalNextLong(long origin, long bound) {
+ long r = mix64(nextSeed());
+ if (origin < bound) {
+ long n = bound - origin, m = n - 1;
+ if ((n & m) == 0L) // power of two
+ r = (r & m) + origin;
+ else if (n > 0L) { // reject over-represented candidates
+ for (long u = r >>> 1; // ensure nonnegative
+ u + m - (r = u % n) < 0L; // rejection check
+ u = mix64(nextSeed()) >>> 1) // retry
+ ;
+ r += origin;
+ }
+ else { // range not representable as long
+ while (r < origin || r >= bound)
+ r = mix64(nextSeed());
+ }
+ }
+ return r;
}
/**
- * Returns a pseudorandom, uniformly distributed value between the
- * given least value (inclusive) and bound (exclusive).
+ * The form of nextInt used by IntStream Spliterators.
+ * Exactly the same as long version, except for types.
+ *
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final int internalNextInt(int origin, int bound) {
+ int r = mix32(nextSeed());
+ if (origin < bound) {
+ int n = bound - origin, m = n - 1;
+ if ((n & m) == 0)
+ r = (r & m) + origin;
+ else if (n > 0) {
+ for (int u = r >>> 1;
+ u + m - (r = u % n) < 0;
+ u = mix32(nextSeed()) >>> 1)
+ ;
+ r += origin;
+ }
+ else {
+ while (r < origin || r >= bound)
+ r = mix32(nextSeed());
+ }
+ }
+ return r;
+ }
+
+ /**
+ * The form of nextDouble used by DoubleStream Spliterators.
*
- * @param least the least value returned
- * @param bound the upper bound (exclusive)
- * @throws IllegalArgumentException if least greater than or equal
- * to bound
- * @return the next value
+ * @param origin the least value, unless greater than bound
+ * @param bound the upper bound (exclusive), must not equal origin
+ * @return a pseudorandom value
+ */
+ final double internalNextDouble(double origin, double bound) {
+ double r = (nextLong() >>> 11) * DOUBLE_UNIT;
+ if (origin < bound) {
+ r = r * (bound - origin) + origin;
+ if (r >= bound) // correct for rounding
+ r = Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
+ }
+ return r;
+ }
+
+ /**
+ * Returns a pseudorandom {@code int} value.
+ *
+ * @return a pseudorandom {@code int} value
*/
- public int nextInt(int least, int bound) {
- if (least >= bound)
- throw new IllegalArgumentException();
- return nextInt(bound - least) + least;
+ public int nextInt() {
+ return mix32(nextSeed());
+ }
+
+ /**
+ * Returns a pseudorandom {@code int} value between zero (inclusive)
+ * and the specified bound (exclusive).
+ *
+ * @param bound the upper bound (exclusive). Must be positive.
+ * @return a pseudorandom {@code int} value between zero
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code bound} is not positive
+ */
+ public int nextInt(int bound) {
+ if (bound <= 0)
+ throw new IllegalArgumentException(BadBound);
+ int r = mix32(nextSeed());
+ int m = bound - 1;
+ if ((bound & m) == 0) // power of two
+ r &= m;
+ else { // reject over-represented candidates
+ for (int u = r >>> 1;
+ u + m - (r = u % bound) < 0;
+ u = mix32(nextSeed()) >>> 1)
+ ;
+ }
+ return r;
}
/**
- * Returns a pseudorandom, uniformly distributed value
- * between 0 (inclusive) and the specified value (exclusive).
+ * Returns a pseudorandom {@code int} value between the specified
+ * origin (inclusive) and the specified bound (exclusive).
*
- * @param n the bound on the random number to be returned. Must be
- * positive.
- * @return the next value
- * @throws IllegalArgumentException if n is not positive
+ * @param origin the least value returned
+ * @param bound the upper bound (exclusive)
+ * @return a pseudorandom {@code int} value between the origin
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code origin} is greater than
+ * or equal to {@code bound}
*/
- public long nextLong(long n) {
- if (n <= 0)
- throw new IllegalArgumentException("n must be positive");
- // Divide n by two until small enough for nextInt. On each
- // iteration (at most 31 of them but usually much less),
- // randomly choose both whether to include high bit in result
- // (offset) and whether to continue with the lower vs upper
- // half (which makes a difference only if odd).
- long offset = 0;
- while (n >= Integer.MAX_VALUE) {
- int bits = next(2);
- long half = n >>> 1;
- long nextn = ((bits & 2) == 0) ? half : n - half;
- if ((bits & 1) == 0)
- offset += n - nextn;
- n = nextn;
- }
- return offset + nextInt((int) n);
+ public int nextInt(int origin, int bound) {
+ if (origin >= bound)
+ throw new IllegalArgumentException(BadRange);
+ return internalNextInt(origin, bound);
}
- @Override
- public IntStream ints() {
- return IntStream.generate(() -> current().nextInt());
+ /**
+ * Returns a pseudorandom {@code long} value.
+ *
+ * @return a pseudorandom {@code long} value
+ */
+ public long nextLong() {
+ return mix64(nextSeed());
}
- @Override
- public LongStream longs() {
- return LongStream.generate(() -> current().nextLong());
- }
-
- @Override
- public DoubleStream doubles() {
- return DoubleStream.generate(() -> current().nextDouble());
- }
-
- @Override
- public DoubleStream gaussians() {
- return DoubleStream.generate(() -> current().nextGaussian());
+ /**
+ * Returns a pseudorandom {@code long} value between zero (inclusive)
+ * and the specified bound (exclusive).
+ *
+ * @param bound the upper bound (exclusive). Must be positive.
+ * @return a pseudorandom {@code long} value between zero
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code bound} is not positive
+ */
+ public long nextLong(long bound) {
+ if (bound <= 0)
+ throw new IllegalArgumentException(BadBound);
+ long r = mix64(nextSeed());
+ long m = bound - 1;
+ if ((bound & m) == 0L) // power of two
+ r &= m;
+ else { // reject over-represented candidates
+ for (long u = r >>> 1;
+ u + m - (r = u % bound) < 0L;
+ u = mix64(nextSeed()) >>> 1)
+ ;
+ }
+ return r;
}
/**
- * Returns a pseudorandom, uniformly distributed value between the
- * given least value (inclusive) and bound (exclusive).
+ * Returns a pseudorandom {@code long} value between the specified
+ * origin (inclusive) and the specified bound (exclusive).
*
- * @param least the least value returned
+ * @param origin the least value returned
* @param bound the upper bound (exclusive)
- * @return the next value
- * @throws IllegalArgumentException if least greater than or equal
- * to bound
+ * @return a pseudorandom {@code long} value between the origin
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code origin} is greater than
+ * or equal to {@code bound}
*/
- public long nextLong(long least, long bound) {
- if (least >= bound)
- throw new IllegalArgumentException();
- return nextLong(bound - least) + least;
+ public long nextLong(long origin, long bound) {
+ if (origin >= bound)
+ throw new IllegalArgumentException(BadRange);
+ return internalNextLong(origin, bound);
+ }
+
+ /**
+ * Returns a pseudorandom {@code double} value between zero
+ * (inclusive) and one (exclusive).
+ *
+ * @return a pseudorandom {@code double} value between zero
+ * (inclusive) and one (exclusive)
+ */
+ public double nextDouble() {
+ return (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT;
}
/**
- * Returns a pseudorandom, uniformly distributed {@code double} value
- * between 0 (inclusive) and the specified value (exclusive).
+ * Returns a pseudorandom {@code double} value between 0.0
+ * (inclusive) and the specified bound (exclusive).
*
- * @param n the bound on the random number to be returned. Must be
- * positive.
- * @return the next value
- * @throws IllegalArgumentException if n is not positive
+ * @param bound the upper bound (exclusive). Must be positive.
+ * @return a pseudorandom {@code double} value between zero
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code bound} is not positive
*/
- public double nextDouble(double n) {
- if (n <= 0)
- throw new IllegalArgumentException("n must be positive");
- return nextDouble() * n;
+ public double nextDouble(double bound) {
+ if (!(bound > 0.0))
+ throw new IllegalArgumentException(BadBound);
+ double result = (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT * bound;
+ return (result < bound) ? result : // correct for rounding
+ Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
}
/**
- * Returns a pseudorandom, uniformly distributed value between the
- * given least value (inclusive) and bound (exclusive).
+ * Returns a pseudorandom {@code double} value between the specified
+ * origin (inclusive) and bound (exclusive).
*
- * @param least the least value returned
+ * @param origin the least value returned
* @param bound the upper bound (exclusive)
- * @return the next value
- * @throws IllegalArgumentException if least greater than or equal
- * to bound
+ * @return a pseudorandom {@code double} value between the origin
+ * (inclusive) and the bound (exclusive)
+ * @throws IllegalArgumentException if {@code origin} is greater than
+ * or equal to {@code bound}
*/
- public double nextDouble(double least, double bound) {
- if (least >= bound)
- throw new IllegalArgumentException();
- return nextDouble() * (bound - least) + least;
+ public double nextDouble(double origin, double bound) {
+ if (!(origin < bound))
+ throw new IllegalArgumentException(BadRange);
+ return internalNextDouble(origin, bound);
+ }
+
+ /**
+ * Returns a pseudorandom {@code boolean} value.
+ *
+ * @return a pseudorandom {@code boolean} value
+ */
+ public boolean nextBoolean() {
+ return mix32(nextSeed()) < 0;
+ }
+
+ /**
+ * Returns a pseudorandom {@code float} value between zero
+ * (inclusive) and one (exclusive).
+ *
+ * @return a pseudorandom {@code float} value between zero
+ * (inclusive) and one (exclusive)
+ */
+ public float nextFloat() {
+ return (mix32(nextSeed()) >>> 8) * FLOAT_UNIT;
}
public double nextGaussian() {
@@ -329,6 +498,445 @@
return v1 * multiplier;
}
+ // stream methods, coded in a way intended to better isolate for
+ // maintenance purposes the small differences across forms.
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code int} values.
+ *
+ * @param streamSize the number of values to generate
+ * @return a stream of pseudorandom {@code int} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @since 1.8
+ */
+ public IntStream ints(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (0L, streamSize, Integer.MAX_VALUE, 0),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code int}
+ * values.
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * ints(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code int} values
+ * @since 1.8
+ */
+ public IntStream ints() {
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (0L, Long.MAX_VALUE, Integer.MAX_VALUE, 0),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number
+ * of pseudorandom {@code int} values, each conforming to the given
+ * origin (inclusive) and bound (exclusive).
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code int} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero, or {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public IntStream ints(long streamSize, int randomNumberOrigin,
+ int randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * int} values, each conforming to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * ints(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
+ *
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code int} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public IntStream ints(int randomNumberOrigin, int randomNumberBound) {
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.intStream
+ (new RandomIntsSpliterator
+ (0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code long} values.
+ *
+ * @param streamSize the number of values to generate
+ * @return a stream of pseudorandom {@code long} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @since 1.8
+ */
+ public LongStream longs(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (0L, streamSize, Long.MAX_VALUE, 0L),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code long}
+ * values.
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * longs(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code long} values
+ * @since 1.8
+ */
+ public LongStream longs() {
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (0L, Long.MAX_VALUE, Long.MAX_VALUE, 0L),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code long}, each conforming to the given origin
+ * (inclusive) and bound (exclusive).
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code long} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero, or {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public LongStream longs(long streamSize, long randomNumberOrigin,
+ long randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * long} values, each conforming to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * longs(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
+ *
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code long} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public LongStream longs(long randomNumberOrigin, long randomNumberBound) {
+ if (randomNumberOrigin >= randomNumberBound)
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.longStream
+ (new RandomLongsSpliterator
+ (0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code double} values, each between zero
+ * (inclusive) and one (exclusive).
+ *
+ * @param streamSize the number of values to generate
+ * @return a stream of {@code double} values
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @since 1.8
+ */
+ public DoubleStream doubles(long streamSize) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (0L, streamSize, Double.MAX_VALUE, 0.0),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * double} values, each between zero (inclusive) and one
+ * (exclusive).
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * doubles(Long.MAX_VALUE)}.
+ *
+ * @return a stream of pseudorandom {@code double} values
+ * @since 1.8
+ */
+ public DoubleStream doubles() {
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (0L, Long.MAX_VALUE, Double.MAX_VALUE, 0.0),
+ false);
+ }
+
+ /**
+ * Returns a stream producing the given {@code streamSize} number of
+ * pseudorandom {@code double} values, each conforming to the given origin
+ * (inclusive) and bound (exclusive).
+ *
+ * @param streamSize the number of values to generate
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code double} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code streamSize} is
+ * less than zero
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public DoubleStream doubles(long streamSize, double randomNumberOrigin,
+ double randomNumberBound) {
+ if (streamSize < 0L)
+ throw new IllegalArgumentException(BadSize);
+ if (!(randomNumberOrigin < randomNumberBound))
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (0L, streamSize, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Returns an effectively unlimited stream of pseudorandom {@code
+ * double} values, each conforming to the given origin (inclusive) and bound
+ * (exclusive).
+ *
+ * @implNote This method is implemented to be equivalent to {@code
+ * doubles(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
+ *
+ * @param randomNumberOrigin the origin (inclusive) of each random value
+ * @param randomNumberBound the bound (exclusive) of each random value
+ * @return a stream of pseudorandom {@code double} values,
+ * each with the given origin (inclusive) and bound (exclusive)
+ * @throws IllegalArgumentException if {@code randomNumberOrigin}
+ * is greater than or equal to {@code randomNumberBound}
+ * @since 1.8
+ */
+ public DoubleStream doubles(double randomNumberOrigin, double randomNumberBound) {
+ if (!(randomNumberOrigin < randomNumberBound))
+ throw new IllegalArgumentException(BadRange);
+ return StreamSupport.doubleStream
+ (new RandomDoublesSpliterator
+ (0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
+ false);
+ }
+
+ /**
+ * Spliterator for int streams. We multiplex the four int
+ * versions into one class by treating a bound less than origin as
+ * unbounded, and also by treating "infinite" as equivalent to
+ * Long.MAX_VALUE. For splits, it uses the standard divide-by-two
+ * approach. The long and double versions of this class are
+ * identical except for types.
+ */
+ static final class RandomIntsSpliterator implements Spliterator.OfInt {
+ long index;
+ final long fence;
+ final int origin;
+ final int bound;
+ RandomIntsSpliterator(long index, long fence,
+ int origin, int bound) {
+ this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomIntsSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomIntsSpliterator(i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(IntConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(ThreadLocalRandom.current().internalNextInt(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(IntConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ int o = origin, b = bound;
+ ThreadLocalRandom rng = ThreadLocalRandom.current();
+ do {
+ consumer.accept(rng.internalNextInt(o, b));
+ } while (++i < f);
+ }
+ }
+ }
+
+ /**
+ * Spliterator for long streams.
+ */
+ static final class RandomLongsSpliterator implements Spliterator.OfLong {
+ long index;
+ final long fence;
+ final long origin;
+ final long bound;
+ RandomLongsSpliterator(long index, long fence,
+ long origin, long bound) {
+ this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomLongsSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomLongsSpliterator(i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(LongConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(ThreadLocalRandom.current().internalNextLong(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(LongConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ long o = origin, b = bound;
+ ThreadLocalRandom rng = ThreadLocalRandom.current();
+ do {
+ consumer.accept(rng.internalNextLong(o, b));
+ } while (++i < f);
+ }
+ }
+
+ }
+
+ /**
+ * Spliterator for double streams.
+ */
+ static final class RandomDoublesSpliterator implements Spliterator.OfDouble {
+ long index;
+ final long fence;
+ final double origin;
+ final double bound;
+ RandomDoublesSpliterator(long index, long fence,
+ double origin, double bound) {
+ this.index = index; this.fence = fence;
+ this.origin = origin; this.bound = bound;
+ }
+
+ public RandomDoublesSpliterator trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomDoublesSpliterator(i, index = m, origin, bound);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ public boolean tryAdvance(DoubleConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(ThreadLocalRandom.current().internalNextDouble(origin, bound));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+
+ public void forEachRemaining(DoubleConsumer consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ index = f;
+ double o = origin, b = bound;
+ ThreadLocalRandom rng = ThreadLocalRandom.current();
+ do {
+ consumer.accept(rng.internalNextDouble(o, b));
+ } while (++i < f);
+ }
+ }
+ }
+
+
// Within-package utilities
/*
@@ -401,23 +1009,26 @@
*/
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("rnd", long.class),
- new ObjectStreamField("initialized", boolean.class)
+ new ObjectStreamField("initialized", boolean.class),
};
/**
* Saves the {@code ThreadLocalRandom} to a stream (that is, serializes it).
+ * @param s the stream
+ * @throws java.io.IOException if an I/O error occurs
*/
- private void writeObject(java.io.ObjectOutputStream out)
+ private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
- java.io.ObjectOutputStream.PutField fields = out.putFields();
+ java.io.ObjectOutputStream.PutField fields = s.putFields();
fields.put("rnd", UNSAFE.getLong(Thread.currentThread(), SEED));
fields.put("initialized", true);
- out.writeFields();
+ s.writeFields();
}
/**
* Returns the {@link #current() current} thread's {@code ThreadLocalRandom}.
+ * @return the {@link #current() current} thread's {@code ThreadLocalRandom}
*/
private Object readResolve() {
return current();
--- a/jdk/src/share/classes/java/util/concurrent/locks/StampedLock.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/concurrent/locks/StampedLock.java Fri Sep 06 15:09:44 2013 -0700
@@ -226,7 +226,11 @@
* incoming reader arrives while read lock is held but there is a
* queued writer, this incoming reader is queued. (This rule is
* responsible for some of the complexity of method acquireRead,
- * but without it, the lock becomes highly unfair.)
+ * but without it, the lock becomes highly unfair.) Method release
+ * does not (and sometimes cannot) itself wake up cowaiters. This
+ * is done by the primary thread, but helped by any other threads
+ * with nothing better to do in methods acquireRead and
+ * acquireWrite.
*
* These rules apply to threads actually queued. All tryLock forms
* opportunistically try to acquire locks regardless of preference
@@ -267,11 +271,14 @@
/** Number of processors, for spin control */
private static final int NCPU = Runtime.getRuntime().availableProcessors();
- /** Maximum number of retries before blocking on acquisition */
+ /** Maximum number of retries before enqueuing on acquisition */
private static final int SPINS = (NCPU > 1) ? 1 << 6 : 0;
+ /** Maximum number of retries before blocking at head on acquisition */
+ private static final int HEAD_SPINS = (NCPU > 1) ? 1 << 10 : 0;
+
/** Maximum number of retries before re-blocking */
- private static final int MAX_HEAD_SPINS = (NCPU > 1) ? 1 << 12 : 0;
+ private static final int MAX_HEAD_SPINS = (NCPU > 1) ? 1 << 16 : 0;
/** The period for yielding when waiting for overflow spinlock */
private static final int OVERFLOW_YIELD_RATE = 7; // must be power 2 - 1
@@ -415,8 +422,8 @@
* @return a stamp that can be used to unlock or convert mode
*/
public long readLock() {
- long s, next; // bypass acquireRead on fully unlocked case only
- return ((((s = state) & ABITS) == 0L &&
+ long s = state, next; // bypass acquireRead on common uncontended case
+ return ((whead == wtail && (s & ABITS) < RFULL &&
U.compareAndSwapLong(this, STATE, s, next = s + RUNIT)) ?
next : acquireRead(false, 0L));
}
@@ -1012,17 +1019,8 @@
if (t.status <= 0)
q = t;
}
- if (q != null) {
- for (WNode r = q;;) { // release co-waiters too
- if ((w = r.thread) != null) {
- r.thread = null;
- U.unpark(w);
- }
- if ((r = q.cowait) == null)
- break;
- U.compareAndSwapObject(q, WCOWAIT, r, r.cowait);
- }
- }
+ if (q != null && (w = q.thread) != null)
+ U.unpark(w);
}
}
@@ -1038,22 +1036,22 @@
private long acquireWrite(boolean interruptible, long deadline) {
WNode node = null, p;
for (int spins = -1;;) { // spin while enqueuing
- long s, ns;
- if (((s = state) & ABITS) == 0L) {
+ long m, s, ns;
+ if ((m = (s = state) & ABITS) == 0L) {
if (U.compareAndSwapLong(this, STATE, s, ns = s + WBIT))
return ns;
}
+ else if (spins < 0)
+ spins = (m == WBIT && wtail == whead) ? SPINS : 0;
else if (spins > 0) {
if (LockSupport.nextSecondarySeed() >= 0)
--spins;
}
else if ((p = wtail) == null) { // initialize queue
- WNode h = new WNode(WMODE, null);
- if (U.compareAndSwapObject(this, WHEAD, null, h))
- wtail = h;
+ WNode hd = new WNode(WMODE, null);
+ if (U.compareAndSwapObject(this, WHEAD, null, hd))
+ wtail = hd;
}
- else if (spins < 0)
- spins = (p == whead) ? SPINS : 0;
else if (node == null)
node = new WNode(WMODE, p);
else if (node.prev != p)
@@ -1064,14 +1062,18 @@
}
}
- for (int spins = SPINS;;) {
- WNode np, pp; int ps; long s, ns; Thread w;
- while ((np = node.prev) != p && np != null)
- (p = np).next = node; // stale
- if (whead == p) {
+ for (int spins = -1;;) {
+ WNode h, np, pp; int ps;
+ if ((h = whead) == p) {
+ if (spins < 0)
+ spins = HEAD_SPINS;
+ else if (spins < MAX_HEAD_SPINS)
+ spins <<= 1;
for (int k = spins;;) { // spin at head
+ long s, ns;
if (((s = state) & ABITS) == 0L) {
- if (U.compareAndSwapLong(this, STATE, s, ns = s+WBIT)) {
+ if (U.compareAndSwapLong(this, STATE, s,
+ ns = s + WBIT)) {
whead = node;
node.prev = null;
return ns;
@@ -1081,33 +1083,45 @@
--k <= 0)
break;
}
- if (spins < MAX_HEAD_SPINS)
- spins <<= 1;
}
- if ((ps = p.status) == 0)
- U.compareAndSwapInt(p, WSTATUS, 0, WAITING);
- else if (ps == CANCELLED) {
- if ((pp = p.prev) != null) {
- node.prev = pp;
- pp.next = node;
+ else if (h != null) { // help release stale waiters
+ WNode c; Thread w;
+ while ((c = h.cowait) != null) {
+ if (U.compareAndSwapObject(h, WCOWAIT, c, c.cowait) &&
+ (w = c.thread) != null)
+ U.unpark(w);
}
}
- else {
- long time; // 0 argument to park means no timeout
- if (deadline == 0L)
- time = 0L;
- else if ((time = deadline - System.nanoTime()) <= 0L)
- return cancelWaiter(node, node, false);
- Thread wt = Thread.currentThread();
- U.putObject(wt, PARKBLOCKER, this); // emulate LockSupport.park
- node.thread = wt;
- if (node.prev == p && p.status == WAITING && // recheck
- (p != whead || (state & ABITS) != 0L))
- U.park(false, time);
- node.thread = null;
- U.putObject(wt, PARKBLOCKER, null);
- if (interruptible && Thread.interrupted())
- return cancelWaiter(node, node, true);
+ if (whead == h) {
+ if ((np = node.prev) != p) {
+ if (np != null)
+ (p = np).next = node; // stale
+ }
+ else if ((ps = p.status) == 0)
+ U.compareAndSwapInt(p, WSTATUS, 0, WAITING);
+ else if (ps == CANCELLED) {
+ if ((pp = p.prev) != null) {
+ node.prev = pp;
+ pp.next = node;
+ }
+ }
+ else {
+ long time; // 0 argument to park means no timeout
+ if (deadline == 0L)
+ time = 0L;
+ else if ((time = deadline - System.nanoTime()) <= 0L)
+ return cancelWaiter(node, node, false);
+ Thread wt = Thread.currentThread();
+ U.putObject(wt, PARKBLOCKER, this);
+ node.thread = wt;
+ if (p.status < 0 && (p != h || (state & ABITS) != 0L) &&
+ whead == h && node.prev == p)
+ U.park(false, time); // emulate LockSupport.park
+ node.thread = null;
+ U.putObject(wt, PARKBLOCKER, null);
+ if (interruptible && Thread.interrupted())
+ return cancelWaiter(node, node, true);
+ }
}
}
}
@@ -1122,138 +1136,159 @@
* @return next state, or INTERRUPTED
*/
private long acquireRead(boolean interruptible, long deadline) {
- WNode node = null, group = null, p;
+ WNode node = null, p;
for (int spins = -1;;) {
- for (;;) {
- long s, m, ns; WNode h, q; Thread w; // anti-barging guard
- if (group == null && (h = whead) != null &&
- (q = h.next) != null && q.mode != RMODE)
- break;
- if ((m = (s = state) & ABITS) < RFULL ?
- U.compareAndSwapLong(this, STATE, s, ns = s + RUNIT) :
- (m < WBIT && (ns = tryIncReaderOverflow(s)) != 0L)) {
- if (group != null) { // help release others
- for (WNode r = group;;) {
- if ((w = r.thread) != null) {
- r.thread = null;
- U.unpark(w);
+ WNode h;
+ if ((h = whead) == (p = wtail)) {
+ for (long m, s, ns;;) {
+ if ((m = (s = state) & ABITS) < RFULL ?
+ U.compareAndSwapLong(this, STATE, s, ns = s + RUNIT) :
+ (m < WBIT && (ns = tryIncReaderOverflow(s)) != 0L))
+ return ns;
+ else if (m >= WBIT) {
+ if (spins > 0) {
+ if (LockSupport.nextSecondarySeed() >= 0)
+ --spins;
+ }
+ else {
+ if (spins == 0) {
+ WNode nh = whead, np = wtail;
+ if ((nh == h && np == p) || (h = nh) != (p = np))
+ break;
}
- if ((r = group.cowait) == null)
- break;
- U.compareAndSwapObject(group, WCOWAIT, r, r.cowait);
+ spins = SPINS;
}
}
- return ns;
}
- if (m >= WBIT)
- break;
+ }
+ if (p == null) { // initialize queue
+ WNode hd = new WNode(WMODE, null);
+ if (U.compareAndSwapObject(this, WHEAD, null, hd))
+ wtail = hd;
}
- if (spins > 0) {
- if (LockSupport.nextSecondarySeed() >= 0)
- --spins;
- }
- else if ((p = wtail) == null) {
- WNode h = new WNode(WMODE, null);
- if (U.compareAndSwapObject(this, WHEAD, null, h))
- wtail = h;
+ else if (node == null)
+ node = new WNode(RMODE, p);
+ else if (h == p || p.mode != RMODE) {
+ if (node.prev != p)
+ node.prev = p;
+ else if (U.compareAndSwapObject(this, WTAIL, p, node)) {
+ p.next = node;
+ break;
+ }
}
- else if (spins < 0)
- spins = (p == whead) ? SPINS : 0;
- else if (node == null)
- node = new WNode(WMODE, p);
- else if (node.prev != p)
- node.prev = p;
- else if (p.mode == RMODE && p != whead) {
- WNode pp = p.prev; // become co-waiter with group p
- if (pp != null && p == wtail &&
- U.compareAndSwapObject(p, WCOWAIT,
- node.cowait = p.cowait, node)) {
- node.thread = Thread.currentThread();
- for (long time;;) {
+ else if (!U.compareAndSwapObject(p, WCOWAIT,
+ node.cowait = p.cowait, node))
+ node.cowait = null;
+ else {
+ for (;;) {
+ WNode pp, c; Thread w;
+ if ((h = whead) != null && (c = h.cowait) != null &&
+ U.compareAndSwapObject(h, WCOWAIT, c, c.cowait) &&
+ (w = c.thread) != null) // help release
+ U.unpark(w);
+ if (h == (pp = p.prev) || h == p || pp == null) {
+ long m, s, ns;
+ do {
+ if ((m = (s = state) & ABITS) < RFULL ?
+ U.compareAndSwapLong(this, STATE, s,
+ ns = s + RUNIT) :
+ (m < WBIT &&
+ (ns = tryIncReaderOverflow(s)) != 0L))
+ return ns;
+ } while (m < WBIT);
+ }
+ if (whead == h && p.prev == pp) {
+ long time;
+ if (pp == null || h == p || p.status > 0) {
+ node = null; // throw away
+ break;
+ }
if (deadline == 0L)
time = 0L;
else if ((time = deadline - System.nanoTime()) <= 0L)
return cancelWaiter(node, p, false);
- if (node.thread == null)
- break;
- if (p.prev != pp || p.status == CANCELLED ||
- p == whead || p.prev != pp) {
- node.thread = null;
- break;
- }
Thread wt = Thread.currentThread();
U.putObject(wt, PARKBLOCKER, this);
- if (node.thread == null) // must recheck
- break;
- U.park(false, time);
+ node.thread = wt;
+ if ((h != pp || (state & ABITS) == WBIT) &&
+ whead == h && p.prev == pp)
+ U.park(false, time);
+ node.thread = null;
U.putObject(wt, PARKBLOCKER, null);
if (interruptible && Thread.interrupted())
return cancelWaiter(node, p, true);
}
- group = p;
}
- node = null; // throw away
- }
- else if (U.compareAndSwapObject(this, WTAIL, p, node)) {
- p.next = node;
- break;
}
}
- for (int spins = SPINS;;) {
- WNode np, pp, r; int ps; long m, s, ns; Thread w;
- while ((np = node.prev) != p && np != null)
- (p = np).next = node;
- if (whead == p) {
- for (int k = spins;;) {
- if ((m = (s = state) & ABITS) != WBIT) {
- if (m < RFULL ?
- U.compareAndSwapLong(this, STATE, s, ns = s + RUNIT):
- (ns = tryIncReaderOverflow(s)) != 0L) {
- whead = node;
- node.prev = null;
- while ((r = node.cowait) != null) {
- if (U.compareAndSwapObject(node, WCOWAIT,
- r, r.cowait) &&
- (w = r.thread) != null) {
- r.thread = null;
- U.unpark(w); // release co-waiter
- }
- }
- return ns;
+ for (int spins = -1;;) {
+ WNode h, np, pp; int ps;
+ if ((h = whead) == p) {
+ if (spins < 0)
+ spins = HEAD_SPINS;
+ else if (spins < MAX_HEAD_SPINS)
+ spins <<= 1;
+ for (int k = spins;;) { // spin at head
+ long m, s, ns;
+ if ((m = (s = state) & ABITS) < RFULL ?
+ U.compareAndSwapLong(this, STATE, s, ns = s + RUNIT) :
+ (m < WBIT && (ns = tryIncReaderOverflow(s)) != 0L)) {
+ WNode c; Thread w;
+ whead = node;
+ node.prev = null;
+ while ((c = node.cowait) != null) {
+ if (U.compareAndSwapObject(node, WCOWAIT,
+ c, c.cowait) &&
+ (w = c.thread) != null)
+ U.unpark(w);
}
+ return ns;
}
- else if (LockSupport.nextSecondarySeed() >= 0 &&
- --k <= 0)
+ else if (m >= WBIT &&
+ LockSupport.nextSecondarySeed() >= 0 && --k <= 0)
break;
}
- if (spins < MAX_HEAD_SPINS)
- spins <<= 1;
}
- if ((ps = p.status) == 0)
- U.compareAndSwapInt(p, WSTATUS, 0, WAITING);
- else if (ps == CANCELLED) {
- if ((pp = p.prev) != null) {
- node.prev = pp;
- pp.next = node;
+ else if (h != null) {
+ WNode c; Thread w;
+ while ((c = h.cowait) != null) {
+ if (U.compareAndSwapObject(h, WCOWAIT, c, c.cowait) &&
+ (w = c.thread) != null)
+ U.unpark(w);
}
}
- else {
- long time;
- if (deadline == 0L)
- time = 0L;
- else if ((time = deadline - System.nanoTime()) <= 0L)
- return cancelWaiter(node, node, false);
- Thread wt = Thread.currentThread();
- U.putObject(wt, PARKBLOCKER, this);
- node.thread = wt;
- if (node.prev == p && p.status == WAITING &&
- (p != whead || (state & ABITS) != WBIT))
- U.park(false, time);
- node.thread = null;
- U.putObject(wt, PARKBLOCKER, null);
- if (interruptible && Thread.interrupted())
- return cancelWaiter(node, node, true);
+ if (whead == h) {
+ if ((np = node.prev) != p) {
+ if (np != null)
+ (p = np).next = node; // stale
+ }
+ else if ((ps = p.status) == 0)
+ U.compareAndSwapInt(p, WSTATUS, 0, WAITING);
+ else if (ps == CANCELLED) {
+ if ((pp = p.prev) != null) {
+ node.prev = pp;
+ pp.next = node;
+ }
+ }
+ else {
+ long time;
+ if (deadline == 0L)
+ time = 0L;
+ else if ((time = deadline - System.nanoTime()) <= 0L)
+ return cancelWaiter(node, node, false);
+ Thread wt = Thread.currentThread();
+ U.putObject(wt, PARKBLOCKER, this);
+ node.thread = wt;
+ if (p.status < 0 &&
+ (p != h || (state & ABITS) == WBIT) &&
+ whead == h && node.prev == p)
+ U.park(false, time);
+ node.thread = null;
+ U.putObject(wt, PARKBLOCKER, null);
+ if (interruptible && Thread.interrupted())
+ return cancelWaiter(node, node, true);
+ }
}
}
}
@@ -1278,22 +1313,19 @@
if (node != null && group != null) {
Thread w;
node.status = CANCELLED;
- node.thread = null;
// unsplice cancelled nodes from group
for (WNode p = group, q; (q = p.cowait) != null;) {
- if (q.status == CANCELLED)
- U.compareAndSwapObject(p, WNEXT, q, q.next);
+ if (q.status == CANCELLED) {
+ U.compareAndSwapObject(p, WCOWAIT, q, q.cowait);
+ p = group; // restart
+ }
else
p = q;
}
if (group == node) {
- WNode r; // detach and wake up uncancelled co-waiters
- while ((r = node.cowait) != null) {
- if (U.compareAndSwapObject(node, WCOWAIT, r, r.cowait) &&
- (w = r.thread) != null) {
- r.thread = null;
- U.unpark(w);
- }
+ for (WNode r = group.cowait; r != null; r = r.cowait) {
+ if ((w = r.thread) != null)
+ U.unpark(w); // wake up uncancelled co-waiters
}
for (WNode pred = node.prev; pred != null; ) { // unsplice
WNode succ, pp; // find valid successor
--- a/jdk/src/share/classes/java/util/jar/JarVerifier.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/jar/JarVerifier.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,6 +32,7 @@
import java.security.cert.CertificateException;
import java.util.zip.ZipEntry;
+import sun.misc.JarIndex;
import sun.security.util.ManifestDigester;
import sun.security.util.ManifestEntryVerifier;
import sun.security.util.SignatureFileVerifier;
@@ -139,7 +140,8 @@
return;
}
- if (uname.equals(JarFile.MANIFEST_NAME)) {
+ if (uname.equals(JarFile.MANIFEST_NAME) ||
+ uname.equals(JarIndex.INDEX_NAME)) {
return;
}
--- a/jdk/src/share/classes/java/util/logging/Logger.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/logging/Logger.java Fri Sep 06 15:09:44 2013 -0700
@@ -457,13 +457,15 @@
* of the subsystem, such as java.net
* or javax.swing
* @param resourceBundleName name of ResourceBundle to be used for localizing
- * messages for this logger. May be <CODE>null</CODE> if none of
- * the messages require localization.
+ * messages for this logger. May be {@code null}
+ * if none of the messages require localization.
* @return a suitable Logger
* @throws MissingResourceException if the resourceBundleName is non-null and
* no corresponding resource can be found.
* @throws IllegalArgumentException if the Logger already exists and uses
- * a different resource bundle name.
+ * a different resource bundle name; or if
+ * {@code resourceBundleName} is {@code null} but the named
+ * logger has a resource bundle set.
* @throws NullPointerException if the name is null.
*/
@@ -1731,10 +1733,6 @@
// Synchronized to prevent races in setting the fields.
private synchronized void setupResourceInfo(String name,
Class<?> callersClass) {
- if (name == null) {
- return;
- }
-
if (resourceBundleName != null) {
// this Logger already has a ResourceBundle
@@ -1748,6 +1746,10 @@
resourceBundleName + " != " + name);
}
+ if (name == null) {
+ return;
+ }
+
setCallersClassLoaderRef(callersClass);
if (findResourceBundle(name, true) == null) {
// We've failed to find an expected ResourceBundle.
--- a/jdk/src/share/classes/java/util/regex/Pattern.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/regex/Pattern.java Fri Sep 06 15:09:44 2013 -0700
@@ -219,7 +219,7 @@
*
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="unicode">Classes for Unicode scripts, blocks, categories and binary properties</th></tr>
- * * <tr><td valign="top" headers="construct unicode">{@code \p{IsLatin}}</td>
+ * <tr><td valign="top" headers="construct unicode">{@code \p{IsLatin}}</td>
* <td headers="matches">A Latin script character (<a href="#usc">script</a>)</td></tr>
* <tr><td valign="top" headers="construct unicode">{@code \p{InGreek}}</td>
* <td headers="matches">A character in the Greek block (<a href="#ubc">block</a>)</td></tr>
@@ -4456,16 +4456,16 @@
groups[groupIndex+1] = i;
groups[groupIndex] = i - k;
}
- i = i - k;
return true;
}
// backing off
+ i = i - k;
if (capture) {
groups[groupIndex+1] = i;
groups[groupIndex] = i - k;
}
- i = i - k;
j--;
+
}
break;
}
@@ -4883,7 +4883,6 @@
int k = matcher.groups[groupIndex+1];
int groupSize = k - j;
-
// If the referenced group didn't match, neither can this
if (j < 0)
return false;
@@ -4893,7 +4892,6 @@
matcher.hitEnd = true;
return false;
}
-
// Check each new char to make sure it matches what the group
// referenced matched last time around
for (int index=0; index<groupSize; index++)
--- a/jdk/src/share/classes/java/util/stream/Collectors.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/Collectors.java Fri Sep 06 15:09:44 2013 -0700
@@ -137,6 +137,11 @@
return (u,v) -> { throw new IllegalStateException(String.format("Duplicate key %s", u)); };
}
+ @SuppressWarnings("unchecked")
+ private static <I, R> Function<I, R> castingIdentity() {
+ return i -> (R) i;
+ }
+
/**
* Simple implementation class for {@code Collector}.
*
@@ -166,7 +171,7 @@
BiConsumer<A, T> accumulator,
BinaryOperator<A> combiner,
Set<Characteristics> characteristics) {
- this(supplier, accumulator, combiner, i -> (R) i, characteristics);
+ this(supplier, accumulator, combiner, castingIdentity(), characteristics);
}
@Override
@@ -209,7 +214,7 @@
*/
public static <T, C extends Collection<T>>
Collector<T, ?, C> toCollection(Supplier<C> collectionFactory) {
- return new CollectorImpl<>(collectionFactory, Collection::add,
+ return new CollectorImpl<>(collectionFactory, Collection<T>::add,
(r1, r2) -> { r1.addAll(r2); return r1; },
CH_ID);
}
@@ -1046,30 +1051,23 @@
public static <T, D, A>
Collector<T, ?, Map<Boolean, D>> partitioningBy(Predicate<? super T> predicate,
Collector<? super T, A, D> downstream) {
- @SuppressWarnings("unchecked")
- BiConsumer<D, ? super T> downstreamAccumulator = (BiConsumer<D, ? super T>) downstream.accumulator();
- BiConsumer<Map<Boolean, A>, T> accumulator = (result, t) -> {
- Partition<D> asPartition = ((Partition<D>) result);
- downstreamAccumulator.accept(predicate.test(t) ? asPartition.forTrue : asPartition.forFalse, t);
- };
+ BiConsumer<A, ? super T> downstreamAccumulator = downstream.accumulator();
+ BiConsumer<Partition<A>, T> accumulator = (result, t) ->
+ downstreamAccumulator.accept(predicate.test(t) ? result.forTrue : result.forFalse, t);
BinaryOperator<A> op = downstream.combiner();
- BinaryOperator<Map<Boolean, A>> merger = (m1, m2) -> {
- Partition<A> left = (Partition<A>) m1;
- Partition<A> right = (Partition<A>) m2;
- return new Partition<>(op.apply(left.forTrue, right.forTrue),
- op.apply(left.forFalse, right.forFalse));
- };
- Supplier<Map<Boolean, A>> supplier = () -> new Partition<>(downstream.supplier().get(),
- downstream.supplier().get());
+ BinaryOperator<Partition<A>> merger = (left, right) ->
+ new Partition<>(op.apply(left.forTrue, right.forTrue),
+ op.apply(left.forFalse, right.forFalse));
+ Supplier<Partition<A>> supplier = () ->
+ new Partition<>(downstream.supplier().get(),
+ downstream.supplier().get());
if (downstream.characteristics().contains(Collector.Characteristics.IDENTITY_FINISH)) {
return new CollectorImpl<>(supplier, accumulator, merger, CH_ID);
}
else {
- Function<Map<Boolean, A>, Map<Boolean, D>> finisher = (Map<Boolean, A> par) -> {
- Partition<A> asAPartition = (Partition<A>) par;
- return new Partition<>(downstream.finisher().apply(asAPartition.forTrue),
- downstream.finisher().apply(asAPartition.forFalse));
- };
+ Function<Partition<A>, Map<Boolean, D>> finisher = par ->
+ new Partition<>(downstream.finisher().apply(par.forTrue),
+ downstream.finisher().apply(par.forFalse));
return new CollectorImpl<>(supplier, accumulator, merger, finisher, CH_NOID);
}
}
--- a/jdk/src/share/classes/java/util/stream/DistinctOps.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/DistinctOps.java Fri Sep 06 15:09:44 2013 -0700
@@ -101,7 +101,7 @@
if (StreamOpFlag.DISTINCT.isKnown(flags)) {
return sink;
} else if (StreamOpFlag.SORTED.isKnown(flags)) {
- return new Sink.ChainedReference<T>(sink) {
+ return new Sink.ChainedReference<T, T>(sink) {
boolean seenNull;
T lastSeen;
@@ -132,7 +132,7 @@
}
};
} else {
- return new Sink.ChainedReference<T>(sink) {
+ return new Sink.ChainedReference<T, T>(sink) {
Set<T> seen;
@Override
--- a/jdk/src/share/classes/java/util/stream/DoublePipeline.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/DoublePipeline.java Fri Sep 06 15:09:44 2013 -0700
@@ -191,7 +191,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble(sink) {
+ return new Sink.ChainedDouble<Double>(sink) {
@Override
public void accept(double t) {
downstream.accept(mapper.applyAsDouble(t));
@@ -208,9 +208,8 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Double> opWrapSink(int flags, Sink<U> sink) {
- return new Sink.ChainedDouble(sink) {
+ return new Sink.ChainedDouble<U>(sink) {
@Override
- @SuppressWarnings("unchecked")
public void accept(double t) {
downstream.accept(mapper.apply(t));
}
@@ -226,7 +225,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedDouble(sink) {
+ return new Sink.ChainedDouble<Integer>(sink) {
@Override
public void accept(double t) {
downstream.accept(mapper.applyAsInt(t));
@@ -243,7 +242,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedDouble(sink) {
+ return new Sink.ChainedDouble<Long>(sink) {
@Override
public void accept(double t) {
downstream.accept(mapper.applyAsLong(t));
@@ -259,7 +258,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble(sink) {
+ return new Sink.ChainedDouble<Double>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -296,7 +295,7 @@
StreamOpFlag.NOT_SIZED) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble(sink) {
+ return new Sink.ChainedDouble<Double>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -319,7 +318,7 @@
0) {
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble(sink) {
+ return new Sink.ChainedDouble<Double>(sink) {
@Override
public void accept(double t) {
consumer.accept(t);
--- a/jdk/src/share/classes/java/util/stream/IntPipeline.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/IntPipeline.java Fri Sep 06 15:09:44 2013 -0700
@@ -189,9 +189,8 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Long>(sink) {
@Override
- @SuppressWarnings("unchecked")
public void accept(int t) {
downstream.accept((long) t);
}
@@ -206,9 +205,8 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Double>(sink) {
@Override
- @SuppressWarnings("unchecked")
public void accept(int t) {
downstream.accept((double) t);
}
@@ -229,7 +227,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Integer>(sink) {
@Override
public void accept(int t) {
downstream.accept(mapper.applyAsInt(t));
@@ -246,9 +244,8 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<U> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<U>(sink) {
@Override
- @SuppressWarnings("unchecked")
public void accept(int t) {
downstream.accept(mapper.apply(t));
}
@@ -264,7 +261,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Long>(sink) {
@Override
public void accept(int t) {
downstream.accept(mapper.applyAsLong(t));
@@ -281,7 +278,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Double>(sink) {
@Override
public void accept(int t) {
downstream.accept(mapper.applyAsDouble(t));
@@ -297,7 +294,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Integer>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -334,7 +331,7 @@
StreamOpFlag.NOT_SIZED) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Integer>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -357,7 +354,7 @@
0) {
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Integer>(sink) {
@Override
public void accept(int t) {
consumer.accept(t);
--- a/jdk/src/share/classes/java/util/stream/LongPipeline.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/LongPipeline.java Fri Sep 06 15:09:44 2013 -0700
@@ -186,7 +186,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<Double>(sink) {
@Override
public void accept(long t) {
downstream.accept((double) t);
@@ -208,9 +208,8 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<Long>(sink) {
@Override
- @SuppressWarnings("unchecked")
public void accept(long t) {
downstream.accept(mapper.applyAsLong(t));
}
@@ -226,9 +225,8 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<U> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<U>(sink) {
@Override
- @SuppressWarnings("unchecked")
public void accept(long t) {
downstream.accept(mapper.apply(t));
}
@@ -244,9 +242,8 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<Integer>(sink) {
@Override
- @SuppressWarnings("unchecked")
public void accept(long t) {
downstream.accept(mapper.applyAsInt(t));
}
@@ -262,7 +259,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<Double>(sink) {
@Override
public void accept(long t) {
downstream.accept(mapper.applyAsDouble(t));
@@ -278,7 +275,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<Long>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -315,7 +312,7 @@
StreamOpFlag.NOT_SIZED) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<Long>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
@@ -338,7 +335,7 @@
0) {
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<Long>(sink) {
@Override
public void accept(long t) {
consumer.accept(t);
--- a/jdk/src/share/classes/java/util/stream/ReferencePipeline.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/ReferencePipeline.java Fri Sep 06 15:09:44 2013 -0700
@@ -163,17 +163,16 @@
StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, P_OUT>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
}
@Override
- @SuppressWarnings("unchecked")
public void accept(P_OUT u) {
if (predicate.test(u))
- downstream.accept((Object) u);
+ downstream.accept(u);
}
};
}
@@ -188,7 +187,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<R> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, R>(sink) {
@Override
public void accept(P_OUT u) {
downstream.accept(mapper.apply(u));
@@ -205,7 +204,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, Integer>(sink) {
@Override
public void accept(P_OUT u) {
downstream.accept(mapper.applyAsInt(u));
@@ -222,7 +221,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, Long>(sink) {
@Override
public void accept(P_OUT u) {
downstream.accept(mapper.applyAsLong(u));
@@ -239,7 +238,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, Double>(sink) {
@Override
public void accept(P_OUT u) {
downstream.accept(mapper.applyAsDouble(u));
@@ -257,14 +256,13 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<R> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, R>(sink) {
@Override
public void begin(long size) {
downstream.begin(-1);
}
@Override
- @SuppressWarnings("unchecked")
public void accept(P_OUT u) {
// We can do better that this too; optimize for depth=0 case and just grab spliterator and forEach it
Stream<? extends R> result = mapper.apply(u);
@@ -284,7 +282,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, Integer>(sink) {
IntConsumer downstreamAsInt = downstream::accept;
@Override
public void begin(long size) {
@@ -311,7 +309,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, Double>(sink) {
DoubleConsumer downstreamAsDouble = downstream::accept;
@Override
public void begin(long size) {
@@ -338,7 +336,7 @@
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, Long>(sink) {
LongConsumer downstreamAsLong = downstream::accept;
@Override
public void begin(long size) {
@@ -364,9 +362,8 @@
0) {
@Override
Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
- return new Sink.ChainedReference<P_OUT>(sink) {
+ return new Sink.ChainedReference<P_OUT, P_OUT>(sink) {
@Override
- @SuppressWarnings("unchecked")
public void accept(P_OUT u) {
tee.accept(u);
downstream.accept(u);
@@ -495,6 +492,7 @@
}
@Override
+ @SuppressWarnings("unchecked")
public final <R, A> R collect(Collector<? super P_OUT, A, ? extends R> collector) {
A container;
if (isParallel()
--- a/jdk/src/share/classes/java/util/stream/Sink.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/Sink.java Fri Sep 06 15:09:44 2013 -0700
@@ -241,11 +241,10 @@
* implementation of the {@code accept()} method must call the correct
* {@code accept()} method on the downstream {@code Sink}.
*/
- static abstract class ChainedReference<T> implements Sink<T> {
- @SuppressWarnings("rawtypes")
- protected final Sink downstream;
+ static abstract class ChainedReference<T, E_OUT> implements Sink<T> {
+ protected final Sink<? super E_OUT> downstream;
- public ChainedReference(Sink downstream) {
+ public ChainedReference(Sink<? super E_OUT> downstream) {
this.downstream = Objects.requireNonNull(downstream);
}
@@ -274,11 +273,10 @@
* The implementation of the {@code accept()} method must call the correct
* {@code accept()} method on the downstream {@code Sink}.
*/
- static abstract class ChainedInt implements Sink.OfInt {
- @SuppressWarnings("rawtypes")
- protected final Sink downstream;
+ static abstract class ChainedInt<E_OUT> implements Sink.OfInt {
+ protected final Sink<? super E_OUT> downstream;
- public ChainedInt(Sink downstream) {
+ public ChainedInt(Sink<? super E_OUT> downstream) {
this.downstream = Objects.requireNonNull(downstream);
}
@@ -307,11 +305,10 @@
* The implementation of the {@code accept()} method must call the correct
* {@code accept()} method on the downstream {@code Sink}.
*/
- static abstract class ChainedLong implements Sink.OfLong {
- @SuppressWarnings("rawtypes")
- protected final Sink downstream;
+ static abstract class ChainedLong<E_OUT> implements Sink.OfLong {
+ protected final Sink<? super E_OUT> downstream;
- public ChainedLong(Sink downstream) {
+ public ChainedLong(Sink<? super E_OUT> downstream) {
this.downstream = Objects.requireNonNull(downstream);
}
@@ -340,11 +337,10 @@
* The implementation of the {@code accept()} method must call the correct
* {@code accept()} method on the downstream {@code Sink}.
*/
- static abstract class ChainedDouble implements Sink.OfDouble {
- @SuppressWarnings("rawtypes")
- protected final Sink downstream;
+ static abstract class ChainedDouble<E_OUT> implements Sink.OfDouble {
+ protected final Sink<? super E_OUT> downstream;
- public ChainedDouble(Sink downstream) {
+ public ChainedDouble(Sink<? super E_OUT> downstream) {
this.downstream = Objects.requireNonNull(downstream);
}
--- a/jdk/src/share/classes/java/util/stream/SliceOps.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/SliceOps.java Fri Sep 06 15:09:44 2013 -0700
@@ -96,6 +96,11 @@
}
}
+ @SuppressWarnings("unchecked")
+ private static <T> IntFunction<T[]> castingArray() {
+ return size -> (T[]) new Object[size];
+ }
+
/**
* Appends a "slice" operation to the provided stream. The slice operation
* may be may be skip-only, limit-only, or skip-and-limit.
@@ -107,12 +112,12 @@
* is to be imposed
*/
public static <T> Stream<T> makeRef(AbstractPipeline<?, T, ?> upstream,
- long skip, long limit) {
+ long skip, long limit) {
if (skip < 0)
throw new IllegalArgumentException("Skip must be non-negative: " + skip);
- return new ReferencePipeline.StatefulOp<T,T>(upstream, StreamShape.REFERENCE,
- flags(limit)) {
+ return new ReferencePipeline.StatefulOp<T, T>(upstream, StreamShape.REFERENCE,
+ flags(limit)) {
Spliterator<T> unorderedSkipLimitSpliterator(Spliterator<T> s,
long skip, long limit, long sizeIfKnown) {
if (skip <= sizeIfKnown) {
@@ -146,7 +151,7 @@
// cancellation will be more aggressive cancelling later tasks
// if the target slice size has been reached from a given task,
// cancellation should also clear local results if any
- return new SliceTask<>(this, helper, spliterator, i -> (T[]) new Object[i], skip, limit).
+ return new SliceTask<>(this, helper, spliterator, castingArray(), skip, limit).
invoke().spliterator();
}
}
@@ -182,7 +187,7 @@
@Override
Sink<T> opWrapSink(int flags, Sink<T> sink) {
- return new Sink.ChainedReference<T>(sink) {
+ return new Sink.ChainedReference<T, T>(sink) {
long n = skip;
long m = limit >= 0 ? limit : Long.MAX_VALUE;
@@ -291,7 +296,7 @@
@Override
Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
- return new Sink.ChainedInt(sink) {
+ return new Sink.ChainedInt<Integer>(sink) {
long n = skip;
long m = limit >= 0 ? limit : Long.MAX_VALUE;
@@ -400,7 +405,7 @@
@Override
Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
- return new Sink.ChainedLong(sink) {
+ return new Sink.ChainedLong<Long>(sink) {
long n = skip;
long m = limit >= 0 ? limit : Long.MAX_VALUE;
@@ -509,7 +514,7 @@
@Override
Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
- return new Sink.ChainedDouble(sink) {
+ return new Sink.ChainedDouble<Double>(sink) {
long n = skip;
long m = limit >= 0 ? limit : Long.MAX_VALUE;
@@ -560,13 +565,13 @@
private volatile boolean completed;
- SliceTask(AbstractPipeline<?, P_OUT, ?> op,
+ SliceTask(AbstractPipeline<P_OUT, P_OUT, ?> op,
PipelineHelper<P_OUT> helper,
Spliterator<P_IN> spliterator,
IntFunction<P_OUT[]> generator,
long offset, long size) {
super(helper, spliterator);
- this.op = (AbstractPipeline<P_OUT, P_OUT, ?>) op;
+ this.op = op;
this.generator = generator;
this.targetOffset = offset;
this.targetSize = size;
--- a/jdk/src/share/classes/java/util/stream/SortedOps.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/stream/SortedOps.java Fri Sep 06 15:09:44 2013 -0700
@@ -129,7 +129,7 @@
}
@Override
- public Sink<T> opWrapSink(int flags, Sink sink) {
+ public Sink<T> opWrapSink(int flags, Sink<T> sink) {
Objects.requireNonNull(sink);
// If the input is already naturally sorted and this operation
@@ -280,12 +280,12 @@
/**
* {@link ForkJoinTask} for implementing sort on SIZED reference streams.
*/
- private static final class SizedRefSortingSink<T> extends Sink.ChainedReference<T> {
+ private static final class SizedRefSortingSink<T> extends Sink.ChainedReference<T, T> {
private final Comparator<? super T> comparator;
private T[] array;
private int offset;
- SizedRefSortingSink(Sink<T> sink, Comparator<? super T> comparator) {
+ SizedRefSortingSink(Sink<? super T> sink, Comparator<? super T> comparator) {
super(sink);
this.comparator = comparator;
}
@@ -320,11 +320,11 @@
/**
* {@link Sink} for implementing sort on reference streams.
*/
- private static final class RefSortingSink<T> extends Sink.ChainedReference<T> {
+ private static final class RefSortingSink<T> extends Sink.ChainedReference<T, T> {
private final Comparator<? super T> comparator;
private ArrayList<T> list;
- RefSortingSink(Sink<T> sink, Comparator<? super T> comparator) {
+ RefSortingSink(Sink<? super T> sink, Comparator<? super T> comparator) {
super(sink);
this.comparator = comparator;
}
@@ -352,11 +352,11 @@
/**
* {@link Sink} for implementing sort on SIZED int streams.
*/
- private static final class SizedIntSortingSink extends Sink.ChainedInt {
+ private static final class SizedIntSortingSink extends Sink.ChainedInt<Integer> {
private int[] array;
private int offset;
- SizedIntSortingSink(Sink downstream) {
+ SizedIntSortingSink(Sink<? super Integer> downstream) {
super(downstream);
}
@@ -386,10 +386,10 @@
/**
* {@link Sink} for implementing sort on int streams.
*/
- private static final class IntSortingSink extends Sink.ChainedInt {
+ private static final class IntSortingSink extends Sink.ChainedInt<Integer> {
private SpinedBuffer.OfInt b;
- IntSortingSink(Sink sink) {
+ IntSortingSink(Sink<? super Integer> sink) {
super(sink);
}
@@ -417,11 +417,11 @@
/**
* {@link Sink} for implementing sort on SIZED long streams.
*/
- private static final class SizedLongSortingSink extends Sink.ChainedLong {
+ private static final class SizedLongSortingSink extends Sink.ChainedLong<Long> {
private long[] array;
private int offset;
- SizedLongSortingSink(Sink downstream) {
+ SizedLongSortingSink(Sink<? super Long> downstream) {
super(downstream);
}
@@ -451,10 +451,10 @@
/**
* {@link Sink} for implementing sort on long streams.
*/
- private static final class LongSortingSink extends Sink.ChainedLong {
+ private static final class LongSortingSink extends Sink.ChainedLong<Long> {
private SpinedBuffer.OfLong b;
- LongSortingSink(Sink sink) {
+ LongSortingSink(Sink<? super Long> sink) {
super(sink);
}
@@ -482,11 +482,11 @@
/**
* {@link Sink} for implementing sort on SIZED double streams.
*/
- private static final class SizedDoubleSortingSink extends Sink.ChainedDouble {
+ private static final class SizedDoubleSortingSink extends Sink.ChainedDouble<Double> {
private double[] array;
private int offset;
- SizedDoubleSortingSink(Sink downstream) {
+ SizedDoubleSortingSink(Sink<? super Double> downstream) {
super(downstream);
}
@@ -516,10 +516,10 @@
/**
* {@link Sink} for implementing sort on double streams.
*/
- private static final class DoubleSortingSink extends Sink.ChainedDouble {
+ private static final class DoubleSortingSink extends Sink.ChainedDouble<Double> {
private SpinedBuffer.OfDouble b;
- DoubleSortingSink(Sink sink) {
+ DoubleSortingSink(Sink<? super Double> sink) {
super(sink);
}
--- a/jdk/src/share/classes/java/util/zip/ZipOutputStream.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/java/util/zip/ZipOutputStream.java Fri Sep 06 15:09:44 2013 -0700
@@ -663,6 +663,9 @@
while (off + 4 <= len) {
int tag = get16(extra, off);
int sz = get16(extra, off + 2);
+ if (sz < 0 || (off + 4 + sz) > len) {
+ break;
+ }
if (tag == EXTID_EXTT || tag == EXTID_ZIP64) {
skipped += (sz + 4);
}
@@ -684,11 +687,18 @@
while (off + 4 <= len) {
int tag = get16(extra, off);
int sz = get16(extra, off + 2);
+ if (sz < 0 || (off + 4 + sz) > len) {
+ writeBytes(extra, off, len - off);
+ return;
+ }
if (tag != EXTID_EXTT && tag != EXTID_ZIP64) {
writeBytes(extra, off, sz + 4);
}
off += (sz + 4);
}
+ if (off < len) {
+ writeBytes(extra, off, len - off);
+ }
}
}
--- a/jdk/src/share/classes/javax/net/ssl/SNIHostName.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/javax/net/ssl/SNIHostName.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -293,6 +293,7 @@
* the <a href="{@docRoot}/java/util/regex/Pattern.html#sum">
* regular expression pattern</a>
* representing the hostname(s) to match
+ * @return a {@code SNIMatcher} object for {@code SNIHostName}s
* @throws NullPointerException if {@code regex} is
* {@code null}
* @throws java.util.regex.PatternSyntaxException if the regular expression's
--- a/jdk/src/share/classes/javax/net/ssl/X509KeyManager.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/javax/net/ssl/X509KeyManager.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2004, 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
@@ -40,7 +40,7 @@
* <UL>
* <LI> determine the set of aliases that are available for negotiations
* based on the criteria presented,
- * <LI> select the <ITALIC> best alias </ITALIC> based on
+ * <LI> select the <i> best alias</i> based on
* the criteria presented, and
* <LI> obtain the corresponding key material for given aliases.
* </UL>
--- a/jdk/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java Fri Sep 06 15:09:44 2013 -0700
@@ -197,8 +197,7 @@
* {@code KerberosPrincipal} and the two
* {@code KerberosPrincipal} instances are equivalent.
* More formally two {@code KerberosPrincipal} instances are equal
- * if the values returned by {@code getName()} are equal and the
- * values returned by {@code getNameType()} are equal.
+ * if the values returned by {@code getName()} are equal.
*
* @param other the Object to compare to
* @return true if the Object passed in represents the same principal
@@ -211,15 +210,10 @@
if (! (other instanceof KerberosPrincipal)) {
return false;
- } else {
- String myFullName = getName();
- String otherFullName = ((KerberosPrincipal) other).getName();
- if (nameType == ((KerberosPrincipal)other).nameType &&
- myFullName.equals(otherFullName)) {
- return true;
- }
}
- return false;
+ String myFullName = getName();
+ String otherFullName = ((KerberosPrincipal) other).getName();
+ return myFullName.equals(otherFullName);
}
/**
--- a/jdk/src/share/classes/sun/misc/Compare.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1996, 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.
- */
-
-/**
- * Compare: an interface to enable users to define the result of
- * a comparison of two objects.
- *
- * @author Sunita Mani
- */
-
-package sun.misc;
-
-public interface Compare {
-
- /**
- * doCompare
- *
- * @param obj1 first object to compare.
- * @param obj2 second object to compare.
- * @return -1 if obj1 < obj2, 0 if obj1 == obj2, 1 if obj1 > obj2.
- */
- public int doCompare(Object obj1, Object obj2);
-
-}
--- a/jdk/src/share/classes/sun/misc/Sort.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.
- */
-
-/**
- * Sort: a class that uses the quicksort algorithm to sort an
- * array of objects.
- *
- * @author Sunita Mani
- */
-
-package sun.misc;
-
-public class Sort {
-
- private static void swap(Object arr[], int i, int j) {
- Object tmp;
-
- tmp = arr[i];
- arr[i] = arr[j];
- arr[j] = tmp;
- }
-
- /**
- * quicksort the array of objects.
- *
- * @param arr[] - an array of objects
- * @param left - the start index - from where to begin sorting
- * @param right - the last index.
- * @param comp - an object that implemnts the Compare interface to resolve thecomparison.
- */
- public static void quicksort(Object arr[], int left, int right, Compare comp) {
- int i, last;
-
- if (left >= right) { /* do nothing if array contains fewer than two */
- return; /* two elements */
- }
- swap(arr, left, (left+right) / 2);
- last = left;
- for (i = left+1; i <= right; i++) {
- if (comp.doCompare(arr[i], arr[left]) < 0) {
- swap(arr, ++last, i);
- }
- }
- swap(arr, left, last);
- quicksort(arr, left, last-1, comp);
- quicksort(arr, last+1, right, comp);
- }
-
- public static void quicksort(Object arr[], Compare comp) {
- quicksort(arr, 0, arr.length-1, comp);
- }
-}
--- a/jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -193,9 +193,4 @@
if (!selch.isOpen() && !selch.isRegistered())
((SelChImpl)selch).kill();
}
-
- static {
- Util.load();
- }
-
}
--- a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1138,7 +1138,7 @@
throws IOException;
static {
- Util.load();
+ IOUtil.load();
initIDs();
}
--- a/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1162,7 +1162,7 @@
private static native long initIDs();
static {
- Util.load();
+ IOUtil.load();
allocationGranularity = initIDs();
}
--- a/jdk/src/share/classes/sun/nio/ch/IOUtil.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/nio/ch/IOUtil.java Fri Sep 06 15:09:44 2013 -0700
@@ -347,9 +347,23 @@
static native void initIDs();
+ /**
+ * Used to trigger loading of native libraries
+ */
+ public static void load() { }
+
static {
- // Note that IOUtil.initIDs is called from within Util.load.
- Util.load();
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+ System.loadLibrary("net");
+ System.loadLibrary("nio");
+ return null;
+ }
+ });
+
+ initIDs();
+
IOV_MAX = iovMax();
}
--- a/jdk/src/share/classes/sun/nio/ch/Net.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/nio/ch/Net.java Fri Sep 06 15:09:44 2013 -0700
@@ -582,7 +582,7 @@
private static native void initIDs();
static {
- Util.load();
+ IOUtil.load();
initIDs();
}
--- a/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -416,7 +416,7 @@
private static native void initIDs();
static {
- Util.load();
+ IOUtil.load();
initIDs();
nd = new SocketDispatcher();
}
--- a/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1024,7 +1024,7 @@
throws IOException;
static {
- Util.load();
+ IOUtil.load();
nd = new SocketDispatcher();
}
--- a/jdk/src/share/classes/sun/nio/ch/Util.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/nio/ch/Util.java Fri Sep 06 15:09:44 2013 -0700
@@ -401,30 +401,4 @@
return bugLevel.equals(bl);
}
-
-
- // -- Initialization --
-
- private static boolean loaded = false;
-
- public static void load() {
- synchronized (Util.class) {
- if (loaded)
- return;
- loaded = true;
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
- System.loadLibrary("net");
- System.loadLibrary("nio");
- return null;
- }
- });
-
- // IOUtil must be initialized; Its native methods are called from
- // other places in native nio code so they must be set up.
- IOUtil.initIDs();
- }
- }
-
}
--- a/jdk/src/share/classes/sun/tools/jconsole/ConnectDialog.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/ConnectDialog.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2012, 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
@@ -268,8 +268,13 @@
public void revalidate() {
// Adjust some colors
+ Color disabledForeground = UIManager.getColor("Label.disabledForeground");
+ if (disabledForeground == null) {
+ // fall back for Nimbus that doesn't support 'Label.disabledForeground'
+ disabledForeground = UIManager.getColor("Label.disabledText");
+ }
hintTextColor =
- ensureContrast(UIManager.getColor("Label.disabledForeground"),
+ ensureContrast(disabledForeground,
UIManager.getColor("Panel.background"));
disabledTableCellColor =
ensureContrast(new Color(0x808080),
--- a/jdk/src/share/classes/sun/tools/jconsole/JConsole.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/JConsole.java Fri Sep 06 15:09:44 2013 -0700
@@ -858,6 +858,10 @@
try {
updateInterval = Integer.parseInt(arg.substring(10)) *
1000;
+ if (updateInterval <= 0) {
+ usage();
+ return;
+ }
} catch (NumberFormatException ex) {
usage();
return;
--- a/jdk/src/share/classes/sun/tools/jconsole/Messages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/Messages.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * 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
@@ -146,7 +146,6 @@
public static String HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME;
public static String HELP_ABOUT_DIALOG_MASTHEAD_TITLE;
public static String HELP_ABOUT_DIALOG_TITLE;
- public static String HELP_ABOUT_DIALOG_USER_GUIDE_LINK;
public static String HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL;
public static String HELP_MENU_ABOUT_TITLE;
public static String HELP_MENU_USER_GUIDE_TITLE;
@@ -272,6 +271,7 @@
public static String THREADS;
public static String THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME;
public static String THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME;
+ public static String THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE;
public static String THRESHOLD;
public static String TILE;
public static String TIME_RANGE_COLON;
--- a/jdk/src/share/classes/sun/tools/jconsole/Plotter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/Plotter.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2012, 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
@@ -337,6 +337,13 @@
public void paintComponent(Graphics g) {
super.paintComponent(g);
+ int width = getWidth()-rightMargin-leftMargin-10;
+ int height = getHeight()-topMargin-bottomMargin;
+ if (width <= 0 || height <= 0) {
+ // not enough room to paint anything
+ return;
+ }
+
Color oldColor = g.getColor();
Font oldFont = g.getFont();
Color fg = getForeground();
--- a/jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java Fri Sep 06 15:09:44 2013 -0700
@@ -595,6 +595,8 @@
setBorder(thinEmptyBorder);
+ setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ textArea.setText(Messages.THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE);
addListSelectionListener(ThreadTab.this);
setCellRenderer(new DefaultListCellRenderer() {
public Component getListCellRendererComponent(JList<?> list, Object value, int index,
--- a/jdk/src/share/classes/sun/tools/jconsole/VMPanel.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/VMPanel.java Fri Sep 06 15:09:44 2013 -0700
@@ -153,9 +153,11 @@
// in order to reserve space for the connect toggle.
public void setUI(TabbedPaneUI ui) {
Insets insets = (Insets) UIManager.getLookAndFeelDefaults().get("TabbedPane.tabAreaInsets");
- insets = (Insets) insets.clone();
- insets.right += connectedIcon24.getIconWidth() + 8;
- UIManager.put("TabbedPane.tabAreaInsets", insets);
+ if (insets != null) {
+ insets = (Insets) insets.clone();
+ insets.right += connectedIcon24.getIconWidth() + 8;
+ UIManager.put("TabbedPane.tabAreaInsets", insets);
+ }
super.setUI(ui);
}
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -104,7 +104,6 @@
HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Masthead Graphic
HELP_ABOUT_DIALOG_MASTHEAD_TITLE=About JConsole
HELP_ABOUT_DIALOG_TITLE=JConsole: About
-HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole &User Guide:<br>{0}
HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html
HELP_MENU_ABOUT_TITLE=&About JConsole
HELP_MENU_USER_GUIDE_TITLE=Online &User Guide
@@ -230,6 +229,7 @@
THREADS=Threads
THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=Thread Information
THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Chart for number of threads.
+THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[No thread selected]
THRESHOLD=Threshold
TILE=&Tile
TIME_RANGE_COLON=&Time Range:
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Fri Sep 06 15:09:44 2013 -0700
@@ -104,7 +104,6 @@
HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62
HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306B\u3064\u3044\u3066
HELP_ABOUT_DIALOG_TITLE=JConsole: \u8A73\u7D30
-HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U):<br>{0}
HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html
HELP_MENU_ABOUT_TITLE=JConsole\u306B\u3064\u3044\u3066(&A)
HELP_MENU_USER_GUIDE_TITLE=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U)
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Fri Sep 06 15:09:44 2013 -0700
@@ -104,7 +104,6 @@
HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE
HELP_ABOUT_DIALOG_MASTHEAD_TITLE=\u5173\u4E8E JConsole
HELP_ABOUT_DIALOG_TITLE=JConsole: \u5173\u4E8E
-HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole \u7528\u6237\u6307\u5357(&U):<br>{0}
HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html
HELP_MENU_ABOUT_TITLE=\u5173\u4E8E JConsole(&A)
HELP_MENU_USER_GUIDE_TITLE=\u8054\u673A\u7528\u6237\u6307\u5357(&U)
--- a/jdk/src/share/lib/security/java.security-linux Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/lib/security/java.security-linux Fri Sep 06 15:09:44 2013 -0700
@@ -181,6 +181,7 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
com.sun.jmx.,\
+ com.sun.media.sound.,\
com.sun.proxy.,\
com.sun.org.apache.bcel.internal.,\
com.sun.org.apache.regexp.internal.,\
@@ -225,6 +226,7 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
com.sun.jmx.,\
+ com.sun.media.sound.,\
com.sun.proxy.,\
com.sun.org.apache.bcel.internal.,\
com.sun.org.apache.regexp.internal.,\
--- a/jdk/src/share/lib/security/java.security-macosx Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/lib/security/java.security-macosx Fri Sep 06 15:09:44 2013 -0700
@@ -182,6 +182,7 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
com.sun.jmx.,\
+ com.sun.media.sound.,\
com.sun.proxy.,\
com.sun.org.apache.bcel.internal.,\
com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
com.sun.jmx.,\
+ com.sun.media.sound.,\
com.sun.proxy.,\
com.sun.org.apache.bcel.internal.,\
com.sun.org.apache.regexp.internal.,\
--- a/jdk/src/share/lib/security/java.security-solaris Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/lib/security/java.security-solaris Fri Sep 06 15:09:44 2013 -0700
@@ -183,6 +183,7 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
com.sun.jmx.,\
+ com.sun.media.sound.,\
com.sun.proxy.,\
com.sun.org.apache.bcel.internal.,\
com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
com.sun.jmx.,\
+ com.sun.media.sound.,\
com.sun.proxy.,\
com.sun.org.apache.bcel.internal.,\
com.sun.org.apache.regexp.internal.,\
--- a/jdk/src/share/lib/security/java.security-windows Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/lib/security/java.security-windows Fri Sep 06 15:09:44 2013 -0700
@@ -182,6 +182,7 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
com.sun.jmx.,\
+ com.sun.media.sound.,\
com.sun.proxy.,\
com.sun.org.apache.bcel.internal.,\
com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
com.sun.imageio.,\
com.sun.istack.internal.,\
com.sun.jmx.,\
+ com.sun.media.sound.,\
com.sun.proxy.,\
com.sun.org.apache.bcel.internal.,\
com.sun.org.apache.regexp.internal.,\
--- a/jdk/src/share/native/common/check_code.c Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/share/native/common/check_code.c Fri Sep 06 15:09:44 2013 -0700
@@ -90,6 +90,12 @@
#include "classfile_constants.h"
#include "opcodes.in_out"
+#ifdef __APPLE__
+/* use setjmp/longjmp versions that do not save/restore the signal mask */
+#define setjmp _setjmp
+#define longjmp _longjmp
+#endif
+
#define MAX_ARRAY_DIMENSIONS 255
/* align byte code */
#ifndef ALIGN_UP
--- a/jdk/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,7 +36,7 @@
class DatagramDispatcher extends NativeDispatcher
{
static {
- Util.load();
+ IOUtil.load();
}
int read(FileDescriptor fd, long address, int len) throws IOException {
--- a/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java Fri Sep 06 15:09:44 2013 -0700
@@ -316,4 +316,8 @@
private native int poll0(long pollAddress, int numfds, long timeout,
int wfd);
private static native void interrupt(int fd);
+
+ static {
+ IOUtil.load();
+ }
}
--- a/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -196,9 +196,4 @@
}
return this;
}
-
- static {
- Util.load();
- }
-
}
--- a/jdk/src/solaris/classes/sun/nio/ch/EPoll.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/EPoll.java Fri Sep 06 15:09:44 2013 -0700
@@ -113,6 +113,6 @@
throws IOException;
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java Fri Sep 06 15:09:44 2013 -0700
@@ -318,6 +318,7 @@
}
static {
+ IOUtil.load();
init();
}
--- a/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java Fri Sep 06 15:09:44 2013 -0700
@@ -318,6 +318,6 @@
private static native void close0(int fd);
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -196,8 +196,4 @@
}
return this;
}
-
- static {
- Util.load();
- }
}
--- a/jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,7 +31,7 @@
{
static {
- Util.load();
+ IOUtil.load();
init();
}
--- a/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java Fri Sep 06 15:09:44 2013 -0700
@@ -235,6 +235,6 @@
private static native int peerPort0(int fd);
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/src/solaris/classes/sun/nio/ch/KQueue.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/KQueue.java Fri Sep 06 15:09:44 2013 -0700
@@ -115,6 +115,6 @@
throws IOException;
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/src/solaris/classes/sun/nio/ch/KQueuePort.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/KQueuePort.java Fri Sep 06 15:09:44 2013 -0700
@@ -326,6 +326,6 @@
private static native void close0(int fd);
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/src/solaris/classes/sun/nio/ch/NativeThread.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/NativeThread.java Fri Sep 06 15:09:44 2013 -0700
@@ -54,7 +54,7 @@
private static native void init();
static {
- Util.load();
+ IOUtil.load();
init();
}
--- a/jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java Fri Sep 06 15:09:44 2013 -0700
@@ -126,4 +126,7 @@
private static native void interrupt(int fd);
+ static {
+ IOUtil.load();
+ }
}
--- a/jdk/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -37,7 +37,7 @@
{
// Used to make native read and write calls
- private static NativeDispatcher nd;
+ private static final NativeDispatcher nd = new FileDispatcherImpl();
// The file descriptor associated with this channel
FileDescriptor fd;
@@ -206,10 +206,4 @@
throw new IndexOutOfBoundsException();
return write(Util.subsequence(srcs, offset, length));
}
-
- static {
- Util.load();
- nd = new FileDispatcherImpl();
- }
-
}
--- a/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java Fri Sep 06 15:09:44 2013 -0700
@@ -260,6 +260,6 @@
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/src/solaris/classes/sun/nio/ch/SourceChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/SourceChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -37,7 +37,7 @@
{
// Used to make native read and write calls
- private static NativeDispatcher nd;
+ private static final NativeDispatcher nd = new FileDispatcherImpl();
// The file descriptor associated with this channel
FileDescriptor fd;
@@ -206,10 +206,4 @@
}
}
}
-
- static {
- Util.load();
- nd = new FileDispatcherImpl();
- }
-
}
--- a/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -345,7 +345,7 @@
throws IOException;
static {
- Util.load();
+ IOUtil.load();
initIDs();
}
}
--- a/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -748,6 +748,6 @@
private static native void checkConnect(int fdVal) throws IOException;
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -1106,7 +1106,7 @@
boolean ready) throws IOException;
static {
- Util.load(); /* loads nio & net native libraries */
+ IOUtil.load(); /* loads nio & net native libraries */
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {
public Void run() {
--- a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -995,7 +995,7 @@
}
static {
- Util.load(); /* loads nio & net native libraries */
+ IOUtil.load(); /* loads nio & net native libraries */
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {
public Void run() {
--- a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -426,7 +426,7 @@
FileDescriptor newfd, InetSocketAddress[] isaa) throws IOException;
static {
- Util.load(); // loads nio & net native libraries
+ IOUtil.load(); // loads nio & net native libraries
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {
public Void run() {
--- a/jdk/src/windows/classes/sun/nio/ch/DatagramDispatcher.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/DatagramDispatcher.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,7 +36,7 @@
class DatagramDispatcher extends NativeDispatcher
{
static {
- Util.load();
+ IOUtil.load();
}
int read(FileDescriptor fd, long address, int len) throws IOException {
--- a/jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,7 +32,7 @@
class FileDispatcherImpl extends FileDispatcher
{
static {
- Util.load();
+ IOUtil.load();
}
/**
--- a/jdk/src/windows/classes/sun/nio/ch/FileKey.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/FileKey.java Fri Sep 06 15:09:44 2013 -0700
@@ -73,6 +73,7 @@
private static native void initIDs();
static {
+ IOUtil.load();
initIDs();
}
}
--- a/jdk/src/windows/classes/sun/nio/ch/Iocp.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/Iocp.java Fri Sep 06 15:09:44 2013 -0700
@@ -443,7 +443,7 @@
private static native String getErrorMessage(int error);
static {
- Util.load();
+ IOUtil.load();
initIDs();
// thread agnostic I/O on Vista/2008 or newer
--- a/jdk/src/windows/classes/sun/nio/ch/PipeImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/PipeImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -56,7 +56,6 @@
private static final Random rnd;
static {
- Util.load();
byte[] someBytes = new byte[8];
boolean resultOK = IOUtil.randomBytes(someBytes);
if (resultOK) {
--- a/jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,7 +36,7 @@
{
static {
- Util.load();
+ IOUtil.load();
}
int read(FileDescriptor fd, long address, int len) throws IOException {
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -750,6 +750,6 @@
private static native void close0(long handle);
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -363,7 +363,7 @@
private static native void closesocket0(long socket) throws IOException;
static {
- Util.load();
+ IOUtil.load();
initIDs();
}
}
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -919,7 +919,7 @@
private static native void closesocket0(long socket) throws IOException;
static {
- Util.load();
+ IOUtil.load();
initIDs();
}
}
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -611,6 +611,6 @@
}
static {
- Util.load();
+ IOUtil.load();
}
}
--- a/jdk/test/ProblemList.txt Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/ProblemList.txt Fri Sep 06 15:09:44 2013 -0700
@@ -208,7 +208,7 @@
# jdk_io
# 7160013
-java/io/File/MaxPathLength.java windows-all
+#java/io/File/MaxPathLength.java windows-all
############################################################################
@@ -336,12 +336,6 @@
# Filed 6653793
com/sun/jdi/RedefineCrossEvent.java generic-all
-# Filed 6987312
-com/sun/jdi/DoubleAgentTest.java generic-all
-
-# Filed 7020857
-com/sun/jdi/FieldWatchpoints.java generic-all
-
# Filed 6402201
com/sun/jdi/ProcessAttachTest.sh generic-all
--- a/jdk/test/TEST.ROOT Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/TEST.ROOT Fri Sep 06 15:09:44 2013 -0700
@@ -9,3 +9,6 @@
# Tests that cannot run concurrently
exclusiveAccess.dirs=java/rmi/Naming java/util/Currency java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi
+
+# Group definitions
+groups=TEST.groups [closed/TEST.groups]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/TEST.groups Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,214 @@
+# 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.
+#
+
+jdk_lang = \
+ java/lang \
+ -java/lang/management \
+ -java/lang/instrument \
+ sun/invoke \
+ sun/misc \
+ sun/reflect \
+ vm
+
+jdk_util = \
+ java/util \
+ sun/util
+
+jdk_math = \
+ java/math
+
+jdk_io = \
+ java/io
+
+jdk_nio = \
+ java/nio \
+ sun/nio
+
+jdk_net = \
+ java/net \
+ com/sun/net \
+ com/oracle/net \
+ sun/net
+
+jdk_time = \
+ java/time
+
+jdk_rmi = \
+ java/rmi \
+ javax/rmi/ssl \
+ sun/rmi
+
+jdk_security1 = \
+ java/security
+
+jdk_security2 = \
+ javax/crypto \
+ javax/xml/crypto \
+ com/sun/crypto
+
+jdk_security3 = \
+ javax/security \
+ com/sun/security \
+ com/sun/org/apache/xml/internal/security \
+ com/oracle/security \
+ sun/security \
+ lib/security
+
+jdk_security = \
+ :jdk_security1 \
+ :jdk_security2 \
+ :jdk_security3
+
+jdk_text = \
+ java/text \
+ sun/text
+
+jdk_management = \
+ java/lang/management \
+ com/sun/management \
+ sun/management
+
+jdk_instrument = \
+ java/lang/instrument
+
+jdk_jmx = \
+ javax/management \
+ com/sun/jmx
+
+jdk_jdi = \
+ com/sun/jdi
+
+#
+# Tool (and tool API) tests are split into core and svc groups
+#
+core_tools = \
+ tools \
+ com/sun/tools/extcheck \
+ sun/tools/java \
+ sun/tools/native2ascii \
+ sun/tools/jrunscript
+
+svc_tools = \
+ com/sun/tools/attach \
+ com/sun/tracing \
+ sun/tools \
+ -sun/tools/java \
+ -sun/tools/native2ascii \
+ -sun/tools/jrunscript \
+ sun/jvmstat \
+ demo/jvmti
+
+jdk_tools = \
+ :core_tools \
+ :svc_tools
+
+#
+# Catch-all for other areas with a small number of tests
+#
+jdk_other = \
+ java/sql \
+ javax/sql \
+ javax/naming \
+ javax/script \
+ javax/smartcardio \
+ javax/xml \
+ -javax/xml/crypto \
+ jdk/asm \
+ jdk/lambda \
+ com/sun/jndi \
+ com/sun/corba \
+ lib/testlibrary \
+ demo/zipfs \
+ sample
+
+#
+# SCTP is its own group as it is highly sensitive to kernel/network config
+#
+jdk_sctp = \
+ com/sun/nio/sctp
+
+
+#
+# core group to run all core area tests
+#
+jdk_core = \
+ :jdk_lang \
+ :jdk_util \
+ :jdk_math \
+ :jdk_io \
+ :jdk_nio \
+ :jdk_net \
+ :jdk_rmi \
+ :jdk_time \
+ :jdk_security \
+ :jdk_text \
+ :core_tools \
+ :jdk_other
+
+#
+# svc group to run all serviceability area tests
+#
+jdk_svc = \
+ :jdk_management \
+ :jdk_instrument \
+ :jdk_jmx \
+ :jdk_jdi \
+ :svc_tools
+
+#############################
+
+#
+# Client area groups
+#
+
+jdk_awt = \
+ java/awt \
+ com/sun/awt \
+ com/apple/eawt \
+ sun/awt
+
+jdk_2d = \
+ javax/print \
+ sun/pisces \
+ sun/java2d
+
+jdk_beans = \
+ java/beans
+
+jdk_swing = \
+ javax/accessibility \
+ javax/swing \
+ com/sun/java/swing
+
+jdk_sound = \
+ javax/sound
+
+jdk_imageio = \
+ javax/imageio
+
+jdk_desktop = \
+ :jdk_awt \
+ :jdk_2d \
+ :jdk_beans \
+ :jdk_swing \
+ :jdk_sound \
+ :jdk_imageio
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/io/BufferedInputStream/LargeCopyWithMark.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,117 @@
+/*
+ * 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 7129312
+ * @summary BufferedInputStream calculates negative array size with large
+ * streams and mark
+ * @library /lib/testlibrary
+ * @run main/othervm LargeCopyWithMark
+ */
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import static jdk.testlibrary.ProcessTools.*;
+
+
+public class LargeCopyWithMark {
+
+ public static void main(String[] args) throws Exception {
+ if (! System.getProperty("os.arch").contains("64")) {
+ System.out.println("Test runs on 64 bit platforms");
+ return;
+ }
+ ProcessBuilder pb = createJavaProcessBuilder("-Xmx4G",
+ "-ea:LargeCopyWithMark$Child",
+ "LargeCopyWithMark$Child");
+ int res = pb.inheritIO().start().waitFor();
+ if (res != 0) {
+ throw new AssertionError("Test failed: exit code = " + res);
+ }
+ }
+
+ public static class Child {
+ static final int BUFF_SIZE = 8192;
+ static final int BIS_BUFF_SIZE = Integer.MAX_VALUE / 2 + 100;
+ static final long BYTES_TO_COPY = 2L * Integer.MAX_VALUE;
+
+ static {
+ assert BIS_BUFF_SIZE * 2 < 0 : "doubling must overflow";
+ }
+
+ public static void main(String[] args) throws Exception {
+ byte[] buff = new byte[BUFF_SIZE];
+
+ try (InputStream myis = new MyInputStream(BYTES_TO_COPY);
+ InputStream bis = new BufferedInputStream(myis, BIS_BUFF_SIZE);
+ OutputStream myos = new MyOutputStream()) {
+
+ // will require a buffer bigger than BIS_BUFF_SIZE
+ bis.mark(BIS_BUFF_SIZE + 100);
+
+ for (;;) {
+ int count = bis.read(buff, 0, BUFF_SIZE);
+ if (count == -1)
+ break;
+ myos.write(buff, 0, count);
+ }
+ } catch (java.lang.NegativeArraySizeException e) {
+ e.printStackTrace();
+ System.exit(11);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
+
+class MyInputStream extends InputStream {
+ private long bytesLeft;
+ public MyInputStream(long bytesLeft) {
+ this.bytesLeft = bytesLeft;
+ }
+ @Override public int read() throws IOException {
+ return 0;
+ }
+ @Override public int read(byte[] b) throws IOException {
+ return read(b, 0, b.length);
+ }
+ @Override public int read(byte[] b, int off, int len) throws IOException {
+ if (bytesLeft <= 0)
+ return -1;
+ long result = Math.min(bytesLeft, (long)len);
+ bytesLeft -= result;
+ return (int)result;
+ }
+ @Override public int available() throws IOException {
+ return (bytesLeft > 0) ? 1 : 0;
+ }
+}
+
+class MyOutputStream extends OutputStream {
+ @Override public void write(int b) throws IOException {}
+ @Override public void write(byte[] b) throws IOException {}
+ @Override public void write(byte[] b, int off, int len) throws IOException {}
+}
--- a/jdk/test/java/io/File/MaxPathLength.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/io/File/MaxPathLength.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -27,6 +27,7 @@
*/
import java.io.*;
+import java.nio.file.Files;
public class MaxPathLength {
private static String sep = File.separator;
@@ -87,10 +88,8 @@
System.err.println("Warning: Test directory structure exists already!");
return;
}
- boolean couldMakeTestDirectory = dirFile.mkdirs();
- if (!couldMakeTestDirectory) {
- throw new RuntimeException ("Could not create test directory structure");
- }
+ Files.createDirectories(dirFile.toPath());
+
try {
if (tryAbsolute)
dirFile = new File(dirFile.getCanonicalPath());
--- a/jdk/test/java/io/pathNames/General.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/io/pathNames/General.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,7 @@
import java.io.*;
import java.util.*;
+import java.nio.file.*;
public class General {
@@ -57,7 +58,7 @@
for (int i = 0; i < dl.length; i++) {
File f = new File(subdir, dl[i]);
File df = new File(dir, f.getPath());
- if (df.exists() && df.isFile()) {
+ if (Files.isRegularFile(df.toPath(), LinkOption.NOFOLLOW_LINKS)) {
return f.getPath();
}
}
@@ -65,7 +66,7 @@
File f = (subdir.length() == 0) ? new File(dl[i])
: new File(subdir, dl[i]);
File df = new File(dir, f.getPath());
- if (df.exists() && df.isDirectory()) {
+ if (Files.isDirectory(df.toPath(), LinkOption.NOFOLLOW_LINKS)) {
String[] dl2 = df.list();
if (dl2 != null) {
String ff = findSomeFile(dir, f.getPath(), dl2);
@@ -90,7 +91,7 @@
}
for (int i = 0; i < dl.length; i++) {
File f = new File(dir, dl[i]);
- if (f.isFile()) {
+ if (Files.isRegularFile(f.toPath(), LinkOption.NOFOLLOW_LINKS)) {
return dl[i];
}
}
@@ -127,7 +128,7 @@
}
for (int i = 0; i < dl.length; i++) {
File f = new File(d, dl[i]);
- if (f.isDirectory()) {
+ if (Files.isDirectory(f.toPath(), LinkOption.NOFOLLOW_LINKS)) {
String[] dl2 = f.list();
if (dl2 == null || dl2.length >= 250) {
/* Heuristic to avoid scanning huge directories */
@@ -314,7 +315,7 @@
/* Normal name */
if (f.exists()) {
- if (f.isDirectory() && f.list() != null) {
+ if (Files.isDirectory(f.toPath(), LinkOption.NOFOLLOW_LINKS) && f.list() != null) {
if ((n = findSomeFile(ans, create)) != null)
checkSlashes(d, create, ans + n, ask + n);
if ((n = findSomeDir(ans, create)) != null)
--- a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 6741606 7146431 8000450
+ * @bug 6741606 7146431 8000450 8019830
* @summary Make sure all restricted packages listed in the package.access
* property in the java.security file are blocked
* @run main/othervm CheckPackageAccess
@@ -54,6 +54,7 @@
"com.sun.imageio.",
"com.sun.istack.internal.",
"com.sun.jmx.",
+ "com.sun.media.sound.",
"com.sun.proxy.",
"com.sun.org.apache.bcel.internal.",
"com.sun.org.apache.regexp.internal.",
--- a/jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,6 +28,9 @@
*/
import java.lang.annotation.Retention;
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
@@ -66,17 +69,6 @@
}
}
- static void dumpState(Task task) {
- System.err.println(
- "Task[" + task.getName() + "].state: " +
- task.getState() + " ..."
- );
- for (StackTraceElement ste : task.getStackTrace()) {
- System.err.println("\tat " + ste);
- }
- System.err.println();
- }
-
public static void main(String[] args) throws Exception {
CountDownLatch prepareLatch = new CountDownLatch(2);
AtomicInteger goLatch = new AtomicInteger(1);
@@ -88,18 +80,22 @@
prepareLatch.await();
// let them go
goLatch.set(0);
- // attempt to join them
- taskA.join(5000L);
- taskB.join(5000L);
-
- if (taskA.isAlive() || taskB.isAlive()) {
- dumpState(taskA);
- dumpState(taskB);
- throw new IllegalStateException(
- taskA.getState() == Thread.State.BLOCKED &&
- taskB.getState() == Thread.State.BLOCKED
- ? "deadlock detected"
- : "unexpected condition");
+ // obtain ThreadMXBean
+ ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
+ // wait for threads to finish or dead-lock
+ while (taskA.isAlive() || taskB.isAlive()) {
+ // attempt to join threads
+ taskA.join(500L);
+ taskB.join(500L);
+ // detect dead-lock
+ long[] deadlockedIds = threadBean.findMonitorDeadlockedThreads();
+ if (deadlockedIds != null && deadlockedIds.length > 0) {
+ StringBuilder sb = new StringBuilder("deadlock detected:\n\n");
+ for (ThreadInfo ti : threadBean.getThreadInfo(deadlockedIds, Integer.MAX_VALUE)) {
+ sb.append(ti);
+ }
+ throw new IllegalStateException(sb.toString());
+ }
}
}
}
--- a/jdk/test/java/lang/annotation/TypeAnnotationReflection.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/lang/annotation/TypeAnnotationReflection.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8004698 8007073
+ * @bug 8004698 8007073 8022343
* @summary Unit test for type annotations
*/
@@ -58,7 +58,7 @@
}
private static void testSuper() throws Exception {
- check(Object.class.getAnnotatedSuperclass().getAnnotations().length == 0);
+ check(Object.class.getAnnotatedSuperclass() == null);
check(Class.class.getAnnotatedSuperclass().getAnnotations().length == 0);
AnnotatedType a;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java Fri Sep 06 15:09:44 2013 -0700
@@ -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.
+ */
+
+/*
+ * @test
+ * @bug 8022343
+ * @summary make sure Class.getAnnotatedSuperclass() returns null when specified to do so
+ */
+
+public class GetAnnotatedSuperclass {
+ private static final Class<?>[] testData = {
+ Object.class,
+ If.class,
+ Object[].class,
+ void.class,
+ int.class,
+ };
+
+ public static void main(String[] args) throws Exception {
+ int failed = 0;
+ for (Class<?> toTest : testData) {
+ Object res = toTest.getAnnotatedSuperclass();
+
+ if (res != null) {
+ failed++;
+ System.out.println(toTest + ".getAnnotatedSuperclass() returns: "
+ + res + ", should be null");
+ }
+ }
+
+ if (failed != 0)
+ throw new RuntimeException("Test failed, check log for details");
+ }
+
+ interface If {}
+}
--- a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,10 +33,10 @@
* @author Mandy Chung
*
* @build ResetPeakMemoryUsage MemoryUtil
- * @run main/othervm -XX:+UseSerialGC -XX:MarkSweepAlwaysCompactCount=1 -Xmn8m ResetPeakMemoryUsage
- * @run main/othervm -XX:+UseConcMarkSweepGC -Xmn8m ResetPeakMemoryUsage
- * @run main/othervm -XX:+UseParallelGC -Xmn8m ResetPeakMemoryUsage
- * @run main/othervm -XX:+UseG1GC -Xmn8m -XX:G1HeapRegionSize=1m ResetPeakMemoryUsage
+ * @run main/othervm -XX:+PrintGCDetails -XX:+UseSerialGC -Xms256m -XX:MarkSweepAlwaysCompactCount=1 -Xmn8m ResetPeakMemoryUsage
+ * @run main/othervm -XX:+PrintGCDetails -XX:+UseConcMarkSweepGC -Xms256m -Xmn8m ResetPeakMemoryUsage
+ * @run main/othervm -XX:+PrintGCDetails -XX:+UseParallelGC -Xms256m -Xmn8m ResetPeakMemoryUsage
+ * @run main/othervm -XX:+PrintGCDetails -XX:+UseG1GC -Xms256m -Xmn8m -XX:G1HeapRegionSize=1m ResetPeakMemoryUsage
*/
import java.lang.management.*;
--- a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java Fri Sep 06 15:09:44 2013 -0700
@@ -22,7 +22,7 @@
*/
/*
* @test
- * @bug 4904082 4917089 6337226
+ * @bug 4904082 4917089 6337226 6378503
* @summary Tests that integral division and related methods return the proper result and scale.
* @author Joseph D. Darcy
*/
@@ -47,6 +47,9 @@
{new BigDecimal("400e1"), new BigDecimal("5"), new BigDecimal("80e1")},
{new BigDecimal("400e1"), new BigDecimal("4.999999999"), new BigDecimal("8e2")},
{new BigDecimal("40e2"), new BigDecimal("5"), new BigDecimal("8e2")},
+ {BigDecimal.valueOf(1, Integer.MIN_VALUE),
+ BigDecimal.valueOf(1, -(Integer.MAX_VALUE & 0x7fffff00)),
+ BigDecimal.valueOf(1, -256)},
};
for(BigDecimal [] testCase: moreTestCases) {
--- a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/nio/file/WatchService/SensitivityModifier.java Fri Sep 06 15:09:44 2013 -0700
@@ -54,60 +54,66 @@
@SuppressWarnings("unchecked")
static void doTest(Path top) throws Exception {
FileSystem fs = top.getFileSystem();
- WatchService watcher = fs.newWatchService();
+ try (WatchService watcher = fs.newWatchService()) {
- // create directories and files
- int nDirs = 5 + rand.nextInt(20);
- int nFiles = 50 + rand.nextInt(50);
- Path[] dirs = new Path[nDirs];
- Path[] files = new Path[nFiles];
- for (int i=0; i<nDirs; i++) {
- dirs[i] = Files.createDirectory(top.resolve("dir" + i));
- }
- for (int i=0; i<nFiles; i++) {
- Path dir = dirs[rand.nextInt(nDirs)];
- files[i] = Files.createFile(dir.resolve("file" + i));
- }
+ // create directories and files
+ int nDirs = 5 + rand.nextInt(20);
+ int nFiles = 50 + rand.nextInt(50);
+ Path[] dirs = new Path[nDirs];
+ Path[] files = new Path[nFiles];
+ for (int i=0; i<nDirs; i++) {
+ dirs[i] = Files.createDirectory(top.resolve("dir" + i));
+ }
+ for (int i=0; i<nFiles; i++) {
+ Path dir = dirs[rand.nextInt(nDirs)];
+ files[i] = Files.createFile(dir.resolve("file" + i));
+ }
- // register the directories (random sensitivity)
- register(dirs, watcher);
+ // register the directories (random sensitivity)
+ register(dirs, watcher);
- // sleep a bit here to ensure that modification to the first file
- // can be detected by polling implementations (ie: last modified time
- // may not change otherwise).
- try { Thread.sleep(1000); } catch (InterruptedException e) { }
+ // sleep a bit here to ensure that modification to the first file
+ // can be detected by polling implementations (ie: last modified time
+ // may not change otherwise).
+ try { Thread.sleep(1000); } catch (InterruptedException e) { }
- // modify files and check that events are received
- for (int i=0; i<10; i++) {
- Path file = files[rand.nextInt(nFiles)];
- System.out.println("Modify: " + file);
- try (OutputStream out = Files.newOutputStream(file)) {
- out.write(new byte[100]);
+ // modify files and check that events are received
+ for (int i=0; i<10; i++) {
+ Path file = files[rand.nextInt(nFiles)];
+ System.out.println("Modify: " + file);
+ try (OutputStream out = Files.newOutputStream(file)) {
+ out.write(new byte[100]);
+ }
+
+ System.out.println("Waiting for event(s)...");
+ boolean eventReceived = false;
+ WatchKey key = watcher.take();
+ do {
+ for (WatchEvent<?> event: key.pollEvents()) {
+ if (event.kind() != ENTRY_MODIFY)
+ throw new RuntimeException("Unexpected event: " + event);
+ Path name = ((WatchEvent<Path>)event).context();
+ if (name.equals(file.getFileName())) {
+ eventReceived = true;
+ break;
+ }
+ }
+ key.reset();
+ key = watcher.poll(1, TimeUnit.SECONDS);
+ } while (key != null && !eventReceived);
+
+ // we should have received at least one ENTRY_MODIFY event
+ if (eventReceived) {
+ System.out.println("Event OK");
+ } else {
+ throw new RuntimeException("No ENTRY_MODIFY event received for " + file);
+ }
+
+ // re-register the directories to force changing their sensitivity
+ // level
+ register(dirs, watcher);
}
- System.out.println("Waiting for event...");
- WatchKey key = watcher.take();
- WatchEvent<?> event = key.pollEvents().iterator().next();
- if (event.kind() != ENTRY_MODIFY)
- throw new RuntimeException("Unexpected event: " + event);
- Path name = ((WatchEvent<Path>)event).context();
- if (!name.equals(file.getFileName()))
- throw new RuntimeException("Unexpected context: " + name);
- System.out.println("Event OK");
-
- // drain events (to avoid interference)
- do {
- key.pollEvents();
- key.reset();
- key = watcher.poll(1, TimeUnit.SECONDS);
- } while (key != null);
-
- // re-register the directories to force changing their sensitivity
- // level
- register(dirs, watcher);
}
-
- // done
- watcher.close();
}
public static void main(String[] args) throws Exception {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Arrays/TimSortStackSize.java Fri Sep 06 15:09:44 2013 -0700
@@ -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 8011944
+ * @summary Test TimSort stack size
+ */
+import java.util.Arrays;
+import java.util.ArrayDeque;
+
+public class TimSortStackSize {
+
+ public static void main(String[] args) {
+ testComparableTimSort();
+ testTimSort();
+ }
+
+ static void testComparableTimSort() {
+ System.out.printf("testComparableTimSort()%n");
+ Arrays.sort(genData());
+ }
+
+ static void testTimSort() {
+ System.out.printf("testTimSort()%n");
+ Arrays.sort(genData(), Integer::compare);
+ }
+
+ private static final int MIN = 16;
+
+ private static final int BOUND1 = 2 * MIN + 1;
+ private static final int BOUND2 = BOUND1 + MIN + 2;
+ private static final int BOUND3 = BOUND1 + 1 + BOUND2;
+ private static final int BOUND4 = BOUND2 + 1 + BOUND3;
+ private static final int BOUND5 = BOUND3 + 1 + BOUND4;
+
+ static int build(int size, int B, ArrayDeque<Integer> chunks) {
+ chunks.addFirst(B);
+ if (size < BOUND1) {
+ chunks.addFirst(size);
+ return size;
+ }
+
+ int asize = (size + 2) / 2;
+ if (size >= BOUND2 && asize < BOUND1) {
+ asize = BOUND1;
+ } else if (size >= BOUND3 && asize < BOUND2) {
+ asize = BOUND2;
+ } else if (size >= BOUND4 && asize < BOUND3) {
+ asize = BOUND3;
+ } else if (size >= BOUND5 && asize < BOUND4) {
+ asize = BOUND4;
+ }
+ if (size - asize >= B) {
+ throw new AssertionError(" " + size + " , " + asize + " , " + B);
+ }
+ return build(asize, size - asize, chunks);
+ }
+
+ static Integer[] genData() {
+ ArrayDeque<Integer> chunks = new ArrayDeque<Integer>();
+ chunks.addFirst(MIN);
+
+ int B = MIN + 4;
+ int A = B + MIN + 1;
+
+ for (int i = 0; i < 8; i++) {
+ int eps = build(A, B, chunks);
+ B = B + A + 1;
+ A = B + eps + 1;
+ }
+ chunks.addFirst(B);
+ chunks.addFirst(A);
+ int total = 0;
+ for (Integer len : chunks) {
+ total += len;
+ }
+ int pow = MIN;
+ while (pow < total) {
+ pow += pow;
+ }
+ chunks.addLast(pow - total);
+ System.out.println(" Total: " + total);
+ Integer[] array = new Integer[pow];
+ int off = 0;
+ int pos = 0;
+ for (Integer len : chunks) {
+ for (int i = 0; i < len; i++) {
+ array[pos++] = Integer.valueOf(i == 0 ? 0 : 1);
+ }
+ off++;
+ }
+ return array;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Collections/Wrappers.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,146 @@
+/*
+ * 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
+ * @run testng Wrappers
+ * @summary Ensure Collections wrapping classes provide non-default implementations
+ */
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.testng.annotations.Test;
+import org.testng.annotations.DataProvider;
+
+import static org.testng.Assert.assertFalse;
+
+@Test(groups = "unit")
+public class Wrappers {
+ static Object[][] collections;
+
+ @DataProvider(name="collections")
+ public static Object[][] collectionCases() {
+ if (collections != null) {
+ return collections;
+ }
+
+ List<Object[]> cases = new ArrayList<>();
+ LinkedList<Integer> seedList = new LinkedList<>();
+ ArrayList<Integer> seedRandomAccess = new ArrayList<>();
+ TreeSet<Integer> seedSet = new TreeSet<>();
+ TreeMap<Integer, Integer> seedMap = new TreeMap<>();
+
+ for (int i = 1; i <= 10; i++) {
+ seedList.add(i);
+ seedRandomAccess.add(i);
+ seedSet.add(i);
+ seedMap.put(i, i);
+ }
+
+ cases.add(new Object[] { Collections.unmodifiableCollection(seedList) });
+ cases.add(new Object[] { Collections.unmodifiableList(seedList) });
+ cases.add(new Object[] { Collections.unmodifiableList(seedRandomAccess) });
+ cases.add(new Object[] { Collections.unmodifiableSet(seedSet) });
+ cases.add(new Object[] { Collections.unmodifiableSortedSet(seedSet) });
+ cases.add(new Object[] { Collections.unmodifiableNavigableSet(seedSet) });
+
+ // As sets from map also need to be unmodifiable, thus a wrapping
+ // layer exist and should not have default methods
+ cases.add(new Object[] { Collections.unmodifiableMap(seedMap).entrySet() });
+ cases.add(new Object[] { Collections.unmodifiableMap(seedMap).keySet() });
+ cases.add(new Object[] { Collections.unmodifiableMap(seedMap).values() });
+ cases.add(new Object[] { Collections.unmodifiableSortedMap(seedMap).entrySet() });
+ cases.add(new Object[] { Collections.unmodifiableSortedMap(seedMap).keySet() });
+ cases.add(new Object[] { Collections.unmodifiableSortedMap(seedMap).values() });
+ cases.add(new Object[] { Collections.unmodifiableNavigableMap(seedMap).entrySet() });
+ cases.add(new Object[] { Collections.unmodifiableNavigableMap(seedMap).keySet() });
+ cases.add(new Object[] { Collections.unmodifiableNavigableMap(seedMap).values() });
+
+ // Synchronized
+ cases.add(new Object[] { Collections.synchronizedCollection(seedList) });
+ cases.add(new Object[] { Collections.synchronizedList(seedList) });
+ cases.add(new Object[] { Collections.synchronizedList(seedRandomAccess) });
+ cases.add(new Object[] { Collections.synchronizedSet(seedSet) });
+ cases.add(new Object[] { Collections.synchronizedSortedSet(seedSet) });
+ cases.add(new Object[] { Collections.synchronizedNavigableSet(seedSet) });
+
+ // As sets from map also need to be synchronized on the map, thus a
+ // wrapping layer exist and should not have default methods
+ cases.add(new Object[] { Collections.synchronizedMap(seedMap).entrySet() });
+ cases.add(new Object[] { Collections.synchronizedMap(seedMap).keySet() });
+ cases.add(new Object[] { Collections.synchronizedMap(seedMap).values() });
+ cases.add(new Object[] { Collections.synchronizedSortedMap(seedMap).entrySet() });
+ cases.add(new Object[] { Collections.synchronizedSortedMap(seedMap).keySet() });
+ cases.add(new Object[] { Collections.synchronizedSortedMap(seedMap).values() });
+ cases.add(new Object[] { Collections.synchronizedNavigableMap(seedMap).entrySet() });
+ cases.add(new Object[] { Collections.synchronizedNavigableMap(seedMap).keySet() });
+ cases.add(new Object[] { Collections.synchronizedNavigableMap(seedMap).values() });
+
+ // Checked
+ cases.add(new Object[] { Collections.checkedCollection(seedList, Integer.class) });
+ cases.add(new Object[] { Collections.checkedList(seedList, Integer.class) });
+ cases.add(new Object[] { Collections.checkedList(seedRandomAccess, Integer.class) });
+ cases.add(new Object[] { Collections.checkedSet(seedSet, Integer.class) });
+ cases.add(new Object[] { Collections.checkedSortedSet(seedSet, Integer.class) });
+ cases.add(new Object[] { Collections.checkedNavigableSet(seedSet, Integer.class) });
+ cases.add(new Object[] { Collections.checkedQueue(seedList, Integer.class) });
+
+ // asLifoQueue is another wrapper
+ cases.add(new Object[] { Collections.asLifoQueue(seedList) });
+
+ collections = cases.toArray(new Object[0][]);
+ return collections;
+ }
+
+ static Method[] defaultMethods;
+
+ static {
+ List<Method> list = new ArrayList<>();
+ Method[] methods = Collection.class.getMethods();
+ for (Method m: methods) {
+ if (m.isDefault()) {
+ list.add(m);
+ }
+ }
+ defaultMethods = list.toArray(new Method[0]);
+ }
+
+ @Test(dataProvider = "collections")
+ public static void testAllDefaultMethodsOverridden(Collection c) throws NoSuchMethodException {
+ Class cls = c.getClass();
+ for (Method m: defaultMethods) {
+ Method m2 = cls.getMethod(m.getName(), m.getParameterTypes());
+ // default had been override
+ assertFalse(m2.isDefault(), cls.getCanonicalName());
+ }
+ }
+}
+
--- a/jdk/test/java/util/Comparator/BasicTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/util/Comparator/BasicTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -90,7 +90,7 @@
Thing[] things = new Thing[intValues.length];
for (int i=0; i<intValues.length; i++)
things[i] = new Thing(intValues[i], 0L, 0.0, null);
- Comparator<Thing> comp = Comparator.comparing(new ToIntFunction<Thing>() {
+ Comparator<Thing> comp = Comparator.comparingInt(new ToIntFunction<Thing>() {
@Override
public int applyAsInt(Thing thing) {
return thing.getIntField();
@@ -104,7 +104,7 @@
Thing[] things = new Thing[longValues.length];
for (int i=0; i<longValues.length; i++)
things[i] = new Thing(0, longValues[i], 0.0, null);
- Comparator<Thing> comp = Comparator.comparing(new ToLongFunction<Thing>() {
+ Comparator<Thing> comp = Comparator.comparingLong(new ToLongFunction<Thing>() {
@Override
public long applyAsLong(Thing thing) {
return thing.getLongField();
@@ -118,7 +118,7 @@
Thing[] things = new Thing[doubleValues.length];
for (int i=0; i<doubleValues.length; i++)
things[i] = new Thing(0, 0L, doubleValues[i], null);
- Comparator<Thing> comp = Comparator.comparing(new ToDoubleFunction<Thing>() {
+ Comparator<Thing> comp = Comparator.comparingDouble(new ToDoubleFunction<Thing>() {
@Override
public double applyAsDouble(Thing thing) {
return thing.getDoubleField();
@@ -211,8 +211,8 @@
};
public void testComparatorDefaultMethods() {
- Comparator<People> cmp = Comparator.comparing((Function<People, String>) People::getFirstName);
- Comparator<People> cmp2 = Comparator.comparing((Function<People, String>) People::getLastName);
+ Comparator<People> cmp = Comparator.comparing(People::getFirstName);
+ Comparator<People> cmp2 = Comparator.comparing(People::getLastName);
// reverseOrder
assertComparison(cmp.reversed(), people[1], people[0]);
// thenComparing(Comparator)
@@ -222,20 +222,20 @@
assertComparison(cmp.thenComparing(People::getLastName), people[0], people[1]);
assertComparison(cmp.thenComparing(People::getLastName), people[4], people[0]);
// thenComparing(ToIntFunction)
- assertComparison(cmp.thenComparing(People::getAge), people[0], people[1]);
- assertComparison(cmp.thenComparing(People::getAge), people[1], people[5]);
+ assertComparison(cmp.thenComparingInt(People::getAge), people[0], people[1]);
+ assertComparison(cmp.thenComparingInt(People::getAge), people[1], people[5]);
// thenComparing(ToLongFunction)
- assertComparison(cmp.thenComparing(People::getAgeAsLong), people[0], people[1]);
- assertComparison(cmp.thenComparing(People::getAgeAsLong), people[1], people[5]);
+ assertComparison(cmp.thenComparingLong(People::getAgeAsLong), people[0], people[1]);
+ assertComparison(cmp.thenComparingLong(People::getAgeAsLong), people[1], people[5]);
// thenComparing(ToDoubleFunction)
- assertComparison(cmp.thenComparing(People::getAgeAsDouble), people[0], people[1]);
- assertComparison(cmp.thenComparing(People::getAgeAsDouble), people[1], people[5]);
+ assertComparison(cmp.thenComparingDouble(People::getAgeAsDouble), people[0], people[1]);
+ assertComparison(cmp.thenComparingDouble(People::getAgeAsDouble), people[1], people[5]);
}
public void testNullsFirst() {
Comparator<String> strcmp = Comparator.nullsFirst(Comparator.naturalOrder());
- Comparator<People> cmp = Comparator.<People, String>comparing(People::getLastName, strcmp)
+ Comparator<People> cmp = Comparator.comparing(People::getLastName, strcmp)
.thenComparing(People::getFirstName, strcmp);
// Mary.null vs Mary.Cook - solve by last name
assertComparison(cmp, people[6], people[5]);
@@ -243,7 +243,7 @@
assertComparison(cmp, people[7], people[6]);
// More than one thenComparing
- strcmp = Comparator.nullsFirst(Comparator.comparing((ToIntFunction<String>) String::length)
+ strcmp = Comparator.nullsFirst(Comparator.comparingInt(String::length)
.thenComparing(String.CASE_INSENSITIVE_ORDER));
assertComparison(strcmp, null, "abc");
assertComparison(strcmp, "ab", "abc");
@@ -273,7 +273,7 @@
public void testNullsLast() {
Comparator<String> strcmp = Comparator.nullsLast(Comparator.naturalOrder());
- Comparator<People> cmp = Comparator.<People, String>comparing(People::getLastName, strcmp)
+ Comparator<People> cmp = Comparator.comparing(People::getLastName, strcmp)
.thenComparing(People::getFirstName, strcmp);
// Mary.null vs Mary.Cook - solve by last name
assertComparison(cmp, people[5], people[6]);
@@ -281,7 +281,7 @@
assertComparison(cmp, people[7], people[6]);
// More than one thenComparing
- strcmp = Comparator.nullsLast(Comparator.comparing((ToIntFunction<String>) String::length)
+ strcmp = Comparator.nullsLast(Comparator.comparingInt(String::length)
.thenComparing(String.CASE_INSENSITIVE_ORDER));
assertComparison(strcmp, "abc", null);
assertComparison(strcmp, "ab", "abc");
@@ -341,28 +341,28 @@
} catch (NullPointerException npe) {}
try {
- Comparator<People> cmp = Comparator.comparing((Function<People, String>) null, Comparator.<String>naturalOrder());
+ Comparator<People> cmp = Comparator.comparing(null, Comparator.<String>naturalOrder());
fail("comparing(null, cmp) should throw NPE");
} catch (NullPointerException npe) {}
try {
- Comparator<People> cmp = Comparator.comparing((Function<People, String>) People::getFirstName, null);
+ Comparator<People> cmp = Comparator.comparing(People::getFirstName, null);
fail("comparing(f, null) should throw NPE");
} catch (NullPointerException npe) {}
try {
- Comparator<People> cmp = Comparator.comparing((Function<People, String>) null);
+ Comparator<People> cmp = Comparator.comparing(null);
fail("comparing(null) should throw NPE");
} catch (NullPointerException npe) {}
try {
- Comparator<People> cmp = Comparator.comparing((ToIntFunction<People>) null);
+ Comparator<People> cmp = Comparator.comparingInt(null);
fail("comparing(null) should throw NPE");
} catch (NullPointerException npe) {}
try {
- Comparator<People> cmp = Comparator.comparing((ToLongFunction<People>) null);
+ Comparator<People> cmp = Comparator.comparingLong(null);
fail("comparing(null) should throw NPE");
} catch (NullPointerException npe) {}
try {
- Comparator<People> cmp = Comparator.comparing((ToDoubleFunction<People>) null);
+ Comparator<People> cmp = Comparator.comparingDouble(null);
fail("comparing(null) should throw NPE");
} catch (NullPointerException npe) {}
}
--- a/jdk/test/java/util/Map/EntryComparators.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/util/Map/EntryComparators.java Fri Sep 06 15:09:44 2013 -0700
@@ -115,8 +115,8 @@
// Comparator<People> cmp = Comparator.naturalOrder(); // Should fail to compiler as People is not comparable
// We can use simple comparator, but those have been tested above.
// Thus choose to do compose for some level of interation.
- Comparator<People> cmp1 = Comparator.comparing((Function<People, String>) People::getFirstName);
- Comparator<People> cmp2 = Comparator.comparing((Function<People, String>) People::getLastName);
+ Comparator<People> cmp1 = Comparator.comparing(People::getFirstName);
+ Comparator<People> cmp2 = Comparator.comparing(People::getLastName);
Comparator<People> cmp = cmp1.thenComparing(cmp2);
assertPairComparison(people[0], people[0], people[1], people[1],
--- a/jdk/test/java/util/Random/RandomStreamTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/util/Random/RandomStreamTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -82,13 +82,6 @@
assertEquals(destination.size(), count);
}
- @Test(dataProvider = "suppliers")
- public void testRandomGaussianStream(final Random random, final int count) {
- final List<Double> destination = new ArrayList<>(count);
- random.gaussians().limit(count).forEach(destination::add);
- assertEquals(destination.size(), count);
- }
-
@Test
public void testIntStream() {
final long seed = System.currentTimeMillis();
@@ -132,20 +125,6 @@
}
@Test
- public void testGaussianStream() {
- final long seed = System.currentTimeMillis();
- final Random r1 = new Random(seed);
- final double[] a = new double[SIZE];
- for (int i=0; i < SIZE; i++) {
- a[i] = r1.nextGaussian();
- }
-
- final Random r2 = new Random(seed); // same seed
- final double[] b = r2.gaussians().limit(SIZE).toArray();
- assertEquals(a, b);
- }
-
- @Test
public void testThreadLocalIntStream() throws InterruptedException, ExecutionException, TimeoutException {
ThreadLocalRandom tlr = ThreadLocalRandom.current();
testRandomResultSupplierConcurrently(() -> tlr.ints().limit(SIZE).boxed().collect(toList()));
@@ -163,12 +142,6 @@
testRandomResultSupplierConcurrently(() -> tlr.doubles().limit(SIZE).boxed().collect(toList()));
}
- @Test
- public void testThreadLocalGaussianStream() throws InterruptedException, ExecutionException, TimeoutException {
- ThreadLocalRandom tlr = ThreadLocalRandom.current();
- testRandomResultSupplierConcurrently(() -> tlr.gaussians().limit(SIZE).boxed().collect(toList()));
- }
-
<T> void testRandomResultSupplierConcurrently(Supplier<T> s) throws InterruptedException, ExecutionException, TimeoutException {
// Produce 10 completable future tasks
final int tasks = 10;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Random/RandomTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,430 @@
+/*
+ * 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 org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.BiConsumer;
+
+import static org.testng.Assert.*;
+
+/**
+ * @test
+ * @run testng RandomTest
+ * @summary test methods on Random
+ */
+@Test
+public class RandomTest {
+
+ // Note: this test was adapted from the 166 TCK ThreadLocalRandomTest test
+ // and modified to be a TestNG test
+
+ /*
+ * Testing coverage notes:
+ *
+ * We don't test randomness properties, but only that repeated
+ * calls, up to NCALLS tries, produce at least one different
+ * result. For bounded versions, we sample various intervals
+ * across multiples of primes.
+ */
+
+ // max numbers of calls to detect getting stuck on one value
+ static final int NCALLS = 10000;
+
+ // max sampled int bound
+ static final int MAX_INT_BOUND = (1 << 28);
+
+ // max sampled long bound
+ static final long MAX_LONG_BOUND = (1L << 42);
+
+ // Number of replications for other checks
+ static final int REPS = 20;
+
+ /**
+ * Repeated calls to nextInt produce at least two distinct results
+ */
+ public void testNextInt() {
+ Random r = new Random();
+ int f = r.nextInt();
+ int i = 0;
+ while (i < NCALLS && r.nextInt() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextLong produce at least two distinct results
+ */
+ public void testNextLong() {
+ Random r = new Random();
+ long f = r.nextLong();
+ int i = 0;
+ while (i < NCALLS && r.nextLong() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextBoolean produce at least two distinct results
+ */
+ public void testNextBoolean() {
+ Random r = new Random();
+ boolean f = r.nextBoolean();
+ int i = 0;
+ while (i < NCALLS && r.nextBoolean() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextFloat produce at least two distinct results
+ */
+ public void testNextFloat() {
+ Random r = new Random();
+ float f = r.nextFloat();
+ int i = 0;
+ while (i < NCALLS && r.nextFloat() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextDouble produce at least two distinct results
+ */
+ public void testNextDouble() {
+ Random r = new Random();
+ double f = r.nextDouble();
+ int i = 0;
+ while (i < NCALLS && r.nextDouble() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextGaussian produce at least two distinct results
+ */
+ public void testNextGaussian() {
+ Random r = new Random();
+ double f = r.nextGaussian();
+ int i = 0;
+ while (i < NCALLS && r.nextGaussian() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * nextInt(negative) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextIntBoundedNeg() {
+ Random r = new Random();
+ int f = r.nextInt(-17);
+ }
+
+ /**
+ * nextInt(bound) returns 0 <= value < bound; repeated calls produce at
+ * least two distinct results
+ */
+ public void testNextIntBounded() {
+ Random r = new Random();
+ // sample bound space across prime number increments
+ for (int bound = 2; bound < MAX_INT_BOUND; bound += 524959) {
+ int f = r.nextInt(bound);
+ assertTrue(0 <= f && f < bound);
+ int i = 0;
+ int j;
+ while (i < NCALLS &&
+ (j = r.nextInt(bound)) == f) {
+ assertTrue(0 <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+
+ /**
+ * Invoking sized ints, long, doubles, with negative sizes throws
+ * IllegalArgumentException
+ */
+ public void testBadStreamSize() {
+ Random r = new Random();
+ executeAndCatchIAE(() -> r.ints(-1L));
+ executeAndCatchIAE(() -> r.ints(-1L, 2, 3));
+ executeAndCatchIAE(() -> r.longs(-1L));
+ executeAndCatchIAE(() -> r.longs(-1L, -1L, 1L));
+ executeAndCatchIAE(() -> r.doubles(-1L));
+ executeAndCatchIAE(() -> r.doubles(-1L, .5, .6));
+ }
+
+ /**
+ * Invoking bounded ints, long, doubles, with illegal bounds throws
+ * IllegalArgumentException
+ */
+ public void testBadStreamBounds() {
+ Random r = new Random();
+ executeAndCatchIAE(() -> r.ints(2, 1));
+ executeAndCatchIAE(() -> r.ints(10, 42, 42));
+ executeAndCatchIAE(() -> r.longs(-1L, -1L));
+ executeAndCatchIAE(() -> r.longs(10, 1L, -2L));
+
+ testDoubleBadOriginBound((o, b) -> r.doubles(10, o, b));
+ }
+
+ // An arbitrary finite double value
+ static final double FINITE = Math.PI;
+
+ void testDoubleBadOriginBound(BiConsumer<Double, Double> bi) {
+ executeAndCatchIAE(() -> bi.accept(17.0, 2.0));
+ executeAndCatchIAE(() -> bi.accept(0.0, 0.0));
+ executeAndCatchIAE(() -> bi.accept(Double.NaN, FINITE));
+ executeAndCatchIAE(() -> bi.accept(FINITE, Double.NaN));
+ executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY));
+
+ // Returns NaN
+// executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, FINITE));
+// executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY));
+
+ executeAndCatchIAE(() -> bi.accept(FINITE, Double.NEGATIVE_INFINITY));
+
+ // Returns Double.MAX_VALUE
+// executeAndCatchIAE(() -> bi.accept(FINITE, Double.POSITIVE_INFINITY));
+
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY));
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, FINITE));
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY));
+ }
+
+ private void executeAndCatchIAE(Runnable r) {
+ executeAndCatch(IllegalArgumentException.class, r);
+ }
+
+ private void executeAndCatch(Class<? extends Exception> expected, Runnable r) {
+ Exception caught = null;
+ try {
+ r.run();
+ }
+ catch (Exception e) {
+ caught = e;
+ }
+
+ assertNotNull(caught,
+ String.format("No Exception was thrown, expected an Exception of %s to be thrown",
+ expected.getName()));
+ Assert.assertTrue(expected.isInstance(caught),
+ String.format("Exception thrown %s not an instance of %s",
+ caught.getClass().getName(), expected.getName()));
+ }
+
+ /**
+ * A sequential sized stream of ints generates the given number of values
+ */
+ public void testIntsCount() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.ints(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * A sequential sized stream of longs generates the given number of values
+ */
+ public void testLongsCount() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.longs(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * A sequential sized stream of doubles generates the given number of values
+ */
+ public void testDoublesCount() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.doubles(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * Each of a sequential sized stream of bounded ints is within bounds
+ */
+ public void testBoundedInts() {
+ AtomicInteger fails = new AtomicInteger(0);
+ Random r = new Random();
+ long size = 12345L;
+ for (int least = -15485867; least < MAX_INT_BOUND; least += 524959) {
+ for (int bound = least + 2; bound > least && bound < MAX_INT_BOUND; bound += 67867967) {
+ final int lo = least, hi = bound;
+ r.ints(size, lo, hi).
+ forEach(x -> {
+ if (x < lo || x >= hi)
+ fails.getAndIncrement();
+ });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * Each of a sequential sized stream of bounded longs is within bounds
+ */
+ public void testBoundedLongs() {
+ AtomicInteger fails = new AtomicInteger(0);
+ Random r = new Random();
+ long size = 123L;
+ for (long least = -86028121; least < MAX_LONG_BOUND; least += 1982451653L) {
+ for (long bound = least + 2; bound > least && bound < MAX_LONG_BOUND; bound += Math.abs(bound * 7919)) {
+ final long lo = least, hi = bound;
+ r.longs(size, lo, hi).
+ forEach(x -> {
+ if (x < lo || x >= hi)
+ fails.getAndIncrement();
+ });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * Each of a sequential sized stream of bounded doubles is within bounds
+ */
+ public void testBoundedDoubles() {
+ AtomicInteger fails = new AtomicInteger(0);
+ Random r = new Random();
+ long size = 456;
+ for (double least = 0.00011; least < 1.0e20; least *= 9) {
+ for (double bound = least * 1.0011; bound < 1.0e20; bound *= 17) {
+ final double lo = least, hi = bound;
+ r.doubles(size, lo, hi).
+ forEach(x -> {
+ if (x < lo || x >= hi)
+ fails.getAndIncrement();
+ });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * A parallel unsized stream of ints generates at least 100 values
+ */
+ public void testUnsizedIntsCount() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 100;
+ r.ints().limit(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A parallel unsized stream of longs generates at least 100 values
+ */
+ public void testUnsizedLongsCount() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 100;
+ r.longs().limit(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A parallel unsized stream of doubles generates at least 100 values
+ */
+ public void testUnsizedDoublesCount() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 100;
+ r.doubles().limit(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of ints generates at least 100 values
+ */
+ public void testUnsizedIntsCountSeq() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 100;
+ r.ints().limit(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of longs generates at least 100 values
+ */
+ public void testUnsizedLongsCountSeq() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 100;
+ r.longs().limit(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of doubles generates at least 100 values
+ */
+ public void testUnsizedDoublesCountSeq() {
+ LongAdder counter = new LongAdder();
+ Random r = new Random();
+ long size = 100;
+ r.doubles().limit(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/SplittableRandom/SplittableRandomTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,560 @@
+/*
+ * 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 org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.SplittableRandom;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.BiConsumer;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
+/**
+ * @test
+ * @run testng SplittableRandomTest
+ * @run testng/othervm -Djava.util.secureRandomSeed=true SplittableRandomTest
+ * @summary test methods on SplittableRandom
+ */
+@Test
+public class SplittableRandomTest {
+
+ // Note: this test was copied from the 166 TCK SplittableRandomTest test
+ // and modified to be a TestNG test
+
+ /*
+ * Testing coverage notes:
+ *
+ * 1. Many of the test methods are adapted from ThreadLocalRandomTest.
+ *
+ * 2. These tests do not check for random number generator quality.
+ * But we check for minimal API compliance by requiring that
+ * repeated calls to nextX methods, up to NCALLS tries, produce at
+ * least two distinct results. (In some possible universe, a
+ * "correct" implementation might fail, but the odds are vastly
+ * less than that of encountering a hardware failure while running
+ * the test.) For bounded nextX methods, we sample various
+ * intervals across multiples of primes. In other tests, we repeat
+ * under REPS different values.
+ */
+
+ // max numbers of calls to detect getting stuck on one value
+ static final int NCALLS = 10000;
+
+ // max sampled int bound
+ static final int MAX_INT_BOUND = (1 << 28);
+
+ // max sampled long bound
+ static final long MAX_LONG_BOUND = (1L << 42);
+
+ // Number of replications for other checks
+ static final int REPS = 20;
+
+ /**
+ * Repeated calls to nextInt produce at least two distinct results
+ */
+ public void testNextInt() {
+ SplittableRandom sr = new SplittableRandom();
+ int f = sr.nextInt();
+ int i = 0;
+ while (i < NCALLS && sr.nextInt() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextLong produce at least two distinct results
+ */
+ public void testNextLong() {
+ SplittableRandom sr = new SplittableRandom();
+ long f = sr.nextLong();
+ int i = 0;
+ while (i < NCALLS && sr.nextLong() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextDouble produce at least two distinct results
+ */
+ public void testNextDouble() {
+ SplittableRandom sr = new SplittableRandom();
+ double f = sr.nextDouble();
+ int i = 0;
+ while (i < NCALLS && sr.nextDouble() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Two SplittableRandoms created with the same seed produce the
+ * same values for nextLong.
+ */
+ public void testSeedConstructor() {
+ for (long seed = 2; seed < MAX_LONG_BOUND; seed += 15485863) {
+ SplittableRandom sr1 = new SplittableRandom(seed);
+ SplittableRandom sr2 = new SplittableRandom(seed);
+ for (int i = 0; i < REPS; ++i)
+ assertEquals(sr1.nextLong(), sr2.nextLong());
+ }
+ }
+
+ /**
+ * A SplittableRandom produced by split() of a default-constructed
+ * SplittableRandom generates a different sequence
+ */
+ public void testSplit1() {
+ SplittableRandom sr = new SplittableRandom();
+ for (int reps = 0; reps < REPS; ++reps) {
+ SplittableRandom sc = sr.split();
+ int i = 0;
+ while (i < NCALLS && sr.nextLong() == sc.nextLong())
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+ }
+
+ /**
+ * A SplittableRandom produced by split() of a seeded-constructed
+ * SplittableRandom generates a different sequence
+ */
+ public void testSplit2() {
+ SplittableRandom sr = new SplittableRandom(12345);
+ for (int reps = 0; reps < REPS; ++reps) {
+ SplittableRandom sc = sr.split();
+ int i = 0;
+ while (i < NCALLS && sr.nextLong() == sc.nextLong())
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+ }
+
+ /**
+ * nextInt(negative) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextIntBoundedNeg() {
+ SplittableRandom sr = new SplittableRandom();
+ int f = sr.nextInt(-17);
+ }
+
+ /**
+ * nextInt(least >= bound) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextIntBadBounds() {
+ SplittableRandom sr = new SplittableRandom();
+ int f = sr.nextInt(17, 2);
+ }
+
+ /**
+ * nextInt(bound) returns 0 <= value < bound;
+ * repeated calls produce at least two distinct results
+ */
+ public void testNextIntBounded() {
+ SplittableRandom sr = new SplittableRandom();
+ // sample bound space across prime number increments
+ for (int bound = 2; bound < MAX_INT_BOUND; bound += 524959) {
+ int f = sr.nextInt(bound);
+ assertTrue(0 <= f && f < bound);
+ int i = 0;
+ int j;
+ while (i < NCALLS &&
+ (j = sr.nextInt(bound)) == f) {
+ assertTrue(0 <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+
+ /**
+ * nextInt(least, bound) returns least <= value < bound;
+ * repeated calls produce at least two distinct results
+ */
+ public void testNextIntBounded2() {
+ SplittableRandom sr = new SplittableRandom();
+ for (int least = -15485863; least < MAX_INT_BOUND; least += 524959) {
+ for (int bound = least + 2; bound > least && bound < MAX_INT_BOUND; bound += 49979687) {
+ int f = sr.nextInt(least, bound);
+ assertTrue(least <= f && f < bound);
+ int i = 0;
+ int j;
+ while (i < NCALLS &&
+ (j = sr.nextInt(least, bound)) == f) {
+ assertTrue(least <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+ }
+
+ /**
+ * nextLong(negative) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextLongBoundedNeg() {
+ SplittableRandom sr = new SplittableRandom();
+ long f = sr.nextLong(-17);
+ }
+
+ /**
+ * nextLong(least >= bound) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextLongBadBounds() {
+ SplittableRandom sr = new SplittableRandom();
+ long f = sr.nextLong(17, 2);
+ }
+
+ /**
+ * nextLong(bound) returns 0 <= value < bound;
+ * repeated calls produce at least two distinct results
+ */
+ public void testNextLongBounded() {
+ SplittableRandom sr = new SplittableRandom();
+ for (long bound = 2; bound < MAX_LONG_BOUND; bound += 15485863) {
+ long f = sr.nextLong(bound);
+ assertTrue(0 <= f && f < bound);
+ int i = 0;
+ long j;
+ while (i < NCALLS &&
+ (j = sr.nextLong(bound)) == f) {
+ assertTrue(0 <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+
+ /**
+ * nextLong(least, bound) returns least <= value < bound;
+ * repeated calls produce at least two distinct results
+ */
+ public void testNextLongBounded2() {
+ SplittableRandom sr = new SplittableRandom();
+ for (long least = -86028121; least < MAX_LONG_BOUND; least += 982451653L) {
+ for (long bound = least + 2; bound > least && bound < MAX_LONG_BOUND; bound += Math.abs(bound * 7919)) {
+ long f = sr.nextLong(least, bound);
+ assertTrue(least <= f && f < bound);
+ int i = 0;
+ long j;
+ while (i < NCALLS &&
+ (j = sr.nextLong(least, bound)) == f) {
+ assertTrue(least <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+ }
+
+ /**
+ * nextDouble(bound) throws IllegalArgumentException
+ */
+ public void testNextDoubleBadBound() {
+ SplittableRandom sr = new SplittableRandom();
+ executeAndCatchIAE(() -> sr.nextDouble(0.0));
+ executeAndCatchIAE(() -> sr.nextDouble(-0.0));
+ executeAndCatchIAE(() -> sr.nextDouble(+0.0));
+ executeAndCatchIAE(() -> sr.nextDouble(-1.0));
+ executeAndCatchIAE(() -> sr.nextDouble(Double.NaN));
+ executeAndCatchIAE(() -> sr.nextDouble(Double.NEGATIVE_INFINITY));
+
+ // Returns Double.MAX_VALUE
+// executeAndCatchIAE(() -> r.nextDouble(Double.POSITIVE_INFINITY));
+ }
+
+ /**
+ * nextDouble(origin, bound) throws IllegalArgumentException
+ */
+ public void testNextDoubleBadOriginBound() {
+ testDoubleBadOriginBound(new SplittableRandom()::nextDouble);
+ }
+
+ // An arbitrary finite double value
+ static final double FINITE = Math.PI;
+
+ void testDoubleBadOriginBound(BiConsumer<Double, Double> bi) {
+ executeAndCatchIAE(() -> bi.accept(17.0, 2.0));
+ executeAndCatchIAE(() -> bi.accept(0.0, 0.0));
+ executeAndCatchIAE(() -> bi.accept(Double.NaN, FINITE));
+ executeAndCatchIAE(() -> bi.accept(FINITE, Double.NaN));
+ executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY));
+
+ // Returns NaN
+// executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, FINITE));
+// executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY));
+
+ executeAndCatchIAE(() -> bi.accept(FINITE, Double.NEGATIVE_INFINITY));
+
+ // Returns Double.MAX_VALUE
+// executeAndCatchIAE(() -> bi.accept(FINITE, Double.POSITIVE_INFINITY));
+
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY));
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, FINITE));
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY));
+ }
+
+ /**
+ * nextDouble(least, bound) returns least <= value < bound;
+ * repeated calls produce at least two distinct results
+ */
+ public void testNextDoubleBounded2() {
+ SplittableRandom sr = new SplittableRandom();
+ for (double least = 0.0001; least < 1.0e20; least *= 8) {
+ for (double bound = least * 1.001; bound < 1.0e20; bound *= 16) {
+ double f = sr.nextDouble(least, bound);
+ assertTrue(least <= f && f < bound);
+ int i = 0;
+ double j;
+ while (i < NCALLS &&
+ (j = sr.nextDouble(least, bound)) == f) {
+ assertTrue(least <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+ }
+
+ /**
+ * Invoking sized ints, long, doubles, with negative sizes throws
+ * IllegalArgumentException
+ */
+ public void testBadStreamSize() {
+ SplittableRandom r = new SplittableRandom();
+ executeAndCatchIAE(() -> r.ints(-1L));
+ executeAndCatchIAE(() -> r.ints(-1L, 2, 3));
+ executeAndCatchIAE(() -> r.longs(-1L));
+ executeAndCatchIAE(() -> r.longs(-1L, -1L, 1L));
+ executeAndCatchIAE(() -> r.doubles(-1L));
+ executeAndCatchIAE(() -> r.doubles(-1L, .5, .6));
+ }
+
+ /**
+ * Invoking bounded ints, long, doubles, with illegal bounds throws
+ * IllegalArgumentException
+ */
+ public void testBadStreamBounds() {
+ SplittableRandom r = new SplittableRandom();
+ executeAndCatchIAE(() -> r.ints(2, 1));
+ executeAndCatchIAE(() -> r.ints(10, 42, 42));
+ executeAndCatchIAE(() -> r.longs(-1L, -1L));
+ executeAndCatchIAE(() -> r.longs(10, 1L, -2L));
+
+ testDoubleBadOriginBound((o, b) -> r.doubles(10, o, b));
+ }
+
+ private void executeAndCatchIAE(Runnable r) {
+ executeAndCatch(IllegalArgumentException.class, r);
+ }
+
+ private void executeAndCatch(Class<? extends Exception> expected, Runnable r) {
+ Exception caught = null;
+ try {
+ r.run();
+ }
+ catch (Exception e) {
+ caught = e;
+ }
+
+ assertNotNull(caught,
+ String.format("No Exception was thrown, expected an Exception of %s to be thrown",
+ expected.getName()));
+ Assert.assertTrue(expected.isInstance(caught),
+ String.format("Exception thrown %s not an instance of %s",
+ caught.getClass().getName(), expected.getName()));
+ }
+
+ /**
+ * A parallel sized stream of ints generates the given number of values
+ */
+ public void testIntsCount() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.ints(size).parallel().forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * A parallel sized stream of longs generates the given number of values
+ */
+ public void testLongsCount() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.longs(size).parallel().forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * A parallel sized stream of doubles generates the given number of values
+ */
+ public void testDoublesCount() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.doubles(size).parallel().forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * Each of a parallel sized stream of bounded ints is within bounds
+ */
+ public void testBoundedInts() {
+ AtomicInteger fails = new AtomicInteger(0);
+ SplittableRandom r = new SplittableRandom();
+ long size = 12345L;
+ for (int least = -15485867; least < MAX_INT_BOUND; least += 524959) {
+ for (int bound = least + 2; bound > least && bound < MAX_INT_BOUND; bound += 67867967) {
+ final int lo = least, hi = bound;
+ r.ints(size, lo, hi).parallel().
+ forEach(x -> {if (x < lo || x >= hi)
+ fails.getAndIncrement(); });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * Each of a parallel sized stream of bounded longs is within bounds
+ */
+ public void testBoundedLongs() {
+ AtomicInteger fails = new AtomicInteger(0);
+ SplittableRandom r = new SplittableRandom();
+ long size = 123L;
+ for (long least = -86028121; least < MAX_LONG_BOUND; least += 1982451653L) {
+ for (long bound = least + 2; bound > least && bound < MAX_LONG_BOUND; bound += Math.abs(bound * 7919)) {
+ final long lo = least, hi = bound;
+ r.longs(size, lo, hi).parallel().
+ forEach(x -> {if (x < lo || x >= hi)
+ fails.getAndIncrement(); });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * Each of a parallel sized stream of bounded doubles is within bounds
+ */
+ public void testBoundedDoubles() {
+ AtomicInteger fails = new AtomicInteger(0);
+ SplittableRandom r = new SplittableRandom();
+ long size = 456;
+ for (double least = 0.00011; least < 1.0e20; least *= 9) {
+ for (double bound = least * 1.0011; bound < 1.0e20; bound *= 17) {
+ final double lo = least, hi = bound;
+ r.doubles(size, lo, hi).parallel().
+ forEach(x -> {if (x < lo || x >= hi)
+ fails.getAndIncrement(); });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * A parallel unsized stream of ints generates at least 100 values
+ */
+ public void testUnsizedIntsCount() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 100;
+ r.ints().limit(size).parallel().forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A parallel unsized stream of longs generates at least 100 values
+ */
+ public void testUnsizedLongsCount() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 100;
+ r.longs().limit(size).parallel().forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A parallel unsized stream of doubles generates at least 100 values
+ */
+ public void testUnsizedDoublesCount() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 100;
+ r.doubles().limit(size).parallel().forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of ints generates at least 100 values
+ */
+ public void testUnsizedIntsCountSeq() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 100;
+ r.ints().limit(size).forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of longs generates at least 100 values
+ */
+ public void testUnsizedLongsCountSeq() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 100;
+ r.longs().limit(size).forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of doubles generates at least 100 values
+ */
+ public void testUnsizedDoublesCountSeq() {
+ LongAdder counter = new LongAdder();
+ SplittableRandom r = new SplittableRandom();
+ long size = 100;
+ r.doubles().limit(size).forEach(x -> {counter.increment();});
+ assertEquals(counter.sum(), size);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/ThreadLocalRandom/ThreadLocalRandomTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,559 @@
+/*
+ * 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 org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.BiConsumer;
+
+import static org.testng.Assert.*;
+
+/**
+ * @test
+ * @run testng ThreadLocalRandomTest
+ * @summary test methods on ThreadLocalRandom
+ */
+@Test
+public class ThreadLocalRandomTest {
+
+ // Note: this test was copied from the 166 TCK ThreadLocalRandomTest test
+ // and modified to be a TestNG test
+
+ /*
+ * Testing coverage notes:
+ *
+ * We don't test randomness properties, but only that repeated
+ * calls, up to NCALLS tries, produce at least one different
+ * result. For bounded versions, we sample various intervals
+ * across multiples of primes.
+ */
+
+ // max numbers of calls to detect getting stuck on one value
+ static final int NCALLS = 10000;
+
+ // max sampled int bound
+ static final int MAX_INT_BOUND = (1 << 28);
+
+ // max sampled long bound
+ static final long MAX_LONG_BOUND = (1L << 42);
+
+ // Number of replications for other checks
+ static final int REPS = 20;
+
+ /**
+ * setSeed throws UnsupportedOperationException
+ */
+ @Test(expectedExceptions = UnsupportedOperationException.class)
+ public void testSetSeed() {
+ ThreadLocalRandom.current().setSeed(17);
+ }
+
+ /**
+ * Repeated calls to nextInt produce at least two distinct results
+ */
+ public void testNextInt() {
+ int f = ThreadLocalRandom.current().nextInt();
+ int i = 0;
+ while (i < NCALLS && ThreadLocalRandom.current().nextInt() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextLong produce at least two distinct results
+ */
+ public void testNextLong() {
+ long f = ThreadLocalRandom.current().nextLong();
+ int i = 0;
+ while (i < NCALLS && ThreadLocalRandom.current().nextLong() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextBoolean produce at least two distinct results
+ */
+ public void testNextBoolean() {
+ boolean f = ThreadLocalRandom.current().nextBoolean();
+ int i = 0;
+ while (i < NCALLS && ThreadLocalRandom.current().nextBoolean() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextFloat produce at least two distinct results
+ */
+ public void testNextFloat() {
+ float f = ThreadLocalRandom.current().nextFloat();
+ int i = 0;
+ while (i < NCALLS && ThreadLocalRandom.current().nextFloat() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextDouble produce at least two distinct results
+ */
+ public void testNextDouble() {
+ double f = ThreadLocalRandom.current().nextDouble();
+ int i = 0;
+ while (i < NCALLS && ThreadLocalRandom.current().nextDouble() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * Repeated calls to nextGaussian produce at least two distinct results
+ */
+ public void testNextGaussian() {
+ double f = ThreadLocalRandom.current().nextGaussian();
+ int i = 0;
+ while (i < NCALLS && ThreadLocalRandom.current().nextGaussian() == f)
+ ++i;
+ assertTrue(i < NCALLS);
+ }
+
+ /**
+ * nextInt(negative) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextIntBoundedNeg() {
+ int f = ThreadLocalRandom.current().nextInt(-17);
+ }
+
+ /**
+ * nextInt(least >= bound) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextIntBadBounds() {
+ int f = ThreadLocalRandom.current().nextInt(17, 2);
+ }
+
+ /**
+ * nextInt(bound) returns 0 <= value < bound; repeated calls produce at
+ * least two distinct results
+ */
+ public void testNextIntBounded() {
+ // sample bound space across prime number increments
+ for (int bound = 2; bound < MAX_INT_BOUND; bound += 524959) {
+ int f = ThreadLocalRandom.current().nextInt(bound);
+ assertTrue(0 <= f && f < bound);
+ int i = 0;
+ int j;
+ while (i < NCALLS &&
+ (j = ThreadLocalRandom.current().nextInt(bound)) == f) {
+ assertTrue(0 <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+
+ /**
+ * nextInt(least, bound) returns least <= value < bound; repeated calls
+ * produce at least two distinct results
+ */
+ public void testNextIntBounded2() {
+ for (int least = -15485863; least < MAX_INT_BOUND; least += 524959) {
+ for (int bound = least + 2; bound > least && bound < MAX_INT_BOUND; bound += 49979687) {
+ int f = ThreadLocalRandom.current().nextInt(least, bound);
+ assertTrue(least <= f && f < bound);
+ int i = 0;
+ int j;
+ while (i < NCALLS &&
+ (j = ThreadLocalRandom.current().nextInt(least, bound)) == f) {
+ assertTrue(least <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+ }
+
+ /**
+ * nextLong(negative) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextLongBoundedNeg() {
+ long f = ThreadLocalRandom.current().nextLong(-17);
+ }
+
+ /**
+ * nextLong(least >= bound) throws IllegalArgumentException
+ */
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNextLongBadBounds() {
+ long f = ThreadLocalRandom.current().nextLong(17, 2);
+ }
+
+ /**
+ * nextLong(bound) returns 0 <= value < bound; repeated calls produce at
+ * least two distinct results
+ */
+ public void testNextLongBounded() {
+ for (long bound = 2; bound < MAX_LONG_BOUND; bound += 15485863) {
+ long f = ThreadLocalRandom.current().nextLong(bound);
+ assertTrue(0 <= f && f < bound);
+ int i = 0;
+ long j;
+ while (i < NCALLS &&
+ (j = ThreadLocalRandom.current().nextLong(bound)) == f) {
+ assertTrue(0 <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+
+ /**
+ * nextLong(least, bound) returns least <= value < bound; repeated calls
+ * produce at least two distinct results
+ */
+ public void testNextLongBounded2() {
+ for (long least = -86028121; least < MAX_LONG_BOUND; least += 982451653L) {
+ for (long bound = least + 2; bound > least && bound < MAX_LONG_BOUND; bound += Math.abs(bound * 7919)) {
+ long f = ThreadLocalRandom.current().nextLong(least, bound);
+ assertTrue(least <= f && f < bound);
+ int i = 0;
+ long j;
+ while (i < NCALLS &&
+ (j = ThreadLocalRandom.current().nextLong(least, bound)) == f) {
+ assertTrue(least <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+ }
+
+ /**
+ * nextDouble(bound) throws IllegalArgumentException
+ */
+ public void testNextDoubleBadBound() {
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ executeAndCatchIAE(() -> r.nextDouble(0.0));
+ executeAndCatchIAE(() -> r.nextDouble(-0.0));
+ executeAndCatchIAE(() -> r.nextDouble(+0.0));
+ executeAndCatchIAE(() -> r.nextDouble(-1.0));
+ executeAndCatchIAE(() -> r.nextDouble(Double.NaN));
+ executeAndCatchIAE(() -> r.nextDouble(Double.NEGATIVE_INFINITY));
+
+ // Returns Double.MAX_VALUE
+// executeAndCatchIAE(() -> r.nextDouble(Double.POSITIVE_INFINITY));
+ }
+
+ /**
+ * nextDouble(origin, bound) throws IllegalArgumentException
+ */
+ public void testNextDoubleBadOriginBound() {
+ testDoubleBadOriginBound(ThreadLocalRandom.current()::nextDouble);
+ }
+
+ // An arbitrary finite double value
+ static final double FINITE = Math.PI;
+
+ void testDoubleBadOriginBound(BiConsumer<Double, Double> bi) {
+ executeAndCatchIAE(() -> bi.accept(17.0, 2.0));
+ executeAndCatchIAE(() -> bi.accept(0.0, 0.0));
+ executeAndCatchIAE(() -> bi.accept(Double.NaN, FINITE));
+ executeAndCatchIAE(() -> bi.accept(FINITE, Double.NaN));
+ executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY));
+
+ // Returns NaN
+// executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, FINITE));
+// executeAndCatchIAE(() -> bi.accept(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY));
+
+ executeAndCatchIAE(() -> bi.accept(FINITE, Double.NEGATIVE_INFINITY));
+
+ // Returns Double.MAX_VALUE
+// executeAndCatchIAE(() -> bi.accept(FINITE, Double.POSITIVE_INFINITY));
+
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY));
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, FINITE));
+ executeAndCatchIAE(() -> bi.accept(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY));
+ }
+
+ /**
+ * nextDouble(least, bound) returns least <= value < bound; repeated calls
+ * produce at least two distinct results
+ */
+ public void testNextDoubleBounded2() {
+ for (double least = 0.0001; least < 1.0e20; least *= 8) {
+ for (double bound = least * 1.001; bound < 1.0e20; bound *= 16) {
+ double f = ThreadLocalRandom.current().nextDouble(least, bound);
+ assertTrue(least <= f && f < bound);
+ int i = 0;
+ double j;
+ while (i < NCALLS &&
+ (j = ThreadLocalRandom.current().nextDouble(least, bound)) == f) {
+ assertTrue(least <= j && j < bound);
+ ++i;
+ }
+ assertTrue(i < NCALLS);
+ }
+ }
+ }
+
+ /**
+ * Invoking sized ints, long, doubles, with negative sizes throws
+ * IllegalArgumentException
+ */
+ public void testBadStreamSize() {
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ executeAndCatchIAE(() -> r.ints(-1L));
+ executeAndCatchIAE(() -> r.ints(-1L, 2, 3));
+ executeAndCatchIAE(() -> r.longs(-1L));
+ executeAndCatchIAE(() -> r.longs(-1L, -1L, 1L));
+ executeAndCatchIAE(() -> r.doubles(-1L));
+ executeAndCatchIAE(() -> r.doubles(-1L, .5, .6));
+ }
+
+ /**
+ * Invoking bounded ints, long, doubles, with illegal bounds throws
+ * IllegalArgumentException
+ */
+ public void testBadStreamBounds() {
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ executeAndCatchIAE(() -> r.ints(2, 1));
+ executeAndCatchIAE(() -> r.ints(10, 42, 42));
+ executeAndCatchIAE(() -> r.longs(-1L, -1L));
+ executeAndCatchIAE(() -> r.longs(10, 1L, -2L));
+
+ testDoubleBadOriginBound((o, b) -> r.doubles(10, o, b));
+ }
+
+ private void executeAndCatchIAE(Runnable r) {
+ executeAndCatch(IllegalArgumentException.class, r);
+ }
+
+ private void executeAndCatch(Class<? extends Exception> expected, Runnable r) {
+ Exception caught = null;
+ try {
+ r.run();
+ }
+ catch (Exception e) {
+ caught = e;
+ }
+
+ assertNotNull(caught,
+ String.format("No Exception was thrown, expected an Exception of %s to be thrown",
+ expected.getName()));
+ Assert.assertTrue(expected.isInstance(caught),
+ String.format("Exception thrown %s not an instance of %s",
+ caught.getClass().getName(), expected.getName()));
+ }
+
+ /**
+ * A parallel sized stream of ints generates the given number of values
+ */
+ public void testIntsCount() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.ints(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * A parallel sized stream of longs generates the given number of values
+ */
+ public void testLongsCount() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.longs(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * A parallel sized stream of doubles generates the given number of values
+ */
+ public void testDoublesCount() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 0;
+ for (int reps = 0; reps < REPS; ++reps) {
+ counter.reset();
+ r.doubles(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ size += 524959;
+ }
+ }
+
+ /**
+ * Each of a parallel sized stream of bounded ints is within bounds
+ */
+ public void testBoundedInts() {
+ AtomicInteger fails = new AtomicInteger(0);
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 12345L;
+ for (int least = -15485867; least < MAX_INT_BOUND; least += 524959) {
+ for (int bound = least + 2; bound > least && bound < MAX_INT_BOUND; bound += 67867967) {
+ final int lo = least, hi = bound;
+ r.ints(size, lo, hi).parallel().
+ forEach(x -> {
+ if (x < lo || x >= hi)
+ fails.getAndIncrement();
+ });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * Each of a parallel sized stream of bounded longs is within bounds
+ */
+ public void testBoundedLongs() {
+ AtomicInteger fails = new AtomicInteger(0);
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 123L;
+ for (long least = -86028121; least < MAX_LONG_BOUND; least += 1982451653L) {
+ for (long bound = least + 2; bound > least && bound < MAX_LONG_BOUND; bound += Math.abs(bound * 7919)) {
+ final long lo = least, hi = bound;
+ r.longs(size, lo, hi).parallel().
+ forEach(x -> {
+ if (x < lo || x >= hi)
+ fails.getAndIncrement();
+ });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * Each of a parallel sized stream of bounded doubles is within bounds
+ */
+ public void testBoundedDoubles() {
+ AtomicInteger fails = new AtomicInteger(0);
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 456;
+ for (double least = 0.00011; least < 1.0e20; least *= 9) {
+ for (double bound = least * 1.0011; bound < 1.0e20; bound *= 17) {
+ final double lo = least, hi = bound;
+ r.doubles(size, lo, hi).parallel().
+ forEach(x -> {
+ if (x < lo || x >= hi)
+ fails.getAndIncrement();
+ });
+ }
+ }
+ assertEquals(fails.get(), 0);
+ }
+
+ /**
+ * A parallel unsized stream of ints generates at least 100 values
+ */
+ public void testUnsizedIntsCount() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 100;
+ r.ints().limit(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A parallel unsized stream of longs generates at least 100 values
+ */
+ public void testUnsizedLongsCount() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 100;
+ r.longs().limit(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A parallel unsized stream of doubles generates at least 100 values
+ */
+ public void testUnsizedDoublesCount() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 100;
+ r.doubles().limit(size).parallel().forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of ints generates at least 100 values
+ */
+ public void testUnsizedIntsCountSeq() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 100;
+ r.ints().limit(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of longs generates at least 100 values
+ */
+ public void testUnsizedLongsCountSeq() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 100;
+ r.longs().limit(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+ /**
+ * A sequential unsized stream of doubles generates at least 100 values
+ */
+ public void testUnsizedDoublesCountSeq() {
+ LongAdder counter = new LongAdder();
+ ThreadLocalRandom r = ThreadLocalRandom.current();
+ long size = 100;
+ r.doubles().limit(size).forEach(x -> {
+ counter.increment();
+ });
+ assertEquals(counter.sum(), size);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/locks/StampedLock/ReadersUnlockAfterWriteUnlock.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,88 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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
+ * @run main/othervm/timeout=60 ReadersUnlockAfterWriteUnlock
+ * @bug 8023234
+ * @summary StampedLock serializes readers on writer unlock
+ * @author Dmitry Chyuko
+ * @author Aleksey Shipilev
+ */
+
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.locks.StampedLock;
+
+public class ReadersUnlockAfterWriteUnlock {
+ static final int RNUM = 2;
+ static final StampedLock sl = new StampedLock();
+ static volatile boolean isDone;
+
+ static CyclicBarrier iterationStart = new CyclicBarrier(RNUM + 1);
+ static CyclicBarrier readersHaveLocks = new CyclicBarrier(RNUM);
+ static CyclicBarrier writerHasLock = new CyclicBarrier(RNUM + 1);
+
+ static class Reader extends Thread {
+ final String name;
+ Reader(String name) {
+ super();
+ this.name = name;
+ }
+ public void run() {
+ while (!isDone && !isInterrupted()) {
+ try {
+ iterationStart.await();
+ writerHasLock.await();
+ long rs = sl.readLock();
+
+ // single reader blocks here indefinitely if readers
+ // are serialized
+ readersHaveLocks.await();
+
+ sl.unlockRead(rs);
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ }
+ }
+
+ public static void main(String[] args) throws InterruptedException {
+ for (int r = 0 ; r < RNUM; ++r) {
+ new Reader("r" + r).start();
+ }
+ int i;
+ for (i = 0; i < 1024; ++i) {
+ try {
+ iterationStart.await();
+ long ws = sl.writeLock();
+ writerHasLock.await();
+ Thread.sleep(10);
+ sl.unlockWrite(ws);
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ isDone = true;
+ }
+
+}
--- a/jdk/test/java/util/function/BinaryOperator/BasicTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/util/function/BinaryOperator/BasicTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -67,26 +67,26 @@
};
public void testMaxBy() {
- Comparator<People> cmp = Comparator.comparing((Function<People, String>) People::getFirstName);
+ Comparator<People> cmp = Comparator.comparing(People::getFirstName);
// lesser
assertSame(maxBy(cmp).apply(people[0], people[1]), people[1]);
// euqal
- cmp = Comparator.comparing((Function<People, String>) People::getLastName);
+ cmp = Comparator.comparing(People::getLastName);
assertSame(maxBy(cmp).apply(people[0], people[1]), people[0]);
// greater
- cmp = Comparator.comparing((ToIntFunction<People>) People::getAge);
+ cmp = Comparator.comparingInt(People::getAge);
assertSame(maxBy(cmp).apply(people[0], people[1]), people[0]);
}
- public void testLesserOf() {
- Comparator<People> cmp = Comparator.comparing((Function<People, String>) People::getFirstName);
+ public void testMinBy() {
+ Comparator<People> cmp = Comparator.comparing(People::getFirstName);
// lesser
assertSame(minBy(cmp).apply(people[0], people[1]), people[0]);
// euqal
- cmp = Comparator.comparing((Function<People, String>) People::getLastName);
+ cmp = Comparator.comparing(People::getLastName);
assertSame(minBy(cmp).apply(people[0], people[1]), people[0]);
// greater
- cmp = Comparator.comparing((ToIntFunction<People>) People::getAge);
+ cmp = Comparator.comparingInt(People::getAge);
assertSame(minBy(cmp).apply(people[0], people[1]), people[1]);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/logging/Logger/getLogger/TestLogger.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,98 @@
+/*
+ * 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.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * @test
+ * @bug 8005899
+ * @build TestLogger testlogger.MyResource
+ * @run main/othervm TestLogger
+ * @run main/othervm -Dsecurity=on TestLogger
+ **/
+public class TestLogger {
+
+ public static final String RESOURCE_BUNDLE = "testlogger.MyResource";
+ public static final String ORG_LOGGER = "org";
+ public static final String FOO_LOGGER = ORG_LOGGER + ".foo.Foo";
+ public static final String BAR_LOGGER = ORG_LOGGER + ".bar.Bar";
+ public static final String GEE_LOGGER = ORG_LOGGER + ".gee.Gee";
+ public static final String GEE_GEE_LOGGER = GEE_LOGGER+".Gee";
+
+ public static void main(String[] args) {
+ final String security = System.getProperty("security", "off");
+ System.out.println("Security is " + security);
+ if ("on".equals(security)) {
+ System.setSecurityManager(new SecurityManager());
+ }
+
+ newLogger(FOO_LOGGER, RESOURCE_BUNDLE);
+ newLogger(FOO_LOGGER);
+ newLogger(BAR_LOGGER);
+ newLogger(BAR_LOGGER, RESOURCE_BUNDLE);
+ newLogger(GEE_LOGGER, null);
+ newLogger(GEE_LOGGER, RESOURCE_BUNDLE);
+ newLogger(ORG_LOGGER);
+ newLogger(GEE_GEE_LOGGER);
+
+ for (String log : new String[] { FOO_LOGGER, BAR_LOGGER, GEE_LOGGER }) {
+ if (!RESOURCE_BUNDLE.equals(Logger.getLogger(log).getResourceBundleName())) {
+ throw new RuntimeException("Shouldn't allow to reset the resource bundle for " + log);
+ }
+ try {
+ Logger logger = Logger.getLogger(log, null);
+ if (!RESOURCE_BUNDLE.equals(logger.getResourceBundleName())) {
+ throw new RuntimeException("Shouldn't allow to reset the resource bundle for " + log);
+ }
+ throw new RuntimeException("Expected IllegalArgumentException not thrown for " + log);
+ } catch (IllegalArgumentException e) {
+ System.out.println("Got expected exception for " + log +": " + e);
+ }
+ }
+ for (String log : new String[] { ORG_LOGGER, GEE_GEE_LOGGER }) {
+ if (Logger.getLogger(log).getResourceBundleName() != null) {
+ throw new RuntimeException("Resource bundle is not null for log: "
+ + Logger.getLogger(log).getResourceBundleName());
+ }
+ try {
+ Logger logger = Logger.getLogger(log, null);
+ if (logger.getResourceBundleName() != null) {
+ throw new RuntimeException("Resource bundle is not null for log: "
+ + logger.getResourceBundleName());
+ }
+ System.out.println("Success calling Logger.getLogger(\""+log+"\", null)");
+ } catch (IllegalArgumentException e) {
+ throw new RuntimeException("Unexpected exception for " + log +": " + e, e);
+ }
+ }
+ }
+
+ private static List<Logger> strongRefs = new ArrayList<>();
+ private static void newLogger(String name) {
+ strongRefs.add(Logger.getLogger(name));
+ }
+ private static void newLogger(String name, String resourceBundleName) {
+ strongRefs.add(Logger.getLogger(name, resourceBundleName));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/logging/Logger/getLogger/testlogger/MyResource.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package testlogger;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+/**
+ * A dummy resource bundle for testing purposes.
+ * @author danielfuchs
+ */
+public class MyResource extends ResourceBundle {
+ Map<String, Object> bundle = new HashMap<>();
+
+ @Override
+ protected Object handleGetObject(String key) {
+ bundle.put(key,"Localized: " + key);
+ return bundle.get(key);
+ }
+
+ @Override
+ public Enumeration<String> getKeys() {
+ final Hashtable<String, Object> h = new Hashtable<>(bundle);
+ return h.keys();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/regex/PatternTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,147 @@
+/*
+ * 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 Unit tests for wrapping classes should delegate to default methods
+ * @library ../stream/bootlib
+ * @build java.util.stream.OpTestCase
+ * @run testng/othervm PatternTest
+ */
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.regex.Pattern;
+import java.util.stream.LambdaTestHelpers;
+import java.util.stream.OpTestCase;
+import java.util.stream.Stream;
+import java.util.stream.TestData;
+
+@Test
+public class PatternTest extends OpTestCase {
+
+ @DataProvider(name = "Stream<String>")
+ public static Object[][] makeStreamTestData() {
+ List<Object[]> data = new ArrayList<>();
+
+ String description = "";
+ String input = "awgqwefg1fefw4vssv1vvv1";
+ Pattern pattern = Pattern.compile("4");
+ List<String> expected = new ArrayList<>();
+ expected.add("awgqwefg1fefw");
+ expected.add("vssv1vvv1");
+
+ // Must match the type signature of the consumer of this data, testStrings
+ // String, String, Pattern, List<String>
+ data.add(new Object[]{description, input, pattern, expected});
+
+ input = "afbfq\u00a3abgwgb\u00a3awngnwggw\u00a3a\u00a3ahjrnhneerh";
+ pattern = Pattern.compile("\u00a3a");
+ expected = new ArrayList<>();
+ expected.add("afbfq");
+ expected.add("bgwgb");
+ expected.add("wngnwggw");
+ expected.add("");
+ expected.add("hjrnhneerh");
+
+ data.add(new Object[]{description, input, pattern, expected});
+
+
+ input = "awgqwefg1fefw4vssv1vvv1";
+ pattern = Pattern.compile("1");
+ expected = new ArrayList<>();
+ expected.add("awgqwefg");
+ expected.add("fefw4vssv");
+ expected.add("vvv");
+
+ data.add(new Object[]{description, input, pattern, expected});
+
+
+ input = "a\u4ebafg1fefw\u4eba4\u9f9cvssv\u9f9c1v\u672c\u672cvv";
+ pattern = Pattern.compile("1");
+ expected = new ArrayList<>();
+ expected.add("a\u4ebafg");
+ expected.add("fefw\u4eba4\u9f9cvssv\u9f9c");
+ expected.add("v\u672c\u672cvv");
+
+ data.add(new Object[]{description, input, pattern, expected});
+
+
+ input = "1\u56da23\u56da456\u56da7890";
+ pattern = Pattern.compile("\u56da");
+ expected = new ArrayList<>();
+ expected.add("1");
+ expected.add("23");
+ expected.add("456");
+ expected.add("7890");
+
+ data.add(new Object[]{description, input, pattern, expected});
+
+
+ input = "1\u56da23\u9f9c\u672c\u672c\u56da456\u56da\u9f9c\u672c7890";
+ pattern = Pattern.compile("\u56da");
+ expected = new ArrayList<>();
+ expected.add("1");
+ expected.add("23\u9f9c\u672c\u672c");
+ expected.add("456");
+ expected.add("\u9f9c\u672c7890");
+
+ data.add(new Object[]{description, input, pattern, expected});
+
+
+ input = "";
+ pattern = Pattern.compile("\u56da");
+ expected = new ArrayList<>();
+
+ data.add(new Object[]{description, input, pattern, expected});
+
+
+ description = "Multiple separators";
+ input = "This is,testing: with\tdifferent separators.";
+ pattern = Pattern.compile("[ \t,:.]");
+ expected = new ArrayList<>();
+ expected.add("This");
+ expected.add("is");
+ expected.add("testing");
+ expected.add("");
+ expected.add("with");
+ expected.add("different");
+ expected.add("separators");
+
+ data.add(new Object[] {description, input, pattern, expected});
+ return data.toArray(new Object[0][]);
+ }
+
+ @Test(dataProvider = "Stream<String>")
+ public void testStrings(String description, String input, Pattern pattern, List<String> expected) {
+ Supplier<Stream<String>> ss = () -> pattern.splitAsStream(input);
+ withData(TestData.Factory.ofSupplier(description, ss))
+ .stream(LambdaTestHelpers.identity())
+ .expectedResult(expected)
+ .exercise();
+ }
+}
--- a/jdk/test/java/util/regex/RegExTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/util/regex/RegExTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,7 +33,7 @@
* 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940
* 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133
* 6350801 6676425 6878475 6919132 6931676 6948903 6990617 7014645 7039066
- * 7067045 7014640 7189363 8007395 8013252 8013254 8012646
+ * 7067045 7014640 7189363 8007395 8013252 8013254 8012646 8023647
*/
import java.util.regex.*;
@@ -146,6 +146,7 @@
linebreakTest();
branchTest();
groupCurlyNotFoundSuppTest();
+ groupCurlyBackoffTest();
patternAsPredicate();
if (failure) {
throw new
@@ -3999,6 +4000,15 @@
report("GroupCurly NotFoundSupp");
}
+ // This test is for 8023647
+ private static void groupCurlyBackoffTest() throws Exception {
+ if (!"abc1c".matches("(\\w)+1\\1") ||
+ "abc11".matches("(\\w)+1\\1")) {
+ failCount++;
+ }
+ report("GroupCurly backoff");
+ }
+
// This test is for 8012646
private static void patternAsPredicate() throws Exception {
Predicate<String> p = Pattern.compile("[a-z]+").asPredicate();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/SplittableRandomTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,367 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.tests.java.util;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.SplittableRandom;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.DoubleStream;
+import java.util.stream.DoubleStreamTestScenario;
+import java.util.stream.IntStream;
+import java.util.stream.IntStreamTestScenario;
+import java.util.stream.LongStream;
+import java.util.stream.LongStreamTestScenario;
+import java.util.stream.OpTestCase;
+import java.util.stream.StreamSupport;
+import java.util.stream.TestData;
+
+@Test
+public class SplittableRandomTest extends OpTestCase {
+
+ static class RandomBoxedSpliterator<T> implements Spliterator<T> {
+ final SplittableRandom rng;
+ long index;
+ final long fence;
+ final Function<SplittableRandom, T> rngF;
+
+ RandomBoxedSpliterator(SplittableRandom rng, long index, long fence, Function<SplittableRandom, T> rngF) {
+ this.rng = rng;
+ this.index = index;
+ this.fence = fence;
+ this.rngF = rngF;
+ }
+
+ public RandomBoxedSpliterator<T> trySplit() {
+ long i = index, m = (i + fence) >>> 1;
+ return (m <= i) ? null :
+ new RandomBoxedSpliterator<>(rng.split(), i, index = m, rngF);
+ }
+
+ public long estimateSize() {
+ return fence - index;
+ }
+
+ public int characteristics() {
+ return (Spliterator.SIZED | Spliterator.SUBSIZED |
+ Spliterator.NONNULL | Spliterator.IMMUTABLE);
+ }
+
+ @Override
+ public boolean tryAdvance(Consumer<? super T> consumer) {
+ if (consumer == null) throw new NullPointerException();
+ long i = index, f = fence;
+ if (i < f) {
+ consumer.accept(rngF.apply(rng));
+ index = i + 1;
+ return true;
+ }
+ return false;
+ }
+ }
+
+ static final int SIZE = 1 << 16;
+
+ // Ensure there is a range of a power of 2
+ static final int[] BOUNDS = {256};
+ static final int[] ORIGINS = {-16, 0, 16};
+
+ static <T extends Comparable<T>> ResultAsserter<Iterable<T>> randomAsserter(int size, T origin, T bound) {
+ return (act, exp, ord, par) -> {
+ int count = 0;
+ Set<Comparable<T>> values = new HashSet<>();
+ for (Comparable<T> t : act) {
+ if (origin.compareTo(bound) < 0) {
+ assertTrue(t.compareTo(origin) >= 0);
+ assertTrue(t.compareTo(bound) < 0);
+ }
+ values.add(t);
+ count++;
+ }
+ assertEquals(count, size);
+ // Assert that at least one different result is produced
+ // For the size of the data it is highly improbable that this
+ // will cause a false negative (i.e. a false failure)
+ assertTrue(values.size() > 1);
+ };
+ }
+
+ @DataProvider(name = "ints")
+ public static Object[][] intsDataProvider() {
+ List<Object[]> data = new ArrayList<>();
+
+ // Function to create a stream using a RandomBoxedSpliterator
+
+ Function<Function<SplittableRandom, Integer>, IntStream> rbsf =
+ sf -> StreamSupport.stream(new RandomBoxedSpliterator<>(new SplittableRandom(), 0, SIZE, sf), false).
+ mapToInt(i -> i);
+
+ // Unbounded
+
+ data.add(new Object[]{
+ TestData.Factory.ofIntSupplier(
+ String.format("new SplittableRandom().ints().limit(%d)", SIZE),
+ () -> new SplittableRandom().ints().limit(SIZE)),
+ randomAsserter(SIZE, Integer.MAX_VALUE, 0)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofIntSupplier(
+ String.format("new SplittableRandom().ints(%d)", SIZE),
+ () -> new SplittableRandom().ints(SIZE)),
+ randomAsserter(SIZE, Integer.MAX_VALUE, 0)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofIntSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextInt())", SIZE),
+ () -> rbsf.apply(sr -> sr.nextInt())),
+ randomAsserter(SIZE, Integer.MAX_VALUE, 0)
+ });
+
+ // Bounded
+
+ for (int b : BOUNDS) {
+ for (int o : ORIGINS) {
+ final int origin = o;
+ final int bound = b;
+
+ data.add(new Object[]{
+ TestData.Factory.ofIntSupplier(
+ String.format("new SplittableRandom().ints(%d, %d).limit(%d)", origin, bound, SIZE),
+ () -> new SplittableRandom().ints(origin, bound).limit(SIZE)),
+ randomAsserter(SIZE, origin, bound)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofIntSupplier(
+ String.format("new SplittableRandom().ints(%d, %d, %d)", SIZE, origin, bound),
+ () -> new SplittableRandom().ints(SIZE, origin, bound)),
+ randomAsserter(SIZE, origin, bound)
+ });
+
+ if (origin == 0) {
+ data.add(new Object[]{
+ TestData.Factory.ofIntSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextInt(%d))", SIZE, bound),
+ () -> rbsf.apply(sr -> sr.nextInt(bound))),
+ randomAsserter(SIZE, origin, bound)
+ });
+ }
+
+ data.add(new Object[]{
+ TestData.Factory.ofIntSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextInt(%d, %d))", SIZE, origin, bound),
+ () -> rbsf.apply(sr -> sr.nextInt(origin, bound))),
+ randomAsserter(SIZE, origin, bound)
+ });
+ }
+ }
+
+ return data.toArray(new Object[0][]);
+ }
+
+ @Test(dataProvider = "ints")
+ public void testInts(TestData.OfInt data, ResultAsserter<Iterable<Integer>> ra) {
+ withData(data).
+ stream(s -> s).
+ without(IntStreamTestScenario.PAR_STREAM_TO_ARRAY_CLEAR_SIZED).
+ resultAsserter(ra).
+ exercise();
+ }
+
+ @DataProvider(name = "longs")
+ public static Object[][] longsDataProvider() {
+ List<Object[]> data = new ArrayList<>();
+
+ // Function to create a stream using a RandomBoxedSpliterator
+
+ Function<Function<SplittableRandom, Long>, LongStream> rbsf =
+ sf -> StreamSupport.stream(new RandomBoxedSpliterator<>(new SplittableRandom(), 0, SIZE, sf), false).
+ mapToLong(i -> i);
+
+ // Unbounded
+
+ data.add(new Object[]{
+ TestData.Factory.ofLongSupplier(
+ String.format("new SplittableRandom().longs().limit(%d)", SIZE),
+ () -> new SplittableRandom().longs().limit(SIZE)),
+ randomAsserter(SIZE, Long.MAX_VALUE, 0L)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofLongSupplier(
+ String.format("new SplittableRandom().longs(%d)", SIZE),
+ () -> new SplittableRandom().longs(SIZE)),
+ randomAsserter(SIZE, Long.MAX_VALUE, 0L)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofLongSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextLong())", SIZE),
+ () -> rbsf.apply(sr -> sr.nextLong())),
+ randomAsserter(SIZE, Long.MAX_VALUE, 0L)
+ });
+
+ // Bounded
+
+ for (int b : BOUNDS) {
+ for (int o : ORIGINS) {
+ final long origin = o;
+ final long bound = b;
+
+ data.add(new Object[]{
+ TestData.Factory.ofLongSupplier(
+ String.format("new SplittableRandom().longs(%d, %d).limit(%d)", origin, bound, SIZE),
+ () -> new SplittableRandom().longs(origin, bound).limit(SIZE)),
+ randomAsserter(SIZE, origin, bound)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofLongSupplier(
+ String.format("new SplittableRandom().longs(%d, %d, %d)", SIZE, origin, bound),
+ () -> new SplittableRandom().longs(SIZE, origin, bound)),
+ randomAsserter(SIZE, origin, bound)
+ });
+
+ if (origin == 0) {
+ data.add(new Object[]{
+ TestData.Factory.ofLongSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextLong(%d))", SIZE, bound),
+ () -> rbsf.apply(sr -> sr.nextLong(bound))),
+ randomAsserter(SIZE, origin, bound)
+ });
+ }
+
+ data.add(new Object[]{
+ TestData.Factory.ofLongSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextLong(%d, %d))", SIZE, origin, bound),
+ () -> rbsf.apply(sr -> sr.nextLong(origin, bound))),
+ randomAsserter(SIZE, origin, bound)
+ });
+ }
+ }
+
+ return data.toArray(new Object[0][]);
+ }
+
+ @Test(dataProvider = "longs")
+ public void testLongs(TestData.OfLong data, ResultAsserter<Iterable<Long>> ra) {
+ withData(data).
+ stream(s -> s).
+ without(LongStreamTestScenario.PAR_STREAM_TO_ARRAY_CLEAR_SIZED).
+ resultAsserter(ra).
+ exercise();
+ }
+
+ @DataProvider(name = "doubles")
+ public static Object[][] doublesDataProvider() {
+ List<Object[]> data = new ArrayList<>();
+
+ // Function to create a stream using a RandomBoxedSpliterator
+
+ Function<Function<SplittableRandom, Double>, DoubleStream> rbsf =
+ sf -> StreamSupport.stream(new RandomBoxedSpliterator<>(new SplittableRandom(), 0, SIZE, sf), false).
+ mapToDouble(i -> i);
+
+ // Unbounded
+
+ data.add(new Object[]{
+ TestData.Factory.ofDoubleSupplier(
+ String.format("new SplittableRandom().doubles().limit(%d)", SIZE),
+ () -> new SplittableRandom().doubles().limit(SIZE)),
+ randomAsserter(SIZE, Double.MAX_VALUE, 0d)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofDoubleSupplier(
+ String.format("new SplittableRandom().doubles(%d)", SIZE),
+ () -> new SplittableRandom().doubles(SIZE)),
+ randomAsserter(SIZE, Double.MAX_VALUE, 0d)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofDoubleSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextDouble())", SIZE),
+ () -> rbsf.apply(sr -> sr.nextDouble())),
+ randomAsserter(SIZE, Double.MAX_VALUE, 0d)
+ });
+
+ // Bounded
+
+ for (int b : BOUNDS) {
+ for (int o : ORIGINS) {
+ final double origin = o;
+ final double bound = b;
+
+ data.add(new Object[]{
+ TestData.Factory.ofDoubleSupplier(
+ String.format("new SplittableRandom().doubles(%f, %f).limit(%d)", origin, bound, SIZE),
+ () -> new SplittableRandom().doubles(origin, bound).limit(SIZE)),
+ randomAsserter(SIZE, origin, bound)
+ });
+
+ data.add(new Object[]{
+ TestData.Factory.ofDoubleSupplier(
+ String.format("new SplittableRandom().doubles(%d, %f, %f)", SIZE, origin, bound),
+ () -> new SplittableRandom().doubles(SIZE, origin, bound)),
+ randomAsserter(SIZE, origin, bound)
+ });
+
+ if (origin == 0) {
+ data.add(new Object[]{
+ TestData.Factory.ofDoubleSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextDouble(%f))", SIZE, bound),
+ () -> rbsf.apply(sr -> sr.nextDouble(bound))),
+ randomAsserter(SIZE, origin, bound)
+ });
+ }
+
+ data.add(new Object[]{
+ TestData.Factory.ofDoubleSupplier(
+ String.format("new RandomBoxedSpliterator(0, %d, sr -> sr.nextDouble(%f, %f))", SIZE, origin, bound),
+ () -> rbsf.apply(sr -> sr.nextDouble(origin, bound))),
+ randomAsserter(SIZE, origin, bound)
+ });
+ }
+ }
+
+ return data.toArray(new Object[0][]);
+ }
+
+ @Test(dataProvider = "doubles")
+ public void testDoubles(TestData.OfDouble data, ResultAsserter<Iterable<Double>> ra) {
+ withData(data).
+ stream(s -> s).
+ without(DoubleStreamTestScenario.PAR_STREAM_TO_ARRAY_CLEAR_SIZED).
+ resultAsserter(ra).
+ exercise();
+ }
+}
--- a/jdk/test/java/util/zip/TestExtraTime.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/java/util/zip/TestExtraTime.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 4759491 6303183 7012868 8015666
+ * @bug 4759491 6303183 7012868 8015666 8023713
* @summary Test ZOS and ZIS timestamp in extra field correctly
*/
@@ -32,6 +32,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.FileTime;
+import java.util.Arrays;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import java.util.zip.ZipEntry;
@@ -52,24 +53,26 @@
FileTime ctime = FileTime.from(time - 300000, TimeUnit.MILLISECONDS);
TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");
- test(mtime, null, null, null);
- // ms-dos 1980 epoch problem
- test(FileTime.from(10, TimeUnit.MILLISECONDS), null, null, null);
- // non-default tz
- test(mtime, null, null, tz);
+ for (byte[] extra : new byte[][] { null, new byte[] {1, 2, 3}}) {
+ test(mtime, null, null, null, extra);
+ // ms-dos 1980 epoch problem
+ test(FileTime.from(10, TimeUnit.MILLISECONDS), null, null, null, extra);
+ // non-default tz
+ test(mtime, null, null, tz, extra);
- test(mtime, atime, null, null);
- test(mtime, null, ctime, null);
- test(mtime, atime, ctime, null);
+ test(mtime, atime, null, null, extra);
+ test(mtime, null, ctime, null, extra);
+ test(mtime, atime, ctime, null, extra);
- test(mtime, atime, null, tz);
- test(mtime, null, ctime, tz);
- test(mtime, atime, ctime, tz);
+ test(mtime, atime, null, tz, extra);
+ test(mtime, null, ctime, tz, extra);
+ test(mtime, atime, ctime, tz, extra);
+ }
}
}
static void test(FileTime mtime, FileTime atime, FileTime ctime,
- TimeZone tz) throws Throwable {
+ TimeZone tz, byte[] extra) throws Throwable {
System.out.printf("--------------------%nTesting: [%s]/[%s]/[%s]%n",
mtime, atime, ctime);
TimeZone tz0 = TimeZone.getDefault();
@@ -78,8 +81,8 @@
}
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ZipOutputStream zos = new ZipOutputStream(baos);
- ZipEntry ze = new ZipEntry("TestExtreTime.java");
-
+ ZipEntry ze = new ZipEntry("TestExtraTime.java");
+ ze.setExtra(extra);
ze.setLastModifiedTime(mtime);
if (atime != null)
ze.setLastAccessTime(atime);
@@ -87,6 +90,14 @@
ze.setCreationTime(ctime);
zos.putNextEntry(ze);
zos.write(new byte[] { 1,2 ,3, 4});
+
+ // append an extra entry to help check if the length and data
+ // of the extra field are being correctly written (in previous
+ // entry).
+ if (extra != null) {
+ ze = new ZipEntry("TestExtraEntry");
+ zos.putNextEntry(ze);
+ }
zos.close();
if (tz != null) {
TimeZone.setDefault(tz0);
@@ -96,23 +107,23 @@
new ByteArrayInputStream(baos.toByteArray()));
ze = zis.getNextEntry();
zis.close();
- check(mtime, atime, ctime, ze);
+ check(mtime, atime, ctime, ze, extra);
// ZipFile
Path zpath = Paths.get(System.getProperty("test.dir", "."),
- "TestExtraTimp.zip");
+ "TestExtraTime.zip");
Files.copy(new ByteArrayInputStream(baos.toByteArray()), zpath);
ZipFile zf = new ZipFile(zpath.toFile());
- ze = zf.getEntry("TestExtreTime.java");
+ ze = zf.getEntry("TestExtraTime.java");
// ZipFile read entry from cen, which does not have a/ctime,
// for now.
- check(mtime, null, null, ze);
+ check(mtime, null, null, ze, extra);
zf.close();
Files.delete(zpath);
}
static void check(FileTime mtime, FileTime atime, FileTime ctime,
- ZipEntry ze) {
+ ZipEntry ze, byte[] extra) {
/*
System.out.printf(" mtime [%tc]: [%tc]/[%tc]%n",
mtime.to(TimeUnit.MILLISECONDS),
@@ -130,5 +141,17 @@
ctime.to(TimeUnit.SECONDS) !=
ze.getCreationTime().to(TimeUnit.SECONDS))
throw new RuntimeException("Timestamp: storing ctime failed!");
+ if (extra != null) {
+ // if extra data exists, the current implementation put it at
+ // the end of the extra data array (implementation detail)
+ byte[] extra1 = ze.getExtra();
+ if (extra1 == null || extra1.length < extra.length ||
+ !Arrays.equals(Arrays.copyOfRange(extra1,
+ extra1.length - extra.length,
+ extra1.length),
+ extra)) {
+ throw new RuntimeException("Timestamp: storing extra field failed!");
+ }
+ }
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/auto/KPEquals.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
+ * @bug 8015669
+ * @summary KerberosPrincipal::equals should ignore name-type
+ * @compile -XDignore.symbol.file KPEquals.java
+ * @run main/othervm KPEquals
+ */
+
+import sun.security.jgss.GSSUtil;
+
+import javax.security.auth.kerberos.KerberosKey;
+import javax.security.auth.kerberos.KerberosPrincipal;
+import javax.security.auth.kerberos.KeyTab;
+
+public class KPEquals {
+
+ public static void main(String[] args) throws Exception {
+ new OneKDC(null).writeJAASConf();
+ Context c = Context.fromJAAS("client");
+ Context s = Context.fromThinAir();
+ KerberosPrincipal kp = new KerberosPrincipal(
+ OneKDC.SERVER + "@" + OneKDC.REALM,
+ KerberosPrincipal.KRB_NT_SRV_INST);
+ s.s().getPrincipals().add(kp);
+ for (KerberosKey k: KeyTab.getInstance(kp).getKeys(kp)) {
+ s.s().getPrivateCredentials().add(k);
+ }
+ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
+ s.startAsServer(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
+ Context.handshake(c, s);
+ }
+}
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -21,14 +21,16 @@
* questions.
*/
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
/*
* @test
* @bug 4366807
* @summary Need new APIs to get/set session timeout and session cache size.
* @run main/othervm SessionCacheSizeTests
- *
- * SunJSSE does not support dynamic system properties, no way to re-use
- * system properties in samevm/agentvm mode.
*/
import java.io.*;
@@ -113,7 +115,9 @@
/*
* Signal Client, we're ready for his connect.
*/
- serverReady = true;
+ if (createdPorts == serverPorts.length) {
+ serverReady = true;
+ }
int read = 0;
int nConnections = 0;
/*
@@ -310,7 +314,6 @@
* Fork off the other side, then do your work.
*/
SessionCacheSizeTests() throws Exception {
-
/*
* create the SSLServerSocket and SSLSocket factories
*/
@@ -323,46 +326,87 @@
int serverConns = MAX_ACTIVE_CONNECTIONS / (serverPorts.length);
int remainingConns = MAX_ACTIVE_CONNECTIONS % (serverPorts.length);
- if (separateServerThread) {
- for (int i = 0; i < serverPorts.length; i++) {
-
- // distribute remaining connections among the available ports
- if (i < remainingConns)
- startServer(serverPorts[i], (serverConns + 1), true);
- else
- startServer(serverPorts[i], serverConns, true);
+ Exception startException = null;
+ try {
+ if (separateServerThread) {
+ for (int i = 0; i < serverPorts.length; i++) {
+ // distribute remaining connections among the
+ // available ports
+ if (i < remainingConns)
+ startServer(serverPorts[i], (serverConns + 1), true);
+ else
+ startServer(serverPorts[i], serverConns, true);
+ }
+ startClient(false);
+ } else {
+ startClient(true);
+ for (int i = 0; i < serverPorts.length; i++) {
+ if (i < remainingConns)
+ startServer(serverPorts[i], (serverConns + 1), false);
+ else
+ startServer(serverPorts[i], serverConns, false);
+ }
}
- startClient(false);
- } else {
- startClient(true);
- for (int i = 0; i < serverPorts.length; i++) {
- if (i < remainingConns)
- startServer(serverPorts[i], (serverConns + 1), false);
- else
- startServer(serverPorts[i], serverConns, false);
- }
+ } catch (Exception e) {
+ startException = e;
}
/*
* Wait for other side to close down.
*/
if (separateServerThread) {
- serverThread.join();
+ if (serverThread != null) {
+ serverThread.join();
+ }
} else {
- clientThread.join();
+ if (clientThread != null) {
+ clientThread.join();
+ }
}
/*
* When we get here, the test is pretty much over.
- *
- * If the main thread excepted, that propagates back
- * immediately. If the other thread threw an exception, we
- * should report back.
+ */
+ Exception local;
+ Exception remote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ } else {
+ remote = clientException;
+ local = serverException;
+ }
+
+ Exception exception = null;
+
+ /*
+ * Check various exception conditions.
*/
- if (serverException != null)
- throw serverException;
- if (clientException != null)
- throw clientException;
+ if ((local != null) && (remote != null)) {
+ // If both failed, return the curthread's exception.
+ local.initCause(remote);
+ exception = local;
+ } else if (local != null) {
+ exception = local;
+ } else if (remote != null) {
+ exception = remote;
+ } else if (startException != null) {
+ exception = startException;
+ }
+
+ /*
+ * If there was an exception *AND* a startException,
+ * output it.
+ */
+ if (exception != null) {
+ if (exception != startException && startException != null) {
+ exception.addSuppressed(startException);
+ }
+ throw exception;
+ }
+
+ // Fall-through: no exception to throw!
}
void startServer(final int port, final int nConns,
@@ -387,7 +431,13 @@
};
serverThread.start();
} else {
- doServerSide(port, nConns);
+ try {
+ doServerSide(port, nConns);
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
}
}
@@ -409,7 +459,11 @@
};
clientThread.start();
} else {
- doClientSide();
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
}
}
}
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -21,14 +21,14 @@
* questions.
*/
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
/*
* @test
* @bug 4366807
* @summary Need new APIs to get/set session timeout and session cache size.
* @run main/othervm SessionTimeOutTests
- *
- * SunJSSE does not support dynamic system properties, no way to re-use
- * system properties in samevm/agentvm mode.
*/
import java.io.*;
@@ -263,7 +263,7 @@
for (int i = 0; i < nConnections; i++) {
sslSockets[i].close();
}
- System.out.println("----------------------------------------"
+ System.out.println("----------------------------------------"
+ "-----------------------");
System.out.println("Session timeout test passed");
}
@@ -348,45 +348,88 @@
int serverConns = MAX_ACTIVE_CONNECTIONS / (serverPorts.length);
int remainingConns = MAX_ACTIVE_CONNECTIONS % (serverPorts.length);
- if (separateServerThread) {
- for (int i = 0; i < serverPorts.length; i++) {
- // distribute remaining connections among the available ports
- if (i < remainingConns)
- startServer(serverPorts[i], (serverConns + 1), true);
- else
- startServer(serverPorts[i], serverConns, true);
+ Exception startException = null;
+ try {
+ if (separateServerThread) {
+ for (int i = 0; i < serverPorts.length; i++) {
+ // distribute remaining connections among the
+ // vailable ports
+ if (i < remainingConns)
+ startServer(serverPorts[i], (serverConns + 1), true);
+ else
+ startServer(serverPorts[i], serverConns, true);
+ }
+ startClient(false);
+ } else {
+ startClient(true);
+ for (int i = 0; i < serverPorts.length; i++) {
+ if (i < remainingConns)
+ startServer(serverPorts[i], (serverConns + 1), false);
+ else
+ startServer(serverPorts[i], serverConns, false);
+ }
}
- startClient(false);
- } else {
- startClient(true);
- for (int i = 0; i < serverPorts.length; i++) {
- if (i < remainingConns)
- startServer(serverPorts[i], (serverConns + 1), false);
- else
- startServer(serverPorts[i], serverConns, false);
- }
+ } catch (Exception e) {
+ startException = e;
}
/*
* Wait for other side to close down.
*/
if (separateServerThread) {
- serverThread.join();
+ if (serverThread != null) {
+ serverThread.join();
+ }
} else {
- clientThread.join();
+ if (clientThread != null) {
+ clientThread.join();
+ }
}
/*
* When we get here, the test is pretty much over.
- *
- * If the main thread excepted, that propagates back
- * immediately. If the other thread threw an exception, we
- * should report back.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ } else {
+ remote = clientException;
+ local = serverException;
+ }
+
+ Exception exception = null;
+
+ /*
+ * Check various exception conditions.
*/
- if (serverException != null)
- throw serverException;
- if (clientException != null)
- throw clientException;
+ if ((local != null) && (remote != null)) {
+ // If both failed, return the curthread's exception.
+ local.initCause(remote);
+ exception = local;
+ } else if (local != null) {
+ exception = local;
+ } else if (remote != null) {
+ exception = remote;
+ } else if (startException != null) {
+ exception = startException;
+ }
+
+ /*
+ * If there was an exception *AND* a startException,
+ * output it.
+ */
+ if (exception != null) {
+ if (exception != startException && startException != null) {
+ exception.addSuppressed(startException);
+ }
+ throw exception;
+ }
+
+ // Fall-through: no exception to throw!
}
void startServer(final int port, final int nConns,
@@ -411,7 +454,13 @@
};
serverThread.start();
} else {
- doServerSide(port, nConns);
+ try {
+ doServerSide(port, nConns);
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = 0;
+ }
}
}
@@ -433,7 +482,11 @@
};
clientThread.start();
} else {
- doClientSide();
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
}
}
}
--- a/jdk/test/sun/security/ssl/templates/SSLSocketTemplate.java Thu Sep 05 15:37:40 2013 +0400
+++ b/jdk/test/sun/security/ssl/templates/SSLSocketTemplate.java Fri Sep 06 15:09:44 2013 -0700
@@ -243,7 +243,7 @@
* output it.
*/
if (exception != null) {
- if (exception != startException) {
+ if (exception != startException && startException != null) {
exception.addSuppressed(startException);
}
throw exception;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/tools/jarsigner/jvindex.sh Fri Sep 06 15:09:44 2013 -0700
@@ -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.
+#
+
+# @test
+# @bug 8022761
+# @summary regression: SecurityException is NOT thrown while trying to pack a wrongly signed Indexed Jar file
+#
+
+if [ "${TESTJAVA}" = "" ] ; then
+ JAVAC_CMD=`which javac`
+ TESTJAVA=`dirname $JAVAC_CMD`/..
+fi
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+ Windows_* )
+ FS="\\"
+ ;;
+ * )
+ FS="/"
+ ;;
+esac
+
+F=abcde
+KS=jvindex.jks
+JFILE=jvindex.jar
+
+KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
+ -keystore $KS"
+JAR=$TESTJAVA${FS}bin${FS}jar
+JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner -keystore $KS -storepass changeit"
+
+rm $F $KS $JFILE 2> /dev/null
+
+echo 12345 > $F
+$JAR cvf $JFILE $F
+
+ERR=""
+
+$KT -alias a -dname CN=a -genkey -validity 300 || ERR="$ERR 1"
+
+$JARSIGNER $JFILE a || ERR="$ERR 2"
+$JAR i $JFILE
+
+# Make sure the $F line has "sm" (signed and in manifest)
+$JARSIGNER -verify -verbose $JFILE | grep $F | grep sm || ERR="$ERR 3"
+
+if [ "$ERR" = "" ]; then
+ exit 0
+else
+ echo "ERR is $ERR"
+ exit 1
+fi
+
+
--- a/langtools/.hgtags Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/.hgtags Fri Sep 06 15:09:44 2013 -0700
@@ -225,3 +225,5 @@
0324dbf07b0f1cc51ad9fa18976489d02d23b60d jdk8-b101
453a305e116507847cc6577b80b4d9794bcb08bf jdk8-b102
76cfe7c61f2575ea5400845b8e80dab6f4b1d7d0 jdk8-b103
+dd4a00c220c6e14d9b2ce93a2bd436a1d04f0d03 jdk8-b104
+375834b5cf086dd7ce9e49f602d81bb51d3e0fa9 jdk8-b105
--- a/langtools/src/share/classes/com/sun/source/tree/MethodTree.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/source/tree/MethodTree.java Fri Sep 06 15:09:44 2013 -0700
@@ -53,7 +53,15 @@
Tree getReturnType();
List<? extends TypeParameterTree> getTypeParameters();
List<? extends VariableTree> getParameters();
+
+ /**
+ * Return an explicit receiver parameter ("this" parameter).
+ *
+ * @return an explicit receiver parameter ("this" parameter)
+ * @since 1.8
+ */
VariableTree getReceiverParameter();
+
List<? extends ExpressionTree> getThrows();
BlockTree getBody();
Tree getDefaultValue(); // for annotation types
--- a/langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,7 +25,7 @@
package com.sun.source.tree;
-import java.util.List;
+import com.sun.tools.javac.util.List;
/**
* A tree node for an expression to create a new instance of an array.
@@ -48,4 +48,6 @@
Tree getType();
List<? extends ExpressionTree> getDimensions();
List<? extends ExpressionTree> getInitializers();
+ List<? extends AnnotationTree> getAnnotations();
+ List<? extends List<? extends AnnotationTree>> getDimAnnotations();
}
--- a/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,6 +36,8 @@
* <em>name</em>
*
* <em>name</em> extends <em>bounds</em>
+ *
+ * <em>annotations</em> <em>name</em>
* </pre>
*
* @jls section 4.4
@@ -48,5 +50,17 @@
public interface TypeParameterTree extends Tree {
Name getName();
List<? extends Tree> getBounds();
+
+ /**
+ * Return annotations on the type parameter declaration.
+ *
+ * Annotations need Target meta-annotations of
+ * {@link java.lang.annotation.ElementType#TYPE_PARAMETER} or
+ * {@link java.lang.annotation.ElementType#TYPE_USE}
+ * to appear in this position.
+ *
+ * @return annotations on the type parameter declaration
+ * @since 1.8
+ */
List<? extends AnnotationTree> getAnnotations();
}
--- a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java Fri Sep 06 15:09:44 2013 -0700
@@ -285,6 +285,10 @@
R r = scan(node.getType(), p);
r = scanAndReduce(node.getDimensions(), p, r);
r = scanAndReduce(node.getInitializers(), p, r);
+ r = scanAndReduce(node.getAnnotations(), p, r);
+ for (Iterable< ? extends Tree> dimAnno : node.getDimAnnotations()) {
+ r = scanAndReduce(dimAnno, p, r);
+ }
return r;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -159,10 +159,7 @@
body.addContent(div);
if (configuration.showProfiles) {
Content profileSummary = configuration.getResource("doclet.Profiles");
- Content profilesTableSummary = configuration.getResource("doclet.Member_Table_Summary",
- configuration.getResource("doclet.Profile_Summary"),
- configuration.getResource("doclet.profiles"));
- addProfilesList(profileSummary, profilesTableSummary, body);
+ addProfilesList(profileSummary, body);
}
addPackagesList(packages, text, tableSummary, body);
}
@@ -214,10 +211,8 @@
* Do nothing. This will be overridden.
*
* @param profileSummary the profile summary heading
- * @param profilesTableSummary the profiles table summary information
* @param body the content tree to which the profiles list will be added
*/
- protected void addProfilesList(Content profileSummary, Content profilesTableSummary,
- Content body) {
+ protected void addProfilesList(Content profileSummary, Content body) {
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -102,7 +102,7 @@
configuration.standardmessage.
error("doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -304,7 +304,7 @@
subDiv.addContent(div);
} catch (Exception e) {
e.printStackTrace();
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,8 +25,16 @@
package com.sun.tools.doclets.formats.html;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
import com.sun.javadoc.*;
import com.sun.tools.doclets.formats.html.markup.*;
@@ -95,7 +103,7 @@
super(configuration, filename);
this.classdoc = classdoc;
if (mapper.classToPackageAnnotations.containsKey(classdoc.qualifiedName()))
- pkgToPackageAnnotations = new HashSet<PackageDoc>(mapper.classToPackageAnnotations.get(classdoc.qualifiedName()));
+ pkgToPackageAnnotations = new TreeSet<PackageDoc>(mapper.classToPackageAnnotations.get(classdoc.qualifiedName()));
configuration.currentcd = classdoc;
this.pkgSet = new TreeSet<PackageDoc>();
this.pkgToClassTypeParameter = pkgDivide(mapper.classToClassTypeParam);
@@ -210,7 +218,7 @@
configuration.standardmessage.
error("doclet.exception_encountered",
exc.toString(), path.getPath());
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -610,7 +610,7 @@
subDiv.addContent(div);
} catch (Exception e) {
e.printStackTrace();
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -127,7 +127,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -87,7 +87,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -72,7 +72,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Fri Sep 06 15:09:44 2013 -0700
@@ -196,7 +196,7 @@
}
} catch (Exception e) {
e.printStackTrace();
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
}
}
@@ -332,7 +332,7 @@
configuration.message.error((SourcePosition) null,
"doclet.perform_copy_exception_encountered",
exc.toString());
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -411,7 +411,7 @@
head.addContent(headComment);
}
if (configuration.charset.length() > 0) {
- Content meta = HtmlTree.META("Content-Type", "text/html",
+ Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
configuration.charset);
head.addContent(meta);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -109,7 +109,7 @@
}
}
// Can't link so just write label.
- link.addContent(label.toString());
+ link.addContent(label);
if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
link.addContent(getTypeParameterLinks(linkInfo));
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -109,7 +109,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), DocPaths.PACKAGE_FRAME.getPath());
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -71,7 +71,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -98,7 +98,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
@@ -123,15 +123,20 @@
/**
* {@inheritDoc}
*/
- protected void addProfilesList(Content profileSummary, String profilesTableSummary,
- Content body) {
- Content table = HtmlTree.TABLE(HtmlStyle.overviewSummary, 0, 3, 0, profilesTableSummary,
- getTableCaption(profileSummary));
- table.addContent(getSummaryTableHeader(profileTableHeader, "col"));
- Content tbody = new HtmlTree(HtmlTag.TBODY);
- addProfilesList(tbody);
- table.addContent(tbody);
- Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table);
+ protected void addProfilesList(Content profileSummary, Content body) {
+ Content h2 = HtmlTree.HEADING(HtmlTag.H2, profileSummary);
+ Content profilesDiv = HtmlTree.DIV(h2);
+ Content ul = new HtmlTree(HtmlTag.UL);
+ String profileName;
+ for (int i = 1; i < configuration.profiles.getProfileCount(); i++) {
+ profileName = Profile.lookup(i).name;
+ Content profileLinkContent = getTargetProfileLink("classFrame",
+ new StringContent(profileName), profileName);
+ Content li = HtmlTree.LI(profileLinkContent);
+ ul.addContent(li);
+ }
+ profilesDiv.addContent(ul);
+ Content div = HtmlTree.DIV(HtmlStyle.contentContainer, profilesDiv);
body.addContent(div);
}
@@ -151,31 +156,6 @@
}
/**
- * Adds list of profiles in the index table. Generate link to each profile.
- *
- * @param tbody the documentation tree to which the list will be added
- */
- protected void addProfilesList(Content tbody) {
- for (int i = 1; i < configuration.profiles.getProfileCount(); i++) {
- String profileName = Profile.lookup(i).name;
- Content profileLinkContent = getTargetProfileLink("classFrame",
- new StringContent(profileName), profileName);
- Content tdProfile = HtmlTree.TD(HtmlStyle.colFirst, profileLinkContent);
- HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
- tdSummary.addStyle(HtmlStyle.colLast);
- tdSummary.addContent(getSpace());
- HtmlTree tr = HtmlTree.TR(tdProfile);
- tr.addContent(tdSummary);
- if (i % 2 == 0) {
- tr.addStyle(HtmlStyle.altColor);
- } else {
- tr.addStyle(HtmlStyle.rowColor);
- }
- tbody.addContent(tr);
- }
- }
-
- /**
* Adds list of packages in the index table. Generate link to each package.
*
* @param packages Packages to which link is to be generated
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -105,7 +105,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), path.getPath());
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -106,7 +106,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -74,7 +74,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -115,7 +115,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), DocPaths.PACKAGE_FRAME.getPath());
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -75,7 +75,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -79,7 +79,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -102,7 +102,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename.getPath());
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -93,7 +93,7 @@
configuration.standardmessage.error(
"doclet.exception_encountered",
exc.toString(), filename);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java Fri Sep 06 15:09:44 2013 -0700
@@ -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,7 +63,7 @@
* is not supported.
*/
public void addContent(Content content) {
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
/**
@@ -75,7 +75,7 @@
* is not supported.
*/
public void addContent(String stringContent) {
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -70,7 +70,7 @@
* is not supported.
*/
public void addContent(Content content) {
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
/**
@@ -82,7 +82,7 @@
* is not supported.
*/
public void addContent(String stringContent) {
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java Fri Sep 06 15:09:44 2013 -0700
@@ -40,7 +40,6 @@
BORDER,
CELLPADDING,
CELLSPACING,
- CHARSET,
CLASS,
CLEAR,
COLS,
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -53,6 +53,8 @@
*/
public abstract class HtmlDocWriter extends HtmlWriter {
+ public static final String CONTENT_TYPE = "text/html";
+
/**
* Constructor. Initializes the destination file name through the super
* class HtmlWriter.
@@ -194,7 +196,7 @@
head.addContent(headComment);
}
if (configuration.charset.length() > 0) {
- Content meta = HtmlTree.META("Content-Type", "text/html",
+ Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
configuration.charset);
head.addContent(meta);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -91,7 +91,7 @@
* is not supported.
*/
public void addContent(String stringContent) {
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,6 +25,8 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.util.Locale;
+
/**
* Enum representing HTML tags.
*
@@ -115,7 +117,7 @@
HtmlTag(BlockType blockType, EndTag endTag ) {
this.blockType = blockType;
this.endTag = endTag;
- this.value = name().toLowerCase();
+ this.value = name().toLowerCase(Locale.US);
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Fri Sep 06 15:09:44 2013 -0700
@@ -456,9 +456,9 @@
*/
public static HtmlTree META(String httpEquiv, String content, String charSet) {
HtmlTree htmltree = new HtmlTree(HtmlTag.META);
+ String contentCharset = content + "; charset=" + charSet;
htmltree.addAttr(HtmlAttr.HTTP_EQUIV, nullCheck(httpEquiv));
- htmltree.addAttr(HtmlAttr.CONTENT, nullCheck(content));
- htmltree.addAttr(HtmlAttr.CHARSET, nullCheck(charSet));
+ htmltree.addAttr(HtmlAttr.CONTENT, contentCharset);
return htmltree;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Fri Sep 06 15:09:44 2013 -0700
@@ -65,7 +65,7 @@
* is not supported.
*/
public void addContent(Content content) {
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
/**
@@ -77,7 +77,7 @@
* is not supported.
*/
public void addContent(String stringContent) {
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Fri Sep 06 15:09:44 2013 -0700
@@ -70,8 +70,9 @@
* DocletAbortException because it
* is not supported.
*/
+ @Override
public void addContent(Content content) {
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
/**
@@ -80,6 +81,7 @@
*
* @param strContent string content to be added
*/
+ @Override
public void addContent(String strContent) {
appendChars(strContent);
}
@@ -87,10 +89,12 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isEmpty() {
return (stringContent.length() == 0);
}
+ @Override
public int charCount() {
return RawHtml.charCount(stringContent.toString());
}
@@ -98,6 +102,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
return stringContent.toString();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Fri Sep 06 15:09:44 2013 -0700
@@ -539,7 +539,7 @@
initProfiles();
initProfilePackages();
} catch (Exception e) {
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
}
setSpecificDocletOptions(root.options());
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java Fri Sep 06 15:09:44 2013 -0700
@@ -55,7 +55,7 @@
write(out, true);
} catch (IOException e) {
// cannot happen from StringWriter
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
return out.toString();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -138,7 +138,7 @@
} catch (NoSuchMethodException e) {
e.printStackTrace();
configuration.root.printError("Unknown element: " + component);
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
} catch (InvocationTargetException e) {
e.getCause().printStackTrace();
} catch (Exception e) {
@@ -146,7 +146,7 @@
configuration.root.printError("Exception " +
e.getClass().getName() +
" thrown while processing element: " + component);
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -62,7 +62,7 @@
*/
public void build() throws DocletAbortException {
//You may not call the build method in a subbuilder.
- throw new DocletAbortException();
+ throw new DocletAbortException("not supported");
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -93,7 +93,7 @@
return xmlElementsMap.get(root);
} catch (Throwable t) {
t.printStackTrace();
- throw new DocletAbortException();
+ throw new DocletAbortException(t);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -125,7 +125,7 @@
return;
}
} catch (Exception e) {
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
build(layoutParser.parseXML(NAME), contentTree);
writer.close();
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Fri Sep 06 15:09:44 2013 -0700
@@ -176,25 +176,32 @@
doclet.0_and_1={0} and {1}
#Documentation for Enums
-doclet.enum_values_doc=\n\
+doclet.enum_values_doc.main=\n\
Returns an array containing the constants of this enum type, in\n\
the order they are declared. This method may be used to iterate\n\
over the constants as follows:\n\
<pre>\n\
for ({0} c : {0}.values())\n\
System.out.println(c);\n\
- </pre>\n\
- @return an array containing the constants of this enum type, in\n\
- the order they are declared
+ </pre>
-doclet.enum_valueof_doc=\n\
+doclet.enum_values_doc.return=\n\
+ an array containing the constants of this enum type, in the order they are declared
+
+doclet.enum_valueof_doc.main=\n\
Returns the enum constant of this type with the specified name.\n\
The string must match <i>exactly</i> an identifier used to declare an\n\
enum constant in this type. (Extraneous whitespace characters are \n\
- not permitted.)\n\
- \n\
- @param name the name of the enum constant to be returned.\n\
- @return the enum constant with the specified name\n\
- @throws IllegalArgumentException if this enum type has no constant\n\
- with the specified name\n\
- @throws NullPointerException if the argument is null
+ not permitted.)
+
+doclet.enum_valueof_doc.param_name=\
+ the name of the enum constant to be returned.
+
+doclet.enum_valueof_doc.return=\
+ the enum constant with the specified name
+
+doclet.enum_valueof_doc.throws_ila=\
+ if this enum type has no constant with the specified name
+
+doclet.enum_valueof_doc.throws_npe=\
+ if the argument is null
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Fri Sep 06 15:09:44 2013 -0700
@@ -126,7 +126,7 @@
return (FieldDoc) tag.holder();
} else {
//This should never ever happen.
- throw new DocletAbortException();
+ throw new DocletAbortException("should not happen");
}
}
StringTokenizer st = new StringTokenizer(name, "#");
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -452,7 +452,7 @@
} else if (doc instanceof Parameter) {
annotations = ((Parameter) doc).annotations();
} else {
- throw new DocletAbortException();
+ throw new DocletAbortException("should not happen");
}
for (int i = 0; i < annotations.length; i++) {
AnnotationTypeDoc annotationDoc = annotations[i].annotationType();
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -197,7 +197,7 @@
}
} catch (IOException e) {
e.printStackTrace(System.err);
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -34,6 +34,11 @@
public class DocletAbortException extends RuntimeException {
private static final long serialVersionUID = -9131058909576418984L;
- public DocletAbortException() {
+ public DocletAbortException(String message) {
+ super(message);
+ }
+
+ public DocletAbortException(Throwable cause) {
+ super(cause);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -71,7 +71,7 @@
} catch (IOException exc) {
configuration.message.error("doclet.exception_encountered",
exc.toString(), DocPaths.PACKAGE_LIST);
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -77,7 +77,7 @@
Path dir = fileManager.getDefaultFileSystem().getPath(dirName);
fileManager.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(dir));
} catch (IOException e) {
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -269,7 +269,7 @@
configuration.message.error(
"doclet.Unable_to_create_directory_0", dir.getPath());
- throw new DocletAbortException();
+ throw new DocletAbortException("can't create directory");
}
/** Return a string to identify the contents of this object,
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -79,7 +79,7 @@
File dir = new File(dirName);
fileManager.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(dir));
} catch (IOException e) {
- throw new DocletAbortException();
+ throw new DocletAbortException(e);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Fri Sep 06 15:09:44 2013 -0700
@@ -241,9 +241,9 @@
first = false;
}
} catch (SecurityException exc) {
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
} catch (IOException exc) {
- throw new DocletAbortException();
+ throw new DocletAbortException(exc);
}
}
@@ -667,16 +667,28 @@
for (int j = 0; j < methods.length; j++) {
MethodDoc currentMethod = methods[j];
if (currentMethod.name().equals("values") &&
- currentMethod.parameters().length == 0) {
- currentMethod.setRawCommentText(
- configuration.getText("doclet.enum_values_doc", classDoc.name()));
+ currentMethod.parameters().length == 0) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(configuration.getText("doclet.enum_values_doc.main", classDoc.name()));
+ sb.append("\n@return ");
+ sb.append(configuration.getText("doclet.enum_values_doc.return"));
+ currentMethod.setRawCommentText(sb.toString());
} else if (currentMethod.name().equals("valueOf") &&
- currentMethod.parameters().length == 1) {
+ currentMethod.parameters().length == 1) {
Type paramType = currentMethod.parameters()[0].type();
if (paramType != null &&
- paramType.qualifiedTypeName().equals(String.class.getName())) {
- currentMethod.setRawCommentText(
- configuration.getText("doclet.enum_valueof_doc"));
+ paramType.qualifiedTypeName().equals(String.class.getName())) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(configuration.getText("doclet.enum_valueof_doc.main", classDoc.name()));
+ sb.append("\n@param name ");
+ sb.append(configuration.getText("doclet.enum_valueof_doc.param_name"));
+ sb.append("\n@return ");
+ sb.append(configuration.getText("doclet.enum_valueof_doc.return"));
+ sb.append("\n@throws IllegalArgumentException ");
+ sb.append(configuration.getText("doclet.enum_valueof_doc.throws_ila"));
+ sb.append("\n@throws NullPointerException ");
+ sb.append(configuration.getText("doclet.enum_valueof_doc.throws_npe"));
+ currentMethod.setRawCommentText(sb.toString());
}
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclint/HtmlTag.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/doclint/HtmlTag.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,7 @@
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import javax.lang.model.element.Name;
@@ -41,12 +42,14 @@
*
* The intent of this class is to embody the semantics of W3C HTML 4.01
* to the extent supported/used by javadoc.
+ * In time, we may wish to transition javadoc and doclint to using HTML 5.
*
* This is derivative of com.sun.tools.doclets.formats.html.markup.HtmlTag.
* Eventually, these two should be merged back together, and possibly made
* public.
*
* @see <a href="http://www.w3.org/TR/REC-html40/">HTML 4.01 Specification</a>
+ * @see <a href="http://www.w3.org/TR/html5/">HTML 5 Specification</a>
* @author Bhavesh Patel
* @author Jonathan Gibbons (revised)
*/
@@ -118,7 +121,8 @@
HEAD(BlockType.OTHER, EndKind.REQUIRED),
- HR(BlockType.BLOCK, EndKind.NONE),
+ HR(BlockType.BLOCK, EndKind.NONE,
+ attrs(AttrKind.OK, WIDTH)), // OK in 4.01; not allowed in 5
HTML(BlockType.OTHER, EndKind.REQUIRED),
@@ -151,7 +155,7 @@
OL(BlockType.BLOCK, EndKind.REQUIRED,
EnumSet.of(Flag.EXPECT_CONTENT),
- attrs(AttrKind.USE_CSS, START, TYPE)){
+ attrs(AttrKind.OK, START, TYPE)) {
@Override
public boolean accepts(HtmlTag t) {
return (t == LI);
@@ -195,8 +199,8 @@
TABLE(BlockType.BLOCK, EndKind.REQUIRED,
EnumSet.of(Flag.EXPECT_CONTENT),
attrs(AttrKind.OK, SUMMARY, Attr.FRAME, RULES, BORDER,
- CELLPADDING, CELLSPACING),
- attrs(AttrKind.USE_CSS, ALIGN, WIDTH, BGCOLOR)) {
+ CELLPADDING, CELLSPACING, WIDTH), // width OK in 4.01; not allowed in 5
+ attrs(AttrKind.USE_CSS, ALIGN, BGCOLOR)) {
@Override
public boolean accepts(HtmlTag t) {
switch (t) {
@@ -266,7 +270,7 @@
UL(BlockType.BLOCK, EndKind.REQUIRED,
EnumSet.of(Flag.EXPECT_CONTENT),
- attrs(AttrKind.USE_CSS, COMPACT, TYPE)){
+ attrs(AttrKind.OK, COMPACT, TYPE)) { // OK in 4.01; not allowed in 5
@Override
public boolean accepts(HtmlTag t) {
return (t == LI);
@@ -345,7 +349,7 @@
WIDTH;
public String getText() {
- return name().toLowerCase();
+ return toLowerCase(name());
}
static final Map<String,Attr> index = new HashMap<String,Attr>();
@@ -424,11 +428,11 @@
}
public String getText() {
- return name().toLowerCase();
+ return toLowerCase(name());
}
public Attr getAttr(Name attrName) {
- return Attr.index.get(attrName.toString().toLowerCase());
+ return Attr.index.get(toLowerCase(attrName.toString()));
}
public AttrKind getAttrKind(Name attrName) {
@@ -450,6 +454,10 @@
}
static HtmlTag get(Name tagName) {
- return index.get(tagName.toString().toLowerCase());
+ return index.get(toLowerCase(tagName.toString()));
+ }
+
+ private static String toLowerCase(String s) {
+ return s.toLowerCase(Locale.US);
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java Fri Sep 06 15:09:44 2013 -0700
@@ -340,6 +340,14 @@
}
}
+ public static class UnresolvedClass extends Error {
+ public Type classType;
+ public UnresolvedClass(Type type, Type classType) {
+ super(type);
+ this.classType = classType;
+ }
+ }
+
/** A visitor type for dynamic dispatch on the kind of attribute value. */
public static interface Visitor {
void visitConstant(Attribute.Constant value);
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,6 @@
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.Type.ArrayType;
@@ -191,7 +189,7 @@
void printBaseElementType(Type t, StringBuilder sb, Locale locale) {
Type arrel = t;
- while (arrel.getKind() == TypeKind.ARRAY) {
+ while (arrel.hasTag(TypeTag.ARRAY)) {
arrel = arrel.unannotatedType();
arrel = ((ArrayType) arrel).elemtype;
}
@@ -200,7 +198,7 @@
void printBrackets(Type t, StringBuilder sb, Locale locale) {
Type arrel = t;
- while (arrel.getKind() == TypeKind.ARRAY) {
+ while (arrel.hasTag(TypeTag.ARRAY)) {
if (arrel.isAnnotated()) {
sb.append(' ');
sb.append(arrel.getAnnotationMirrors());
@@ -264,12 +262,12 @@
public String visitAnnotatedType(AnnotatedType t, Locale locale) {
if (t.typeAnnotations != null &&
t.typeAnnotations.nonEmpty()) {
- if (t.underlyingType.getKind() == TypeKind.ARRAY) {
+ if (t.underlyingType.hasTag(TypeTag.ARRAY)) {
StringBuilder res = new StringBuilder();
printBaseElementType(t, res, locale);
printBrackets(t, res, locale);
return res.toString();
- } else if (t.underlyingType.getKind() == TypeKind.DECLARED &&
+ } else if (t.underlyingType.hasTag(TypeTag.CLASS) &&
t.underlyingType.getEnclosingType() != Type.noType) {
return visit(t.underlyingType.getEnclosingType(), locale) +
". " +
@@ -348,7 +346,7 @@
args = args.tail;
buf.append(',');
}
- if (args.head.unannotatedType().getKind() == TypeKind.ARRAY) {
+ if (args.head.unannotatedType().hasTag(TypeTag.ARRAY)) {
buf.append(visit(((ArrayType) args.head.unannotatedType()).elemtype, locale));
if (args.head.getAnnotationMirrors().nonEmpty()) {
buf.append(' ');
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Fri Sep 06 15:09:44 2013 -0700
@@ -199,7 +199,7 @@
}
public void enter(Symbol sym, Scope s) {
- enter(sym, s, s);
+ enter(sym, s, s, false);
}
/**
@@ -207,7 +207,7 @@
* given scope `s' accessed through `origin'. The last two
* arguments are only used in import scopes.
*/
- public void enter(Symbol sym, Scope s, Scope origin) {
+ public void enter(Symbol sym, Scope s, Scope origin, boolean staticallyImported) {
Assert.check(shared == 0);
if (nelems * 3 >= hashMask * 2)
dble();
@@ -217,7 +217,7 @@
old = sentinel;
nelems++;
}
- Entry e = makeEntry(sym, old, elems, s, origin);
+ Entry e = makeEntry(sym, old, elems, s, origin, staticallyImported);
table[hash] = e;
elems = e;
@@ -227,7 +227,7 @@
}
}
- Entry makeEntry(Symbol sym, Entry shadowed, Entry sibling, Scope scope, Scope origin) {
+ Entry makeEntry(Symbol sym, Entry shadowed, Entry sibling, Scope scope, Scope origin, boolean staticallyImported) {
return new Entry(sym, shadowed, sibling, scope);
}
@@ -499,6 +499,10 @@
else return shadowed.next(sf);
}
+ public boolean isStaticallyImported() {
+ return false;
+ }
+
public Scope getOrigin() {
// The origin is only recorded for import scopes. For all
// other scope entries, the "enclosing" type is available
@@ -517,20 +521,19 @@
}
@Override
- Entry makeEntry(Symbol sym, Entry shadowed, Entry sibling, Scope scope, Scope origin) {
- return new ImportEntry(sym, shadowed, sibling, scope, origin);
- }
-
- static class ImportEntry extends Entry {
- private Scope origin;
+ Entry makeEntry(Symbol sym, Entry shadowed, Entry sibling, Scope scope,
+ final Scope origin, final boolean staticallyImported) {
+ return new Entry(sym, shadowed, sibling, scope) {
+ @Override
+ public Scope getOrigin() {
+ return origin;
+ }
- ImportEntry(Symbol sym, Entry shadowed, Entry sibling, Scope scope, Scope origin) {
- super(sym, shadowed, sibling, scope);
- this.origin = origin;
- }
-
- @Override
- public Scope getOrigin() { return origin; }
+ @Override
+ public boolean isStaticallyImported() {
+ return staticallyImported;
+ }
+ };
}
}
@@ -724,7 +727,7 @@
}
@Override
- public void enter(Symbol sym, Scope s, Scope origin) {
+ public void enter(Symbol sym, Scope s, Scope origin, boolean staticallyImported) {
throw new UnsupportedOperationException();
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Fri Sep 06 15:09:44 2013 -0700
@@ -463,26 +463,34 @@
return false;
}
- /** Check for hiding. Note that this doesn't handle multiple
- * (interface) inheritance. */
private boolean hiddenIn(ClassSymbol clazz, Types types) {
- if (kind == MTH && (flags() & STATIC) == 0) return false;
- while (true) {
- if (owner == clazz) return false;
- Scope.Entry e = clazz.members().lookup(name);
- while (e.scope != null) {
- if (e.sym == this) return false;
- if (e.sym.kind == kind &&
+ Symbol sym = hiddenInInternal(clazz, types);
+ return sym != null && sym != this;
+ }
+
+ private Symbol hiddenInInternal(ClassSymbol c, Types types) {
+ Scope.Entry e = c.members().lookup(name);
+ while (e.scope != null) {
+ if (e.sym.kind == kind &&
(kind != MTH ||
- (e.sym.flags() & STATIC) != 0 &&
- types.isSubSignature(e.sym.type, type)))
- return true;
- e = e.next();
+ (e.sym.flags() & STATIC) != 0 &&
+ types.isSubSignature(e.sym.type, type))) {
+ return e.sym;
}
- Type superType = types.supertype(clazz.type);
- if (!superType.hasTag(CLASS)) return false;
- clazz = (ClassSymbol)superType.tsym;
+ e = e.next();
}
+ List<Symbol> hiddenSyms = List.nil();
+ for (Type st : types.interfaces(c.type).prepend(types.supertype(c.type))) {
+ if (st != null && (st.hasTag(CLASS))) {
+ Symbol sym = hiddenInInternal((ClassSymbol)st.tsym, types);
+ if (sym != null) {
+ hiddenSyms = hiddenSyms.prepend(hiddenInInternal((ClassSymbol)st.tsym, types));
+ }
+ }
+ }
+ return hiddenSyms.contains(this) ?
+ this :
+ (hiddenSyms.isEmpty() ? null : hiddenSyms.head);
}
/** Is this symbol inherited into a given class?
@@ -1171,7 +1179,7 @@
/**
* The variable's constant value, if this is a constant.
* Before the constant value is evaluated, it points to an
- * initalizer environment. If this is not a constant, it can
+ * initializer environment. If this is not a constant, it can
* be used for other stuff.
*/
private Object data;
@@ -1223,6 +1231,9 @@
/** The extra (synthetic/mandated) parameters of the method. */
public List<VarSymbol> extraParams = List.nil();
+ /** The captured local variables in an anonymous class */
+ public List<VarSymbol> capturedLocals = List.nil();
+
/** The parameters of the method. */
public List<VarSymbol> params = null;
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Fri Sep 06 15:09:44 2013 -0700
@@ -1161,7 +1161,7 @@
}
public boolean contains(Type elem) {
- return elem == this || contains(argtypes, elem) || restype.contains(elem);
+ return elem == this || contains(argtypes, elem) || restype.contains(elem) || contains(thrown, elem);
}
public MethodType asMethodType() { return this; }
@@ -1525,7 +1525,7 @@
}
protected void addBound(InferenceBound ib, Type bound, Types types, boolean update) {
- Type bound2 = toTypeVarMap.apply(bound);
+ Type bound2 = toTypeVarMap.apply(bound).baseType();
List<Type> prevBounds = bounds.get(ib);
for (Type b : prevBounds) {
//check for redundancy - use strict version of isSameType on tvars
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,8 @@
import javax.lang.model.element.ElementKind;
import javax.lang.model.type.TypeKind;
+import javax.tools.JavaFileObject;
+
import com.sun.tools.javac.code.Attribute;
import com.sun.tools.javac.code.Attribute.TypeCompound;
import com.sun.tools.javac.code.Flags;
@@ -52,12 +54,16 @@
import com.sun.tools.javac.code.Symbol.MethodSymbol;
import com.sun.tools.javac.comp.Annotate;
import com.sun.tools.javac.comp.Annotate.Annotator;
+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.TreeInfo;
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.JCLambda;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
+import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
import com.sun.tools.javac.tree.JCTree.JCNewClass;
import com.sun.tools.javac.tree.JCTree.JCTypeApply;
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
@@ -90,11 +96,17 @@
* later processing.
*/
public static void organizeTypeAnnotationsSignatures(final Symtab syms, final Names names,
- final Log log, final JCClassDecl tree, Annotate annotate) {
+ final Log log, final Env<AttrContext> env, final JCClassDecl tree, final Annotate annotate) {
annotate.afterRepeated( new Annotator() {
@Override
public void enterAnnotation() {
- new TypeAnnotationPositions(syms, names, log, true).scan(tree);
+ JavaFileObject oldSource = log.useSource(env.toplevel.sourcefile);
+
+ try {
+ new TypeAnnotationPositions(syms, names, log, true).scan(tree);
+ } finally {
+ log.useSource(oldSource);
+ }
}
} );
}
@@ -906,7 +918,14 @@
if (!invocation.typeargs.contains(tree)) {
Assert.error("{" + tree + "} is not an argument in the invocation: " + invocation);
}
- p.type = TargetType.METHOD_INVOCATION_TYPE_ARGUMENT;
+ MethodSymbol exsym = (MethodSymbol) TreeInfo.symbol(invocation.getMethodSelect());
+ if (exsym == null) {
+ Assert.error("could not determine symbol for {" + invocation + "}");
+ } else if (exsym.isConstructor()) {
+ p.type = TargetType.CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT;
+ } else {
+ p.type = TargetType.METHOD_INVOCATION_TYPE_ARGUMENT;
+ }
p.pos = invocation.pos;
p.type_index = invocation.typeargs.indexOf(tree);
return;
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Fri Sep 06 15:09:44 2013 -0700
@@ -505,12 +505,27 @@
//merge thrown types - form the intersection of all the thrown types in
//all the signatures in the list
+ boolean toErase = !bestSoFar.type.hasTag(FORALL);
List<Type> thrown = null;
- for (Symbol msym1 : methodSyms) {
- Type mt1 = memberType(origin.type, msym1);
+ Type mt1 = memberType(origin.type, bestSoFar);
+ for (Symbol msym2 : methodSyms) {
+ Type mt2 = memberType(origin.type, msym2);
+ List<Type> thrown_mt2 = mt2.getThrownTypes();
+ if (toErase) {
+ thrown_mt2 = erasure(thrown_mt2);
+ } else {
+ /* If bestSoFar is generic then all the methods are generic.
+ * The opposite is not true: a non generic method can override
+ * a generic method (raw override) so it's safe to cast mt1 and
+ * mt2 to ForAll.
+ */
+ ForAll fa1 = (ForAll)mt1;
+ ForAll fa2 = (ForAll)mt2;
+ thrown_mt2 = subst(thrown_mt2, fa2.tvars, fa1.tvars);
+ }
thrown = (thrown == null) ?
- mt1.getThrownTypes() :
- chk.intersect(mt1.getThrownTypes(), thrown);
+ thrown_mt2 :
+ chk.intersect(thrown_mt2, thrown);
}
final List<Type> thrown1 = thrown;
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Fri Sep 06 15:09:44 2013 -0700
@@ -332,8 +332,20 @@
}
if (expected.tsym == syms.classType.tsym) {
Type result = attr.attribExpr(tree, env, expected);
- if (result.isErroneous())
- return new Attribute.Error(expected);
+ if (result.isErroneous()) {
+ // Does it look like a class literal?
+ if (TreeInfo.name(tree) == names._class) {
+ Name n = (((JCFieldAccess) tree).selected).type.tsym.flatName();
+ return new Attribute.UnresolvedClass(expected,
+ types.createErrorType(n,
+ syms.unknownSymbol, syms.classType));
+ } else {
+ return new Attribute.Error(expected);
+ }
+ }
+
+ // Class literals look like field accesses of a field named class
+ // at the tree level
if (TreeInfo.name(tree) != names._class) {
log.error(tree.pos(), "annotation.value.must.be.class.literal");
return new Attribute.Error(expected);
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Fri Sep 06 15:09:44 2013 -0700
@@ -398,7 +398,7 @@
@Override
public Symbol visitMemberSelect(MemberSelectTree node, Env<AttrContext> env) {
Symbol site = visit(node.getExpression(), env);
- if (site.kind == ERR)
+ if (site.kind == ERR || site.kind == ABSENT_TYP)
return site;
Name name = (Name)node.getIdentifier();
if (site.kind == PCK) {
@@ -1063,9 +1063,7 @@
if (tree.init != null) {
if ((v.flags_field & FINAL) != 0 &&
- !tree.init.hasTag(NEWCLASS) &&
- !tree.init.hasTag(LAMBDA) &&
- !tree.init.hasTag(REFERENCE)) {
+ memberEnter.needsLazyConstValue(tree.init)) {
// In this case, `v' is final. Ensure that it's initializer is
// evaluated.
v.getConstValue(); // ensure initializer is evaluated
@@ -2395,7 +2393,7 @@
ResultInfo bodyResultInfo = lambdaType.getReturnType() == Type.recoveryType ?
recoveryInfo :
- new LambdaResultInfo(lambdaType.getReturnType(), funcContext);
+ new ResultInfo(VAL, lambdaType.getReturnType(), funcContext);
localEnv.info.returnResult = bodyResultInfo;
Log.DeferredDiagnosticHandler lambdaDeferredHandler = new Log.DeferredDiagnosticHandler(log);
@@ -2602,35 +2600,12 @@
}
}
- class LambdaResultInfo extends ResultInfo {
-
- LambdaResultInfo(Type pt, CheckContext checkContext) {
- super(VAL, pt, checkContext);
- }
-
- @Override
- protected Type check(DiagnosticPosition pos, Type found) {
- return super.check(pos, found.baseType());
- }
-
- @Override
- protected ResultInfo dup(CheckContext newContext) {
- return new LambdaResultInfo(pt, newContext);
- }
-
- @Override
- protected ResultInfo dup(Type newPt) {
- return new LambdaResultInfo(newPt, checkContext);
- }
- }
-
/**
* Lambda compatibility. Check that given return types, thrown types, parameter types
* are compatible with the expected functional interface descriptor. This means that:
* (i) parameter types must be identical to those of the target descriptor; (ii) return
* types must be compatible with the return type of the expected descriptor;
- * (iii) thrown types must be 'included' in the thrown types list of the expected
- * descriptor.
+ * (iii) finish inference of thrown types if required.
*/
private void checkLambdaCompatible(JCLambda tree, Type descriptor, CheckContext checkContext, boolean speculativeAttr) {
Type returnType = checkContext.inferenceContext().asFree(descriptor.getReturnType());
@@ -2652,9 +2627,7 @@
if (!speculativeAttr) {
List<Type> thrownTypes = checkContext.inferenceContext().asFree(descriptor.getThrownTypes());
- if (chk.unhandled(tree.inferredThrownTypes == null ? List.<Type>nil() : tree.inferredThrownTypes, thrownTypes).nonEmpty()) {
- log.error(tree, "incompatible.thrown.types.in.lambda", tree.inferredThrownTypes);
- }
+ chk.unhandled(tree.inferredThrownTypes == null ? List.<Type>nil() : tree.inferredThrownTypes, thrownTypes);
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Fri Sep 06 15:09:44 2013 -0700
@@ -875,19 +875,23 @@
}
Type owntype = mtype;
List<Type> formals = owntype.getParameterTypes();
+ List<Type> nonInferred = sym.type.getParameterTypes();
+ if (nonInferred.length() != formals.length()) nonInferred = formals;
Type last = useVarargs ? formals.last() : null;
- if (sym.name == names.init &&
- sym.owner == syms.enumSym)
- formals = formals.tail.tail;
+ if (sym.name == names.init && sym.owner == syms.enumSym) {
+ formals = formals.tail.tail;
+ nonInferred = nonInferred.tail.tail;
+ }
List<JCExpression> args = argtrees;
if (args != null) {
//this is null when type-checking a method reference
while (formals.head != last) {
JCTree arg = args.head;
- Warner warn = convertWarner(arg.pos(), arg.type, formals.head);
+ Warner warn = convertWarner(arg.pos(), arg.type, nonInferred.head);
assertConvertible(arg, arg.type, formals.head, warn);
args = args.tail;
formals = formals.tail;
+ nonInferred = nonInferred.tail;
}
if (useVarargs) {
Type varArg = types.elemtype(last);
@@ -903,17 +907,17 @@
Type varParam = owntype.getParameterTypes().last();
Type lastArg = argtypes.last();
if (types.isSubtypeUnchecked(lastArg, types.elemtype(varParam)) &&
- !types.isSameType(types.erasure(varParam), types.erasure(lastArg)))
+ !types.isSameType(types.erasure(varParam), types.erasure(lastArg)))
log.warning(argtrees.last().pos(), "inexact.non-varargs.call",
- types.elemtype(varParam), varParam);
+ types.elemtype(varParam), varParam);
}
}
if (useVarargs) {
Type argtype = owntype.getParameterTypes().last();
if (!types.isReifiable(argtype) &&
- (!allowSimplifiedVarargs ||
- sym.attribute(syms.trustMeType.tsym) == null ||
- !isTrustMeAllowedOnMethod(sym))) {
+ (!allowSimplifiedVarargs ||
+ sym.attribute(syms.trustMeType.tsym) == null ||
+ !isTrustMeAllowedOnMethod(sym))) {
warnUnchecked(env.tree.pos(),
"unchecked.generic.array.creation",
argtype);
@@ -929,15 +933,15 @@
return owntype;
}
//where
- private void assertConvertible(JCTree tree, Type actual, Type formal, Warner warn) {
- if (types.isConvertible(actual, formal, warn))
- return;
-
- if (formal.isCompound()
- && types.isSubtype(actual, types.supertype(formal))
- && types.isSubtypeUnchecked(actual, types.interfaces(formal), warn))
- return;
- }
+ private void assertConvertible(JCTree tree, Type actual, Type formal, Warner warn) {
+ if (types.isConvertible(actual, formal, warn))
+ return;
+
+ if (formal.isCompound()
+ && types.isSubtype(actual, types.supertype(formal))
+ && types.isSubtypeUnchecked(actual, types.interfaces(formal), warn))
+ return;
+ }
/**
* Check that type 't' is a valid instantiation of a generic class
@@ -1747,7 +1751,7 @@
if (!sup.hasTag(CLASS)) return;
for (Type t1 = sup;
- t1.tsym.type.isParameterized();
+ t1.hasTag(CLASS) && t1.tsym.type.isParameterized();
t1 = types.supertype(t1)) {
for (Scope.Entry e1 = t1.tsym.members().elems;
e1 != null;
@@ -2212,11 +2216,11 @@
if (t.hasTag(TYPEVAR) && (t.tsym.flags() & UNATTRIBUTED) != 0)
return;
if (seen.contains(t)) {
- tv = (TypeVar)t;
+ tv = (TypeVar)t.unannotatedType();
tv.bound = types.createErrorType(t);
log.error(pos, "cyclic.inheritance", t);
} else if (t.hasTag(TYPEVAR)) {
- tv = (TypeVar)t;
+ tv = (TypeVar)t.unannotatedType();
seen = seen.prepend(tv);
for (Type b : types.getBounds(tv))
checkNonCyclic1(pos, b, seen);
@@ -3329,14 +3333,15 @@
boolean isClassDecl = e.scope == s;
if ((isClassDecl || sym != e.sym) &&
sym.kind == e.sym.kind &&
- sym.name != names.error) {
+ sym.name != names.error &&
+ (!staticImport || !e.isStaticallyImported())) {
if (!e.sym.type.isErroneous()) {
String what = e.sym.toString();
if (!isClassDecl) {
if (staticImport)
log.error(pos, "already.defined.static.single.import", what);
else
- log.error(pos, "already.defined.single.import", what);
+ log.error(pos, "already.defined.single.import", what);
}
else if (sym != e.sym)
log.error(pos, "already.defined.this.unit", what);
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Fri Sep 06 15:09:44 2013 -0700
@@ -291,7 +291,7 @@
if (tree.packageAnnotations.nonEmpty() || pkginfoOpt == PkgInfo.ALWAYS) {
if (isPkgInfo) {
addEnv = true;
- } else {
+ } else if (tree.packageAnnotations.nonEmpty()){
log.error(tree.packageAnnotations.head.pos(),
"pkg.annotations.sb.in.package-info.java");
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Fri Sep 06 15:09:44 2013 -0700
@@ -224,7 +224,7 @@
}
try {
new AliveAnalyzer().analyzeTree(env, that, make);
- new FlowAnalyzer().analyzeTree(env, that, make);
+ new LambdaFlowAnalyzer().analyzeTree(env, that, make);
} finally {
if (!speculative) {
log.popDiagnosticHandler(diagHandler);
@@ -1259,12 +1259,24 @@
ListBuffer<FlowPendingExit> prevPending = pendingExits;
try {
pendingExits = ListBuffer.lb();
- caught = List.of(syms.throwableType); //inhibit exception checking
+ caught = tree.getDescriptorType(types).getThrownTypes();
thrown = List.nil();
scan(tree.body);
- tree.inferredThrownTypes = thrown;
- }
- finally {
+ List<FlowPendingExit> exits = pendingExits.toList();
+ pendingExits = new ListBuffer<FlowPendingExit>();
+ while (exits.nonEmpty()) {
+ FlowPendingExit exit = exits.head;
+ exits = exits.tail;
+ if (exit.thrown == null) {
+ Assert.check(exit.tree.hasTag(RETURN));
+ } else {
+ // uncaught throws will be reported later
+ pendingExits.append(exit);
+ }
+ }
+
+ errorUncaught();
+ } finally {
pendingExits = prevPending;
caught = prevCaught;
thrown = prevThrown;
@@ -1303,6 +1315,33 @@
}
/**
+ * Specialized pass that performs inference of thrown types for lambdas.
+ */
+ class LambdaFlowAnalyzer extends FlowAnalyzer {
+ @Override
+ public void visitLambda(JCLambda tree) {
+ if (tree.type != null &&
+ tree.type.isErroneous()) {
+ return;
+ }
+ List<Type> prevCaught = caught;
+ List<Type> prevThrown = thrown;
+ ListBuffer<FlowPendingExit> prevPending = pendingExits;
+ try {
+ pendingExits = ListBuffer.lb();
+ caught = List.of(syms.throwableType);
+ thrown = List.nil();
+ scan(tree.body);
+ tree.inferredThrownTypes = thrown;
+ } finally {
+ pendingExits = prevPending;
+ caught = prevCaught;
+ thrown = prevThrown;
+ }
+ }
+ }
+
+ /**
* This pass implements (i) definite assignment analysis, which ensures that
* each variable is assigned when used and (ii) definite unassignment analysis,
* which ensures that no final variable is assigned more than once. This visitor
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Fri Sep 06 15:09:44 2013 -0700
@@ -249,7 +249,7 @@
MethodType lambdaType = (MethodType) sym.type;
{
- MethodSymbol owner = (MethodSymbol) localContext.owner;
+ Symbol owner = localContext.owner;
ListBuffer<Attribute.TypeCompound> ownerTypeAnnos = new ListBuffer<Attribute.TypeCompound>();
ListBuffer<Attribute.TypeCompound> lambdaTypeAnnos = new ListBuffer<Attribute.TypeCompound>();
@@ -473,7 +473,7 @@
//non-void to non-void conversion:
// return (TYPE)BODY;
JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype);
- return make.Block(0, List.<JCStatement>of(make.Return(retExpr)));
+ return make.at(retExpr).Block(0, List.<JCStatement>of(make.Return(retExpr)));
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Fri Sep 06 15:09:44 2013 -0700
@@ -356,22 +356,44 @@
}
}
+ ClassSymbol ownerToCopyFreeVarsFrom(ClassSymbol c) {
+ if (!c.isLocal()) {
+ return null;
+ }
+ Symbol currentOwner = c.owner;
+ while ((currentOwner.owner.kind & TYP) != 0 && currentOwner.isLocal()) {
+ currentOwner = currentOwner.owner;
+ }
+ if ((currentOwner.owner.kind & (VAR | MTH)) != 0 && c.isSubClass(currentOwner, types)) {
+ return (ClassSymbol)currentOwner;
+ }
+ return null;
+ }
+
/** Return the variables accessed from within a local class, which
* are declared in the local class' owner.
* (in reverse order of first access).
*/
List<VarSymbol> freevars(ClassSymbol c) {
+ List<VarSymbol> fvs = freevarCache.get(c);
+ if (fvs != null) {
+ return fvs;
+ }
if ((c.owner.kind & (VAR | MTH)) != 0) {
- List<VarSymbol> fvs = freevarCache.get(c);
- if (fvs == null) {
- FreeVarCollector collector = new FreeVarCollector(c);
- collector.scan(classDef(c));
- fvs = collector.fvs;
- freevarCache.put(c, fvs);
- }
+ FreeVarCollector collector = new FreeVarCollector(c);
+ collector.scan(classDef(c));
+ fvs = collector.fvs;
+ freevarCache.put(c, fvs);
return fvs;
} else {
- return List.nil();
+ ClassSymbol owner = ownerToCopyFreeVarsFrom(c);
+ if (owner != null) {
+ fvs = freevarCache.get(owner);
+ freevarCache.put(c, fvs);
+ return fvs;
+ } else {
+ return List.nil();
+ }
}
}
@@ -1046,7 +1068,7 @@
boolean needsPrivateAccess(Symbol sym) {
if ((sym.flags() & PRIVATE) == 0 || sym.owner == currentClass) {
return false;
- } else if (sym.name == names.init && (sym.owner.owner.kind & (VAR | MTH)) != 0) {
+ } else if (sym.name == names.init && sym.owner.isLocal()) {
// private constructor in local class: relax protection
sym.flags_field &= ~PRIVATE;
return false;
@@ -2448,6 +2470,7 @@
tree.name = Convert.shortName(currentClass.flatName());
// Add this$n and free variables proxy definitions to class.
+
for (List<JCVariableDecl> l = fvdefs; l.nonEmpty(); l = l.tail) {
tree.defs = tree.defs.prepend(l.head);
enterSynthetic(tree.pos(), l.head.sym, currentClass.members());
@@ -2670,8 +2693,7 @@
//where
private void visitMethodDefInternal(JCMethodDecl tree) {
if (tree.name == names.init &&
- (currentClass.isInner() ||
- (currentClass.owner.kind & (VAR | MTH)) != 0)) {
+ (currentClass.isInner() || currentClass.isLocal())) {
// We are seeing a constructor of an inner class.
MethodSymbol m = tree.sym;
@@ -2713,9 +2735,9 @@
for (List<VarSymbol> l = fvs; l.nonEmpty(); l = l.tail) {
if (TreeInfo.isInitialConstructor(tree)) {
final Name pName = proxyName(l.head.name);
- m.extraParams =
- m.extraParams.append((VarSymbol)
- (proxies.lookup(pName).sym));
+ m.capturedLocals =
+ m.capturedLocals.append((VarSymbol)
+ (proxies.lookup(pName).sym));
added = added.prepend(
initField(tree.body.pos, pName));
}
@@ -2818,7 +2840,7 @@
// If created class is local, add free variables after
// explicit constructor arguments.
- if ((c.owner.kind & (VAR | MTH)) != 0) {
+ if (c.isLocal()) {
tree.args = tree.args.appendList(loadFreevars(tree.pos(), freevars(c)));
}
@@ -2837,7 +2859,7 @@
if (tree.encl != null) {
thisArg = attr.makeNullCheck(translate(tree.encl));
thisArg.type = tree.encl.type;
- } else if ((c.owner.kind & (MTH | VAR)) != 0) {
+ } else if (c.isLocal()) {
// local class
thisArg = makeThis(tree.pos(), c.type.getEnclosingType().tsym);
} else {
@@ -2966,7 +2988,7 @@
// If we are calling a constructor of a local class, add
// free variables after explicit constructor arguments.
ClassSymbol c = (ClassSymbol)constructor.owner;
- if ((c.owner.kind & (VAR | MTH)) != 0) {
+ if (c.isLocal()) {
tree.args = tree.args.appendList(loadFreevars(tree.pos(), freevars(c)));
}
@@ -2994,7 +3016,7 @@
makeNullCheck(translate(((JCFieldAccess) tree.meth).selected));
tree.meth = make.Ident(constructor);
((JCIdent) tree.meth).name = methName;
- } else if ((c.owner.kind & (MTH | VAR)) != 0 || methName == names._this){
+ } else if (c.isLocal() || methName == names._this){
// local class or this() call
thisArg = makeThis(tree.meth.pos(), c.type.getEnclosingType().tsym);
} else {
@@ -3436,7 +3458,7 @@
eType,
List.<Type>nil());
VarSymbol itvar = new VarSymbol(0, names.fromString("i" + target.syntheticNameChar()),
- types.erasure(iterator.type.getReturnType()),
+ types.erasure(types.asSuper(iterator.type.getReturnType(), syms.iteratorType.tsym)),
currentMethodSym);
JCStatement init = make.
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Fri Sep 06 15:09:44 2013 -0700
@@ -189,7 +189,7 @@
staticImportAccessible(sym, packge) &&
sym.isMemberOf(origin, types) &&
!toScope.includes(sym))
- toScope.enter(sym, fromScope, origin.members());
+ toScope.enter(sym, fromScope, origin.members(), true);
}
}
}.importFrom(tsym);
@@ -217,7 +217,7 @@
staticImportAccessible(sym, packge) &&
!toScope.includes(sym) &&
sym.isMemberOf(origin, types)) {
- toScope.enter(sym, fromScope, origin.members());
+ toScope.enter(sym, fromScope, origin.members(), true);
}
}
}
@@ -283,7 +283,7 @@
staticImportAccessible(sym, packge) &&
sym.isMemberOf(origin, types) &&
chk.checkUniqueStaticImport(pos, sym, toScope))
- toScope.enter(sym, sym.owner.members(), origin.members());
+ toScope.enter(sym, sym.owner.members(), origin.members(), true);
}
}
}.importFrom(tsym);
@@ -313,9 +313,9 @@
staticImportAccessible(sym, packge) &&
sym.isMemberOf(origin, types)) {
found = true;
- if (sym.kind == MTH ||
- sym.kind != TYP && chk.checkUniqueStaticImport(pos, sym, toScope))
- toScope.enter(sym, sym.owner.members(), origin.members());
+ if (sym.kind != TYP) {
+ toScope.enter(sym, sym.owner.members(), origin.members(), true);
+ }
}
}
}
@@ -677,8 +677,7 @@
if (tree.init != null) {
v.flags_field |= HASINIT;
if ((v.flags_field & FINAL) != 0 &&
- !tree.init.hasTag(NEWCLASS) &&
- !tree.init.hasTag(LAMBDA)) {
+ needsLazyConstValue(tree.init)) {
Env<AttrContext> initEnv = getInitEnv(tree, env);
initEnv.info.enclVar = v;
v.setLazyConstValue(initEnv(tree, initEnv), attr, tree.init);
@@ -700,6 +699,59 @@
}
}
+ public boolean needsLazyConstValue(JCTree tree) {
+ InitTreeVisitor initTreeVisitor = new InitTreeVisitor();
+ tree.accept(initTreeVisitor);
+ return initTreeVisitor.result;
+ }
+
+ /** Visitor class for expressions which might be constant expressions.
+ */
+ static class InitTreeVisitor extends JCTree.Visitor {
+
+ private boolean result = true;
+
+ @Override
+ public void visitTree(JCTree tree) {}
+
+ @Override
+ public void visitNewClass(JCNewClass that) {
+ result = false;
+ }
+
+ @Override
+ public void visitLambda(JCLambda that) {
+ result = false;
+ }
+
+ @Override
+ public void visitReference(JCMemberReference that) {
+ result = false;
+ }
+
+ @Override
+ public void visitSelect(JCFieldAccess tree) {
+ tree.selected.accept(this);
+ }
+
+ @Override
+ public void visitConditional(JCConditional tree) {
+ tree.cond.accept(this);
+ tree.truepart.accept(this);
+ tree.falsepart.accept(this);
+ }
+
+ @Override
+ public void visitParens(JCParens tree) {
+ tree.expr.accept(this);
+ }
+
+ @Override
+ public void visitTypeCast(JCTypeCast tree) {
+ tree.expr.accept(this);
+ }
+ }
+
/** Create a fresh environment for a variable's initializer.
* If the variable is a field, the owner of the environment's scope
* is be the variable itself, otherwise the owner is the method
@@ -1089,7 +1141,7 @@
}
}
if (allowTypeAnnos) {
- TypeAnnotations.organizeTypeAnnotationsSignatures(syms, names, log, tree, annotate);
+ TypeAnnotations.organizeTypeAnnotationsSignatures(syms, names, log, env, tree, annotate);
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Fri Sep 06 15:09:44 2013 -0700
@@ -1344,32 +1344,23 @@
if (bestSoFar.exists())
return bestSoFar;
- Scope.Entry e = env.toplevel.namedImportScope.lookup(name);
- for (; e.scope != null; e = e.next()) {
- sym = e.sym;
- Type origin = e.getOrigin().owner.type;
- if (sym.kind == VAR) {
- if (e.sym.owner.type != origin)
- sym = sym.clone(e.getOrigin().owner);
- return isAccessible(env, origin, sym)
- ? sym : new AccessError(env, origin, sym);
+ Symbol origin = null;
+ for (Scope sc : new Scope[] { env.toplevel.namedImportScope, env.toplevel.starImportScope }) {
+ Scope.Entry e = sc.lookup(name);
+ for (; e.scope != null; e = e.next()) {
+ sym = e.sym;
+ if (sym.kind != VAR)
+ continue;
+ // invariant: sym.kind == VAR
+ if (bestSoFar.kind < AMBIGUOUS && sym.owner != bestSoFar.owner)
+ return new AmbiguityError(bestSoFar, sym);
+ else if (bestSoFar.kind >= VAR) {
+ origin = e.getOrigin().owner;
+ bestSoFar = isAccessible(env, origin.type, sym)
+ ? sym : new AccessError(env, origin.type, sym);
+ }
}
- }
-
- Symbol origin = null;
- e = env.toplevel.starImportScope.lookup(name);
- for (; e.scope != null; e = e.next()) {
- sym = e.sym;
- if (sym.kind != VAR)
- continue;
- // invariant: sym.kind == VAR
- if (bestSoFar.kind < AMBIGUOUS && sym.owner != bestSoFar.owner)
- return new AmbiguityError(bestSoFar, sym);
- else if (bestSoFar.kind >= VAR) {
- origin = e.getOrigin().owner;
- bestSoFar = isAccessible(env, origin.type, sym)
- ? sym : new AccessError(env, origin.type, sym);
- }
+ if (bestSoFar.exists()) break;
}
if (bestSoFar.kind == VAR && bestSoFar.owner.type != origin.type)
return bestSoFar.clone(origin);
@@ -1868,7 +1859,10 @@
}
}
- /** Find qualified member type.
+
+ /**
+ * Find a type declared in a scope (not inherited). Return null
+ * if none is found.
* @param env The current environment.
* @param site The original type from where the selection takes
* place.
@@ -1877,12 +1871,10 @@
* always a superclass or implemented interface of
* site's class.
*/
- Symbol findMemberType(Env<AttrContext> env,
- Type site,
- Name name,
- TypeSymbol c) {
- Symbol bestSoFar = typeNotFound;
- Symbol sym;
+ Symbol findImmediateMemberType(Env<AttrContext> env,
+ Type site,
+ Name name,
+ TypeSymbol c) {
Scope.Entry e = c.members().lookup(name);
while (e.scope != null) {
if (e.sym.kind == TYP) {
@@ -1892,6 +1884,24 @@
}
e = e.next();
}
+ return typeNotFound;
+ }
+
+ /** Find a member type inherited from a superclass or interface.
+ * @param env The current environment.
+ * @param site The original type from where the selection takes
+ * place.
+ * @param name The type's name.
+ * @param c The class to search for the member type. This is
+ * always a superclass or implemented interface of
+ * site's class.
+ */
+ Symbol findInheritedMemberType(Env<AttrContext> env,
+ Type site,
+ Name name,
+ TypeSymbol c) {
+ Symbol bestSoFar = typeNotFound;
+ Symbol sym;
Type st = types.supertype(c.type);
if (st != null && st.hasTag(CLASS)) {
sym = findMemberType(env, site, name, st.tsym);
@@ -1910,6 +1920,28 @@
return bestSoFar;
}
+ /** Find qualified member type.
+ * @param env The current environment.
+ * @param site The original type from where the selection takes
+ * place.
+ * @param name The type's name.
+ * @param c The class to search for the member type. This is
+ * always a superclass or implemented interface of
+ * site's class.
+ */
+ Symbol findMemberType(Env<AttrContext> env,
+ Type site,
+ Name name,
+ TypeSymbol c) {
+ Symbol sym = findImmediateMemberType(env, site, name, c);
+
+ if (sym != typeNotFound)
+ return sym;
+
+ return findInheritedMemberType(env, site, name, c);
+
+ }
+
/** Find a global type in given scope and load corresponding class.
* @param env The current environment.
* @param scope The scope in which to look for the type.
@@ -1928,6 +1960,21 @@
return bestSoFar;
}
+ Symbol findTypeVar(Env<AttrContext> env, Name name, boolean staticOnly) {
+ for (Scope.Entry e = env.info.scope.lookup(name);
+ e.scope != null;
+ e = e.next()) {
+ if (e.sym.kind == TYP) {
+ if (staticOnly &&
+ e.sym.type.hasTag(TYPEVAR) &&
+ e.sym.owner.kind == TYP)
+ return new StaticError(e.sym);
+ return e.sym;
+ }
+ }
+ return typeNotFound;
+ }
+
/** Find an unqualified type symbol.
* @param env The current environment.
* @param name The type's name.
@@ -1938,19 +1985,26 @@
boolean staticOnly = false;
for (Env<AttrContext> env1 = env; env1.outer != null; env1 = env1.outer) {
if (isStatic(env1)) staticOnly = true;
- for (Scope.Entry e = env1.info.scope.lookup(name);
- e.scope != null;
- e = e.next()) {
- if (e.sym.kind == TYP) {
- if (staticOnly &&
- e.sym.type.hasTag(TYPEVAR) &&
- e.sym.owner.kind == TYP) return new StaticError(e.sym);
- return e.sym;
- }
+ // First, look for a type variable and the first member type
+ final Symbol tyvar = findTypeVar(env1, name, staticOnly);
+ sym = findImmediateMemberType(env1, env1.enclClass.sym.type,
+ name, env1.enclClass.sym);
+
+ // Return the type variable if we have it, and have no
+ // immediate member, OR the type variable is for a method.
+ if (tyvar != typeNotFound) {
+ if (sym == typeNotFound ||
+ (tyvar.kind == TYP && tyvar.exists() &&
+ tyvar.owner.kind == MTH))
+ return tyvar;
}
- sym = findMemberType(env1, env1.enclClass.sym.type, name,
- env1.enclClass.sym);
+ // If the environment is a class def, finish up,
+ // otherwise, do the entire findMemberType
+ if (sym == typeNotFound)
+ sym = findInheritedMemberType(env1, env1.enclClass.sym.type,
+ name, env1.enclClass.sym);
+
if (staticOnly && sym.kind == TYP &&
sym.type.hasTag(CLASS) &&
sym.type.getEnclosingType().hasTag(CLASS) &&
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Fri Sep 06 15:09:44 2013 -0700
@@ -657,6 +657,14 @@
databuf.appendChar(pool.put(s.name));
databuf.appendChar(flags);
}
+ // Now write the captured locals
+ for (VarSymbol s : m.capturedLocals) {
+ final int flags =
+ ((int) s.flags() & (FINAL | SYNTHETIC | MANDATED)) |
+ ((int) m.flags() & SYNTHETIC);
+ databuf.appendChar(pool.put(s.name));
+ databuf.appendChar(flags);
+ }
endAttr(attrIndex);
return 1;
} else
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Fri Sep 06 15:09:44 2013 -0700
@@ -363,6 +363,7 @@
throw new Abort();
}
source = Source.instance(context);
+ Target target = Target.instance(context);
attr = Attr.instance(context);
chk = Check.instance(context);
gen = Gen.instance(context);
@@ -403,6 +404,8 @@
}
}
+ checkForObsoleteOptions(target);
+
verboseCompilePolicy = options.isSet("verboseCompilePolicy");
if (attrParseOnly)
@@ -432,6 +435,26 @@
log.setDiagnosticFormatter(RichDiagnosticFormatter.instance(context));
}
+ private void checkForObsoleteOptions(Target target) {
+ // Unless lint checking on options is disabled, check for
+ // obsolete source and target options.
+ boolean obsoleteOptionFound = false;
+ if (options.isUnset(XLINT_CUSTOM, "-" + LintCategory.OPTIONS.option)) {
+ if (source.compareTo(Source.JDK1_5) <= 0) {
+ log.warning(LintCategory.OPTIONS, "option.obsolete.source", source.name);
+ obsoleteOptionFound = true;
+ }
+
+ if (target.compareTo(Target.JDK1_5) <= 0) {
+ log.warning(LintCategory.OPTIONS, "option.obsolete.target", target.name);
+ obsoleteOptionFound = true;
+ }
+
+ if (obsoleteOptionFound)
+ log.warning(LintCategory.OPTIONS, "option.obsolete.suppression");
+ }
+ }
+
/* Switches:
*/
--- a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java Fri Sep 06 15:09:44 2013 -0700
@@ -262,6 +262,11 @@
}
}
+ if (options.get(PROFILE) != null && options.get(BOOTCLASSPATH) != null) {
+ error("err.profile.bootclasspath.conflict");
+ return null;
+ }
+
if (this.classnames != null && classNames != null) {
this.classnames.addAll(Arrays.asList(classNames));
}
--- a/langtools/src/share/classes/com/sun/tools/javac/main/Option.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Option.java Fri Sep 06 15:09:44 2013 -0700
@@ -389,6 +389,7 @@
XPREFER("-Xprefer:", "opt.prefer", EXTENDED, BASIC, ONEOF, "source", "newer"),
+ // see enum PkgInfo
XPKGINFO("-Xpkginfo:", "opt.pkginfo", EXTENDED, BASIC, ONEOF, "always", "legacy", "nonempty"),
/* -O is a no-op, accepted for backward compatibility. */
@@ -686,7 +687,28 @@
// For -XpkgInfo:value
public enum PkgInfo {
- ALWAYS, LEGACY, NONEMPTY;
+ /**
+ * Always generate package-info.class for every package-info.java file.
+ * The file may be empty if there annotations with a RetentionPolicy
+ * of CLASS or RUNTIME. This option may be useful in conjunction with
+ * build systems (such as Ant) that expect javac to generate at least
+ * one .class file for every .java file.
+ */
+ ALWAYS,
+ /**
+ * Generate a package-info.class file if package-info.java contains
+ * annotations. The file may be empty if all the annotations have
+ * a RetentionPolicy of SOURCE.
+ * This value is just for backwards compatibility with earlier behavior.
+ * Either of the other two values are to be preferred to using this one.
+ */
+ LEGACY,
+ /**
+ * Generate a package-info.class file if and only if there are annotations
+ * in package-info.java to be written into it.
+ */
+ NONEMPTY;
+
public static PkgInfo get(Options options) {
String v = options.get(XPKGINFO);
return (v == null
--- a/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Fri Sep 06 15:09:44 2013 -0700
@@ -244,7 +244,10 @@
}
public void visitError(Attribute.Error e) {
- value = null; // indicates a type mismatch
+ if (e instanceof Attribute.UnresolvedClass)
+ value = new MirroredTypeExceptionProxy(((Attribute.UnresolvedClass)e).classType);
+ else
+ value = null; // indicates a type mismatch
}
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Fri Sep 06 15:09:44 2013 -0700
@@ -89,7 +89,7 @@
* deletion without notice.</b>
*/
public class JavacProcessingEnvironment implements ProcessingEnvironment, Closeable {
- Options options;
+ private final Options options;
private final boolean printProcessorInfo;
private final boolean printRounds;
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Sep 06 15:09:44 2013 -0700
@@ -733,10 +733,6 @@
{0}
# 0: list of type
-compiler.err.incompatible.thrown.types.in.lambda=\
- incompatible thrown types {0} in lambda expression
-
-# 0: list of type
compiler.err.incompatible.thrown.types.in.mref=\
incompatible thrown types {0} in method reference
@@ -1444,6 +1440,17 @@
compiler.warn.source.no.bootclasspath=\
bootstrap class path not set in conjunction with -source {0}
+# 0: string
+compiler.warn.option.obsolete.source=\
+ source value {0} is obsolete and will be removed in a future release
+
+# 0: string
+compiler.warn.option.obsolete.target=\
+ target value {0} is obsolete and will be removed in a future release
+
+compiler.warn.option.obsolete.suppression=\
+ To suppress warnings about obsolete options, use -Xlint:-options.
+
# 0: name, 1: number, 2: number, 3: number, 4: number
compiler.warn.future.attr=\
{0} attribute introduced in version {1}.{2} class files is ignored in version {3}.{4} class files
@@ -2241,7 +2248,7 @@
# TODO 308: make a better error message
# 0: unused
compiler.err.cant.annotate.nested.type=\
- nested type cannot be annotated
+ scoping construct for static nested type cannot be annotated
# 0: type, 1: type
compiler.err.incorrect.receiver.name=\
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties Fri Sep 06 15:09:44 2013 -0700
@@ -185,6 +185,8 @@
key in annotation processor option ''{0}'' is not a dot-separated sequence of identifiers
javac.err.invalid.flag=\
invalid flag: {0}
+javac.err.profile.bootclasspath.conflict=\
+ profile and bootclasspath options cannot be used together
javac.err.invalid.profile=\
invalid profile: {0}
javac.err.invalid.target=\
--- a/langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java Fri Sep 06 15:09:44 2013 -0700
@@ -148,7 +148,7 @@
}
}
- final static Map<String, Package> packages = new TreeMap<String, Package>();
+ final Map<String, Package> packages = new TreeMap<String, Package>();
final int maxProfile = 4; // Three compact profiles plus full JRE
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Fri Sep 06 15:09:44 2013 -0700
@@ -645,7 +645,7 @@
public List<Type> targets;
public Type getDescriptorType(Types types) {
- return types.findDescriptorType(targets.head);
+ return targets.nonEmpty() ? types.findDescriptorType(targets.head) : types.createErrorType(null);
}
}
@@ -1571,6 +1571,16 @@
public Tag getTag() {
return NEWARRAY;
}
+
+ @Override
+ public List<JCAnnotation> getAnnotations() {
+ return annotations;
+ }
+
+ @Override
+ public List<List<JCAnnotation>> getDimAnnotations() {
+ return dimAnnotations;
+ }
}
/**
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Fri Sep 06 15:09:44 2013 -0700
@@ -944,10 +944,17 @@
try {
if (tree.elemtype != null) {
print("new ");
- printTypeAnnotations(tree.annotations);
JCTree elem = tree.elemtype;
printBaseElementType(elem);
- boolean isElemAnnoType = elem instanceof JCAnnotatedType;
+
+ if (!tree.annotations.isEmpty()) {
+ print(' ');
+ printTypeAnnotations(tree.annotations);
+ }
+ if (tree.elems != null) {
+ print("[]");
+ }
+
int i = 0;
List<List<JCAnnotation>> da = tree.dimAnnotations;
for (List<JCExpression> l = tree.dims; l.nonEmpty(); l = l.tail) {
@@ -960,17 +967,7 @@
printExpr(l.head);
print("]");
}
- if (tree.elems != null) {
- if (isElemAnnoType) {
- print(' ');
- printTypeAnnotations(((JCAnnotatedType)tree.elemtype).annotations);
- }
- print("[]");
- }
- if (isElemAnnoType)
- elem = ((JCAnnotatedType)elem).underlyingType;
- if (elem instanceof JCArrayTypeTree)
- printBrackets((JCArrayTypeTree) elem);
+ printBrackets(elem);
}
if (tree.elems != null) {
print("{");
@@ -1260,20 +1257,24 @@
}
// prints the brackets of a nested array in reverse order
- private void printBrackets(JCArrayTypeTree tree) throws IOException {
- JCTree elem;
+ // tree is either JCArrayTypeTree or JCAnnotatedTypeTree
+ private void printBrackets(JCTree tree) throws IOException {
+ JCTree elem = tree;
while (true) {
- elem = tree.elemtype;
if (elem.hasTag(ANNOTATED_TYPE)) {
JCAnnotatedType atype = (JCAnnotatedType) elem;
elem = atype.underlyingType;
- if (!elem.hasTag(TYPEARRAY)) break;
- print(' ');
- printTypeAnnotations(atype.annotations);
+ if (elem.hasTag(TYPEARRAY)) {
+ print(' ');
+ printTypeAnnotations(atype.annotations);
+ }
}
- print("[]");
- if (!elem.hasTag(TYPEARRAY)) break;
- tree = (JCArrayTypeTree) elem;
+ if (elem.hasTag(TYPEARRAY)) {
+ print("[]");
+ elem = ((JCArrayTypeTree)elem).elemtype;
+ } else {
+ break;
+ }
}
}
@@ -1378,22 +1379,15 @@
public void visitAnnotatedType(JCAnnotatedType tree) {
try {
- if (tree.underlyingType.getKind() == JCTree.Kind.MEMBER_SELECT) {
+ if (tree.underlyingType.hasTag(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;
+ } else if (tree.underlyingType.hasTag(TYPEARRAY)) {
printBaseElementType(tree);
- print(' ');
- printTypeAnnotations(tree.annotations);
- print("[]");
- JCExpression elem = array.elemtype;
- if (elem.hasTag(TYPEARRAY)) {
- printBrackets((JCArrayTypeTree) elem);
- }
+ printBrackets(tree);
} else {
printTypeAnnotations(tree.annotations);
printExpr(tree.underlyingType);
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Fri Sep 06 15:09:44 2013 -0700
@@ -128,7 +128,14 @@
try {
return clazz.flags();
} catch (CompletionFailure ex) {
- // quietly ignore completion failures
+ /* Quietly ignore completion failures.
+ * Note that a CompletionFailure can only
+ * occur as a result of calling complete(),
+ * which will always remove the current
+ * completer, leaving it to be null or
+ * follow-up completer. Thus the loop
+ * is guaranteed to eventually terminate.
+ */
}
}
}
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,9 +30,12 @@
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.comp.MemberEnter;
+import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.Context;
+import static com.sun.tools.javac.code.Flags.*;
+
/**
* Javadoc's own memberEnter phase does a few things above and beyond that
* done by javac.
@@ -86,6 +89,17 @@
@Override
public void visitVarDef(JCVariableDecl tree) {
+ if (tree.init != null) {
+ boolean isFinal = (tree.mods.flags & FINAL) != 0
+ || (env.enclClass.mods.flags & INTERFACE) != 0;
+ if (!isFinal || containsNonConstantExpression(tree.init)) {
+ // Avoid unnecessary analysis and release resources.
+ // In particular, remove non-constant expressions
+ // which may trigger Attr.attribClass, since
+ // method bodies are also removed, in visitMethodDef.
+ tree.init = null;
+ }
+ }
super.visitVarDef(tree);
if (tree.sym != null &&
tree.sym.kind == Kinds.VAR &&
@@ -101,4 +115,95 @@
private static boolean isParameter(VarSymbol var) {
return (var.flags() & Flags.PARAMETER) != 0;
}
+
+ /**
+ * Simple analysis of an expression tree to see if it contains tree nodes
+ * for any non-constant expression. This does not include checking references
+ * to other fields which may or may not be constant.
+ */
+ private static boolean containsNonConstantExpression(JCExpression tree) {
+ return new MaybeConstantExpressionScanner().containsNonConstantExpression(tree);
+ }
+
+ /**
+ * See JLS 15.18, Constant Expression
+ */
+ private static class MaybeConstantExpressionScanner extends JCTree.Visitor {
+ boolean maybeConstantExpr = true;
+
+ public boolean containsNonConstantExpression(JCExpression tree) {
+ scan(tree);
+ return !maybeConstantExpr;
+ }
+
+ public void scan(JCTree tree) {
+ // short circuit scan when end result is definitely false
+ if (maybeConstantExpr && tree != null)
+ tree.accept(this);
+ }
+
+ @Override
+ /** default for any non-overridden visit method. */
+ public void visitTree(JCTree tree) {
+ maybeConstantExpr = false;
+ }
+
+ @Override
+ public void visitBinary(JCBinary tree) {
+ switch (tree.getTag()) {
+ case MUL: case DIV: case MOD:
+ case PLUS: case MINUS:
+ case SL: case SR: case USR:
+ case LT: case LE: case GT: case GE:
+ case EQ: case NE:
+ case BITAND: case BITXOR: case BITOR:
+ case AND: case OR:
+ break;
+ default:
+ maybeConstantExpr = false;
+ }
+ }
+
+ @Override
+ public void visitConditional(JCConditional tree) {
+ scan(tree.cond);
+ scan(tree.truepart);
+ scan(tree.falsepart);
+ }
+
+ @Override
+ public void visitIdent(JCIdent tree) { }
+
+ @Override
+ public void visitLiteral(JCLiteral tree) { }
+
+ @Override
+ public void visitParens(JCParens tree) {
+ scan(tree.expr);
+ }
+
+ @Override
+ public void visitSelect(JCTree.JCFieldAccess tree) {
+ scan(tree.selected);
+ }
+
+ @Override
+ public void visitTypeCast(JCTypeCast tree) {
+ scan(tree.clazz);
+ scan(tree.expr);
+ }
+
+ @Override
+ public void visitTypeIdent(JCPrimitiveTypeTree tree) { }
+
+ @Override
+ public void visitUnary(JCUnary tree) {
+ switch (tree.getTag()) {
+ case POS: case NEG: case COMPL: case NOT:
+ break;
+ default:
+ maybeConstantExpr = false;
+ }
+ }
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java Fri Sep 06 15:09:44 2013 -0700
@@ -269,6 +269,8 @@
setDocletInvoker(docletClass, fileManager, argv);
compOpts = Options.instance(context);
+ // Make sure no obsolete source/target messages are reported
+ compOpts.put("-Xlint:-options", "-Xlint:-options");
// Parse arguments
for (int i = 0 ; i < argv.length ; i++) {
--- a/langtools/src/share/classes/com/sun/tools/sjavac/JavacState.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/JavacState.java Fri Sep 06 15:09:44 2013 -0700
@@ -808,7 +808,10 @@
// Create a set of filenames with full paths.
for (Source s : now.sources().values()) {
- calculatedSources.add(s.file().getPath());
+ // Don't include link only sources when comparing sources to compile
+ if (!s.isLinkedOnly()) {
+ calculatedSources.add(s.file().getPath());
+ }
}
// Read in the file and create another set of filenames with full paths.
try {
--- a/langtools/src/share/classes/com/sun/tools/sjavac/Main.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Main.java Fri Sep 06 15:09:44 2013 -0700
@@ -249,16 +249,19 @@
return -1;
}
- // Find all source files allowable for linking.
+ // Create a map of all source files that are available for linking. Both -src and
+ // -sourcepath point to such files. It is possible to specify multiple
+ // -sourcepath options to enable different filtering rules. If the
+ // filters are the same for multiple sourcepaths, they may be concatenated
+ // using :(;). Before sending the list of sourcepaths to javac, they are
+ // all concatenated. The list created here is used by the SmartFileWrapper to
+ // make sure only the correct sources are actually available.
// 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, "-src", Util.set(".java"), sources_to_link_to, modules, current_module, true);
findFiles(args, "-sourcepath", Util.set(".java"), sources_to_link_to, modules, current_module, true);
+ // Rewrite the -src option to make it through to the javac instances.
+ rewriteOptions(args, "-src", "-sourcepath");
// Find all class files allowable for linking.
// And pickup knowledge of all modules found here.
--- a/langtools/src/share/classes/javax/tools/JavaCompiler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/src/share/classes/javax/tools/JavaCompiler.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -251,8 +251,8 @@
* occurred in a user supplied component. The
* {@linkplain Throwable#getCause() cause} will be the error in
* user code.
- * @throws IllegalArgumentException if any of the given
- * compilation units are of other kind than
+ * @throws IllegalArgumentException if any of the options are invalid,
+ * or if any of the given compilation units are of other kind than
* {@linkplain JavaFileObject.Kind#SOURCE source}
*/
CompilationTask getTask(Writer out,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testCharset/TestCharset.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,82 @@
+/*
+ * 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 7052170
+ * @summary Run a test on -charset to make sure the charset gets generated as a
+ * part of the meta tag.
+ * @author Bhavesh Patel
+ * @library ../lib/
+ * @build JavadocTester TestCharset
+ * @run main TestCharset
+ */
+
+public class TestCharset extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "7052170";
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[] {
+ "-d", BUG_ID, "-charset", "UTF-8", "-sourcepath", SRC_DIR, "pkg"
+ };
+
+ private static final String[][] TEST = {
+ {BUG_ID + FS + "index.html",
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"},
+ {BUG_ID + FS + "pkg" + FS + "Foo.html",
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"}
+ };
+
+ private static final String[][] NEGATED_TEST = {
+ {BUG_ID + FS + "index.html",
+ "<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"UTF-8\">"},
+ {BUG_ID + FS + "pkg" + FS + "Foo.html",
+ "<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"UTF-8\">"}
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestCharset tester = new TestCharset();
+ 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/testCharset/pkg/Foo.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+public class Foo {}
--- a/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * @bug 4131628 4664607 7025314
- * @summary Make sure the Next/Prev Class links iterate through all types.
- * Make sure the navagation is 2 columns, not 3.
- * @author jamieh
- * @library ../lib/
- * @build JavadocTester
- * @build TestNavagation
- * @run main TestNavagation
- */
-
-public class TestNavagation extends JavadocTester {
-
- //Test information.
- private static final String BUG_ID = "4131628-4664607";
-
- //Javadoc arguments.
- private static final String[] ARGS = new String[] {
- "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
- };
-
- //Input for string search tests.
- private static final String[][] TEST = {
- {BUG_ID + FS + "pkg" + FS + "A.html", "<li>Prev Class</li>"},
- {BUG_ID + FS + "pkg" + FS + "A.html",
- "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Next Class</span></a>"},
- {BUG_ID + FS + "pkg" + FS + "C.html",
- "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"strong\">Prev Class</span></a>"},
- {BUG_ID + FS + "pkg" + FS + "C.html",
- "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Next Class</span></a>"},
- {BUG_ID + FS + "pkg" + FS + "E.html",
- "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Prev Class</span></a>"},
- {BUG_ID + FS + "pkg" + FS + "E.html",
- "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"strong\">Next Class</span></a>"},
- {BUG_ID + FS + "pkg" + FS + "I.html",
- "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Prev Class</span></a>"},
- {BUG_ID + FS + "pkg" + FS + "I.html", "<li>Next Class</li>"},
- // Test for 4664607
- {BUG_ID + FS + "pkg" + FS + "I.html",
- "<a href=\"#skip-navbar_top\" title=\"Skip navigation links\"></a><a name=\"navbar_top_firstrow\">" + NL +
- "<!-- -->" + NL + "</a>"}
- };
- 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) {
- TestNavagation tester = new TestNavagation();
- run(tester, ARGS, TEST, NEGATED_TEST);
- tester.printSummary();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
-}
--- a/langtools/test/com/sun/javadoc/testNavagation/pkg/A.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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;
-
-/**
- * Sample Annotation Type.
- */
-public @interface A {}
--- a/langtools/test/com/sun/javadoc/testNavagation/pkg/C.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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;
-
-/**
- * Sample Class.
- */
-public class C {}
--- a/langtools/test/com/sun/javadoc/testNavagation/pkg/E.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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;
-
-/**
- * Sample Enum.
- */
-public enum E {}
--- a/langtools/test/com/sun/javadoc/testNavagation/pkg/I.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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;
-
-/**
- * Sample Interface.
- */
-public interface I {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 4131628 4664607 7025314
+ * @summary Make sure the Next/Prev Class links iterate through all types.
+ * Make sure the navagation is 2 columns, not 3.
+ * @author jamieh
+ * @library ../lib/
+ * @build JavadocTester
+ * @build TestNavigation
+ * @run main TestNavigation
+ */
+
+public class TestNavigation extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "4131628-4664607";
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+ };
+
+ //Input for string search tests.
+ private static final String[][] TEST = {
+ {BUG_ID + FS + "pkg" + FS + "A.html", "<li>Prev Class</li>"},
+ {BUG_ID + FS + "pkg" + FS + "A.html",
+ "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Next Class</span></a>"},
+ {BUG_ID + FS + "pkg" + FS + "C.html",
+ "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"strong\">Prev Class</span></a>"},
+ {BUG_ID + FS + "pkg" + FS + "C.html",
+ "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Next Class</span></a>"},
+ {BUG_ID + FS + "pkg" + FS + "E.html",
+ "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"strong\">Prev Class</span></a>"},
+ {BUG_ID + FS + "pkg" + FS + "E.html",
+ "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"strong\">Next Class</span></a>"},
+ {BUG_ID + FS + "pkg" + FS + "I.html",
+ "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"strong\">Prev Class</span></a>"},
+ {BUG_ID + FS + "pkg" + FS + "I.html", "<li>Next Class</li>"},
+ // Test for 4664607
+ {BUG_ID + FS + "pkg" + FS + "I.html",
+ "<a href=\"#skip-navbar_top\" title=\"Skip navigation links\"></a><a name=\"navbar_top_firstrow\">" + NL +
+ "<!-- -->" + NL + "</a>"}
+ };
+ 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) {
+ TestNavigation tester = new TestNavigation();
+ 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/testNavigation/pkg/A.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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;
+
+/**
+ * Sample Annotation Type.
+ */
+public @interface A {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testNavigation/pkg/C.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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;
+
+/**
+ * Sample Class.
+ */
+public class C {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testNavigation/pkg/E.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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;
+
+/**
+ * Sample Enum.
+ */
+public enum E {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testNavigation/pkg/I.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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;
+
+/**
+ * Sample Interface.
+ */
+public interface I {}
--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8006124 8009684
+ * @bug 8006124 8009684 8016921
* @summary Test javadoc support for profiles.
* @author Bhavesh Patel
* @library ../lib/
@@ -33,7 +33,7 @@
public class TestProfiles extends JavadocTester {
//Test information.
- private static final String BUG_ID = "8006124-8009684";
+ private static final String BUG_ID = "8006124-8009684-8016921";
private static final String PROFILE_BUG_ID = BUG_ID + "-1";
private static final String PACKAGE_BUG_ID = BUG_ID + "-2";
//Javadoc arguments.
@@ -105,6 +105,14 @@
{PROFILE_BUG_ID + FS + "index.html",
"<frame src=\"overview-frame.html\" name=\"packageListFrame\" " +
"title=\"All Packages\">"
+ },
+ //Test for "overview-summary.html" showing the profile list.
+ {PROFILE_BUG_ID + FS + "overview-summary.html",
+ "<ul>" + NL +"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
+ "compact1</a></li>" + NL + "<li><a href=\"compact2-summary.html\" " +
+ "target=\"classFrame\">compact2</a></li>" + NL + "<li><a href=\"" +
+ "compact3-summary.html\" target=\"classFrame\">compact3</a></li>" + NL +
+ "</ul>"
}
};
private static final String[][] PROFILES_NEGATED_TEST = {
@@ -159,6 +167,13 @@
},
{PACKAGE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
+ },
+ {PACKAGE_BUG_ID + FS + "overview-summary.html",
+ "<ul>" + NL +"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
+ "compact1</a></li>" + NL + "<li><a href=\"compact2-summary.html\" " +
+ "target=\"classFrame\">compact2</a></li>" + NL + "<li><a href=\"" +
+ "compact3-summary.html\" target=\"classFrame\">compact3</a></li>" + NL +
+ "</ul>"
}
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,80 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 8017191
+ * @summary Javadoc is confused by at-link to imported classes outside of the set of generated packages
+ * @author jjg
+ * @library ../lib/
+ * @build JavadocTester TestSeeTag
+ * @run main TestSeeTag
+ */
+
+public class TestSeeTag extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "8017191";
+ private static final String OUTPUT_DIR = BUG_ID;
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[] {
+ "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
+ };
+
+ //Input for string search tests.
+ private static final String[][] TEST = {
+ { OUTPUT_DIR + FS + "pkg" + FS + "Test.html",
+ "<code>List</code>"
+ }
+ };
+ private static final String[][] NEGATED_TEST = {
+ { OUTPUT_DIR + FS + "pkg" + FS + "Test.html",
+ "<code>List</code>"
+ }
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestSeeTag tester = new TestSeeTag();
+ 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/testSeeTag/pkg/Test.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+import java.util.List;
+
+/** @see List */
+public class Test { }
+
--- a/langtools/test/tools/doclint/html/ListTagsTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/doclint/html/ListTagsTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
/*
* @test /nodynamiccopyright/
- * @bug 8006251 8013405
+ * @bug 8006251 8013405 8022173
* @summary test list tags
* @library ..
* @build DocLintTester
@@ -15,6 +15,7 @@
* <ol> <li value="1"> abc </ol>
* <ol> <li value> bad </ol>
* <ol> <li value="a"> bad </ol>
+ * <ol type="a"> <li> bad </ol>
* <ul> <li> abc </ul>
*/
public void supportedTags() { }
--- a/langtools/test/tools/doclint/html/OtherTagsTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/doclint/html/OtherTagsTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
/*
* @test /nodynamiccopyright/
- * @bug 8006251
+ * @bug 8006251 8022173
* @summary test other tags
* @library ..
* @build DocLintTester
@@ -14,6 +14,7 @@
* <frame>
* <frameset> </frameset>
* <head> </head>
+ * <hr width="50%">
* <link>
* <meta>
* <noframes> </noframes>
--- a/langtools/test/tools/doclint/html/OtherTagsTest.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/doclint/html/OtherTagsTest.out Fri Sep 06 15:09:44 2013 -0700
@@ -10,19 +10,19 @@
OtherTagsTest.java:16: error: element not allowed in documentation comments: <head>
* <head> </head>
^
-OtherTagsTest.java:17: error: element not allowed in documentation comments: <link>
+OtherTagsTest.java:18: error: element not allowed in documentation comments: <link>
* <link>
^
-OtherTagsTest.java:18: error: element not allowed in documentation comments: <meta>
+OtherTagsTest.java:19: error: element not allowed in documentation comments: <meta>
* <meta>
^
-OtherTagsTest.java:19: error: element not allowed in documentation comments: <noframes>
+OtherTagsTest.java:20: error: element not allowed in documentation comments: <noframes>
* <noframes> </noframes>
^
-OtherTagsTest.java:20: error: element not allowed in documentation comments: <script>
+OtherTagsTest.java:21: error: element not allowed in documentation comments: <script>
* <script> </script>
^
-OtherTagsTest.java:21: error: element not allowed in documentation comments: <title>
+OtherTagsTest.java:22: error: element not allowed in documentation comments: <title>
* <title> </title>
^
9 errors
--- a/langtools/test/tools/doclint/html/TableTagsTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/doclint/html/TableTagsTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8006251
+ * @bug 8006251 8022173
* @summary test table tags
* @library ..
* @build DocLintTester
@@ -39,6 +39,7 @@
* <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>
+ * <table summary="abc" width="50%"> <tr> <td> <tfoot> <tr> </tfoot></table>
*/
public void supportedTags() { }
}
--- a/langtools/test/tools/javac/4980495/static/Test.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/4980495/static/Test.out Fri Sep 06 15:09:44 2013 -0700
@@ -1,2 +1,2 @@
-Test.java:9:1: compiler.err.already.defined.static.single.import: f
+Test.java:15:9: compiler.err.ref.ambiguous: f, kindname.variable, f, p1.A1, kindname.variable, f, p2.A2
1 error
--- a/langtools/test/tools/javac/6758789/T6758789b.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/6758789/T6758789b.out Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
T6758789b.java:16:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
-T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<java.lang.Object>
+T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
- compiler.err.warnings.and.werror
1 error
2 warnings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/7118412/ShadowingTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,287 @@
+/*
+ * 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 7118412
+ * @summary Shadowing of type-variables vs. member types
+ */
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class ShadowingTest {
+
+ // We generate a method "test" that tries to call T.<something,
+ // depending on the value of MethodCall>. This controls whether
+ // "test" is static or not.
+ private enum MethodContext {
+ STATIC("static "),
+ INSTANCE("");
+
+ public final String methodcontext;
+
+ MethodContext(final String methodcontext) {
+ this.methodcontext = methodcontext;
+ }
+ }
+
+ // These control whether or not a type parameter, method type
+ // parameter, or inner class get declared (and in the case of
+ // inner classes, whether it's static or not.
+
+ private enum MethodTypeParameterDecl {
+ NO(""),
+ YES("<T extends Number> ");
+
+ public final String tyvar;
+
+ MethodTypeParameterDecl(final String tyvar) {
+ this.tyvar = tyvar;
+ }
+ }
+
+ private enum InsideDef {
+ NONE(""),
+ STATIC("static class T { public void inner() {} }\n"),
+ INSTANCE("class T { public void inner() {} }\n");
+
+ public final String instancedef;
+
+ InsideDef(final String instancedef) {
+ this.instancedef = instancedef;
+ }
+ }
+
+ private enum TypeParameterDecl {
+ NO(""),
+ YES("<T extends Collection>");
+
+ public final String tyvar;
+
+ TypeParameterDecl(final String tyvar) {
+ this.tyvar = tyvar;
+ }
+ }
+
+ // Represents what method we try to call. This is a way of
+ // checking which T we're seeing.
+ private enum MethodCall {
+ // Method type variables extend Number, so we have intValue
+ METHOD_TYPEVAR("intValue"),
+ // The inner class declaration has a method called "inner"
+ INNER_CLASS("inner"),
+ // The class type variables extend Collection, so we call iterator
+ TYPEVAR("iterator"),
+ // The outer class declaration has a method called "outer"
+ OUTER_CLASS("outer");
+
+ public final String methodcall;
+
+ MethodCall(final String methodcall) {
+ this.methodcall = methodcall;
+ }
+
+ }
+
+ public boolean succeeds(final MethodCall call,
+ final MethodTypeParameterDecl mtyvar,
+ final MethodContext ctx,
+ final InsideDef inside,
+ final TypeParameterDecl tyvar) {
+ switch(call) {
+ // We want to resolve to the method type variable
+ case METHOD_TYPEVAR: switch(mtyvar) {
+ // If the method type variable exists, then T will
+ // resolve to it, and we'll have intValue.
+ case YES: return true;
+ // Otherwise, this cannot succeed.
+ default: return false;
+ }
+ // We want to resolve to the inner class
+ case INNER_CLASS: switch(mtyvar) {
+ // The method type parameter will shadow the inner
+ // class, so there can't be one.
+ case NO: switch(ctx) {
+ // If we're not static, then either one should succeed.
+ case INSTANCE: switch(inside) {
+ case INSTANCE:
+ case STATIC:
+ return true;
+ default: return false;
+ }
+ case STATIC: switch(inside) {
+ // If we are static, and the inner class is
+ // static, then we also succeed, because we
+ // can't see the type variable.
+ case STATIC: return true;
+ case INSTANCE: switch(tyvar) {
+ // If we're calling from a non-static
+ // context, there can't be a class type
+ // variable, because that will shadow the
+ // static inner class definition.
+ case NO: return true;
+ default: return false;
+ }
+ // If the inner class isn't declared, we can't
+ // see it.
+ default: return false;
+ }
+ // Can't get here.
+ default: return false;
+ }
+ default: return false;
+ }
+ // We want to resolve to the class type parameter
+ case TYPEVAR: switch(mtyvar) {
+ // We can't have a method type parameter, as that would
+ // shadow the class type parameter
+ case NO: switch(ctx) {
+ case INSTANCE: switch(inside) {
+ // We have to be in an instance context. If
+ // we're static, we can't see the type
+ // variable.
+ case NONE: switch(tyvar) {
+ // Obviously, the type parameter has to be declared.
+ case YES: return true;
+ default: return false;
+ }
+ default: return false;
+ }
+ default: return false;
+ }
+ default: return false;
+ }
+ // We want to resolve to the outer class
+ case OUTER_CLASS: switch(mtyvar) {
+ case NO: switch(inside) {
+ case NONE: switch(tyvar) {
+ // Basically, nothing else can be declared, or
+ // else we can't see it. Even if our context
+ // is static, the compiler will complain if
+ // non-static T's exist, because they will
+ // shadow the outer class.
+ case NO: return true;
+ default: return false;
+ }
+ default: return false;
+ }
+ default: return false;
+ }
+ }
+ return false;
+ }
+
+ private static final File classesdir = new File("7118412");
+
+ private int errors = 0;
+
+ private int dirnum = 0;
+
+ private void doTest(final MethodTypeParameterDecl mtyvar,
+ final TypeParameterDecl tyvar,
+ final InsideDef insidedef, final MethodContext ctx,
+ final MethodCall call)
+ throws IOException {
+ final String content = "import java.util.Collection;\n" +
+ "class Test" + tyvar.tyvar + " {\n" +
+ " " + insidedef.instancedef +
+ " " + ctx.methodcontext + mtyvar.tyvar + "void test(T t) { t." +
+ call.methodcall + "(); }\n" +
+ "}\n" +
+ "class T { void outer() {} }\n";
+ final File dir = new File(classesdir, "" + dirnum);
+ final File Test_java = writeFile(dir, "Test.java", content);
+ dirnum++;
+ if(succeeds(call, mtyvar, ctx, insidedef, tyvar)) {
+ if(!assert_compile_succeed(Test_java))
+ System.err.println("Failed file:\n" + content);
+ }
+ else {
+ if(!assert_compile_fail(Test_java))
+ System.err.println("Failed file:\n" + content);
+ }
+ }
+
+ private void run() throws Exception {
+ classesdir.mkdir();
+ for(MethodTypeParameterDecl mtyvar : MethodTypeParameterDecl.values())
+ for(TypeParameterDecl tyvar : TypeParameterDecl.values())
+ for(InsideDef insidedef : InsideDef.values())
+ for(MethodContext ctx : MethodContext.values())
+ for(MethodCall methodcall : MethodCall.values())
+ doTest(mtyvar, tyvar, insidedef, ctx, methodcall);
+ if (errors != 0)
+ throw new Exception("ShadowingTest test failed with " +
+ errors + " errors.");
+ }
+
+ private boolean assert_compile_fail(final File file) {
+ final String filename = file.getPath();
+ final String[] args = { filename };
+ final StringWriter sw = new StringWriter();
+ final PrintWriter pw = new PrintWriter(sw);
+ final int rc = com.sun.tools.javac.Main.compile(args, pw);
+ pw.close();
+ if (rc == 0) {
+ System.err.println("Compilation of " + file.getName() +
+ " didn't fail as expected.");
+ errors++;
+ return false;
+ } else return true;
+ }
+
+ private boolean assert_compile_succeed(final File file) {
+ final String filename = file.getPath();
+ final String[] args = { filename };
+ final StringWriter sw = new StringWriter();
+ final PrintWriter pw = new PrintWriter(sw);
+ final int rc = com.sun.tools.javac.Main.compile(args, pw);
+ pw.close();
+ if (rc != 0) {
+ System.err.println("Compilation of " + file.getName() +
+ " didn't succeed as expected. Output:");
+ System.err.println(sw.toString());
+ errors++;
+ return false;
+ } else return true;
+ }
+
+ private File writeFile(final File dir,
+ final String path,
+ final String body) throws IOException {
+ final File f = new File(dir, path);
+ f.getParentFile().mkdirs();
+ final FileWriter out = new FileWriter(f);
+ out.write(body);
+ out.close();
+ return f;
+ }
+
+ public static void main(String... args) throws Exception {
+ new ShadowingTest().run();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/7182350/T7182350.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,14 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug 7182350
+ * @summary verify correct output of -Xlint:unchecked on methods with unchecked conversations in parameters
+ * @compile/ref=T7182350.out -XDrawDiagnostics -Xlint:unchecked T7182350.java
+ */
+
+import java.util.*;
+
+class T7182350 {
+ public static void quicksort(Vector vector, Comparator compare) {
+ Collections.sort(vector,compare);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/7182350/T7182350.out Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,4 @@
+T7182350.java:12:25: compiler.warn.unchecked.meth.invocation.applied: kindname.method, sort, java.util.List<T>,java.util.Comparator<? super T>, java.util.Vector,java.util.Comparator, kindname.class, java.util.Collections
+T7182350.java:12:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.util.Vector, java.util.List<T>
+T7182350.java:12:33: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.util.Comparator, java.util.Comparator<? super T>
+3 warnings
--- a/langtools/test/tools/javac/8015701/AnonymousParameters.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
- * 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 8015701
- * @summary javac should generate method parameters correctly.
- * @compile -parameters AnonymousParameters.java
- * @run main AnonymousParameters
- */
-import java.lang.Class;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Parameter;
-import java.util.concurrent.Callable;
-
-public class AnonymousParameters {
-
- String[] names = {
- "this$0",
- "val$message"
- };
-
- public static void main(String... args) throws Exception {
- new AnonymousParameters().run();
- }
-
- void run() throws Exception {
- Class<?> cls = new ParameterNames().makeInner("hello").getClass();
- Constructor<?> ctor = cls.getDeclaredConstructors()[0];
- Parameter[] params = ctor.getParameters();
-
- if(params.length == 2) {
- for(int i = 0; i < 2; i++) {
- System.err.println("Testing parameter " + params[i].getName());
- if(!params[i].getName().equals(names[i]))
- error("Expected parameter name " + names[i] +
- " got " + params[i].getName());
- }
- } else
- error("Expected 2 parameters");
-
- if(0 != errors)
- throw new Exception("MethodParameters test failed with " +
- errors + " errors");
- }
-
- void error(String msg) {
- System.err.println("Error: " + msg);
- errors++;
- }
-
- int errors;
-}
-
-class ParameterNames {
-
- public Callable<String> makeInner(final String message) {
- return new Callable<String>() {
- public String call() throws Exception {
- return message;
- }
- };
- }
-
- public static void main(String... args) throws Exception {
- ParameterNames test = new ParameterNames();
- System.out.println(test.makeInner("Hello").call());
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/MethodParameters/CaptureTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,289 @@
+/*
+ * 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 8015701
+ * @summary Test method parameter attribute generation with captured locals.
+ * @compile -parameters CaptureTest.java
+ * @run main CaptureTest
+ */
+import java.lang.Class;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Parameter;
+import java.lang.reflect.Modifier;
+import java.util.List;
+import java.util.ArrayList;
+
+public class CaptureTest {
+
+ private static final int SYNTHETIC = 0x1000;
+ private static final int MANDATED = 0x8000;
+
+ public static void main(String... args) throws Exception {
+ new CaptureTest().run();
+ }
+
+
+ private void run() throws Exception {
+ final Encloser pn = new Encloser();
+
+ /* Cases covered here:
+ *
+ * - Local class
+ * - Inner class
+ * - Anonymous class
+ * - Anonymous class extending a local
+ * - Anonymous class extending an inner
+ */
+ pn.makeLocal("hello").check();
+ pn.makeInner("hello").check();
+ pn.makeAnon("hello").check();
+ pn.makeAnonExtendsLocal("hello").check();
+ pn.makeAnonExtendsInner("hello").check();
+
+ if (0 != errors)
+ throw new Exception("MethodParameters test failed with " +
+ errors + " errors");
+ }
+
+ private void error(final String msg) {
+ System.err.println("Error: " + msg);
+ errors++;
+ }
+
+ int errors;
+
+ abstract class Tester {
+
+ public Tester(final int param) {}
+
+ protected abstract String[] names();
+ protected abstract int[] modifiers();
+ protected abstract Class[] types();
+
+ public void check() {
+ final Class<?> cls = this.getClass();
+ final Constructor<?> ctor = cls.getDeclaredConstructors()[0];
+ final Parameter[] params = ctor.getParameters();
+ final String[] names = names();
+ final int[] modifiers = modifiers();
+ final Class[] types = types();
+
+ System.err.println("Testing class " + cls);
+
+ if (params.length == names.length) {
+ for (int i = 0; i < names.length; i++) {
+ System.err.println("Testing parameter " + params[i].getName());
+ if (!params[i].getName().equals(names[i]))
+ error("Expected parameter name " + names[i] +
+ " got " + params[i].getName());
+ if (params[i].getModifiers() != modifiers[i])
+ error("Expected parameter modifiers " +
+ modifiers[i] + " got " +
+ params[i].getModifiers());
+ if (!params[i].getType().equals(types[i]))
+ error("Expected parameter type " + types[i] +
+ " got " + params[i].getType());
+ }
+ } else
+ error("Expected " + names.length + " parameters");
+
+ }
+
+ }
+
+ class Encloser {
+ private class InnerTester extends Tester {
+ public InnerTester(final int innerparam) {
+ super(innerparam);
+ }
+
+ protected String[] names() {
+ return new String[] {
+ "this$1",
+ "innerparam"
+ };
+ }
+
+ protected int[] modifiers() {
+ return new int[] {
+ Modifier.FINAL | SYNTHETIC,
+ Modifier.FINAL
+ };
+ }
+
+ protected Class[] types() {
+ return new Class[] {
+ Encloser.class,
+ int.class
+ };
+ }
+ }
+
+ public Tester makeInner(final String message) {
+ return new InnerTester(2);
+ }
+
+ public Tester makeLocal(final String message) {
+ class LocalTester extends Tester {
+ public LocalTester(final int localparam) {
+ super(localparam);
+ }
+
+ protected String[] names() {
+ return new String[] {
+ "this$1",
+ "localparam",
+ "val$message"
+ };
+ }
+
+ protected int[] modifiers() {
+ return new int[] {
+ Modifier.FINAL | MANDATED,
+ Modifier.FINAL,
+ Modifier.FINAL | SYNTHETIC
+ };
+ }
+
+ protected Class[] types() {
+ return new Class[] {
+ Encloser.class,
+ int.class,
+ String.class
+ };
+ }
+
+ public String message() {
+ return message;
+ }
+ }
+
+ return new LocalTester(2);
+ }
+
+ public Tester makeAnonExtendsLocal(final String message) {
+ abstract class LocalTester extends Tester {
+ public LocalTester(final int localparam) {
+ super(localparam);
+ }
+
+ protected String[] names() {
+ return new String[] {
+ "this$1",
+ "localparam",
+ "val$message"
+ };
+ }
+
+ protected int[] modifiers() {
+ return new int[] {
+ Modifier.FINAL | MANDATED,
+ Modifier.FINAL,
+ Modifier.FINAL | SYNTHETIC
+ };
+ }
+
+ protected Class[] types() {
+ return new Class[] {
+ Encloser.class,
+ int.class,
+ String.class
+ };
+ }
+
+ }
+
+ return new LocalTester(2) {
+ public String message() {
+ return message;
+ }
+ };
+ }
+
+ public Tester makeAnonExtendsInner(final String message) {
+ return new InnerTester(2) {
+ protected String[] names() {
+ return new String[] {
+ "this$1",
+ "innerparam",
+ "val$message"
+ };
+ }
+
+ protected int[] modifiers() {
+ return new int[] {
+ Modifier.FINAL | MANDATED,
+ Modifier.FINAL,
+ Modifier.FINAL | SYNTHETIC
+ };
+ }
+
+ protected Class[] types() {
+ return new Class[] {
+ Encloser.class,
+ int.class,
+ String.class
+ };
+ }
+
+ public String message() {
+ return message;
+ }
+ };
+ }
+
+ public Tester makeAnon(final String message) {
+ return new Tester(2) {
+ protected String[] names() {
+ return new String[] {
+ "this$1",
+ "param",
+ "val$message"
+ };
+ }
+
+ protected int[] modifiers() {
+ return new int[] {
+ Modifier.FINAL | MANDATED,
+ Modifier.FINAL,
+ Modifier.FINAL | SYNTHETIC
+ };
+ }
+
+ protected Class[] types() {
+ return new Class[] {
+ Encloser.class,
+ int.class,
+ String.class
+ };
+ }
+
+ public String message() {
+ return message;
+ }
+ };
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8009640
+ * @summary -profile <compact> does not work when -bootclasspath specified
+ * @library /tools/javac/lib
+ * @build ToolBox
+ * @run main CheckRejectProfileBCPOptionsIfUsedTogetherTest
+ */
+
+import com.sun.tools.javac.util.Assert;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CheckRejectProfileBCPOptionsIfUsedTogetherTest {
+
+ private static final String TestSrc =
+ "public class Test {\n" +
+ " javax.swing.JButton b;\n" +
+ "}";
+
+ public static void main(String args[]) throws Exception {
+ List<String> errOutput = new ArrayList<>();
+ String testJDK = ToolBox.jdkUnderTest;
+ ToolBox.createJavaFileFromSource(TestSrc);
+
+ ToolBox.AnyToolArgs javacParams =
+ new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
+ .appendArgs(ToolBox.javacBinary)
+ .appendArgs(ToolBox.testToolVMOpts)
+ .appendArgs("-profile", "compact1", "-bootclasspath",
+ testJDK + "/jre/lib/rt.jar", "Test.java")
+ .setErrOutput(errOutput);
+
+ ToolBox.executeCommand(javacParams);
+
+ Assert.check(errOutput.get(0).startsWith(
+ "javac: profile and bootclasspath options cannot be used together"),
+ "Incorrect javac error output");
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8013394
+ * @summary compile of iterator use fails with error "defined in an inaccessible class or interface"
+ * @library /tools/javac/lib
+ * @build ToolBox
+ * @run main CompileErrorWithIteratorTest
+ */
+
+public class CompileErrorWithIteratorTest {
+
+ private static final String TestCollectionSrc =
+ "package pkg;\n" +
+
+ "import java.util.Iterator;\n" +
+ "import java.util.NoSuchElementException;\n" +
+
+ "public class TestCollection<E> implements Iterable<E> {\n" +
+ " public testCollectionIterator iterator() {\n" +
+ " return new testCollectionIterator();\n" +
+ " }\n" +
+ " class testCollectionIterator implements Iterator<E> {\n" +
+ " public boolean hasNext() { return true; }\n" +
+ " public E next() throws NoSuchElementException\n" +
+ " {\n" +
+ " return null;\n" +
+ " }\n" +
+ " public void remove() {}\n" +
+ " }\n" +
+ "}";
+
+ private static final String TestSrc =
+ "import pkg.TestCollection;\n" +
+ "\n" +
+ "public class Test {\n" +
+ "\n" +
+ " public static void main(String[] args) {\n" +
+ " TestCollection<String> tc1 = new TestCollection<String>();\n" +
+ " for (String s : tc1) {\n" +
+ " System.out.println(s);\n" +
+ " }\n" +
+ " }\n" +
+ "}";
+
+ public static void main(String args[]) throws Exception {
+ new CompileErrorWithIteratorTest().run();
+ }
+
+ void run() throws Exception {
+ compile();
+ }
+
+ void compile() throws Exception {
+ ToolBox.JavaToolArgs javacParams =
+ new ToolBox.JavaToolArgs()
+ .setSources(TestCollectionSrc, TestSrc);
+ ToolBox.javac(javacParams);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8019486/WrongLVTForLambdaTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8019486
+ * @summary javac, generates erroneous LVT for a test case with lambda code
+ * @library /tools/javac/lib
+ * @build ToolBox
+ * @run main WrongLVTForLambdaTest
+ */
+
+import java.io.File;
+import java.nio.file.Paths;
+
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.Code_attribute;
+import com.sun.tools.classfile.LineNumberTable_attribute;
+import com.sun.tools.classfile.Method;
+import com.sun.tools.javac.util.Assert;
+
+public class WrongLVTForLambdaTest {
+
+ static final String testSource =
+ /* 01 */ "import java.util.List;\n" +
+ /* 02 */ "import java.util.Arrays;\n" +
+ /* 03 */ "import java.util.stream.Collectors;\n" +
+ /* 04 */ "\n" +
+ /* 05 */ "public class Foo {\n" +
+ /* 06 */ " void bar(int value) {\n" +
+ /* 07 */ " final List<Integer> numbers = Arrays.asList(1, 2, 3);\n" +
+ /* 08 */ " final List<Integer> numbersPlusOne = \n" +
+ /* 09 */ " numbers.stream().map(number -> number / 1).collect(Collectors.toList());\n" +
+ /* 10 */ " }\n" +
+ /* 11 */ "}";
+
+ static final int[][] expectedLNT = {
+ // {line-number, start-pc},
+ {9, 0}, //number -> number / 1
+ };
+
+ static final String methodToLookFor = "lambda$0";
+
+ public static void main(String[] args) throws Exception {
+ new WrongLVTForLambdaTest().run();
+ }
+
+ void run() throws Exception {
+ compileTestClass();
+ checkClassFile(new File(Paths.get(System.getProperty("user.dir"),
+ "Foo.class").toUri()), methodToLookFor);
+ }
+
+ void compileTestClass() throws Exception {
+ ToolBox.JavaToolArgs javacSuccessArgs =
+ new ToolBox.JavaToolArgs().setSources(testSource);
+ ToolBox.javac(javacSuccessArgs);
+ }
+
+ void checkClassFile(final File cfile, String methodToFind) throws Exception {
+ ClassFile classFile = ClassFile.read(cfile);
+ boolean methodFound = false;
+ for (Method method : classFile.methods) {
+ if (method.getName(classFile.constant_pool).equals(methodToFind)) {
+ methodFound = true;
+ Code_attribute code = (Code_attribute) method.attributes.get("Code");
+ LineNumberTable_attribute lnt =
+ (LineNumberTable_attribute) code.attributes.get("LineNumberTable");
+ Assert.check(lnt.line_number_table_length == expectedLNT.length,
+ "The LineNumberTable found has a length different to the expected one");
+ int i = 0;
+ for (LineNumberTable_attribute.Entry entry: lnt.line_number_table) {
+ Assert.check(entry.line_number == expectedLNT[i][0] &&
+ entry.start_pc == expectedLNT[i][1],
+ "LNT entry at pos " + i + " differ from expected." +
+ "Found " + entry.line_number + ":" + entry.start_pc +
+ ". Expected " + expectedLNT[i][0] + ":" + expectedLNT[i][1]);
+ i++;
+ }
+ }
+ }
+ Assert.check(methodFound, "The seek method was not found");
+ }
+
+ void error(String msg) {
+ throw new AssertionError(msg);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8022053/UnverifiableInitForNestedLocalClassTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,73 @@
+/*
+ * 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 8022053
+ * @summary 8022053: javac generates unverifiable initializer for nested subclass of local class
+ * @run main UnverifiableInitForNestedLocalClassTest
+ */
+
+public class UnverifiableInitForNestedLocalClassTest {
+
+ public static void main(final String[] args) {
+ test("test");
+ }
+
+ static void test(final String arg) {
+ final String inlined = " inlined ";
+ class LocalClass {
+ String m() {
+ return "LocalClass " + arg + inlined;
+ }
+
+ class SubClass extends LocalClass {
+ @Override
+ String m() {
+ return "SubClass " + arg + inlined;
+ }
+ }
+
+ class SubSubClass extends SubClass {
+ @Override
+ String m() {
+ return "SubSubClass " + arg + inlined;
+ }
+ }
+
+ class AnotherLocal {
+ class AnotherSub extends LocalClass {
+ @Override
+ String m() {
+ return "AnotherSub " + arg + inlined;
+ }
+ }
+ }
+ }
+ System.out.println(new LocalClass().m());
+ System.out.println(new LocalClass().new SubClass().m());
+ System.out.println(new LocalClass().new SubSubClass().m());
+ System.out.println(new LocalClass().new AnotherLocal().new AnotherSub().m());
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8022316
+ * @summary Generic throws, overriding and method reference
+ * @compile/fail/ref=CompilerErrorGenericThrowPlusMethodRefTest.out -XDrawDiagnostics CompilerErrorGenericThrowPlusMethodRefTest.java
+ */
+
+@SuppressWarnings("unchecked")
+public class CompilerErrorGenericThrowPlusMethodRefTest {
+ interface SAM11 {
+ public <E extends Throwable> void foo() throws E ;
+ }
+
+ interface SAM12 extends SAM11{
+ @Override
+ public void foo() throws Throwable;
+ }
+
+ public void boo() throws RuntimeException {}
+
+ static void test1() {
+ try {
+ SAM12 s2 = new CompilerErrorGenericThrowPlusMethodRefTest()::boo;
+ s2.foo();
+ } catch(Throwable ex) {}
+ }
+
+ static void test2() {
+ SAM11 s1 = null;
+ s1.<Exception>foo();
+ s1.<RuntimeException>foo();
+ }
+
+ interface SAM21 {
+ <E extends Exception> void m(E arg) throws E;
+ }
+
+ interface SAM22 {
+ <F extends Exception> void m(F arg) throws F;
+ }
+
+ interface SAM23 extends SAM21, SAM22 {}
+
+ public <E extends Exception> void bar(E e) throws E {}
+
+ static <E extends Exception> void test3(E e) {
+ try {
+ SAM23 s2 = new CompilerErrorGenericThrowPlusMethodRefTest()::bar;
+ s2.m(e);
+ } catch(Exception ex) {}
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.out Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,2 @@
+CompilerErrorGenericThrowPlusMethodRefTest.java:55:26: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Exception
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8023112/SkipLazyConstantCreationForMethodRefTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8023112
+ * @summary Mixing up the method type argument with the class type for method
+ * reference ClassType<Q>::<T>new
+ * @compile SkipLazyConstantCreationForMethodRefTest.java
+ */
+
+public class SkipLazyConstantCreationForMethodRefTest<T> {
+ SkipLazyConstantCreationForMethodRefTest(int a, boolean b) {}
+ SkipLazyConstantCreationForMethodRefTest() {}
+}
+
+class SubClass<T> extends SkipLazyConstantCreationForMethodRefTest {
+ SubClass(int a, boolean b) {}
+}
+
+interface SAM {
+ SubClass<SkipLazyConstantCreationForMethodRefTest> m(int a, boolean b);
+}
+
+interface Tester1 {
+ SAM s11 = SubClass<SkipLazyConstantCreationForMethodRefTest>::<Object>new;
+ SAM s12 = (SubClass<SkipLazyConstantCreationForMethodRefTest>::<Object>new);
+ SAM s13 = (SAM)SubClass<SkipLazyConstantCreationForMethodRefTest>::<Object>new;
+ SAM s14 = true ? s11 : s12;
+ SAM s15 = true ? s11 : (SAM)SubClass<SkipLazyConstantCreationForMethodRefTest>::<Object>new;
+ SAM s16 = true ? (SAM)SubClass<SkipLazyConstantCreationForMethodRefTest>::<Object>new : s12;
+}
+
+interface Tester2 {
+ SAM s21 = Tester1.s11;
+}
--- a/langtools/test/tools/javac/TestPkgInfo.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/TestPkgInfo.java Fri Sep 06 15:09:44 2013 -0700
@@ -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
@@ -23,8 +23,10 @@
/*
* @test
- * @bug 6960424
- * @summary new option -Xpkginfo for better control of when package-info.class is generated
+ * @bug 6960424 8022161
+ * @summary new option -Xpkginfo for better control of when package-info.class
+ * is generated, also ensures no failures if package-info.java is
+ * not available.
*/
import java.io.*;
@@ -43,8 +45,11 @@
public static void main(String... args) throws Exception {
new TestPkgInfo().run(args);
}
-
public void run(String... args) throws Exception {
+ testPositive();
+ testNoExceptions();
+ }
+ public void testPositive(String... args) throws Exception {
boolean[] booleanValues = { false, true };
for (OptKind ok: OptKind.values()) {
for (boolean sr: booleanValues) {
@@ -65,6 +70,32 @@
throw new Exception(errors + " errors occurred");
}
+ /** this should throw no exceptions **/
+ void testNoExceptions() throws Exception {
+ count++;
+ System.err.println("Test " + count + ": ALWAYS nofile");
+
+ StringBuilder sb = new StringBuilder();
+ sb.append("package test; class Hello{}");
+
+ // test specific tmp directory
+ File tmpDir = new File("tmp.test" + count);
+ File classesDir = new File(tmpDir, "classes");
+ classesDir.mkdirs();
+ File javafile = new File(new File(tmpDir, "src"), "Hello.java");
+ writeFile(javafile, sb.toString());
+ // build up list of options and files to be compiled
+ List<String> opts = new ArrayList<>();
+ List<File> files = new ArrayList<>();
+
+ opts.add("-d");
+ opts.add(classesDir.getPath());
+ opts.add("-Xpkginfo:always");
+ files.add(javafile);
+
+ compile(opts, files);
+ }
+
void test(OptKind ok, boolean sr, boolean cr, boolean rr) throws Exception {
count++;
System.err.println("Test " + count + ": ok:" + ok + " sr:" + sr + " cr:" + cr + " rr:" + rr);
@@ -91,15 +122,15 @@
writeFile(pkginfo_java, sb.toString());
// build up list of options and files to be compiled
- List<String> opts = new ArrayList<String>();
- List<File> files = new ArrayList<File>();
+ List<String> opts = new ArrayList<>();
+ List<File> files = new ArrayList<>();
opts.add("-d");
opts.add(classesDir.getPath());
if (ok.opt != null)
opts.add(ok.opt);
//opts.add("-verbose");
- files.add(pkginfo_java);
+ files.add(pkginfo_java);
compile(opts, files);
@@ -134,7 +165,7 @@
/** Compile files with options provided. */
void compile(List<String> opts, List<File> files) throws Exception {
System.err.println("javac: " + opts + " " + files);
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
args.addAll(opts);
for (File f: files)
args.add(f.getPath());
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java Fri Sep 06 15:09:44 2013 -0700
@@ -35,13 +35,16 @@
// Test count helps identify test case in event of failure.
int testcount = 0;
- // Base test case template descriptions
+ // Base test case template descriptions;true==annotations in code attribute.
enum srce {
src1("(repeating) type annotations on on field in method body",true),
src2("(repeating) type annotations on type parameters, bounds and type arguments", true),
src3("(repeating) type annotations on type parameters of class, method return value in method", true),
src4("(repeating) type annotations on field in anonymous class", false),
- src5("(repeating) type annotations on field in anonymous class", false);
+ src5("(repeating) type annotations on field in anonymous class", false),
+ src6("(repeating) type annotations on void method declaration", false),
+ src7("(repeating) type annotations in use of instanceof", true),
+ src8("(repeating) type annotations in use of instanceof in method", true);
String description;
Boolean local;
@@ -84,6 +87,12 @@
test( 0, 8, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src1);
test( 2, 0, 2, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src5);
test( 0, 2, 0, 2, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src5);
+ test( 0, 0, 2, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src6);
+ test( 0, 0, 0, 2, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src6);
+ test( 2, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src7);
+ test( 0, 2, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src7);
+ test( 4, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src8);
+ test( 0, 4, 0, 0, As, BDs, ABMix, "RUNTIME", et, ++testrun, srce.src8);
break;
case "FIELD":
test( 8, 0, 0, 0, As, BDs, ABMix, "CLASS", et, ++testrun, srce.src1);
@@ -121,18 +130,6 @@
", ABmix=" + ABmix + ", retention: " + rtn + ", anno2: " +
et2 + ", src=" + source + "\n " + source.description;
- if(
-// 8005681 - src1,2,3 - skip cases with repeated annotations on new, array, cast.
- (( source.equals(srce.src1) || source.equals(srce.src2) ||
- source.equals(srce.src3)) && (ABmix || (Arepeats && BDrepeats)))
- // 8008928 - src4,5 - this change cause crash with t-a on anon class)
- || (source.equals(srce.src4) || source.equals(srce.src5))
- ) {
- System.out.println(testDef +
- "\n 8005681-skip repeated annotations on new,array,cast");
- return;
- }
-
println(testDef);
// Create test source and File.
String sourceString = sourceString(tname, rtn, et2, Arepeats,
@@ -178,9 +175,7 @@
println("Pass");
}
- //
// Source for test cases
- //
String sourceString(String testname, String retentn, String annot2,
Boolean Arepeats, Boolean BDrepeats, Boolean ABmix,
srce src) {
@@ -359,6 +354,63 @@
hasInnerClass=true;
innerClassname="$1";
break;
+ case src6: // (repeating)annotations on void method declaration
+ /*
+ * class Test95{
+ * @A @A @B @B public void test() { };
+ * }
+ */
+ source = new String( source +
+ "// " + src.description + "\n" +
+ "class "+ testname + "{\n" +
+ " _As_ _Bs_ public void test() { }\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+ "\n\n";
+ hasInnerClass=false;
+ break;
+ case src7: // (repeating) type annotations in use of instanceof
+ /*
+ * class Test10{
+ * String data = "test";
+ * boolean dataIsString = ( data instanceof @A @B @A @B String);
+ * }
+ */
+ source = new String( source +
+ "// " + src.description + "\n" +
+ "class "+ testname + "{\n" +
+ " String data = \"test\";\n" +
+ " boolean dataIsString = ( data instanceof _As_ _Bs_ String);\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+ "\n\n";
+ hasInnerClass=false;
+ break;
+ case src8: // (repeating) type annotations in use of instanceof
+ /*
+ * class Test20{
+ * String data = "test";
+ * Boolean isString() {
+ * if( data instanceof @A @B @A @B String )
+ * return true;
+ * else
+ * return( data instanceof @A @B @A @B String );
+ * }
+ * }
+ */
+ source = new String( source +
+ "// " + src.description + "\n" +
+ "class "+ testname + "{\n" +
+ " String data = \"test\";\n" +
+ " Boolean isString() { \n" +
+ " if( data instanceof _As_ _Bs_ String )\n" +
+ " return true;\n" +
+ " else\n" +
+ " return( data instanceof _As_ _Bs_ String );\n" +
+ " }\n" +
+ "}\n").concat(sourceBase).replace("_OTHER_", annot2).replace("_As_",As).replace("_Bs_",Bs) +
+ "\n\n";
+ hasInnerClass=false;
+ break;
+
}
return imports + source;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/DummyProcessor.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,43 @@
+/*
+ * 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 javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.TypeElement;
+
+import java.util.Set;
+
+/* A simple annotation processor. */
+@SupportedAnnotationTypes("*")
+public class DummyProcessor extends AbstractProcessor {
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+
+ @Override
+ public final boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ return false;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/T8020715.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,49 @@
+/*
+ * 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 Regression: compiling program with lambda crashed compiler
+ * @bug 8020715
+ * @compile T8020715.java
+ */
+class T8020715 {
+ // This crashed.
+ private static void makeTask1() {
+ class LocalClass {
+ private Runnable r = () -> {};
+ }
+ }
+
+ // This crashed, too.
+ private void makeTask2() {
+ class LocalClass {
+ private Runnable r = () -> {};
+ }
+ }
+
+ // This is fine.
+ private class InnerClass {
+ private Runnable r = () -> {};
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableCycleTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -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 8023768
+ * @summary Type annotations on a type variable, where the bound of
+ * the type variable is an annotated type variable,
+ * need to be processed correctly.
+ * @author Werner Dietl
+ * @compile TypeVariableCycleTest.java
+ */
+
+import java.lang.annotation.*;
+
+class TypeVariableCycleTest<CTV> {
+ <MTV extends @TA CTV> MTV cast(CTV p) {
+ return (@TA MTV) p;
+ }
+}
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface TA {}
+
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Fri Sep 06 15:09:44 2013 -0700
@@ -85,4 +85,24 @@
" } } }";
}
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 4),
+ @TADescription(annotation = "TB", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 0)
+ })
+ public String generic1() {
+ return "class Test { <T> Test(int i) { new <@TA T>Test(); }" +
+ " <T> Test() { <@TB String>this(0); } }";
+ }
+
+ @TADescriptions({
+ @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 0)
+ })
+ public String generic2() {
+ return "class Super { <T> Super(int i) { } } " +
+ "class Test extends Super { <T> Test() { <@TA String>super(0); } }";
+ }
+
}
--- a/langtools/test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * @test
- * @ignore 8007517: DefaultMethodRegressionTests.java fail in TL
- * @bug 8003639
- * @summary convert lambda testng tests to jtreg and add them
- * @run testng DefaultMethodRegressionTests
- */
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
-
-/**
- * This set of classes/interfaces (K/I/C) is specially designed to expose a
- * bug in the JVM where it did not find some overloaded methods in some
- * specific situations. (fixed by hotspot changeset ffb9316fd9ed)
- */
-interface K {
- int bbb(Long l);
-}
-
-interface I extends K {
- default void aaa() {}
- default void aab() {}
- default void aac() {}
-
- default int bbb(Integer i) { return 22; }
- default int bbb(Float f) { return 33; }
- default int bbb(Long l) { return 44; }
- default int bbb(Double d) { return 55; }
- default int bbb(String s) { return 66; }
-
- default void caa() {}
- default void cab() {}
- default void cac() {}
-}
-
-class C implements I {}
-
-public class DefaultMethodRegressionTests {
-
- @Test(groups = "vm")
- public void testLostOverloadedMethod() {
- C c = new C();
- assertEquals(c.bbb(new Integer(1)), 22);
- assertEquals(c.bbb(new Float(1.1)), 33);
- assertEquals(c.bbb(new Long(1L)), 44);
- assertEquals(c.bbb(new Double(0.01)), 55);
- assertEquals(c.bbb(new String("")), 66);
- }
-
- // Test to ensure that the inference verifier accepts older classfiles
- // with classes that implement interfaces with defaults.
- @Test(groups = "vm")
- public void testInferenceVerifier() {
- // interface I { int m() default { return 99; } }
- byte I_bytes[] = {
- (byte)0xca, (byte)0xfe, (byte)0xba, (byte)0xbe, 0x00, 0x00, 0x00, 0x33,
- 0x00, 0x08, 0x07, 0x00, 0x06, 0x07, 0x00, 0x07,
- 0x01, 0x00, 0x03, 0x66, 0x6f, 0x6f, 0x01, 0x00,
- 0x03, 0x28, 0x29, 0x49, 0x01, 0x00, 0x04, 0x43,
- 0x6f, 0x64, 0x65, 0x01, 0x00, 0x01, 0x49, 0x01,
- 0x00, 0x10, 0x6a, 0x61, 0x76, 0x61, 0x2f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x4f, 0x62, 0x6a, 0x65,
- 0x63, 0x74, 0x06, 0x00, 0x00, 0x01, 0x00, 0x02,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01,
- 0x00, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05,
- 0x00, 0x00, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x01,
- 0x00, 0x00, 0x00, 0x03, 0x10, 0x63, (byte)0xac, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00
- };
- // public class C implements I {} /* -target 1.5 */
- byte C_bytes[] = {
- (byte)0xca, (byte)0xfe, (byte)0xba, (byte)0xbe, 0x00, 0x00, 0x00, 0x31,
- 0x00, 0x0c, 0x0a, 0x00, 0x03, 0x00, 0x08, 0x07,
- 0x00, 0x09, 0x07, 0x00, 0x0a, 0x07, 0x00, 0x0b,
- 0x01, 0x00, 0x06, 0x3c, 0x69, 0x6e, 0x69, 0x74,
- 0x3e, 0x01, 0x00, 0x03, 0x28, 0x29, 0x56, 0x01,
- 0x00, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x0c, 0x00,
- 0x05, 0x00, 0x06, 0x01, 0x00, 0x01, 0x43, 0x01,
- 0x00, 0x10, 0x6a, 0x61, 0x76, 0x61, 0x2f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x4f, 0x62, 0x6a, 0x65,
- 0x63, 0x74, 0x01, 0x00, 0x01, 0x49, 0x00, 0x21,
- 0x00, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x04,
- 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05,
- 0x00, 0x06, 0x00, 0x01, 0x00, 0x07, 0x00, 0x00,
- 0x00, 0x11, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
- 0x00, 0x05, 0x2a, (byte)0xb7, 0x00, 0x01, (byte)0xb1, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00
- };
-
- ClassLoader cl = new ClassLoader() {
- protected Class<?> findClass(String name) {
- if (name.equals("I")) {
- return defineClass("I", I_bytes, 0, I_bytes.length);
- } else if (name.equals("C")) {
- return defineClass("C", C_bytes, 0, C_bytes.length);
- } else {
- return null;
- }
- }
- };
- try {
- Class.forName("C", true, cl);
- } catch (Exception e) {
- // unmodified verifier will throw VerifyError
- fail("No exception should be thrown");
- }
- }
-}
--- a/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,5 +23,5 @@
// key: compiler.err.already.defined.static.single.import
-import static p.E1.A;
+import p.E1.A;
import static p.E2.A;
--- a/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,4 +23,6 @@
package p;
-public enum E1 { A, B, C}
+public class E1 {
+ public static class A { }
+}
--- a/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java Fri Sep 06 15:09:44 2013 -0700
@@ -23,4 +23,6 @@
package p;
-public enum E2 { A, B, C }
+public class E2 {
+ public static class A { }
+}
--- a/langtools/test/tools/javac/diags/examples/IncompatibleThrownTypesInLambda.java Thu Sep 05 15:37:40 2013 +0400
+++ /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.incompatible.thrown.types.in.lambda
-
-class IncompatibleThrownTypesInLambda {
- interface SAM {
- void m();
- }
-
- SAM s = ()-> { throw new Exception(); };
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/ObsoleteSourceAndTarget.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,32 @@
+/*
+ * 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.option.obsolete.source
+// key: compiler.warn.option.obsolete.target
+// key: compiler.warn.option.obsolete.suppression
+// key: compiler.warn.source.no.bootclasspath
+// options: -source 1.5 -target 1.5
+
+class ObsoleteSourceAndTarget {
+ public static void foo() {;}
+}
--- a/langtools/test/tools/javac/generics/7015430/T7015430_1.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/generics/7015430/T7015430_1.out Fri Sep 06 15:09:44 2013 -0700
@@ -1,13 +1,13 @@
T7015430.java:42:14: compiler.warn.unchecked.meth.invocation.applied: kindname.method, empty, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
T7015430.java:42:15: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:51:41: compiler.warn.unchecked.meth.invocation.applied: kindname.method, empty, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:51:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:51:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:69:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
T7015430.java:69:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:78:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:78:40: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:78:40: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:105:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:105:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:105:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:114:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
T7015430.java:114:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:42:14: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Exception
--- a/langtools/test/tools/javac/generics/7015430/T7015430_2.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/generics/7015430/T7015430_2.out Fri Sep 06 15:09:44 2013 -0700
@@ -1,15 +1,15 @@
T7015430.java:42:14: compiler.warn.unchecked.meth.invocation.applied: kindname.method, empty, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:42:15: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:42:15: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:51:41: compiler.warn.unchecked.meth.invocation.applied: kindname.method, empty, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:51:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:51:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:69:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:69:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:69:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:78:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:78:40: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:78:40: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:105:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:105:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:105:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:114:9: compiler.warn.unchecked.meth.invocation.applied: kindname.constructor, <init>, java.lang.Iterable<E>, java.lang.Iterable, kindname.class, T7015430
-T7015430.java:114:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<java.lang.RuntimeException>
+T7015430.java:114:22: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.lang.Iterable, java.lang.Iterable<E>
T7015430.java:130:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Exception
1 error
12 warnings
--- a/langtools/test/tools/javac/generics/7151802/T7151802.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/generics/7151802/T7151802.out Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,6 @@
T7151802.java:14:31: compiler.warn.unchecked.meth.invocation.applied: kindname.method, get1, Z, T7151802.Foo, kindname.class, T7151802
T7151802.java:22:30: compiler.warn.unchecked.meth.invocation.applied: kindname.method, get3, T7151802.Foo<Z>, T7151802.Foo, kindname.class, T7151802
-T7151802.java:22:31: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T7151802.Foo, T7151802.Foo<java.lang.Object>
+T7151802.java:22:31: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T7151802.Foo, T7151802.Foo<Z>
T7151802.java:30:36: compiler.warn.unchecked.meth.invocation.applied: kindname.method, get5, compiler.misc.no.args, compiler.misc.no.args, kindname.class, T7151802
T7151802.java:38:31: compiler.warn.unchecked.meth.invocation.applied: kindname.method, get7, T7151802.Foo<java.lang.String>, T7151802.Foo, kindname.class, T7151802
T7151802.java:38:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T7151802.Foo, T7151802.Foo<java.lang.String>
--- a/langtools/test/tools/javac/generics/8016640/T8016640.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/generics/8016640/T8016640.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,10 +1,11 @@
/*
* @test /nodynamiccopyright/
- * @bug 8016640
+ * @bug 8016640 8022508
* @summary compiler hangs if the generics arity of a base class is wrong
* @compile/fail/ref=T8016640.out -XDrawDiagnostics T8016640.java
*/
class T8016640 {
static class Foo<X,Y> { }
static class BadFoo<T> extends Foo<T> { }
+ static class SubBadFoo<T> extends BadFoo<T> { }
}
--- a/langtools/test/tools/javac/generics/inference/6718364/T6718364.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/generics/inference/6718364/T6718364.out Fri Sep 06 15:09:44 2013 -0700
@@ -1,3 +1,3 @@
T6718364.java:13:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
-T6718364.java:13:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
+T6718364.java:13:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T
2 warnings
--- a/langtools/test/tools/javac/generics/inference/7177306/T7177306a.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/generics/inference/7177306/T7177306a.out Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
T7177306a.java:13:33: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, java.util.List<E>, java.util.List, kindname.class, T7177306a
-T7177306a.java:13:34: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.util.List, java.util.List<java.lang.Object>
+T7177306a.java:13:34: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), java.util.List, java.util.List<E>
T7177306a.java:13:33: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T7177306a, T7177306a<java.lang.Object>
- compiler.err.warnings.and.werror
1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/8021567/T8021567.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,26 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8021567
+ * @summary Javac doesn't report "java: reference to method is ambiguous" any more
+ * @compile/fail/ref=T8021567.out -XDrawDiagnostics T8021567.java
+ */
+
+class T8021567 {
+
+ interface I_int { int m(); }
+
+ interface I_char { char m(); }
+
+ interface I_byte { byte m(); }
+
+ void m(I_byte b) { }
+ void m(I_char b) { }
+ void m(I_int b) { }
+
+ void test() {
+ m(() -> 1); //ambiguous
+ m(() -> 256); //ok - only method(I_int) applicable
+ m(() -> { int i = 1; return i; }); //ok - only method(I_int) applicable
+ m(() -> { int i = 256; return i; }); //ok - only method(I_int) applicable
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/8021567/T8021567.out Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,2 @@
+T8021567.java:21:9: compiler.err.ref.ambiguous: m, kindname.method, m(T8021567.I_byte), T8021567, kindname.method, m(T8021567.I_char), T8021567
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/8021567/T8021567b.java Fri Sep 06 15:09:44 2013 -0700
@@ -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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 8021567
+ * @summary Javac doesn't report "java: reference to method is ambiguous" any more
+ */
+
+public class T8021567b {
+
+ interface SAM {
+ int m();
+ }
+
+ public static void main(String argv[]) {
+ test();
+ }
+
+ static boolean test() {
+ final int i = 0;
+ SAM s = () -> i;
+ return (s.m() == 0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/ExceptionsInLambda.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,61 @@
+/*
+ * 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 8015809
+ * @summary Producing individual errors for uncaught undeclared exceptions inside lambda expressions, instead of one error for whole lambda
+ * @compile/fail/ref=ExceptionsInLambda.out -XDrawDiagnostics ExceptionsInLambda.java
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.InputStream;
+import java.io.Reader;
+
+public class ExceptionsInLambda {
+
+ public static void main(Runnable p, File f) {
+ main(() -> {
+ StringBuilder sb = new StringBuilder();
+
+ Reader in = new FileReader(f);
+ int r;
+
+ while ((r = in.read()) != (-1)) {
+ sb.append((char) r);
+ }
+ }, f);
+
+ doOpen(() -> new FileInputStream(f));
+ }
+
+ public static InputStream doOpen(Open open) {
+ return open.open();
+ }
+
+ public interface Open {
+ public InputStream open();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/ExceptionsInLambda.out Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,4 @@
+ExceptionsInLambda.java:43:25: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.FileNotFoundException
+ExceptionsInLambda.java:46:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.IOException
+ExceptionsInLambda.java:51:22: compiler.err.unreported.exception.need.to.catch.or.throw: java.io.FileNotFoundException
+3 errors
--- a/langtools/test/tools/javac/lambda/MethodReference66.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/lambda/MethodReference66.java Fri Sep 06 15:09:44 2013 -0700
@@ -24,7 +24,6 @@
/*
* @test
* @bug 8009299
- * @ignore 8013875: Incorrect vtable index being set during methodHandle creation for static
* @summary Javac crashes when compiling method reference to static interface method
* @run main/othervm -Xverify:none MethodReference66
*/
--- a/langtools/test/tools/javac/lambda/TargetType21.out Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/lambda/TargetType21.out Fri Sep 06 15:09:44 2013 -0700
@@ -1,6 +1,5 @@
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
+4 errors
--- a/langtools/test/tools/javac/lambda/TargetType59.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/lambda/TargetType59.java Fri Sep 06 15:09:44 2013 -0700
@@ -34,15 +34,15 @@
class TargetType59 {
- <T, R> Collector<T, R> m(Supplier<? extends R> supplier, BiConsumer<R, T> accumulator) {
+ <T, R> Collector<T, String, R> m(Supplier<? extends R> supplier, BiConsumer<R, T> accumulator) {
return null;
}
- <T, C extends Collection<T>> Collector<T,C> test1(Supplier<C> collectionFactory) {
+ <T, C extends Collection<T>> Collector<T, String, C> test1(Supplier<C> collectionFactory) {
return m(collectionFactory, Collection::add);
}
- Collector<String, StringBuilder> test2(Supplier<StringBuilder> sb) {
+ Collector<String, String, StringBuilder> test2(Supplier<StringBuilder> sb) {
return m(sb, StringBuilder::append);
}
}
--- a/langtools/test/tools/javac/lambda/TargetType62.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/lambda/TargetType62.java Fri Sep 06 15:09:44 2013 -0700
@@ -38,8 +38,8 @@
return g(classifier, TreeMap::new, m(HashSet::new));
}
- <R> Collector<Integer, R> m(Supplier<R> s) { return null; }
+ <R> Collector<Integer, String, R> m(Supplier<R> s) { return null; }
<T, K, D, M extends Map<K, D>>
- Collector<T, M> g(Function<T, K> classifier, Supplier<M> mapFactory, Collector<T, D> downstream) { return null; }
+ Collector<T, String, M> g(Function<T, K> classifier, Supplier<M> mapFactory, Collector<T, String, D> downstream) { return null; }
}
--- a/langtools/test/tools/javac/lambda/lambdaExecution/InInterface.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/lambda/lambdaExecution/InInterface.java Fri Sep 06 15:09:44 2013 -0700
@@ -26,7 +26,6 @@
/**
* @test
* @bug 8003639
- * @ignore 8013875: Incorrect vtable index being set during methodHandle creation for static
* @summary convert lambda testng tests to jtreg and add them
* @run testng InInterface
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Processor.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,100 @@
+/*
+ * 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.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.MirroredTypeException;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeKind;
+import javax.tools.*;
+
+import com.sun.tools.javac.util.Assert;
+import com.sun.tools.javac.code.Symbol;
+import static com.sun.tools.javac.code.Symbol.TypeSymbol;
+
+public class Processor extends JavacTestingAbstractProcessor {
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ for (Element e : roundEnv.getElementsAnnotatedWith(A.class)) {
+ A rtg = e.getAnnotation(A.class);
+
+ try {
+ rtg.a();
+ Assert.check(false); //Should not reach here
+ } catch (MirroredTypeException ex) {
+ TypeMirror tm = ex.getTypeMirror();
+ Assert.check(tm.getKind() == TypeKind.ERROR);
+
+ TypeElement elm = (TypeElement)((DeclaredType)tm).asElement();
+ Assert.check(elm.getQualifiedName().toString().
+ endsWith("some.path.to.SomeUnknownClass$Inner"));
+
+ TypeSymbol sym = (TypeSymbol)elm;
+ Assert.check(sym.name.contentEquals("some.path.to.SomeUnknownClass$Inner"));
+ }
+ }
+ for (Element e : roundEnv.getElementsAnnotatedWith(B.class)) {
+ B rtg = e.getAnnotation(B.class);
+
+ try {
+ rtg.a();
+ Assert.check(false); //Should not reach here
+ } catch (MirroredTypeException ex) {
+ TypeMirror tm = ex.getTypeMirror();
+ Assert.check(tm.getKind() == TypeKind.ERROR);
+
+ TypeElement elm = (TypeElement)((DeclaredType)tm).asElement();
+ Assert.check(elm.getQualifiedName().toString().
+ endsWith("SomeUnknownClass"));
+
+ TypeSymbol sym = (TypeSymbol)elm;
+ Assert.check(sym.name.contentEquals("SomeUnknownClass"));
+ }
+ }
+ for (Element e : roundEnv.getElementsAnnotatedWith(C.class)) {
+ C rtg = e.getAnnotation(C.class);
+
+ try {
+ rtg.a();
+ Assert.check(false); //Should not reach here
+ } catch (AnnotationTypeMismatchException ex) {
+ ;
+ }
+ }
+ return true;
+ }
+
+ @interface A {
+ Class<?> a();
+ }
+ @interface B {
+ Class<?> a();
+ }
+ @interface C {
+ Class<?> a();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8019243
+ * @summary AnnotationTypeMismatchException instead of MirroredTypeException
+ * @library /tools/javac/lib
+ * @build JavacTestingAbstractProcessor Processor
+ * @compile/fail/ref=Source.out -XDrawDiagnostics -processor Processor Source.java
+ */
+
+@Processor.A(a=some.path.to.SomeUnknownClass$Inner.class)
+class Source1{}
+
+@Processor.B(a=SomeUnknownClass.class)
+class Source2{}
+
+@Processor.C(a=SomeUnknownClass.clas) // this is not a class literal
+class Source3{}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.out Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,4 @@
+Source.java:10:28: compiler.err.doesnt.exist: some.path.to
+Source.java:13:16: compiler.err.cant.resolve: kindname.class, SomeUnknownClass, ,
+Source.java:16:16: compiler.err.cant.resolve: kindname.variable, SomeUnknownClass, ,
+3 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/errors/TestClassNames.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,47 @@
+/*
+ * 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 7071377
+ * @summary verify if erroneous class names are rejected
+ * @library /tools/javac/lib
+ * @build TestClassNames JavacTestingAbstractProcessor CompileFail
+ * @run main CompileFail ERROR -processor TestClassNames TestClassNames.x.y
+ * @run main CompileFail ERROR -processor TestClassNames x.y.TestClassNames
+ * @run main CompileFail ERROR -processor NoClass NoClass.x.y
+ */
+
+import java.util.Set;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+
+/**
+ * No-op processor; should not be run.
+ */
+public class TestClassNames extends JavacTestingAbstractProcessor {
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnvironment) {
+ return true;
+ }
+}
--- a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2009, 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,7 +31,6 @@
import java.io.File;
import java.util.*;
-import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.PackageElement;
@@ -60,7 +59,10 @@
static Elements elements;
public static void main(String[] args) throws Exception {
-
+ if (haveAltRt()) {
+ System.out.println("Warning: alt-rt.jar detected, test skipped");
+ return;
+ }
JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
fm.setLocation(CLASS_PATH, Collections.<File>emptyList());
@@ -123,4 +125,23 @@
if (nestedClasses < 3000)
throw new AssertionError("Too few nested classes in PLATFORM_CLASS_PATH ;-)");
}
+ /*
+ * If -XX:+AggressiveOpts has been used to test, the option currently
+ * instructs the VM to prepend alt-rt.jar onto the bootclasspath. This
+ * overrides the default TreeMap implemation in rt.jar causing symbol
+ * resolution problems (caused by inconsistent inner class), although
+ * alt-rt.jar is being eliminated, we have this sanity check to detect this
+ * case and skip the test.
+ */
+ static boolean haveAltRt() {
+ String bootClassPath = System.getProperty("sun.boot.class.path");
+ for (String cp : bootClassPath.split(File.pathSeparator)) {
+ if (cp.endsWith("alt-rt.jar")) {
+ System.err.println("Warning: detected alt-rt.jar in "
+ + "sun.boot.class.path");
+ return true;
+ }
+ }
+ return false;
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/profiles/ProfileTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,114 @@
+/*
+ * 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 8022287
+ * @summary javac.sym.Profiles uses a static Map when it should not
+ */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import com.sun.tools.javac.sym.Profiles;
+
+public class ProfileTest {
+ public static void main(String... args) throws Exception {
+ new ProfileTest().run();
+ }
+
+ public void run() throws Exception {
+ test("A");
+ test("B");
+
+ if (errors > 0)
+ throw new Exception(errors + " occurred");
+ }
+
+ void test(String base) throws IOException {
+ System.err.println("test " + base);
+ File profileDesc = createFiles(base);
+ checkProfile(profileDesc, base);
+ }
+
+ void checkProfile(File profileDesc, String base) throws IOException {
+ Profiles p = Profiles.read(profileDesc);
+ for (int i = 0; i < p.getProfileCount(); i++) {
+ System.err.println(p.getPackages(i));
+ for (String pkg: p.getPackages(i)) {
+ if (!pkg.endsWith(base))
+ error("unexpected package " + pkg + " for profile " + i);
+ }
+ }
+ }
+
+ File createFiles(String base) throws IOException {
+ File baseDir = new File(base);
+ baseDir.mkdirs();
+ for (int p = 1; p <= 4; p++) {
+ String pkg = "pkg" + p + base;
+ File pkgDir = new File(baseDir, pkg);
+ pkgDir.mkdirs();
+ File clssFile = new File(pkgDir, pkg + "Class.java");
+ try (PrintWriter out = new PrintWriter(new FileWriter(clssFile))) {
+ out.println("package " + pkgDir.getName() + ";");
+ out.println("class " + clssFile.getName().replace(".java", ""));
+ }
+ }
+
+ File profileDesc = new File(baseDir, "profiles" + base + ".txt");
+ try (PrintWriter out = new PrintWriter(new FileWriter(profileDesc))) {
+ for (int p = 1; p <= 4; p++) {
+ String pkg = "pkg" + p + base;
+ createPackage(baseDir, pkg, "Pkg" + p + base + "Class");
+ out.println("PROFILE_" + p + "_RTJAR_INCLUDE_PACKAGES := " + pkg);
+ out.println("PROFILE_" + p + "_RTJAR_INCLUDE_TYPES :=");
+ out.println("PROFILE_" + p + "_RTJAR_EXCLUDE_TYPES :=");
+ out.println("PROFILE_" + p + "_INCLUDE_METAINF_SERVICES := ");
+ }
+ }
+
+ return profileDesc;
+ }
+
+ void createPackage(File baseDir, String pkg, String... classNames) throws IOException {
+ File pkgDir = new File(baseDir, pkg);
+ pkgDir.mkdirs();
+ for (String className: classNames) {
+ File clssFile = new File(pkgDir, className + ".java");
+ try (PrintWriter out = new PrintWriter(new FileWriter(clssFile))) {
+ out.println("package " + pkg + ";");
+ out.println("public class " + className + " { }");
+ }
+ }
+ }
+
+ 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/javac/staticImport/6537020/T6537020.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,26 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6537020
+ * @summary JCK tests: a compile-time error should be given in case of ambiguously imported fields (types, methods)
+ *
+ * @compile/fail/ref=T6537020.out -XDrawDiagnostics T6537020.java
+ */
+
+package p;
+
+import static p.T6537020.C.s;
+
+class T6537020 {
+
+ static class A {
+ static String s;
+ }
+
+ interface B {
+ String s = "";
+ }
+
+ static class C extends A implements B { }
+
+ Object o = s;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/staticImport/6537020/T6537020.out Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,2 @@
+T6537020.java:25:16: compiler.err.ref.ambiguous: s, kindname.variable, s, p.T6537020.B, kindname.variable, s, p.T6537020.A
+1 error
--- a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/javac/tree/SourceTreeScannerTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -140,13 +140,6 @@
// not part of public API
continue;
}
- if (JCTree.JCNewArray.class.isAssignableFrom(tree.getClass())
- && (f.getName().equals("annotations")
- || f.getName().equals("dimAnnotations"))) {
- // these fields are incorrectly missing from the public API
- // (CR 6983297)
- continue;
- }
try {
//System.err.println("FIELD: " + f.getName());
reflectiveScan(f.get(tree));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/tree/TypeAnnotationsPretty.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,169 @@
+/*
+ * 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 8023522
+ * @summary test Pretty print of type annotations
+ * @author wmdietl
+ */
+
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.tools.javac.api.JavacTaskImpl;
+import com.sun.tools.javac.tree.JCTree;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import java.util.LinkedList;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class TypeAnnotationsPretty {
+ private final JavaCompiler tool;
+
+ TypeAnnotationsPretty() {
+ tool = ToolProvider.getSystemJavaCompiler();
+ }
+
+ private List<String> matches = new LinkedList<String>();
+ private List<String> mismatches = new LinkedList<String>();
+
+ public static void main(String... args) throws Exception {
+ TypeAnnotationsPretty tap = new TypeAnnotationsPretty();
+
+ tap.runField("@TA()\nObject cls = null");
+ tap.runField("@TA()\nObject cls = new @TA() Object()");
+
+ tap.runField("@TA()\nList<@TB() Object> cls = null");
+ tap.runField("@TA()\nList<@TB() Object> cls = new @TA() LinkedList<@TB() Object>()");
+
+ tap.runField("Class[] cls = null");
+ tap.runField("@TA()\nClass[] cls = null");
+ tap.runField("Class @TA() [] cls = null");
+ tap.runField("@TA()\nClass @TB() [] cls = null");
+
+ tap.runField("Class[] cls = new Class[]{Object.class}");
+ tap.runField("@TA()\nClass[] cls = new @TA() Class[]{Object.class}");
+ tap.runField("Class @TB() [] cls = new Class @TB() []{Object.class}");
+ tap.runField("@TA()\nClass @TB() [] cls = new @TA() Class @TB() []{Object.class}");
+ tap.runField("@TA()\nClass @TB() [] @TC() [] cls = new @TA() Class @TB() [10] @TC() []");
+ tap.runField("Class @TB() [] @TC() [] cls = new Class @TB() [10] @TC() []");
+ tap.runField("@TA()\nClass @TB() [] @TC() [] @TD() [] cls = new @TA() Class @TB() [10] @TC() [] @TD() []");
+
+ tap.runMethod("\n@TA()\nObject test(@TB()\nList<@TC() String> p) {\n" +
+ " return null;\n" +
+ "}");
+
+
+ if (!tap.matches.isEmpty()) {
+ for (String m : tap.matches)
+ System.out.println(m);
+ }
+ if (!tap.mismatches.isEmpty()) {
+ for (String mm : tap.mismatches)
+ System.err.println(mm + NL);
+ throw new RuntimeException("Tests failed!");
+ }
+ }
+
+ private static final String prefix =
+ "import java.lang.annotation.*;" +
+ "import java.util.*;" +
+ "public class Test {";
+
+ private static final String postfix =
+ "@Target(ElementType.TYPE_USE)" +
+ "@interface TA {}" +
+ "@Target(ElementType.TYPE_USE)" +
+ "@interface TB {}" +
+ "@Target(ElementType.TYPE_USE)" +
+ "@interface TC {}" +
+ "@Target(ElementType.TYPE_USE)" +
+ "@interface TD {}";
+
+ private static final String NL = System.getProperty("line.separator");
+
+ private void runField(String code) throws IOException {
+ String src = prefix +
+ code + "; }" +
+ postfix;
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+ null, Arrays.asList(new MyFileObject(src)));
+
+ for (CompilationUnitTree cut : ct.parse()) {
+ JCTree.JCVariableDecl var =
+ (JCTree.JCVariableDecl) ((ClassTree) cut.getTypeDecls().get(0)).getMembers().get(0);
+ checkMatch(code, var);
+ }
+ }
+
+ private void runMethod(String code) throws IOException {
+ String src = prefix +
+ code + "}" +
+ postfix;
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+ null, Arrays.asList(new MyFileObject(src)));
+
+
+ for (CompilationUnitTree cut : ct.parse()) {
+ JCTree.JCMethodDecl meth =
+ (JCTree.JCMethodDecl) ((ClassTree) cut.getTypeDecls().get(0)).getMembers().get(0);
+ checkMatch(code, meth);
+ }
+ }
+
+ void checkMatch(String code, JCTree tree) {
+ String expect = code.replace("\n", NL);
+ String found = tree.toString();
+ if (!expect.equals(found)) {
+ mismatches.add("Expected: " + expect + NL +
+ "Obtained: " + found);
+ } else {
+ matches.add("Passed: " + expect);
+ }
+ }
+}
+
+
+class MyFileObject extends SimpleJavaFileObject {
+
+ private String text;
+
+ public MyFileObject(String text) {
+ super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+ this.text = text;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return text;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javadoc/nonConstExprs/Test.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,62 @@
+/*
+ * 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 8010310
+ * @summary Error processing sources with -private
+ */
+
+import java.io.File;
+
+public class Test {
+ public static void main(String... args) throws Exception {
+ File testSrc = new File(System.getProperty("test.src"));
+ String[] jdoc_args = {
+ "-d", "out",
+ new File(testSrc, Test.class.getSimpleName() + ".java").getPath()
+ };
+ int rc = com.sun.tools.javadoc.Main.execute(jdoc_args);
+ if (rc != 0)
+ throw new Exception("unexpected return code from javadoc: " + rc);
+ }
+
+ static int array[] = { 1, 2, 3};
+ static int method(int p) { return p; }
+ static int value = 0;
+
+ public int not_static_not_final = 1;
+ public static int static_not_final = 2;
+ public final int not_static_final = 3;
+ public static final int static_final = 4;
+
+ public static final int array_index = array[0];
+ public static final int method_call = method(0);
+ public static final int inner_class = new Test() { }.method(0);
+ public static final int new_class = new Test().method(0);
+ public static final int pre_inc = ++value;
+ public static final int pre_dec = --value;
+ public static final int post_inc = value++;
+ public static final int post_dec = value--;
+}
+
--- a/langtools/test/tools/sjavac/SJavac.java Thu Sep 05 15:37:40 2013 +0400
+++ b/langtools/test/tools/sjavac/SJavac.java Fri Sep 06 15:09:44 2013 -0700
@@ -82,11 +82,13 @@
compileWithOverrideSource();
compileWithInvisibleSources();
compileCircularSources();
+ compileExcludingDependency();
delete(gensrc);
delete(gensrc2);
delete(gensrc3);
delete(bin);
+ delete(headers);
}
void initialCompile() throws Exception {
@@ -381,6 +383,33 @@
delete(bin);
}
+ /**
+ * Tests compiling class A that depends on class B without compiling class B
+ * @throws Exception If test fails
+ */
+ void compileExcludingDependency() throws Exception {
+ System.out.println("\nVerify that excluding classes from compilation but not from linking works.");
+ System.out.println("---------------------------------------------------------------------------");
+
+ delete(gensrc);
+ 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 { }");
+
+ compile("-x", "beta", "-src", "gensrc", "-x", "alfa", "-sourcepath", "gensrc",
+ "-d", "bin", "--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/javac_state");
+ }
+
void removeFrom(Path dir, String... args) throws IOException {
for (String filename : args) {
Path p = dir.resolve(filename);
@@ -405,7 +434,7 @@
}
}
- void delete(Path root) throws IOException {
+ void delete(final Path root) throws IOException {
if (!Files.exists(root)) return;
Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
@Override
--- a/nashorn/.hgtags Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/.hgtags Fri Sep 06 15:09:44 2013 -0700
@@ -213,3 +213,5 @@
a302b05d0ee460679501dc01004f70eb395fadf5 jdk8-b101
e966ff0a3ffef8a687eaf5a14167bb595b623d02 jdk8-b102
414203de4374e1964a9918c38a95fb245010a9f1 jdk8-b103
+afc100513451d22f0b8135999d6eb52f36df3d36 jdk8-b104
+f484bfb624dd06683cb33b524700a5dd4927a82b jdk8-b105
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,7 +27,6 @@
import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL;
import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
import static jdk.internal.org.objectweb.asm.Opcodes.V1_7;
import static jdk.nashorn.internal.tools.nasgen.StringConstants.CONSTRUCTOR_SUFFIX;
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,7 +27,6 @@
import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
import static jdk.internal.org.objectweb.asm.Opcodes.DUP;
-import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC;
import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC;
import static jdk.internal.org.objectweb.asm.Opcodes.NEW;
--- a/nashorn/docs/DEVELOPER_README Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/docs/DEVELOPER_README Fri Sep 06 15:09:44 2013 -0700
@@ -16,8 +16,9 @@
SYSTEM PROPERTY: -Dnashorn.args=<string>
This property takes as its value a space separated list of Nashorn
-command line options that should be passed to Nashorn. This might be useful
-in environments where it is hard to tell how a nashorn.jar is launched.
+command line options that should be passed to Nashorn. This might be
+useful in environments where it is hard to tell how a nashorn.jar is
+launched.
Example:
@@ -43,6 +44,10 @@
SYSTEM PROPERTY: -Dnashorn.compiler.intarithmetic
+(and integer arithmetic in general)
+
+<currently disabled - this is being refactored for update releases>
+
Arithmetic operations in Nashorn (except bitwise ones) typically
coerce the operands to doubles (as per the JavaScript spec). To switch
this off and remain in integer mode, for example for "var x = a&b; var
@@ -65,13 +70,382 @@
does not overflow. Getting access to a JVM intrinsic that does branch
on overflow would probably alleviate this.
-There is also a problem with this optimistic approach if the symbol
-happens to reside in a local variable slot in the bytecode, as those
-are strongly typed. Then we would need to split large sections of
-control flow, so this is probably not the right way to go, while range
-analysis is. There is a large difference between integer bytecode
-without overflow checks and double bytecode. The former is
-significantly faster.
+The future:
+
+We are transitioning to an optimistic type system that uses int
+arithmetic everywhere until proven wrong. The problem here is mostly
+catch an overflow exception and rolling back the state to a new method
+with less optimistic assumptions for an operation at a particular
+program point. This will most likely not be in the Java 8.0 release
+but likely end up in an update release
+
+For Java 8, several java.lang.Math methods like addExact, subExact and
+mulExact are available to help us. Experiments intrinsifying these
+show a lot of promise, and we have devised a system that basically
+does on stack replacement with exceptions in bytecode to revert
+erroneous assumptions. An explanation of how this works and what we
+are doing can be found here:
+http://www.slideshare.net/lagergren/lagergren-jvmls2013final
+
+Experiments with this show significant ~x2-3 performance increases on
+pretty much everything, provided that optimistic assumptions don't
+fail much. It will affect warmup time negatively, depending on how
+many erroneous too optimistic assumptions are placed in the code at
+compile time. We don't think this will be much of an issue.
+
+For example for a small benchmark that repeatedly executes this
+method taken from the Crypto Octane benchmark
+
+function am3(i,x,w,j,c,n) {
+ var this_array = this.array;
+ var w_array = w.array;
+ var xl = x&0x3fff, xh = x>>14;
+ while(--n >= 0) {
+ var l = this_array[i]&0x3fff;
+ var h = this_array[i++]>>14;
+ var m = xh*l+h*xl;
+ l = xl*l+((m&0x3fff)<<14)+w_array[j]+c;
+ c = (l>>28)+(m>>14)+xh*h;
+ w_array[j++] = l&0xfffffff;
+ }
+
+ return c;
+}
+
+The performance increase more than doubles. We are also working hard
+with the code generation team in the Java Virtual Machine to fix
+things that are lacking in invokedynamic performance, which is another
+area where a lot of ongoing performance work takes place
+
+"Pessimistic" bytecode for am3, guaranteed to be semantically correct:
+
+// access flags 0x9
+ public static am3(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ L0
+ LINENUMBER 12 L0
+ ALOAD 0
+ INVOKEDYNAMIC dyn:getProp|getElem|getMethod:array(Ljava/lang/Object;)Ljava/lang/Object; [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ ASTORE 8
+ L1
+ LINENUMBER 13 L1
+ ALOAD 3
+ INVOKEDYNAMIC dyn:getProp|getElem|getMethod:array(Ljava/lang/Object;)Ljava/lang/Object; [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ ASTORE 9
+ L2
+ LINENUMBER 14 L2
+ ALOAD 2
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toInt32 (Ljava/lang/Object;)I
+ SIPUSH 16383
+ IAND
+ ISTORE 10
+ ALOAD 2
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toInt32 (Ljava/lang/Object;)I
+ BIPUSH 14
+ ISHR
+ ISTORE 11
+ L3
+ LINENUMBER 15 L3
+ GOTO L4
+ L5
+ LINENUMBER 16 L5
+ FRAME FULL [java/lang/Object java/lang/Object java/lang/Object java/lang/Object java/lang/Object java/lang/Object java/lang/Double T java/lang/Object java/lang/Object I I] []
+ ALOAD 8
+ ALOAD 1
+ INVOKEDYNAMIC dyn:getElem|getProp|getMethod(Ljava/lang/Object;Ljava/lang/Object;)I [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ SIPUSH 16383
+ IAND
+ INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer;
+ ASTORE 12
+ L6
+ LINENUMBER 17 L6
+ ALOAD 8
+ ALOAD 1
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toNumber (Ljava/lang/Object;)D
+ DUP2
+ DCONST_1
+ DADD
+ INVOKESTATIC java/lang/Double.valueOf (D)Ljava/lang/Double;
+ ASTORE 1
+ INVOKEDYNAMIC dyn:getElem|getProp|getMethod(Ljava/lang/Object;D)I [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ BIPUSH 14
+ ISHR
+ ISTORE 13
+ L7
+ LINENUMBER 18 L7
+ ILOAD 11
+ I2D
+ ALOAD 12
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toNumber (Ljava/lang/Object;)D
+ DMUL
+ ILOAD 13
+ I2D
+ ILOAD 10
+ I2D
+ DMUL
+ DADD
+ DSTORE 14
+ L8
+ LINENUMBER 19 L8
+ ILOAD 10
+ I2D
+ ALOAD 12
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toNumber (Ljava/lang/Object;)D
+ DMUL
+ DLOAD 14
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toInt32 (D)I
+ SIPUSH 16383
+ IAND
+ BIPUSH 14
+ ISHL
+ I2D
+ DADD
+ ALOAD 9
+ ALOAD 4
+ INVOKEDYNAMIC dyn:getElem|getProp|getMethod(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ INVOKEDYNAMIC ADD:ODO_D(DLjava/lang/Object;)Ljava/lang/Object; [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.runtimeBootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;)
+ // arguments: none
+ ]
+ ALOAD 5
+ INVOKEDYNAMIC ADD:OOO_I(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.runtimeBootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;)
+ // arguments: none
+ ]
+ ASTORE 12
+ L9
+ LINENUMBER 20 L9
+ ALOAD 12
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toInt32 (Ljava/lang/Object;)I
+ BIPUSH 28
+ ISHR
+ I2D
+ DLOAD 14
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toInt32 (D)I
+ BIPUSH 14
+ ISHR
+ I2D
+ DADD
+ ILOAD 11
+ I2D
+ ILOAD 13
+ I2D
+ DMUL
+ DADD
+ INVOKESTATIC java/lang/Double.valueOf (D)Ljava/lang/Double;
+ ASTORE 5
+ L10
+ LINENUMBER 21 L10
+ ALOAD 9
+ ALOAD 4
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toNumber (Ljava/lang/Object;)D
+ DUP2
+ DCONST_1
+ DADD
+ INVOKESTATIC java/lang/Double.valueOf (D)Ljava/lang/Double;
+ ASTORE 4
+ ALOAD 12
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toInt32 (Ljava/lang/Object;)I
+ LDC 268435455
+ IAND
+ INVOKEDYNAMIC dyn:setElem|setProp(Ljava/lang/Object;DI)V [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ L4
+ FRAME FULL [java/lang/Object java/lang/Object java/lang/Object java/lang/Object java/lang/Object java/lang/Object java/lang/Object T java/lang/Object java/lang/Object I I] []
+ ALOAD 6
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.toNumber (Ljava/lang/Object;)D
+ LDC -1.0
+ DADD
+ DUP2
+ INVOKESTATIC java/lang/Double.valueOf (D)Ljava/lang/Double;
+ ASTORE 6
+ DCONST_0
+ DCMPL
+ IFGE L5
+ L11
+ LINENUMBER 24 L11
+ ALOAD 5
+ ARETURN
+
+"Optimistic" bytecode that requires invalidation on e.g overflow. Factor
+x2-3 speedup:
+
+public static am3(Ljava/lang/Object;IILjava/lang/Object;III)I
+ L0
+ LINENUMBER 12 L0
+ ALOAD 0
+ INVOKEDYNAMIC dyn:getProp|getElem|getMethod:array(Ljava/lang/Object;)Ljava/lang/Object; [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ ASTORE 8
+ L1
+ LINENUMBER 13 L1
+ ALOAD 3
+ INVOKEDYNAMIC dyn:getProp|getElem|getMethod:array(Ljava/lang/Object;)Ljava/lang/Object; [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ ASTORE 9
+ L2
+ LINENUMBER 14 L2
+ ILOAD 2
+ SIPUSH 16383
+ IAND
+ ISTORE 10
+ ILOAD 2
+ BIPUSH 14
+ ISHR
+ ISTORE 11
+ L3
+ LINENUMBER 15 L3
+ GOTO L4
+ L5
+ LINENUMBER 16 L5
+ FRAME FULL [java/lang/Object I I java/lang/Object I I I T java/lang/Object java/lang/Object I I] []
+ ALOAD 8
+ ILOAD 1
+ INVOKEDYNAMIC dyn:getElem|getProp|getMethod(Ljava/lang/Object;I)I [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ SIPUSH 16383
+ IAND
+ ISTORE 12
+ L6
+ LINENUMBER 17 L6
+ ALOAD 8
+ ILOAD 1
+ DUP
+ ICONST_1
+ IADD
+ ISTORE 1
+ INVOKEDYNAMIC dyn:getElem|getProp|getMethod(Ljava/lang/Object;I)I [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ BIPUSH 14
+ ISHR
+ ISTORE 13
+ L7
+ LINENUMBER 18 L7
+ ILOAD 11
+ ILOAD 12
+ BIPUSH 8
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.mulExact (III)I
+ ILOAD 13
+ ILOAD 10
+ BIPUSH 9
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.mulExact (III)I
+ IADD
+ ISTORE 14
+ L8
+ LINENUMBER 19 L8
+ ILOAD 10
+ ILOAD 12
+ BIPUSH 11
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.mulExact (III)I
+ ILOAD 14
+ SIPUSH 16383
+ IAND
+ BIPUSH 14
+ ISHL
+ IADD
+ ALOAD 9
+ ILOAD 4
+ INVOKEDYNAMIC dyn:getElem|getProp|getMethod(Ljava/lang/Object;I)I [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ IADD
+ ILOAD 5
+ IADD
+ ISTORE 12
+ L9
+ LINENUMBER 20 L9
+ ILOAD 12
+ BIPUSH 28
+ ISHR
+ ILOAD 14
+ BIPUSH 14
+ ISHR
+ IADD
+ ILOAD 11
+ ILOAD 13
+ BIPUSH 21
+ INVOKESTATIC jdk/nashorn/internal/runtime/JSType.mulExact (III)I
+ IADD
+ ISTORE 5
+ L10
+ LINENUMBER 21 L10
+ ALOAD 9
+ ILOAD 4
+ DUP
+ ICONST_1
+ IADD
+ ISTORE 4
+ ILOAD 12
+ LDC 268435455
+ IAND
+ INVOKEDYNAMIC dyn:setElem|setProp(Ljava/lang/Object;II)V [
+ // handle kind 0x6 : INVOKESTATIC
+ jdk/nashorn/internal/runtime/linker/Bootstrap.bootstrap((Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/CallSite;)
+ // arguments:
+ 0
+ ]
+ L4
+ FRAME SAME
+ ILOAD 6
+ ICONST_M1
+ IADD
+ DUP
+ ISTORE 6
+ ICONST_0
+ IF_ICMPGE L5
+ L11
+ LINENUMBER 24 L11
+ ILOAD 5
+ IRETURN
SYSTEM PROPERTY: -Dnashorn.codegen.debug, -Dnashorn.codegen.debug.trace=<x>
@@ -167,7 +541,7 @@
of byte code (try it e.g. on all the variants of am3 in the Octane
benchmark crypto.js). Thus, this needs to be lazy
-3) Possibly optimistic callsite writes, something on the form
+3) Optimistic callsite writes, something on the form
x = y; //x is a field known to be a primitive. y is only an object as
far as we can tell
@@ -189,6 +563,12 @@
We still have to deal with objects vs primitives for local bytecode
slots, possibly through code copying and versioning.
+The Future:
+
+We expect the usefulness of dual fields to increase significantly
+after the optimistic type system described in the section on
+integer arithmetic above is implemented.
+
SYSTEM PROPERTY: -Dnashorn.compiler.symbol.trace=[<x>[,*]],
-Dnashorn.compiler.symbol.stacktrace=[<x>[,*]]
@@ -211,7 +591,7 @@
semantics.
-SYSTEM PROPERTY: nashorn.lexer.xmlliterals
+SYSTEM PROPERTY: -Dnashorn.lexer.xmlliterals
If this property it set, it means that the Lexer should attempt to
parse XML literals, which would otherwise generate syntax
@@ -222,7 +602,7 @@
the IR.
-SYSTEM_PROPERTY: nashorn.debug
+SYSTEM_PROPERTY: -Dnashorn.debug
If this property is set to true, Nashorn runs in Debug mode. Debug
mode is slightly slower, as for example statistics counters are enabled
@@ -269,8 +649,8 @@
object layout being invalidated.
-SYSTEM PROPERTY: nashorn.methodhandles.debug,
-nashorn.methodhandles.debug=create
+SYSTEM PROPERTY: -Dnashorn.methodhandles.debug,
+-Dnashorn.methodhandles.debug=create
If this property is enabled, each MethodHandle related call that uses
the java.lang.invoke package gets its MethodHandle intercepted and an
@@ -286,7 +666,7 @@
rather than at runtime usage.
-SYSTEM PROPERTY: nashorn.methodhandles.debug.stacktrace
+SYSTEM PROPERTY: -Dnashorn.methodhandles.debug.stacktrace
This does the same as nashorn.methodhandles.debug, but when enabled
also dumps the stack trace for every instrumented method handle
@@ -297,14 +677,13 @@
description of this option
-SYSTEM PROPERTY: nashorn.scriptfunction.specialization.disable
+SYSTEM PROPERTY: -Dnashorn.scriptfunction.specialization.disable
There are several "fast path" implementations of constructors and
functions in the NativeObject classes that, in their original form,
take a variable amount of arguments. Said functions are also declared
to take Object parameters in their original form, as this is what the
JavaScript specification mandates.
-
However, we often know quite a lot more at a callsite of one of these
functions. For example, Math.min is called with a fixed number (2) of
integer arguments. The overhead of boxing these ints to Objects and
@@ -331,7 +710,7 @@
just call the generic one.
-SYSTEM PROPERTY: nashorn.tcs.miss.samplePercent=<x>
+SYSTEM PROPERTY: -Dnashorn.tcs.miss.samplePercent=<x>
When running with the trace callsite option (-tcs), Nashorn will count
and instrument any callsite misses that require relinking. As the
@@ -341,7 +720,7 @@
default value.
-SYSTEM_PROPERTY: nashorn.profilefile=<filename>
+SYSTEM_PROPERTY: -Dnashorn.profilefile=<filename>
When running with the profile callsite options (-pcs), Nashorn will
dump profiling data for all callsites to stderr as a shutdown hook. To
@@ -349,14 +728,34 @@
this system property.
-SYSTEM_PROPERTY: nashorn.regexp.impl=[jdk|joni]
+SYSTEM_PROPERTY: -Dnashorn.regexp.impl=[jdk|joni]
This property defines the regular expression engine to be used by
-Nashorn. The default implementation is "jdk" which is based on the
+Nashorn. Set this flag to "jdk" to get an implementation based on the
JDK's java.util.regex package. Set this property to "joni" to install
an implementation based on Joni, the regular expression engine used by
-the JRuby project.
+the JRuby project. The default value for this flag is "joni"
+
+
+SYSTEM PROPERTY: -Dnashorn.time
+
+This enables timers for various phases of script compilation. The timers
+will be dumped when the Nashorn process exits. We see a percentage value
+of how much time was spent not executing bytecode (i.e. compilation and
+internal tasks) at the end of the report.
+Here is an example:
+
+[JavaScript Parsing] 61 ms
+[Constant Folding] 11 ms
+[Control Flow Lowering] 26 ms
+[Type Attribution] 81 ms
+[Range Analysis] 0 ms
+[Code Splitting] 29 ms
+[Type Finalization] 19 ms
+[Bytecode Generation] 189 ms
+[Code Installation] 7 ms
+Total runtime: 508 ms (Non-runtime: 423 ms [83%])
===============
2. The loggers.
@@ -442,6 +841,9 @@
The --log=codegen option is equivalent to setting the system variable
"nashorn.codegen.debug" to true.
+* fold
+
+Shows constant folding taking place before lowering
* lower
@@ -484,3 +886,160 @@
etc. It will also show the internal representation of respective field
(Object in the normal case, unless running with the dual field
representation)
+
+
+=======================
+3. Undocumented options
+=======================
+
+Here follows a short description of undocumented options for Nashorn.
+To see a list of all undocumented options, use the (undocumented) flag
+"-xhelp".
+
+i.e. jjs -xhelp or java -jar nashorn.jar -xhelp
+
+Undocumented options are not guaranteed to work, run correctly or be
+bug free. They are experimental and for internal or debugging use.
+They are also subject to change without notice.
+
+In practice, though, all options below not explicitly documented as
+EXPERIMENTAL can be relied upon, for example --dump-on-error is useful
+for any JavaScript/Nashorn developer, but there is no guarantee.
+
+A short summary follows:
+
+ -D (-Dname=value. Set a system property. This option can be repeated.)
+
+ -ccs, --class-cache-size (Size of the Class cache size per global scope.)
+
+ -cp, -classpath (-cp path. Specify where to find user class files.)
+
+ -co, --compile-only (Compile script without running. Exit after compilation)
+ param: [true|false] default: false
+
+ -d, --dump-debug-dir (specify a destination directory to dump class files.
+ This must be combined with the --compile-only option to work)
+ param: <path>
+
+ --debug-lines (Generate line number table in .class files.)
+ param: [true|false] default: true
+
+ --debug-locals (Generate local variable table in .class files.)
+ param: [true|false] default: false
+
+ -doe, -dump-on-error (Dump a stack trace on errors.)
+ param: [true|false] default: false
+
+ --early-lvalue-error (invalid lvalue expressions should be reported as early errors.)
+ param: [true|false] default: true
+
+ --empty-statements (Preserve empty statements in AST.)
+ param: [true|false] default: false
+
+ -fv, -fullversion (Print full version info of Nashorn.)
+ param: [true|false] default: false
+
+ --function-statement-error (Report an error when function declaration is used as a statement.)
+ param: [true|false] default: false
+
+ --function-statement-warning (Warn when function declaration is used as a statement.)
+ param: [true|false] default: false
+
+ -fx (Launch script as an fx application.)
+ param: [true|false] default: false
+
+ --global-per-engine (Use single Global instance per script engine instance.)
+ param: [true|false] default: false
+
+ -h, -help (Print help for command line flags.)
+ param: [true|false] default: false
+
+ --lazy-compilation (EXPERIMENTAL: Use lazy code generation strategies - do not compile
+ the entire script at once.)
+ param: [true|false] default: false
+
+ --loader-per-compile (Create a new class loader per compile.)
+ param: [true|false] default: true
+
+ -l, --locale (Set Locale for script execution.)
+ param: <locale> default: en-US
+
+ --log (Enable logging of a given level for a given number of sub systems.
+ [for example: --log=fields:finest,codegen:info])
+ param: <module:level>,*
+
+ -nj, --no-java (No Java support)
+ param: [true|false] default: false
+
+ -nse, --no-syntax-extensions (No non-standard syntax extensions)
+ param: [true|false] default: false
+
+ -nta, --no-typed-arrays (No Typed arrays support)
+ param: [true|false] default: false
+
+ --parse-only (Parse without compiling.)
+ param: [true|false] default: false
+
+ --print-ast (Print abstract syntax tree.)
+ param: [true|false] default: false
+
+ --print-code (Print bytecode.)
+ param: [true|false] default: false
+
+ --print-lower-ast (Print lowered abstract syntax tree.)
+ param: [true|false] default: false
+
+ --print-lower-parse (Print the parse tree after lowering.)
+ param: [true|false] default: false
+
+ --print-mem-usage (Print memory usage of IR after each compile stage.)
+ param: [true|false] default: false
+
+ --print-no-newline (Print function will not print new line char.)
+ param: [true|false] default: false
+
+ --print-parse (Print the parse tree.)
+ param: [true|false] default: false
+
+ --print-symbols (Print the symbol table.)
+ param: [true|false] default: false
+
+ -pcs, --profile-callsites (Dump callsite profile data.)
+ param: [true|false] default: false
+
+ --range-analysis (EXPERIMENTAL: Do range analysis using known compile time types,
+ and try to narrow number types)
+ param: [true|false] default: false
+
+ -scripting (Enable scripting features.)
+ param: [true|false] default: false
+
+ --specialize-calls (EXPERIMENTAL: Specialize all or a set of method according
+ to callsite parameter types)
+ param: [=function_1,...,function_n]
+
+ --stderr (Redirect stderr to a filename or to another tty, e.g. stdout)
+ param: <output console>
+
+ --stdout (Redirect stdout to a filename or to another tty, e.g. stderr)
+ param: <output console>
+
+ -strict (Run scripts in strict mode.)
+ param: [true|false] default: false
+
+ -t, -timezone (Set timezone for script execution.)
+ param: <timezone> default: Europe/Stockholm
+
+ -tcs, --trace-callsites (Enable callsite trace mode. Options are: miss [trace callsite misses]
+ enterexit [trace callsite enter/exit], objects [print object properties])
+ param: [=[option,]*]
+
+ --verify-code (Verify byte code before running.)
+ param: [true|false] default: false
+
+ -v, -version (Print version info of Nashorn.)
+ param: [true|false] default: false
+
+ -xhelp (Print extended help for command line flags.)
+ param: [true|false] default: false
+
--- a/nashorn/exclude/exclude_list_cc.txt Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/exclude/exclude_list_cc.txt Fri Sep 06 15:09:44 2013 -0700
@@ -3,4 +3,5 @@
<excludeList>
<test id="JDK-8014647.js" />
<test id="javaclassoverrides.js" />
+ <test id="JDK-8020809.js" />
</excludeList>
--- a/nashorn/make/project.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/make/project.properties Fri Sep 06 15:09:44 2013 -0700
@@ -222,11 +222,16 @@
run.test.user.language=tr
run.test.user.country=TR
-# -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMethods
-run.test.jvmargs.main=-server -Xmx${run.test.xmx} -XX:+TieredCompilation -ea -Dfile.encoding=UTF-8 -Duser.language=${run.test.user.language} -Duser.country=${run.test.user.country}
+run.test.jvmargs.common=-server -Xmx${run.test.xmx} -XX:+TieredCompilation -Dfile.encoding=UTF-8 -Duser.language=${run.test.user.language} -Duser.country=${run.test.user.country} -XX:+HeapDumpOnOutOfMemoryError
+
+#-XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M
+# -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMethods
-#-XX:+HeapDumpOnOutOfMemoryError -XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M
-run.test.jvmargs.octane.main=-Xms${run.test.xms} ${run.test.jvmargs.main}
+# turn on assertions for tests
+run.test.jvmargs.main=${run.test.jvmargs.common} -ea
+
+#-XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M
+run.test.jvmargs.octane.main=-Xms${run.test.xms} ${run.test.jvmargs.common}
run.test.jvmsecurityargs=-Xverify:all -Djava.security.properties=${basedir}/make/java.security.override -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
--- a/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java Fri Sep 06 15:09:44 2013 -0700
@@ -85,12 +85,12 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.concurrent.atomic.AtomicReference;
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.support.AbstractRelinkableCallSite;
+import jdk.internal.dynalink.support.Lookup;
/**
* A relinkable call site that maintains a chain of linked method handles. In the default implementation, up to 8 method
@@ -103,6 +103,9 @@
* handle is always at the start of the chain.
*/
public class ChainedCallSite extends AbstractRelinkableCallSite {
+ private static final MethodHandle PRUNE = Lookup.findOwnSpecial(MethodHandles.lookup(), "prune", MethodHandle.class,
+ MethodHandle.class);
+
private final AtomicReference<LinkedList<GuardedInvocation>> invocations = new AtomicReference<>();
/**
@@ -118,7 +121,6 @@
* to change the value. If your override returns a value less than 1, the code will break.
* @return the maximum number of method handles in the chain.
*/
- @SuppressWarnings("static-method")
protected int getMaxChainLength() {
return 8;
}
@@ -194,18 +196,4 @@
private MethodHandle prune(MethodHandle relink) {
return relinkInternal(null, relink, false);
}
-
- private static final MethodHandle PRUNE;
- static {
- try {
- PRUNE = MethodHandles.lookup().findSpecial(ChainedCallSite.class, "prune", MethodType.methodType(
- MethodHandle.class, MethodHandle.class), ChainedCallSite.class);
- // NOTE: using two catch blocks so we don't introduce a reference to 1.7 ReflectiveOperationException, allowing
- // Dynalink to be used on 1.6 JVMs with Remi's backport library.
- } catch(IllegalAccessException e) {
- throw new AssertionError(e.getMessage(), e); // Can not happen
- } catch(NoSuchMethodException e) {
- throw new AssertionError(e.getMessage(), e); // Can not happen
- }
- }
}
--- a/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java Fri Sep 06 15:09:44 2013 -0700
@@ -133,7 +133,7 @@
* @param type the method signature at the call site
* @return a new {@link MonomorphicCallSite} linked with the default dynamic linker.
*/
- public static CallSite publicBootstrap(@SuppressWarnings("unused") MethodHandles.Lookup caller, String name, MethodType type) {
+ public static CallSite publicBootstrap(MethodHandles.Lookup caller, String name, MethodType type) {
return bootstrapInternal(MethodHandles.publicLookup(), name, type);
}
--- a/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -84,6 +84,8 @@
package jdk.internal.dynalink;
import java.lang.invoke.MutableCallSite;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -97,6 +99,7 @@
import jdk.internal.dynalink.linker.LinkRequest;
import jdk.internal.dynalink.support.AutoDiscovery;
import jdk.internal.dynalink.support.BottomGuardingDynamicLinker;
+import jdk.internal.dynalink.support.ClassLoaderGetterContextProvider;
import jdk.internal.dynalink.support.CompositeGuardingDynamicLinker;
import jdk.internal.dynalink.support.CompositeTypeBasedGuardingDynamicLinker;
import jdk.internal.dynalink.support.LinkerServicesImpl;
@@ -117,7 +120,9 @@
*/
public static final int DEFAULT_UNSTABLE_RELINK_THRESHOLD = 8;
- private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ private boolean classLoaderExplicitlySet = false;
+ private ClassLoader classLoader;
+
private List<? extends GuardingDynamicLinker> prioritizedLinkers;
private List<? extends GuardingDynamicLinker> fallbackLinkers;
private int runtimeContextArgCount = 0;
@@ -126,12 +131,13 @@
/**
* Sets the class loader for automatic discovery of available linkers. If not set explicitly, then the thread
- * context class loader at the time of the constructor invocation will be used.
+ * context class loader at the time of {@link #createLinker()} invocation will be used.
*
* @param classLoader the class loader used for the autodiscovery of available linkers.
*/
public void setClassLoader(ClassLoader classLoader) {
this.classLoader = classLoader;
+ classLoaderExplicitlySet = true;
}
/**
@@ -260,7 +266,8 @@
addClasses(knownLinkerClasses, prioritizedLinkers);
addClasses(knownLinkerClasses, fallbackLinkers);
- final List<GuardingDynamicLinker> discovered = AutoDiscovery.loadLinkers(classLoader);
+ final ClassLoader effectiveClassLoader = classLoaderExplicitlySet ? classLoader : getThreadContextClassLoader();
+ final List<GuardingDynamicLinker> discovered = AutoDiscovery.loadLinkers(effectiveClassLoader);
// Now, concatenate ...
final List<GuardingDynamicLinker> linkers =
new ArrayList<>(prioritizedLinkers.size() + discovered.size()
@@ -303,6 +310,15 @@
runtimeContextArgCount, syncOnRelink, unstableRelinkThreshold);
}
+ private static ClassLoader getThreadContextClassLoader() {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ @Override
+ public ClassLoader run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ }, ClassLoaderGetterContextProvider.GET_CLASS_LOADER_CONTEXT);
+ }
+
private static void addClasses(Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses,
List<? extends GuardingDynamicLinker> linkers) {
for(GuardingDynamicLinker linker: linkers) {
--- a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Fri Sep 06 15:09:44 2013 -0700
@@ -97,6 +97,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import jdk.internal.dynalink.CallSiteDescriptor;
import jdk.internal.dynalink.beans.GuardedInvocationComponent.ValidationType;
import jdk.internal.dynalink.linker.GuardedInvocation;
--- a/nashorn/src/jdk/internal/dynalink/beans/ClassString.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/beans/ClassString.java Fri Sep 06 15:09:44 2013 -0700
@@ -112,10 +112,6 @@
this(type.parameterArray());
}
- Class<?>[] getClasses() {
- return classes;
- }
-
@Override
public boolean equals(Object other) {
if(!(other instanceof ClassString)) {
--- a/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java Fri Sep 06 15:09:44 2013 -0700
@@ -148,6 +148,7 @@
}
}
+ @SuppressWarnings("fallthrough")
@Override
public MethodHandle getInvocation(final CallSiteDescriptor callSiteDescriptor, final LinkerServices linkerServices) {
final MethodType callSiteType = callSiteDescriptor.getMethodType();
--- a/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java Fri Sep 06 15:09:44 2013 -0700
@@ -189,15 +189,17 @@
return type == StaticClass.class;
}
- /*private*/ static final MethodHandle GET_CLASS = new Lookup(MethodHandles.lookup()).findVirtual(StaticClass.class,
- "getRepresentedClass", MethodType.methodType(Class.class));
-
- /*private*/ static final MethodHandle IS_CLASS = new Lookup(MethodHandles.lookup()).findStatic(StaticClassLinker.class,
- "isClass", MethodType.methodType(Boolean.TYPE, Class.class, Object.class));
-
+ /*private*/ static final MethodHandle GET_CLASS;
+ /*private*/ static final MethodHandle IS_CLASS;
/*private*/ static final MethodHandle ARRAY_CTOR = Lookup.PUBLIC.findStatic(Array.class, "newInstance",
MethodType.methodType(Object.class, Class.class, int.class));
+ static {
+ final Lookup lookup = new Lookup(MethodHandles.lookup());
+ GET_CLASS = lookup.findVirtual(StaticClass.class, "getRepresentedClass", MethodType.methodType(Class.class));
+ IS_CLASS = lookup.findOwnStatic("isClass", Boolean.TYPE, Class.class, Object.class);
+ }
+
@SuppressWarnings("unused")
private static boolean isClass(Class<?> clazz, Object obj) {
return obj instanceof StaticClass && ((StaticClass)obj).getRepresentedClass() == clazz;
--- a/nashorn/src/jdk/internal/dynalink/support/Backport.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. 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 available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file, and Oracle licenses the original version of this file under the BSD
- * license:
- */
-/*
- Copyright 2009-2013 Attila Szegedi
-
- Licensed under both the Apache License, Version 2.0 (the "Apache License")
- and the BSD License (the "BSD License"), with licensee being free to
- choose either of the two at their discretion.
-
- You may not use this file except in compliance with either the Apache
- License or the BSD License.
-
- If you choose to use this file in compliance with the Apache License, the
- following notice applies to you:
-
- You may obtain a copy of the Apache 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.
-
- If you choose to use this file in compliance with the BSD License, the
- following notice applies to you:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the copyright holder nor the names of
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package jdk.internal.dynalink.support;
-
-import java.lang.invoke.MethodHandles;
-
-/**
- * @author Attila Szegedi
- */
-public class Backport {
- /**
- * True if Remi's JSR-292 backport agent is active; false if we're using native OpenJDK JSR-292 support.
- */
- public static final boolean inUse = MethodHandles.class.getName().startsWith("jsr292");
-
- private Backport() {
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,107 @@
+/*
+ * 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. 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 available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+ Copyright 2009-2013 Attila Szegedi
+
+ Licensed under both the Apache License, Version 2.0 (the "Apache License")
+ and the BSD License (the "BSD License"), with licensee being free to
+ choose either of the two at their discretion.
+
+ You may not use this file except in compliance with either the Apache
+ License or the BSD License.
+
+ If you choose to use this file in compliance with the Apache License, the
+ following notice applies to you:
+
+ You may obtain a copy of the Apache 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.
+
+ If you choose to use this file in compliance with the BSD License, the
+ following notice applies to you:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the copyright holder nor the names of
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.security.AccessControlContext;
+import java.security.Permissions;
+import java.security.ProtectionDomain;
+
+/**
+ * This class exposes a canonical {@link AccessControlContext} with a single {@link RuntimePermission} for
+ * {@code "getClassLoader"} permission that is used by other parts of the code to narrow their set of permissions when
+ * they're retrieving class loaders in privileged blocks.
+ */
+public class ClassLoaderGetterContextProvider {
+ /**
+ * Canonical instance of {@link AccessControlContext} with a single {@link RuntimePermission} for
+ * {@code "getClassLoader"} permission.
+ */
+ public static final AccessControlContext GET_CLASS_LOADER_CONTEXT;
+ static {
+ final Permissions perms = new Permissions();
+ perms.add(new RuntimePermission("getClassLoader"));
+ GET_CLASS_LOADER_CONTEXT = new AccessControlContext(
+ new ProtectionDomain[] { new ProtectionDomain(null, perms) });
+ }
+}
--- a/nashorn/src/jdk/internal/dynalink/support/ClassMap.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/support/ClassMap.java Fri Sep 06 15:09:44 2013 -0700
@@ -85,6 +85,8 @@
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -122,21 +124,12 @@
protected abstract T computeValue(Class<?> clazz);
/**
- * Returns the class loader that governs the strong referenceability of this class map.
- *
- * @return the class loader that governs the strong referenceability of this class map.
- */
- public ClassLoader getClassLoader() {
- return classLoader;
- }
-
- /**
* Returns the value associated with the class
*
* @param clazz the class
* @return the value associated with the class
*/
- public T get(Class<?> clazz) {
+ public T get(final Class<?> clazz) {
// Check in fastest first - objects we're allowed to strongly reference
final T v = map.get(clazz);
if(v != null) {
@@ -156,8 +149,16 @@
// Not found in either place; create a new value
final T newV = computeValue(clazz);
assert newV != null;
+
+ final ClassLoader clazzLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ @Override
+ public ClassLoader run() {
+ return clazz.getClassLoader();
+ }
+ }, ClassLoaderGetterContextProvider.GET_CLASS_LOADER_CONTEXT);
+
// If allowed to strongly reference, put it in the fast map
- if(Guards.canReferenceDirectly(classLoader, clazz.getClassLoader())) {
+ if(Guards.canReferenceDirectly(classLoader, clazzLoader)) {
final T oldV = map.putIfAbsent(clazz, newV);
return oldV != null ? oldV : newV;
}
--- a/nashorn/src/jdk/internal/dynalink/support/Guards.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/support/Guards.java Fri Sep 06 15:09:44 2013 -0700
@@ -258,23 +258,24 @@
type.changeReturnType(Boolean.TYPE), new int[] { pos });
}
- private static final MethodHandle IS_OF_CLASS = new Lookup(MethodHandles.lookup()).findStatic(Guards.class,
- "isOfClass", MethodType.methodType(Boolean.TYPE, Class.class, Object.class));
-
private static final MethodHandle IS_INSTANCE = Lookup.PUBLIC.findVirtual(Class.class, "isInstance",
MethodType.methodType(Boolean.TYPE, Object.class));
- private static final MethodHandle IS_ARRAY = new Lookup(MethodHandles.lookup()).findStatic(Guards.class, "isArray",
- MethodType.methodType(Boolean.TYPE, Object.class));
-
- private static final MethodHandle IS_IDENTICAL = new Lookup(MethodHandles.lookup()).findStatic(Guards.class,
- "isIdentical", MethodType.methodType(Boolean.TYPE, Object.class, Object.class));
+ private static final MethodHandle IS_OF_CLASS;
+ private static final MethodHandle IS_ARRAY;
+ private static final MethodHandle IS_IDENTICAL;
+ private static final MethodHandle IS_NULL;
+ private static final MethodHandle IS_NOT_NULL;
- private static final MethodHandle IS_NULL = new Lookup(MethodHandles.lookup()).findStatic(Guards.class,
- "isNull", MethodType.methodType(Boolean.TYPE, Object.class));
+ static {
+ final Lookup lookup = new Lookup(MethodHandles.lookup());
- private static final MethodHandle IS_NOT_NULL = new Lookup(MethodHandles.lookup()).findStatic(Guards.class,
- "isNotNull", MethodType.methodType(Boolean.TYPE, Object.class));
+ IS_OF_CLASS = lookup.findOwnStatic("isOfClass", Boolean.TYPE, Class.class, Object.class);
+ IS_ARRAY = lookup.findOwnStatic("isArray", Boolean.TYPE, Object.class);
+ IS_IDENTICAL = lookup.findOwnStatic("isIdentical", Boolean.TYPE, Object.class, Object.class);
+ IS_NULL = lookup.findOwnStatic("isNull", Boolean.TYPE, Object.class);
+ IS_NOT_NULL = lookup.findOwnStatic("isNotNull", Boolean.TYPE, Object.class);
+ }
/**
* Creates a guard method that tests its only argument for being of an exact particular class.
--- a/nashorn/src/jdk/internal/dynalink/support/Lookup.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/support/Lookup.java Fri Sep 06 15:09:44 2013 -0700
@@ -89,7 +89,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
/**
* A wrapper around MethodHandles.Lookup that masks checked exceptions in those cases when you're looking up methods
@@ -235,9 +234,8 @@
}
/**
- * Performs a findSpecial on the underlying lookup, except for the backport where it rather uses unreflect. Converts
- * any encountered {@link IllegalAccessException} into an {@link IllegalAccessError} and a
- * {@link NoSuchMethodException} into a {@link NoSuchMethodError}.
+ * Performs a findSpecial on the underlying lookup. Converts any encountered {@link IllegalAccessException} into an
+ * {@link IllegalAccessError} and a {@link NoSuchMethodException} into a {@link NoSuchMethodError}.
*
* @param declaringClass class declaring the method
* @param name the name of the method
@@ -248,13 +246,6 @@
*/
public MethodHandle findSpecial(Class<?> declaringClass, String name, MethodType type) {
try {
- if(Backport.inUse) {
- final Method m = declaringClass.getDeclaredMethod(name, type.parameterArray());
- if(!Modifier.isPublic(declaringClass.getModifiers()) || !Modifier.isPublic(m.getModifiers())) {
- m.setAccessible(true);
- }
- return unreflect(m);
- }
return lookup.findSpecial(declaringClass, name, type, declaringClass);
} catch(IllegalAccessException e) {
final IllegalAccessError ee = new IllegalAccessError("Failed to access special method " + methodDescription(
--- a/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -87,6 +87,8 @@
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.invoke.WrongMethodTypeException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.LinkedList;
import java.util.List;
import jdk.internal.dynalink.linker.ConversionComparator;
@@ -110,7 +112,7 @@
private final ClassValue<ClassMap<MethodHandle>> converterMap = new ClassValue<ClassMap<MethodHandle>>() {
@Override
protected ClassMap<MethodHandle> computeValue(final Class<?> sourceType) {
- return new ClassMap<MethodHandle>(sourceType.getClassLoader()) {
+ return new ClassMap<MethodHandle>(getClassLoader(sourceType)) {
@Override
protected MethodHandle computeValue(Class<?> targetType) {
try {
@@ -128,7 +130,7 @@
private final ClassValue<ClassMap<MethodHandle>> converterIdentityMap = new ClassValue<ClassMap<MethodHandle>>() {
@Override
protected ClassMap<MethodHandle> computeValue(final Class<?> sourceType) {
- return new ClassMap<MethodHandle>(sourceType.getClassLoader()) {
+ return new ClassMap<MethodHandle>(getClassLoader(sourceType)) {
@Override
protected MethodHandle computeValue(Class<?> targetType) {
if(!canAutoConvert(sourceType, targetType)) {
@@ -143,6 +145,15 @@
}
};
+ private static final ClassLoader getClassLoader(final Class<?> clazz) {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ @Override
+ public ClassLoader run() {
+ return clazz.getClassLoader();
+ }
+ }, ClassLoaderGetterContextProvider.GET_CLASS_LOADER_CONTEXT);
+ }
+
/**
* Creates a new type converter factory from the available {@link GuardingTypeConverterFactory} instances.
*
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,10 +36,13 @@
import java.lang.reflect.Modifier;
import java.net.URL;
import java.nio.charset.Charset;
+import java.security.AccessControlContext;
import java.security.AccessController;
+import java.security.Permissions;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -52,6 +55,7 @@
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
+import javax.script.SimpleBindings;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.ErrorManager;
import jdk.nashorn.internal.runtime.GlobalObject;
@@ -71,31 +75,46 @@
*/
public final class NashornScriptEngine extends AbstractScriptEngine implements Compilable, Invocable {
+ /**
+ * Key used to associate Nashorn global object mirror with arbitrary Bindings instance.
+ */
+ public static final String NASHORN_GLOBAL = "nashorn.global";
+ // commonly used access control context objects
+ private static AccessControlContext createPermAccCtxt(final String permName) {
+ final Permissions perms = new Permissions();
+ perms.add(new RuntimePermission(permName));
+ return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, perms) });
+ }
+
+ private static final AccessControlContext CREATE_CONTEXT_ACC_CTXT = createPermAccCtxt(Context.NASHORN_CREATE_CONTEXT);
+ private static final AccessControlContext CREATE_GLOBAL_ACC_CTXT = createPermAccCtxt(Context.NASHORN_CREATE_GLOBAL);
+
+ // the factory that created this engine
private final ScriptEngineFactory factory;
+ // underlying nashorn Context - 1:1 with engine instance
private final Context nashornContext;
+ // do we want to share single Nashorn global instance across ENGINE_SCOPEs?
+ private final boolean _global_per_engine;
+ // This is the initial default Nashorn global object.
+ // This is used as "shared" global if above option is true.
private final ScriptObject global;
- // initialized bit late to be made 'final'. Property object for "context"
- // property of global object
- private Property contextProperty;
+ // initialized bit late to be made 'final'.
+ // Property object for "context" property of global object.
+ private volatile Property contextProperty;
// default options passed to Nashorn Options object
private static final String[] DEFAULT_OPTIONS = new String[] { "-scripting", "-doe" };
+ // Nashorn script engine error message management
private static final String MESSAGES_RESOURCE = "jdk.nashorn.api.scripting.resources.Messages";
- // Without do privileged, under security manager messages can not be loaded.
private static final ResourceBundle MESSAGES_BUNDLE;
static {
- MESSAGES_BUNDLE = AccessController.doPrivileged(
- new PrivilegedAction<ResourceBundle>() {
- @Override
- public ResourceBundle run() {
- return ResourceBundle.getBundle(MESSAGES_RESOURCE, Locale.getDefault());
- }
- });
+ MESSAGES_BUNDLE = ResourceBundle.getBundle(MESSAGES_RESOURCE, Locale.getDefault());
}
+ // helper to get Nashorn script engine error message
private static String getMessage(final String msgId, final String... args) {
try {
return new MessageFormat(MESSAGES_BUNDLE.getString(msgId)).format(args);
@@ -104,6 +123,31 @@
}
}
+ // load engine.js and return content as a char[]
+ @SuppressWarnings("resource")
+ private static char[] loadEngineJSSource() {
+ final String script = "resources/engine.js";
+ try {
+ final InputStream is = AccessController.doPrivileged(
+ new PrivilegedExceptionAction<InputStream>() {
+ @Override
+ public InputStream run() throws Exception {
+ final URL url = NashornScriptEngine.class.getResource(script);
+ return url.openStream();
+ }
+ });
+ return Source.readFully(new InputStreamReader(is));
+ } catch (final PrivilegedActionException | IOException e) {
+ if (Context.DEBUG) {
+ e.printStackTrace();
+ }
+ throw new RuntimeException(e);
+ }
+ }
+
+ // Source object for engine.js
+ private static final Source ENGINE_SCRIPT_SRC = new Source(NashornException.ENGINE_SCRIPT_SOURCE_NAME, loadEngineJSSource());
+
NashornScriptEngine(final NashornScriptEngineFactory factory, final ClassLoader appLoader) {
this(factory, DEFAULT_OPTIONS, appLoader);
}
@@ -128,22 +172,15 @@
throw e;
}
}
- });
+ }, CREATE_CONTEXT_ACC_CTXT);
+
+ // cache this option that is used often
+ this._global_per_engine = nashornContext.getEnv()._global_per_engine;
// create new global object
- this.global = createNashornGlobal();
- // set the default engine scope for the default context
+ this.global = createNashornGlobal(context);
+ // set the default ENGINE_SCOPE object for the default context
context.setBindings(new ScriptObjectMirror(global, global), ScriptContext.ENGINE_SCOPE);
-
- // evaluate engine initial script
- try {
- evalEngineScript();
- } catch (final ScriptException e) {
- if (Context.DEBUG) {
- e.printStackTrace();
- }
- throw new RuntimeException(e);
- }
}
@Override
@@ -172,8 +209,12 @@
@Override
public Bindings createBindings() {
- final ScriptObject newGlobal = createNashornGlobal();
- return new ScriptObjectMirror(newGlobal, newGlobal);
+ if (_global_per_engine) {
+ // just create normal SimpleBindings.
+ // We use same 'global' for all Bindings.
+ return new SimpleBindings();
+ }
+ return createGlobalMirror(null);
}
// Compilable methods
@@ -209,6 +250,48 @@
return invokeImpl(thiz, name, args);
}
+ @Override
+ public <T> T getInterface(final Class<T> clazz) {
+ return getInterfaceInner(null, clazz);
+ }
+
+ @Override
+ public <T> T getInterface(final Object thiz, final Class<T> clazz) {
+ if (thiz == null) {
+ throw new IllegalArgumentException(getMessage("thiz.cannot.be.null"));
+ }
+ return getInterfaceInner(thiz, clazz);
+ }
+
+ // These are called from the "engine.js" script
+
+ /**
+ * This hook is used to search js global variables exposed from Java code.
+ *
+ * @param self 'this' passed from the script
+ * @param ctxt current ScriptContext in which name is searched
+ * @param name name of the variable searched
+ * @return the value of the named variable
+ */
+ public Object __noSuchProperty__(final Object self, final ScriptContext ctxt, final String name) {
+ if (ctxt != null) {
+ final int scope = ctxt.getAttributesScope(name);
+ final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
+ if (scope != -1) {
+ return ScriptObjectMirror.unwrap(ctxt.getAttribute(name, scope), ctxtGlobal);
+ }
+
+ if (self == UNDEFINED) {
+ // scope access and so throw ReferenceError
+ throw referenceError(ctxtGlobal, "not.defined", name);
+ }
+ }
+
+ return UNDEFINED;
+ }
+
+ // Implementation only below this point
+
private <T> T getInterfaceInner(final Object thiz, final Class<T> clazz) {
if (clazz == null || !clazz.isInterface()) {
throw new IllegalArgumentException(getMessage("interface.class.expected"));
@@ -276,58 +359,56 @@
}
}
- @Override
- public <T> T getInterface(final Class<T> clazz) {
- return getInterfaceInner(null, clazz);
- }
+ // Retrieve nashorn Global object for a given ScriptContext object
+ private ScriptObject getNashornGlobalFrom(final ScriptContext ctxt) {
+ if (_global_per_engine) {
+ // shared single global object for all ENGINE_SCOPE Bindings
+ return global;
+ }
- @Override
- public <T> T getInterface(final Object thiz, final Class<T> clazz) {
- if (thiz == null) {
- throw new IllegalArgumentException(getMessage("thiz.cannot.be.null"));
+ final Bindings bindings = ctxt.getBindings(ScriptContext.ENGINE_SCOPE);
+ // is this Nashorn's own Bindings implementation?
+ if (bindings instanceof ScriptObjectMirror) {
+ final ScriptObject sobj = globalFromMirror((ScriptObjectMirror)bindings);
+ if (sobj != null) {
+ return sobj;
+ }
}
- return getInterfaceInner(thiz, clazz);
+
+ // Arbitrary user Bindings implementation. Look for NASHORN_GLOBAL in it!
+ Object scope = bindings.get(NASHORN_GLOBAL);
+ if (scope instanceof ScriptObjectMirror) {
+ final ScriptObject sobj = globalFromMirror((ScriptObjectMirror)scope);
+ if (sobj != null) {
+ return sobj;
+ }
+ }
+
+ // We didn't find associated nashorn global mirror in the Bindings given!
+ // Create new global instance mirror and associate with the Bindings.
+ final ScriptObjectMirror mirror = createGlobalMirror(ctxt);
+ bindings.put(NASHORN_GLOBAL, mirror);
+ return mirror.getScriptObject();
}
- // These are called from the "engine.js" script
-
- /**
- * This hook is used to search js global variables exposed from Java code.
- *
- * @param self 'this' passed from the script
- * @param ctxt current ScriptContext in which name is searched
- * @param name name of the variable searched
- * @return the value of the named variable
- */
- public Object __noSuchProperty__(final Object self, final ScriptContext ctxt, final String name) {
- final int scope = ctxt.getAttributesScope(name);
- final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
- if (scope != -1) {
- return ScriptObjectMirror.unwrap(ctxt.getAttribute(name, scope), ctxtGlobal);
+ // Retrieve nashorn Global object from a given ScriptObjectMirror
+ private ScriptObject globalFromMirror(final ScriptObjectMirror mirror) {
+ ScriptObject sobj = mirror.getScriptObject();
+ if (sobj instanceof GlobalObject && sobj.isOfContext(nashornContext)) {
+ return sobj;
}
- if (self == UNDEFINED) {
- // scope access and so throw ReferenceError
- throw referenceError(ctxtGlobal, "not.defined", name);
- }
-
- return UNDEFINED;
+ return null;
}
- private ScriptObject getNashornGlobalFrom(final ScriptContext ctxt) {
- final Bindings bindings = ctxt.getBindings(ScriptContext.ENGINE_SCOPE);
- if (bindings instanceof ScriptObjectMirror) {
- ScriptObject sobj = ((ScriptObjectMirror)bindings).getScriptObject();
- if (sobj instanceof GlobalObject) {
- return sobj;
- }
- }
-
- // didn't find global object from context given - return the engine-wide global
- return global;
+ // Create a new ScriptObjectMirror wrapping a newly created Nashorn Global object
+ private ScriptObjectMirror createGlobalMirror(final ScriptContext ctxt) {
+ final ScriptObject newGlobal = createNashornGlobal(ctxt);
+ return new ScriptObjectMirror(newGlobal, newGlobal);
}
- private ScriptObject createNashornGlobal() {
+ // Create a new Nashorn Global object
+ private ScriptObject createNashornGlobal(final ScriptContext ctxt) {
final ScriptObject newGlobal = AccessController.doPrivileged(new PrivilegedAction<ScriptObject>() {
@Override
public ScriptObject run() {
@@ -340,7 +421,7 @@
throw e;
}
}
- });
+ }, CREATE_GLOBAL_ACC_CTXT);
nashornContext.initGlobal(newGlobal);
@@ -348,7 +429,7 @@
// current ScriptContext exposed as "context"
// "context" is non-writable from script - but script engine still
// needs to set it and so save the context Property object
- contextProperty = newGlobal.addOwnProperty("context", NON_ENUMERABLE_CONSTANT, UNDEFINED);
+ contextProperty = newGlobal.addOwnProperty("context", NON_ENUMERABLE_CONSTANT, null);
// current ScriptEngine instance exposed as "engine". We added @SuppressWarnings("LeakingThisInConstructor") as
// NetBeans identifies this assignment as such a leak - this is a false positive as we're setting this property
// in the Global of a Context we just created - both the Context and the Global were just created and can not be
@@ -358,37 +439,17 @@
newGlobal.addOwnProperty("arguments", Property.NOT_ENUMERABLE, UNDEFINED);
// file name default is null
newGlobal.addOwnProperty(ScriptEngine.FILENAME, Property.NOT_ENUMERABLE, null);
+ // evaluate engine.js initialization script this new global object
+ try {
+ evalImpl(compileImpl(ENGINE_SCRIPT_SRC, newGlobal), ctxt, newGlobal);
+ } catch (final ScriptException exp) {
+ throw new RuntimeException(exp);
+ }
return newGlobal;
}
- private void evalEngineScript() throws ScriptException {
- evalSupportScript("resources/engine.js", NashornException.ENGINE_SCRIPT_SOURCE_NAME);
- }
-
- private void evalSupportScript(final String script, final String name) throws ScriptException {
- try {
- final InputStream is = AccessController.doPrivileged(
- new PrivilegedExceptionAction<InputStream>() {
- @Override
- public InputStream run() throws Exception {
- final URL url = NashornScriptEngine.class.getResource(script);
- return url.openStream();
- }
- });
- put(ScriptEngine.FILENAME, name);
- try (final InputStreamReader isr = new InputStreamReader(is)) {
- eval(isr);
- }
- } catch (final PrivilegedActionException | IOException e) {
- throw new ScriptException(e);
- } finally {
- put(ScriptEngine.FILENAME, null);
- }
- }
-
- // scripts should see "context" and "engine" as variables
- private void setContextVariables(final ScriptContext ctxt) {
- final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
+ // scripts should see "context" and "engine" as variables in the given global object
+ private void setContextVariables(final ScriptObject ctxtGlobal, final ScriptContext ctxt) {
// set "context" global variable via contextProperty - because this
// property is non-writable
contextProperty.setObjectValue(ctxtGlobal, ctxtGlobal, ctxt, false);
@@ -397,8 +458,10 @@
args = ScriptRuntime.EMPTY_ARRAY;
}
// if no arguments passed, expose it
- args = ((GlobalObject)ctxtGlobal).wrapAsObject(args);
- ctxtGlobal.set("arguments", args, false);
+ if (! (args instanceof ScriptObject)) {
+ args = ((GlobalObject)ctxtGlobal).wrapAsObject(args);
+ ctxtGlobal.set("arguments", args, false);
+ }
}
private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException {
@@ -451,18 +514,24 @@
}
private Object evalImpl(final ScriptFunction script, final ScriptContext ctxt) throws ScriptException {
+ return evalImpl(script, ctxt, getNashornGlobalFrom(ctxt));
+ }
+
+ private Object evalImpl(final ScriptFunction script, final ScriptContext ctxt, final ScriptObject ctxtGlobal) throws ScriptException {
if (script == null) {
return null;
}
final ScriptObject oldGlobal = Context.getGlobal();
- final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
final boolean globalChanged = (oldGlobal != ctxtGlobal);
try {
if (globalChanged) {
Context.setGlobal(ctxtGlobal);
}
- setContextVariables(ctxt);
+ // set ScriptContext variables if ctxt is non-null
+ if (ctxt != null) {
+ setContextVariables(ctxtGlobal, ctxt);
+ }
return ScriptObjectMirror.translateUndefined(ScriptObjectMirror.wrap(ScriptRuntime.apply(script, ctxtGlobal), ctxtGlobal));
} catch (final Exception e) {
throwAsScriptException(e);
@@ -512,15 +581,18 @@
}
private ScriptFunction compileImpl(final Source source, final ScriptContext ctxt) throws ScriptException {
+ return compileImpl(source, getNashornGlobalFrom(ctxt));
+ }
+
+ private ScriptFunction compileImpl(final Source source, final ScriptObject newGlobal) throws ScriptException {
final ScriptObject oldGlobal = Context.getGlobal();
- final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
- final boolean globalChanged = (oldGlobal != ctxtGlobal);
+ final boolean globalChanged = (oldGlobal != newGlobal);
try {
if (globalChanged) {
- Context.setGlobal(ctxtGlobal);
+ Context.setGlobal(newGlobal);
}
- return nashornContext.compileScript(source, ctxtGlobal);
+ return nashornContext.compileScript(source, newGlobal);
} catch (final Exception e) {
throwAsScriptException(e);
throw new AssertionError("should not reach here");
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -30,6 +30,7 @@
import java.util.List;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
+import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.Version;
/**
@@ -136,7 +137,14 @@
@Override
public ScriptEngine getScriptEngine() {
- return new NashornScriptEngine(this, getAppClassLoader());
+ try {
+ return new NashornScriptEngine(this, getAppClassLoader());
+ } catch (final RuntimeException e) {
+ if (Context.DEBUG) {
+ e.printStackTrace();
+ }
+ throw e;
+ }
}
/**
@@ -178,7 +186,7 @@
private static void checkConfigPermission() {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkPermission(new RuntimePermission("nashorn.setConfig"));
+ sm.checkPermission(new RuntimePermission(Context.NASHORN_SET_CONFIG));
}
}
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,14 +25,17 @@
package jdk.nashorn.api.scripting;
+import java.security.AccessControlContext;
import java.security.AccessController;
+import java.security.Permissions;
import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
import java.util.LinkedHashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -49,6 +52,14 @@
* netscape.javascript.JSObject interface.
*/
public final class ScriptObjectMirror extends JSObject implements Bindings {
+ private static AccessControlContext getContextAccCtxt() {
+ final Permissions perms = new Permissions();
+ perms.add(new RuntimePermission(Context.NASHORN_GET_CONTEXT));
+ return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, perms) });
+ }
+
+ private static final AccessControlContext GET_CONTEXT_ACC_CTXT = getContextAccCtxt();
+
private final ScriptObject sobj;
private final ScriptObject global;
@@ -88,12 +99,14 @@
}
final Object val = functionName == null? sobj : sobj.get(functionName);
- if (! (val instanceof ScriptFunction)) {
- throw new NoSuchMethodException("No such function " + ((functionName != null)? functionName : ""));
+ if (val instanceof ScriptFunction) {
+ final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
+ return wrap(ScriptRuntime.checkAndApply((ScriptFunction)val, sobj, unwrapArray(modArgs, global)), global);
+ } else if (val instanceof ScriptObjectMirror && ((ScriptObjectMirror)val).isFunction()) {
+ return ((ScriptObjectMirror)val).call(null, args);
}
- final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
- return wrap(ScriptRuntime.checkAndApply((ScriptFunction)val, sobj, unwrapArray(modArgs, global)), global);
+ throw new NoSuchMethodException("No such function " + ((functionName != null)? functionName : ""));
} catch (final RuntimeException | Error e) {
throw e;
} catch (final Throwable t) {
@@ -116,12 +129,14 @@
}
final Object val = functionName == null? sobj : sobj.get(functionName);
- if (! (val instanceof ScriptFunction)) {
- throw new RuntimeException("not a constructor " + ((functionName != null)? functionName : ""));
+ if (val instanceof ScriptFunction) {
+ final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
+ return wrap(ScriptRuntime.checkAndConstruct((ScriptFunction)val, unwrapArray(modArgs, global)), global);
+ } else if (val instanceof ScriptObjectMirror && ((ScriptObjectMirror)val).isFunction()) {
+ return ((ScriptObjectMirror)val).newObject(null, args);
}
- final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
- return wrap(ScriptRuntime.checkAndConstruct((ScriptFunction)val, unwrapArray(modArgs, global)), global);
+ throw new RuntimeException("not a constructor " + ((functionName != null)? functionName : ""));
} catch (final RuntimeException | Error e) {
throw e;
} catch (final Throwable t) {
@@ -144,7 +159,7 @@
public Context run() {
return Context.getContext();
}
- });
+ }, GET_CONTEXT_ACC_CTXT);
return wrap(context.eval(global, s, null, null, false), global);
}
});
@@ -363,6 +378,28 @@
}
/**
+ * Set the __proto__ of this object.
+ * @param proto new proto for this object
+ */
+ public void setProto(final Object proto) {
+ inGlobal(new Callable<Void>() {
+ @Override public Void call() {
+ sobj.setProtoCheck(unwrap(proto, global));
+ return null;
+ }
+ });
+ }
+
+ /**
+ * ECMA [[Class]] property
+ *
+ * @return ECMA [[Class]] property value of this object
+ */
+ public String getClassName() {
+ return sobj.getClassName();
+ }
+
+ /**
* ECMA 8.12.1 [[GetOwnProperty]] (P)
*
* @param key property key
--- a/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js Fri Sep 06 15:09:44 2013 -0700
@@ -23,10 +23,9 @@
/**
* This script file is executed by script engine at the construction
- * of the engine. The functions here assume global variables "context"
- * of type javax.script.ScriptContext and "engine" of the type
+ * of the every new Global object. The functions here assume global variables
+ * "context" of type javax.script.ScriptContext and "engine" of the type
* jdk.nashorn.api.scripting.NashornScriptEngine.
- *
**/
Object.defineProperty(this, "__noSuchProperty__", {
@@ -40,7 +39,7 @@
});
function print() {
- var writer = context.getWriter();
+ var writer = context != null? context.writer : engine.context.writer;
if (! (writer instanceof java.io.PrintWriter)) {
writer = new java.io.PrintWriter(writer);
}
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java Fri Sep 06 15:09:44 2013 -0700
@@ -543,8 +543,6 @@
public Node leaveIdentNode(final IdentNode identNode) {
final String name = identNode.getName();
- start(identNode);
-
if (identNode.isPropertyName()) {
// assign a pseudo symbol to property name
final Symbol pseudoSymbol = pseudoSymbol(name);
@@ -1850,9 +1848,10 @@
append("] ").
append(printNode ? node.toString() : "").
append(" in '").
- append(lc.getCurrentFunction().getName());
+ append(lc.getCurrentFunction().getName()).
+ append('\'');
- if(node instanceof Expression) {
+ if (node instanceof Expression) {
final Symbol symbol = ((Expression)node).getSymbol();
if (symbol == null) {
sb.append(" <NO SYMBOL>");
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java Fri Sep 06 15:09:44 2013 -0700
@@ -414,30 +414,34 @@
compiler.getCodeInstaller().verify(bytecode);
}
- // should code be dumped to disk - only valid in compile_only
- // mode?
+ // should code be dumped to disk - only valid in compile_only mode?
if (env._dest_dir != null && env._compile_only) {
final String fileName = className.replace('.', File.separatorChar) + ".class";
- final int index = fileName.lastIndexOf(File.separatorChar);
+ final int index = fileName.lastIndexOf(File.separatorChar);
+ final File dir;
if (index != -1) {
- final File dir = new File(fileName.substring(0, index));
- try {
- if (!dir.exists() && !dir.mkdirs()) {
- throw new IOException(dir.toString());
- }
- final File file = new File(env._dest_dir, fileName);
- try (final FileOutputStream fos = new FileOutputStream(file)) {
- fos.write(bytecode);
- }
- } catch (final IOException e) {
- Compiler.LOG.warning("Skipping class dump for ",
- className,
- ": ",
- ECMAErrors.getMessage(
- "io.error.cant.write",
- dir.toString()));
+ dir = new File(env._dest_dir, fileName.substring(0, index));
+ } else {
+ dir = new File(env._dest_dir);
+ }
+
+ try {
+ if (!dir.exists() && !dir.mkdirs()) {
+ throw new IOException(dir.toString());
}
+ final File file = new File(env._dest_dir, fileName);
+ try (final FileOutputStream fos = new FileOutputStream(file)) {
+ fos.write(bytecode);
+ }
+ Compiler.LOG.info("Wrote class to '" + file.getAbsolutePath() + '\'');
+ } catch (final IOException e) {
+ Compiler.LOG.warning("Skipping class dump for ",
+ className,
+ ": ",
+ ECMAErrors.getMessage(
+ "io.error.cant.write",
+ dir.toString()));
}
}
}
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,7 +33,7 @@
private final String className;
/** Current class generator */
- private final ClassEmitter classEmitter;
+ private ClassEmitter classEmitter;
private long weight;
@@ -64,7 +64,11 @@
* @param clazz class with code for this compile unit
*/
void setCode(final Class<?> clazz) {
+ clazz.getClass(); // null check
this.clazz = clazz;
+ // Revisit this - refactor to avoid null-ed out non-final fields
+ // null out emitter
+ this.classEmitter = null;
}
/**
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java Fri Sep 06 15:09:44 2013 -0700
@@ -489,20 +489,6 @@
}
/**
- * Create a static call, looking up the method handle for it at the same time
- *
- * @param clazz the class
- * @param name the name of the method
- * @param rtype the return type of the method
- * @param ptypes the parameter types of the method
- *
- * @return the call object representing the static call
- */
- public static Call staticCall(final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
- return staticCall(MethodHandles.publicLookup(), clazz, name, rtype, ptypes);
- }
-
- /**
* Create a static call, given an explicit lookup, looking up the method handle for it at the same time
*
* @param lookup the lookup
@@ -523,20 +509,6 @@
}
/**
- * Create a virtual call, looking up the method handle for it at the same time
- *
- * @param clazz the class
- * @param name the name of the method
- * @param rtype the return type of the method
- * @param ptypes the parameter types of the method
- *
- * @return the call object representing the virtual call
- */
- public static Call virtualCall(final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
- return virtualCall(MethodHandles.publicLookup(), clazz, name, rtype, ptypes);
- }
-
- /**
* Create a virtual call, given an explicit lookup, looking up the method handle for it at the same time
*
* @param lookup the lookup
--- a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Fri Sep 06 15:09:44 2013 -0700
@@ -317,7 +317,8 @@
final String className = getClassName(fieldCount);
final String superName = className(ScriptObject.class);
final ClassEmitter classEmitter = newClassEmitter(className, superName);
- final List<String> initFields = addFields(classEmitter, fieldCount);
+
+ addFields(classEmitter, fieldCount);
final MethodEmitter init = newInitMethod(classEmitter);
init.returnVoid();
--- a/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java Fri Sep 06 15:09:44 2013 -0700
@@ -45,9 +45,11 @@
/** Code generator */
protected final CodeGenerator codegen;
- private final boolean isScope;
- private final boolean hasArguments;
- protected PropertyMap propertyMap;
+ /** Property map */
+ protected PropertyMap propertyMap;
+
+ private final boolean isScope;
+ private final boolean hasArguments;
/**
* Constructor
--- a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java Fri Sep 06 15:09:44 2013 -0700
@@ -99,6 +99,7 @@
case DIV:
case MOD:
case MUL:
+ case SUB:
case ASSIGN_DIV:
case ASSIGN_MOD:
case ASSIGN_MUL:
--- a/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,6 +33,14 @@
* a {@code break} statement
*/
public interface BreakableNode extends LexicalContextNode {
+ /**
+ * Ensure that any labels in this breakable node are unique so
+ * that new jumps won't go to old parts of the tree. Used for
+ * example for cloning finally blocks
+ *
+ * @param lc the lexical context
+ * @return node after labels have been made unique
+ */
public abstract Node ensureUniqueLabels(final LexicalContext lc);
/**
--- a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java Fri Sep 06 15:09:44 2013 -0700
@@ -161,13 +161,13 @@
* converting to object, for example if the symbol is used as the left hand side of an
* assignment such as in the code below.</p>
*
- * <pre>{@code
+ * <pre>
* try {
* return 2;
* } finally {
* return 3;
* }
- * }</pre>
+ * }
*
* @return true if can have callsite type
*/
--- a/nashorn/src/jdk/nashorn/internal/ir/LexicalContextNode.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/ir/LexicalContextNode.java Fri Sep 06 15:09:44 2013 -0700
@@ -44,8 +44,14 @@
Node accept(final LexicalContext lc, final NodeVisitor<? extends LexicalContext> visitor);
// Would be a default method on Java 8
+ /**
+ * Helper class for accept for items of this lexical context, delegates to the
+ * subclass accept and makes sure that the node is on the context before accepting
+ * and gets popped after accepting (and that the stack is consistent in that the
+ * node has been replaced with the possible new node resulting in visitation)
+ */
static class Acceptor {
- static Node accept(LexicalContextNode node, final NodeVisitor<? extends LexicalContext> visitor) {
+ static Node accept(final LexicalContextNode node, final NodeVisitor<? extends LexicalContext> visitor) {
final LexicalContext lc = visitor.getLexicalContext();
lc.push(node);
final LexicalContextNode newNode = (LexicalContextNode)node.accept(lc, visitor);
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java Fri Sep 06 15:09:44 2013 -0700
@@ -35,12 +35,12 @@
import java.lang.invoke.MethodHandles;
import java.lang.ref.SoftReference;
import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.linker.LinkRequest;
import jdk.nashorn.internal.objects.annotations.Attribute;
@@ -72,8 +72,8 @@
*/
@ScriptClass("Global")
public final class Global extends ScriptObject implements GlobalObject, Scope {
- private static final InvokeByName TO_STRING = new InvokeByName("toString", ScriptObject.class);
- private static final InvokeByName VALUE_OF = new InvokeByName("valueOf", ScriptObject.class);
+ private final InvokeByName TO_STRING = new InvokeByName("toString", ScriptObject.class);
+ private final InvokeByName VALUE_OF = new InvokeByName("valueOf", ScriptObject.class);
/** ECMA 15.1.2.2 parseInt (string , radix) */
@Property(attributes = Attribute.NOT_ENUMERABLE)
@@ -418,7 +418,7 @@
// security check first
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkPermission(new RuntimePermission("nashorn.newGlobal"));
+ sm.checkPermission(new RuntimePermission(Context.NASHORN_CREATE_GLOBAL));
}
// null check on context
@@ -709,6 +709,35 @@
classCache.put(source, new SoftReference<Class<?>>(clazz));
}
+ private static <T> T getLazilyCreatedValue(final Object key, final Callable<T> creator, final Map<Object, T> map) {
+ final T obj = map.get(key);
+ if (obj != null) {
+ return obj;
+ }
+
+ try {
+ final T newObj = creator.call();
+ final T existingObj = map.putIfAbsent(key, newObj);
+ return existingObj != null ? existingObj : newObj;
+ } catch (final Exception exp) {
+ throw new RuntimeException(exp);
+ }
+ }
+
+ private final Map<Object, InvokeByName> namedInvokers = new ConcurrentHashMap<>();
+
+ @Override
+ public InvokeByName getInvokeByName(final Object key, final Callable<InvokeByName> creator) {
+ return getLazilyCreatedValue(key, creator, namedInvokers);
+ }
+
+ private final Map<Object, MethodHandle> dynamicInvokers = new ConcurrentHashMap<>();
+
+ @Override
+ public MethodHandle getDynamicInvoker(final Object key, final Callable<MethodHandle> creator) {
+ return getLazilyCreatedValue(key, creator, dynamicInvokers);
+ }
+
/**
* This is the eval used when 'indirect' eval call is made.
*
@@ -1749,19 +1778,13 @@
}
private static void copyOptions(final ScriptObject options, final ScriptEnvironment scriptEnv) {
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- @Override
- public Void run() {
- for (Field f : scriptEnv.getClass().getFields()) {
- try {
- options.set(f.getName(), f.get(scriptEnv), false);
- } catch (final IllegalArgumentException | IllegalAccessException exp) {
- throw new RuntimeException(exp);
- }
- }
- return null;
+ for (Field f : scriptEnv.getClass().getFields()) {
+ try {
+ options.set(f.getName(), f.get(scriptEnv), false);
+ } catch (final IllegalArgumentException | IllegalAccessException exp) {
+ throw new RuntimeException(exp);
}
- });
+ }
}
private void initTypedArray() {
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java Fri Sep 06 15:09:44 2013 -0700
@@ -76,36 +76,21 @@
private Object length;
private Object callee;
- private ArrayData namedArgs;
- // This is lazily initialized - only when delete is invoked at all
+ private final int numMapped;
+ private final int numParams;
+
+ // These are lazily initialized when delete is invoked on a mapped arg or an unmapped argument is set.
+ private ArrayData unmappedArgs;
private BitSet deleted;
NativeArguments(final Object[] arguments, final Object callee, final int numParams, final ScriptObject proto, final PropertyMap map) {
super(proto, map);
setIsArguments();
-
setArray(ArrayData.allocate(arguments));
this.length = arguments.length;
this.callee = callee;
-
- /**
- * Declared number of parameters may be more or less than the actual passed
- * runtime arguments count. We need to truncate or extend with undefined values.
- *
- * Example:
- *
- * // less declared params
- * (function (x) { print(arguments); })(20, 44);
- *
- * // more declared params
- * (function (x, y) { print(arguments); })(3);
- */
- final Object[] newValues = new Object[numParams];
- if (numParams > arguments.length) {
- Arrays.fill(newValues, UNDEFINED);
- }
- System.arraycopy(arguments, 0, newValues, 0, Math.min(newValues.length, arguments.length));
- this.namedArgs = ArrayData.allocate(newValues);
+ this.numMapped = Math.min(numParams, arguments.length);
+ this.numParams = numParams;
}
@Override
@@ -118,7 +103,8 @@
*/
@Override
public Object getArgument(final int key) {
- return namedArgs.has(key) ? namedArgs.getObject(key) : UNDEFINED;
+ assert key >= 0 && key < numParams : "invalid argument index";
+ return isMapped(key) ? getArray().getObject(key) : getUnmappedArg(key);
}
/**
@@ -126,353 +112,36 @@
*/
@Override
public void setArgument(final int key, final Object value) {
- if (namedArgs.has(key)) {
- namedArgs = namedArgs.set(key, value, false);
- }
- }
-
- @Override
- public int getInt(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
- }
-
- @Override
- public int getInt(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
- }
-
- @Override
- public int getInt(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
- }
-
- @Override
- public int getInt(final int key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
- }
-
- @Override
- public long getLong(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
- }
-
- @Override
- public long getLong(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
- }
-
- @Override
- public long getLong(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
- }
-
- @Override
- public long getLong(final int key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
- }
-
- @Override
- public double getDouble(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
- }
-
- @Override
- public double getDouble(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
- }
-
- @Override
- public double getDouble(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
- }
-
- @Override
- public double getDouble(final int key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
- }
-
- @Override
- public Object get(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
- }
-
- @Override
- public Object get(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
- }
-
- @Override
- public Object get(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
- }
-
- @Override
- public Object get(final int key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
- }
-
- @Override
- public void set(final Object key, final int value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
+ assert key >= 0 && key < numParams : "invalid argument index";
+ if (isMapped(key)) {
+ setArray(getArray().set(key, value, false));
} else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final Object key, final long value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final Object key, final double value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final Object key, final Object value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final double key, final int value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
+ setUnmappedArg(key, value);
}
}
@Override
- public void set(final double key, final long value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final double key, final double value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final double key, final Object value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final long key, final int value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final long key, final long value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final long key, final double value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final long key, final Object value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final int key, final int value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final int key, final long value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final int key, final double value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public void set(final int key, final Object value, final boolean strict) {
- final int index = ArrayIndex.getArrayIndex(key);
- if (isMapped(index)) {
- namedArgs = namedArgs.set(index, value, strict);
- } else {
- super.set(key, value, strict);
- }
- }
-
- @Override
- public boolean has(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) || super.has(key);
- }
-
- @Override
- public boolean has(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) || super.has(key);
- }
-
- @Override
- public boolean has(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) || super.has(key);
- }
-
- @Override
- public boolean has(final int key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) || super.has(key);
- }
-
- @Override
- public boolean hasOwnProperty(final Object key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) || super.hasOwnProperty(key);
- }
-
- @Override
- public boolean hasOwnProperty(final int key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) || super.hasOwnProperty(key);
- }
-
- @Override
- public boolean hasOwnProperty(final long key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) || super.hasOwnProperty(key);
- }
-
- @Override
- public boolean hasOwnProperty(final double key) {
- final int index = ArrayIndex.getArrayIndex(key);
- return isMapped(index) || super.hasOwnProperty(key);
- }
-
- @Override
public boolean delete(final int key, final boolean strict) {
final int index = ArrayIndex.getArrayIndex(key);
- final boolean success = super.delete(key, strict);
- if (success && namedArgs.has(index)) {
- setDeleted(index);
- }
- return success;
+ return isMapped(index) ? deleteMapped(index, strict) : super.delete(key, strict);
}
@Override
public boolean delete(final long key, final boolean strict) {
final int index = ArrayIndex.getArrayIndex(key);
- final boolean success = super.delete(key, strict);
- if (success && namedArgs.has(index)) {
- setDeleted(index);
- }
- return success;
+ return isMapped(index) ? deleteMapped(index, strict) : super.delete(key, strict);
}
@Override
public boolean delete(final double key, final boolean strict) {
final int index = ArrayIndex.getArrayIndex(key);
- final boolean success = super.delete(key, strict);
- if (success && namedArgs.has(index)) {
- setDeleted(index);
- }
- return success;
+ return isMapped(index) ? deleteMapped(index, strict) : super.delete(key, strict);
}
@Override
public boolean delete(final Object key, final boolean strict) {
final int index = ArrayIndex.getArrayIndex(key);
- final boolean success = super.delete(key, strict);
- if (success && namedArgs.has(index)) {
- setDeleted(index);
- }
- return success;
+ return isMapped(index) ? deleteMapped(index, strict) : super.delete(key, strict);
}
/**
@@ -483,29 +152,27 @@
public boolean defineOwnProperty(final String key, final Object propertyDesc, final boolean reject) {
final int index = ArrayIndex.getArrayIndex(key);
if (index >= 0) {
- final boolean allowed = super.defineOwnProperty(key, propertyDesc, false);
- if (!allowed) {
+ final boolean isMapped = isMapped(index);
+ final Object oldValue = isMapped ? getArray().getObject(index) : null;
+
+ if (!super.defineOwnProperty(key, propertyDesc, false)) {
if (reject) {
throw typeError("cant.redefine.property", key, ScriptRuntime.safeToString(this));
}
return false;
}
- if (isMapped(index)) {
+ if (isMapped) {
// When mapped argument is redefined, if new descriptor is accessor property
// or data-non-writable property, we have to "unmap" (unlink).
final PropertyDescriptor desc = toPropertyDescriptor(Global.instance(), propertyDesc);
if (desc.type() == PropertyDescriptor.ACCESSOR) {
- setDeleted(index);
- } else {
- // set "value" from new descriptor to named args
- if (desc.has(PropertyDescriptor.VALUE)) {
- namedArgs = namedArgs.set(index, desc.getValue(), false);
- }
-
- if (desc.has(PropertyDescriptor.WRITABLE) && !desc.isWritable()) {
- setDeleted(index);
- }
+ setDeleted(index, oldValue);
+ } else if (desc.has(PropertyDescriptor.WRITABLE) && !desc.isWritable()) {
+ // delete and set value from new descriptor if it has one, otherwise use old value
+ setDeleted(index, desc.has(PropertyDescriptor.VALUE) ? desc.getValue() : oldValue);
+ } else if (desc.has(PropertyDescriptor.VALUE)) {
+ setArray(getArray().set(index, desc.getValue(), false));
}
}
@@ -519,31 +186,72 @@
// We track deletions using a bit set (delete arguments[index])
private boolean isDeleted(final int index) {
- return (deleted != null) ? deleted.get(index) : false;
+ return deleted != null && deleted.get(index);
+ }
+
+ private void setDeleted(final int index, final Object unmappedValue) {
+ if (deleted == null) {
+ deleted = new BitSet(numMapped);
+ }
+ deleted.set(index, true);
+ setUnmappedArg(index, unmappedValue);
+ }
+
+ private boolean deleteMapped(final int index, final boolean strict) {
+ final Object value = getArray().getObject(index);
+ final boolean success = super.delete(index, strict);
+ if (success) {
+ setDeleted(index, value);
+ }
+ return success;
+ }
+
+ private Object getUnmappedArg(final int key) {
+ assert key >= 0 && key < numParams;
+ return unmappedArgs == null ? UNDEFINED : unmappedArgs.getObject(key);
}
- private void setDeleted(final int index) {
- if (deleted == null) {
- deleted = new BitSet((int)namedArgs.length());
+ private void setUnmappedArg(final int key, final Object value) {
+ assert key >= 0 && key < numParams;
+ if (unmappedArgs == null) {
+ /*
+ * Declared number of parameters may be more or less than the actual passed
+ * runtime arguments count. We need to truncate or extend with undefined values.
+ *
+ * Example:
+ *
+ * // less declared params
+ * (function (x) { print(arguments); })(20, 44);
+ *
+ * // more declared params
+ * (function (x, y) { print(arguments); })(3);
+ */
+ final Object[] newValues = new Object[numParams];
+ System.arraycopy(getArray().asObjectArray(), 0, newValues, 0, numMapped);
+ if (numMapped < numParams) {
+ Arrays.fill(newValues, numMapped, numParams, UNDEFINED);
+ }
+ this.unmappedArgs = ArrayData.allocate(newValues);
}
- deleted.set(index, true);
+ // Set value of argument
+ unmappedArgs = unmappedArgs.set(key, value, false);
}
/**
* Are arguments[index] and corresponding named parameter linked?
*
- * In non-strict mode, arguments[index] and corresponding named param
- * are "linked" or "mapped". Modifications are tacked b/w each other - till
- * (delete arguments[index]) is used. Once deleted, the corresponding arg
- * is no longer 'mapped'. Please note that delete can happen only through
- * the arguments array - named param can not be deleted. (delete is one-way).
+ * In non-strict mode, arguments[index] and corresponding named param are "linked" or "mapped"
+ * if the argument is provided by the caller. Modifications are tacked b/w each other - until
+ * (delete arguments[index]) is used. Once deleted, the corresponding arg is no longer 'mapped'.
+ * Please note that delete can happen only through the arguments array - named param can not
+ * be deleted. (delete is one-way).
*/
private boolean isMapped(final int index) {
- // in named args and not marked as "deleted"
- return namedArgs.has(index) && !isDeleted(index);
+ // in mapped named args and not marked as "deleted"
+ return index >= 0 && index < numMapped && !isDeleted(index);
}
- /**
+ /**
* Factory to create correct Arguments object based on strict mode.
*
* @param arguments the actual arguments array passed
@@ -558,9 +266,8 @@
final ScriptObject proto = global.getObjectPrototype();
if (isStrict) {
return new NativeStrictArguments(arguments, numParams, proto, global.getStrictArgumentsMap());
- } else {
- return new NativeArguments(arguments, callee, numParams, proto, global.getArgumentsMap());
}
+ return new NativeArguments(arguments, callee, numParams, proto, global.getArgumentsMap());
}
/**
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java Fri Sep 06 15:09:44 2013 -0700
@@ -39,6 +39,8 @@
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.concurrent.Callable;
+
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import jdk.nashorn.internal.objects.annotations.Attribute;
import jdk.nashorn.internal.objects.annotations.Constructor;
@@ -68,20 +70,88 @@
*/
@ScriptClass("Array")
public final class NativeArray extends ScriptObject {
- private static final InvokeByName JOIN = new InvokeByName("join", ScriptObject.class);
+ private static final Object JOIN = new Object();
+ private static final Object EVERY_CALLBACK_INVOKER = new Object();
+ private static final Object SOME_CALLBACK_INVOKER = new Object();
+ private static final Object FOREACH_CALLBACK_INVOKER = new Object();
+ private static final Object MAP_CALLBACK_INVOKER = new Object();
+ private static final Object FILTER_CALLBACK_INVOKER = new Object();
+ private static final Object REDUCE_CALLBACK_INVOKER = new Object();
+ private static final Object CALL_CMP = new Object();
+ private static final Object TO_LOCALE_STRING = new Object();
+
+ private static InvokeByName getJOIN() {
+ return Global.instance().getInvokeByName(JOIN,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("join", ScriptObject.class);
+ }
+ });
+ }
+
+ private static MethodHandle createIteratorCallbackInvoker(final Object key, final Class<?> rtype) {
+ return Global.instance().getDynamicInvoker(key,
+ new Callable<MethodHandle>() {
+ @Override
+ public MethodHandle call() {
+ return Bootstrap.createDynamicInvoker("dyn:call", rtype, Object.class, Object.class, Object.class,
+ long.class, Object.class);
+ }
+ });
+ }
+
+ private static MethodHandle getEVERY_CALLBACK_INVOKER() {
+ return createIteratorCallbackInvoker(EVERY_CALLBACK_INVOKER, boolean.class);
+ }
+
+ private static MethodHandle getSOME_CALLBACK_INVOKER() {
+ return createIteratorCallbackInvoker(SOME_CALLBACK_INVOKER, boolean.class);
+ }
- private static final MethodHandle EVERY_CALLBACK_INVOKER = createIteratorCallbackInvoker(boolean.class);
- private static final MethodHandle SOME_CALLBACK_INVOKER = createIteratorCallbackInvoker(boolean.class);
- private static final MethodHandle FOREACH_CALLBACK_INVOKER = createIteratorCallbackInvoker(void.class);
- private static final MethodHandle MAP_CALLBACK_INVOKER = createIteratorCallbackInvoker(Object.class);
- private static final MethodHandle FILTER_CALLBACK_INVOKER = createIteratorCallbackInvoker(boolean.class);
+ private static MethodHandle getFOREACH_CALLBACK_INVOKER() {
+ return createIteratorCallbackInvoker(FOREACH_CALLBACK_INVOKER, void.class);
+ }
+
+ private static MethodHandle getMAP_CALLBACK_INVOKER() {
+ return createIteratorCallbackInvoker(MAP_CALLBACK_INVOKER, Object.class);
+ }
+
+ private static MethodHandle getFILTER_CALLBACK_INVOKER() {
+ return createIteratorCallbackInvoker(FILTER_CALLBACK_INVOKER, boolean.class);
+ }
- private static final MethodHandle REDUCE_CALLBACK_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
- Object.class, Undefined.class, Object.class, Object.class, long.class, Object.class);
- private static final MethodHandle CALL_CMP = Bootstrap.createDynamicInvoker("dyn:call", double.class,
- ScriptFunction.class, Object.class, Object.class, Object.class);
+ private static MethodHandle getREDUCE_CALLBACK_INVOKER() {
+ return Global.instance().getDynamicInvoker(REDUCE_CALLBACK_INVOKER,
+ new Callable<MethodHandle>() {
+ @Override
+ public MethodHandle call() {
+ return Bootstrap.createDynamicInvoker("dyn:call", Object.class, Object.class,
+ Undefined.class, Object.class, Object.class, long.class, Object.class);
+ }
+ });
+ }
- private static final InvokeByName TO_LOCALE_STRING = new InvokeByName("toLocaleString", ScriptObject.class, String.class);
+ private static MethodHandle getCALL_CMP() {
+ return Global.instance().getDynamicInvoker(CALL_CMP,
+ new Callable<MethodHandle>() {
+ @Override
+ public MethodHandle call() {
+ return Bootstrap.createDynamicInvoker("dyn:call", double.class,
+ ScriptFunction.class, Object.class, Object.class, Object.class);
+ }
+ });
+ }
+
+ private static InvokeByName getTO_LOCALE_STRING() {
+ return Global.instance().getInvokeByName(TO_LOCALE_STRING,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("toLocaleString", ScriptObject.class, String.class);
+ }
+ });
+ }
// initialized by nasgen
private static PropertyMap $nasgenmap$;
@@ -357,11 +427,12 @@
public static Object toString(final Object self) {
final Object obj = Global.toObject(self);
if (obj instanceof ScriptObject) {
+ final InvokeByName joinInvoker = getJOIN();
final ScriptObject sobj = (ScriptObject)obj;
try {
- final Object join = JOIN.getGetter().invokeExact(sobj);
+ final Object join = joinInvoker.getGetter().invokeExact(sobj);
if (Bootstrap.isCallable(join)) {
- return JOIN.getInvoker().invokeExact(join, sobj);
+ return joinInvoker.getInvoker().invokeExact(join, sobj);
}
} catch (final RuntimeException | Error e) {
throw e;
@@ -393,11 +464,12 @@
try {
if (val instanceof ScriptObject) {
+ final InvokeByName localeInvoker = getTO_LOCALE_STRING();
final ScriptObject sobj = (ScriptObject)val;
- final Object toLocaleString = TO_LOCALE_STRING.getGetter().invokeExact(sobj);
+ final Object toLocaleString = localeInvoker.getGetter().invokeExact(sobj);
if (Bootstrap.isCallable(toLocaleString)) {
- sb.append((String)TO_LOCALE_STRING.getInvoker().invokeExact(toLocaleString, sobj));
+ sb.append((String)localeInvoker.getInvoker().invokeExact(toLocaleString, sobj));
} else {
throw typeError("not.a.function", "toLocaleString");
}
@@ -561,15 +633,16 @@
return new NativeArray(list.toArray());
}
+ @SuppressWarnings("null")
private static void concatToList(final ArrayList<Object> list, final Object obj) {
final boolean isScriptArray = isArray(obj);
final boolean isScriptObject = isScriptArray || obj instanceof ScriptObject;
if (isScriptArray || obj instanceof Iterable || (obj != null && obj.getClass().isArray())) {
final Iterator<Object> iter = arrayLikeIterator(obj, true);
if (iter.hasNext()) {
- for(int i = 0; iter.hasNext(); ++i) {
+ for (int i = 0; iter.hasNext(); ++i) {
final Object value = iter.next();
- if(value == ScriptRuntime.UNDEFINED && isScriptObject && !((ScriptObject)obj).has(i)) {
+ if (value == ScriptRuntime.UNDEFINED && isScriptObject && !((ScriptObject)obj).has(i)) {
// TODO: eventually rewrite arrayLikeIterator to use a three-state enum for handling
// UNDEFINED instead of an "includeUndefined" boolean with states SKIP, INCLUDE,
// RETURN_EMPTY. Until then, this is how we'll make sure that empty elements don't make it
@@ -814,6 +887,7 @@
final Object cmpThis = cmp == null || cmp.isStrict() ? ScriptRuntime.UNDEFINED : Global.instance();
Collections.sort(list, new Comparator<Object>() {
+ private final MethodHandle call_cmp = getCALL_CMP();
@Override
public int compare(final Object x, final Object y) {
if (x == ScriptRuntime.UNDEFINED && y == ScriptRuntime.UNDEFINED) {
@@ -826,7 +900,7 @@
if (cmp != null) {
try {
- return (int)Math.signum((double)CALL_CMP.invokeExact(cmp, cmpThis, x, y));
+ return (int)Math.signum((double)call_cmp.invokeExact(cmp, cmpThis, x, y));
} catch (final RuntimeException | Error e) {
throw e;
} catch (final Throwable t) {
@@ -1103,9 +1177,11 @@
private static boolean applyEvery(final Object self, final Object callbackfn, final Object thisArg) {
return new IteratorAction<Boolean>(Global.toObject(self), callbackfn, thisArg, true) {
+ private final MethodHandle everyInvoker = getEVERY_CALLBACK_INVOKER();
+
@Override
protected boolean forEach(final Object val, final long i) throws Throwable {
- return (result = (boolean)EVERY_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self));
+ return (result = (boolean)everyInvoker.invokeExact(callbackfn, thisArg, val, i, self));
}
}.apply();
}
@@ -1121,9 +1197,11 @@
@Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
public static Object some(final Object self, final Object callbackfn, final Object thisArg) {
return new IteratorAction<Boolean>(Global.toObject(self), callbackfn, thisArg, false) {
+ private final MethodHandle someInvoker = getSOME_CALLBACK_INVOKER();
+
@Override
protected boolean forEach(final Object val, final long i) throws Throwable {
- return !(result = (boolean)SOME_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self));
+ return !(result = (boolean)someInvoker.invokeExact(callbackfn, thisArg, val, i, self));
}
}.apply();
}
@@ -1139,9 +1217,11 @@
@Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
public static Object forEach(final Object self, final Object callbackfn, final Object thisArg) {
return new IteratorAction<Object>(Global.toObject(self), callbackfn, thisArg, ScriptRuntime.UNDEFINED) {
+ private final MethodHandle forEachInvoker = getFOREACH_CALLBACK_INVOKER();
+
@Override
protected boolean forEach(final Object val, final long i) throws Throwable {
- FOREACH_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self);
+ forEachInvoker.invokeExact(callbackfn, thisArg, val, i, self);
return true;
}
}.apply();
@@ -1158,9 +1238,11 @@
@Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
public static Object map(final Object self, final Object callbackfn, final Object thisArg) {
return new IteratorAction<NativeArray>(Global.toObject(self), callbackfn, thisArg, null) {
+ private final MethodHandle mapInvoker = getMAP_CALLBACK_INVOKER();
+
@Override
protected boolean forEach(final Object val, final long i) throws Throwable {
- final Object r = MAP_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self);
+ final Object r = mapInvoker.invokeExact(callbackfn, thisArg, val, i, self);
result.defineOwnProperty(ArrayIndex.getArrayIndex(index), r);
return true;
}
@@ -1186,10 +1268,11 @@
public static Object filter(final Object self, final Object callbackfn, final Object thisArg) {
return new IteratorAction<NativeArray>(Global.toObject(self), callbackfn, thisArg, new NativeArray()) {
private long to = 0;
+ private final MethodHandle filterInvoker = getFILTER_CALLBACK_INVOKER();
@Override
protected boolean forEach(final Object val, final long i) throws Throwable {
- if ((boolean)FILTER_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self)) {
+ if ((boolean)filterInvoker.invokeExact(callbackfn, thisArg, val, i, self)) {
result.defineOwnProperty(ArrayIndex.getArrayIndex(to++), val);
}
return true;
@@ -1217,10 +1300,12 @@
//if initial value is ScriptRuntime.UNDEFINED - step forward once.
return new IteratorAction<Object>(Global.toObject(self), callbackfn, ScriptRuntime.UNDEFINED, initialValue, iter) {
+ private final MethodHandle reduceInvoker = getREDUCE_CALLBACK_INVOKER();
+
@Override
protected boolean forEach(final Object val, final long i) throws Throwable {
// TODO: why can't I declare the second arg as Undefined.class?
- result = REDUCE_CALLBACK_INVOKER.invokeExact(callbackfn, ScriptRuntime.UNDEFINED, result, val, i, self);
+ result = reduceInvoker.invokeExact(callbackfn, ScriptRuntime.UNDEFINED, result, val, i, self);
return true;
}
}.apply();
@@ -1273,10 +1358,4 @@
return false;
}
-
- private static MethodHandle createIteratorCallbackInvoker(final Class<?> rtype) {
- return Bootstrap.createDynamicInvoker("dyn:call", rtype, Object.class, Object.class, Object.class,
- long.class, Object.class);
-
- }
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java Fri Sep 06 15:09:44 2013 -0700
@@ -73,6 +73,11 @@
this(Arrays.copyOfRange(other.buffer, begin, end));
}
+ @Override
+ public String getClassName() {
+ return "ArrayBuffer";
+ }
+
@Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_WRITABLE | Attribute.NOT_CONFIGURABLE)
public static Object byteLength(final Object self) {
return ((NativeArrayBuffer)self).buffer.length;
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,6 +33,7 @@
import java.util.Locale;
import java.util.TimeZone;
+import java.util.concurrent.Callable;
import jdk.nashorn.internal.objects.annotations.Attribute;
import jdk.nashorn.internal.objects.annotations.Constructor;
import jdk.nashorn.internal.objects.annotations.Function;
@@ -95,8 +96,17 @@
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
- private static final InvokeByName TO_ISO_STRING = new InvokeByName("toISOString", ScriptObject.class, Object.class,
- Object.class);
+ private static final Object TO_ISO_STRING = new Object();
+
+ private static InvokeByName getTO_ISO_STRING() {
+ return Global.instance().getInvokeByName(TO_ISO_STRING,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("toISOString", ScriptObject.class, Object.class, Object.class);
+ }
+ });
+ }
private double time;
private final TimeZone timezone;
@@ -861,9 +871,10 @@
}
try {
- final Object func = TO_ISO_STRING.getGetter().invokeExact(sobj);
+ final InvokeByName toIsoString = getTO_ISO_STRING();
+ final Object func = toIsoString.getGetter().invokeExact(sobj);
if (Bootstrap.isCallable(func)) {
- return TO_ISO_STRING.getInvoker().invokeExact(func, sobj, key);
+ return toIsoString.getInvoker().invokeExact(func, sobj, key);
}
throw typeError("not.a.function", ScriptRuntime.safeToString(func));
} catch (final RuntimeException | Error e) {
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java Fri Sep 06 15:09:44 2013 -0700
@@ -72,7 +72,7 @@
public static Object getContext(final Object self) {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkPermission(new RuntimePermission("nashorn.getContext"));
+ sm.checkPermission(new RuntimePermission(Context.NASHORN_GET_CONTEXT));
}
return Global.getThisContext();
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java Fri Sep 06 15:09:44 2013 -0700
@@ -145,6 +145,11 @@
}
@Override
+ public String getClassName() {
+ return "Float32Array";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java Fri Sep 06 15:09:44 2013 -0700
@@ -155,6 +155,11 @@
}
@Override
+ public String getClassName() {
+ return "Float64Array";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java Fri Sep 06 15:09:44 2013 -0700
@@ -109,6 +109,11 @@
}
@Override
+ public String getClassName() {
+ return "Int16Array";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java Fri Sep 06 15:09:44 2013 -0700
@@ -112,6 +112,11 @@
}
@Override
+ public String getClassName() {
+ return "Int32Array";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java Fri Sep 06 15:09:44 2013 -0700
@@ -102,6 +102,11 @@
}
@Override
+ public String getClassName() {
+ return "Int8Array";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java Fri Sep 06 15:09:44 2013 -0700
@@ -35,6 +35,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Callable;
import jdk.nashorn.internal.objects.annotations.Attribute;
import jdk.nashorn.internal.objects.annotations.Function;
import jdk.nashorn.internal.objects.annotations.ScriptClass;
@@ -55,9 +56,31 @@
*/
@ScriptClass("JSON")
public final class NativeJSON extends ScriptObject {
- private static final InvokeByName TO_JSON = new InvokeByName("toJSON", ScriptObject.class, Object.class, Object.class);
- private static final MethodHandle REPLACER_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
- ScriptFunction.class, ScriptObject.class, Object.class, Object.class);
+ private static final Object TO_JSON = new Object();
+
+ private static InvokeByName getTO_JSON() {
+ return Global.instance().getInvokeByName(TO_JSON,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("toJSON", ScriptObject.class, Object.class, Object.class);
+ }
+ });
+ }
+
+
+ private static final Object REPLACER_INVOKER = new Object();
+
+ private static MethodHandle getREPLACER_INVOKER() {
+ return Global.instance().getDynamicInvoker(REPLACER_INVOKER,
+ new Callable<MethodHandle>() {
+ @Override
+ public MethodHandle call() {
+ return Bootstrap.createDynamicInvoker("dyn:call", Object.class,
+ ScriptFunction.class, ScriptObject.class, Object.class, Object.class);
+ }
+ });
+ }
// initialized by nasgen
@SuppressWarnings("unused")
@@ -187,15 +210,16 @@
try {
if (value instanceof ScriptObject) {
+ final InvokeByName toJSONInvoker = getTO_JSON();
final ScriptObject svalue = (ScriptObject)value;
- final Object toJSON = TO_JSON.getGetter().invokeExact(svalue);
+ final Object toJSON = toJSONInvoker.getGetter().invokeExact(svalue);
if (Bootstrap.isCallable(toJSON)) {
- value = TO_JSON.getInvoker().invokeExact(toJSON, svalue, key);
+ value = toJSONInvoker.getInvoker().invokeExact(toJSON, svalue, key);
}
}
if (state.replacerFunction != null) {
- value = REPLACER_INVOKER.invokeExact(state.replacerFunction, holder, key, value);
+ value = getREPLACER_INVOKER().invokeExact(state.replacerFunction, holder, key, value);
}
} catch(Error|RuntimeException t) {
throw t;
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,7 +32,6 @@
import java.util.Collection;
import java.util.Deque;
import java.util.List;
-
import jdk.internal.dynalink.beans.StaticClass;
import jdk.internal.dynalink.support.TypeUtilities;
import jdk.nashorn.internal.objects.annotations.Attribute;
@@ -44,6 +43,7 @@
import jdk.nashorn.internal.runtime.ListAdapter;
import jdk.nashorn.internal.runtime.PropertyMap;
import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
/**
@@ -539,4 +539,25 @@
}
return JavaAdapterFactory.getAdapterClassFor(stypes, classOverrides);
}
+
+ /**
+ * When given an object created using {@code Java.extend()} or equivalent mechanism (that is, any JavaScript-to-Java
+ * adapter), returns an object that can be used to invoke superclass methods on that object. E.g.:
+ * <pre>
+ * var cw = new FilterWriterAdapter(sw) {
+ * write: function(s, off, len) {
+ * s = capitalize(s, off, len)
+ * cw_super.write(s, 0, s.length())
+ * }
+ * }
+ * var cw_super = Java.super(cw)
+ * </pre>
+ * @param self the {@code Java} object itself - not used.
+ * @param adapter the original Java adapter instance for which the super adapter is created.
+ * @return a super adapter for the original adapter
+ */
+ @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR, name="super")
+ public static Object _super(final Object self, final Object adapter) {
+ return Bootstrap.createSuperAdapter(adapter);
+ }
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,6 +36,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.Callable;
import jdk.internal.dynalink.beans.BeansLinker;
import jdk.internal.dynalink.beans.StaticClass;
import jdk.internal.dynalink.linker.GuardedInvocation;
@@ -70,7 +71,18 @@
*/
@ScriptClass("Object")
public final class NativeObject {
- private static final InvokeByName TO_STRING = new InvokeByName("toString", ScriptObject.class);
+ private static final Object TO_STRING = new Object();
+
+ private static InvokeByName getTO_STRING() {
+ return Global.instance().getInvokeByName(TO_STRING,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("toString", ScriptObject.class);
+ }
+ });
+ }
+
private static final MethodType MIRROR_GETTER_TYPE = MethodType.methodType(Object.class, ScriptObjectMirror.class);
private static final MethodType MIRROR_SETTER_TYPE = MethodType.methodType(Object.class, ScriptObjectMirror.class, Object.class);
@@ -101,11 +113,40 @@
} else if (obj instanceof ScriptObjectMirror) {
return ((ScriptObjectMirror)obj).getProto();
} else {
+ final JSType type = JSType.of(obj);
+ if (type == JSType.OBJECT) {
+ // host (Java) objects have null __proto__
+ return null;
+ }
+
+ // must be some JS primitive
throw notAnObject(obj);
}
}
/**
+ * Nashorn extension: Object.setPrototypeOf ( O, proto )
+ * Also found in ES6 draft specification.
+ *
+ * @param self self reference
+ * @param obj object to set prototype for
+ * @param proto prototype object to be used
+ * @return object whose prototype is set
+ */
+ @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+ public static Object setPrototypeOf(final Object self, final Object obj, final Object proto) {
+ if (obj instanceof ScriptObject) {
+ ((ScriptObject)obj).setProtoCheck(proto);
+ return obj;
+ } else if (obj instanceof ScriptObjectMirror) {
+ ((ScriptObjectMirror)obj).setProto(proto);
+ return obj;
+ }
+
+ throw notAnObject(obj);
+ }
+
+ /**
* ECMA 15.2.3.3 Object.getOwnPropertyDescriptor ( O, P )
*
* @param self self reference
@@ -165,7 +206,7 @@
// FIXME: should we create a proper object with correct number of
// properties?
final ScriptObject newObj = Global.newEmptyInstance();
- newObj.setProtoCheck(proto);
+ newObj.setProto((ScriptObject)proto);
if (props != UNDEFINED) {
NativeObject.defineProperties(self, newObj, props);
}
@@ -402,12 +443,13 @@
public static Object toLocaleString(final Object self) {
final Object obj = JSType.toScriptObject(self);
if (obj instanceof ScriptObject) {
+ final InvokeByName toStringInvoker = getTO_STRING();
final ScriptObject sobj = (ScriptObject)self;
try {
- final Object toString = TO_STRING.getGetter().invokeExact(sobj);
+ final Object toString = toStringInvoker.getGetter().invokeExact(sobj);
if (Bootstrap.isCallable(toString)) {
- return TO_STRING.getInvoker().invokeExact(toString, sobj);
+ return toStringInvoker.getInvoker().invokeExact(toString, sobj);
}
} catch (final RuntimeException | Error e) {
throw e;
@@ -627,15 +669,43 @@
final List<AccessorProperty> properties = new ArrayList<>(propertyNames.size() + methodNames.size());
for(final String methodName: methodNames) {
- properties.add(AccessorProperty.create(methodName, Property.NOT_WRITABLE,
- getBoundBeanMethodGetter(source, getBeanOperation(linker, "dyn:getMethod:" + methodName, getterType, source)),
- null));
+ final MethodHandle method;
+ try {
+ method = getBeanOperation(linker, "dyn:getMethod:" + methodName, getterType, source);
+ } catch(final IllegalAccessError e) {
+ // Presumably, this was a caller sensitive method. Ignore it and carry on.
+ continue;
+ }
+ properties.add(AccessorProperty.create(methodName, Property.NOT_WRITABLE, getBoundBeanMethodGetter(source,
+ method), null));
}
for(final String propertyName: propertyNames) {
+ MethodHandle getter;
+ if(readablePropertyNames.contains(propertyName)) {
+ try {
+ getter = getBeanOperation(linker, "dyn:getProp:" + propertyName, getterType, source);
+ } catch(final IllegalAccessError e) {
+ // Presumably, this was a caller sensitive method. Ignore it and carry on.
+ getter = Lookup.EMPTY_GETTER;
+ }
+ } else {
+ getter = Lookup.EMPTY_GETTER;
+ }
final boolean isWritable = writablePropertyNames.contains(propertyName);
- properties.add(AccessorProperty.create(propertyName, isWritable ? 0 : Property.NOT_WRITABLE,
- readablePropertyNames.contains(propertyName) ? getBeanOperation(linker, "dyn:getProp:" + propertyName, getterType, source) : Lookup.EMPTY_GETTER,
- isWritable ? getBeanOperation(linker, "dyn:setProp:" + propertyName, setterType, source) : Lookup.EMPTY_SETTER));
+ MethodHandle setter;
+ if(isWritable) {
+ try {
+ setter = getBeanOperation(linker, "dyn:setProp:" + propertyName, setterType, source);
+ } catch(final IllegalAccessError e) {
+ // Presumably, this was a caller sensitive method. Ignore it and carry on.
+ setter = Lookup.EMPTY_SETTER;
+ }
+ } else {
+ setter = Lookup.EMPTY_SETTER;
+ }
+ if(getter != Lookup.EMPTY_GETTER || setter != Lookup.EMPTY_SETTER) {
+ properties.add(AccessorProperty.create(propertyName, isWritable ? 0 : Property.NOT_WRITABLE, getter, setter));
+ }
}
targetObj.addBoundProperties(source, properties.toArray(new AccessorProperty[properties.size()]));
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java Fri Sep 06 15:09:44 2013 -0700
@@ -65,10 +65,9 @@
private RegExp regexp;
// Reference to global object needed to support static RegExp properties
- private Global globalObject;
+ private final Global globalObject;
// initialized by nasgen
- @SuppressWarnings("unused")
private static PropertyMap $nasgenmap$;
static PropertyMap getInitialMap() {
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java Fri Sep 06 15:09:44 2013 -0700
@@ -1058,9 +1058,8 @@
public static Object trim(final Object self) {
final String str = checkObjectToString(self);
- final int len = str.length();
int start = 0;
- int end = len - 1;
+ int end = str.length() - 1;
while (start <= end && ScriptRuntime.isJSWhitespace(str.charAt(start))) {
start++;
@@ -1069,7 +1068,45 @@
end--;
}
- return start == 0 && end + 1 == len ? str : str.substring(start, end + 1);
+ return str.substring(start, end + 1);
+ }
+
+ /**
+ * Nashorn extension: String.prototype.trimLeft ( )
+ * @param self self reference
+ * @return string trimmed left from whitespace
+ */
+ @Function(attributes = Attribute.NOT_ENUMERABLE)
+ public static Object trimLeft(final Object self) {
+
+ final String str = checkObjectToString(self);
+ int start = 0;
+ int end = str.length() - 1;
+
+ while (start <= end && ScriptRuntime.isJSWhitespace(str.charAt(start))) {
+ start++;
+ }
+
+ return str.substring(start, end + 1);
+ }
+
+ /**
+ * Nashorn extension: String.prototype.trimRight ( )
+ * @param self self reference
+ * @return string trimmed right from whitespace
+ */
+ @Function(attributes = Attribute.NOT_ENUMERABLE)
+ public static Object trimRight(final Object self) {
+
+ final String str = checkObjectToString(self);
+ int start = 0;
+ int end = str.length() - 1;
+
+ while (end >= start && ScriptRuntime.isJSWhitespace(str.charAt(end))) {
+ end--;
+ }
+
+ return str.substring(start, end + 1);
}
private static Object newObj(final Object self, final CharSequence str) {
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java Fri Sep 06 15:09:44 2013 -0700
@@ -108,6 +108,11 @@
}
@Override
+ public String getClassName() {
+ return "Uint16Array";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java Fri Sep 06 15:09:44 2013 -0700
@@ -127,6 +127,11 @@
}
@Override
+ public String getClassName() {
+ return "Uint32Array";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java Fri Sep 06 15:09:44 2013 -0700
@@ -101,6 +101,11 @@
}
@Override
+ public String getClassName() {
+ return "Uint8Array";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java Fri Sep 06 15:09:44 2013 -0700
@@ -118,6 +118,11 @@
}
@Override
+ public String getClassName() {
+ return "Uint8ClampedArray";
+ }
+
+ @Override
protected Factory factory() {
return FACTORY;
}
--- a/nashorn/src/jdk/nashorn/internal/parser/DateParser.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/parser/DateParser.java Fri Sep 06 15:09:44 2013 -0700
@@ -141,7 +141,7 @@
* Try parsing the date string according to the rules laid out in ES5 15.9.1.15.
* The date string must conform to the following format:
*
- * <pre> [('-'|'+')yy]yyyy[-MM[-dd]][hh:mm[:ss[.sss]][Z|(+|-)hh:mm]] </pre>
+ * <pre> [('-'|'+')yy]yyyy[-MM[-dd]][Thh:mm[:ss[.sss]][Z|(+|-)hh:mm]] </pre>
*
* <p>If the string does not contain a time zone offset, the <tt>TIMEZONE</tt> field
* is set to <tt>0</tt> (GMT).</p>
@@ -249,7 +249,7 @@
switch (token) {
case NUMBER:
- if (skip(':')) {
+ if (skipDelimiter(':')) {
// A number followed by ':' is parsed as time
if (!setTimeField(numValue)) {
return false;
@@ -260,14 +260,14 @@
if (token != Token.NUMBER || !setTimeField(numValue)) {
return false;
}
- } while (skip(isSet(SECOND) ? '.' : ':'));
+ } while (skipDelimiter(isSet(SECOND) ? '.' : ':'));
} else {
// Parse as date token
if (!setDateField(numValue)) {
return false;
}
- skip('-');
+ skipDelimiter('-');
}
break;
@@ -297,7 +297,7 @@
break;
}
if (nameValue.type != Name.TIMEZONE_ID) {
- skip('-');
+ skipDelimiter('-');
}
break;
@@ -359,7 +359,18 @@
return pos < length ? string.charAt(pos) : -1;
}
- private boolean skip(final char c) {
+ // Skip delimiter if followed by a number. Used for ISO 8601 formatted dates
+ private boolean skipNumberDelimiter(final char c) {
+ if (pos < length - 1 && string.charAt(pos) == c
+ && Character.getType(string.charAt(pos + 1)) == DECIMAL_DIGIT_NUMBER) {
+ token = null;
+ pos++;
+ return true;
+ }
+ return false;
+ }
+
+ private boolean skipDelimiter(final char c) {
if (pos < length && string.charAt(pos) == c) {
token = null;
pos++;
@@ -452,14 +463,14 @@
switch (currentField) {
case YEAR:
case MONTH:
- return skip('-') || peek() == 'T' || peek() == -1;
+ return skipNumberDelimiter('-') || peek() == 'T' || peek() == -1;
case DAY:
return peek() == 'T' || peek() == -1;
case HOUR:
case MINUTE:
- return skip(':') || endOfTime();
+ return skipNumberDelimiter(':') || endOfTime();
case SECOND:
- return skip('.') || endOfTime();
+ return skipNumberDelimiter('.') || endOfTime();
default:
return true;
}
@@ -515,7 +526,7 @@
private int readTimeZoneOffset() {
final int sign = string.charAt(pos - 1) == '+' ? 1 : -1;
int offset = readNumber(2);
- skip(':');
+ skipDelimiter(':');
offset = offset * 60 + readNumber(2);
return sign * offset;
}
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java Fri Sep 06 15:09:44 2013 -0700
@@ -160,10 +160,10 @@
if (this.scripting) {
this.lineInfoReceiver = new Lexer.LineInfoReceiver() {
@Override
- public void lineInfo(final int line, final int linePosition) {
+ public void lineInfo(final int receiverLine, final int receiverLinePosition) {
// update the parser maintained line information
- Parser.this.line = line;
- Parser.this.linePosition = linePosition;
+ Parser.this.line = receiverLine;
+ Parser.this.linePosition = receiverLinePosition;
}
};
} else {
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java Fri Sep 06 15:09:44 2013 -0700
@@ -284,7 +284,7 @@
@Override
public String toString() {
- return name;
+ return getNameOrType();
}
static {
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java Fri Sep 06 15:09:44 2013 -0700
@@ -48,6 +48,7 @@
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.Map;
+
import jdk.internal.org.objectweb.asm.ClassReader;
import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
@@ -64,6 +65,36 @@
* This class manages the global state of execution. Context is immutable.
*/
public final class Context {
+ // nashorn specific security runtime access permission names
+ /**
+ * Permission needed to pass arbitrary nashorn command line options when creating Context.
+ */
+ public static final String NASHORN_SET_CONFIG = "nashorn.setConfig";
+
+ /**
+ * Permission needed to create Nashorn Context instance.
+ */
+ public static final String NASHORN_CREATE_CONTEXT = "nashorn.createContext";
+
+ /**
+ * Permission needed to create Nashorn Global instance.
+ */
+ public static final String NASHORN_CREATE_GLOBAL = "nashorn.createGlobal";
+
+ /**
+ * Permission to get current Nashorn Context from thread local storage.
+ */
+ public static final String NASHORN_GET_CONTEXT = "nashorn.getContext";
+
+ /**
+ * Permission to use Java reflection/jsr292 from script code.
+ */
+ public static final String NASHORN_JAVA_REFLECTION = "nashorn.JavaReflection";
+
+ /* Force DebuggerSupport to be loaded. */
+ static {
+ DebuggerSupport.FORCELOAD = true;
+ }
/**
* ContextCodeInstaller that has the privilege of installing classes in the Context.
@@ -139,7 +170,7 @@
public static Context getContext() {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkPermission(new RuntimePermission("nashorn.getContext"));
+ sm.checkPermission(new RuntimePermission(NASHORN_GET_CONTEXT));
}
return getContextTrusted();
}
@@ -204,7 +235,20 @@
private static final ClassLoader myLoader = Context.class.getClassLoader();
private static final StructureLoader sharedLoader;
- private static final AccessControlContext NO_PERMISSIONS_CONTEXT;
+
+ private static AccessControlContext createNoPermAccCtxt() {
+ return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, new Permissions()) });
+ }
+
+ private static AccessControlContext createPermAccCtxt(final String permName) {
+ final Permissions perms = new Permissions();
+ perms.add(new RuntimePermission(permName));
+ return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, perms) });
+ }
+
+ private static final AccessControlContext NO_PERMISSIONS_ACC_CTXT = createNoPermAccCtxt();
+ private static final AccessControlContext CREATE_LOADER_ACC_CTXT = createPermAccCtxt("createClassLoader");
+ private static final AccessControlContext CREATE_GLOBAL_ACC_CTXT = createPermAccCtxt(NASHORN_CREATE_GLOBAL);
static {
sharedLoader = AccessController.doPrivileged(new PrivilegedAction<StructureLoader>() {
@@ -212,8 +256,7 @@
public StructureLoader run() {
return new StructureLoader(myLoader, null);
}
- });
- NO_PERMISSIONS_CONTEXT = new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, new Permissions()) });
+ }, CREATE_LOADER_ACC_CTXT);
}
/**
@@ -254,7 +297,7 @@
public Context(final Options options, final ErrorManager errors, final PrintWriter out, final PrintWriter err, final ClassLoader appLoader) {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- sm.checkPermission(new RuntimePermission("nashorn.createContext"));
+ sm.checkPermission(new RuntimePermission(NASHORN_CREATE_CONTEXT));
}
this.env = new ScriptEnvironment(options, out, err);
@@ -516,7 +559,7 @@
@Override
public ScriptObject run() {
try {
- return createGlobal();
+ return newGlobal();
} catch (final RuntimeException e) {
if (Context.DEBUG) {
e.printStackTrace();
@@ -524,7 +567,9 @@
throw e;
}
}
- });
+ }, CREATE_GLOBAL_ACC_CTXT);
+ // initialize newly created Global instance
+ initGlobal(newGlobal);
setGlobalTrusted(newGlobal);
final Object[] wrapped = args == null? ScriptRuntime.EMPTY_ARRAY : ScriptObjectMirror.wrapArray(args, oldGlobal);
@@ -577,7 +622,7 @@
sm.checkPackageAccess(fullName.substring(0, index));
return null;
}
- }, NO_PERMISSIONS_CONTEXT);
+ }, NO_PERMISSIONS_ACC_CTXT);
}
}
}
@@ -856,7 +901,7 @@
public ScriptLoader run() {
return new ScriptLoader(sharedLoader, Context.this);
}
- });
+ }, CREATE_LOADER_ACC_CTXT);
}
private long getUniqueScriptId() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,330 @@
+/*
+ * 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 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 License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * This class provides support for external debuggers. Its primary purpose is
+ * is to simplify the debugger tasks and provide better performance.
+ */
+final class DebuggerSupport {
+ /**
+ * Hook to force the loading of the DebuggerSupport class so that it is
+ * available to external debuggers.
+ */
+ static boolean FORCELOAD = true;
+
+ static {
+ /**
+ * Hook to force the loading of the DebuggerValueDesc class so that it is
+ * available to external debuggers.
+ */
+ @SuppressWarnings("unused")
+ DebuggerValueDesc forceLoad = new DebuggerValueDesc(null, false, null, null);
+ }
+
+ /** This class is used to send a bulk description of a value. */
+ static class DebuggerValueDesc {
+ /** Property key (or index) or field name. */
+ final String key;
+
+ /** If the value is expandable. */
+ final boolean expandable;
+
+ /** Property or field value as object. */
+ final Object valueAsObject;
+
+ /** Property or field value as string. */
+ final String valueAsString;
+
+ DebuggerValueDesc(final String key, final boolean expandable, final Object valueAsObject, final String valueAsString) {
+ this.key = key;
+ this.expandable = expandable;
+ this.valueAsObject = valueAsObject;
+ this.valueAsString = valueAsString;
+ }
+ }
+
+ /**
+ * Return the current context global.
+ * @return context global.
+ */
+ static Object getGlobal() {
+ return Context.getGlobalTrusted();
+ }
+
+ /**
+ * Call eval on the current global.
+ * @param scope Scope to use.
+ * @param self Receiver to use.
+ * @param string String to evaluate.
+ * @param returnException true if exceptions are to be returned.
+ * @return Result of eval as string, or, an exception or null depending on returnException.
+ */
+ static Object eval(final ScriptObject scope, final Object self, final String string, final boolean returnException) {
+ final ScriptObject global = Context.getGlobalTrusted();
+ final ScriptObject initialScope = scope != null ? scope : global;
+ final Object callThis = self != null ? self : global;
+ final Context context = global.getContext();
+
+ try {
+ return context.eval(initialScope, string, callThis, ScriptRuntime.UNDEFINED, false);
+ } catch (Throwable ex) {
+ return returnException ? ex : null;
+ }
+ }
+
+ /**
+ * This method returns a bulk description of an object's properties.
+ * @param object Script object to be displayed by the debugger.
+ * @param all true if to include non-enumerable values.
+ * @return An array of DebuggerValueDesc.
+ */
+ static DebuggerValueDesc[] valueInfos(final Object object, final boolean all) {
+ assert object instanceof ScriptObject;
+ return getDebuggerValueDescs((ScriptObject)object, all, new HashSet<>());
+ }
+
+ /**
+ * This method returns a debugger description of the value.
+ * @param name Name of value (property name).
+ * @param value Data value.
+ * @param all true if to include non-enumerable values.
+ * @return A DebuggerValueDesc.
+ */
+ static DebuggerValueDesc valueInfo(final String name, final Object value, final boolean all) {
+ return valueInfo(name, value, all, new HashSet<>());
+ }
+
+ /**
+ * This method returns a debugger description of the value.
+ * @param name Name of value (property name).
+ * @param value Data value.
+ * @param all true if to include non-enumerable values.
+ * @param duplicates Duplication set to avoid cycles.
+ * @return A DebuggerValueDesc.
+ */
+ private static DebuggerValueDesc valueInfo(final String name, final Object value, final boolean all, final Set<Object> duplicates) {
+ if (value instanceof ScriptObject && !(value instanceof ScriptFunction)) {
+ final ScriptObject object = (ScriptObject)value;
+ return new DebuggerValueDesc(name, !object.isEmpty(), value, objectAsString(object, all, duplicates));
+ }
+ return new DebuggerValueDesc(name, false, value, valueAsString(value));
+ }
+
+ /**
+ * Generate the descriptions for an object's properties.
+ * @param object Object to introspect.
+ * @param all true if to include non-enumerable values.
+ * @param duplicates Duplication set to avoid cycles.
+ * @return An array of DebuggerValueDesc.
+ */
+ private static DebuggerValueDesc[] getDebuggerValueDescs(final ScriptObject object, final boolean all, final Set<Object> duplicates) {
+ if (duplicates.contains(object)) {
+ return null;
+ }
+
+ duplicates.add(object);
+
+ final String[] keys = object.getOwnKeys(all);
+ final DebuggerValueDesc[] descs = new DebuggerValueDesc[keys.length];
+
+ for (int i = 0; i < keys.length; i++) {
+ final String key = keys[i];
+ descs[i] = valueInfo(key, object.get(key), all, duplicates);
+ }
+
+ duplicates.remove(object);
+
+ return descs;
+ }
+
+ /**
+ * Generate a string representation of a Script object.
+ * @param object Script object to represent.
+ * @param all true if to include non-enumerable values.
+ * @param duplicates Duplication set to avoid cycles.
+ * @return String representation.
+ */
+ private static String objectAsString(final ScriptObject object, final boolean all, final Set<Object> duplicates) {
+ final StringBuilder sb = new StringBuilder();
+
+ if (ScriptObject.isArray(object)) {
+ sb.append('[');
+ final long length = object.getLong("length");
+
+ for (long i = 0; i < length; i++) {
+ if (object.has(i)) {
+ final Object valueAsObject = object.get(i);
+ final boolean isUndefined = JSType.of(valueAsObject) == JSType.UNDEFINED;
+
+ if (isUndefined) {
+ if (i != 0) {
+ sb.append(",");
+ }
+ } else {
+ if (i != 0) {
+ sb.append(", ");
+ }
+
+ if (valueAsObject instanceof ScriptObject && !(valueAsObject instanceof ScriptFunction)) {
+ final String objectString = objectAsString((ScriptObject)valueAsObject, all, duplicates);
+ sb.append(objectString != null ? objectString : "{...}");
+ } else {
+ sb.append(valueAsString(valueAsObject));
+ }
+ }
+ } else {
+ if (i != 0) {
+ sb.append(',');
+ }
+ }
+ }
+
+ sb.append(']');
+ } else {
+ sb.append('{');
+ final DebuggerValueDesc[] descs = getDebuggerValueDescs(object, all, duplicates);
+
+ if (descs != null) {
+ for (int i = 0; i < descs.length; i++) {
+ if (i != 0) {
+ sb.append(", ");
+ }
+
+ final String valueAsString = descs[i].valueAsString;
+ sb.append(descs[i].key);
+ sb.append(": ");
+ sb.append(valueAsString);
+ }
+ }
+
+ sb.append('}');
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * This method returns a string representation of a value.
+ * @param value Arbitrary value to be displayed by the debugger.
+ * @return A string representation of the value or an array of DebuggerValueDesc.
+ */
+ private static String valueAsString(final Object value) {
+ final JSType type = JSType.of(value);
+
+ switch (type) {
+ case BOOLEAN:
+ return value.toString();
+
+ case STRING:
+ return escape((String)value);
+
+ case NUMBER:
+ return JSType.toString(((Number)value).doubleValue());
+
+ case NULL:
+ return "null";
+
+ case UNDEFINED:
+ return "undefined";
+
+ case OBJECT:
+ return ScriptRuntime.safeToString(value);
+
+ case FUNCTION:
+ if (value instanceof ScriptFunction) {
+ return ((ScriptFunction)value).toSource();
+ }
+ return value.toString();
+
+ default:
+ return value.toString();
+ }
+ }
+
+ /**
+ * Escape a string into a form that can be parsed by JavaScript.
+ * @param value String to be escaped.
+ * @return Escaped string.
+ */
+ private static String escape(final String value) {
+ final StringBuilder sb = new StringBuilder();
+
+ sb.append("\"");
+
+ for (final char ch : value.toCharArray()) {
+ switch (ch) {
+ case '\\':
+ sb.append("\\\\");
+ break;
+ case '"':
+ sb.append("\\\"");
+ break;
+ case '\'':
+ sb.append("\\\'");
+ break;
+ case '\b':
+ sb.append("\\b");
+ break;
+ case '\f':
+ sb.append("\\f");
+ break;
+ case '\n':
+ sb.append("\\n");
+ break;
+ case '\r':
+ sb.append("\\r");
+ break;
+ case '\t':
+ sb.append("\\t");
+ break;
+ default:
+ if (ch < ' ' || ch >= 0xFF) {
+ sb.append("\\u");
+
+ final String hex = Integer.toHexString(ch);
+ for (int i = hex.length(); i < 4; i++) {
+ sb.append('0');
+ }
+ sb.append(hex);
+ } else {
+ sb.append(ch);
+ }
+
+ break;
+ }
+ }
+
+ sb.append("\"");
+
+ return sb.toString();
+ }
+}
+
+
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,8 +25,6 @@
package jdk.nashorn.internal.runtime;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -40,16 +38,9 @@
public final class ECMAErrors {
private static final String MESSAGES_RESOURCE = "jdk.nashorn.internal.runtime.resources.Messages";
- // Without do privileged, under security manager messages can not be loaded.
private static final ResourceBundle MESSAGES_BUNDLE;
static {
- MESSAGES_BUNDLE = AccessController.doPrivileged(
- new PrivilegedAction<ResourceBundle>() {
- @Override
- public ResourceBundle run() {
- return ResourceBundle.getBundle(MESSAGES_RESOURCE, Locale.getDefault());
- }
- });
+ MESSAGES_BUNDLE = ResourceBundle.getBundle(MESSAGES_RESOURCE, Locale.getDefault());
}
/** We assume that compiler generates script classes into the known package. */
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java Fri Sep 06 15:09:44 2013 -0700
@@ -26,8 +26,10 @@
package jdk.nashorn.internal.runtime;
import java.lang.invoke.MethodHandle;
+import java.util.concurrent.Callable;
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.nashorn.internal.runtime.linker.InvokeByName;
/**
* Runtime interface to the global scope objects.
@@ -210,4 +212,20 @@
* @param clazz compiled Class object for the source
*/
public void cacheClass(Source source, Class<?> clazz);
+
+ /**
+ * Get cached InvokeByName object for the given key
+ * @param key key to be associated with InvokeByName object
+ * @param creator if InvokeByName is absent 'creator' is called to make one (lazy init)
+ * @return InvokeByName object associated with the key.
+ */
+ public InvokeByName getInvokeByName(final Object key, final Callable<InvokeByName> creator);
+
+ /**
+ * Get cached dynamic method handle for the given key
+ * @param key key to be associated with dynamic method handle
+ * @param creator if method handle is absent 'creator' is called to make one (lazy init)
+ * @return dynamic method handle associated with the key.
+ */
+ public MethodHandle getDynamicInvoker(final Object key, final Callable<MethodHandle> creator);
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,6 +27,7 @@
import java.lang.invoke.MethodHandle;
import java.util.Iterator;
+import java.util.concurrent.Callable;
import jdk.nashorn.internal.ir.LiteralNode;
import jdk.nashorn.internal.ir.Node;
import jdk.nashorn.internal.ir.ObjectNode;
@@ -42,8 +43,19 @@
*/
public final class JSONFunctions {
private JSONFunctions() {}
- private static final MethodHandle REVIVER_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
- ScriptFunction.class, ScriptObject.class, String.class, Object.class);
+
+ private static final Object REVIVER_INVOKER = new Object();
+
+ private static MethodHandle getREVIVER_INVOKER() {
+ return ((GlobalObject)Context.getGlobal()).getDynamicInvoker(REVIVER_INVOKER,
+ new Callable<MethodHandle>() {
+ @Override
+ public MethodHandle call() {
+ return Bootstrap.createDynamicInvoker("dyn:call", Object.class,
+ ScriptFunction.class, ScriptObject.class, String.class, Object.class);
+ }
+ });
+ }
/**
* Returns JSON-compatible quoted version of the given string.
@@ -117,7 +129,7 @@
try {
// Object.class, ScriptFunction.class, ScriptObject.class, String.class, Object.class);
- return REVIVER_INVOKER.invokeExact(reviver, holder, JSType.toString(name), val);
+ return getREVIVER_INVOKER().invokeExact(reviver, holder, JSType.toString(name), val);
} catch(Error|RuntimeException t) {
throw t;
} catch(final Throwable t) {
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,12 +28,12 @@
import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import java.lang.invoke.MethodHandles;
import java.util.Locale;
-import jdk.internal.dynalink.beans.BeansLinker;
import jdk.internal.dynalink.beans.StaticClass;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
import jdk.nashorn.internal.codegen.CompilerConstants.Call;
import jdk.nashorn.internal.parser.Lexer;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
/**
* Representation for ECMAScript types - this maps directly to the ECMA script standard
@@ -63,47 +63,49 @@
/** Max value for an uint32 in JavaScript */
public static final long MAX_UINT = 0xFFFF_FFFFL;
+ private static final MethodHandles.Lookup myLookup = MethodHandles.lookup();
+
/** JavaScript compliant conversion function from Object to boolean */
- public static final Call TO_BOOLEAN = staticCall(JSType.class, "toBoolean", boolean.class, Object.class);
+ public static final Call TO_BOOLEAN = staticCall(myLookup, JSType.class, "toBoolean", boolean.class, Object.class);
/** JavaScript compliant conversion function from number to boolean */
- public static final Call TO_BOOLEAN_D = staticCall(JSType.class, "toBoolean", boolean.class, double.class);
+ public static final Call TO_BOOLEAN_D = staticCall(myLookup, JSType.class, "toBoolean", boolean.class, double.class);
/** JavaScript compliant conversion function from Object to integer */
- public static final Call TO_INTEGER = staticCall(JSType.class, "toInteger", int.class, Object.class);
+ public static final Call TO_INTEGER = staticCall(myLookup, JSType.class, "toInteger", int.class, Object.class);
/** JavaScript compliant conversion function from Object to long */
- public static final Call TO_LONG = staticCall(JSType.class, "toLong", long.class, Object.class);
+ public static final Call TO_LONG = staticCall(myLookup, JSType.class, "toLong", long.class, Object.class);
/** JavaScript compliant conversion function from Object to number */
- public static final Call TO_NUMBER = staticCall(JSType.class, "toNumber", double.class, Object.class);
+ public static final Call TO_NUMBER = staticCall(myLookup, JSType.class, "toNumber", double.class, Object.class);
/** JavaScript compliant conversion function from Object to int32 */
- public static final Call TO_INT32 = staticCall(JSType.class, "toInt32", int.class, Object.class);
+ public static final Call TO_INT32 = staticCall(myLookup, JSType.class, "toInt32", int.class, Object.class);
/** JavaScript compliant conversion function from double to int32 */
- public static final Call TO_INT32_D = staticCall(JSType.class, "toInt32", int.class, double.class);
+ public static final Call TO_INT32_D = staticCall(myLookup, JSType.class, "toInt32", int.class, double.class);
/** JavaScript compliant conversion function from Object to uint32 */
- public static final Call TO_UINT32 = staticCall(JSType.class, "toUint32", long.class, Object.class);
+ public static final Call TO_UINT32 = staticCall(myLookup, JSType.class, "toUint32", long.class, Object.class);
/** JavaScript compliant conversion function from number to uint32 */
- public static final Call TO_UINT32_D = staticCall(JSType.class, "toUint32", long.class, double.class);
+ public static final Call TO_UINT32_D = staticCall(myLookup, JSType.class, "toUint32", long.class, double.class);
/** JavaScript compliant conversion function from Object to int64 */
- public static final Call TO_INT64 = staticCall(JSType.class, "toInt64", long.class, Object.class);
+ public static final Call TO_INT64 = staticCall(myLookup, JSType.class, "toInt64", long.class, Object.class);
/** JavaScript compliant conversion function from number to int64 */
- public static final Call TO_INT64_D = staticCall(JSType.class, "toInt64", long.class, double.class);
+ public static final Call TO_INT64_D = staticCall(myLookup, JSType.class, "toInt64", long.class, double.class);
/** JavaScript compliant conversion function from Object to String */
- public static final Call TO_STRING = staticCall(JSType.class, "toString", String.class, Object.class);
+ public static final Call TO_STRING = staticCall(myLookup, JSType.class, "toString", String.class, Object.class);
/** JavaScript compliant conversion function from number to String */
- public static final Call TO_STRING_D = staticCall(JSType.class, "toString", String.class, double.class);
+ public static final Call TO_STRING_D = staticCall(myLookup, JSType.class, "toString", String.class, double.class);
/** JavaScript compliant conversion function from Object to primitive */
- public static final Call TO_PRIMITIVE = staticCall(JSType.class, "toPrimitive", Object.class, Object.class);
+ public static final Call TO_PRIMITIVE = staticCall(myLookup, JSType.class, "toPrimitive", Object.class, Object.class);
private static final double INT32_LIMIT = 4294967296.0;
@@ -145,22 +147,10 @@
return JSType.STRING;
}
- if (obj instanceof ScriptObject) {
- return (obj instanceof ScriptFunction) ? JSType.FUNCTION : JSType.OBJECT;
- }
-
- if (obj instanceof StaticClass) {
+ if (Bootstrap.isCallable(obj)) {
return JSType.FUNCTION;
}
- if (BeansLinker.isDynamicMethod(obj)) {
- return JSType.FUNCTION;
- }
-
- if (obj instanceof ScriptObjectMirror) {
- return ((ScriptObjectMirror)obj).isFunction()? JSType.FUNCTION : JSType.OBJECT;
- }
-
return JSType.OBJECT;
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,6 +31,7 @@
import java.util.ListIterator;
import java.util.NoSuchElementException;
import java.util.RandomAccess;
+import java.util.concurrent.Callable;
import jdk.nashorn.internal.runtime.linker.Bootstrap;
import jdk.nashorn.internal.runtime.linker.InvokeByName;
@@ -49,16 +50,73 @@
*/
public final class ListAdapter extends AbstractList<Object> implements RandomAccess, Deque<Object> {
// These add to the back and front of the list
- private static final InvokeByName PUSH = new InvokeByName("push", ScriptObject.class, void.class, Object.class);
- private static final InvokeByName UNSHIFT = new InvokeByName("unshift", ScriptObject.class, void.class, Object.class);
+ private static final Object PUSH = new Object();
+ private static InvokeByName getPUSH() {
+ return ((GlobalObject)Context.getGlobal()).getInvokeByName(PUSH,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("push", ScriptObject.class, void.class, Object.class);
+ }
+ });
+ }
+
+ private static final Object UNSHIFT = new Object();
+ private static InvokeByName getUNSHIFT() {
+ return ((GlobalObject)Context.getGlobal()).getInvokeByName(UNSHIFT,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("unshift", ScriptObject.class, void.class, Object.class);
+ }
+ });
+ }
// These remove from the back and front of the list
- private static final InvokeByName POP = new InvokeByName("pop", ScriptObject.class, Object.class);
- private static final InvokeByName SHIFT = new InvokeByName("shift", ScriptObject.class, Object.class);
+ private static final Object POP = new Object();
+ private static InvokeByName getPOP() {
+ return ((GlobalObject)Context.getGlobal()).getInvokeByName(POP,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("pop", ScriptObject.class, Object.class);
+ }
+ });
+ }
+
+ private static final Object SHIFT = new Object();
+ private static InvokeByName getSHIFT() {
+ return ((GlobalObject)Context.getGlobal()).getInvokeByName(SHIFT,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("shift", ScriptObject.class, Object.class);
+ }
+ });
+ }
// These insert and remove in the middle of the list
- private static final InvokeByName SPLICE_ADD = new InvokeByName("splice", ScriptObject.class, void.class, int.class, int.class, Object.class);
- private static final InvokeByName SPLICE_REMOVE = new InvokeByName("splice", ScriptObject.class, void.class, int.class, int.class);
+ private static final Object SPLICE_ADD = new Object();
+ private static InvokeByName getSPLICE_ADD() {
+ return ((GlobalObject)Context.getGlobal()).getInvokeByName(SPLICE_ADD,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("splice", ScriptObject.class, void.class, int.class, int.class, Object.class);
+ }
+ });
+ }
+
+ private static final Object SPLICE_REMOVE = new Object();
+ private static InvokeByName getSPLICE_REMOVE() {
+ return ((GlobalObject)Context.getGlobal()).getInvokeByName(SPLICE_REMOVE,
+ new Callable<InvokeByName>() {
+ @Override
+ public InvokeByName call() {
+ return new InvokeByName("splice", ScriptObject.class, void.class, int.class, int.class);
+ }
+ });
+ }
private final ScriptObject obj;
@@ -109,9 +167,10 @@
@Override
public void addFirst(Object e) {
try {
- final Object fn = UNSHIFT.getGetter().invokeExact(obj);
- checkFunction(fn, UNSHIFT);
- UNSHIFT.getInvoker().invokeExact(fn, obj, e);
+ final InvokeByName unshiftInvoker = getUNSHIFT();
+ final Object fn = unshiftInvoker.getGetter().invokeExact(obj);
+ checkFunction(fn, unshiftInvoker);
+ unshiftInvoker.getInvoker().invokeExact(fn, obj, e);
} catch(RuntimeException | Error ex) {
throw ex;
} catch(Throwable t) {
@@ -122,9 +181,10 @@
@Override
public void addLast(Object e) {
try {
- final Object fn = PUSH.getGetter().invokeExact(obj);
- checkFunction(fn, PUSH);
- PUSH.getInvoker().invokeExact(fn, obj, e);
+ final InvokeByName pushInvoker = getPUSH();
+ final Object fn = pushInvoker.getGetter().invokeExact(obj);
+ checkFunction(fn, pushInvoker);
+ pushInvoker.getInvoker().invokeExact(fn, obj, e);
} catch(RuntimeException | Error ex) {
throw ex;
} catch(Throwable t) {
@@ -142,9 +202,10 @@
} else {
final int size = size();
if(index < size) {
- final Object fn = SPLICE_ADD.getGetter().invokeExact(obj);
- checkFunction(fn, SPLICE_ADD);
- SPLICE_ADD.getInvoker().invokeExact(fn, obj, index, 0, e);
+ final InvokeByName spliceAddInvoker = getSPLICE_ADD();
+ final Object fn = spliceAddInvoker.getGetter().invokeExact(obj);
+ checkFunction(fn, spliceAddInvoker);
+ spliceAddInvoker.getInvoker().invokeExact(fn, obj, index, 0, e);
} else if(index == size) {
addLast(e);
} else {
@@ -234,9 +295,10 @@
private Object invokeShift() {
try {
- final Object fn = SHIFT.getGetter().invokeExact(obj);
- checkFunction(fn, SHIFT);
- return SHIFT.getInvoker().invokeExact(fn, obj);
+ final InvokeByName shiftInvoker = getSHIFT();
+ final Object fn = shiftInvoker.getGetter().invokeExact(obj);
+ checkFunction(fn, shiftInvoker);
+ return shiftInvoker.getInvoker().invokeExact(fn, obj);
} catch(RuntimeException | Error ex) {
throw ex;
} catch(Throwable t) {
@@ -246,9 +308,10 @@
private Object invokePop() {
try {
- final Object fn = POP.getGetter().invokeExact(obj);
- checkFunction(fn, POP);
- return POP.getInvoker().invokeExact(fn, obj);
+ final InvokeByName popInvoker = getPOP();
+ final Object fn = popInvoker.getGetter().invokeExact(obj);
+ checkFunction(fn, popInvoker);
+ return popInvoker.getInvoker().invokeExact(fn, obj);
} catch(RuntimeException | Error ex) {
throw ex;
} catch(Throwable t) {
@@ -263,9 +326,10 @@
private void invokeSpliceRemove(int fromIndex, int count) {
try {
- final Object fn = SPLICE_REMOVE.getGetter().invokeExact(obj);
- checkFunction(fn, SPLICE_REMOVE);
- SPLICE_REMOVE.getInvoker().invokeExact(fn, obj, fromIndex, count);
+ final InvokeByName spliceRemoveInvoker = getSPLICE_REMOVE();
+ final Object fn = spliceRemoveInvoker.getGetter().invokeExact(obj);
+ checkFunction(fn, spliceRemoveInvoker);
+ spliceRemoveInvoker.getInvoker().invokeExact(fn, obj, fromIndex, count);
} catch(RuntimeException | Error ex) {
throw ex;
} catch(Throwable t) {
--- a/nashorn/src/jdk/nashorn/internal/runtime/Logging.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,6 +25,11 @@
package jdk.nashorn.internal.runtime;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -35,6 +40,7 @@
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
+import java.util.logging.LoggingPermission;
/**
* Logging system for getting loggers for arbitrary subsystems as
@@ -50,12 +56,20 @@
private static final Logger disabledLogger = Logger.getLogger("disabled");
+ private static AccessControlContext createLoggerControlAccCtxt() {
+ final Permissions perms = new Permissions();
+ perms.add(new LoggingPermission("control", null));
+ return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, perms) });
+ }
+
static {
- try {
- Logging.disabledLogger.setLevel(Level.OFF);
- } catch (final SecurityException e) {
- //ignored
- }
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
+ public Void run() {
+ Logging.disabledLogger.setLevel(Level.OFF);
+ return null;
+ }
+ }, createLoggerControlAccCtxt());
}
/** Maps logger name to loggers. Names are typically per package */
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java Fri Sep 06 15:09:44 2013 -0700
@@ -54,4 +54,13 @@
*
*/
public void propertyModified(ScriptObject object, Property oldProp, Property newProp);
+
+ /**
+ * Given object's __proto__ has changed.
+ *
+ * @param object object whose __proto__ has changed.
+ * @param oldProto old __proto__
+ * @param newProto new __proto__
+ */
+ public void protoChanged(ScriptObject object, ScriptObject oldProto, ScriptObject newProto);
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java Fri Sep 06 15:09:44 2013 -0700
@@ -140,6 +140,21 @@
}
}
+ /**
+ * This method can be called to notify __proto__ modification to this object's listeners.
+ *
+ * @param object The ScriptObject whose __proto__ was changed.
+ * @param oldProto old __proto__
+ * @param newProto new __proto__
+ */
+ protected synchronized final void notifyProtoChanged(final ScriptObject object, final ScriptObject oldProto, final ScriptObject newProto) {
+ if (listeners != null) {
+ for (PropertyListener listener : listeners.keySet()) {
+ listener.protoChanged(object, oldProto, newProto);
+ }
+ }
+ }
+
// PropertyListener methods
@Override
@@ -156,4 +171,9 @@
public final void propertyModified(final ScriptObject object, final Property oldProp, final Property newProp) {
notifyPropertyModified(object, oldProp, newProp);
}
+
+ @Override
+ public final void protoChanged(final ScriptObject object, final ScriptObject oldProto, final ScriptObject newProto) {
+ notifyProtoChanged(object, oldProto, newProto);
+ }
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java Fri Sep 06 15:09:44 2013 -0700
@@ -230,7 +230,7 @@
}
/**
- * Indicate that a prototype property hash changed.
+ * Indicate that a prototype property has changed.
*
* @param property {@link Property} to invalidate.
*/
@@ -251,6 +251,18 @@
}
/**
+ * Indicate that proto itself has changed in hierachy somewhere.
+ */
+ private void invalidateAllProtoGetSwitchPoints() {
+ assert !isShared() : "proto invalidation on a shared PropertyMap";
+
+ if (protoGetSwitches != null) {
+ final Collection<SwitchPoint> sws = protoGetSwitches.values();
+ SwitchPoint.invalidateAll(sws.toArray(new SwitchPoint[sws.size()]));
+ }
+ }
+
+ /**
* Add a property to the map, re-binding its getters and setters,
* if available, to a given receiver. This is typically the global scope. See
* {@link ScriptObject#addBoundProperties(ScriptObject)}
@@ -878,6 +890,15 @@
invalidateProtoGetSwitchPoint(oldProp);
}
+ @Override
+ public void protoChanged(final ScriptObject object, final ScriptObject oldProto, final ScriptObject newProto) {
+ // We may walk and invalidate SwitchPoints for properties inherited
+ // from 'object' or it's old proto chain. But, it may not be worth it.
+ // For example, a new proto may have a user defined getter/setter for
+ // a data property down the chain. So, invalidating all is better.
+ invalidateAllProtoGetSwitchPoints();
+ }
+
/*
* Debugging and statistics.
*/
--- a/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java Fri Sep 06 15:09:44 2013 -0700
@@ -47,18 +47,24 @@
* This is a subclass that represents a script function that may be regenerated,
* for example with specialization based on call site types, or lazily generated.
* The common denominator is that it can get new invokers during its lifespan,
- * unlike {@link FinalScriptFunctionData}
+ * unlike {@code FinalScriptFunctionData}
*/
public final class RecompilableScriptFunctionData extends ScriptFunctionData {
/** FunctionNode with the code for this ScriptFunction */
- private FunctionNode functionNode;
+ private volatile FunctionNode functionNode;
+
+ /** Source from which FunctionNode was parsed. */
+ private final Source source;
+
+ /** Token of this function within the source. */
+ private final long token;
/** Allocator map from makeMap() */
private final PropertyMap allocatorMap;
/** Code installer used for all further recompilation/specialization of this ScriptFunction */
- private final CodeInstaller<ScriptEnvironment> installer;
+ private volatile CodeInstaller<ScriptEnvironment> installer;
/** Name of class where allocator function resides */
private final String allocatorClassName;
@@ -103,6 +109,8 @@
true);
this.functionNode = functionNode;
+ this.source = functionNode.getSource();
+ this.token = tokenFor(functionNode);
this.installer = installer;
this.allocatorClassName = allocatorClassName;
this.allocatorMap = allocatorMap;
@@ -110,9 +118,6 @@
@Override
String toSource() {
- final Source source = functionNode.getSource();
- final long token = tokenFor(functionNode);
-
if (source != null && token != 0) {
return source.getString(Token.descPosition(token), Token.descLength(token));
}
@@ -123,8 +128,6 @@
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
- final Source source = functionNode.getSource();
- final long token = tokenFor(functionNode);
if (source != null) {
sb.append(source.getName())
@@ -190,6 +193,12 @@
// code exists - look it up and add it into the automatically sorted invoker list
addCode(functionNode);
+
+ if (! functionNode.canSpecialize()) {
+ // allow GC to claim IR stuff that is not needed anymore
+ functionNode = null;
+ installer = null;
+ }
}
private MethodHandle addCode(final FunctionNode fn) {
@@ -325,7 +334,7 @@
* footprint too large to store a parse snapshot, or if it is meaningless
* to do so, such as e.g. for runScript
*/
- if (!functionNode.canSpecialize()) {
+ if (functionNode == null || !functionNode.canSpecialize()) {
return mh;
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java Fri Sep 06 15:09:44 2013 -0700
@@ -86,6 +86,9 @@
/** Launch using as fx application */
public final boolean _fx;
+ /** Use single Global instance per jsr223 engine instance. */
+ public final boolean _global_per_engine;
+
/**
* Behavior when encountering a function declaration in a lexical context where only statements are acceptable
* (function declarations are source elements, but not statements).
@@ -128,9 +131,6 @@
/** Do not support typed arrays. */
public final boolean _no_typed_arrays;
- /** Package to which generated class files are added */
- public final String _package;
-
/** Only parse the source code, do not compile */
public final boolean _parse_only;
@@ -211,12 +211,12 @@
_function_statement = FunctionStatementBehavior.ACCEPT;
}
_fx = options.getBoolean("fx");
+ _global_per_engine = options.getBoolean("global.per.engine");
_lazy_compilation = options.getBoolean("lazy.compilation");
_loader_per_compile = options.getBoolean("loader.per.compile");
_no_java = options.getBoolean("no.java");
_no_syntax_extensions = options.getBoolean("no.syntax.extensions");
_no_typed_arrays = options.getBoolean("no.typed.arrays");
- _package = options.getString("package");
_parse_only = options.getBoolean("parse.only");
_print_ast = options.getBoolean("print.ast");
_print_lower_ast = options.getBoolean("print.lower.ast");
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java Fri Sep 06 15:09:44 2013 -0700
@@ -496,32 +496,24 @@
MethodHandle boundHandle;
MethodHandle guard = null;
+ final boolean scopeCall = NashornCallSiteDescriptor.isScope(desc);
+
if (data.needsCallee()) {
final MethodHandle callHandle = getBestInvoker(type, request.getArguments());
- if (NashornCallSiteDescriptor.isScope(desc)) {
+ if (scopeCall) {
// Make a handle that drops the passed "this" argument and substitutes either Global or Undefined
// (callee, this, args...) => (callee, args...)
boundHandle = MH.insertArguments(callHandle, 1, needsWrappedThis() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
// (callee, args...) => (callee, [this], args...)
boundHandle = MH.dropArguments(boundHandle, 1, Object.class);
+
} else {
// It's already (callee, this, args...), just what we need
boundHandle = callHandle;
-
- // For non-strict functions, check whether this-object is primitive type.
- // If so add a to-object-wrapper argument filter.
- // Else install a guard that will trigger a relink when the argument becomes primitive.
- if (needsWrappedThis()) {
- if (ScriptFunctionData.isPrimitiveThis(request.getArguments()[1])) {
- boundHandle = MH.filterArguments(boundHandle, 1, WRAPFILTER);
- } else {
- guard = getNonStrictFunctionGuard(this);
- }
- }
}
} else {
final MethodHandle callHandle = getBestInvoker(type.dropParameterTypes(0, 1), request.getArguments());
- if (NashornCallSiteDescriptor.isScope(desc)) {
+ if (scopeCall) {
// Make a handle that drops the passed "this" argument and substitutes either Global or Undefined
// (this, args...) => (args...)
boundHandle = MH.bindTo(callHandle, needsWrappedThis() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
@@ -533,6 +525,17 @@
}
}
+ // For non-strict functions, check whether this-object is primitive type.
+ // If so add a to-object-wrapper argument filter.
+ // Else install a guard that will trigger a relink when the argument becomes primitive.
+ if (!scopeCall && needsWrappedThis()) {
+ if (ScriptFunctionData.isPrimitiveThis(request.getArguments()[1])) {
+ boundHandle = MH.filterArguments(boundHandle, 1, WRAPFILTER);
+ } else {
+ guard = getNonStrictFunctionGuard(this);
+ }
+ }
+
boundHandle = pairArguments(boundHandle, type);
return new GuardedInvocation(boundHandle, guard == null ? getFunctionGuard(this) : guard);
@@ -550,19 +553,18 @@
private static MethodHandle bindToNameIfNeeded(final MethodHandle methodHandle, final String bindName) {
if (bindName == null) {
return methodHandle;
- } else {
- // if it is vararg method, we need to extend argument array with
- // a new zeroth element that is set to bindName value.
- final MethodType methodType = methodHandle.type();
- final int parameterCount = methodType.parameterCount();
- final boolean isVarArg = parameterCount > 0 && methodType.parameterType(parameterCount - 1).isArray();
+ }
- if (isVarArg) {
- return MH.filterArguments(methodHandle, 1, MH.insertArguments(ADD_ZEROTH_ELEMENT, 1, bindName));
- } else {
- return MH.insertArguments(methodHandle, 1, bindName);
- }
+ // if it is vararg method, we need to extend argument array with
+ // a new zeroth element that is set to bindName value.
+ final MethodType methodType = methodHandle.type();
+ final int parameterCount = methodType.parameterCount();
+ final boolean isVarArg = parameterCount > 0 && methodType.parameterType(parameterCount - 1).isArray();
+
+ if (isVarArg) {
+ return MH.filterArguments(methodHandle, 1, MH.insertArguments(ADD_ZEROTH_ELEMENT, 1, bindName));
}
+ return MH.insertArguments(methodHandle, 1, bindName);
}
/**
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java Fri Sep 06 15:09:44 2013 -0700
@@ -250,9 +250,18 @@
final int length = args == null ? 0 : args.length;
CompiledFunctions boundList = new CompiledFunctions();
- for (final CompiledFunction inv : code) {
+ if (code.size() == 1) {
+ // only one variant - bind that
+ boundList.add(bind(code.first(), fn, self, allArgs));
+ } else {
+ // There are specialized versions. Get the most generic one.
+ // This is to avoid ambiguous overloaded versions of bound and
+ // specialized variants and choosing wrong overload.
+ final MethodHandle genInvoker = getGenericInvoker();
+ final CompiledFunction inv = new CompiledFunction(genInvoker.type(), genInvoker, getGenericConstructor());
boundList.add(bind(inv, fn, self, allArgs));
}
+
ScriptFunctionData boundData = new FinalScriptFunctionData(name, arity == -1 ? -1 : Math.max(0, arity - length), boundList, isStrict(), isBuiltin(), isConstructor());
return boundData;
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java Fri Sep 06 15:09:44 2013 -0700
@@ -52,6 +52,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import jdk.internal.dynalink.CallSiteDescriptor;
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.linker.LinkRequest;
@@ -138,10 +139,10 @@
private static final MethodHandle KNOWNFUNCPROPGUARD = findOwnMH("knownFunctionPropertyGuard", boolean.class, Object.class, PropertyMap.class, MethodHandle.class, Object.class, ScriptFunction.class);
/** Method handle for getting a function argument at a given index. Used from MapCreator */
- public static final Call GET_ARGUMENT = virtualCall(ScriptObject.class, "getArgument", Object.class, int.class);
+ public static final Call GET_ARGUMENT = virtualCall(MethodHandles.lookup(), ScriptObject.class, "getArgument", Object.class, int.class);
/** Method handle for setting a function argument at a given index. Used from MapCreator */
- public static final Call SET_ARGUMENT = virtualCall(ScriptObject.class, "setArgument", void.class, int.class, Object.class);
+ public static final Call SET_ARGUMENT = virtualCall(MethodHandles.lookup(), ScriptObject.class, "setArgument", void.class, int.class, Object.class);
/** Method handle for getting the proto of a ScriptObject */
public static final Call GET_PROTO = virtualCallNoLookup(ScriptObject.class, "getProto", ScriptObject.class);
@@ -150,7 +151,7 @@
public static final Call SET_PROTO = virtualCallNoLookup(ScriptObject.class, "setProto", void.class, ScriptObject.class);
/** Method handle for setting the user accessors of a ScriptObject */
- public static final Call SET_USER_ACCESSORS = virtualCall(ScriptObject.class, "setUserAccessors", void.class, String.class, ScriptFunction.class, ScriptFunction.class);
+ public static final Call SET_USER_ACCESSORS = virtualCall(MethodHandles.lookup(), ScriptObject.class, "setUserAccessors", void.class, String.class, ScriptFunction.class, ScriptFunction.class);
/**
* Constructor
@@ -1008,10 +1009,6 @@
return getMap().findProperty(key);
}
- static String convertKey(final Object key) {
- return (key instanceof String) ? (String)key : JSType.toString(key);
- }
-
/**
* Overridden by {@link jdk.nashorn.internal.objects.NativeArguments} class (internal use.)
* Used for argument access in a vararg function using parameter name.
@@ -1129,6 +1126,9 @@
proto = newProto;
if (isPrototype()) {
+ // tell listeners that my __proto__ has been changed
+ notifyProtoChanged(this, oldProto, newProto);
+
if (oldProto != null) {
oldProto.removePropertyListener(this);
}
@@ -1144,7 +1144,19 @@
* @param newProto Prototype to set.
*/
public final void setProtoCheck(final Object newProto) {
+ if (!isExtensible()) {
+ throw typeError("__proto__.set.non.extensible", ScriptRuntime.safeToString(this));
+ }
+
if (newProto == null || newProto instanceof ScriptObject) {
+ // check for circularity
+ ScriptObject p = (ScriptObject)newProto;
+ while (p != null) {
+ if (p == this) {
+ throw typeError("circular.__proto__.set", ScriptRuntime.safeToString(this));
+ }
+ p = p.getProto();
+ }
setProto((ScriptObject)newProto);
} else {
final ScriptObject global = Context.getGlobalTrusted();
@@ -2006,15 +2018,17 @@
* @param request the link request
* @return GuardedInvocation to be invoked at call site.
*/
+ @SuppressWarnings("null")
public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc, final LinkRequest request) {
final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
final FindProperty find = findProperty(NO_SUCH_PROPERTY_NAME, true);
final boolean scopeAccess = isScope() && NashornCallSiteDescriptor.isScope(desc);
if (find != null) {
- final Object value = getObjectValue(find);
- ScriptFunction func = null;
- MethodHandle methodHandle = null;
+ final Object value = getObjectValue(find);
+ ScriptFunction func = null;
+ MethodHandle methodHandle = null;
+
if (value instanceof ScriptFunction) {
func = (ScriptFunction)value;
methodHandle = getCallMethodHandle(func, desc.getMethodType(), name);
@@ -2358,7 +2372,7 @@
return array.getInt(index);
}
- return getInt(index, convertKey(key));
+ return getInt(index, JSType.toString(key));
}
@Override
@@ -2370,7 +2384,7 @@
return array.getInt(index);
}
- return getInt(index, convertKey(key));
+ return getInt(index, JSType.toString(key));
}
@Override
@@ -2382,7 +2396,7 @@
return array.getInt(index);
}
- return getInt(index, convertKey(key));
+ return getInt(index, JSType.toString(key));
}
@Override
@@ -2393,7 +2407,7 @@
return array.getInt(key);
}
- return getInt(key, convertKey(key));
+ return getInt(key, JSType.toString(key));
}
private long getLong(final int index, final String key) {
@@ -2435,7 +2449,7 @@
return array.getLong(index);
}
- return getLong(index, convertKey(key));
+ return getLong(index, JSType.toString(key));
}
@Override
@@ -2447,7 +2461,7 @@
return array.getLong(index);
}
- return getLong(index, convertKey(key));
+ return getLong(index, JSType.toString(key));
}
@Override
@@ -2459,7 +2473,7 @@
return array.getLong(index);
}
- return getLong(index, convertKey(key));
+ return getLong(index, JSType.toString(key));
}
@Override
@@ -2470,7 +2484,7 @@
return array.getLong(key);
}
- return getLong(key, convertKey(key));
+ return getLong(key, JSType.toString(key));
}
private double getDouble(final int index, final String key) {
@@ -2512,7 +2526,7 @@
return array.getDouble(index);
}
- return getDouble(index, convertKey(key));
+ return getDouble(index, JSType.toString(key));
}
@Override
@@ -2524,7 +2538,7 @@
return array.getDouble(index);
}
- return getDouble(index, convertKey(key));
+ return getDouble(index, JSType.toString(key));
}
@Override
@@ -2536,7 +2550,7 @@
return array.getDouble(index);
}
- return getDouble(index, convertKey(key));
+ return getDouble(index, JSType.toString(key));
}
@Override
@@ -2547,7 +2561,7 @@
return array.getDouble(key);
}
- return getDouble(key, convertKey(key));
+ return getDouble(key, JSType.toString(key));
}
private Object get(final int index, final String key) {
@@ -2589,7 +2603,7 @@
return array.getObject(index);
}
- return get(index, convertKey(key));
+ return get(index, JSType.toString(key));
}
@Override
@@ -2601,7 +2615,7 @@
return array.getObject(index);
}
- return get(index, convertKey(key));
+ return get(index, JSType.toString(key));
}
@Override
@@ -2613,7 +2627,7 @@
return array.getObject(index);
}
- return get(index, convertKey(key));
+ return get(index, JSType.toString(key));
}
@Override
@@ -2624,7 +2638,7 @@
return array.getObject(key);
}
- return get(key, convertKey(key));
+ return get(key, JSType.toString(key));
}
/**
@@ -2639,7 +2653,7 @@
final long longIndex = index & JSType.MAX_UINT;
if (!getArray().has(index)) {
- final String key = convertKey(longIndex);
+ final String key = JSType.toString(longIndex);
final FindProperty find = findProperty(key, true);
if (find != null) {
@@ -2785,7 +2799,7 @@
return;
}
- final String propName = convertKey(key);
+ final String propName = JSType.toString(key);
final FindProperty find = findProperty(propName, true);
setObject(find, strict, propName, value);
@@ -3007,7 +3021,7 @@
}
}
- final FindProperty find = findProperty(convertKey(key), true);
+ final FindProperty find = findProperty(JSType.toString(key), true);
return find != null;
}
@@ -3024,7 +3038,7 @@
}
}
- final FindProperty find = findProperty(convertKey(key), true);
+ final FindProperty find = findProperty(JSType.toString(key), true);
return find != null;
}
@@ -3041,7 +3055,7 @@
}
}
- final FindProperty find = findProperty(convertKey(key), true);
+ final FindProperty find = findProperty(JSType.toString(key), true);
return find != null;
}
@@ -3058,7 +3072,7 @@
}
}
- final FindProperty find = findProperty(convertKey(key), true);
+ final FindProperty find = findProperty(JSType.toString(key), true);
return find != null;
}
@@ -3071,7 +3085,7 @@
return true;
}
- final FindProperty find = findProperty(convertKey(key), false);
+ final FindProperty find = findProperty(JSType.toString(key), false);
return find != null;
}
@@ -3084,7 +3098,7 @@
return true;
}
- final FindProperty find = findProperty(convertKey(key), false);
+ final FindProperty find = findProperty(JSType.toString(key), false);
return find != null;
}
@@ -3097,7 +3111,7 @@
return true;
}
- final FindProperty find = findProperty(convertKey(key), false);
+ final FindProperty find = findProperty(JSType.toString(key), false);
return find != null;
}
@@ -3110,7 +3124,7 @@
return true;
}
- final FindProperty find = findProperty(convertKey(key), false);
+ final FindProperty find = findProperty(JSType.toString(key), false);
return find != null;
}
@@ -3180,7 +3194,7 @@
}
private boolean deleteObject(final Object key, final boolean strict) {
- final String propName = convertKey(key);
+ final String propName = JSType.toString(key);
final FindProperty find = findProperty(propName, false);
if (find == null) {
@@ -3219,6 +3233,11 @@
return property;
}
+ /**
+ * Write a value to a spill slot
+ * @param slot the slot index
+ * @param value the value
+ */
protected final void setSpill(final int slot, final Object value) {
if (spill == null) {
// create new spill.
@@ -3233,6 +3252,11 @@
spill[slot] = value;
}
+ /**
+ * Get a value from a spill slot
+ * @param slot the slot index
+ * @return the value in the spill slot with the given index
+ */
protected Object getSpill(final int slot) {
return spill != null && slot < spill.length ? spill[slot] : null;
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,10 +33,13 @@
import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Array;
import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
import jdk.internal.dynalink.beans.StaticClass;
@@ -100,7 +103,7 @@
* call sites that are known to be megamorphic. Using an invoke dynamic here would
* lead to the JVM deoptimizing itself to death
*/
- public static final Call APPLY = staticCall(ScriptRuntime.class, "apply", Object.class, ScriptFunction.class, Object.class, Object[].class);
+ public static final Call APPLY = staticCall(MethodHandles.lookup(), ScriptRuntime.class, "apply", Object.class, ScriptFunction.class, Object.class, Object[].class);
/**
* Converts a switch tag value to a simple integer. deflt value if it can't.
@@ -187,6 +190,8 @@
case FUNCTION:
if (self instanceof ScriptObject) {
className = ((ScriptObject)self).getClassName();
+ } else if (self instanceof ScriptObjectMirror) {
+ className = ((ScriptObjectMirror)self).getClassName();
} else {
className = self.getClass().getName();
}
@@ -220,49 +225,71 @@
}
/**
- * Used to determine property iterator used in for in.
- * @param obj Object to iterate on.
- * @return Iterator.
+ * Returns an iterator over property identifiers used in the {@code for...in} statement. Note that the ECMAScript
+ * 5.1 specification, chapter 12.6.4. uses the terminology "property names", which seems to imply that the property
+ * identifiers are expected to be strings, but this is not actually spelled out anywhere, and Nashorn will in some
+ * cases deviate from this. Namely, we guarantee to always return an iterator over {@link String} values for any
+ * built-in JavaScript object. We will however return an iterator over {@link Integer} objects for native Java
+ * arrays and {@link List} objects, as well as arbitrary objects representing keys of a {@link Map}. Therefore, the
+ * expression {@code typeof i} within a {@code for(i in obj)} statement can return something other than
+ * {@code string} when iterating over native Java arrays, {@code List}, and {@code Map} objects.
+ * @param obj object to iterate on.
+ * @return iterator over the object's property names.
*/
- public static Iterator<String> toPropertyIterator(final Object obj) {
+ public static Iterator<?> toPropertyIterator(final Object obj) {
if (obj instanceof ScriptObject) {
return ((ScriptObject)obj).propertyIterator();
}
if (obj != null && obj.getClass().isArray()) {
- final int length = Array.getLength(obj);
-
- return new Iterator<String>() {
- private int index = 0;
-
- @Override
- public boolean hasNext() {
- return index < length;
- }
-
- @Override
- public String next() {
- return "" + index++; //TODO numeric property iterator?
- }
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
- };
+ return new RangeIterator(Array.getLength(obj));
}
if (obj instanceof ScriptObjectMirror) {
return ((ScriptObjectMirror)obj).keySet().iterator();
}
+ if (obj instanceof List) {
+ return new RangeIterator(((List<?>)obj).size());
+ }
+
+ if (obj instanceof Map) {
+ return ((Map<?,?>)obj).keySet().iterator();
+ }
+
return Collections.emptyIterator();
}
+ private static final class RangeIterator implements Iterator<Integer> {
+ private final int length;
+ private int index;
+
+ RangeIterator(int length) {
+ this.length = length;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return index < length;
+ }
+
+ @Override
+ public Integer next() {
+ return index++;
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
+
/**
- * Used to determine property value iterator used in for each in.
- * @param obj Object to iterate on.
- * @return Iterator.
+ * Returns an iterator over property values used in the {@code for each...in} statement. Aside from built-in JS
+ * objects, it also operates on Java arrays, any {@link Iterable}, as well as on {@link Map} objects, iterating over
+ * map values.
+ * @param obj object to iterate on.
+ * @return iterator over the object's property values.
*/
public static Iterator<?> toValueIterator(final Object obj) {
if (obj instanceof ScriptObject) {
@@ -300,6 +327,10 @@
return ((ScriptObjectMirror)obj).values().iterator();
}
+ if (obj instanceof Map) {
+ return ((Map<?,?>)obj).values().iterator();
+ }
+
if (obj instanceof Iterable) {
return ((Iterable<?>)obj).iterator();
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,6 +27,7 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
+import java.util.concurrent.Callable;
import jdk.nashorn.internal.codegen.CompilerConstants;
import jdk.nashorn.internal.lookup.Lookup;
@@ -68,12 +69,32 @@
"userAccessorSetter", void.class, ScriptObject.class, int.class, String.class, Object.class, Object.class);
/** Dynamic invoker for getter */
- private static final MethodHandle INVOKE_UA_GETTER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
- Object.class, Object.class);
+ private static final Object INVOKE_UA_GETTER = new Object();
+
+ private static MethodHandle getINVOKE_UA_GETTER() {
+
+ return ((GlobalObject)Context.getGlobal()).getDynamicInvoker(INVOKE_UA_GETTER,
+ new Callable<MethodHandle>() {
+ @Override
+ public MethodHandle call() {
+ return Bootstrap.createDynamicInvoker("dyn:call", Object.class,
+ Object.class, Object.class);
+ }
+ });
+ }
/** Dynamic invoker for setter */
- private static final MethodHandle INVOKE_UA_SETTER = Bootstrap.createDynamicInvoker("dyn:call", void.class,
- Object.class, Object.class, Object.class);
+ private static Object INVOKE_UA_SETTER = new Object();
+ private static MethodHandle getINVOKE_UA_SETTER() {
+ return ((GlobalObject)Context.getGlobal()).getDynamicInvoker(INVOKE_UA_SETTER,
+ new Callable<MethodHandle>() {
+ @Override
+ public MethodHandle call() {
+ return Bootstrap.createDynamicInvoker("dyn:call", void.class,
+ Object.class, Object.class, Object.class);
+ }
+ });
+ }
/**
* Constructor
@@ -191,7 +212,7 @@
if (func instanceof ScriptFunction) {
try {
- return INVOKE_UA_GETTER.invokeExact(func, self);
+ return getINVOKE_UA_GETTER().invokeExact(func, self);
} catch(final Error|RuntimeException t) {
throw t;
} catch(final Throwable t) {
@@ -208,7 +229,7 @@
if (func instanceof ScriptFunction) {
try {
- INVOKE_UA_SETTER.invokeExact(func, self, value);
+ getINVOKE_UA_SETTER().invokeExact(func, self, value);
} catch(final Error|RuntimeException t) {
throw t;
} catch(final Throwable t) {
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java Fri Sep 06 15:09:44 2013 -0700
@@ -73,7 +73,7 @@
public boolean delete(final Object key, final boolean strict) {
if (expression instanceof ScriptObject) {
final ScriptObject self = (ScriptObject)expression;
- final String propName = ScriptObject.convertKey(key);
+ final String propName = JSType.toString(key);
final FindProperty find = self.findProperty(propName, true);
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.runtime.arrays;
-
-import jdk.nashorn.internal.runtime.ScriptObject;
-
-/**
- * Iterator over a NativeArray
- */
-class ArrayIterator extends ArrayLikeIterator<Object> {
-
- /** Array {@link ScriptObject} to iterate over */
- protected final ScriptObject array;
-
- /** length of array */
- protected final long length;
-
- /**
- * Constructor
- * @param array array to iterate over
- * @param includeUndefined should undefined elements be included in iteration
- */
- protected ArrayIterator(final ScriptObject array, final boolean includeUndefined) {
- super(includeUndefined);
- this.array = array;
- this.length = array.getArray().length();
- }
-
- /**
- * Is the current index still inside the array
- * @return true if inside the array
- */
- protected boolean indexInArray() {
- return index < length;
- }
-
- @Override
- public Object next() {
- return array.get(bumpIndex());
- }
-
- @Override
- public long getLength() {
- return length;
- }
-
- @Override
- public boolean hasNext() {
- if (!includeUndefined) {
- while (indexInArray()) {
- if (array.has(index)) {
- break;
- }
- bumpIndex();
- }
- }
-
- return indexInArray();
- }
-
- @Override
- public void remove() {
- array.delete(index, false);
- }
-}
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -26,6 +26,7 @@
package jdk.nashorn.internal.runtime.arrays;
import java.util.Iterator;
+import java.util.List;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import jdk.nashorn.internal.runtime.JSType;
import jdk.nashorn.internal.runtime.ScriptObject;
@@ -49,7 +50,7 @@
*
* @param includeUndefined should undefined elements be included in the iteration?
*/
- protected ArrayLikeIterator(final boolean includeUndefined) {
+ ArrayLikeIterator(final boolean includeUndefined) {
this.includeUndefined = includeUndefined;
this.index = 0;
}
@@ -118,18 +119,26 @@
Object obj = object;
if (ScriptObject.isArray(obj)) {
- return new ArrayIterator((ScriptObject) obj, includeUndefined);
+ return new ScriptArrayIterator((ScriptObject) obj, includeUndefined);
}
obj = JSType.toScriptObject(obj);
if (obj instanceof ScriptObject) {
- return new MapIterator((ScriptObject)obj, includeUndefined);
+ return new ScriptObjectIterator((ScriptObject)obj, includeUndefined);
}
if (obj instanceof ScriptObjectMirror) {
return new ScriptObjectMirrorIterator((ScriptObjectMirror)obj, includeUndefined);
}
+ if (obj instanceof List) {
+ return new JavaListIterator((List<?>)obj, includeUndefined);
+ }
+
+ if (obj != null && obj.getClass().isArray()) {
+ return new JavaArrayIterator(obj, includeUndefined);
+ }
+
return new EmptyArrayLikeIterator();
}
@@ -143,19 +152,25 @@
Object obj = object;
if (ScriptObject.isArray(obj)) {
- return new ReverseArrayIterator((ScriptObject) obj, includeUndefined);
+ return new ReverseScriptArrayIterator((ScriptObject) obj, includeUndefined);
}
obj = JSType.toScriptObject(obj);
if (obj instanceof ScriptObject) {
- return new ReverseMapIterator((ScriptObject)obj, includeUndefined);
+ return new ReverseScriptObjectIterator((ScriptObject)obj, includeUndefined);
}
if (obj instanceof ScriptObjectMirror) {
return new ReverseScriptObjectMirrorIterator((ScriptObjectMirror)obj, includeUndefined);
}
- assert !obj.getClass().isArray();
+ if (obj instanceof List) {
+ return new ReverseJavaListIterator((List<?>)obj, includeUndefined);
+ }
+
+ if (obj != null && obj.getClass().isArray()) {
+ return new ReverseJavaArrayIterator(obj, includeUndefined);
+ }
return new EmptyArrayLikeIterator();
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,80 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.lang.reflect.Array;
+
+/**
+ * Iterator over a Java List.
+ */
+class JavaArrayIterator extends ArrayLikeIterator<Object> {
+
+ /** Array to iterate over */
+ protected final Object array;
+
+ /** length of array */
+ protected final long length;
+
+ /**
+ * Constructor
+ * @param array array to iterate over
+ * @param includeUndefined should undefined elements be included in iteration
+ */
+ protected JavaArrayIterator(final Object array, final boolean includeUndefined) {
+ super(includeUndefined);
+ assert array.getClass().isArray() : "expecting Java array object";
+ this.array = array;
+ this.length = Array.getLength(array);
+ }
+
+ /**
+ * Is the current index still inside the array
+ * @return true if inside the array
+ */
+ protected boolean indexInArray() {
+ return index < length;
+ }
+
+ @Override
+ public Object next() {
+ return Array.get(array, (int)bumpIndex());
+ }
+
+ @Override
+ public long getLength() {
+ return length;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return indexInArray();
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException("remove");
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,79 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.util.List;
+
+/**
+ * Iterator over a Java List.
+ */
+class JavaListIterator extends ArrayLikeIterator<Object> {
+
+ /** {@link java.util.List} to iterate over */
+ protected final List<?> list;
+
+ /** length of array */
+ protected final long length;
+
+ /**
+ * Constructor
+ * @param list list to iterate over
+ * @param includeUndefined should undefined elements be included in iteration
+ */
+ protected JavaListIterator(final List<?> list, final boolean includeUndefined) {
+ super(includeUndefined);
+ this.list = list;
+ this.length = list.size();
+ }
+
+ /**
+ * Is the current index still inside the array
+ * @return true if inside the array
+ */
+ protected boolean indexInArray() {
+ return index < length;
+ }
+
+ @Override
+ public Object next() {
+ return list.get((int)bumpIndex());
+ }
+
+ @Override
+ public long getLength() {
+ return length;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return indexInArray();
+ }
+
+ @Override
+ public void remove() {
+ list.remove(index);
+ }
+}
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java Fri Sep 06 15:09:44 2013 -0700
@@ -98,9 +98,8 @@
final int length = (int) length();
if (type == Double.class) {
return new NumberArrayData(LongArrayData.toDoubleArray(array, length), length);
- } else {
- return new ObjectArrayData(LongArrayData.toObjectArray(array, length), length);
}
+ return new ObjectArrayData(LongArrayData.toObjectArray(array, length), length);
}
@Override
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.runtime.arrays;
-
-import java.util.NoSuchElementException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptObject;
-
-/**
- * Iterator over a map
- */
-class MapIterator extends ArrayLikeIterator<Object> {
-
- protected final ScriptObject obj;
- private final long length;
-
- MapIterator(final ScriptObject obj, final boolean includeUndefined) {
- super(includeUndefined);
- this.obj = obj;
- this.length = JSType.toUint32(obj.getLength());
- this.index = 0;
- }
-
- protected boolean indexInArray() {
- return index < length;
- }
-
- @Override
- public long getLength() {
- return length;
- }
-
- @Override
- public boolean hasNext() {
- if (length == 0L) {
- return false; //return empty string if toUint32(length) == 0
- }
-
- while (indexInArray()) {
- if (obj.has(index) || includeUndefined) {
- break;
- }
- bumpIndex();
- }
-
- return indexInArray();
- }
-
- @Override
- public Object next() {
- if (indexInArray()) {
- return obj.get(bumpIndex());
- }
-
- throw new NoSuchElementException();
- }
-}
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.runtime.arrays;
-
-import jdk.nashorn.internal.runtime.ScriptObject;
-
-/**
- * Reverse iterator over a NativeArray
- */
-final class ReverseArrayIterator extends ArrayIterator {
-
- /**
- * Constructor
- * @param array array to iterate over
- * @param includeUndefined should undefined elements be included in iteration
- */
- public ReverseArrayIterator(final ScriptObject array, final boolean includeUndefined) {
- super(array, includeUndefined);
- this.index = array.getArray().length() - 1;
- }
-
- @Override
- public boolean isReverse() {
- return true;
- }
-
- @Override
- protected boolean indexInArray() {
- return index >= 0;
- }
-
- @Override
- protected long bumpIndex() {
- return index--;
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,58 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.lang.reflect.Array;
+
+/**
+ * Reverse iterator over a array
+ */
+final class ReverseJavaArrayIterator extends JavaArrayIterator {
+ /**
+ * Constructor
+ * @param array array to iterate over
+ * @param includeUndefined should undefined elements be included in iteration
+ */
+ public ReverseJavaArrayIterator(final Object array, final boolean includeUndefined) {
+ super(array, includeUndefined);
+ this.index = Array.getLength(array) - 1;
+ }
+
+ @Override
+ public boolean isReverse() {
+ return true;
+ }
+
+ @Override
+ protected boolean indexInArray() {
+ return index >= 0;
+ }
+
+ @Override
+ protected long bumpIndex() {
+ return index--;
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,58 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.util.List;
+
+/**
+ * Reverse iterator over a List
+ */
+final class ReverseJavaListIterator extends JavaListIterator {
+ /**
+ * Constructor
+ * @param list list to iterate over
+ * @param includeUndefined should undefined elements be included in iteration
+ */
+ public ReverseJavaListIterator(final List<?> list, final boolean includeUndefined) {
+ super(list, includeUndefined);
+ this.index = list.size() - 1;
+ }
+
+ @Override
+ public boolean isReverse() {
+ return true;
+ }
+
+ @Override
+ protected boolean indexInArray() {
+ return index >= 0;
+ }
+
+ @Override
+ protected long bumpIndex() {
+ return index--;
+ }
+}
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java Thu Sep 05 15:37:40 2013 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.runtime.arrays;
-
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptObject;
-
-/**
- * Reverse iterator over a map
- */
-final class ReverseMapIterator extends MapIterator {
-
- ReverseMapIterator(final ScriptObject obj, final boolean includeUndefined) {
- super(obj, includeUndefined);
- this.index = JSType.toUint32(obj.getLength()) - 1;
- }
-
- @Override
- public boolean isReverse() {
- return true;
- }
-
- @Override
- protected boolean indexInArray() {
- return index >= 0;
- }
-
- @Override
- protected long bumpIndex() {
- return index--;
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,59 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Reverse iterator over a NativeArray
+ */
+final class ReverseScriptArrayIterator extends ScriptArrayIterator {
+
+ /**
+ * Constructor
+ * @param array array to iterate over
+ * @param includeUndefined should undefined elements be included in iteration
+ */
+ public ReverseScriptArrayIterator(final ScriptObject array, final boolean includeUndefined) {
+ super(array, includeUndefined);
+ this.index = array.getArray().length() - 1;
+ }
+
+ @Override
+ public boolean isReverse() {
+ return true;
+ }
+
+ @Override
+ protected boolean indexInArray() {
+ return index >= 0;
+ }
+
+ @Override
+ protected long bumpIndex() {
+ return index--;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,55 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Reverse iterator over a map
+ */
+final class ReverseScriptObjectIterator extends ScriptObjectIterator {
+
+ ReverseScriptObjectIterator(final ScriptObject obj, final boolean includeUndefined) {
+ super(obj, includeUndefined);
+ this.index = JSType.toUint32(obj.getLength()) - 1;
+ }
+
+ @Override
+ public boolean isReverse() {
+ return true;
+ }
+
+ @Override
+ protected boolean indexInArray() {
+ return index >= 0;
+ }
+
+ @Override
+ protected long bumpIndex() {
+ return index--;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Iterator over a NativeArray
+ */
+class ScriptArrayIterator extends ArrayLikeIterator<Object> {
+
+ /** Array {@link ScriptObject} to iterate over */
+ protected final ScriptObject array;
+
+ /** length of array */
+ protected final long length;
+
+ /**
+ * Constructor
+ * @param array array to iterate over
+ * @param includeUndefined should undefined elements be included in iteration
+ */
+ protected ScriptArrayIterator(final ScriptObject array, final boolean includeUndefined) {
+ super(includeUndefined);
+ this.array = array;
+ this.length = array.getArray().length();
+ }
+
+ /**
+ * Is the current index still inside the array
+ * @return true if inside the array
+ */
+ protected boolean indexInArray() {
+ return index < length;
+ }
+
+ @Override
+ public Object next() {
+ return array.get(bumpIndex());
+ }
+
+ @Override
+ public long getLength() {
+ return length;
+ }
+
+ @Override
+ public boolean hasNext() {
+ if (!includeUndefined) {
+ while (indexInArray()) {
+ if (array.has(index)) {
+ break;
+ }
+ bumpIndex();
+ }
+ }
+
+ return indexInArray();
+ }
+
+ @Override
+ public void remove() {
+ array.delete(index, false);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,80 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.util.NoSuchElementException;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Iterator over a map
+ */
+class ScriptObjectIterator extends ArrayLikeIterator<Object> {
+
+ protected final ScriptObject obj;
+ private final long length;
+
+ ScriptObjectIterator(final ScriptObject obj, final boolean includeUndefined) {
+ super(includeUndefined);
+ this.obj = obj;
+ this.length = JSType.toUint32(obj.getLength());
+ this.index = 0;
+ }
+
+ protected boolean indexInArray() {
+ return index < length;
+ }
+
+ @Override
+ public long getLength() {
+ return length;
+ }
+
+ @Override
+ public boolean hasNext() {
+ if (length == 0L) {
+ return false; //return empty string if toUint32(length) == 0
+ }
+
+ while (indexInArray()) {
+ if (obj.has(index) || includeUndefined) {
+ break;
+ }
+ bumpIndex();
+ }
+
+ return indexInArray();
+ }
+
+ @Override
+ public Object next() {
+ if (indexInArray()) {
+ return obj.get(bumpIndex());
+ }
+
+ throw new NoSuchElementException();
+ }
+}
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java Fri Sep 06 15:09:44 2013 -0700
@@ -60,7 +60,7 @@
@Override
public ArrayData copy() {
- return new SparseArrayData(underlying.copy(), length(), new TreeMap<Long, Object>(sparseMap));
+ return new SparseArrayData(underlying.copy(), length(), new TreeMap<>(sparseMap));
}
@Override
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,6 +36,7 @@
import jdk.internal.dynalink.DynamicLinker;
import jdk.internal.dynalink.DynamicLinkerFactory;
import jdk.internal.dynalink.beans.BeansLinker;
+import jdk.internal.dynalink.beans.StaticClass;
import jdk.internal.dynalink.linker.GuardedInvocation;
import jdk.internal.dynalink.linker.LinkerServices;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
@@ -61,13 +62,17 @@
static {
final DynamicLinkerFactory factory = new DynamicLinkerFactory();
factory.setPrioritizedLinkers(new NashornLinker(), new NashornPrimitiveLinker(), new NashornStaticClassLinker(),
- new BoundDynamicMethodLinker(), new JSObjectLinker(), new ReflectionCheckLinker());
+ new BoundDynamicMethodLinker(), new JavaSuperAdapterLinker(), new JSObjectLinker(), new ReflectionCheckLinker());
factory.setFallbackLinkers(new BeansLinker(), new NashornBottomLinker());
factory.setSyncOnRelink(true);
final int relinkThreshold = Options.getIntProperty("nashorn.unstable.relink.threshold", -1);
if (relinkThreshold > -1) {
factory.setUnstableRelinkThreshold(relinkThreshold);
}
+
+ // Linkers for any additional language runtimes deployed alongside Nashorn will be picked up by the factory.
+ factory.setClassLoader(Bootstrap.class.getClassLoader());
+
dynamicLinker = factory.createLinker();
}
@@ -84,7 +89,8 @@
return obj instanceof ScriptFunction ||
((obj instanceof ScriptObjectMirror) && ((ScriptObjectMirror)obj).isFunction()) ||
isDynamicMethod(obj) ||
- isFunctionalInterfaceObject(obj);
+ isFunctionalInterfaceObject(obj) ||
+ obj instanceof StaticClass;
}
/**
@@ -258,6 +264,16 @@
}
/**
+ * Creates a super-adapter for an adapter, that is, an adapter to the adapter that allows invocation of superclass
+ * methods on it.
+ * @param adapter the original adapter
+ * @return a new adapter that can be used to invoke super methods on the original adapter.
+ */
+ public static Object createSuperAdapter(final Object adapter) {
+ return new JavaSuperAdapter(adapter);
+ }
+
+ /**
* If the given class is a reflection-specific class (anything in {@code java.lang.reflect} and
* {@code java.lang.invoke} package, as well a {@link Class} and any subclass of {@link ClassLoader}) and there is
* a security manager in the system, then it checks the {@code nashorn.JavaReflection} {@code RuntimePermission}.
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,7 +29,7 @@
/**
* Represents a Dynalink dynamic method bound to a receiver. Note that objects of this class are just the tuples of
- * a method and a bound this, without any behavior. All the behavior is defined in the {@link BoundDynamicMethodLinker}.
+ * a method and a bound this, without any behavior. All the behavior is defined in the {@code BoundDynamicMethodLinker}.
*/
final class BoundDynamicMethod {
private final Object dynamicMethod;
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java Fri Sep 06 15:09:44 2013 -0700
@@ -37,7 +37,7 @@
import jdk.internal.dynalink.support.Guards;
/**
- * Links {@link BoundDynamicMethod} objects. Passes through to Dynalink's BeansLinker for linking a dynamic method
+ * Links {@code BoundDynamicMethod} objects. Passes through to Dynalink's BeansLinker for linking a dynamic method
* (they only respond to "dyn:call"), and modifies the returned invocation to deal with the receiver binding.
*/
final class BoundDynamicMethodLinker implements TypeBasedGuardingDynamicLinker {
@@ -67,11 +67,12 @@
// BeansLinker.
final CallSiteDescriptor descriptor = linkRequest.getCallSiteDescriptor();
final MethodType type = descriptor.getMethodType();
+ final Class<?> dynamicMethodClass = dynamicMethod.getClass();
final CallSiteDescriptor newDescriptor = descriptor.changeMethodType(
- type.changeParameterType(0, dynamicMethod.getClass()).changeParameterType(1, boundThis.getClass()));
+ type.changeParameterType(0, dynamicMethodClass).changeParameterType(1, boundThis.getClass()));
// Delegate to BeansLinker
- final GuardedInvocation inv = BeansLinker.getLinkerForClass(dynamicMethod.getClass()).getGuardedInvocation(
+ final GuardedInvocation inv = BeansLinker.getLinkerForClass(dynamicMethodClass).getGuardedInvocation(
linkRequest.replaceArguments(newDescriptor, args), linkerServices);
if(inv == null) {
return null;
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java Fri Sep 06 15:09:44 2013 -0700
@@ -27,8 +27,11 @@
import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import java.security.AccessControlContext;
import java.security.AccessController;
+import java.security.Permissions;
import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -43,6 +46,16 @@
* used to determine if one loader can see the other loader's classes.
*/
final class ClassAndLoader {
+ static AccessControlContext createPermAccCtxt(final String... permNames) {
+ final Permissions perms = new Permissions();
+ for (final String permName : permNames) {
+ perms.add(new RuntimePermission(permName));
+ }
+ return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, perms) });
+ }
+
+ private static final AccessControlContext GET_LOADER_ACC_CTXT = createPermAccCtxt("getClassLoader");
+
private final Class<?> representativeClass;
// Don't access this directly; most of the time, use getRetrievedLoader(), or if you know what you're doing,
// getLoader().
@@ -116,7 +129,7 @@
public ClassAndLoader run() {
return getDefiningClassAndLoaderPrivileged(types);
}
- });
+ }, GET_LOADER_ACC_CTXT);
}
static ClassAndLoader getDefiningClassAndLoaderPrivileged(final Class<?>[] types) {
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java Fri Sep 06 15:09:44 2013 -0700
@@ -49,6 +49,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
@@ -172,6 +173,9 @@
private static final String CLASS_INIT = "<clinit>";
private static final String STATIC_GLOBAL_FIELD_NAME = "staticGlobal";
+ // Method name prefix for invoking super-methods
+ static final String SUPER_PREFIX = "super$";
+
/**
* Collection of methods we never override: Object.clone(), Object.finalize().
*/
@@ -239,6 +243,7 @@
}
generateConstructors();
generateMethods();
+ generateSuperMethods();
// }
cw.visitEnd();
}
@@ -506,6 +511,10 @@
private static void endInitMethod(final InstructionAdapter mv) {
mv.visitInsn(RETURN);
+ endMethod(mv);
+ }
+
+ private static void endMethod(final InstructionAdapter mv) {
mv.visitMaxs(0, 0);
mv.visitEnd();
}
@@ -602,13 +611,8 @@
*/
private void generateMethod(final MethodInfo mi) {
final Method method = mi.method;
- final int mod = method.getModifiers();
- final int access = ACC_PUBLIC | (method.isVarArgs() ? ACC_VARARGS : 0);
final Class<?>[] exceptions = method.getExceptionTypes();
- final String[] exceptionNames = new String[exceptions.length];
- for (int i = 0; i < exceptions.length; ++i) {
- exceptionNames[i] = Type.getInternalName(exceptions[i]);
- }
+ final String[] exceptionNames = getExceptionNames(exceptions);
final MethodType type = mi.type;
final String methodDesc = type.toMethodDescriptorString();
final String name = mi.getName();
@@ -616,14 +620,8 @@
final Type asmType = Type.getMethodType(methodDesc);
final Type[] asmArgTypes = asmType.getArgumentTypes();
- // Determine the first index for a local variable
- int nextLocalVar = 1; // this
- for(final Type t: asmArgTypes) {
- nextLocalVar += t.getSize();
- }
-
- final InstructionAdapter mv = new InstructionAdapter(cw.visitMethod(access, name, methodDesc, null,
- exceptionNames));
+ final InstructionAdapter mv = new InstructionAdapter(cw.visitMethod(getAccessModifiers(method), name,
+ methodDesc, null, exceptionNames));
mv.visitCode();
final Label instanceHandleDefined = new Label();
@@ -645,7 +643,7 @@
}
// No handle is available, fall back to default behavior
- if(Modifier.isAbstract(mod)) {
+ if(Modifier.isAbstract(method.getModifiers())) {
// If the super method is abstract, throw an exception
mv.anew(UNSUPPORTED_OPERATION_TYPE);
mv.dup();
@@ -653,14 +651,7 @@
mv.athrow();
} else {
// If the super method is not abstract, delegate to it.
- mv.visitVarInsn(ALOAD, 0);
- int nextParam = 1;
- for(final Type t: asmArgTypes) {
- mv.load(nextParam, t);
- nextParam += t.getSize();
- }
- mv.invokespecial(superClassName, name, methodDesc);
- mv.areturn(asmReturnType);
+ emitSuperCall(mv, name, methodDesc);
}
final Label setupGlobal = new Label();
@@ -684,6 +675,12 @@
// stack: [creatingGlobal, someHandle]
mv.visitLabel(setupGlobal);
+ // Determine the first index for a local variable
+ int nextLocalVar = 1; // "this" is at 0
+ for(final Type t: asmArgTypes) {
+ nextLocalVar += t.getSize();
+ }
+ // Set our local variable indices
final int currentGlobalVar = nextLocalVar++;
final int globalsDifferVar = nextLocalVar++;
@@ -774,8 +771,7 @@
}
mv.visitTryCatchBlock(tryBlockStart, tryBlockEnd, throwableHandler, THROWABLE_TYPE_NAME);
}
- mv.visitMaxs(0, 0);
- mv.visitEnd();
+ endMethod(mv);
}
/**
@@ -816,6 +812,53 @@
return false;
}
+ private void generateSuperMethods() {
+ for(final MethodInfo mi: methodInfos) {
+ if(!Modifier.isAbstract(mi.method.getModifiers())) {
+ generateSuperMethod(mi);
+ }
+ }
+ }
+
+ private void generateSuperMethod(MethodInfo mi) {
+ final Method method = mi.method;
+
+ final String methodDesc = mi.type.toMethodDescriptorString();
+ final String name = mi.getName();
+
+ final InstructionAdapter mv = new InstructionAdapter(cw.visitMethod(getAccessModifiers(method),
+ SUPER_PREFIX + name, methodDesc, null, getExceptionNames(method.getExceptionTypes())));
+ mv.visitCode();
+
+ emitSuperCall(mv, name, methodDesc);
+
+ endMethod(mv);
+ }
+
+ private void emitSuperCall(final InstructionAdapter mv, final String name, final String methodDesc) {
+ mv.visitVarInsn(ALOAD, 0);
+ int nextParam = 1;
+ final Type methodType = Type.getMethodType(methodDesc);
+ for(final Type t: methodType.getArgumentTypes()) {
+ mv.load(nextParam, t);
+ nextParam += t.getSize();
+ }
+ mv.invokespecial(superClassName, name, methodDesc);
+ mv.areturn(methodType.getReturnType());
+ }
+
+ private static String[] getExceptionNames(final Class<?>[] exceptions) {
+ final String[] exceptionNames = new String[exceptions.length];
+ for (int i = 0; i < exceptions.length; ++i) {
+ exceptionNames[i] = Type.getInternalName(exceptions[i]);
+ }
+ return exceptionNames;
+ }
+
+ private static int getAccessModifiers(final Method method) {
+ return ACC_PUBLIC | (method.isVarArgs() ? ACC_VARARGS : 0);
+ }
+
/**
* Gathers methods that can be implemented or overridden from the specified type into this factory's
* {@link #methodInfos} set. It will add all non-final, non-static methods that are either public or protected from
@@ -868,6 +911,8 @@
}
}
+ private static final AccessControlContext GET_DECLARED_MEMBERS_ACC_CTXT = ClassAndLoader.createPermAccCtxt("accessDeclaredMembers");
+
/**
* Creates a collection of methods that are not final, but we still never allow them to be overridden in adapters,
* as explicitly declaring them automatically is a bad idea. Currently, this means {@code Object.finalize()} and
@@ -886,7 +931,7 @@
throw new AssertionError(e);
}
}
- });
+ }, GET_DECLARED_MEMBERS_ACC_CTXT);
}
private String getCommonSuperClass(final String type1, final String type2) {
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java Fri Sep 06 15:09:44 2013 -0700
@@ -25,6 +25,7 @@
package jdk.nashorn.internal.runtime.linker;
+import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.AllPermission;
import java.security.CodeSigner;
@@ -33,7 +34,6 @@
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.security.SecureClassLoader;
-
import jdk.internal.dynalink.beans.StaticClass;
/**
@@ -46,9 +46,10 @@
@SuppressWarnings("javadoc")
final class JavaAdapterClassLoader {
private static final ProtectionDomain GENERATED_PROTECTION_DOMAIN = createGeneratedProtectionDomain();
+ private static final AccessControlContext CREATE_LOADER_ACC_CTXT = ClassAndLoader.createPermAccCtxt("createClassLoader");
private final String className;
- private final byte[] classBytes;
+ private volatile byte[] classBytes;
JavaAdapterClassLoader(String className, byte[] classBytes) {
this.className = className.replace('/', '.');
@@ -56,6 +57,13 @@
}
/**
+ * clear classBytes after loading class.
+ */
+ void clearClassBytes() {
+ this.classBytes = null;
+ }
+
+ /**
* Loads the generated adapter class into the JVM.
* @param parentLoader the parent class loader for the generated class loader
* @return the generated adapter class
@@ -70,7 +78,7 @@
throw new AssertionError(e); // cannot happen
}
}
- });
+ }, CREATE_LOADER_ACC_CTXT);
}
// Note that the adapter class is created in the protection domain of the class/interface being
@@ -103,10 +111,10 @@
@Override
protected Class<?> findClass(final String name) throws ClassNotFoundException {
if(name.equals(className)) {
+ assert classBytes != null : "what? already cleared .class bytes!!";
return defineClass(name, classBytes, 0, classBytes.length, GENERATED_PROTECTION_DOMAIN);
- } else {
- throw new ClassNotFoundException(name);
}
+ throw new ClassNotFoundException(name);
}
};
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java Fri Sep 06 15:09:44 2013 -0700
@@ -31,9 +31,9 @@
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.Modifier;
+import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -70,6 +70,11 @@
@SuppressWarnings("javadoc")
public final class JavaAdapterFactory {
+ // context with permissions needs for AdapterInfo creation
+ private static final AccessControlContext CREATE_ADAPTER_INFO_ACC_CTXT =
+ ClassAndLoader.createPermAccCtxt("createClassLoader", "getClassLoader",
+ "accessDeclaredMembers", "accessClassInPackage.jdk.nashorn.internal.runtime");
+
/**
* A mapping from an original Class object to AdapterInfo representing the adapter for the class it represents.
*/
@@ -124,17 +129,10 @@
*/
public static MethodHandle getConstructor(final Class<?> sourceType, final Class<?> targetType) throws Exception {
final StaticClass adapterClass = getAdapterClassFor(new Class<?>[] { targetType }, null);
- return AccessController.doPrivileged(new PrivilegedExceptionAction<MethodHandle>() {
- @Override
- public MethodHandle run() throws Exception {
- // NOTE: we use publicLookup(), but none of our adapter constructors are caller sensitive, so this is
- // okay, we won't artificially limit access.
- return MH.bindTo(Bootstrap.getLinkerServices().getGuardedInvocation(new LinkRequestImpl(
- NashornCallSiteDescriptor.get(MethodHandles.publicLookup(), "dyn:new",
- MethodType.methodType(targetType, StaticClass.class, sourceType), 0), false,
- adapterClass, null)).getInvocation(), adapterClass);
- }
- });
+ return MH.bindTo(Bootstrap.getLinkerServices().getGuardedInvocation(new LinkRequestImpl(
+ NashornCallSiteDescriptor.get(MethodHandles.publicLookup(), "dyn:new",
+ MethodType.methodType(targetType, StaticClass.class, sourceType), 0), false,
+ adapterClass, null)).getInvocation(), adapterClass);
}
/**
@@ -171,7 +169,7 @@
return (List)Collections.singletonList(clazz);
}
- /**
+ /**
* For a given class, create its adapter class and associated info.
* @param type the class for which the adapter is created
* @return the adapter info for the class.
@@ -190,12 +188,19 @@
}
superClass = t;
} else {
+ if (interfaces.size() > 65535) {
+ throw new IllegalArgumentException("interface limit exceeded");
+ }
+
interfaces.add(t);
}
+
if(!Modifier.isPublic(mod)) {
return new AdapterInfo(AdaptationResult.Outcome.ERROR_NON_PUBLIC_CLASS, t.getCanonicalName());
}
}
+
+
final Class<?> effectiveSuperClass = superClass == null ? Object.class : superClass;
return AccessController.doPrivileged(new PrivilegedAction<AdapterInfo>() {
@Override
@@ -206,7 +211,7 @@
return new AdapterInfo(e.getAdaptationResult());
}
}
- });
+ }, CREATE_ADAPTER_INFO_ACC_CTXT);
}
private static class AdapterInfo {
@@ -224,7 +229,10 @@
this.commonLoader = findCommonLoader(definingLoader);
final JavaAdapterBytecodeGenerator gen = new JavaAdapterBytecodeGenerator(superClass, interfaces, commonLoader, false);
this.autoConvertibleFromFunction = gen.isAutoConvertibleFromFunction();
- this.instanceAdapterClass = gen.createAdapterClassLoader().generateClass(commonLoader);
+ final JavaAdapterClassLoader jacl = gen.createAdapterClassLoader();
+ this.instanceAdapterClass = jacl.generateClass(commonLoader);
+ // loaded Class - no need to keep class bytes around
+ jacl.clearClassBytes();
this.adapterGenerator = new JavaAdapterBytecodeGenerator(superClass, interfaces, commonLoader, true).createAdapterClassLoader();
this.adaptationResult = AdaptationResult.SUCCESSFUL_RESULT;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java Fri Sep 06 15:09:44 2013 -0700
@@ -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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+/**
+ * Represents a an adapter for invoking superclass methods on an adapter instance generated by
+ * {@link JavaAdapterBytecodeGenerator}. Note that objects of this class are just wrappers around the adapter instances,
+ * without any behavior. All the behavior is defined in the {@code JavaSuperAdapterLinker}.
+ */
+class JavaSuperAdapter {
+ private final Object adapter;
+
+ JavaSuperAdapter(final Object adapter) {
+ adapter.getClass(); // NPE check
+ this.adapter = adapter;
+ }
+
+ public Object getAdapter() {
+ return adapter;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,180 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.lookup.Lookup.EMPTY_GETTER;
+import static jdk.nashorn.internal.runtime.linker.JavaAdapterBytecodeGenerator.SUPER_PREFIX;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.beans.BeansLinker;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
+import jdk.internal.dynalink.support.Lookup;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * A linker for instances of {@link JavaSuperAdapter}. Only links {@code getMethod} calls, by forwarding them to the
+ * bean linker for the adapter class and prepending {@code super$} to method names.
+ *
+ */
+final class JavaSuperAdapterLinker implements TypeBasedGuardingDynamicLinker {
+ private static final String GET_METHOD = "getMethod";
+ private static final String DYN_GET_METHOD = "dyn:" + GET_METHOD;
+ private static final String DYN_GET_METHOD_FIXED = DYN_GET_METHOD + ":" + SUPER_PREFIX;
+
+ private static final MethodHandle ADD_PREFIX_TO_METHOD_NAME;
+ private static final MethodHandle BIND_DYNAMIC_METHOD;
+ private static final MethodHandle GET_ADAPTER;
+ private static final MethodHandle IS_ADAPTER_OF_CLASS;
+
+ static {
+ final Lookup lookup = new Lookup(MethodHandles.lookup());
+ ADD_PREFIX_TO_METHOD_NAME = lookup.findOwnStatic("addPrefixToMethodName", Object.class, Object.class);
+ BIND_DYNAMIC_METHOD = lookup.findOwnStatic("bindDynamicMethod", Object.class, Object.class, Object.class);
+ GET_ADAPTER = lookup.findVirtual(JavaSuperAdapter.class, "getAdapter", MethodType.methodType(Object.class));
+ IS_ADAPTER_OF_CLASS = lookup.findOwnStatic("isAdapterOfClass", boolean.class, Class.class, Object.class);
+ }
+
+ @Override
+ public boolean canLinkType(final Class<?> type) {
+ return type == JavaSuperAdapter.class;
+ }
+
+ @Override
+ public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices)
+ throws Exception {
+ final Object objSuperAdapter = linkRequest.getReceiver();
+ if(!(objSuperAdapter instanceof JavaSuperAdapter)) {
+ return null;
+ }
+
+ final CallSiteDescriptor descriptor = linkRequest.getCallSiteDescriptor();
+ if(!CallSiteDescriptorFactory.tokenizeOperators(descriptor).contains(GET_METHOD)) {
+ // We only handle getMethod
+ return null;
+ }
+
+ final Object adapter = ((JavaSuperAdapter)objSuperAdapter).getAdapter();
+
+ // Replace argument (javaSuperAdapter, ...) => (adapter, ...) when delegating to BeansLinker
+ final Object[] args = linkRequest.getArguments();
+ args[0] = adapter;
+
+ // Use R(T0, ...) => R(adapter.class, ...) call site type when delegating to BeansLinker.
+ final MethodType type = descriptor.getMethodType();
+ final Class<?> adapterClass = adapter.getClass();
+ final boolean hasFixedName = descriptor.getNameTokenCount() > 2;
+ final String opName = hasFixedName ? (DYN_GET_METHOD_FIXED + descriptor.getNameToken(
+ CallSiteDescriptor.NAME_OPERAND)) : DYN_GET_METHOD;
+
+ final CallSiteDescriptor newDescriptor = NashornCallSiteDescriptor.get(descriptor.getLookup(), opName,
+ type.changeParameterType(0, adapterClass), 0);
+
+ // Delegate to BeansLinker
+ final GuardedInvocation guardedInv = BeansLinker.getLinkerForClass(adapterClass).getGuardedInvocation(
+ linkRequest.replaceArguments(newDescriptor, args), linkerServices);
+
+ final MethodHandle guard = IS_ADAPTER_OF_CLASS.bindTo(adapterClass);
+ if(guardedInv == null) {
+ // Short circuit the lookup here for non-existent methods by linking an empty getter. If we just returned
+ // null instead, BeansLinker would find final methods on the JavaSuperAdapter instead: getClass() and
+ // wait().
+ return new GuardedInvocation(MethodHandles.dropArguments(EMPTY_GETTER, 1,type.parameterList().subList(1,
+ type.parameterCount())), guard).asType(descriptor);
+ }
+
+ final MethodHandle invocation = guardedInv.getInvocation();
+ final MethodType invType = invocation.type();
+ // For invocation typed R(T0, ...) create a dynamic method binder of type R(R, T0)
+ final MethodHandle typedBinder = BIND_DYNAMIC_METHOD.asType(MethodType.methodType(invType.returnType(),
+ invType.returnType(), invType.parameterType(0)));
+ // For invocation typed R(T0, T1, ...) create a dynamic method binder of type R(R, T0, T1, ...)
+ final MethodHandle droppingBinder = MethodHandles.dropArguments(typedBinder, 2,
+ invType.parameterList().subList(1, invType.parameterCount()));
+ // Finally, fold the invocation into the binder to produce a method handle that will bind every returned
+ // DynamicMethod object from dyn:getMethod calls to the actual receiver
+ // R(R(T0, T1, ...), T0, T1, ...)
+ final MethodHandle bindingInvocation = MethodHandles.foldArguments(droppingBinder, invocation);
+
+ final MethodHandle typedGetAdapter = asFilterType(GET_ADAPTER, 0, invType, type);
+ final MethodHandle adaptedInvocation;
+ if(hasFixedName) {
+ adaptedInvocation = MethodHandles.filterArguments(bindingInvocation, 0, typedGetAdapter);
+ } else {
+ // Add a filter that'll prepend "super$" to each name passed to the variable-name "dyn:getMethod".
+ final MethodHandle typedAddPrefix = asFilterType(ADD_PREFIX_TO_METHOD_NAME, 1, invType, type);
+ adaptedInvocation = MethodHandles.filterArguments(bindingInvocation, 0, typedGetAdapter, typedAddPrefix);
+ }
+
+ return guardedInv.replaceMethods(adaptedInvocation, guard).asType(descriptor);
+ }
+
+ /**
+ * Adapts the type of a method handle used as a filter in a position from a source method type to a target method type.
+ * @param filter the filter method handle
+ * @param pos the position in the argument list that it's filtering
+ * @param targetType the target method type for filtering
+ * @param sourceType the source method type for filtering
+ * @return a type adapted filter
+ */
+ private static MethodHandle asFilterType(final MethodHandle filter, int pos, MethodType targetType, MethodType sourceType) {
+ return filter.asType(MethodType.methodType(targetType.parameterType(pos), sourceType.parameterType(pos)));
+ }
+
+ @SuppressWarnings("unused")
+ private static Object addPrefixToMethodName(final Object name) {
+ return SUPER_PREFIX.concat(String.valueOf(name));
+ }
+
+ /**
+ * Used to transform the return value of getMethod; transform a {@code DynamicMethod} into a
+ * {@code BoundDynamicMethod} while also accounting for the possibility of a non-existent method.
+ * @param dynamicMethod the dynamic method to bind
+ * @param boundThis the adapter underlying a super adapter, to which the dynamic method is bound.
+ * @return a dynamic method bound to the adapter instance.
+ */
+ @SuppressWarnings("unused")
+ private static Object bindDynamicMethod(final Object dynamicMethod, final Object boundThis) {
+ return dynamicMethod == null ? ScriptRuntime.UNDEFINED : Bootstrap.bindDynamicMethod(dynamicMethod, boundThis);
+ }
+
+ /**
+ * Used as the guard of linkages, as the receiver is not guaranteed to be a JavaSuperAdapter.
+ * @param clazz the class the receiver's adapter is tested against.
+ * @param obj receiver
+ * @return true if the receiver is a super adapter, and its underlying adapter is of the specified class
+ */
+ @SuppressWarnings("unused")
+ private static boolean isAdapterOfClass(Class<?> clazz, Object obj) {
+ return obj instanceof JavaSuperAdapter && clazz == (((JavaSuperAdapter)obj).getAdapter()).getClass();
+ }
+}
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java Fri Sep 06 15:09:44 2013 -0700
@@ -88,6 +88,6 @@
}
private static void checkReflectionPermission(final SecurityManager sm) {
- sm.checkPermission(new RuntimePermission("nashorn.JavaReflection"));
+ sm.checkPermission(new RuntimePermission(Context.NASHORN_JAVA_REFLECTION));
}
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java Fri Sep 06 15:09:44 2013 -0700
@@ -26,8 +26,11 @@
package jdk.nashorn.internal.runtime.options;
import java.io.PrintWriter;
+import java.security.AccessControlContext;
import java.security.AccessController;
+import java.security.Permissions;
import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -39,6 +42,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.MissingResourceException;
+import java.util.PropertyPermission;
import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.TimeZone;
@@ -51,6 +55,15 @@
* Manages global runtime options.
*/
public final class Options {
+ // permission to just read nashorn.* System properties
+ private static AccessControlContext createPropertyReadAccCtxt() {
+ final Permissions perms = new Permissions();
+ perms.add(new PropertyPermission("nashorn.*", "read"));
+ return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, perms) });
+ }
+
+ private static final AccessControlContext READ_PROPERTY_ACC_CTXT = createPropertyReadAccCtxt();
+
/** Resource tag. */
private final String resource;
@@ -144,7 +157,7 @@
return false;
}
}
- });
+ }, READ_PROPERTY_ACC_CTXT);
}
/**
@@ -171,7 +184,7 @@
return defValue;
}
}
- });
+ }, READ_PROPERTY_ACC_CTXT);
}
/**
@@ -198,7 +211,7 @@
return defValue;
}
}
- });
+ }, READ_PROPERTY_ACC_CTXT);
}
/**
@@ -395,13 +408,13 @@
final LinkedList<String> argList = new LinkedList<>();
Collections.addAll(argList, args);
- final String extra = getStringProperty(NASHORN_ARGS_PROPERTY, null);
- if (extra != null) {
- final StringTokenizer st = new StringTokenizer(extra);
- while (st.hasMoreTokens()) {
- argList.add(st.nextToken());
+ final String extra = getStringProperty(NASHORN_ARGS_PROPERTY, null);
+ if (extra != null) {
+ final StringTokenizer st = new StringTokenizer(extra);
+ while (st.hasMoreTokens()) {
+ argList.add(st.nextToken());
+ }
}
- }
while (!argList.isEmpty()) {
final String arg = argList.remove(0);
@@ -418,8 +431,9 @@
continue;
}
- // if it doesn't start with -, it's a file
- if (!arg.startsWith("-")) {
+ // If it doesn't start with -, it's a file. But, if it is just "-",
+ // then it is a file representing standard input.
+ if (!arg.startsWith("-") || arg.length() == 1) {
files.add(arg);
continue;
}
@@ -567,15 +581,7 @@
private static String definePropPrefix;
static {
- // Without do privileged, under security manager messages can not be
- // loaded.
- Options.bundle = AccessController.doPrivileged(new PrivilegedAction<ResourceBundle>() {
- @Override
- public ResourceBundle run() {
- return ResourceBundle.getBundle(Options.MESSAGES_RESOURCE, Locale.getDefault());
- }
- });
-
+ Options.bundle = ResourceBundle.getBundle(Options.MESSAGES_RESOURCE, Locale.getDefault());
Options.validOptions = new TreeSet<>();
Options.usage = new HashMap<>();
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java Fri Sep 06 15:09:44 2013 -0700
@@ -60,7 +60,7 @@
* @param flags the flags string
*/
protected RegExp(final String source, final String flags) {
- this.source = source;
+ this.source = source.length() == 0 ? "(?:)" : source;
for (int i = 0; i < flags.length(); i++) {
final char ch = flags.charAt(i);
switch (ch) {
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java Fri Sep 06 15:09:44 2013 -0700
@@ -39,7 +39,6 @@
import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
import jdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
final class ArrayCompiler extends Compiler {
private int[] code;
@@ -345,6 +344,7 @@
private static final int QUANTIFIER_EXPAND_LIMIT_SIZE = 50; // was 50
+ @SuppressWarnings("unused")
private static boolean cknOn(int ckn) {
return ckn > 0;
}
@@ -879,6 +879,7 @@
}
}
+ @SuppressWarnings("unused")
private void addStateCheckNum(int num) {
addInt(num);
}
@@ -887,6 +888,7 @@
addInt(addr);
}
+ @SuppressWarnings("unused")
private void addAbsAddr(int addr) {
addInt(addr);
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,6 +29,7 @@
final int[] bits = new int[BITSET_SIZE];
private static final int BITS_TO_STRING_WRAP = 4;
+ @Override
public String toString() {
StringBuilder buffer = new StringBuilder();
buffer.append("BitSet");
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java Fri Sep 06 15:09:44 2013 -0700
@@ -26,7 +26,6 @@
import static jdk.nashorn.internal.runtime.regexp.joni.Option.isNotBol;
import static jdk.nashorn.internal.runtime.regexp.joni.Option.isNotEol;
import static jdk.nashorn.internal.runtime.regexp.joni.Option.isPosixRegion;
-import static jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper.isCrnl;
import static jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper.isNewLine;
import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
@@ -96,6 +95,7 @@
}
}
+ @Override
protected final int matchAt(int range, int sstart, int sprev) {
this.range = range;
this.sstart = sstart;
@@ -499,7 +499,7 @@
private void opAnyChar() {
if (s >= range) {opFail(); return;}
- if (chars[s] == EncodingHelper.NEW_LINE) {opFail(); return;}
+ if (isNewLine(chars[s])) {opFail(); return;}
s++;
sprev = sbegin; // break;
}
@@ -537,7 +537,7 @@
while (s < range) {
char b = chars[s];
if (c == b) pushAlt(ip + 1, s, sprev);
- if (b == EncodingHelper.NEW_LINE) {opFail(); return;}
+ if (isNewLine(b)) {opFail(); return;}
sprev = s;
s++;
}
@@ -616,7 +616,7 @@
if (s == str) {
if (isNotBol(msaOptions)) opFail();
return;
- } else if (EncodingHelper.isNewLine(chars, sprev, end) && s != end) {
+ } else if (isNewLine(chars, sprev, end) && s != end) {
return;
}
opFail();
@@ -625,7 +625,7 @@
private void opEndLine() {
if (s == end) {
if (Config.USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE) {
- if (str == end || !EncodingHelper.isNewLine(chars, sprev, end)) {
+ if (str == end || !isNewLine(chars, sprev, end)) {
if (isNotEol(msaOptions)) opFail();
}
return;
@@ -633,7 +633,7 @@
if (isNotEol(msaOptions)) opFail();
return;
}
- } else if (isNewLine(chars, s, end) || (Config.USE_CRNL_AS_LINE_TERMINATOR && isCrnl(chars, s, end))) {
+ } else if (isNewLine(chars, s, end)) {
return;
}
opFail();
@@ -652,9 +652,6 @@
}
} else if (isNewLine(chars, s, end) && s + 1 == end) {
return;
- } else if (Config.USE_CRNL_AS_LINE_TERMINATOR && isCrnl(chars, s, end)) {
- int ss = s + 2;
- if (ss == end) return;
}
opFail();
}
@@ -731,8 +728,6 @@
// STRING_CMP
while(n-- > 0) if (chars[pstart++] != chars[s++]) {opFail(); return;}
- int len;
-
// beyond string check
if (sprev < range) {
while (sprev + 1 < s) sprev++;
@@ -768,7 +763,6 @@
if (!stringCmpIC(regex.caseFoldFlag, pstart, this, n, end)) {opFail(); return;}
s = value;
- int len;
// if (sprev < chars.length)
while (sprev + 1 < s) sprev++;
}
@@ -796,8 +790,6 @@
s = swork;
- int len;
-
// beyond string check
if (sprev < range) {
while (sprev + 1 < s) sprev++;
@@ -829,7 +821,6 @@
if (!stringCmpIC(regex.caseFoldFlag, pstart, this, n, end)) continue loop; // STRING_CMP_VALUE_IC
s = value;
- int len;
// if (sprev < chars.length)
while (sprev + 1 < s) sprev++;
@@ -902,7 +893,6 @@
sprev = s;
if (backrefMatchAtNestedLevel(ic != 0, regex.caseFoldFlag, level, tlen, ip)) { // (s) and (end) implicit
- int len;
while (sprev + 1 < s) sprev++;
ip += tlen; // * SIZE_MEMNUM
} else {
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java Fri Sep 06 15:09:44 2013 -0700
@@ -58,6 +58,7 @@
used = orig.used;
}
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append("CodeRange");
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java Fri Sep 06 15:09:44 2013 -0700
@@ -29,7 +29,6 @@
final int INTERNAL_ENC_CASE_FOLD_MULTI_CHAR = (1<<30);
final int ENC_CASE_FOLD_MIN = INTERNAL_ENC_CASE_FOLD_MULTI_CHAR;
final int ENC_CASE_FOLD_DEFAULT = ENC_CASE_FOLD_MIN;
- final boolean USE_CRNL_AS_LINE_TERMINATOR = false;
final boolean USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT = true; /* /(?:()|())*\2/ */
final boolean USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE = true; /* /\n$/ =~ "\n" */
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java Fri Sep 06 15:09:44 2013 -0700
@@ -24,10 +24,12 @@
import java.util.Arrays;
-public class EncodingHelper {
+public final class EncodingHelper {
- public final static char NEW_LINE = 0xa;
- public final static char RETURN = 0xd;
+ final static int NEW_LINE = 0x000a;
+ final static int RETURN = 0x000d;
+ final static int LINE_SEPARATOR = 0x2028;
+ final static int PARAGRAPH_SEPARATOR = 0x2029;
final static char[] EMPTYCHARS = new char[0];
final static int[][] codeRanges = new int[15][];
@@ -64,15 +66,11 @@
}
public static boolean isNewLine(int code) {
- return code == NEW_LINE;
+ return code == NEW_LINE || code == RETURN || code == LINE_SEPARATOR || code == PARAGRAPH_SEPARATOR;
}
public static boolean isNewLine(char[] chars, int p, int end) {
- return p < end && chars[p] == NEW_LINE;
- }
-
- public static boolean isCrnl(char[] chars, int p, int end) {
- return p + 1 < end && chars[p] == RETURN && chars[p + 1] == NEW_LINE;
+ return p < end && isNewLine(chars[p]);
}
// Encoding.prevCharHead
@@ -194,7 +192,7 @@
int type;
switch (ctype) {
case CharacterType.NEWLINE:
- return code == EncodingHelper.NEW_LINE;
+ return isNewLine(code);
case CharacterType.ALPHA:
return (1 << Character.getType(code) & CharacterType.ALPHA_MASK) != 0;
case CharacterType.BLANK:
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java Fri Sep 06 15:09:44 2013 -0700
@@ -139,6 +139,7 @@
}
}
+ @SuppressWarnings("fallthrough")
/* \M-, \C-, \c, or \... */
private int fetchEscapedValue() {
if (!left()) {
@@ -731,7 +732,7 @@
if (syntax.opLineAnchor()) fetchTokenFor_anchor(isSingleline(env.option) ? AnchorType.BEGIN_BUF : AnchorType.BEGIN_LINE);
break;
case '$':
- if (syntax.opLineAnchor()) fetchTokenFor_anchor(isSingleline(env.option) ? AnchorType.SEMI_END_BUF : AnchorType.END_LINE);
+ if (syntax.opLineAnchor()) fetchTokenFor_anchor(isSingleline(env.option) ? AnchorType.END_BUF : AnchorType.END_LINE);
break;
case '[':
if (syntax.opBracketCC()) token.type = TokenType.CC_CC_OPEN;
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java Fri Sep 06 15:09:44 2013 -0700
@@ -141,7 +141,7 @@
continue retry;
}
}
- } else if (!EncodingHelper.isNewLine(chars, p, end) && (!Config.USE_CRNL_AS_LINE_TERMINATOR || !EncodingHelper.isCrnl(chars, p, end))) {
+ } else if (!EncodingHelper.isNewLine(chars, p, end)) {
//if () break;
// goto retry_gate;
pprev = p;
@@ -226,7 +226,7 @@
continue retry;
}
}
- } else if (!EncodingHelper.isNewLine(chars, p, end) && (!Config.USE_CRNL_AS_LINE_TERMINATOR || !EncodingHelper.isCrnl(chars, p, end))) {
+ } else if (!EncodingHelper.isNewLine(chars, p, end)) {
p = EncodingHelper.prevCharHead(adjrange, p);
if (p == -1) return false;
continue retry;
@@ -330,12 +330,6 @@
maxSemiEnd = end;
if (EncodingHelper.isNewLine(chars, preEnd, end)) {
minSemiEnd = preEnd;
- if (Config.USE_CRNL_AS_LINE_TERMINATOR) {
- preEnd = EncodingHelper.stepBack(str, preEnd, 1);
- if (preEnd != -1 && EncodingHelper.isCrnl(chars, preEnd, end)) {
- minSemiEnd = preEnd;
- }
- }
if (minSemiEnd > str && start <= minSemiEnd) {
// !goto end_buf;!
if (endBuf(start, range, minSemiEnd, maxSemiEnd)) return -1; // mismatch_no_msa;
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java Fri Sep 06 15:09:44 2013 -0700
@@ -297,8 +297,6 @@
throw new SyntaxException(ERR_END_PATTERN_IN_GROUP);
}
- boolean listCapture = false;
-
fetch();
switch(c) {
case ':': /* (?:...) grouping only */
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,6 +32,7 @@
this.end = new int[num];
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("Region: \n");
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java Fri Sep 06 15:09:44 2013 -0700
@@ -21,9 +21,6 @@
import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
abstract class ScannerSupport extends IntHolder implements ErrorMessages {
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,14 +28,17 @@
public static final SearchAlgorithm NONE = new SearchAlgorithm() {
+ @Override
public final String getName() {
return "NONE";
}
+ @Override
public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
return textP;
}
+ @Override
public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
return textP;
}
@@ -44,10 +47,12 @@
public static final SearchAlgorithm SLOW = new SearchAlgorithm() {
+ @Override
public final String getName() {
return "EXACT";
}
+ @Override
public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
char[] target = regex.exact;
int targetP = regex.exactP;
@@ -78,6 +83,7 @@
return -1;
}
+ @Override
public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
char[] target = regex.exact;
int targetP = regex.exactP;
@@ -114,10 +120,12 @@
this.caseFoldFlag = regex.caseFoldFlag;
}
+ @Override
public final String getName() {
return "EXACT_IC";
}
+ @Override
public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
char[] target = regex.exact;
int targetP = regex.exactP;
@@ -136,6 +144,7 @@
return -1;
}
+ @Override
public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
char[] target = regex.exact;
int targetP = regex.exactP;
@@ -163,14 +172,16 @@
}
return true;
}
- };
+ }
public static final SearchAlgorithm BM = new SearchAlgorithm() {
+ @Override
public final String getName() {
return "EXACT_BM";
}
+ @Override
public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
char[] target = regex.exact;
int targetP = regex.exactP;
@@ -212,6 +223,7 @@
private static final int BM_BACKWARD_SEARCH_LENGTH_THRESHOLD = 100;
+ @Override
public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
char[] target = regex.exact;
int targetP = regex.exactP;
@@ -263,10 +275,12 @@
public static final SearchAlgorithm MAP = new SearchAlgorithm() {
+ @Override
public final String getName() {
return "MAP";
}
+ @Override
public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
byte[] map = regex.map;
int s = textP;
@@ -278,6 +292,7 @@
return -1;
}
+ @Override
public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
byte[] map = regex.map;
int s = textStart;
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java Fri Sep 06 15:09:44 2013 -0700
@@ -458,7 +458,7 @@
isNull = 0;
break;
} else if (endp != s) {
- isNull = -1;; /* empty, but position changed */
+ isNull = -1; /* empty, but position changed */
}
}
k++;
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java Fri Sep 06 15:09:44 2013 -0700
@@ -24,6 +24,7 @@
*/
public interface WarnCallback {
WarnCallback DEFAULT = new WarnCallback() {
+ @Override
public void warn(String message) {
System.err.println(message);
}
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java Fri Sep 06 15:09:44 2013 -0700
@@ -19,7 +19,6 @@
*/
package jdk.nashorn.internal.runtime.regexp.joni.ast;
-import jdk.nashorn.internal.runtime.regexp.joni.Config;
import jdk.nashorn.internal.runtime.regexp.joni.Option;
import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java Fri Sep 06 15:09:44 2013 -0700
@@ -35,7 +35,7 @@
}
protected void setChild(Node tgt){} // default definition
- protected Node getChild(){return null;}; // default definition
+ protected Node getChild(){return null;} // default definition
public void swap(Node with) {
Node tmp;
@@ -74,6 +74,7 @@
return getName() + ":0x" + Integer.toHexString(System.identityHashCode(this));
}
+ @Override
public final String toString() {
StringBuilder s = new StringBuilder();
s.append("<" + getAddressName() + " (" + (parent == null ? "NULL" : parent.getAddressName()) + ")>");
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java Fri Sep 06 15:09:44 2013 -0700
@@ -223,6 +223,7 @@
other.target = null; // remove target from reduced quantifier
}
+ @SuppressWarnings("fallthrough")
public int setQuantifier(Node tgt, boolean group, ScanEnvironment env, char[] chars, int p, int end) {
if (lower == 1 && upper == 1) return 1;
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java Fri Sep 06 15:09:44 2013 -0700
@@ -19,8 +19,6 @@
*/
package jdk.nashorn.internal.runtime.regexp.joni.exception;
-import jdk.nashorn.internal.runtime.regexp.joni.Config;
-
public interface ErrorMessages {
/* from jcodings */
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties Fri Sep 06 15:09:44 2013 -0700
@@ -94,13 +94,15 @@
type.error.cant.redefine.property=Cannot redefine property "{0}" of {1}
type.error.property.not.writable="{0}" is not a writable property of {1}
type.error.object.non.extensible=Cannot add new property "{0}" to non-extensible {1}
+type.error.__proto__.set.non.extensible=Cannot set __proto__ of non-extensible {0}
+type.error.circular.__proto__.set=Cannot create__proto__ cycle for {0}
# miscellaneous
type.error.regex.cant.supply.flags=Cannot supply flags when constructing one RegExp from another
type.error.inconsistent.property.descriptor=inconsistent property descriptor
type.error.bad.default.value=bad default value: {0}
type.error.function.apply.expects.array=Function.prototype.apply expects an Array for second argument
-type.error.instanceof.on.non.object=instanceof cannot be used on objects without [[HasInstance]]
+type.error.instanceof.on.non.object=instanceof must be called with a javascript or java object as the right-hand argument
type.error.cannot.convert.to.interface=object {0} cannot be converted to {1} due to "{2}"
type.error.array.reduce.invalid.init=invalid initialValue for Array.prototype.reduce
type.error.array.reduceright.invalid.init=invalid initialValue for Array.prototype.reduceRight
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties Fri Sep 06 15:09:44 2013 -0700
@@ -157,6 +157,14 @@
default=false \
}
+nashorn.option.global.per.engine = { \
+ name="--global-per-engine", \
+ desc="Use single Global instance per script engine instance.", \
+ is_undocumented=true, \
+ type=Boolean, \
+ default=false \
+}
+
nashorn.option.log = { \
name="--log", \
is_undocumented=true, \
@@ -216,15 +224,6 @@
default=false \
}
-nashorn.option.package = { \
- name="--package", \
- is_undocumented=true, \
- desc="Package to which generated .class files are added.", \
- params="<package>", \
- type=String, \
- default="" \
-}
-
nashorn.option.parse.only = { \
name="--parse-only", \
is_undocumented=true, \
@@ -289,7 +288,7 @@
nashorn.option.range.analysis = { \
name="--range-analysis", \
is_undocumented=true, \
- desc="Do range analysis using known compile time types, and try to narrow number types" \
+ desc="EXPERIMENTAL: Do range analysis using known compile time types, and try to narrow number types" \
}
nashorn.option.D = { \
@@ -308,12 +307,12 @@
desc="Enable scripting features." \
}
-nashorn.option.specialize.calls = { \
- name="--specialize-calls", \
- is_undocumented=true, \
- type=String, \
- params="[=function_1,...,function_n]", \
- desc="Specialize all or a set of method according to callsite parameter types" \
+nashorn.option.specialize.calls = { \
+ name="--specialize-calls", \
+ is_undocumented=true, \
+ type=String, \
+ params="[=function_1,...,function_n]", \
+ desc="EXPERIMENTAL: Specialize all or a set of method according to callsite parameter types" \
}
nashorn.option.stdout = { \
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Fri Sep 06 15:09:44 2013 -0700
@@ -144,7 +144,7 @@
return Object.getPrototypeOf(this);
},
set: function(x) {
- throw new TypeError("__proto__ set not supported");
+ Object.setPrototypeOf(this, x);
}
});
--- a/nashorn/src/jdk/nashorn/tools/Shell.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java Fri Sep 06 15:09:44 2013 -0700
@@ -34,8 +34,6 @@
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -68,18 +66,7 @@
/**
* Shell message bundle.
*/
- private static ResourceBundle bundle;
-
- static {
- // Without do privileged, under security manager messages can not be
- // loaded.
- bundle = AccessController.doPrivileged(new PrivilegedAction<ResourceBundle>() {
- @Override
- public ResourceBundle run() {
- return ResourceBundle.getBundle(MESSAGE_RESOURCE, Locale.getDefault());
- }
- });
- }
+ private static final ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_RESOURCE, Locale.getDefault());
/**
* Exit code for command line tool - successful
@@ -305,6 +292,14 @@
// For each file on the command line.
for (final String fileName : files) {
+ if ("-".equals(fileName)) {
+ final int res = readEvalPrint(context, global);
+ if (res != SUCCESS) {
+ return res;
+ }
+ continue;
+ }
+
final File file = new File(fileName);
final ScriptFunction script = context.compileScript(new Source(fileName, file.toURI().toURL()), global);
if (script == null || errors.getNumberOfErrors() != 0) {
@@ -450,7 +445,7 @@
continue;
}
- if (res != null && res != ScriptRuntime.UNDEFINED) {
+ if (res != ScriptRuntime.UNDEFINED) {
err.println(JSType.toString(res));
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8019985.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8019985: Date.parse("2000-01-01T00:00:00.Z") should return NaN
+ *
+ * @test
+ * @run
+ */
+
+function testFail(str) {
+ if (!isNaN(Date.parse(str))) {
+ throw new Error("Parsed invalid date string: " + str);
+ }
+}
+
+function testOk(str) {
+ if (isNaN(Date.parse(str))) {
+ throw new Error("Failed to parse valid date string: " + str);
+ }
+}
+
+testFail("2000-01-01T00:00:00.Z");
+testFail("2000-01-01T00:00:Z");
+testFail("2000-01-01T00:Z");
+testFail("2000-01-01T00Z");
+testOk("2000-01-01T00:00:00.000Z");
+testOk("2000-01-01T00:00:00.0Z");
+testOk("2000-01-01T00:00:00Z");
+testOk("2000-01-01T00:00Z");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8019987.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,171 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8019987: String trimRight and trimLeft could be defined.
+ *
+ * @test
+ * @run
+ */
+
+var TESTSTRING = "abcde";
+
+var SPACES = " ";
+var TESTSTRING_LEFT_SPACES = SPACES + TESTSTRING;
+var TESTSTRING_RIGHT_SPACES = TESTSTRING + SPACES;
+var TESTSTRING_BOTH_SPACES = SPACES + TESTSTRING + SPACES;
+var TESTSTRING_MIDDLE_SPACES = TESTSTRING + SPACES + TESTSTRING;
+
+var WHITESPACE =
+ " \t" + // space and tab
+ "\n\r" + // newline and return
+ "\u2028" + // line separator
+ "\u2029" + // paragraph separator
+ "\u000b" + // tabulation line
+ "\u000c" + // ff (ctrl-l)
+ "\u00a0" + // Latin-1 space
+ "\u1680" + // Ogham space mark
+ "\u180e" + // separator, Mongolian vowel
+ "\u2000" + // en quad
+ "\u2001" + // em quad
+ "\u2002" + // en space
+ "\u2003" + // em space
+ "\u2004" + // three-per-em space
+ "\u2005" + // four-per-em space
+ "\u2006" + // six-per-em space
+ "\u2007" + // figure space
+ "\u2008" + // punctuation space
+ "\u2009" + // thin space
+ "\u200a" + // hair space
+ "\u202f" + // narrow no-break space
+ "\u205f" + // medium mathematical space
+ "\u3000" + // ideographic space
+ "\ufeff"; // byte order mark
+var TESTSTRING_LEFT_WHITESPACE = WHITESPACE + TESTSTRING;
+var TESTSTRING_RIGHT_WHITESPACE = TESTSTRING + WHITESPACE;
+var TESTSTRING_BOTH_WHITESPACE = WHITESPACE + TESTSTRING + WHITESPACE;
+var TESTSTRING_MIDDLE_WHITESPACE = TESTSTRING + WHITESPACE + TESTSTRING;
+
+function escape(string) {
+ var sb = new java.lang.StringBuilder();
+ sb.append("\"");
+
+ for (var i = 0; i < string.length; i++) {
+ var ch = string.charAt(i);
+
+ switch (ch) {
+ case '\\':
+ sb.append("\\\\");
+ break;
+ case '"':
+ sb.append("\\\"");
+ break;
+ case '\'':
+ sb.append("\\\'");
+ break;
+ case '\b':
+ sb.append("\\b");
+ break;
+ case '\f':
+ sb.append("\\f");
+ break;
+ case '\n':
+ sb.append("\\n");
+ break;
+ case '\r':
+ sb.append("\\r");
+ break;
+ case '\t':
+ sb.append("\\t");
+ break;
+ default:
+ var code = string.charCodeAt(i);
+
+ if (code < 0x20 || code >= 0xFF) {
+ sb.append("\\u");
+
+ var hex = java.lang.Integer.toHexString(code);
+ for (var i = hex.length; i < 4; i++) {
+ sb.append('0');
+ }
+ sb.append(hex);
+ } else {
+ sb.append(ch);
+ }
+
+ break;
+ }
+ }
+
+ sb.append("\"");
+
+ return sb.toString();
+}
+
+var count = 0;
+function test(expected, trimmed) {
+ count++;
+ if (trimmed != expected) {
+ print(count + ": Expected: " + escape(expected) + ", found: " + escape(trimmed));
+ }
+}
+
+test("", SPACES.trim());
+test("", SPACES.trimLeft());
+test("", SPACES.trimRight());
+
+test(TESTSTRING, TESTSTRING_LEFT_SPACES.trim());
+test(TESTSTRING, TESTSTRING_LEFT_SPACES.trimLeft());
+test(TESTSTRING_LEFT_SPACES, TESTSTRING_LEFT_SPACES.trimRight());
+
+test(TESTSTRING, TESTSTRING_RIGHT_SPACES.trim());
+test(TESTSTRING_RIGHT_SPACES, TESTSTRING_RIGHT_SPACES.trimLeft());
+test(TESTSTRING, TESTSTRING_RIGHT_SPACES.trimRight());
+
+test(TESTSTRING, TESTSTRING_BOTH_SPACES.trim());
+test(TESTSTRING_RIGHT_SPACES, TESTSTRING_BOTH_SPACES.trimLeft());
+test(TESTSTRING_LEFT_SPACES, TESTSTRING_BOTH_SPACES.trimRight());
+
+test(TESTSTRING_MIDDLE_SPACES, TESTSTRING_MIDDLE_SPACES.trim());
+test(TESTSTRING_MIDDLE_SPACES, TESTSTRING_MIDDLE_SPACES.trimLeft());
+test(TESTSTRING_MIDDLE_SPACES, TESTSTRING_MIDDLE_SPACES.trimRight());
+
+test("", WHITESPACE.trim());
+test("", WHITESPACE.trimLeft());
+test("", WHITESPACE.trimRight());
+
+test(TESTSTRING, TESTSTRING_LEFT_WHITESPACE.trim());
+test(TESTSTRING, TESTSTRING_LEFT_WHITESPACE.trimLeft());
+test(TESTSTRING_LEFT_WHITESPACE, TESTSTRING_LEFT_WHITESPACE.trimRight());
+
+test(TESTSTRING, TESTSTRING_RIGHT_WHITESPACE.trim());
+test(TESTSTRING_RIGHT_WHITESPACE, TESTSTRING_RIGHT_WHITESPACE.trimLeft());
+test(TESTSTRING, TESTSTRING_RIGHT_WHITESPACE.trimRight());
+
+test(TESTSTRING, TESTSTRING_BOTH_WHITESPACE.trim());
+test(TESTSTRING_RIGHT_WHITESPACE, TESTSTRING_BOTH_WHITESPACE.trimLeft());
+test(TESTSTRING_LEFT_WHITESPACE, TESTSTRING_BOTH_WHITESPACE.trimRight());
+
+test(TESTSTRING_MIDDLE_WHITESPACE, TESTSTRING_MIDDLE_WHITESPACE.trim());
+test(TESTSTRING_MIDDLE_WHITESPACE, TESTSTRING_MIDDLE_WHITESPACE.trimLeft());
+test(TESTSTRING_MIDDLE_WHITESPACE, TESTSTRING_MIDDLE_WHITESPACE.trimRight());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8020355.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8020355: bind on built-in constructors don't use bound argument values
+ *
+ * @test
+ * @run
+ */
+
+if (Array.bind(null, 2)().length != 2) {
+ fail("Expected Array.bind(null, 2)().length to be 2");
+}
+
+if (RegExp.bind(null, "a")().source.length != 1) {
+ fail("Expected RegExp.bind(null, 'a')().source.length to be 1");
+}
+
+// check user defined functions as well
+
+var res = (function(x, y) { return x*y }).bind(null, 20, 30)();
+if (res != 600) {
+ fail("Expected 600, but got " + res);
+}
+
+var obj = new ((function(x, y) { this.foo = x*y }).bind({}, 20, 30))();
+if (obj.foo != 600) {
+ fail("Expected this.foo = 600, but got " + res);
+}
+
+// try variadic function as well
+
+var res = (function() { return arguments[0]*arguments[1] }).bind(null, 20, 30)();
+if (res != 600) {
+ fail("Expected 600, but got " + res);
+}
+
+var obj = new ((function(x, y) { this.foo = arguments[0]*arguments[1] }).bind({}, 20, 30))();
+if (obj.foo != 600) {
+ fail("Expected this.foo = 600, but got " + res);
+}
+
+
--- a/nashorn/test/script/basic/JDK-8020357.js Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/script/basic/JDK-8020357.js Fri Sep 06 15:09:44 2013 -0700
@@ -33,17 +33,6 @@
var limit = Math.pow(2, UNSIGNED_INT_BITS)/BYTES_PER_INT_32
-try {
- // A value at or under the limit should either succeed if we have
- // enough heap, or throw an OutOfMemoryError if we don't.
- Int32Array(limit - 1)
-} catch(e) {
- if(!(e instanceof java.lang.OutOfMemoryError)) {
- // Only print an unexpected result; OutOfMemoryError is expected
- print(e)
- }
-}
-
// A value over the limit should throw a RangeError.
try {
Int32Array(limit)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8022598.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8022598: Object.getPrototypeOf should return null for host objects rather than throwing TypeError
+ *
+ * @test
+ * @run
+ */
+
+// the following should not throw TypeError, just return null instead
+
+var proto = Object.getPrototypeOf(new java.lang.Object());
+if (proto !== null) {
+ fail("Expected 'null' __proto__ for host objects");
+}
+
+// on primitive should result in TypeError
+
+function checkTypeError(obj) {
+ try {
+ Object.getPrototypeOf(obj);
+ fail("Expected TypeError for Object.getPrototypeOf on " + obj);
+ } catch (e) {
+ if (! (e instanceof TypeError)) {
+ fail("Expected TypeError, but got " + e);
+ }
+ }
+}
+
+checkTypeError(undefined);
+checkTypeError(null);
+checkTypeError(3.1415);
+checkTypeError("hello");
+checkTypeError(false);
+checkTypeError(true);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8022731.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8022731: NativeArguments has wrong implementation of isMapped()
+ *
+ * @test
+ * @run
+ */
+
+Object.defineProperty(Object.prototype, "0", {value: "proto"});
+
+function test0(a, b) {
+ Object.defineProperty(arguments, "1", {get: function() { return "get" }});
+ return arguments[0];
+}
+
+function test1(a, b) {
+ Object.defineProperty(arguments, "0", {get: function() { return "get" }});
+ return a;
+}
+
+function test2(a, b) {
+ Object.defineProperty(arguments, "0", {value: "value"});
+ delete arguments[0];
+ return a;
+}
+
+function test3(a, b) {
+ arguments[1] = "arg1";
+ return b;
+}
+
+function test4(a, b) {
+ b = "b";
+ return arguments[1];
+}
+
+function test5(a, b) {
+ Object.defineProperty(arguments, "0", {value: "value"});
+ arguments[0] = "new";
+ return a;
+}
+
+function test6(a, b) {
+ Object.defineProperty(arguments, "0", {value: "value"});
+ arguments[0] = "new";
+ delete arguments[0];
+ return a;
+}
+
+function test7(a, b) {
+ Object.defineProperty(arguments, "0", {value: "value", writable: false});
+ arguments[0] = "new";
+ return a;
+}
+
+print(test0());
+print(test0("p1", "p2"));
+print(test1());
+print(test1("p1"));
+print(test2());
+print(test2("p1"));
+print(test3());
+print(test3(1, 2));
+print(test4());
+print(test4("p1", "p2"));
+print(test5());
+print(test5("p1"));
+print(test6());
+print(test6("p1"));
+print(test7());
+print(test7("p1"));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8022731.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,16 @@
+proto
+p1
+undefined
+p1
+undefined
+value
+undefined
+arg1
+undefined
+b
+undefined
+new
+undefined
+new
+undefined
+value
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8022903.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8022903: Enhance for-in and for-each for Lists and Maps
+ *
+ * @test
+ * @run
+ */
+
+var colors = new java.util.ArrayList()
+colors.add("red")
+colors.add("purple")
+colors.add("pink")
+
+for(var index in colors) {
+ print("colors[" + index + "]=" + colors[index])
+}
+
+for each(var color in colors) {
+ print(color)
+}
+
+var capitals = new java.util.LinkedHashMap()
+capitals.Sweden = "Stockholm"
+capitals.Hungary = "Budapet"
+capitals.Croatia = "Zagreb"
+
+for(var key in capitals) {
+ print("capital of " + key + " is " + capitals[key])
+}
+
+for each(var capital in capitals) {
+ print(capital)
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8022903.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,12 @@
+colors[0]=red
+colors[1]=purple
+colors[2]=pink
+red
+purple
+pink
+capital of Sweden is Stockholm
+capital of Hungary is Budapet
+capital of Croatia is Zagreb
+Stockholm
+Budapet
+Zagreb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023026.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023026: Array.prototype iterator functions like forEach, reduce should work for Java arrays, lists
+ *
+ * @test
+ * @run
+ */
+
+function checkIterations(obj) {
+ if (typeof obj.getClass == 'function') {
+ print("iterating on an object of " + obj.getClass());
+ } else {
+ print("iterating on " + String(obj));
+ }
+
+ Array.prototype.forEach.call(obj,
+ function(x) { print("forEach " + x); });
+
+ print("left sum " + Array.prototype.reduce.call(obj,
+ function(x, y) { print("reduce", x, y); return x + y; }));
+
+ print("right sum " + Array.prototype.reduceRight.call(obj,
+ function(x, y) { print("reduceRight", x, y); return x + y; }));
+
+ print("squared " + Array.prototype.map.call(obj,
+ function(x) x*x));
+}
+
+var array = new (Java.type("[I"))(4);
+for (var i in array) {
+ array[i] = i;
+}
+
+checkIterations(array);
+
+var list = new java.util.ArrayList();
+list.add(1);
+list.add(3);
+list.add(5);
+list.add(7);
+
+checkIterations(list);
+
+var mirror = loadWithNewGlobal({
+ name: "test",
+ script: "[2, 4, 6, 8]"
+});
+
+checkIterations(mirror);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023026.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,42 @@
+iterating on an object of class [I
+forEach 0
+forEach 1
+forEach 2
+forEach 3
+reduce 0 1
+reduce 1 2
+reduce 3 3
+left sum 6
+reduceRight 3 2
+reduceRight 5 1
+reduceRight 6 0
+right sum 6
+squared 0,1,4,9
+iterating on an object of class java.util.ArrayList
+forEach 1
+forEach 3
+forEach 5
+forEach 7
+reduce 1 3
+reduce 4 5
+reduce 9 7
+left sum 16
+reduceRight 7 5
+reduceRight 12 3
+reduceRight 15 1
+right sum 16
+squared 1,9,25,49
+iterating on [object Array]
+forEach 2
+forEach 4
+forEach 6
+forEach 8
+reduce 2 4
+reduce 6 6
+reduce 12 8
+left sum 20
+reduceRight 8 6
+reduceRight 14 4
+reduceRight 18 2
+right sum 20
+squared 4,16,36,64
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023368.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023368: Instance __proto__ property should exist and be writable.
+ *
+ * @test
+ * @run
+ */
+
+load("nashorn:mozilla_compat.js");
+
+// function to force same callsites
+function check(obj) {
+ print(obj.func());
+ print(obj.x);
+ print(obj.toString());
+}
+
+function Func() {
+}
+
+Func.prototype.func = function() {
+ return "Func.prototype.func";
+}
+
+Func.prototype.x = "hello";
+
+var obj = new Func();
+var obj2 = Object.create(obj);
+
+// check direct and indirect __proto__ change
+check(obj);
+check(obj2);
+obj.__proto__ = {
+ func: function() {
+ return "obj.__proto__.func @ " + __LINE__;
+ },
+ x: 344
+};
+
+check(obj);
+check(obj2);
+
+// check indirect (1 and 2 levels) __proto__ function change
+obj.__proto__.__proto__ = {
+ toString: function() {
+ return "new object.toString";
+ }
+};
+
+check(obj);
+check(obj2);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023368.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,18 @@
+Func.prototype.func
+hello
+[object Object]
+Func.prototype.func
+hello
+[object Object]
+obj.__proto__.func @ 57
+344
+[object Object]
+obj.__proto__.func @ 57
+344
+[object Object]
+obj.__proto__.func @ 57
+344
+new object.toString
+obj.__proto__.func @ 57
+344
+new object.toString
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023368_2.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023368: Instance __proto__ property should exist and be writable.
+ *
+ * @test
+ * @run
+ */
+
+// check Object.setPrototypeOf extension rather than using __proto__
+
+// function to force same callsites
+function check(obj) {
+ print(obj.func());
+ print(obj.x);
+ print(obj.toString());
+}
+
+function Func() {
+}
+
+Func.prototype.func = function() {
+ return "Func.prototype.func";
+}
+
+Func.prototype.x = "hello";
+
+var obj = new Func();
+var obj2 = Object.create(obj);
+
+// check direct and indirect __proto__ change
+check(obj);
+check(obj2);
+Object.setPrototypeOf(obj, {
+ func: function() {
+ return "obj.__proto__.func @ " + __LINE__;
+ },
+ x: 344
+});
+
+check(obj);
+check(obj2);
+
+// check indirect (1 and 2 levels) __proto__ function change
+Object.setPrototypeOf(Object.getPrototypeOf(obj), {
+ toString: function() {
+ return "new object.toString";
+ }
+});
+
+check(obj);
+check(obj2);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023368_2.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,18 @@
+Func.prototype.func
+hello
+[object Object]
+Func.prototype.func
+hello
+[object Object]
+obj.__proto__.func @ 57
+344
+[object Object]
+obj.__proto__.func @ 57
+344
+[object Object]
+obj.__proto__.func @ 57
+344
+new object.toString
+obj.__proto__.func @ 57
+344
+new object.toString
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023373.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023373: allow super invocation for adapters
+ *
+ * @test
+ * @run
+ */
+
+var CharArray = Java.type("char[]")
+var jString = Java.type("java.lang.String")
+var Character = Java.type("java.lang.Character")
+
+function capitalize(s) {
+ if(s instanceof CharArray) {
+ return new jString(s).toUpperCase()
+ }
+ if(s instanceof jString) {
+ return s.toUpperCase()
+ }
+ return Character.toUpperCase(s) // must be int
+}
+
+var sw = new (Java.type("java.io.StringWriter"))
+
+var FilterWriterAdapter = Java.extend(Java.type("java.io.FilterWriter"))
+
+var cw = new FilterWriterAdapter(sw) {
+ write: function(s, off, len) {
+ s = capitalize(s)
+ // Must handle overloads by arity
+ if(off === undefined) {
+ cw.super$write(s, 0, s.length())
+ } else if (typeof s === "string") {
+ cw.super$write(s, off, len)
+ }
+ }
+}
+
+cw.write("abcd")
+cw.write("e".charAt(0))
+cw.write("fgh".toCharArray())
+cw.write("**ijk**", 2, 3)
+cw.write("***lmno**".toCharArray(), 3, 4)
+cw.flush()
+print(sw)
+
+// Can invoke super for Object methods
+print("cw has super hashCode(): " + (typeof cw.super$hashCode === "function"))
+print("cw has super equals(): " + (typeof cw.super$equals === "function"))
+// Can't invoke super for final methods
+print("cw has no super getClass(): " + (typeof cw.super$getClass === "undefined"))
+print("cw has no super wait(): " + (typeof cw.super$wait === "undefined"))
+
+var r = new (Java.type("java.lang.Runnable"))(function() {})
+// Can't invoke super for abstract methods
+print("r has no super run(): " + (typeof r.super$run === "undefined"))
+// Interfaces can also invoke super Object methods
+print("r has super hashCode(): " + (typeof r.super$hashCode === "function"))
+print("r has super equals(): " + (typeof r.super$equals === "function"))
+// But still can't invoke final methods
+print("r has no super getClass(): " + (typeof r.super$getClass === "undefined"))
+print("r has no super wait(): " + (typeof r.super$wait === "undefined"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023373.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,10 @@
+ABCDEFGHIJKLMNO
+cw has super hashCode(): true
+cw has super equals(): true
+cw has no super getClass(): true
+cw has no super wait(): true
+r has no super run(): true
+r has super hashCode(): true
+r has super equals(): true
+r has no super getClass(): true
+r has no super wait(): true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023531.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023531: new RegExp('').toString() should return '/(?:)/'
+ *
+ * @test
+ * @run
+ */
+
+if (new RegExp("").toString() !== "/(?:)/") {
+ throw new Error();
+} else if (!(new RegExp("").test(""))) {
+ throw new Error();
+}
+
+if (new RegExp("", "g").toString() !== "/(?:)/g") {
+ throw new Error();
+} else if (!(new RegExp("", "g").test(""))) {
+ throw new Error();
+}
+
+if (new RegExp("", "i").toString() !== "/(?:)/i") {
+ throw new Error();
+} else if (!(new RegExp("", "i").test(""))) {
+ throw new Error();
+}
+
+if (new RegExp("", "m").toString() !== "/(?:)/m") {
+ throw new Error();
+} else if (!(new RegExp("", "m").test(""))) {
+ throw new Error();
+}
+
+if (RegExp("").toString() !== "/(?:)/") {
+ throw new Error();
+} else if (!RegExp("").test("")) {
+ throw new Error();
+}
+
+if (RegExp("", "g").toString() !== "/(?:)/g") {
+ throw new Error();
+} else if (!RegExp("", "g").test("")) {
+ throw new Error();
+}
+
+if (RegExp("", "i").toString() !== "/(?:)/i") {
+ throw new Error();
+} else if (!RegExp("", "i").test("")) {
+ throw new Error();
+}
+
+if (RegExp("", "m").toString() !== "/(?:)/m") {
+ throw new Error();
+} else if (!RegExp("", "m").test("")) {
+ throw new Error();
+}
+
+var re = /abc/;
+re.compile("");
+if (re.toString() !== "/(?:)/") {
+ throw new Error();
+} else if (!re.test("")) {
+ throw new Error();
+}
+
+re.compile("", "g");
+if (re.toString() !== "/(?:)/g") {
+ throw new Error();
+} else if (!re.test("")) {
+ throw new Error();
+}
+
+re.compile("", "i");
+if (re.toString() !== "/(?:)/i") {
+ throw new Error();
+} else if (!re.test("")) {
+ throw new Error();
+}
+
+re.compile("", "m");
+if (re.toString() !== "/(?:)/m") {
+ throw new Error();
+} else if (!re.test("")) {
+ throw new Error();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023551.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023551: Mirror functions can not be invoked using invokeMethod, invokeFunction
+ *
+ * @test
+ * @run
+ */
+
+var m = new javax.script.ScriptEngineManager();
+var e = m.getEngineByName("nashorn");
+
+function func(x) {
+ print("func: " + x);
+}
+
+e.put("func", func);
+e.invokeFunction("func", "hello");
+
+var obj = e.eval("({ foo: func })");
+e.invokeMethod(obj, "foo", "world");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023551.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,2 @@
+func: hello
+func: world
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023630.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023630: Implement Java.super() as the preferred way to call super methods
+ *
+ * @test
+ * @run
+ */
+
+var CharArray = Java.type("char[]")
+var jString = Java.type("java.lang.String")
+var Character = Java.type("java.lang.Character")
+
+function capitalize(s) {
+ if(s instanceof CharArray) {
+ return new jString(s).toUpperCase()
+ }
+ if(s instanceof jString) {
+ return s.toUpperCase()
+ }
+ return Character.toUpperCase(s) // must be int
+}
+
+var sw = new (Java.type("java.io.StringWriter"))
+
+var FilterWriterAdapter = Java.extend(Java.type("java.io.FilterWriter"))
+
+var cw = new FilterWriterAdapter(sw) {
+ write: function(s, off, len) {
+ s = capitalize(s)
+ // Must handle overloads by arity
+ if(off === undefined) {
+ cw_super.write(s, 0, s.length())
+ } else if (typeof s === "string") {
+ cw_super.write(s, off, len)
+ }
+ }
+}
+var cw_super = Java.super(cw)
+
+cw.write("abcd")
+cw.write("e".charAt(0))
+cw.write("fgh".toCharArray())
+cw.write("**ijk**", 2, 3)
+cw.write("***lmno**".toCharArray(), 3, 4)
+cw.flush()
+print(sw)
+
+// Can invoke super for Object methods
+print("cw_super has hashCode(): " + (typeof cw_super.hashCode === "function"))
+print("cw_super has super equals(): " + (typeof cw_super.equals === "function"))
+// Can't invoke super for final methods
+print("cw_super has no getClass(): " + (typeof cw_super.getClass === "undefined"))
+print("cw_super has no wait(): " + (typeof cw_super.wait === "undefined"))
+
+var r = new (Java.type("java.lang.Runnable"))(function() {})
+var r_super = Java.super(r)
+
+// Can't invoke super for abstract methods
+print("r_super has no run(): " + (typeof r_super.run === "undefined"))
+// Interfaces can also invoke super Object methods
+print("r_super has hashCode(): " + (typeof r_super.hashCode === "function"))
+print("r_super has equals(): " + (typeof r_super.equals === "function"))
+// But still can't invoke final methods
+print("r_super has no getClass(): " + (typeof r_super.getClass === "undefined"))
+print("r_super has no wait(): " + (typeof r_super.wait === "undefined"))
+
+var name = "write"
+print("cw_super can access write through [] getter: " + (typeof cw_super[name] === "function"))
+var name = "hashCode"
+print("cw_super can access hashCode through [] getter: " + (typeof cw_super[name] === "function"))
+var name = "getClass"
+print("cw_super can not access getClass through [] getter: " + (typeof cw_super[name] === "undefined"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023630.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,13 @@
+ABCDEFGHIJKLMNO
+cw_super has hashCode(): true
+cw_super has super equals(): true
+cw_super has no getClass(): true
+cw_super has no wait(): true
+r_super has no run(): true
+r_super has hashCode(): true
+r_super has equals(): true
+r_super has no getClass(): true
+r_super has no wait(): true
+cw_super can access write through [] getter: true
+cw_super can access hashCode through [] getter: true
+cw_super can not access getClass through [] getter: true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023650.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023650: Regexp m flag does not recognize CRNL or CR
+ *
+ * @test
+ * @run
+ */
+
+if (!/^Connection: close$/m.test('\r\n\r\nConnection: close\r\n\r\n')) {
+ throw new Error();
+}
+
+if (!/^Connection: close$/m.test('\n\nConnection: close\n\n')) {
+ throw new Error();
+}
+
+if (!/^Connection: close$/m.test('\r\rConnection: close\r\r')) {
+ throw new Error();
+}
+
+if (!/^Connection: close$/m.test('\u2028\u2028Connection: close\u2028\u2028')) {
+ throw new Error();
+}
+
+if (!/^Connection: close$/m.test('\u2029\u2029Connection: close\u2029\u2029')) {
+ throw new Error();
+}
+
+var result = /a(.*)/.exec("a\r");
+if (!result || result[0] != 'a' || result[1] != '') {
+ throw new Error();
+}
+
+result = /a(.*)/m.exec("a\r");
+if (!result || result[0] != 'a' || result[1] != '') {
+ throw new Error();
+}
+
+result = /a(.*)/.exec("a\n");
+if (!result || result[0] != 'a' || result[1] != '') {
+ throw new Error();
+}
+
+result = /a(.*)/m.exec("a\n");
+if (!result || result[0] != 'a' || result[1] != '') {
+ throw new Error();
+}
+
+result = /a(.*)/.exec("a\r\n");
+if (!result || result[0] != 'a' || result[1] != '') {
+ throw new Error();
+}
+
+result = /a(.*)/m.exec("a\r\n");
+if (!result || result[0] != 'a' || result[1] != '') {
+ throw new Error();
+}
+
+result = /a(.*)/.exec("a\u2028");
+if (!result || result[0] != 'a' || result[1] != '') {
+ throw new Error();
+}
+
+result = /a(.*)/m.exec("a\u2029");
+if (!result || result[0] != 'a' || result[1] != '') {
+ throw new Error();
+}
+
+if (/a$/.test("a\n")) {
+ throw new Error();
+}
+
+if (/a$/.test("a\r")) {
+ throw new Error();
+}
+
+if (/a$/.test("a\r\n")) {
+ throw new Error();
+}
+
+if (/a$/.test("a\u2028")) {
+ throw new Error();
+}
+
+if (/a$/.test("a\u2029")) {
+ throw new Error();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023780.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023780: Gracefully handle @CS methods while binding bean properties
+ *
+ * @test
+ * @run
+ */
+
+var obj = {}
+Object.bindProperties(obj, java.lang.Thread.currentThread());
+
+print(typeof obj.getName === "function")
+print(typeof obj.getCurrentContext === "undefined")
+
+print(Object.hasOwnProperty("name"))
+print(!Object.hasOwnProperty("currentContext"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023780.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,4 @@
+true
+true
+true
+true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023784.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023784: Object.prototype.toString should contain the class name for all instances
+ *
+ * @test
+ * @run
+ */
+
+// two parts to this bug -- typed array don't have proper [[Class]] property
+
+print(Object.prototype.toString.call(new ArrayBuffer(1)));
+print(Object.prototype.toString.call(new Int8Array(1)));
+print(Object.prototype.toString.call(new Int16Array(1)));
+print(Object.prototype.toString.call(new Int32Array(1)));
+print(Object.prototype.toString.call(new Uint8Array(1)));
+print(Object.prototype.toString.call(new Uint8ClampedArray(1)));
+print(Object.prototype.toString.call(new Uint16Array(1)));
+print(Object.prototype.toString.call(new Uint32Array(1)));
+print(Object.prototype.toString.call(new Float32Array(1)));
+print(Object.prototype.toString.call(new Float64Array(1)));
+
+// second part is that Object.prototype.toString does not handle mirror
+// in the manner expected.
+
+var global = loadWithNewGlobal({
+ name: "test",
+ script: "this"
+});
+
+print(Object.prototype.toString.call(new global.Object()));
+print(Object.prototype.toString.call(new global.Array()));
+print(Object.prototype.toString.call(new global.RegExp()));
+print(Object.prototype.toString.call(new global.Error("error!")));
+print(Object.prototype.toString.call(global.Object));
+print(Object.prototype.toString.call(new global.ArrayBuffer(1)));
+print(Object.prototype.toString.call(new global.Int8Array(1)));
+print(Object.prototype.toString.call(new global.Int16Array(1)));
+print(Object.prototype.toString.call(new global.Int32Array(1)));
+print(Object.prototype.toString.call(new global.Uint8Array(1)));
+print(Object.prototype.toString.call(new global.Uint8ClampedArray(1)));
+print(Object.prototype.toString.call(new global.Uint16Array(1)));
+print(Object.prototype.toString.call(new global.Uint32Array(1)));
+print(Object.prototype.toString.call(new global.Float32Array(1)));
+print(Object.prototype.toString.call(new global.Float64Array(1)));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8023784.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,25 @@
+[object ArrayBuffer]
+[object Int8Array]
+[object Int16Array]
+[object Int32Array]
+[object Uint8Array]
+[object Uint8ClampedArray]
+[object Uint16Array]
+[object Uint32Array]
+[object Float32Array]
+[object Float64Array]
+[object Object]
+[object Array]
+[object RegExp]
+[object Error]
+[object Function]
+[object ArrayBuffer]
+[object Int8Array]
+[object Int16Array]
+[object Int32Array]
+[object Uint8Array]
+[object Uint8ClampedArray]
+[object Uint16Array]
+[object Uint32Array]
+[object Float32Array]
+[object Float64Array]
--- a/nashorn/test/script/basic/NASHORN-377.js.EXPECTED Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/script/basic/NASHORN-377.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -1,5 +1,5 @@
8 8 true undefined
-[object Object] [object Object] [object Object]
+[object ArrayBuffer] [object ArrayBuffer] [object Int8Array]
0 8 8 1
0 8 8 1
0 8 8 1
--- a/nashorn/test/script/basic/NASHORN-397.js Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/script/basic/NASHORN-397.js Fri Sep 06 15:09:44 2013 -0700
@@ -35,7 +35,10 @@
fail("typeof(5).x is not 'number'");
}
-if (typeof (java.lang.System.out) != 'object') {
+// It is function because PrintStream implements Closeable, which is
+// marked with @FunctionalInterface. Yes, this means calling a stream
+// like "stream()" closes it.
+if (typeof (java.lang.System.out) != 'function') {
fail("typeof java.lang.System.out is not 'object'");
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/circular_proto.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023368: Instance __proto__ property should exist and be writable.
+ *
+ * @test
+ * @run
+ */
+
+// check that we cannot create __proto__ cycle
+load("nashorn:mozilla_compat.js");
+
+var obj = {};
+var obj2 = Object.create(obj);
+
+// attempt to create __proto__ cycle
+try {
+ obj.__proto__ = obj2;
+ fail("Should have thrown TypeError");
+} catch (e) {
+ if (! (e instanceof TypeError)) {
+ fail("Expected TypeError, got " + e);
+ }
+ print(e);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/circular_proto.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,1 @@
+TypeError: Cannot create__proto__ cycle for [object Object]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/mirror_proto_assign.js Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8023368: Instance __proto__ property should exist and be writable.
+ *
+ * @test
+ * @run
+ */
+
+// check that Object.setPrototypeOf works for mirror objects as well.
+
+var global = loadWithNewGlobal({
+ name: "test",
+ script: "var obj = {}; this"
+});
+
+var proto = global.eval("({ foo: 323 })");
+
+Object.setPrototypeOf(global.obj, proto);
+
+function func(obj) {
+ // check proto inherited value
+ print("obj.foo = " + obj.foo);
+}
+
+func(global.obj);
+
+var newProto = global.eval("({ foo: 'hello' })");
+Object.setPrototypeOf(global.obj, newProto);
+
+func(global.obj);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/mirror_proto_assign.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,2 @@
+obj.foo = 323
+obj.foo = hello
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/nonextensible_proto_assign.js Fri Sep 06 15:09:44 2013 -0700
@@ -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.
+ */
+
+/**
+ * JDK-8023368: Instance __proto__ property should exist and be writable.
+ *
+ * @test
+ * @run
+ */
+
+load("nashorn:mozilla_compat.js")
+
+// check that we cannot assign to __proto__ of a non-extensible object
+try {
+ var obj = {}
+ Object.preventExtensions(obj);
+ obj.__proto__ = { };
+ fail("Should have thrown TypeError");
+} catch (e) {
+ if (! (e instanceof TypeError)) {
+ fail("Expected TypeError, got " + e);
+ }
+ print(e);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/nonextensible_proto_assign.js.EXPECTED Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,1 @@
+TypeError: Cannot set __proto__ of non-extensible [object Object]
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,6 +33,7 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import org.testng.TestNG;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -44,7 +45,7 @@
public class BooleanAccessTest {
private static ScriptEngine e = null;
- private static SharedObject o = new SharedObject();
+ private static SharedObject o = null;
public static void main(final String[] args) {
TestNG.main(args);
@@ -54,10 +55,17 @@
public static void setUpClass() throws ScriptException {
final ScriptEngineManager m = new ScriptEngineManager();
e = m.getEngineByName("nashorn");
+ o = new SharedObject();
e.put("o", o);
e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
}
+ @AfterClass
+ public static void tearDownClass() {
+ e = null;
+ o = null;
+ }
+
@Test
public void accessFieldBoolean() throws ScriptException {
e.eval("var p_boolean = o.publicBoolean;");
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -36,6 +36,7 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import org.testng.TestNG;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -47,7 +48,7 @@
public class MethodAccessTest {
private static ScriptEngine e = null;
- private static SharedObject o = new SharedObject();
+ private static SharedObject o = null;
public static void main(final String[] args) {
TestNG.main(args);
@@ -57,12 +58,19 @@
public static void setUpClass() throws ScriptException {
final ScriptEngineManager m = new ScriptEngineManager();
e = m.getEngineByName("nashorn");
+ o = new SharedObject();
o.setEngine(e);
e.put("o", o);
e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.Person;");
}
+ @AfterClass
+ public static void tearDownClass() {
+ e = null;
+ o = null;
+ }
+
@Test
public void accessMethodthrowsCheckedException() throws ScriptException {
e.eval("try {" +
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -33,6 +33,7 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import org.testng.TestNG;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -44,7 +45,7 @@
public class NumberAccessTest {
private static ScriptEngine e = null;
- private static SharedObject o = new SharedObject();
+ private static SharedObject o = null;
public static void main(final String[] args) {
TestNG.main(args);
@@ -54,10 +55,17 @@
public static void setUpClass() throws ScriptException {
final ScriptEngineManager m = new ScriptEngineManager();
e = m.getEngineByName("nashorn");
+ o = new SharedObject();
e.put("o", o);
e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
}
+ @AfterClass
+ public static void tearDownClass() {
+ e = null;
+ o = null;
+ }
+
// --------------------------------long
// tests------------------------------------
@Test
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,6 +32,7 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import org.testng.TestNG;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -43,7 +44,7 @@
public class NumberBoxingTest {
private static ScriptEngine e = null;
- private static SharedObject o = new SharedObject();
+ private static SharedObject o = null;
public static void main(final String[] args) {
TestNG.main(args);
@@ -53,10 +54,17 @@
public static void setUpClass() throws ScriptException {
final ScriptEngineManager m = new ScriptEngineManager();
e = m.getEngineByName("nashorn");
+ o = new SharedObject();
e.put("o", o);
e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
}
+ @AfterClass
+ public static void tearDownClass() {
+ e = null;
+ o = null;
+ }
+
// --------------------------------long
// tests------------------------------------
@Test
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,6 +32,7 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import org.testng.TestNG;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -43,7 +44,7 @@
public class ObjectAccessTest {
private static ScriptEngine e = null;
- private static SharedObject o = new SharedObject();
+ private static SharedObject o = null;
public static void main(final String[] args) {
TestNG.main(args);
@@ -53,11 +54,18 @@
public static void setUpClass() throws ScriptException {
final ScriptEngineManager m = new ScriptEngineManager();
e = m.getEngineByName("nashorn");
+ o = new SharedObject();
e.put("o", o);
e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.Person;");
}
+ @AfterClass
+ public static void tearDownClass() {
+ e = null;
+ o = null;
+ }
+
@Test
public void accessFieldObject() throws ScriptException {
e.eval("var p_object = o.publicObject;");
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,6 +32,7 @@
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import org.testng.TestNG;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -43,7 +44,7 @@
public class StringAccessTest {
private static ScriptEngine e = null;
- private static SharedObject o = new SharedObject();
+ private static SharedObject o = null;
public static void main(final String[] args) {
TestNG.main(args);
@@ -53,10 +54,17 @@
public static void setUpClass() throws ScriptException {
final ScriptEngineManager m = new ScriptEngineManager();
e = m.getEngineByName("nashorn");
+ o = new SharedObject();
e.put("o", o);
e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
}
+ @AfterClass
+ public static void tearDownClass() {
+ e = null;
+ o = null;
+ }
+
@Test
public void accessFieldString() throws ScriptException {
e.eval("var p_string = o.publicString;");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/InvocableTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,525 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import java.util.Objects;
+import javax.script.Invocable;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import javax.script.SimpleScriptContext;
+import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for javax.script.Invocable implementation of nashorn.
+ */
+public class InvocableTest {
+
+ private void log(String msg) {
+ org.testng.Reporter.log(msg, true);
+ }
+
+ @Test
+ public void invokeMethodTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ e.eval("var Example = function() { this.hello = function() { return 'Hello World!'; };}; myExample = new Example();");
+ final Object obj = e.get("myExample");
+ final Object res = ((Invocable) e).invokeMethod(obj, "hello");
+ assertEquals(res, "Hello World!");
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+
+ @Test
+ /**
+ * Check that we can call invokeMethod on an object that we got by
+ * evaluating script with different Context set.
+ */
+ public void invokeMethodDifferentContextTest() {
+ ScriptEngineManager m = new ScriptEngineManager();
+ ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ // define an object with method on it
+ Object obj = e.eval("({ hello: function() { return 'Hello World!'; } })");
+
+ final ScriptContext ctxt = new SimpleScriptContext();
+ ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE);
+ e.setContext(ctxt);
+
+ // invoke 'func' on obj - but with current script context changed
+ final Object res = ((Invocable) e).invokeMethod(obj, "hello");
+ assertEquals(res, "Hello World!");
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+
+ @Test
+ /**
+ * Check that invokeMethod throws NPE on null method name.
+ */
+ public void invokeMethodNullNameTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ final Object obj = e.eval("({})");
+ final Object res = ((Invocable) e).invokeMethod(obj, null);
+ fail("should have thrown NPE");
+ } catch (final Exception exp) {
+ if (!(exp instanceof NullPointerException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that invokeMethod throws NoSuchMethodException on missing method.
+ */
+ public void invokeMethodMissingTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ final Object obj = e.eval("({})");
+ final Object res = ((Invocable) e).invokeMethod(obj, "nonExistentMethod");
+ fail("should have thrown NoSuchMethodException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof NoSuchMethodException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that calling method on non-script object 'thiz' results in
+ * IllegalArgumentException.
+ */
+ public void invokeMethodNonScriptObjectThizTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ ((Invocable) e).invokeMethod(new Object(), "toString");
+ fail("should have thrown IllegalArgumentException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof IllegalArgumentException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that calling method on null 'thiz' results in
+ * IllegalArgumentException.
+ */
+ public void invokeMethodNullThizTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ ((Invocable) e).invokeMethod(null, "toString");
+ fail("should have thrown IllegalArgumentException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof IllegalArgumentException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that calling method on mirror created by another engine results in
+ * IllegalArgumentException.
+ */
+ public void invokeMethodMixEnginesTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine engine1 = m.getEngineByName("nashorn");
+ final ScriptEngine engine2 = m.getEngineByName("nashorn");
+
+ try {
+ Object obj = engine1.eval("({ run: function() {} })");
+ // pass object from engine1 to engine2 as 'thiz' for invokeMethod
+ ((Invocable) engine2).invokeMethod(obj, "run");
+ fail("should have thrown IllegalArgumentException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof IllegalArgumentException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ public void getInterfaceTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ final Invocable inv = (Invocable) e;
+
+ // try to get interface from global functions
+ try {
+ e.eval("function run() { print('run'); };");
+ final Runnable runnable = inv.getInterface(Runnable.class);
+ runnable.run();
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+
+ // try interface on specific script object
+ try {
+ e.eval("var obj = { run: function() { print('run from obj'); } };");
+ Object obj = e.get("obj");
+ final Runnable runnable = inv.getInterface(obj, Runnable.class);
+ runnable.run();
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+
+ public interface Foo {
+
+ public void bar();
+ }
+
+ public interface Foo2 extends Foo {
+
+ public void bar2();
+ }
+
+ @Test
+ public void getInterfaceMissingTest() {
+ final ScriptEngineManager manager = new ScriptEngineManager();
+ final ScriptEngine engine = manager.getEngineByName("nashorn");
+
+ // don't define any function.
+ try {
+ engine.eval("");
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+
+ Runnable runnable = ((Invocable) engine).getInterface(Runnable.class);
+ if (runnable != null) {
+ fail("runnable is not null!");
+ }
+
+ // now define "run"
+ try {
+ engine.eval("function run() { print('this is run function'); }");
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ runnable = ((Invocable) engine).getInterface(Runnable.class);
+ // should not return null now!
+ runnable.run();
+
+ // define only one method of "Foo2"
+ try {
+ engine.eval("function bar() { print('bar function'); }");
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+
+ Foo2 foo2 = ((Invocable) engine).getInterface(Foo2.class);
+ if (foo2 != null) {
+ throw new RuntimeException("foo2 is not null!");
+ }
+
+ // now define other method of "Foo2"
+ try {
+ engine.eval("function bar2() { print('bar2 function'); }");
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ foo2 = ((Invocable) engine).getInterface(Foo2.class);
+ foo2.bar();
+ foo2.bar2();
+ }
+
+ @Test
+ /**
+ * Try passing non-interface Class object for interface implementation.
+ */
+ public void getNonInterfaceGetInterfaceTest() {
+ final ScriptEngineManager manager = new ScriptEngineManager();
+ final ScriptEngine engine = manager.getEngineByName("nashorn");
+ try {
+ log(Objects.toString(((Invocable) engine).getInterface(Object.class)));
+ fail("Should have thrown IllegalArgumentException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof IllegalArgumentException)) {
+ fail("IllegalArgumentException expected, got " + exp);
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that we can get interface out of a script object even after
+ * switching to use different ScriptContext.
+ */
+ public void getInterfaceDifferentContext() {
+ ScriptEngineManager m = new ScriptEngineManager();
+ ScriptEngine e = m.getEngineByName("nashorn");
+ try {
+ Object obj = e.eval("({ run: function() { } })");
+
+ // change script context
+ ScriptContext ctxt = new SimpleScriptContext();
+ ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE);
+ e.setContext(ctxt);
+
+ Runnable r = ((Invocable) e).getInterface(obj, Runnable.class);
+ r.run();
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+
+ @Test
+ /**
+ * Check that getInterface on non-script object 'thiz' results in
+ * IllegalArgumentException.
+ */
+ public void getInterfaceNonScriptObjectThizTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ ((Invocable) e).getInterface(new Object(), Runnable.class);
+ fail("should have thrown IllegalArgumentException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof IllegalArgumentException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that getInterface on null 'thiz' results in
+ * IllegalArgumentException.
+ */
+ public void getInterfaceNullThizTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ ((Invocable) e).getInterface(null, Runnable.class);
+ fail("should have thrown IllegalArgumentException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof IllegalArgumentException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that calling getInterface on mirror created by another engine
+ * results in IllegalArgumentException.
+ */
+ public void getInterfaceMixEnginesTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine engine1 = m.getEngineByName("nashorn");
+ final ScriptEngine engine2 = m.getEngineByName("nashorn");
+
+ try {
+ Object obj = engine1.eval("({ run: function() {} })");
+ // pass object from engine1 to engine2 as 'thiz' for getInterface
+ ((Invocable) engine2).getInterface(obj, Runnable.class);
+ fail("should have thrown IllegalArgumentException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof IllegalArgumentException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * check that null function name results in NPE.
+ */
+ public void invokeFunctionNullNameTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ final Object res = ((Invocable) e).invokeFunction(null);
+ fail("should have thrown NPE");
+ } catch (final Exception exp) {
+ if (!(exp instanceof NullPointerException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that attempt to call missing function results in
+ * NoSuchMethodException.
+ */
+ public void invokeFunctionMissingTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ final Object res = ((Invocable) e).invokeFunction("NonExistentFunc");
+ fail("should have thrown NoSuchMethodException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof NoSuchMethodException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ /**
+ * Check that invokeFunction calls functions only from current context's
+ * Bindings.
+ */
+ public void invokeFunctionDifferentContextTest() {
+ ScriptEngineManager m = new ScriptEngineManager();
+ ScriptEngine e = m.getEngineByName("nashorn");
+
+ try {
+ // define an object with method on it
+ Object obj = e.eval("function hello() { return 'Hello World!'; }");
+ final ScriptContext ctxt = new SimpleScriptContext();
+ ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE);
+ // change engine's current context
+ e.setContext(ctxt);
+
+ ((Invocable) e).invokeFunction("hello"); // no 'hello' in new context!
+ fail("should have thrown NoSuchMethodException");
+ } catch (final Exception exp) {
+ if (!(exp instanceof NoSuchMethodException)) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+ }
+
+ @Test
+ public void invokeFunctionExceptionTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ try {
+ e.eval("function func() { throw new TypeError(); }");
+ } catch (final Throwable t) {
+ t.printStackTrace();
+ fail(t.getMessage());
+ }
+
+ try {
+ ((Invocable) e).invokeFunction("func");
+ fail("should have thrown exception");
+ } catch (final ScriptException se) {
+ // ECMA TypeError property wrapped as a ScriptException
+ log("got " + se + " as expected");
+ } catch (final Throwable t) {
+ t.printStackTrace();
+ fail(t.getMessage());
+ }
+ }
+
+ @Test
+ public void invokeMethodExceptionTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ try {
+ e.eval("var sobj = {}; sobj.foo = function func() { throw new TypeError(); }");
+ } catch (final Throwable t) {
+ t.printStackTrace();
+ fail(t.getMessage());
+ }
+
+ try {
+ final Object sobj = e.get("sobj");
+ ((Invocable) e).invokeMethod(sobj, "foo");
+ fail("should have thrown exception");
+ } catch (final ScriptException se) {
+ // ECMA TypeError property wrapped as a ScriptException
+ log("got " + se + " as expected");
+ } catch (final Throwable t) {
+ t.printStackTrace();
+ fail(t.getMessage());
+ }
+ }
+
+ @Test
+ /**
+ * Tests whether invocation of a JavaScript method through a variable arity
+ * Java method will pass the vararg array. Both non-vararg and vararg
+ * JavaScript methods are tested.
+ *
+ * @throws ScriptException
+ */
+ public void variableArityInterfaceTest() throws ScriptException {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ e.eval(
+ "function test1(i, strings) {"
+ + " return 'i == ' + i + ', strings instanceof java.lang.String[] == ' + (strings instanceof Java.type('java.lang.String[]')) + ', strings == ' + java.util.Arrays.toString(strings)"
+ + "}"
+ + "function test2() {"
+ + " return 'arguments[0] == ' + arguments[0] + ', arguments[1] instanceof java.lang.String[] == ' + (arguments[1] instanceof Java.type('java.lang.String[]')) + ', arguments[1] == ' + java.util.Arrays.toString(arguments[1])"
+ + "}");
+ final VariableArityTestInterface itf = ((Invocable) e).getInterface(VariableArityTestInterface.class);
+ Assert.assertEquals(itf.test1(42, "a", "b"), "i == 42, strings instanceof java.lang.String[] == true, strings == [a, b]");
+ Assert.assertEquals(itf.test2(44, "c", "d", "e"), "arguments[0] == 44, arguments[1] instanceof java.lang.String[] == true, arguments[1] == [c, d, e]");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScopeTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,248 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.nashorn.api.scripting;
+
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import javax.script.SimpleBindings;
+import javax.script.SimpleScriptContext;
+import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for jsr223 Bindings "scope" (engine, global scopes)
+ */
+public class ScopeTest {
+
+ @Test
+ public void createBindingsTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ Bindings b = e.createBindings();
+ b.put("foo", 42.0);
+ Object res = null;
+ try {
+ res = e.eval("foo == 42.0", b);
+ } catch (final ScriptException | NullPointerException se) {
+ se.printStackTrace();
+ fail(se.getMessage());
+ }
+
+ assertEquals(res, Boolean.TRUE);
+ }
+
+ @Test
+ public void engineScopeTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ Bindings engineScope = e.getBindings(ScriptContext.ENGINE_SCOPE);
+
+ // check few ECMA standard built-in global properties
+ assertNotNull(engineScope.get("Object"));
+ assertNotNull(engineScope.get("TypeError"));
+ assertNotNull(engineScope.get("eval"));
+
+ // can access via ScriptEngine.get as well
+ assertNotNull(e.get("Object"));
+ assertNotNull(e.get("TypeError"));
+ assertNotNull(e.get("eval"));
+
+ // Access by either way should return same object
+ assertEquals(engineScope.get("Array"), e.get("Array"));
+ assertEquals(engineScope.get("EvalError"), e.get("EvalError"));
+ assertEquals(engineScope.get("undefined"), e.get("undefined"));
+
+ // try exposing a new variable from scope
+ engineScope.put("myVar", "foo");
+ try {
+ assertEquals(e.eval("myVar"), "foo");
+ } catch (final ScriptException se) {
+ se.printStackTrace();
+ fail(se.getMessage());
+ }
+
+ // update "myVar" in script an check the value from scope
+ try {
+ e.eval("myVar = 'nashorn';");
+ } catch (final ScriptException se) {
+ se.printStackTrace();
+ fail(se.getMessage());
+ }
+
+ // now check modified value from scope and engine
+ assertEquals(engineScope.get("myVar"), "nashorn");
+ assertEquals(e.get("myVar"), "nashorn");
+ }
+
+ @Test
+ public void multiGlobalTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ final Bindings b = e.createBindings();
+ final ScriptContext newCtxt = new SimpleScriptContext();
+ newCtxt.setBindings(b, ScriptContext.ENGINE_SCOPE);
+
+ try {
+ Object obj1 = e.eval("Object");
+ Object obj2 = e.eval("Object", newCtxt);
+ Assert.assertNotEquals(obj1, obj2);
+ Assert.assertNotNull(obj1);
+ Assert.assertNotNull(obj2);
+ Assert.assertEquals(obj1.toString(), obj2.toString());
+
+ e.eval("x = 'hello'");
+ e.eval("x = 'world'", newCtxt);
+ Object x1 = e.getContext().getAttribute("x");
+ Object x2 = newCtxt.getAttribute("x");
+ Assert.assertNotEquals(x1, x2);
+ Assert.assertEquals(x1, "hello");
+ Assert.assertEquals(x2, "world");
+
+ x1 = e.eval("x");
+ x2 = e.eval("x", newCtxt);
+ Assert.assertNotEquals(x1, x2);
+ Assert.assertEquals(x1, "hello");
+ Assert.assertEquals(x2, "world");
+
+ final ScriptContext origCtxt = e.getContext();
+ e.setContext(newCtxt);
+ e.eval("y = new Object()");
+ e.eval("y = new Object()", origCtxt);
+
+ Object y1 = origCtxt.getAttribute("y");
+ Object y2 = newCtxt.getAttribute("y");
+ Assert.assertNotEquals(y1, y2);
+ Assert.assertNotEquals(e.eval("y"), e.eval("y", origCtxt));
+ Assert.assertEquals("[object Object]", y1.toString());
+ Assert.assertEquals("[object Object]", y2.toString());
+ } catch (final ScriptException se) {
+ se.printStackTrace();
+ fail(se.getMessage());
+ }
+ }
+
+ @Test
+ public void userEngineScopeBindingsTest() throws ScriptException {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ e.eval("function func() {}");
+
+ final ScriptContext newContext = new SimpleScriptContext();
+ newContext.setBindings(new SimpleBindings(), ScriptContext.ENGINE_SCOPE);
+ // we are using a new bindings - so it should have 'func' defined
+ Object value = e.eval("typeof func", newContext);
+ assertTrue(value.equals("undefined"));
+ }
+
+ @Test
+ public void userEngineScopeBindingsNoLeakTest() throws ScriptException {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ final ScriptContext newContext = new SimpleScriptContext();
+ newContext.setBindings(new SimpleBindings(), ScriptContext.ENGINE_SCOPE);
+ e.eval("function foo() {}", newContext);
+
+ // in the default context's ENGINE_SCOPE, 'foo' shouldn't exist
+ assertTrue(e.eval("typeof foo").equals("undefined"));
+ }
+
+ @Test
+ public void userEngineScopeBindingsRetentionTest() throws ScriptException {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ final ScriptContext newContext = new SimpleScriptContext();
+ newContext.setBindings(new SimpleBindings(), ScriptContext.ENGINE_SCOPE);
+ e.eval("function foo() {}", newContext);
+
+ // definition retained with user's ENGINE_SCOPE Binding
+ assertTrue(e.eval("typeof foo", newContext).equals("function"));
+
+ final Bindings oldBindings = newContext.getBindings(ScriptContext.ENGINE_SCOPE);
+ // but not in another ENGINE_SCOPE binding
+ newContext.setBindings(new SimpleBindings(), ScriptContext.ENGINE_SCOPE);
+ assertTrue(e.eval("typeof foo", newContext).equals("undefined"));
+
+ // restore ENGINE_SCOPE and check again
+ newContext.setBindings(oldBindings, ScriptContext.ENGINE_SCOPE);
+ assertTrue(e.eval("typeof foo", newContext).equals("function"));
+ }
+
+ @Test
+ // check that engine.js definitions are visible in all new global instances
+ public void checkBuiltinsInNewBindingsTest() throws ScriptException {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ // check default global instance has engine.js definitions
+ final Bindings g = (Bindings) e.eval("this");
+ Object value = g.get("__noSuchProperty__");
+ assertTrue(value instanceof ScriptObjectMirror && ((ScriptObjectMirror)value).isFunction());
+ value = g.get("print");
+ assertTrue(value instanceof ScriptObjectMirror && ((ScriptObjectMirror)value).isFunction());
+
+ // check new global instance created has engine.js definitions
+ Bindings b = e.createBindings();
+ value = b.get("__noSuchProperty__");
+ assertTrue(value instanceof ScriptObjectMirror && ((ScriptObjectMirror)value).isFunction());
+ value = b.get("print");
+ assertTrue(value instanceof ScriptObjectMirror && ((ScriptObjectMirror)value).isFunction());
+
+ // put a mapping into GLOBAL_SCOPE
+ final Bindings globalScope = e.getContext().getBindings(ScriptContext.GLOBAL_SCOPE);
+ globalScope.put("x", "hello");
+
+ // GLOBAL_SCOPE mapping should be visible from default ScriptContext eval
+ assertTrue(e.eval("x").equals("hello"));
+
+ final ScriptContext ctx = new SimpleScriptContext();
+ ctx.setBindings(globalScope, ScriptContext.GLOBAL_SCOPE);
+ ctx.setBindings(b, ScriptContext.ENGINE_SCOPE);
+
+ // GLOBAL_SCOPE mapping should be visible from non-default ScriptContext eval
+ assertTrue(e.eval("x", ctx).equals("hello"));
+
+ // try some arbitray Bindings for ENGINE_SCOPE
+ Bindings sb = new SimpleBindings();
+ ctx.setBindings(sb, ScriptContext.ENGINE_SCOPE);
+
+ // GLOBAL_SCOPE mapping should be visible from non-default ScriptContext eval
+ assertTrue(e.eval("x", ctx).equals("hello"));
+
+ // engine.js builtins are still defined even with arbitrary Bindings
+ assertTrue(e.eval("typeof print", ctx).equals("function"));
+ assertTrue(e.eval("typeof __noSuchProperty__", ctx).equals("function"));
+
+ // ENGINE_SCOPE definition should 'hide' GLOBAL_SCOPE definition
+ sb.put("x", "newX");
+ assertTrue(e.eval("x", ctx).equals("newX"));
+ }
+}
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -26,29 +26,21 @@
package jdk.nashorn.api.scripting;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
+import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
import java.util.concurrent.Callable;
-import javax.script.Bindings;
import javax.script.Compilable;
import javax.script.CompiledScript;
-import javax.script.Invocable;
-import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
-import javax.script.SimpleScriptContext;
-import org.testng.Assert;
import org.testng.annotations.Test;
/**
@@ -239,214 +231,6 @@
}
@Test
- public void createBindingsTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- Bindings b = e.createBindings();
- b.put("foo", 42.0);
- Object res = null;
- try {
- res = e.eval("foo == 42.0", b);
- } catch (final ScriptException | NullPointerException se) {
- se.printStackTrace();
- fail(se.getMessage());
- }
-
- assertEquals(res, Boolean.TRUE);
- }
-
- @Test
- public void getInterfaceTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- final Invocable inv = (Invocable)e;
-
- // try to get interface from global functions
- try {
- e.eval("function run() { print('run'); };");
- final Runnable runnable = inv.getInterface(Runnable.class);
- runnable.run();
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
-
- // try interface on specific script object
- try {
- e.eval("var obj = { run: function() { print('run from obj'); } };");
- Object obj = e.get("obj");
- final Runnable runnable = inv.getInterface(obj, Runnable.class);
- runnable.run();
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
-
- public interface Foo {
- public void bar();
- }
-
- public interface Foo2 extends Foo {
- public void bar2();
- }
-
- @Test
- public void getInterfaceMissingTest() {
- final ScriptEngineManager manager = new ScriptEngineManager();
- final ScriptEngine engine = manager.getEngineByName("nashorn");
-
- // don't define any function.
- try {
- engine.eval("");
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
-
- Runnable runnable = ((Invocable)engine).getInterface(Runnable.class);
- if (runnable != null) {
- fail("runnable is not null!");
- }
-
- // now define "run"
- try {
- engine.eval("function run() { print('this is run function'); }");
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- runnable = ((Invocable)engine).getInterface(Runnable.class);
- // should not return null now!
- runnable.run();
-
- // define only one method of "Foo2"
- try {
- engine.eval("function bar() { print('bar function'); }");
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
-
- Foo2 foo2 = ((Invocable)engine).getInterface(Foo2.class);
- if (foo2 != null) {
- throw new RuntimeException("foo2 is not null!");
- }
-
- // now define other method of "Foo2"
- try {
- engine.eval("function bar2() { print('bar2 function'); }");
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- foo2 = ((Invocable)engine).getInterface(Foo2.class);
- foo2.bar();
- foo2.bar2();
- }
-
- @Test
- /**
- * Try passing non-interface Class object for interface implementation.
- */
- public void getNonInterfaceGetInterfaceTest() {
- final ScriptEngineManager manager = new ScriptEngineManager();
- final ScriptEngine engine = manager.getEngineByName("nashorn");
- try {
- log(Objects.toString(((Invocable)engine).getInterface(Object.class)));
- fail("Should have thrown IllegalArgumentException");
- } catch (final Exception exp) {
- if (! (exp instanceof IllegalArgumentException)) {
- fail("IllegalArgumentException expected, got " + exp);
- }
- }
- }
-
- @Test
- /**
- * Check that we can get interface out of a script object even after
- * switching to use different ScriptContext.
- */
- public void getInterfaceDifferentContext() {
- ScriptEngineManager m = new ScriptEngineManager();
- ScriptEngine e = m.getEngineByName("nashorn");
- try {
- Object obj = e.eval("({ run: function() { } })");
-
- // change script context
- ScriptContext ctxt = new SimpleScriptContext();
- ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE);
- e.setContext(ctxt);
-
- Runnable r = ((Invocable)e).getInterface(obj, Runnable.class);
- r.run();
- }catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
-
- @Test
- /**
- * Check that getInterface on non-script object 'thiz' results in IllegalArgumentException.
- */
- public void getInterfaceNonScriptObjectThizTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- ((Invocable)e).getInterface(new Object(), Runnable.class);
- fail("should have thrown IllegalArgumentException");
- } catch (final Exception exp) {
- if (! (exp instanceof IllegalArgumentException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
- /**
- * Check that getInterface on null 'thiz' results in IllegalArgumentException.
- */
- public void getInterfaceNullThizTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- ((Invocable)e).getInterface(null, Runnable.class);
- fail("should have thrown IllegalArgumentException");
- } catch (final Exception exp) {
- if (! (exp instanceof IllegalArgumentException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
- /**
- * Check that calling getInterface on mirror created by another engine results in IllegalArgumentException.
- */
- public void getInterfaceMixEnginesTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine engine1 = m.getEngineByName("nashorn");
- final ScriptEngine engine2 = m.getEngineByName("nashorn");
-
- try {
- Object obj = engine1.eval("({ run: function() {} })");
- // pass object from engine1 to engine2 as 'thiz' for getInterface
- ((Invocable)engine2).getInterface(obj, Runnable.class);
- fail("should have thrown IllegalArgumentException");
- } catch (final Exception exp) {
- if (! (exp instanceof IllegalArgumentException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
public void accessGlobalTest() {
final ScriptEngineManager m = new ScriptEngineManager();
final ScriptEngine e = m.getEngineByName("nashorn");
@@ -617,90 +401,7 @@
exp.printStackTrace();
fail(exp.getMessage());
}
- // dos2unix - fix line endings if running on windows
- assertEquals(sw.toString().replaceAll("\r", ""), "hello world\n");
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void reflectionTest() throws ScriptException {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- e.eval("var obj = { x: 344, y: 'nashorn' }");
-
- int count = 0;
- Map<Object, Object> map = (Map<Object, Object>)e.get("obj");
- assertFalse(map.isEmpty());
- assertTrue(map.keySet().contains("x"));
- assertTrue(map.containsKey("x"));
- assertTrue(map.values().contains("nashorn"));
- assertTrue(map.containsValue("nashorn"));
- for (final Map.Entry<?, ?> ex : map.entrySet()) {
- final Object key = ex.getKey();
- if (key.equals("x")) {
- assertTrue(344 == ((Number)ex.getValue()).doubleValue());
- count++;
- } else if (key.equals("y")) {
- assertEquals(ex.getValue(), "nashorn");
- count++;
- }
- }
- assertEquals(2, count);
- assertEquals(2, map.size());
-
- // add property
- map.put("z", "hello");
- assertEquals(e.eval("obj.z"), "hello");
- assertEquals(map.get("z"), "hello");
- assertTrue(map.keySet().contains("z"));
- assertTrue(map.containsKey("z"));
- assertTrue(map.values().contains("hello"));
- assertTrue(map.containsValue("hello"));
- assertEquals(map.size(), 3);
-
- final Map<Object, Object> newMap = new HashMap<>();
- newMap.put("foo", 23.0);
- newMap.put("bar", true);
- map.putAll(newMap);
-
- assertEquals(e.eval("obj.foo"), 23.0);
- assertEquals(e.eval("obj.bar"), true);
-
- // remove using map method
- map.remove("foo");
- assertEquals(e.eval("typeof obj.foo"), "undefined");
-
- count = 0;
- e.eval("var arr = [ true, 'hello' ]");
- map = (Map<Object, Object>)e.get("arr");
- assertFalse(map.isEmpty());
- assertTrue(map.containsKey("length"));
- assertTrue(map.containsValue("hello"));
- for (final Map.Entry<?, ?> ex : map.entrySet()) {
- final Object key = ex.getKey();
- if (key.equals("0")) {
- assertEquals(ex.getValue(), Boolean.TRUE);
- count++;
- } else if (key.equals("1")) {
- assertEquals(ex.getValue(), "hello");
- count++;
- }
- }
- assertEquals(count, 2);
- assertEquals(map.size(), 2);
-
- // add element
- map.put("2", "world");
- assertEquals(map.get("2"), "world");
- assertEquals(map.size(), 3);
-
- // remove all
- map.clear();
- assertTrue(map.isEmpty());
- assertEquals(e.eval("typeof arr[0]"), "undefined");
- assertEquals(e.eval("typeof arr[1]"), "undefined");
- assertEquals(e.eval("typeof arr[2]"), "undefined");
+ assertEquals(sw.toString(), println("hello world"));
}
@Test
@@ -715,150 +416,6 @@
fail(exp.getMessage());
}
}
-
- @Test
- public void invokeMethodTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- e.eval("var Example = function() { this.hello = function() { return 'Hello World!'; };}; myExample = new Example();");
- final Object obj = e.get("myExample");
- final Object res = ((Invocable)e).invokeMethod(obj, "hello");
- assertEquals(res, "Hello World!");
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
-
- @Test
- /**
- * Check that we can call invokeMethod on an object that we got by evaluating
- * script with different Context set.
- */
- public void invokeMethodDifferentContextTest() {
- ScriptEngineManager m = new ScriptEngineManager();
- ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- // define an object with method on it
- Object obj = e.eval("({ hello: function() { return 'Hello World!'; } })");
-
- final ScriptContext ctxt = new SimpleScriptContext();
- ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE);
- e.setContext(ctxt);
-
- // invoke 'func' on obj - but with current script context changed
- final Object res = ((Invocable)e).invokeMethod(obj, "hello");
- assertEquals(res, "Hello World!");
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
-
- @Test
- /**
- * Check that invokeMethod throws NPE on null method name.
- */
- public void invokeMethodNullNameTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- final Object obj = e.eval("({})");
- final Object res = ((Invocable)e).invokeMethod(obj, null);
- fail("should have thrown NPE");
- } catch (final Exception exp) {
- if (! (exp instanceof NullPointerException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
- /**
- * Check that invokeMethod throws NoSuchMethodException on missing method.
- */
- public void invokeMethodMissingTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- final Object obj = e.eval("({})");
- final Object res = ((Invocable)e).invokeMethod(obj, "nonExistentMethod");
- fail("should have thrown NoSuchMethodException");
- } catch (final Exception exp) {
- if (! (exp instanceof NoSuchMethodException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
- /**
- * Check that calling method on non-script object 'thiz' results in IllegalArgumentException.
- */
- public void invokeMethodNonScriptObjectThizTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- ((Invocable)e).invokeMethod(new Object(), "toString");
- fail("should have thrown IllegalArgumentException");
- } catch (final Exception exp) {
- if (! (exp instanceof IllegalArgumentException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
- /**
- * Check that calling method on null 'thiz' results in IllegalArgumentException.
- */
- public void invokeMethodNullThizTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- ((Invocable)e).invokeMethod(null, "toString");
- fail("should have thrown IllegalArgumentException");
- } catch (final Exception exp) {
- if (! (exp instanceof IllegalArgumentException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
-
- @Test
- /**
- * Check that calling method on mirror created by another engine results in IllegalArgumentException.
- */
- public void invokeMethodMixEnginesTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine engine1 = m.getEngineByName("nashorn");
- final ScriptEngine engine2 = m.getEngineByName("nashorn");
-
- try {
- Object obj = engine1.eval("({ run: function() {} })");
- // pass object from engine1 to engine2 as 'thiz' for invokeMethod
- ((Invocable)engine2).invokeMethod(obj, "run");
- fail("should have thrown IllegalArgumentException");
- } catch (final Exception exp) {
- if (! (exp instanceof IllegalArgumentException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
@Test
public void noEnumerablePropertiesTest() {
final ScriptEngineManager m = new ScriptEngineManager();
@@ -920,308 +477,6 @@
}
@Test
- public void jsobjectTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- try {
- e.eval("var obj = { '1': 'world', func: function() { return this.bar; }, bar: 'hello' }");
- JSObject obj = (JSObject) e.get("obj");
-
- // try basic get on existing properties
- if (! obj.getMember("bar").equals("hello")) {
- fail("obj.bar != 'hello'");
- }
-
- if (! obj.getSlot(1).equals("world")) {
- fail("obj[1] != 'world'");
- }
-
- if (! obj.call("func", new Object[0]).equals("hello")) {
- fail("obj.call('func') != 'hello'");
- }
-
- // try setting properties
- obj.setMember("bar", "new-bar");
- obj.setSlot(1, "new-element-1");
- if (! obj.getMember("bar").equals("new-bar")) {
- fail("obj.bar != 'new-bar'");
- }
-
- if (! obj.getSlot(1).equals("new-element-1")) {
- fail("obj[1] != 'new-element-1'");
- }
-
- // try adding properties
- obj.setMember("prop", "prop-value");
- obj.setSlot(12, "element-12");
- if (! obj.getMember("prop").equals("prop-value")) {
- fail("obj.prop != 'prop-value'");
- }
-
- if (! obj.getSlot(12).equals("element-12")) {
- fail("obj[12] != 'element-12'");
- }
-
- // delete properties
- obj.removeMember("prop");
- if ("prop-value".equals(obj.getMember("prop"))) {
- fail("obj.prop is not deleted!");
- }
-
- // Simple eval tests
- assertEquals(obj.eval("typeof Object"), "function");
- assertEquals(obj.eval("'nashorn'.substring(3)"), "horn");
- } catch (final Exception exp) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
-
- @Test
- /**
- * check that null function name results in NPE.
- */
- public void invokeFunctionNullNameTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- final Object res = ((Invocable)e).invokeFunction(null);
- fail("should have thrown NPE");
- } catch (final Exception exp) {
- if (! (exp instanceof NullPointerException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
- /**
- * Check that attempt to call missing function results in NoSuchMethodException.
- */
- public void invokeFunctionMissingTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- final Object res = ((Invocable)e).invokeFunction("NonExistentFunc");
- fail("should have thrown NoSuchMethodException");
- } catch (final Exception exp) {
- if (! (exp instanceof NoSuchMethodException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
- /**
- * Check that invokeFunction calls functions only from current context's Bindings.
- */
- public void invokeFunctionDifferentContextTest() {
- ScriptEngineManager m = new ScriptEngineManager();
- ScriptEngine e = m.getEngineByName("nashorn");
-
- try {
- // define an object with method on it
- Object obj = e.eval("function hello() { return 'Hello World!'; }");
- final ScriptContext ctxt = new SimpleScriptContext();
- ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE);
- // change engine's current context
- e.setContext(ctxt);
-
- ((Invocable)e).invokeFunction("hello"); // no 'hello' in new context!
- fail("should have thrown NoSuchMethodException");
- } catch (final Exception exp) {
- if (! (exp instanceof NoSuchMethodException)) {
- exp.printStackTrace();
- fail(exp.getMessage());
- }
- }
- }
-
- @Test
- public void invokeFunctionExceptionTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- try {
- e.eval("function func() { throw new TypeError(); }");
- } catch (final Throwable t) {
- t.printStackTrace();
- fail(t.getMessage());
- }
-
- try {
- ((Invocable)e).invokeFunction("func");
- fail("should have thrown exception");
- } catch (final ScriptException se) {
- // ECMA TypeError property wrapped as a ScriptException
- log("got " + se + " as expected");
- } catch (final Throwable t) {
- t.printStackTrace();
- fail(t.getMessage());
- }
- }
-
- @Test
- public void invokeMethodExceptionTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- try {
- e.eval("var sobj = {}; sobj.foo = function func() { throw new TypeError(); }");
- } catch (final Throwable t) {
- t.printStackTrace();
- fail(t.getMessage());
- }
-
- try {
- final Object sobj = e.get("sobj");
- ((Invocable)e).invokeMethod(sobj, "foo");
- fail("should have thrown exception");
- } catch (final ScriptException se) {
- // ECMA TypeError property wrapped as a ScriptException
- log("got " + se + " as expected");
- } catch (final Throwable t) {
- t.printStackTrace();
- fail(t.getMessage());
- }
- }
-
- @Test
- public void scriptObjectMirrorToStringTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- try {
- Object obj = e.eval("new TypeError('wrong type')");
- assertEquals(obj.toString(), "TypeError: wrong type", "toString returns wrong value");
- } catch (final Throwable t) {
- t.printStackTrace();
- fail(t.getMessage());
- }
-
- try {
- Object obj = e.eval("function func() { print('hello'); }");
- assertEquals(obj.toString(), "function func() { print('hello'); }", "toString returns wrong value");
- } catch (final Throwable t) {
- t.printStackTrace();
- fail(t.getMessage());
- }
- }
-
- @Test
- public void engineScopeTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- Bindings engineScope = e.getBindings(ScriptContext.ENGINE_SCOPE);
-
- // check few ECMA standard built-in global properties
- assertNotNull(engineScope.get("Object"));
- assertNotNull(engineScope.get("TypeError"));
- assertNotNull(engineScope.get("eval"));
-
- // can access via ScriptEngine.get as well
- assertNotNull(e.get("Object"));
- assertNotNull(e.get("TypeError"));
- assertNotNull(e.get("eval"));
-
- // Access by either way should return same object
- assertEquals(engineScope.get("Array"), e.get("Array"));
- assertEquals(engineScope.get("EvalError"), e.get("EvalError"));
- assertEquals(engineScope.get("undefined"), e.get("undefined"));
-
- // try exposing a new variable from scope
- engineScope.put("myVar", "foo");
- try {
- assertEquals(e.eval("myVar"), "foo");
- } catch (final ScriptException se) {
- se.printStackTrace();
- fail(se.getMessage());
- }
-
- // update "myVar" in script an check the value from scope
- try {
- e.eval("myVar = 'nashorn';");
- } catch (final ScriptException se) {
- se.printStackTrace();
- fail(se.getMessage());
- }
-
- // now check modified value from scope and engine
- assertEquals(engineScope.get("myVar"), "nashorn");
- assertEquals(e.get("myVar"), "nashorn");
- }
-
- @Test
- public void multiGlobalTest() {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- final Bindings b = e.createBindings();
- final ScriptContext newCtxt = new SimpleScriptContext();
- newCtxt.setBindings(b, ScriptContext.ENGINE_SCOPE);
-
- try {
- Object obj1 = e.eval("Object");
- Object obj2 = e.eval("Object", newCtxt);
- Assert.assertNotEquals(obj1, obj2);
- Assert.assertNotNull(obj1);
- Assert.assertNotNull(obj2);
- Assert.assertEquals(obj1.toString(), obj2.toString());
-
- e.eval("x = 'hello'");
- e.eval("x = 'world'", newCtxt);
- Object x1 = e.getContext().getAttribute("x");
- Object x2 = newCtxt.getAttribute("x");
- Assert.assertNotEquals(x1, x2);
- Assert.assertEquals(x1, "hello");
- Assert.assertEquals(x2, "world");
-
- x1 = e.eval("x");
- x2 = e.eval("x", newCtxt);
- Assert.assertNotEquals(x1, x2);
- Assert.assertEquals(x1, "hello");
- Assert.assertEquals(x2, "world");
-
- final ScriptContext origCtxt = e.getContext();
- e.setContext(newCtxt);
- e.eval("y = new Object()");
- e.eval("y = new Object()", origCtxt);
-
- Object y1 = origCtxt.getAttribute("y");
- Object y2 = newCtxt.getAttribute("y");
- Assert.assertNotEquals(y1, y2);
- Assert.assertNotEquals(e.eval("y"), e.eval("y", origCtxt));
- Assert.assertEquals("[object Object]", y1.toString());
- Assert.assertEquals("[object Object]", y2.toString());
- } catch (final ScriptException se) {
- se.printStackTrace();
- fail(se.getMessage());
- }
- }
-
- @Test
- /**
- * Tests whether invocation of a JavaScript method through a variable arity Java method will pass the vararg array.
- * Both non-vararg and vararg JavaScript methods are tested.
- * @throws ScriptException
- */
- public void variableArityInterfaceTest() throws ScriptException {
- final ScriptEngineManager m = new ScriptEngineManager();
- final ScriptEngine e = m.getEngineByName("nashorn");
- e.eval(
- "function test1(i, strings) {" +
- " return 'i == ' + i + ', strings instanceof java.lang.String[] == ' + (strings instanceof Java.type('java.lang.String[]')) + ', strings == ' + java.util.Arrays.toString(strings)" +
- "}" +
- "function test2() {" +
- " return 'arguments[0] == ' + arguments[0] + ', arguments[1] instanceof java.lang.String[] == ' + (arguments[1] instanceof Java.type('java.lang.String[]')) + ', arguments[1] == ' + java.util.Arrays.toString(arguments[1])" +
- "}"
- );
- final VariableArityTestInterface itf = ((Invocable)e).getInterface(VariableArityTestInterface.class);
- Assert.assertEquals(itf.test1(42, "a", "b"), "i == 42, strings instanceof java.lang.String[] == true, strings == [a, b]");
- Assert.assertEquals(itf.test2(44, "c", "d", "e"), "arguments[0] == 44, arguments[1] instanceof java.lang.String[] == true, arguments[1] == [c, d, e]");
- }
-
- @Test
// check that print function prints arg followed by newline char
public void printTest() {
final ScriptEngineManager m = new ScriptEngineManager();
@@ -1235,7 +490,7 @@
fail(t.getMessage());
}
- assertEquals(sw.toString(), "hello\n");
+ assertEquals(sw.toString(), println("hello"));
}
@Test
@@ -1252,6 +507,14 @@
fail(t.getMessage());
}
- assertEquals(sw.toString(), "34 true hello\n");
+ assertEquals(sw.toString(), println("34 true hello"));
+ }
+
+ private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+
+ // Returns String that would be the result of calling PrintWriter.println
+ // of the given String. (This is to handle platform specific newline).
+ private static String println(final String str) {
+ return str + LINE_SEPARATOR;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -0,0 +1,230 @@
+/*
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+import org.testng.annotations.Test;
+
+/**
+ * Tests to check jdk.nashorn.api.scripting.ScriptObjectMirror API.
+ */
+public class ScriptObjectMirrorTest {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void reflectionTest() throws ScriptException {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+
+ e.eval("var obj = { x: 344, y: 'nashorn' }");
+
+ int count = 0;
+ Map<Object, Object> map = (Map<Object, Object>) e.get("obj");
+ assertFalse(map.isEmpty());
+ assertTrue(map.keySet().contains("x"));
+ assertTrue(map.containsKey("x"));
+ assertTrue(map.values().contains("nashorn"));
+ assertTrue(map.containsValue("nashorn"));
+ for (final Map.Entry<?, ?> ex : map.entrySet()) {
+ final Object key = ex.getKey();
+ if (key.equals("x")) {
+ assertTrue(344 == ((Number) ex.getValue()).doubleValue());
+ count++;
+ } else if (key.equals("y")) {
+ assertEquals(ex.getValue(), "nashorn");
+ count++;
+ }
+ }
+ assertEquals(2, count);
+ assertEquals(2, map.size());
+
+ // add property
+ map.put("z", "hello");
+ assertEquals(e.eval("obj.z"), "hello");
+ assertEquals(map.get("z"), "hello");
+ assertTrue(map.keySet().contains("z"));
+ assertTrue(map.containsKey("z"));
+ assertTrue(map.values().contains("hello"));
+ assertTrue(map.containsValue("hello"));
+ assertEquals(map.size(), 3);
+
+ final Map<Object, Object> newMap = new HashMap<>();
+ newMap.put("foo", 23.0);
+ newMap.put("bar", true);
+ map.putAll(newMap);
+
+ assertEquals(e.eval("obj.foo"), 23.0);
+ assertEquals(e.eval("obj.bar"), true);
+
+ // remove using map method
+ map.remove("foo");
+ assertEquals(e.eval("typeof obj.foo"), "undefined");
+
+ count = 0;
+ e.eval("var arr = [ true, 'hello' ]");
+ map = (Map<Object, Object>) e.get("arr");
+ assertFalse(map.isEmpty());
+ assertTrue(map.containsKey("length"));
+ assertTrue(map.containsValue("hello"));
+ for (final Map.Entry<?, ?> ex : map.entrySet()) {
+ final Object key = ex.getKey();
+ if (key.equals("0")) {
+ assertEquals(ex.getValue(), Boolean.TRUE);
+ count++;
+ } else if (key.equals("1")) {
+ assertEquals(ex.getValue(), "hello");
+ count++;
+ }
+ }
+ assertEquals(count, 2);
+ assertEquals(map.size(), 2);
+
+ // add element
+ map.put("2", "world");
+ assertEquals(map.get("2"), "world");
+ assertEquals(map.size(), 3);
+
+ // remove all
+ map.clear();
+ assertTrue(map.isEmpty());
+ assertEquals(e.eval("typeof arr[0]"), "undefined");
+ assertEquals(e.eval("typeof arr[1]"), "undefined");
+ assertEquals(e.eval("typeof arr[2]"), "undefined");
+ }
+
+ @Test
+ public void jsobjectTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ try {
+ e.eval("var obj = { '1': 'world', func: function() { return this.bar; }, bar: 'hello' }");
+ JSObject obj = (JSObject) e.get("obj");
+
+ // try basic get on existing properties
+ if (!obj.getMember("bar").equals("hello")) {
+ fail("obj.bar != 'hello'");
+ }
+
+ if (!obj.getSlot(1).equals("world")) {
+ fail("obj[1] != 'world'");
+ }
+
+ if (!obj.call("func", new Object[0]).equals("hello")) {
+ fail("obj.call('func') != 'hello'");
+ }
+
+ // try setting properties
+ obj.setMember("bar", "new-bar");
+ obj.setSlot(1, "new-element-1");
+ if (!obj.getMember("bar").equals("new-bar")) {
+ fail("obj.bar != 'new-bar'");
+ }
+
+ if (!obj.getSlot(1).equals("new-element-1")) {
+ fail("obj[1] != 'new-element-1'");
+ }
+
+ // try adding properties
+ obj.setMember("prop", "prop-value");
+ obj.setSlot(12, "element-12");
+ if (!obj.getMember("prop").equals("prop-value")) {
+ fail("obj.prop != 'prop-value'");
+ }
+
+ if (!obj.getSlot(12).equals("element-12")) {
+ fail("obj[12] != 'element-12'");
+ }
+
+ // delete properties
+ obj.removeMember("prop");
+ if ("prop-value".equals(obj.getMember("prop"))) {
+ fail("obj.prop is not deleted!");
+ }
+
+ // Simple eval tests
+ assertEquals(obj.eval("typeof Object"), "function");
+ assertEquals(obj.eval("'nashorn'.substring(3)"), "horn");
+ } catch (final Exception exp) {
+ exp.printStackTrace();
+ fail(exp.getMessage());
+ }
+ }
+
+ @Test
+ public void scriptObjectMirrorToStringTest() {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ try {
+ Object obj = e.eval("new TypeError('wrong type')");
+ assertEquals(obj.toString(), "TypeError: wrong type", "toString returns wrong value");
+ } catch (final Throwable t) {
+ t.printStackTrace();
+ fail(t.getMessage());
+ }
+
+ try {
+ Object obj = e.eval("function func() { print('hello'); }");
+ assertEquals(obj.toString(), "function func() { print('hello'); }", "toString returns wrong value");
+ } catch (final Throwable t) {
+ t.printStackTrace();
+ fail(t.getMessage());
+ }
+ }
+
+ @Test
+ public void mirrorNewObjectGlobalFunctionTest() throws ScriptException {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ final ScriptEngine e2 = m.getEngineByName("nashorn");
+
+ e.eval("function func() {}");
+ e2.put("foo", e.get("func"));
+ final Object e2global = e2.eval("this");
+ final Object newObj = ((ScriptObjectMirror) e2global).newObject("foo");
+ assertTrue(newObj instanceof ScriptObjectMirror);
+ }
+
+ @Test
+ public void mirrorNewObjectInstanceFunctionTest() throws ScriptException {
+ final ScriptEngineManager m = new ScriptEngineManager();
+ final ScriptEngine e = m.getEngineByName("nashorn");
+ final ScriptEngine e2 = m.getEngineByName("nashorn");
+
+ e.eval("function func() {}");
+ e2.put("func", e.get("func"));
+ final Object e2obj = e2.eval("({ foo: func })");
+ final Object newObj = ((ScriptObjectMirror) e2obj).newObject("foo");
+ assertTrue(newObj instanceof ScriptObjectMirror);
+ }
+}
--- a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -35,6 +35,8 @@
import jdk.nashorn.internal.runtime.Source;
import jdk.nashorn.internal.runtime.options.Options;
import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
@@ -58,7 +60,8 @@
private Context context;
private ScriptObject global;
- public CompilerTest() {
+ @BeforeClass
+ public void setupTest() {
final Options options = new Options("nashorn");
options.set("anon.functions", true);
options.set("compile.only", true);
@@ -79,6 +82,12 @@
this.global = context.createGlobal();
}
+ @AfterClass
+ public void tearDownTest() {
+ this.context = null;
+ this.global = null;
+ }
+
@Test
public void compileAllTests() {
if (TEST262) {
--- a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -28,10 +28,11 @@
import java.io.File;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.Source;
import jdk.nashorn.internal.runtime.options.Options;
import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
@@ -54,9 +55,9 @@
}
private Context context;
- private ScriptObject global;
- public ParserTest() {
+ @BeforeClass
+ public void setupTest() {
final Options options = new Options("nashorn");
options.set("anon.functions", true);
options.set("parse.only", true);
@@ -64,7 +65,11 @@
ErrorManager errors = new ErrorManager();
this.context = new Context(options, errors, Thread.currentThread().getContextClassLoader());
- this.global = context.createGlobal();
+ }
+
+ @AfterClass
+ public void tearDownTest() {
+ this.context = null;
}
@Test
@@ -125,8 +130,6 @@
log("Begin parsing " + file.getAbsolutePath());
}
- final ScriptObject oldGlobal = Context.getGlobal();
- final boolean globalChanged = (oldGlobal != global);
try {
final char[] buffer = Source.readFully(file);
boolean excluded = false;
@@ -150,9 +153,6 @@
}
};
errors.setLimit(0);
- if (globalChanged) {
- Context.setGlobal(global);
- }
final Source source = new Source(file.getAbsolutePath(), buffer);
new Parser(context.getEnv(), source, errors).parse();
if (errors.getNumberOfErrors() > 0) {
@@ -167,10 +167,6 @@
exp.printStackTrace(System.out);
}
failed++;
- } finally {
- if (globalChanged) {
- Context.setGlobal(oldGlobal);
- }
}
if (VERBOSE) {
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,7 +32,10 @@
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
+import javax.script.ScriptContext;
import javax.script.ScriptException;
+import javax.script.SimpleBindings;
+import javax.script.SimpleScriptContext;
import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
import org.testng.annotations.Test;
@@ -196,4 +199,25 @@
}
fail("Cannot find nashorn factory!");
}
+
+ @Test
+ public void globalPerEngineTest() throws ScriptException {
+ final NashornScriptEngineFactory fac = new NashornScriptEngineFactory();
+ final String[] options = new String[] { "--global-per-engine" };
+ final ScriptEngine e = fac.getScriptEngine(options);
+
+ e.eval("function foo() {}");
+
+ final ScriptContext newCtx = new SimpleScriptContext();
+ newCtx.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE);
+
+ // all global definitions shared and so 'foo' should be
+ // visible in new Bindings as well.
+ assertTrue(e.eval("typeof foo", newCtx).equals("function"));
+
+ e.eval("function bar() {}", newCtx);
+
+ // bar should be visible in default context
+ assertTrue(e.eval("typeof bar").equals("function"));
+ }
}
--- a/nashorn/tools/fxshell/jdk/nashorn/tools/FXShell.java Thu Sep 05 15:37:40 2013 +0400
+++ b/nashorn/tools/fxshell/jdk/nashorn/tools/FXShell.java Fri Sep 06 15:09:44 2013 -0700
@@ -32,13 +32,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javafx.application.Application;
import javafx.stage.Stage;
import javax.script.Invocable;
-import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
@@ -180,6 +176,7 @@
*
* @return Last evaluation result (discarded.)
*/
+ @SuppressWarnings("resource")
private Object load(String path) {
try {
FileInputStream file = new FileInputStream(path);
--- a/test/Makefile Thu Sep 05 15:37:40 2013 +0400
+++ b/test/Makefile Fri Sep 06 15:09:44 2013 -0700
@@ -49,61 +49,22 @@
fi
endef
-# Test target list for langtools repository
-LANGTOOLS_TEST_LIST = langtools_jtreg
-
-# Test target list for jdk repository
-JDK_ALL_TEST_LIST = \
- jdk_beans1 \
- jdk_io \
- jdk_lang \
- jdk_math \
- jdk_other \
- jdk_net \
- jdk_nio \
- jdk_security1 \
- jdk_text \
- jdk_util \
- jdk_time \
- jdk_awt \
- jdk_beans2 jdk_beans3 \
- jdk_management \
- jdk_jmx \
- jdk_security2 jdk_security3 \
- jdk_rmi \
- jdk_sound \
- jdk_swing \
- jdk_tools \
- jdk_jdi \
- jdk_jfr
-
-# Theses are meta test targets in jdk
-JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
-
-# These are the current jck test targets in the jdk repository
-JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
-
# Default test target (core)
-default: jdk_core $(LANGTOOLS_TEST_LIST)
+default: jdk_core langtools_jtreg
# All testing
-all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
+all: jdk_all langtools_all
# Test targets
-$(LANGTOOLS_TEST_LIST):
- @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
+langtools_% :
+ @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
-$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST):
- @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
-
-clean:
+jdk_% :
+ @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
################################################################
# Phony targets (e.g. these are not filenames)
-.PHONY: all clean \
- $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
- $(LANGTOOLS_TEST_LIST)
+.PHONY: all clean
################################################################
-