--- a/.hgtags Thu May 12 07:24:37 2011 -0700
+++ b/.hgtags Thu May 12 07:28:52 2011 -0700
@@ -115,3 +115,4 @@
62b8e328f8c8c66c14b0713222116f2add473f3f jdk7-b138
955488f34ca418f6cdab843d61c20d2c615637d9 jdk7-b139
f4298bc3f4b6baa315643be06966f09684290068 jdk7-b140
+5d86d0c7692e8f4a58d430d68c03594e2d3403b3 jdk7-b141
--- a/.hgtags-top-repo Thu May 12 07:24:37 2011 -0700
+++ b/.hgtags-top-repo Thu May 12 07:28:52 2011 -0700
@@ -115,3 +115,4 @@
fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140
+c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141
--- a/corba/.hgtags Thu May 12 07:24:37 2011 -0700
+++ b/corba/.hgtags Thu May 12 07:28:52 2011 -0700
@@ -115,3 +115,4 @@
78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138
60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139
cdf5d19ec142424489549025e9c42e51f32cf688 jdk7-b140
+a58635cdd921bafef353f4864184a0481353197b jdk7-b141
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties Thu May 12 07:24:37 2011 -0700
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties Thu May 12 07:28:52 2011 -0700
@@ -23,9 +23,9 @@
# questions.
#
-orbd.usage=Uso: {0} <options> \n\nem que <options> inclui:\n -port porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, default 1049 (opcional)\n -defaultdb diret\u00F3rio dos arquivos ORBD, default "./orb.db" (opcional)\n -serverid id do servidor para ORBD, default 1 (opcional)\n -ORBInitialPort porta inicial (necess\u00E1rio)\n -ORBInitialHost nome de host inicial (necess\u00E1rio)\n
+orbd.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -port porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, default 1049 (opcional)\n -defaultdb diret\u00F3rio dos arquivos ORBD, default "./orb.db" (opcional)\n -serverid id do servidor para ORBD, default 1 (opcional)\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
-servertool.usage=Uso: {0} <options> \n\nem que <options> inclui:\n -ORBInitialPort porta inicial (necess\u00E1rio)\n -ORBInitialHost nome de host inicial (necess\u00E1rio)\n
+servertool.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
servertool.banner=\n\nBem-vindo \u00E0 Ferramenta de Servidor IDL Java \ninsira os comandos no prompt \n
servertool.shorthelp=\n\n\tComandos Dispon\u00EDveis: \n\t------------------- \n
servertool.baddef=Defini\u00E7\u00E3o do servidor inv\u00E1lida: {0}
@@ -40,23 +40,23 @@
servertool.vmargs=\tvmargs - {0}
servertool.serverid=\tserver id - {0}
servertool.servernotrunning=\to servidor n\u00E3o est\u00E1 em execu\u00E7\u00E3o.
-servertool.register=\n\n\tregister -server <server class name> \n\t -applicationName <alternate server name> \n\t -classpath <classpath to server> \n\t -args <args to server> \n\t -vmargs <args to server Java VM>\n
+servertool.register=\n\n\tregister -server <nome da classe do servidor> \n\t -applicationName <nome do servidor alternativo> \n\t -classpath <classpath para o servidor> \n\t -args <args para o servidor> \n\t -vmargs <args para a VM Java do servidor>\n
servertool.register1=registra um servidor ativ\u00E1vel
servertool.register2=\tservidor registrado (serverid = {0}).
servertool.register3=\tservidor registrado, mas em espera (serverid = {0}).
servertool.register4=\tservidor j\u00E1 registrado (serverid = {0}).
-servertool.unregister=\n\tunregister [ -serverid <server id> | -applicationName <name> ] \n
+servertool.unregister=\n\tunregister [ -serverid <id do servidor> | -applicationName <nome> ] \n
servertool.unregister1=cancela o registro de um servidor registrado
servertool.unregister2=\tservidor n\u00E3o registrado.
-servertool.locate=\n\tlocate [ -serverid <server id> | -applicationName <name> ] [ <-endpointType <endpointType> ] \n
+servertool.locate=\n\tlocate [ -serverid <id do servidor> | -applicationName <nome> ] [ <-endpointType <endpointType> ] \n
servertool.locate1=localiza portas de tipo espec\u00EDfico para um servidor registrado
servertool.locate2=\n\n\tNome do Host {0} \n\n\t\tPorta\t\tTipo de Porta\t\tId do ORB\n\t\t----\t\t---------\t\t------\n
-servertool.locateorb=\n\tlocateperorb [ -serverid <server id> | -applicationName <name> ] [ -orbid <ORB name> ]\n
+servertool.locateorb=\n\tlocateperorb [ -serverid <id do servidor> | -applicationName <nome> ] [ -orbid <nome ORB> ]\n
servertool.locateorb1=localiza portas para um orb espec\u00EDfico de servidor registrado
servertool.locateorb2=\n\n\tNome do Host {0} \n\n\t\tPorta\t\tTipo de Porta\t\tId do ORB\n\t\t----\t\t--------\t\t------\n
-servertool.getserverid=\n\tgetserverid [ -applicationName <name> ] \n
+servertool.getserverid=\n\tgetserverid [ -applicationName <nome> ] \n
servertool.getserverid1=retorna o id do servidor de um applicationName
servertool.getserverid2=\tID do Servidor de applicationName {0} \u00E9 {1}
@@ -69,33 +69,33 @@
servertool.listappnames1=lista os applicationNames atualmente definidos
servertool.listappnames2=applicationNames do servidor definidos atualmente:
-servertool.shutdown=\n\tshutdown [ -serverid <server id> | -applicationName <name> ]\n
+servertool.shutdown=\n\tshutdown [ -serverid <id do servidor> | -applicationName <nome> ]\n
servertool.shutdown1=faz shutdown de um servidor registrado
servertool.shutdown2=\tshutdown do servidor bem-sucedido.
-servertool.startserver=\n\tstartup [ -serverid <server id> | -applicationName <name> ]\n
+servertool.startserver=\n\tstartup [ -serverid <id do servidor> | -applicationName <nome> ]\n
servertool.startserver1=inicia um servidor registrado
servertool.startserver2=\tservidor iniciado com \u00EAxito.
servertool.quit=\n\tquit\n
servertool.quit1=sai desta ferramenta
-servertool.help=\thelp\n\tOR\n\thelp <command name>\n
+servertool.help=\thelp\n\tOR\n\thelp <nome do comando>\n
servertool.help1=obt\u00E9m ajuda
-servertool.orbidmap=\tUso: orblist [ -serverid <server id> | -applicationName <name> ]\n
+servertool.orbidmap=\tUso: orblist [ -serverid <id do servidor> | -applicationName <nome> ]\n
servertool.orbidmap1=lista de nomes de orb e seus mapeamentos
servertool.orbidmap2=\n\tId de ORB\t\tNome de ORB\n\t------\t\t--------\n
pnameserv.success=NameServer Persistente Iniciado com \u00CAxito
-bootstrap.usage=Uso: {0} <options> \n\nem que <options> inclui:\n -ORBInitialPort porta inicial (necess\u00E1rio)\n -InitialServicesFile arquivo que cont\u00E9m a lista de servi\u00E7os iniciais (necess\u00E1rio)\n
+bootstrap.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -InitialServicesFile arquivo que cont\u00E9m a lista de servi\u00E7os iniciais (obrigat\u00F3rio)\n
bootstrap.success=definindo porta para {0} e lendo servi\u00E7os de {1}
bootstrap.filenotreadable=o arquivo {0} n\u00E3o \u00E9 leg\u00EDvel
bootstrap.filenotfound=arquivo {0} n\u00E3o encontrado
bootstrap.exception=exce\u00E7\u00E3o capturada ao salvar as propriedades no Arquivo {0}: exce\u00E7\u00E3o {1}
tnameserv.exception=uma exce\u00E7\u00E3o capturada ao iniciar o servi\u00E7o de inicializa\u00E7\u00E3o na porta {0}
-tnameserv.usage=tente usar outra porta com os argumentos de linha de comandos -ORBInitialPort <portno>
+tnameserv.usage=tente usar outra porta com os argumentos de linha de comandos -ORBInitialPort <n\u00BA da porta>
tnameserv.invalidhostoption=ORBInitialHost n\u00E3o \u00E9 uma op\u00E7\u00E3o v\u00E1lida para NameService
tnameserv.orbinitialport0=ORBInitialPort 0 n\u00E3o \u00E9 uma op\u00E7\u00E3o v\u00E1lida para NameService
tnameserv.hs1=Contexto de Nomea\u00E7\u00E3o Inicial:\n{0}
--- a/hotspot/.hgtags Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/.hgtags Thu May 12 07:28:52 2011 -0700
@@ -168,3 +168,5 @@
611e19a16519d6fb5deea9ab565336e6e6ee475d hs21-b09
d283b82966712b353fa307845a1316da42a355f4 jdk7-b140
d283b82966712b353fa307845a1316da42a355f4 hs21-b10
+5d07913abd59261c77f24cc04a759cb75d804099 jdk7-b141
+3aea9e9feb073f5500e031be6186666bcae89aa2 hs21-b11
--- a/hotspot/agent/make/Makefile Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/agent/make/Makefile Thu May 12 07:28:52 2011 -0700
@@ -257,7 +257,7 @@
all: filelist
@mkdir -p $(OUTPUT_DIR)
@echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(JAVAC) -source 1.4 -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist
+ $(JAVAC) -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist
$(RMIC) -classpath $(OUTPUT_DIR) -d $(OUTPUT_DIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql/sa.js
cp $(SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql
@@ -269,7 +269,7 @@
allprof: filelist
@mkdir -p $(OUTPUT_DIR)
@echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(JAVAC) -source 1.4 -J-Xprof -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist
+ $(JAVAC) -J-Xprof -classpath $(CLASSPATH) -deprecation -sourcepath $(SRC_DIR) -g -d $(OUTPUT_DIR) @filelist
$(RMIC) -classpath $(OUTPUT_DIR) -d $(OUTPUT_DIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
rm -f $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql/sa.js
cp $(SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(OUTPUT_DIR)/sun/jvm/hotspot/utilities/soql
--- a/hotspot/agent/src/os/solaris/proc/libproc.h Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/agent/src/os/solaris/proc/libproc.h Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -420,7 +420,22 @@
/*
* Stack frame iteration interface.
*/
+#ifdef SOLARIS_11_B159_OR_LATER
+/* building on Nevada-B159 or later so define the new callback */
+typedef int proc_stack_f(
+ void *, /* the cookie given to Pstack_iter() */
+ const prgregset_t, /* the frame's registers */
+ uint_t, /* argc for the frame's function */
+ const long *, /* argv for the frame's function */
+ int, /* bitwise flags describing the frame (see below) */
+ int); /* a signal number */
+
+#define PR_SIGNAL_FRAME 1 /* called by a signal handler */
+#define PR_FOUND_SIGNAL 2 /* we found the corresponding signal number */
+#else
+/* building on Nevada-B158 or earlier so define the old callback */
typedef int proc_stack_f(void *, const prgregset_t, uint_t, const long *);
+#endif
extern int Pstack_iter(struct ps_prochandle *,
const prgregset_t, proc_stack_f *, void *);
--- a/hotspot/agent/src/os/solaris/proc/salibproc.h Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/agent/src/os/solaris/proc/salibproc.h Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -101,7 +101,23 @@
/*
* Stack frame iteration interface.
*/
+#ifdef SOLARIS_11_B159_OR_LATER
+/* building on Nevada-B159 or later so define the new callback */
+typedef int proc_stack_f(
+ void *, /* the cookie given to Pstack_iter() */
+ const prgregset_t, /* the frame's registers */
+ uint_t, /* argc for the frame's function */
+ const long *, /* argv for the frame's function */
+ int, /* bitwise flags describing the frame (see below) */
+ int); /* a signal number */
+
+#define PR_SIGNAL_FRAME 1 /* called by a signal handler */
+#define PR_FOUND_SIGNAL 2 /* we found the corresponding signal number */
+#else
+/* building on Nevada-B158 or earlier so define the old callback */
typedef int proc_stack_f(void *, const prgregset_t, uint_t, const long *);
+#endif
+
extern int Pstack_iter(struct ps_prochandle *,
const prgregset_t, proc_stack_f *, void *);
--- a/hotspot/agent/src/os/solaris/proc/saproc.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/agent/src/os/solaris/proc/saproc.cpp Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -24,6 +24,9 @@
#include "salibproc.h"
#include "sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal.h"
+#ifndef SOLARIS_11_B159_OR_LATER
+#include <sys/utsname.h>
+#endif
#include <thread_db.h>
#include <strings.h>
#include <limits.h>
@@ -40,8 +43,22 @@
#define SYMBOL_BUF_SIZE 256
#define ERR_MSG_SIZE (PATH_MAX + 256)
-// debug mode
+// debug modes
static int _libsaproc_debug = 0;
+#ifndef SOLARIS_11_B159_OR_LATER
+static bool _Pstack_iter_debug = false;
+
+static void dprintf_2(const char* format,...) {
+ if (_Pstack_iter_debug) {
+ va_list alist;
+
+ va_start(alist, format);
+ fputs("Pstack_iter DEBUG: ", stderr);
+ vfprintf(stderr, format, alist);
+ va_end(alist);
+ }
+}
+#endif // !SOLARIS_11_B159_OR_LATER
static void print_debug(const char* format,...) {
if (_libsaproc_debug) {
@@ -450,6 +467,7 @@
return 0;
}
+// Pstack_iter() proc_stack_f callback prior to Nevada-B159
static int
fill_cframe_list(void *cd, const prgregset_t regs, uint_t argc, const long *argv) {
DebuggerWith2Objects* dbgo2 = (DebuggerWith2Objects*) cd;
@@ -472,6 +490,14 @@
return 0;
}
+// Pstack_iter() proc_stack_f callback in Nevada-B159 or later
+/*ARGSUSED*/
+static int
+wrapper_fill_cframe_list(void *cd, const prgregset_t regs, uint_t argc,
+ const long *argv, int frame_flags, int sig) {
+ return(fill_cframe_list(cd, regs, argc, argv));
+}
+
// part of the class sharing workaround
// FIXME: !!HACK ALERT!!
@@ -970,6 +996,11 @@
TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS);
}
+#ifndef SOLARIS_11_B159_OR_LATER
+// building on Nevada-B158 or earlier so more hoops to jump through
+static bool has_newer_Pstack_iter = false; // older version by default
+#endif
+
/*
* Class: sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal
* Method: fillCFrameList0
@@ -997,7 +1028,24 @@
env->ReleaseLongArrayElements(regsArray, ptr, JNI_ABORT);
CHECK_EXCEPTION_(0);
- Pstack_iter((struct ps_prochandle*) p_ps_prochandle, gregs, fill_cframe_list, &dbgo2);
+
+#ifdef SOLARIS_11_B159_OR_LATER
+ // building on Nevada-B159 or later so use the new callback
+ Pstack_iter((struct ps_prochandle*) p_ps_prochandle, gregs,
+ wrapper_fill_cframe_list, &dbgo2);
+#else
+ // building on Nevada-B158 or earlier so figure out which callback to use
+
+ if (has_newer_Pstack_iter) {
+ // Since we're building on Nevada-B158 or earlier, we have to
+ // cast wrapper_fill_cframe_list to make the compiler happy.
+ Pstack_iter((struct ps_prochandle*) p_ps_prochandle, gregs,
+ (proc_stack_f *)wrapper_fill_cframe_list, &dbgo2);
+ } else {
+ Pstack_iter((struct ps_prochandle*) p_ps_prochandle, gregs,
+ fill_cframe_list, &dbgo2);
+ }
+#endif // SOLARIS_11_B159_OR_LATER
return dbgo2.obj;
}
@@ -1218,6 +1266,102 @@
return res;
}
+#ifndef SOLARIS_11_B159_OR_LATER
+// Determine if the OS we're running on has the newer version
+// of libproc's Pstack_iter.
+//
+// Set env var PSTACK_ITER_DEBUG=true to debug this logic.
+// Set env var PSTACK_ITER_DEBUG_RELEASE to simulate a 'release' value.
+// Set env var PSTACK_ITER_DEBUG_VERSION to simulate a 'version' value.
+//
+// frankenputer 'uname -r -v': 5.10 Generic_141445-09
+// jurassic 'uname -r -v': 5.11 snv_164
+// lonepeak 'uname -r -v': 5.11 snv_127
+//
+static void set_has_newer_Pstack_iter(JNIEnv *env) {
+ static bool done_set = false;
+
+ if (done_set) {
+ // already set has_newer_Pstack_iter
+ return;
+ }
+
+ struct utsname name;
+ if (uname(&name) == -1) {
+ THROW_NEW_DEBUGGER_EXCEPTION("uname() failed!");
+ }
+ dprintf_2("release='%s' version='%s'\n", name.release, name.version);
+
+ if (_Pstack_iter_debug) {
+ char *override = getenv("PSTACK_ITER_DEBUG_RELEASE");
+ if (override != NULL) {
+ strncpy(name.release, override, SYS_NMLN - 1);
+ name.release[SYS_NMLN - 2] = '\0';
+ dprintf_2("overriding with release='%s'\n", name.release);
+ }
+ override = getenv("PSTACK_ITER_DEBUG_VERSION");
+ if (override != NULL) {
+ strncpy(name.version, override, SYS_NMLN - 1);
+ name.version[SYS_NMLN - 2] = '\0';
+ dprintf_2("overriding with version='%s'\n", name.version);
+ }
+ }
+
+ // the major number corresponds to the old SunOS major number
+ int major = atoi(name.release);
+ if (major >= 6) {
+ dprintf_2("release is SunOS 6 or later\n");
+ has_newer_Pstack_iter = true;
+ done_set = true;
+ return;
+ }
+ if (major < 5) {
+ dprintf_2("release is SunOS 4 or earlier\n");
+ done_set = true;
+ return;
+ }
+
+ // some SunOS 5.* build so now check for Solaris versions
+ char *dot = strchr(name.release, '.');
+ int minor = 0;
+ if (dot != NULL) {
+ // release is major.minor format
+ *dot = NULL;
+ minor = atoi(dot + 1);
+ }
+
+ if (minor <= 10) {
+ dprintf_2("release is Solaris 10 or earlier\n");
+ done_set = true;
+ return;
+ } else if (minor >= 12) {
+ dprintf_2("release is Solaris 12 or later\n");
+ has_newer_Pstack_iter = true;
+ done_set = true;
+ return;
+ }
+
+ // some Solaris 11 build so now check for internal build numbers
+ if (strncmp(name.version, "snv_", 4) != 0) {
+ dprintf_2("release is Solaris 11 post-GA or later\n");
+ has_newer_Pstack_iter = true;
+ done_set = true;
+ return;
+ }
+
+ // version begins with "snv_" so a pre-GA build of Solaris 11
+ int build = atoi(&name.version[4]);
+ if (build >= 159) {
+ dprintf_2("release is Nevada-B159 or later\n");
+ has_newer_Pstack_iter = true;
+ } else {
+ dprintf_2("release is Nevada-B158 or earlier\n");
+ }
+
+ done_set = true;
+}
+#endif // !SOLARIS_11_B159_OR_LATER
+
/*
* Class: sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal
* Method: initIDs
@@ -1237,6 +1381,14 @@
if (libproc_handle == 0)
THROW_NEW_DEBUGGER_EXCEPTION("can't load libproc.so, if you are using Solaris 5.7 or below, copy libproc.so from 5.8!");
+#ifndef SOLARIS_11_B159_OR_LATER
+ _Pstack_iter_debug = getenv("PSTACK_ITER_DEBUG") != NULL;
+
+ set_has_newer_Pstack_iter(env);
+ CHECK_EXCEPTION;
+ dprintf_2("has_newer_Pstack_iter=%d\n", has_newer_Pstack_iter);
+#endif
+
p_ps_prochandle_ID = env->GetFieldID(clazz, "p_ps_prochandle", "J");
CHECK_EXCEPTION;
--- a/hotspot/make/altsrc.make Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/make/altsrc.make Thu May 12 07:28:52 2011 -0700
@@ -24,7 +24,8 @@
# This file defines variables and macros which are used in the makefiles to
# allow distributions to augment or replace common hotspot code with
-# distribution-specific source files.
+# distribution-specific source files. This capability is disabled when
+# an OPENJDK build is requested, unless HS_ALT_SRC_REL has been set externally.
# Requires: GAMMADIR
# Provides:
@@ -33,14 +34,17 @@
HS_COMMON_SRC_REL=src
-# This needs to be changed to a more generic location, but we keep it as this
-# for now for compatibility
-HS_ALT_SRC_REL=src/closed
+ifneq ($(OPENJDK),true)
+ # This needs to be changed to a more generic location, but we keep it
+ # as this for now for compatibility
+ HS_ALT_SRC_REL=src/closed
+else
+ HS_ALT_SRC_REL=NO_SUCH_PATH
+endif
HS_COMMON_SRC=$(GAMMADIR)/$(HS_COMMON_SRC_REL)
HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL)
-
## altsrc-equiv
#
# Convert a common source path to an alternative source path
--- a/hotspot/make/hotspot_version Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/make/hotspot_version Thu May 12 07:28:52 2011 -0700
@@ -35,7 +35,7 @@
HS_MAJOR_VER=21
HS_MINOR_VER=0
-HS_BUILD_NUMBER=11
+HS_BUILD_NUMBER=12
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/make/jdk6_hotspot_distro Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# This file format must remain compatible with both
+# GNU Makefile and Microsoft nmake formats.
+#
+
+# Don't put quotes (fail windows build).
+HOTSPOT_VM_DISTRO=Java HotSpot(TM)
+COMPANY_NAME=Sun Microsystems, Inc.
+PRODUCT_NAME=Java(TM) Platform SE
--- a/hotspot/make/linux/makefiles/gcc.make Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/make/linux/makefiles/gcc.make Thu May 12 07:28:52 2011 -0700
@@ -205,7 +205,7 @@
SHARED_FLAG = -shared
# Keep symbols even they are not used
-AOUT_FLAGS += -export-dynamic
+AOUT_FLAGS += -Xlinker -export-dynamic
#------------------------------------------------------------------------
# Debug flags
--- a/hotspot/make/linux/makefiles/vm.make Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/make/linux/makefiles/vm.make Thu May 12 07:28:52 2011 -0700
@@ -102,6 +102,10 @@
CFLAGS += $(EXTRA_CFLAGS)
LFLAGS += $(EXTRA_CFLAGS)
+# Don't set excutable bit on stack segment
+# the same could be done by separate execstack command
+LFLAGS += -Xlinker -z -Xlinker noexecstack
+
LIBS += -lm -ldl -lpthread
# By default, link the *.o into the library, not the executable.
--- a/hotspot/make/solaris/makefiles/saproc.make Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/make/solaris/makefiles/saproc.make Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -56,6 +56,30 @@
SA_LFLAGS += -mt -xnolib -norunpath
endif
+# The libproc Pstack_iter() interface changed in Nevada-B159.
+# This logic needs to match
+# agent/src/os/solaris/proc/saproc.cpp: set_has_newer_Pstack_iter():
+# - skip SunOS 4 or older
+# - skip Solaris 10 or older
+# - skip two digit Nevada builds
+# - skip three digit Nevada builds thru 149
+# - skip Nevada builds 150-158
+SOLARIS_11_B159_OR_LATER := \
+$(shell uname -r -v \
+ | sed -n ' \
+ /^[0-3]\. /b \
+ /^5\.[0-9] /b \
+ /^5\.10 /b \
+ / snv_[0-9][0-9]$/b \
+ / snv_[01][0-4][0-9]$/b \
+ / snv_15[0-8]$/b \
+ s/.*/-DSOLARIS_11_B159_OR_LATER/p \
+ ')
+
+# Uncomment the following to simulate building on Nevada-B159 or later
+# when actually building on Nevada-B158 or earlier:
+#SOLARIS_11_B159_OR_LATER=-DSOLARIS_11_B159_OR_LATER
+
$(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -68,6 +92,7 @@
-I$(GENERATED) \
-I$(BOOT_JAVA_HOME)/include \
-I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \
+ $(SOLARIS_11_B159_OR_LATER) \
$(SASRCFILES) \
$(SA_LFLAGS) \
-o $@ \
--- a/hotspot/make/solaris/makefiles/sparcWorks.make Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/make/solaris/makefiles/sparcWorks.make Thu May 12 07:28:52 2011 -0700
@@ -100,11 +100,6 @@
LINK_LIB.CC/PRE_HOOK += $(JVM_CHECK_SYMBOLS) || exit 1;
-# Some interfaces (_lwp_create) changed with LP64 and Solaris 7
-SOLARIS_7_OR_LATER := \
-$(shell uname -r | awk -F. '{ if ($$2 >= 7) print "-DSOLARIS_7_OR_LATER"; }')
-CFLAGS += ${SOLARIS_7_OR_LATER}
-
# New architecture options started in SS12 (5.9), we need both styles to build.
# The older arch options for SS11 (5.8) or older and also for /usr/ccs/bin/as.
# Note: default for 32bit sparc is now the same as v8plus, so the
--- a/hotspot/make/windows/build.make Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/make/windows/build.make Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
@@ -125,7 +125,25 @@
# or make/hotspot_distro.
!ifndef HOTSPOT_VM_DISTRO
!if exists($(WorkSpace)\src\closed)
+
+# if the build is for JDK6 or earlier version, it should include jdk6_hotspot_distro,
+# instead of hotspot_distro.
+JDK6_OR_EARLIER=0
+!if "$(JDK_MAJOR_VERSION)" != "" && "$(JDK_MINOR_VERSION)" != "" && "$(JDK_MICRO_VERSION)" != ""
+!if $(JDK_MAJOR_VERSION) == 1 && $(JDK_MINOR_VERSION) < 7
+JDK6_OR_EARLIER=1
+!endif
+!else
+!if $(JDK_MAJOR_VER) == 1 && $(JDK_MINOR_VER) < 7
+JDK6_OR_EARLIER=1
+!endif
+!endif
+
+!if $(JDK6_OR_EARLIER) == 1
+!include $(WorkSpace)\make\jdk6_hotspot_distro
+!else
!include $(WorkSpace)\make\hotspot_distro
+!endif
!else
!include $(WorkSpace)\make\openjdk_distro
!endif
@@ -260,7 +278,7 @@
@ echo Variant=$(realVariant) >> $@
@ echo WorkSpace=$(WorkSpace) >> $@
@ echo BootStrapDir=$(BootStrapDir) >> $@
- @ if "$(USERNAME)" NEQ "" echo BuildUser=$(USERNAME) >> $@
+ @ if "$(USERNAME)" NEQ "" echo BuildUser=$(USERNAME) >> $@
@ echo HS_VER=$(HS_VER) >> $@
@ echo HS_DOTVER=$(HS_DOTVER) >> $@
@ echo HS_COMPANY=$(COMPANY_NAME) >> $@
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -806,3 +806,34 @@
int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize) - 1;
return &interpreter_frame_tos_address()[index];
}
+
+
+#ifdef ASSERT
+
+#define DESCRIBE_FP_OFFSET(name) \
+ values.describe(-1, fp() + frame::name##_offset, #name)
+
+void frame::describe_pd(FrameValues& values, int frame_no) {
+ for (int w = 0; w < frame::register_save_words; w++) {
+ values.describe(frame_no, sp() + w, err_msg("register save area word %d", w), 1);
+ }
+
+ if (is_interpreted_frame()) {
+ DESCRIBE_FP_OFFSET(interpreter_frame_d_scratch_fp);
+ DESCRIBE_FP_OFFSET(interpreter_frame_l_scratch_fp);
+ DESCRIBE_FP_OFFSET(interpreter_frame_padding);
+ DESCRIBE_FP_OFFSET(interpreter_frame_oop_temp);
+ }
+
+ if (!is_compiled_frame()) {
+ if (frame::callee_aggregate_return_pointer_words != 0) {
+ values.describe(frame_no, sp() + frame::callee_aggregate_return_pointer_sp_offset, "callee_aggregate_return_pointer_word");
+ }
+ for (int w = 0; w < frame::callee_register_argument_save_area_words; w++) {
+ values.describe(frame_no, sp() + frame::callee_register_argument_save_area_sp_offset + w,
+ err_msg("callee_register_argument_save_area_words %d", w));
+ }
+ }
+}
+
+#endif
--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp Thu May 12 07:28:52 2011 -0700
@@ -350,8 +350,9 @@
#ifndef PRODUCT
extern "C" void print_method_handle(oop mh);
void trace_method_handle_stub(const char* adaptername,
- oopDesc* mh) {
- printf("MH %s mh="INTPTR_FORMAT"\n", adaptername, (intptr_t) mh);
+ oopDesc* mh,
+ intptr_t* saved_sp) {
+ tty->print_cr("MH %s mh="INTPTR_FORMAT " saved_sp=" INTPTR_FORMAT, adaptername, (intptr_t) mh, saved_sp);
print_method_handle(mh);
}
void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) {
@@ -361,6 +362,7 @@
__ save_frame(16);
__ set((intptr_t) adaptername, O0);
__ mov(G3_method_handle, O1);
+ __ mov(I5_savedSP, O2);
__ mov(G3_method_handle, L3);
__ mov(Gargs, L4);
__ mov(G5_method_type, L5);
@@ -643,9 +645,10 @@
// Live at this point:
// - G5_klass : klass required by the target method
+ // - O0_argslot : argslot index in vmarg; may be required in the failing path
// - O1_scratch : argument klass to test
// - G3_method_handle: adapter method handle
- __ check_klass_subtype(O1_scratch, G5_klass, O0_argslot, O2_scratch, done);
+ __ check_klass_subtype(O1_scratch, G5_klass, O2_scratch, O3_scratch, done);
// If we get here, the type check failed!
__ load_heap_oop(G3_amh_argument, O2_required); // required class
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Thu May 12 07:28:52 2011 -0700
@@ -1698,35 +1698,21 @@
popframe_extra_args;
int local_words = method->max_locals() * Interpreter::stackElementWords;
- int parm_words = method->size_of_parameters() * Interpreter::stackElementWords;
- NEEDS_CLEANUP;
intptr_t* locals;
- if (caller->is_interpreted_frame()) {
- // Can force the locals area to end up properly overlapping the top of the expression stack.
- intptr_t* Lesp_ptr = caller->interpreter_frame_tos_address() - 1;
- // Note that this computation means we replace size_of_parameters() values from the caller
- // interpreter frame's expression stack with our argument locals
- locals = Lesp_ptr + parm_words;
- int delta = local_words - parm_words;
- int computed_sp_adjustment = (delta > 0) ? round_to(delta, WordsPerLong) : 0;
- *interpreter_frame->register_addr(I5_savedSP) = (intptr_t) (fp + computed_sp_adjustment) - STACK_BIAS;
+ if (caller->is_compiled_frame()) {
+ // Compiled frames do not allocate a varargs area so place them
+ // next to the register save area.
+ locals = fp + frame::register_save_words + local_words - 1;
+ // Caller wants his own SP back
+ int caller_frame_size = caller->cb()->frame_size();
+ *interpreter_frame->register_addr(I5_savedSP) = (intptr_t)(caller->fp() - caller_frame_size) - STACK_BIAS;
} else {
- assert(caller->is_compiled_frame() || caller->is_entry_frame(), "only possible cases");
- // Don't have Lesp available; lay out locals block in the caller
- // adjacent to the register window save area.
- //
- // Compiled frames do not allocate a varargs area which is why this if
- // statement is needed.
- //
- if (caller->is_compiled_frame()) {
- locals = fp + frame::register_save_words + local_words - 1;
- } else {
- locals = fp + frame::memory_parameter_word_sp_offset + local_words - 1;
- }
- if (!caller->is_entry_frame()) {
- // Caller wants his own SP back
- int caller_frame_size = caller->cb()->frame_size();
- *interpreter_frame->register_addr(I5_savedSP) = (intptr_t)(caller->fp() - caller_frame_size) - STACK_BIAS;
+ assert(caller->is_interpreted_frame() || caller->is_entry_frame(), "only possible cases");
+ // The entry and interpreter frames are laid out like normal C
+ // frames so place the locals adjacent to the varargs area.
+ locals = fp + frame::memory_parameter_word_sp_offset + local_words - 1;
+ if (caller->is_interpreted_frame()) {
+ *interpreter_frame->register_addr(I5_savedSP) = (intptr_t) (fp + rounded_cls) - STACK_BIAS;
}
}
if (TraceDeoptimization) {
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp Thu May 12 07:28:52 2011 -0700
@@ -6039,6 +6039,43 @@
call_VM_leaf(entry_point, 3);
}
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0) {
+ pass_arg0(this, arg_0);
+ MacroAssembler::call_VM_leaf_base(entry_point, 1);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1) {
+
+ LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+ pass_arg1(this, arg_1);
+ pass_arg0(this, arg_0);
+ MacroAssembler::call_VM_leaf_base(entry_point, 2);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2) {
+ LP64_ONLY(assert(arg_0 != c_rarg2, "smashed arg"));
+ LP64_ONLY(assert(arg_1 != c_rarg2, "smashed arg"));
+ pass_arg2(this, arg_2);
+ LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+ pass_arg1(this, arg_1);
+ pass_arg0(this, arg_0);
+ MacroAssembler::call_VM_leaf_base(entry_point, 3);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2, Register arg_3) {
+ LP64_ONLY(assert(arg_0 != c_rarg3, "smashed arg"));
+ LP64_ONLY(assert(arg_1 != c_rarg3, "smashed arg"));
+ LP64_ONLY(assert(arg_2 != c_rarg3, "smashed arg"));
+ pass_arg3(this, arg_3);
+ LP64_ONLY(assert(arg_0 != c_rarg2, "smashed arg"));
+ LP64_ONLY(assert(arg_1 != c_rarg2, "smashed arg"));
+ pass_arg2(this, arg_2);
+ LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+ pass_arg1(this, arg_1);
+ pass_arg0(this, arg_0);
+ MacroAssembler::call_VM_leaf_base(entry_point, 4);
+}
+
void MacroAssembler::check_and_handle_earlyret(Register java_thread) {
}
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp Thu May 12 07:28:52 2011 -0700
@@ -1655,6 +1655,14 @@
void call_VM_leaf(address entry_point,
Register arg_1, Register arg_2, Register arg_3);
+ // These always tightly bind to MacroAssembler::call_VM_leaf_base
+ // bypassing the virtual implementation
+ void super_call_VM_leaf(address entry_point);
+ void super_call_VM_leaf(address entry_point, Register arg_1);
+ void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2);
+ void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3);
+ void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3, Register arg_4);
+
// last Java Frame (fills frame anchor)
void set_last_Java_frame(Register thread,
Register last_java_sp,
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -669,3 +669,23 @@
int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize);
return &interpreter_frame_tos_address()[index];
}
+
+#ifdef ASSERT
+
+#define DESCRIBE_FP_OFFSET(name) \
+ values.describe(-1, fp() + frame::name##_offset, #name)
+
+void frame::describe_pd(FrameValues& values, int frame_no) {
+ if (is_interpreted_frame()) {
+ DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp);
+ DESCRIBE_FP_OFFSET(interpreter_frame_last_sp);
+ DESCRIBE_FP_OFFSET(interpreter_frame_method);
+ DESCRIBE_FP_OFFSET(interpreter_frame_mdx);
+ DESCRIBE_FP_OFFSET(interpreter_frame_cache);
+ DESCRIBE_FP_OFFSET(interpreter_frame_locals);
+ DESCRIBE_FP_OFFSET(interpreter_frame_bcx);
+ DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp);
+ }
+
+}
+#endif
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Thu May 12 07:28:52 2011 -0700
@@ -383,32 +383,6 @@
movptr(Address(rsp, Interpreter::expr_offset_in_bytes(n)), val);
}
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point) {
- MacroAssembler::call_VM_leaf_base(entry_point, 0);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point, Register arg_1) {
- push(arg_1);
- MacroAssembler::call_VM_leaf_base(entry_point, 1);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2) {
- push(arg_2);
- push(arg_1);
- MacroAssembler::call_VM_leaf_base(entry_point, 2);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3) {
- push(arg_3);
- push(arg_2);
- push(arg_1);
- MacroAssembler::call_VM_leaf_base(entry_point, 3);
-}
-
-
void InterpreterMacroAssembler::prepare_to_jump_from_interpreted() {
// set sender sp
lea(rsi, Address(rsp, wordSize));
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -124,12 +124,6 @@
void load_ptr(int n, Register val);
void store_ptr(int n, Register val);
- // Super call_VM calls - correspond to MacroAssembler::call_VM(_leaf) calls
- void super_call_VM_leaf(address entry_point);
- void super_call_VM_leaf(address entry_point, Register arg_1);
- void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2);
- void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2, Register arg_3);
-
// Generate a subtype check: branch to ok_is_subtype if sub_klass is
// a subtype of super_klass. EAX holds the super_klass. Blows ECX
// and EDI. Register sub_klass cannot be any of the above.
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Thu May 12 07:28:52 2011 -0700
@@ -381,56 +381,6 @@
}
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point) {
- MacroAssembler::call_VM_leaf_base(entry_point, 0);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point,
- Register arg_1) {
- if (c_rarg0 != arg_1) {
- mov(c_rarg0, arg_1);
- }
- MacroAssembler::call_VM_leaf_base(entry_point, 1);
-}
-
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point,
- Register arg_1,
- Register arg_2) {
- assert(c_rarg0 != arg_2, "smashed argument");
- assert(c_rarg1 != arg_1, "smashed argument");
- if (c_rarg0 != arg_1) {
- mov(c_rarg0, arg_1);
- }
- if (c_rarg1 != arg_2) {
- mov(c_rarg1, arg_2);
- }
- MacroAssembler::call_VM_leaf_base(entry_point, 2);
-}
-
-void InterpreterMacroAssembler::super_call_VM_leaf(address entry_point,
- Register arg_1,
- Register arg_2,
- Register arg_3) {
- assert(c_rarg0 != arg_2, "smashed argument");
- assert(c_rarg0 != arg_3, "smashed argument");
- assert(c_rarg1 != arg_1, "smashed argument");
- assert(c_rarg1 != arg_3, "smashed argument");
- assert(c_rarg2 != arg_1, "smashed argument");
- assert(c_rarg2 != arg_2, "smashed argument");
- if (c_rarg0 != arg_1) {
- mov(c_rarg0, arg_1);
- }
- if (c_rarg1 != arg_2) {
- mov(c_rarg1, arg_2);
- }
- if (c_rarg2 != arg_3) {
- mov(c_rarg2, arg_3);
- }
- MacroAssembler::call_VM_leaf_base(entry_point, 3);
-}
-
void InterpreterMacroAssembler::prepare_to_jump_from_interpreted() {
// set sender sp
lea(r13, Address(rsp, wordSize));
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -136,13 +136,6 @@
void load_ptr(int n, Register val);
void store_ptr(int n, Register val);
- // Super call_VM calls - correspond to MacroAssembler::call_VM(_leaf) calls
- void super_call_VM_leaf(address entry_point);
- void super_call_VM_leaf(address entry_point, Register arg_1);
- void super_call_VM_leaf(address entry_point, Register arg_1, Register arg_2);
- void super_call_VM_leaf(address entry_point,
- Register arg_1, Register arg_2, Register arg_3);
-
// Generate a subtype check: branch to ok_is_subtype if sub_klass is
// a subtype of super_klass.
void gen_subtype_check( Register sub_klass, Label &ok_is_subtype );
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp Thu May 12 07:28:52 2011 -0700
@@ -315,56 +315,38 @@
#ifndef PRODUCT
extern "C" void print_method_handle(oop mh);
void trace_method_handle_stub(const char* adaptername,
+ intptr_t* saved_sp,
oop mh,
- intptr_t* saved_regs,
- intptr_t* entry_sp,
- intptr_t* saved_sp,
- intptr_t* saved_bp) {
+ intptr_t* sp) {
// called as a leaf from native code: do not block the JVM!
- intptr_t* last_sp = (intptr_t*) saved_bp[frame::interpreter_frame_last_sp_offset];
- intptr_t* base_sp = (intptr_t*) saved_bp[frame::interpreter_frame_monitor_block_top_offset];
- printf("MH %s mh="INTPTR_FORMAT" sp=("INTPTR_FORMAT"+"INTX_FORMAT") stack_size="INTX_FORMAT" bp="INTPTR_FORMAT"\n",
- adaptername, (intptr_t)mh, (intptr_t)entry_sp, (intptr_t)(saved_sp - entry_sp), (intptr_t)(base_sp - last_sp), (intptr_t)saved_bp);
- if (last_sp != saved_sp && last_sp != NULL)
- printf("*** last_sp="INTPTR_FORMAT"\n", (intptr_t)last_sp);
+ intptr_t* entry_sp = sp + LP64_ONLY(16) NOT_LP64(8);
+ tty->print_cr("MH %s mh="INTPTR_FORMAT" sp="INTPTR_FORMAT" saved_sp="INTPTR_FORMAT")",
+ adaptername, (intptr_t)mh, (intptr_t)entry_sp, saved_sp);
if (Verbose) {
- printf(" reg dump: ");
- int saved_regs_count = (entry_sp-1) - saved_regs;
- // 32 bit: rdi rsi rbp rsp; rbx rdx rcx (*) rax
- int i;
- for (i = 0; i <= saved_regs_count; i++) {
- if (i > 0 && i % 4 == 0 && i != saved_regs_count)
- printf("\n + dump: ");
- printf(" %d: "INTPTR_FORMAT, i, saved_regs[i]);
- }
- printf("\n");
- int stack_dump_count = 16;
- if (stack_dump_count < (int)(saved_bp + 2 - saved_sp))
- stack_dump_count = (int)(saved_bp + 2 - saved_sp);
- if (stack_dump_count > 64) stack_dump_count = 48;
- for (i = 0; i < stack_dump_count; i += 4) {
- printf(" dump at SP[%d] "INTPTR_FORMAT": "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT"\n",
- i, (intptr_t) &entry_sp[i+0], entry_sp[i+0], entry_sp[i+1], entry_sp[i+2], entry_sp[i+3]);
- }
print_method_handle(mh);
}
}
void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) {
if (!TraceMethodHandles) return;
BLOCK_COMMENT("trace_method_handle {");
- __ push(rax);
- __ lea(rax, Address(rsp, wordSize*6)); // entry_sp
__ pusha();
+#ifdef _LP64
+ // Pass arguments carefully since the registers overlap with the calling convention.
+ // rcx: method handle
+ // r13: saved sp
+ __ mov(c_rarg2, rcx); // mh
+ __ mov(c_rarg1, r13); // saved sp
+ __ mov(c_rarg3, rsp); // sp
+ __ movptr(c_rarg0, (intptr_t) adaptername);
+ __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), c_rarg0, c_rarg1, c_rarg2, c_rarg3);
+#else
// arguments:
- __ push(rbp); // interpreter frame pointer
- __ push(rsi); // saved_sp
- __ push(rax); // entry_sp
- __ push(rcx); // mh
- __ push(rcx);
- __ movptr(Address(rsp, 0), (intptr_t) adaptername);
- __ call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), 5);
+ // rcx: method handle
+ // rsi: saved sp
+ __ movptr(rbx, (intptr_t) adaptername);
+ __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub), rbx, rsi, rcx, rsp);
+#endif
__ popa();
- __ pop(rax);
BLOCK_COMMENT("} trace_method_handle");
}
#endif //PRODUCT
--- a/hotspot/src/cpu/x86/vm/x86_32.ad Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad Thu May 12 07:28:52 2011 -0700
@@ -12989,6 +12989,53 @@
%}
// ============================================================================
+// Counted Loop limit node which represents exact final iterator value.
+// Note: the resulting value should fit into integer range since
+// counted loops have limit check on overflow.
+instruct loopLimit_eReg(eAXRegI limit, nadxRegI init, immI stride, eDXRegI limit_hi, nadxRegI tmp, eFlagsReg flags) %{
+ match(Set limit (LoopLimit (Binary init limit) stride));
+ effect(TEMP limit_hi, TEMP tmp, KILL flags);
+ ins_cost(300);
+
+ format %{ "loopLimit $init,$limit,$stride # $limit = $init + $stride *( $limit - $init + $stride -1)/ $stride, kills $limit_hi" %}
+ ins_encode %{
+ int strd = (int)$stride$$constant;
+ assert(strd != 1 && strd != -1, "sanity");
+ int m1 = (strd > 0) ? 1 : -1;
+ // Convert limit to long (EAX:EDX)
+ __ cdql();
+ // Convert init to long (init:tmp)
+ __ movl($tmp$$Register, $init$$Register);
+ __ sarl($tmp$$Register, 31);
+ // $limit - $init
+ __ subl($limit$$Register, $init$$Register);
+ __ sbbl($limit_hi$$Register, $tmp$$Register);
+ // + ($stride - 1)
+ if (strd > 0) {
+ __ addl($limit$$Register, (strd - 1));
+ __ adcl($limit_hi$$Register, 0);
+ __ movl($tmp$$Register, strd);
+ } else {
+ __ addl($limit$$Register, (strd + 1));
+ __ adcl($limit_hi$$Register, -1);
+ __ lneg($limit_hi$$Register, $limit$$Register);
+ __ movl($tmp$$Register, -strd);
+ }
+ // signed devision: (EAX:EDX) / pos_stride
+ __ idivl($tmp$$Register);
+ if (strd < 0) {
+ // restore sign
+ __ negl($tmp$$Register);
+ }
+ // (EAX) * stride
+ __ mull($tmp$$Register);
+ // + init (ignore upper bits)
+ __ addl($limit$$Register, $init$$Register);
+ %}
+ ins_pipe( pipe_slow );
+%}
+
+// ============================================================================
// Branch Instructions
// Jump Table
instruct jumpXtnd(eRegI switch_val) %{
--- a/hotspot/src/os/linux/vm/globals_linux.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/os/linux/vm/globals_linux.hpp Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -47,7 +47,7 @@
// Defines Linux-specific default values. The flags are available on all
// platforms, but they may have different default values on other platforms.
//
-define_pd_global(bool, UseLargePages, false);
+define_pd_global(bool, UseLargePages, true);
define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;
--- a/hotspot/src/os/linux/vm/os_linux.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Thu May 12 07:28:52 2011 -0700
@@ -2914,16 +2914,21 @@
static size_t _large_page_size = 0;
-bool os::large_page_init() {
+void os::large_page_init() {
if (!UseLargePages) {
UseHugeTLBFS = false;
UseSHM = false;
- return false;
+ return;
}
if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) {
- // Our user has not expressed a preference, so we'll try both.
- UseHugeTLBFS = UseSHM = true;
+ // 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) {
@@ -2978,7 +2983,6 @@
_page_sizes[1] = default_page_size;
_page_sizes[2] = 0;
}
-
UseHugeTLBFS = UseHugeTLBFS &&
Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size);
@@ -2988,12 +2992,6 @@
UseLargePages = UseHugeTLBFS || UseSHM;
set_coredump_filter();
-
- // Large page support is available on 2.6 or newer kernel, some vendors
- // (e.g. Redhat) have backported it to their 2.4 based distributions.
- // We optimistically assume the support is available. If later it turns out
- // not true, VM will automatically switch to use regular page size.
- return true;
}
#ifndef SHM_HUGETLB
@@ -4118,7 +4116,7 @@
#endif
}
- FLAG_SET_DEFAULT(UseLargePages, os::large_page_init());
+ os::large_page_init();
// initialize suspend/resume support - must do this before signal_sets_init()
if (SR_initialize() != 0) {
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp Thu May 12 07:28:52 2011 -0700
@@ -3336,11 +3336,11 @@
return true;
}
-bool os::large_page_init() {
+void os::large_page_init() {
if (!UseLargePages) {
UseISM = false;
UseMPSS = false;
- return false;
+ return;
}
// print a warning if any large page related flag is specified on command line
@@ -3361,7 +3361,6 @@
Solaris::mpss_sanity_check(warn_on_failure, &_large_page_size);
UseLargePages = UseISM || UseMPSS;
- return UseLargePages;
}
bool os::Solaris::set_mpss_range(caddr_t start, size_t bytes, size_t align) {
@@ -4992,7 +4991,7 @@
#endif
}
- FLAG_SET_DEFAULT(UseLargePages, os::large_page_init());
+ os::large_page_init();
// Check minimum allowable stack size for thread creation and to initialize
// the java system classes, including StackOverflowError - depends on page
--- a/hotspot/src/os/windows/vm/os_windows.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Thu May 12 07:28:52 2011 -0700
@@ -2762,8 +2762,8 @@
_hToken = NULL;
}
-bool os::large_page_init() {
- if (!UseLargePages) return false;
+void os::large_page_init() {
+ if (!UseLargePages) return;
// print a warning if any large page related flag is specified on command line
bool warn_on_failure = !FLAG_IS_DEFAULT(UseLargePages) ||
@@ -2808,7 +2808,7 @@
}
cleanup_after_large_page_init();
- return success;
+ UseLargePages = success;
}
// On win32, one cannot release just a part of reserved memory, it's an
@@ -3561,7 +3561,7 @@
#endif
}
- FLAG_SET_DEFAULT(UseLargePages, os::large_page_init());
+ os::large_page_init();
// Setup Windows Exceptions
--- a/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Thu May 12 07:28:52 2011 -0700
@@ -93,7 +93,7 @@
inline void OrderAccess::store_fence(jbyte* p, jbyte v) {
__asm__ volatile ( "xchgb (%2),%0"
- : "=r" (v)
+ : "=q" (v)
: "0" (v), "r" (p)
: "memory");
}
@@ -155,7 +155,7 @@
// Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile.
inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) {
__asm__ volatile ( "xchgb (%2),%0"
- : "=r" (v)
+ : "=q" (v)
: "0" (v), "r" (p)
: "memory");
}
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu May 12 07:28:52 2011 -0700
@@ -826,6 +826,14 @@
void ConcurrentMark::checkpointRootsInitialPost() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
+ // If we force an overflow during remark, the remark operation will
+ // actually abort and we'll restart concurrent marking. If we always
+ // force an oveflow during remark we'll never actually complete the
+ // marking phase. So, we initilize this here, at the start of the
+ // cycle, so that at the remaining overflow number will decrease at
+ // every remark and we'll eventually not need to cause one.
+ force_overflow_stw()->init();
+
// For each region note start of marking.
NoteStartOfMarkHRClosure startcl;
g1h->heap_region_iterate(&startcl);
@@ -893,27 +901,37 @@
}
/*
- Notice that in the next two methods, we actually leave the STS
- during the barrier sync and join it immediately afterwards. If we
- do not do this, this then the following deadlock can occur: one
- thread could be in the barrier sync code, waiting for the other
- thread to also sync up, whereas another one could be trying to
- yield, while also waiting for the other threads to sync up too.
-
- Because the thread that does the sync barrier has left the STS, it
- is possible to be suspended for a Full GC or an evacuation pause
- could occur. This is actually safe, since the entering the sync
- barrier is one of the last things do_marking_step() does, and it
- doesn't manipulate any data structures afterwards.
-*/
+ * Notice that in the next two methods, we actually leave the STS
+ * during the barrier sync and join it immediately afterwards. If we
+ * do not do this, the following deadlock can occur: one thread could
+ * be in the barrier sync code, waiting for the other thread to also
+ * sync up, whereas another one could be trying to yield, while also
+ * waiting for the other threads to sync up too.
+ *
+ * Note, however, that this code is also used during remark and in
+ * this case we should not attempt to leave / enter the STS, otherwise
+ * we'll either hit an asseert (debug / fastdebug) or deadlock
+ * (product). So we should only leave / enter the STS if we are
+ * operating concurrently.
+ *
+ * Because the thread that does the sync barrier has left the STS, it
+ * is possible to be suspended for a Full GC or an evacuation pause
+ * could occur. This is actually safe, since the entering the sync
+ * barrier is one of the last things do_marking_step() does, and it
+ * doesn't manipulate any data structures afterwards.
+ */
void ConcurrentMark::enter_first_sync_barrier(int task_num) {
if (verbose_low())
gclog_or_tty->print_cr("[%d] entering first barrier", task_num);
- ConcurrentGCThread::stsLeave();
+ if (concurrent()) {
+ ConcurrentGCThread::stsLeave();
+ }
_first_overflow_barrier_sync.enter();
- ConcurrentGCThread::stsJoin();
+ if (concurrent()) {
+ ConcurrentGCThread::stsJoin();
+ }
// at this point everyone should have synced up and not be doing any
// more work
@@ -923,7 +941,12 @@
// let task 0 do this
if (task_num == 0) {
// task 0 is responsible for clearing the global data structures
- clear_marking_state();
+ // We should be here because of an overflow. During STW we should
+ // not clear the overflow flag since we rely on it being true when
+ // we exit this method to abort the pause and restart concurent
+ // marking.
+ clear_marking_state(concurrent() /* clear_overflow */);
+ force_overflow()->update();
if (PrintGC) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
@@ -940,15 +963,45 @@
if (verbose_low())
gclog_or_tty->print_cr("[%d] entering second barrier", task_num);
- ConcurrentGCThread::stsLeave();
+ if (concurrent()) {
+ ConcurrentGCThread::stsLeave();
+ }
_second_overflow_barrier_sync.enter();
- ConcurrentGCThread::stsJoin();
+ if (concurrent()) {
+ ConcurrentGCThread::stsJoin();
+ }
// at this point everything should be re-initialised and ready to go
if (verbose_low())
gclog_or_tty->print_cr("[%d] leaving second barrier", task_num);
}
+#ifndef PRODUCT
+void ForceOverflowSettings::init() {
+ _num_remaining = G1ConcMarkForceOverflow;
+ _force = false;
+ update();
+}
+
+void ForceOverflowSettings::update() {
+ if (_num_remaining > 0) {
+ _num_remaining -= 1;
+ _force = true;
+ } else {
+ _force = false;
+ }
+}
+
+bool ForceOverflowSettings::should_force() {
+ if (_force) {
+ _force = false;
+ return true;
+ } else {
+ return false;
+ }
+}
+#endif // !PRODUCT
+
void ConcurrentMark::grayRoot(oop p) {
HeapWord* addr = (HeapWord*) p;
// We can't really check against _heap_start and _heap_end, since it
@@ -1117,6 +1170,7 @@
_restart_for_overflow = false;
size_t active_workers = MAX2((size_t) 1, parallel_marking_threads());
+ force_overflow_conc()->init();
set_phase(active_workers, true /* concurrent */);
CMConcurrentMarkingTask markingTask(this, cmThread());
@@ -1845,7 +1899,7 @@
while (!_cleanup_list.is_empty()) {
HeapRegion* hr = _cleanup_list.remove_head();
assert(hr != NULL, "the list was not empty");
- hr->rem_set()->clear();
+ hr->par_clear();
tmp_free_list.add_as_tail(hr);
// Instead of adding one region at a time to the secondary_free_list,
@@ -2703,12 +2757,16 @@
}
-void ConcurrentMark::clear_marking_state() {
+void ConcurrentMark::clear_marking_state(bool clear_overflow) {
_markStack.setEmpty();
_markStack.clear_overflow();
_regionStack.setEmpty();
_regionStack.clear_overflow();
- clear_has_overflown();
+ if (clear_overflow) {
+ clear_has_overflown();
+ } else {
+ assert(has_overflown(), "pre-condition");
+ }
_finger = _heap_start;
for (int i = 0; i < (int)_max_task_num; ++i) {
@@ -4279,6 +4337,15 @@
}
}
+ // If we are about to wrap up and go into termination, check if we
+ // should raise the overflow flag.
+ if (do_termination && !has_aborted()) {
+ if (_cm->force_overflow()->should_force()) {
+ _cm->set_has_overflown();
+ regular_clock_call();
+ }
+ }
+
// We still haven't aborted. Now, let's try to get into the
// termination protocol.
if (do_termination && !has_aborted()) {
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu May 12 07:28:52 2011 -0700
@@ -316,6 +316,19 @@
void setEmpty() { _index = 0; clear_overflow(); }
};
+class ForceOverflowSettings VALUE_OBJ_CLASS_SPEC {
+private:
+#ifndef PRODUCT
+ uintx _num_remaining;
+ bool _force;
+#endif // !defined(PRODUCT)
+
+public:
+ void init() PRODUCT_RETURN;
+ void update() PRODUCT_RETURN;
+ bool should_force() PRODUCT_RETURN_( return false; );
+};
+
// this will enable a variety of different statistics per GC task
#define _MARKING_STATS_ 0
// this will enable the higher verbose levels
@@ -462,6 +475,9 @@
WorkGang* _parallel_workers;
+ ForceOverflowSettings _force_overflow_conc;
+ ForceOverflowSettings _force_overflow_stw;
+
void weakRefsWork(bool clear_all_soft_refs);
void swapMarkBitMaps();
@@ -470,7 +486,7 @@
// task local ones; should be called during initial mark.
void reset();
// It resets all the marking data structures.
- void clear_marking_state();
+ void clear_marking_state(bool clear_overflow = true);
// It should be called to indicate which phase we're in (concurrent
// mark or remark) and how many threads are currently active.
@@ -547,6 +563,22 @@
void enter_first_sync_barrier(int task_num);
void enter_second_sync_barrier(int task_num);
+ ForceOverflowSettings* force_overflow_conc() {
+ return &_force_overflow_conc;
+ }
+
+ ForceOverflowSettings* force_overflow_stw() {
+ return &_force_overflow_stw;
+ }
+
+ ForceOverflowSettings* force_overflow() {
+ if (concurrent()) {
+ return force_overflow_conc();
+ } else {
+ return force_overflow_stw();
+ }
+ }
+
public:
// Manipulation of the global mark stack.
// Notice that the first mark_stack_push is CAS-based, whereas the
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu May 12 07:28:52 2011 -0700
@@ -3975,6 +3975,9 @@
oop
G1CollectedHeap::handle_evacuation_failure_par(OopsInHeapRegionClosure* cl,
oop old) {
+ assert(obj_in_cs(old),
+ err_msg("obj: "PTR_FORMAT" should still be in the CSet",
+ (HeapWord*) old));
markOop m = old->mark();
oop forward_ptr = old->forward_to_atomic(old);
if (forward_ptr == NULL) {
@@ -3997,7 +4000,13 @@
}
return old;
} else {
- // Someone else had a place to copy it.
+ // Forward-to-self failed. Either someone else managed to allocate
+ // space for this object (old != forward_ptr) or they beat us in
+ // self-forwarding it (old == forward_ptr).
+ assert(old == forward_ptr || !obj_in_cs(forward_ptr),
+ err_msg("obj: "PTR_FORMAT" forwarded to: "PTR_FORMAT" "
+ "should not be in the CSet",
+ (HeapWord*) old, (HeapWord*) forward_ptr));
return forward_ptr;
}
}
@@ -4308,11 +4317,10 @@
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop(heap_oop);
- assert((_g1->evacuation_failed()) || (!_g1->obj_in_cs(obj)),
- "shouldn't still be in the CSet if evacuation didn't fail.");
HeapWord* addr = (HeapWord*)obj;
- if (_g1->is_in_g1_reserved(addr))
+ if (_g1->is_in_g1_reserved(addr)) {
_cm->grayRoot(oop(addr));
+ }
}
}
@@ -4961,36 +4969,45 @@
#ifndef PRODUCT
class G1VerifyCardTableCleanup: public HeapRegionClosure {
+ G1CollectedHeap* _g1h;
CardTableModRefBS* _ct_bs;
public:
- G1VerifyCardTableCleanup(CardTableModRefBS* ct_bs)
- : _ct_bs(ct_bs) { }
+ G1VerifyCardTableCleanup(G1CollectedHeap* g1h, CardTableModRefBS* ct_bs)
+ : _g1h(g1h), _ct_bs(ct_bs) { }
virtual bool doHeapRegion(HeapRegion* r) {
- MemRegion mr(r->bottom(), r->end());
if (r->is_survivor()) {
- _ct_bs->verify_dirty_region(mr);
+ _g1h->verify_dirty_region(r);
} else {
- _ct_bs->verify_clean_region(mr);
+ _g1h->verify_not_dirty_region(r);
}
return false;
}
};
+void G1CollectedHeap::verify_not_dirty_region(HeapRegion* hr) {
+ // All of the region should be clean.
+ CardTableModRefBS* ct_bs = (CardTableModRefBS*)barrier_set();
+ MemRegion mr(hr->bottom(), hr->end());
+ ct_bs->verify_not_dirty_region(mr);
+}
+
+void G1CollectedHeap::verify_dirty_region(HeapRegion* hr) {
+ // We cannot guarantee that [bottom(),end()] is dirty. Threads
+ // dirty allocated blocks as they allocate them. The thread that
+ // retires each region and replaces it with a new one will do a
+ // maximal allocation to fill in [pre_dummy_top(),end()] but will
+ // not dirty that area (one less thing to have to do while holding
+ // a lock). So we can only verify that [bottom(),pre_dummy_top()]
+ // is dirty.
+ CardTableModRefBS* ct_bs = (CardTableModRefBS*) barrier_set();
+ MemRegion mr(hr->bottom(), hr->pre_dummy_top());
+ ct_bs->verify_dirty_region(mr);
+}
+
void G1CollectedHeap::verify_dirty_young_list(HeapRegion* head) {
- CardTableModRefBS* ct_bs = (CardTableModRefBS*) (barrier_set());
+ CardTableModRefBS* ct_bs = (CardTableModRefBS*) barrier_set();
for (HeapRegion* hr = head; hr != NULL; hr = hr->get_next_young_region()) {
- // We cannot guarantee that [bottom(),end()] is dirty. Threads
- // dirty allocated blocks as they allocate them. The thread that
- // retires each region and replaces it with a new one will do a
- // maximal allocation to fill in [pre_dummy_top(),end()] but will
- // not dirty that area (one less thing to have to do while holding
- // a lock). So we can only verify that [bottom(),pre_dummy_top()]
- // is dirty. Also note that verify_dirty_region() requires
- // mr.start() and mr.end() to be card aligned and pre_dummy_top()
- // is not guaranteed to be.
- MemRegion mr(hr->bottom(),
- ct_bs->align_to_card_boundary(hr->pre_dummy_top()));
- ct_bs->verify_dirty_region(mr);
+ verify_dirty_region(hr);
}
}
@@ -5033,7 +5050,7 @@
g1_policy()->record_clear_ct_time( elapsed * 1000.0);
#ifndef PRODUCT
if (G1VerifyCTCleanup || VerifyAfterGC) {
- G1VerifyCardTableCleanup cleanup_verifier(ct_bs);
+ G1VerifyCardTableCleanup cleanup_verifier(this, ct_bs);
heap_region_iterate(&cleanup_verifier);
}
#endif
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu May 12 07:28:52 2011 -0700
@@ -970,6 +970,8 @@
// The number of regions available for "regular" expansion.
size_t expansion_regions() { return _expansion_regions; }
+ void verify_not_dirty_region(HeapRegion* hr) PRODUCT_RETURN;
+ void verify_dirty_region(HeapRegion* hr) PRODUCT_RETURN;
void verify_dirty_young_list(HeapRegion* head) PRODUCT_RETURN;
void verify_dirty_young_regions() PRODUCT_RETURN;
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Thu May 12 07:28:52 2011 -0700
@@ -157,7 +157,6 @@
void set_try_claimed() { _try_claimed = true; }
void scanCard(size_t index, HeapRegion *r) {
- _cards_done++;
DirtyCardToOopClosure* cl =
r->new_dcto_closure(_oc,
CardTableModRefBS::Precise,
@@ -168,17 +167,14 @@
HeapWord* card_start = _bot_shared->address_for_index(index);
HeapWord* card_end = card_start + G1BlockOffsetSharedArray::N_words;
Space *sp = SharedHeap::heap()->space_containing(card_start);
- MemRegion sm_region;
- if (ParallelGCThreads > 0) {
- // first find the used area
- sm_region = sp->used_region_at_save_marks();
- } else {
- // The closure is not idempotent. We shouldn't look at objects
- // allocated during the GC.
- sm_region = sp->used_region_at_save_marks();
- }
+ MemRegion sm_region = sp->used_region_at_save_marks();
MemRegion mr = sm_region.intersection(MemRegion(card_start,card_end));
- if (!mr.is_empty()) {
+ if (!mr.is_empty() && !_ct_bs->is_card_claimed(index)) {
+ // We make the card as "claimed" lazily (so races are possible
+ // but they're benign), which reduces the number of duplicate
+ // scans (the rsets of the regions in the cset can intersect).
+ _ct_bs->set_card_claimed(index);
+ _cards_done++;
cl->do_MemRegion(mr);
}
}
@@ -199,6 +195,9 @@
HeapRegionRemSet* hrrs = r->rem_set();
if (hrrs->iter_is_complete()) return false; // All done.
if (!_try_claimed && !hrrs->claim_iter()) return false;
+ // If we ever free the collection set concurrently, we should also
+ // clear the card table concurrently therefore we won't need to
+ // add regions of the collection set to the dirty cards region.
_g1h->push_dirty_cards_region(r);
// If we didn't return above, then
// _try_claimed || r->claim_iter()
@@ -230,15 +229,10 @@
_g1h->push_dirty_cards_region(card_region);
}
- // If the card is dirty, then we will scan it during updateRS.
- if (!card_region->in_collection_set() && !_ct_bs->is_card_dirty(card_index)) {
- // We make the card as "claimed" lazily (so races are possible but they're benign),
- // which reduces the number of duplicate scans (the rsets of the regions in the cset
- // can intersect).
- if (!_ct_bs->is_card_claimed(card_index)) {
- _ct_bs->set_card_claimed(card_index);
- scanCard(card_index, card_region);
- }
+ // If the card is dirty, then we will scan it during updateRS.
+ if (!card_region->in_collection_set() &&
+ !_ct_bs->is_card_dirty(card_index)) {
+ scanCard(card_index, card_region);
}
}
if (!_try_claimed) {
@@ -246,8 +240,6 @@
}
return false;
}
- // Set all cards back to clean.
- void cleanup() {_g1h->cleanUpCardTable();}
size_t cards_done() { return _cards_done;}
size_t cards_looked_up() { return _cards;}
};
@@ -566,8 +558,9 @@
update_rs_cl.set_region(r);
HeapWord* stop_point =
r->oops_on_card_seq_iterate_careful(scanRegion,
- &filter_then_update_rs_cset_oop_cl,
- false /* filter_young */);
+ &filter_then_update_rs_cset_oop_cl,
+ false /* filter_young */,
+ NULL /* card_ptr */);
// Since this is performed in the event of an evacuation failure, we
// we shouldn't see a non-null stop point
@@ -735,12 +728,6 @@
(OopClosure*)&mux :
(OopClosure*)&update_rs_oop_cl));
- // Undirty the card.
- *card_ptr = CardTableModRefBS::clean_card_val();
- // We must complete this write before we do any of the reads below.
- OrderAccess::storeload();
- // And process it, being careful of unallocated portions of TLAB's.
-
// The region for the current card may be a young region. The
// current card may have been a card that was evicted from the
// card cache. When the card was inserted into the cache, we had
@@ -749,7 +736,7 @@
// and tagged as young.
//
// We wish to filter out cards for such a region but the current
- // thread, if we're running conucrrently, may "see" the young type
+ // thread, if we're running concurrently, may "see" the young type
// change at any time (so an earlier "is_young" check may pass or
// fail arbitrarily). We tell the iteration code to perform this
// filtering when it has been determined that there has been an actual
@@ -759,7 +746,8 @@
HeapWord* stop_point =
r->oops_on_card_seq_iterate_careful(dirtyRegion,
&filter_then_update_rs_oop_cl,
- filter_young);
+ filter_young,
+ card_ptr);
// If stop_point is non-null, then we encountered an unallocated region
// (perhaps the unfilled portion of a TLAB.) For now, we'll dirty the
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu May 12 07:28:52 2011 -0700
@@ -311,7 +311,11 @@
\
develop(bool, G1ExitOnExpansionFailure, false, \
"Raise a fatal VM exit out of memory failure in the event " \
- " that heap expansion fails due to running out of swap.")
+ " that heap expansion fails due to running out of swap.") \
+ \
+ develop(uintx, G1ConcMarkForceOverflow, 0, \
+ "The number of times we'll force an overflow during " \
+ "concurrent marking")
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 May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Thu May 12 07:28:52 2011 -0700
@@ -376,6 +376,17 @@
if (clear_space) clear(SpaceDecorator::Mangle);
}
+void HeapRegion::par_clear() {
+ assert(used() == 0, "the region should have been already cleared");
+ assert(capacity() == (size_t) HeapRegion::GrainBytes,
+ "should be back to normal");
+ HeapRegionRemSet* hrrs = rem_set();
+ hrrs->clear();
+ CardTableModRefBS* ct_bs =
+ (CardTableModRefBS*)G1CollectedHeap::heap()->barrier_set();
+ ct_bs->clear(MemRegion(bottom(), end()));
+}
+
// <PREDICTION>
void HeapRegion::calc_gc_efficiency() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
@@ -600,7 +611,15 @@
HeapRegion::
oops_on_card_seq_iterate_careful(MemRegion mr,
FilterOutOfRegionClosure* cl,
- bool filter_young) {
+ bool filter_young,
+ jbyte* card_ptr) {
+ // Currently, we should only have to clean the card if filter_young
+ // is true and vice versa.
+ if (filter_young) {
+ assert(card_ptr != NULL, "pre-condition");
+ } else {
+ assert(card_ptr == NULL, "pre-condition");
+ }
G1CollectedHeap* g1h = G1CollectedHeap::heap();
// If we're within a stop-world GC, then we might look at a card in a
@@ -626,6 +645,15 @@
assert(!is_young(), "check value of filter_young");
+ // We can only clean the card here, after we make the decision that
+ // the card is not young. And we only clean the card if we have been
+ // asked to (i.e., card_ptr != NULL).
+ if (card_ptr != NULL) {
+ *card_ptr = CardTableModRefBS::clean_card_val();
+ // We must complete this write before we do any of the reads below.
+ OrderAccess::storeload();
+ }
+
// We used to use "block_start_careful" here. But we're actually happy
// to update the BOT while we do this...
HeapWord* cur = block_start(mr.start());
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Thu May 12 07:28:52 2011 -0700
@@ -584,6 +584,7 @@
// Reset HR stuff to default values.
void hr_clear(bool par, bool clear_space);
+ void par_clear();
void initialize(MemRegion mr, bool clear_space, bool mangle_space);
@@ -802,12 +803,16 @@
HeapWord*
object_iterate_mem_careful(MemRegion mr, ObjectClosure* cl);
- // In this version - if filter_young is true and the region
- // is a young region then we skip the iteration.
+ // filter_young: if true and the region is a young region then we
+ // skip the iteration.
+ // card_ptr: if not NULL, and we decide that the card is not young
+ // and we iterate over it, we'll clean the card before we start the
+ // iteration.
HeapWord*
oops_on_card_seq_iterate_careful(MemRegion mr,
FilterOutOfRegionClosure* cl,
- bool filter_young);
+ bool filter_young,
+ jbyte* card_ptr);
// A version of block start that is guaranteed to find *some* block
// boundary at or before "p", but does not object iteration, and may
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp Thu May 12 07:28:52 2011 -0700
@@ -224,6 +224,12 @@
const size_t alignment = virtual_space()->alignment();
size_t aligned_bytes = align_size_up(bytes, alignment);
size_t aligned_expand_bytes = align_size_up(MinHeapDeltaBytes, alignment);
+
+ if (UseNUMA) {
+ // With NUMA we use round-robin page allocation for the old gen. Expand by at least
+ // providing a page per lgroup. Alignment is larger or equal to the page size.
+ aligned_expand_bytes = MAX2(aligned_expand_bytes, alignment * os::numa_get_groups_num());
+ }
if (aligned_bytes == 0){
// The alignment caused the number of bytes to wrap. An expand_by(0) will
// return true with the implication that and expansion was done when it
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp Thu May 12 07:28:52 2011 -0700
@@ -327,6 +327,7 @@
// 1. check if klass is not interface
if (resolved_klass->is_interface()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Found interface %s, but class was expected", Klass::cast(resolved_klass())->external_name());
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
@@ -413,6 +414,7 @@
// check if klass is interface
if (!resolved_klass->is_interface()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Found class %s, but interface was expected", Klass::cast(resolved_klass())->external_name());
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
@@ -534,6 +536,7 @@
// check for errors
if (is_static != fd.is_static()) {
+ ResourceMark rm(THREAD);
char msg[200];
jio_snprintf(msg, sizeof(msg), "Expected %s field %s.%s", is_static ? "static" : "non-static", Klass::cast(resolved_klass())->external_name(), fd.name()->as_C_string());
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg);
@@ -631,6 +634,7 @@
// check if static
if (!resolved_method->is_static()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Expected static method %s", methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
resolved_method->name(),
@@ -671,6 +675,7 @@
// check if not static
if (resolved_method->is_static()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf),
"Expecting non-static method %s",
@@ -717,6 +722,7 @@
// check if not static
if (sel_method->is_static()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
resolved_method->name(),
@@ -757,6 +763,7 @@
// check if not static
if (resolved_method->is_static()) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Expecting non-static method %s", methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
resolved_method->name(),
@@ -873,6 +880,7 @@
// check if receiver klass implements the resolved interface
if (!recv_klass->is_subtype_of(resolved_klass())) {
+ ResourceMark rm(THREAD);
char buf[200];
jio_snprintf(buf, sizeof(buf), "Class %s does not implement the requested interface %s",
(Klass::cast(recv_klass()))->external_name(),
--- a/hotspot/src/share/vm/memory/allocation.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/memory/allocation.cpp Thu May 12 07:28:52 2011 -0700
@@ -44,6 +44,14 @@
return (void *) AllocateHeap(size, "CHeapObj-new");
}
+void* CHeapObj::operator new (size_t size, const std::nothrow_t& nothrow_constant) {
+ char* p = (char*) os::malloc(size);
+#ifdef ASSERT
+ if (PrintMallocFree) trace_heap_malloc(size, "CHeapObj-new", p);
+#endif
+ return p;
+}
+
void CHeapObj::operator delete(void* p){
FreeHeap(p);
}
--- a/hotspot/src/share/vm/memory/allocation.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/memory/allocation.hpp Thu May 12 07:28:52 2011 -0700
@@ -34,6 +34,8 @@
#include "opto/c2_globals.hpp"
#endif
+#include <new>
+
#define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1)
#define ARENA_ALIGN_MASK (~((size_t)ARENA_ALIGN_M1))
#define ARENA_ALIGN(x) ((((size_t)(x)) + ARENA_ALIGN_M1) & ARENA_ALIGN_MASK)
@@ -99,6 +101,7 @@
class CHeapObj ALLOCATION_SUPER_CLASS_SPEC {
public:
void* operator new(size_t size);
+ void* operator new (size_t size, const std::nothrow_t& nothrow_constant);
void operator delete(void* p);
void* new_array(size_t size);
};
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp Thu May 12 07:28:52 2011 -0700
@@ -652,43 +652,37 @@
}
#ifndef PRODUCT
-class GuaranteeNotModClosure: public MemRegionClosure {
- CardTableModRefBS* _ct;
-public:
- GuaranteeNotModClosure(CardTableModRefBS* ct) : _ct(ct) {}
- void do_MemRegion(MemRegion mr) {
- jbyte* entry = _ct->byte_for(mr.start());
- guarantee(*entry != CardTableModRefBS::clean_card,
- "Dirty card in region that should be clean");
+void CardTableModRefBS::verify_region(MemRegion mr,
+ jbyte val, bool val_equals) {
+ jbyte* start = byte_for(mr.start());
+ jbyte* end = byte_for(mr.last());
+ bool failures = false;
+ for (jbyte* curr = start; curr <= end; ++curr) {
+ jbyte curr_val = *curr;
+ bool failed = (val_equals) ? (curr_val != val) : (curr_val == val);
+ if (failed) {
+ if (!failures) {
+ tty->cr();
+ tty->print_cr("== CT verification failed: ["PTR_FORMAT","PTR_FORMAT"]");
+ tty->print_cr("== %sexpecting value: %d",
+ (val_equals) ? "" : "not ", val);
+ failures = true;
+ }
+ tty->print_cr("== card "PTR_FORMAT" ["PTR_FORMAT","PTR_FORMAT"], "
+ "val: %d", curr, addr_for(curr),
+ (HeapWord*) (((size_t) addr_for(curr)) + card_size),
+ (int) curr_val);
+ }
}
-};
-
-void CardTableModRefBS::verify_clean_region(MemRegion mr) {
- GuaranteeNotModClosure blk(this);
- non_clean_card_iterate_serial(mr, &blk);
+ guarantee(!failures, "there should not have been any failures");
}
-// To verify a MemRegion is entirely dirty this closure is passed to
-// dirty_card_iterate. If the region is dirty do_MemRegion will be
-// invoked only once with a MemRegion equal to the one being
-// verified.
-class GuaranteeDirtyClosure: public MemRegionClosure {
- CardTableModRefBS* _ct;
- MemRegion _mr;
- bool _result;
-public:
- GuaranteeDirtyClosure(CardTableModRefBS* ct, MemRegion mr)
- : _ct(ct), _mr(mr), _result(false) {}
- void do_MemRegion(MemRegion mr) {
- _result = _mr.equals(mr);
- }
- bool result() const { return _result; }
-};
+void CardTableModRefBS::verify_not_dirty_region(MemRegion mr) {
+ verify_region(mr, dirty_card, false /* val_equals */);
+}
void CardTableModRefBS::verify_dirty_region(MemRegion mr) {
- GuaranteeDirtyClosure blk(this, mr);
- dirty_card_iterate(mr, &blk);
- guarantee(blk.result(), "Non-dirty cards in region that should be dirty");
+ verify_region(mr, dirty_card, true /* val_equals */);
}
#endif
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp Thu May 12 07:28:52 2011 -0700
@@ -475,7 +475,10 @@
void verify();
void verify_guard();
- void verify_clean_region(MemRegion mr) PRODUCT_RETURN;
+ // val_equals -> it will check that all cards covered by mr equal val
+ // !val_equals -> it will check that all cards covered by mr do not equal val
+ void verify_region(MemRegion mr, jbyte val, bool val_equals) PRODUCT_RETURN;
+ void verify_not_dirty_region(MemRegion mr) PRODUCT_RETURN;
void verify_dirty_region(MemRegion mr) PRODUCT_RETURN;
static size_t par_chunk_heapword_alignment() {
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp Thu May 12 07:28:52 2011 -0700
@@ -265,8 +265,6 @@
MaxHeapSize = align_size_up(MaxHeapSize, max_alignment());
always_do_update_barrier = UseConcMarkSweepGC;
- BlockOffsetArrayUseUnallocatedBlock =
- BlockOffsetArrayUseUnallocatedBlock || ParallelGCThreads > 0;
// Check validity of heap flags
assert(OldSize % min_alignment() == 0, "old space alignment");
--- a/hotspot/src/share/vm/memory/genOopClosures.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/memory/genOopClosures.hpp Thu May 12 07:28:52 2011 -0700
@@ -175,7 +175,7 @@
protected:
template <class T> inline void do_oop_work(T* p) {
oop obj = oopDesc::load_decode_heap_oop(p);
- guarantee(obj->is_oop_or_null(), err_msg("invalid oop: " INTPTR_FORMAT, obj));
+ guarantee(obj->is_oop_or_null(), err_msg("invalid oop: " INTPTR_FORMAT, (oopDesc*) obj));
}
public:
virtual void do_oop(oop* p);
--- a/hotspot/src/share/vm/memory/modRefBarrierSet.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/memory/modRefBarrierSet.hpp Thu May 12 07:28:52 2011 -0700
@@ -100,12 +100,6 @@
// Pass along the argument to the superclass.
ModRefBarrierSet(int max_covered_regions) :
BarrierSet(max_covered_regions) {}
-
-#ifndef PRODUCT
- // Verifies that the given region contains no modified references.
- virtual void verify_clean_region(MemRegion mr) = 0;
-#endif
-
};
#endif // SHARE_VM_MEMORY_MODREFBARRIERSET_HPP
--- a/hotspot/src/share/vm/oops/methodDataOop.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/oops/methodDataOop.hpp Thu May 12 07:28:52 2011 -0700
@@ -1194,7 +1194,7 @@
// Whole-method sticky bits and flags
public:
enum {
- _trap_hist_limit = 16, // decoupled from Deoptimization::Reason_LIMIT
+ _trap_hist_limit = 17, // decoupled from Deoptimization::Reason_LIMIT
_trap_hist_mask = max_jubyte,
_extra_data_count = 4 // extra DataLayout headers, for trap history
}; // Public flag values
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Thu May 12 07:28:52 2011 -0700
@@ -310,13 +310,14 @@
return "inlining too deep";
}
- // We need to detect recursive inlining of method handle targets: if
- // the current method is a method handle adapter and one of the
- // callers is the same method as the callee, we bail out if
- // MaxRecursiveInlineLevel is hit.
- if (method()->is_method_handle_adapter()) {
+ // detect direct and indirect recursive inlining
+ {
+ // count the current method and the callee
+ int inline_level = (method() == callee_method) ? 1 : 0;
+ if (inline_level > MaxRecursiveInlineLevel)
+ return "recursively inlining too deep";
+ // count callers of current method and callee
JVMState* jvms = caller_jvms();
- int inline_level = 0;
while (jvms != NULL && jvms->has_method()) {
if (jvms->method() == callee_method) {
inline_level++;
@@ -327,10 +328,6 @@
}
}
- if (method() == callee_method && inline_depth() > MaxRecursiveInlineLevel) {
- return "recursively inlining too deep";
- }
-
int size = callee_method->code_size();
if (UseOldInlining && ClipInlining
@@ -376,7 +373,6 @@
return true;
}
-#ifndef PRODUCT
//------------------------------print_inlining---------------------------------
// Really, the failure_msg can be a success message also.
void InlineTree::print_inlining(ciMethod* callee_method, int caller_bci, const char* failure_msg) const {
@@ -388,7 +384,6 @@
tty->print(" bcs: %d+%d invoked: %d", top->count_inline_bcs(), callee_method->code_size(), callee_method->interpreter_invocation_count());
}
}
-#endif
//------------------------------ok_to_inline-----------------------------------
WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, ciCallProfile& profile, WarmCallInfo* initial_wci) {
--- a/hotspot/src/share/vm/opto/c2_globals.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp Thu May 12 07:28:52 2011 -0700
@@ -183,6 +183,21 @@
develop(bool, TraceLoopOpts, false, \
"Trace executed loop optimizations") \
\
+ diagnostic(bool, LoopLimitCheck, true, \
+ "Generate a loop limits check for overflow") \
+ \
+ develop(bool, TraceLoopLimitCheck, false, \
+ "Trace generation of loop limits checks") \
+ \
+ diagnostic(bool, RangeLimitCheck, true, \
+ "Additional overflow checks during range check elimination") \
+ \
+ develop(bool, TraceRangeLimitCheck, false, \
+ "Trace additional overflow checks in RCE") \
+ \
+ diagnostic(bool, UnrollLimitCheck, true, \
+ "Additional overflow checks during loop unroll") \
+ \
product(bool, OptimizeFill, false, \
"convert fill/copy loops into intrinsic") \
\
--- a/hotspot/src/share/vm/opto/cfgnode.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp Thu May 12 07:28:52 2011 -0700
@@ -1373,7 +1373,7 @@
// Clone loop predicates
if (predicate_proj != NULL) {
- newn = igvn->clone_loop_predicates(predicate_proj, newn);
+ newn = igvn->clone_loop_predicates(predicate_proj, newn, !n->is_CountedLoop());
}
// Now I can point to the new node.
--- a/hotspot/src/share/vm/opto/classes.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/classes.hpp Thu May 12 07:28:52 2011 -0700
@@ -156,6 +156,7 @@
macro(LogD)
macro(Log10D)
macro(Loop)
+macro(LoopLimit)
macro(Mach)
macro(MachProj)
macro(MaxI)
--- a/hotspot/src/share/vm/opto/graphKit.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/graphKit.cpp Thu May 12 07:28:52 2011 -0700
@@ -3378,6 +3378,10 @@
if (UseLoopPredicate) {
add_predicate_impl(Deoptimization::Reason_predicate, nargs);
}
+ // loop's limit check predicate should be near the loop.
+ if (LoopLimitCheck) {
+ add_predicate_impl(Deoptimization::Reason_loop_limit_check, nargs);
+ }
}
//----------------------------- store barriers ----------------------------
--- a/hotspot/src/share/vm/opto/ifnode.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/ifnode.cpp Thu May 12 07:28:52 2011 -0700
@@ -236,6 +236,7 @@
}
Node* predicate_c = NULL;
Node* predicate_x = NULL;
+ bool counted_loop = r->is_CountedLoop();
Node *region_c = new (igvn->C, req_c + 1) RegionNode(req_c + 1);
Node *phi_c = con1;
@@ -294,16 +295,16 @@
if (predicate_c != NULL) {
assert(predicate_x == NULL, "only one predicate entry expected");
// Clone loop predicates to each path
- iff_c_t = igvn->clone_loop_predicates(predicate_c, iff_c_t);
- iff_c_f = igvn->clone_loop_predicates(predicate_c, iff_c_f);
+ iff_c_t = igvn->clone_loop_predicates(predicate_c, iff_c_t, !counted_loop);
+ iff_c_f = igvn->clone_loop_predicates(predicate_c, iff_c_f, !counted_loop);
}
Node *iff_x_t = phase->transform(new (igvn->C, 1) IfTrueNode (iff_x));
Node *iff_x_f = phase->transform(new (igvn->C, 1) IfFalseNode(iff_x));
if (predicate_x != NULL) {
assert(predicate_c == NULL, "only one predicate entry expected");
// Clone loop predicates to each path
- iff_x_t = igvn->clone_loop_predicates(predicate_x, iff_x_t);
- iff_x_f = igvn->clone_loop_predicates(predicate_x, iff_x_f);
+ iff_x_t = igvn->clone_loop_predicates(predicate_x, iff_x_t, !counted_loop);
+ iff_x_f = igvn->clone_loop_predicates(predicate_x, iff_x_f, !counted_loop);
}
// Merge the TRUE paths
@@ -545,6 +546,7 @@
Node *new_bol = gvn->transform( new (gvn->C, 2) BoolNode( new_cmp, bol->as_Bool()->_test._test ) );
igvn->hash_delete( iff );
iff->set_req_X( 1, new_bol, igvn );
+ igvn->_worklist.push( iff );
}
//------------------------------up_one_dom-------------------------------------
--- a/hotspot/src/share/vm/opto/library_call.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/library_call.cpp Thu May 12 07:28:52 2011 -0700
@@ -867,12 +867,10 @@
Node* str1_offset = make_load(no_ctrl, str1_offseta, TypeInt::INT, T_INT, string_type->add_offset(offset_offset));
Node* str1_start = array_element_address(str1_value, str1_offset, T_CHAR);
- // Pin loads from String::equals() argument since it could be NULL.
- Node* str2_ctrl = (opcode == Op_StrEquals) ? control() : no_ctrl;
Node* str2_valuea = basic_plus_adr(str2, str2, value_offset);
- Node* str2_value = make_load(str2_ctrl, str2_valuea, value_type, T_OBJECT, string_type->add_offset(value_offset));
+ Node* str2_value = make_load(no_ctrl, str2_valuea, value_type, T_OBJECT, string_type->add_offset(value_offset));
Node* str2_offseta = basic_plus_adr(str2, str2, offset_offset);
- Node* str2_offset = make_load(str2_ctrl, str2_offseta, TypeInt::INT, T_INT, string_type->add_offset(offset_offset));
+ Node* str2_offset = make_load(no_ctrl, str2_offseta, TypeInt::INT, T_INT, string_type->add_offset(offset_offset));
Node* str2_start = array_element_address(str2_value, str2_offset, T_CHAR);
Node* result = NULL;
@@ -1012,14 +1010,15 @@
if (!stopped()) {
// Properly cast the argument to String
argument = _gvn.transform(new (C, 2) CheckCastPPNode(control(), argument, string_type));
+ // This path is taken only when argument's type is String:NotNull.
+ argument = cast_not_null(argument, false);
// Get counts for string and argument
Node* receiver_cnta = basic_plus_adr(receiver, receiver, count_offset);
receiver_cnt = make_load(no_ctrl, receiver_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
- // Pin load from argument string since it could be NULL.
Node* argument_cnta = basic_plus_adr(argument, argument, count_offset);
- argument_cnt = make_load(control(), argument_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+ argument_cnt = make_load(no_ctrl, argument_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
// Check for receiver count != argument count
Node* cmp = _gvn.transform( new(C, 3) CmpINode(receiver_cnt, argument_cnt) );
--- a/hotspot/src/share/vm/opto/loopPredicate.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/loopPredicate.cpp Thu May 12 07:28:52 2011 -0700
@@ -341,7 +341,7 @@
// Cut predicate from old place.
Node* old = predicate_proj;
igvn->_worklist.push(old);
- for (DUIterator_Last imin, i = old->last_outs(imin); i >= imin; ) {
+ for (DUIterator_Last imin, i = old->last_outs(imin); i >= imin;) {
Node* use = old->last_out(i); // for each use...
igvn->hash_delete(use);
igvn->_worklist.push(use);
@@ -384,24 +384,25 @@
//--------------------------clone_loop_predicates-----------------------
// Interface from IGVN
-Node* PhaseIterGVN::clone_loop_predicates(Node* old_entry, Node* new_entry) {
- return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, false, NULL, this);
+Node* PhaseIterGVN::clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
+ return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, false, clone_limit_check, NULL, this);
}
-Node* PhaseIterGVN::move_loop_predicates(Node* old_entry, Node* new_entry) {
- return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, true, NULL, this);
+Node* PhaseIterGVN::move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
+ return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, true, clone_limit_check, NULL, this);
}
// Interface from PhaseIdealLoop
-Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry) {
- return clone_loop_predicates(old_entry, new_entry, false, this, &this->_igvn);
+Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
+ return clone_loop_predicates(old_entry, new_entry, false, clone_limit_check, this, &this->_igvn);
}
-Node* PhaseIdealLoop::move_loop_predicates(Node* old_entry, Node* new_entry) {
- return clone_loop_predicates(old_entry, new_entry, true, this, &this->_igvn);
+Node* PhaseIdealLoop::move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
+ return clone_loop_predicates(old_entry, new_entry, true, clone_limit_check, this, &this->_igvn);
}
// Clone loop predicates to cloned loops (peeled, unswitched, split_if).
Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry,
bool move_predicates,
+ bool clone_limit_check,
PhaseIdealLoop* loop_phase,
PhaseIterGVN* igvn) {
#ifdef ASSERT
@@ -413,10 +414,16 @@
#endif
// Search original predicates
Node* entry = old_entry;
+ ProjNode* limit_check_proj = NULL;
+ if (LoopLimitCheck) {
+ limit_check_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (limit_check_proj != NULL) {
+ entry = entry->in(0)->in(0);
+ }
+ }
if (UseLoopPredicate) {
ProjNode* predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate_proj != NULL) { // right pattern that can be used by loop predication
- assert(entry->in(0)->in(1)->in(1)->Opcode()==Op_Opaque1, "must be");
if (move_predicates) {
new_entry = move_predicate(predicate_proj, new_entry,
Deoptimization::Reason_predicate,
@@ -435,11 +442,37 @@
}
}
}
+ if (limit_check_proj != NULL && clone_limit_check) {
+ // Clone loop limit check last to insert it before loop.
+ // Don't clone a limit check which was already finalized
+ // for this counted loop (only one limit check is needed).
+ if (move_predicates) {
+ new_entry = move_predicate(limit_check_proj, new_entry,
+ Deoptimization::Reason_loop_limit_check,
+ loop_phase, igvn);
+ assert(new_entry == limit_check_proj, "old limit check fall through projection");
+ } else {
+ new_entry = clone_predicate(limit_check_proj, new_entry,
+ Deoptimization::Reason_loop_limit_check,
+ loop_phase, igvn);
+ assert(new_entry != NULL && new_entry->is_Proj(), "IfTrue or IfFalse after clone limit check");
+ }
+ if (TraceLoopLimitCheck) {
+ tty->print_cr("Loop Limit Check %s: ", move_predicates ? "moved" : "cloned");
+ debug_only( new_entry->in(0)->dump(); )
+ }
+ }
return new_entry;
}
//--------------------------eliminate_loop_predicates-----------------------
void PhaseIdealLoop::eliminate_loop_predicates(Node* entry) {
+ if (LoopLimitCheck) {
+ Node* predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate != NULL) {
+ entry = entry->in(0)->in(0);
+ }
+ }
if (UseLoopPredicate) {
ProjNode* predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate_proj != NULL) { // right pattern that can be used by loop predication
@@ -456,10 +489,15 @@
// Skip related predicates.
Node* PhaseIdealLoop::skip_loop_predicates(Node* entry) {
Node* predicate = NULL;
+ if (LoopLimitCheck) {
+ predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate != NULL) {
+ entry = entry->in(0)->in(0);
+ }
+ }
if (UseLoopPredicate) {
predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate != NULL) { // right pattern that can be used by loop predication
- assert(entry->is_Proj() && entry->in(0)->in(1)->in(1)->Opcode()==Op_Opaque1, "must be");
IfNode* iff = entry->in(0)->as_If();
ProjNode* uncommon_proj = iff->proj_out(1 - entry->as_Proj()->_con);
Node* rgn = uncommon_proj->unique_ctrl_out();
@@ -491,10 +529,15 @@
// Find a predicate
Node* PhaseIdealLoop::find_predicate(Node* entry) {
Node* predicate = NULL;
+ if (LoopLimitCheck) {
+ predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate != NULL) { // right pattern that can be used by loop predication
+ return entry;
+ }
+ }
if (UseLoopPredicate) {
predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate != NULL) { // right pattern that can be used by loop predication
- assert(entry->in(0)->in(1)->in(1)->Opcode()==Op_Opaque1, "must be");
return entry;
}
}
@@ -658,7 +701,7 @@
Node* range = cmp->in(2);
if (range->Opcode() != Op_LoadRange) {
const TypeInt* tint = phase->_igvn.type(range)->isa_int();
- if (!OptimizeFill || tint == NULL || tint->empty() || tint->_lo < 0) {
+ if (tint == NULL || tint->empty() || tint->_lo < 0) {
// Allow predication on positive values that aren't LoadRanges.
// This allows optimization of loops where the length of the
// array is a known value and doesn't need to be loaded back
@@ -696,36 +739,49 @@
// max(scale*i + offset) = scale*(limit-stride) + offset
// (2) stride*scale < 0
// max(scale*i + offset) = scale*init + offset
-BoolNode* PhaseIdealLoop::rc_predicate(Node* ctrl,
+BoolNode* PhaseIdealLoop::rc_predicate(IdealLoopTree *loop, Node* ctrl,
int scale, Node* offset,
Node* init, Node* limit, Node* stride,
Node* range, bool upper) {
- DEBUG_ONLY(ttyLocker ttyl);
- if (TraceLoopPredicate) tty->print("rc_predicate ");
+ stringStream* predString = NULL;
+ if (TraceLoopPredicate) {
+ predString = new stringStream();
+ predString->print("rc_predicate ");
+ }
Node* max_idx_expr = init;
int stride_con = stride->get_int();
if ((stride_con > 0) == (scale > 0) == upper) {
- max_idx_expr = new (C, 3) SubINode(limit, stride);
- register_new_node(max_idx_expr, ctrl);
- if (TraceLoopPredicate) tty->print("(limit - stride) ");
+ if (LoopLimitCheck) {
+ // With LoopLimitCheck limit is not exact.
+ // Calculate exact limit here.
+ // Note, counted loop's test is '<' or '>'.
+ limit = exact_limit(loop);
+ max_idx_expr = new (C, 3) SubINode(limit, stride);
+ register_new_node(max_idx_expr, ctrl);
+ if (TraceLoopPredicate) predString->print("(limit - stride) ");
+ } else {
+ max_idx_expr = new (C, 3) SubINode(limit, stride);
+ register_new_node(max_idx_expr, ctrl);
+ if (TraceLoopPredicate) predString->print("(limit - stride) ");
+ }
} else {
- if (TraceLoopPredicate) tty->print("init ");
+ if (TraceLoopPredicate) predString->print("init ");
}
if (scale != 1) {
ConNode* con_scale = _igvn.intcon(scale);
max_idx_expr = new (C, 3) MulINode(max_idx_expr, con_scale);
register_new_node(max_idx_expr, ctrl);
- if (TraceLoopPredicate) tty->print("* %d ", scale);
+ if (TraceLoopPredicate) predString->print("* %d ", scale);
}
if (offset && (!offset->is_Con() || offset->get_int() != 0)){
max_idx_expr = new (C, 3) AddINode(max_idx_expr, offset);
register_new_node(max_idx_expr, ctrl);
if (TraceLoopPredicate)
- if (offset->is_Con()) tty->print("+ %d ", offset->get_int());
- else tty->print("+ offset ");
+ if (offset->is_Con()) predString->print("+ %d ", offset->get_int());
+ else predString->print("+ offset ");
}
CmpUNode* cmp = new (C, 3) CmpUNode(max_idx_expr, range);
@@ -733,7 +789,10 @@
BoolNode* bol = new (C, 2) BoolNode(cmp, BoolTest::lt);
register_new_node(bol, ctrl);
- if (TraceLoopPredicate) tty->print_cr("<u range");
+ if (TraceLoopPredicate) {
+ predString->print_cr("<u range");
+ tty->print(predString->as_string());
+ }
return bol;
}
@@ -746,29 +805,36 @@
// Could be a simple region when irreducible loops are present.
return false;
}
+ LoopNode* head = loop->_head->as_Loop();
- if (loop->_head->unique_ctrl_out()->Opcode() == Op_NeverBranch) {
+ if (head->unique_ctrl_out()->Opcode() == Op_NeverBranch) {
// do nothing for infinite loops
return false;
}
CountedLoopNode *cl = NULL;
- if (loop->_head->is_CountedLoop()) {
- cl = loop->_head->as_CountedLoop();
+ if (head->is_CountedLoop()) {
+ cl = head->as_CountedLoop();
// do nothing for iteration-splitted loops
if (!cl->is_normal_loop()) return false;
}
- LoopNode *lpn = loop->_head->as_Loop();
- Node* entry = lpn->in(LoopNode::EntryControl);
+ Node* entry = head->in(LoopNode::EntryControl);
+ ProjNode *predicate_proj = NULL;
+ // Loop limit check predicate should be near the loop.
+ if (LoopLimitCheck) {
+ predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate_proj != NULL)
+ entry = predicate_proj->in(0)->in(0);
+ }
- ProjNode *predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
+ predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (!predicate_proj) {
#ifndef PRODUCT
if (TraceLoopPredicate) {
tty->print("missing predicate:");
loop->dump_head();
- lpn->dump(1);
+ head->dump(1);
}
#endif
return false;
@@ -782,7 +848,6 @@
// Create list of if-projs such that a newer proj dominates all older
// projs in the list, and they all dominate loop->tail()
Node_List if_proj_list(area);
- LoopNode *head = loop->_head->as_Loop();
Node *current_proj = loop->tail(); //start from tail
while (current_proj != head) {
if (loop == get_loop(current_proj) && // still in the loop ?
@@ -856,8 +921,8 @@
const Node* cmp = bol->in(1)->as_Cmp();
Node* idx = cmp->in(1);
assert(!invar.is_invariant(idx), "index is variant");
- assert(cmp->in(2)->Opcode() == Op_LoadRange || OptimizeFill, "must be");
Node* rng = cmp->in(2);
+ assert(rng->Opcode() == Op_LoadRange || _igvn.type(rng)->is_int() >= 0, "must be");
assert(invar.is_invariant(rng), "range must be invariant");
int scale = 1;
Node* offset = zero;
@@ -886,14 +951,14 @@
}
// Test the lower bound
- Node* lower_bound_bol = rc_predicate(ctrl, scale, offset, init, limit, stride, rng, false);
+ Node* lower_bound_bol = rc_predicate(loop, ctrl, scale, offset, init, limit, stride, rng, false);
IfNode* lower_bound_iff = lower_bound_proj->in(0)->as_If();
_igvn.hash_delete(lower_bound_iff);
lower_bound_iff->set_req(1, lower_bound_bol);
if (TraceLoopPredicate) tty->print_cr("lower bound check if: %d", lower_bound_iff->_idx);
// Test the upper bound
- Node* upper_bound_bol = rc_predicate(ctrl, scale, offset, init, limit, stride, rng, true);
+ Node* upper_bound_bol = rc_predicate(loop, ctrl, scale, offset, init, limit, stride, rng, true);
IfNode* upper_bound_iff = upper_bound_proj->in(0)->as_If();
_igvn.hash_delete(upper_bound_iff);
upper_bound_iff->set_req(1, upper_bound_bol);
@@ -957,4 +1022,3 @@
return hoisted;
}
-
--- a/hotspot/src/share/vm/opto/loopTransform.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp Thu May 12 07:28:52 2011 -0700
@@ -83,7 +83,7 @@
#ifdef ASSERT
BoolTest::mask bt = cl->loopexit()->test_trip();
assert(bt == BoolTest::lt || bt == BoolTest::gt ||
- bt == BoolTest::ne, "canonical test is expected");
+ (bt == BoolTest::ne && !LoopLimitCheck), "canonical test is expected");
#endif
Node* init_n = cl->init_trip();
@@ -510,7 +510,7 @@
// the pre-loop with only 1 user (the new peeled iteration), but the
// peeled-loop backedge has 2 users.
Node* new_exit_value = old_new[head->in(LoopNode::LoopBackControl)->_idx];
- new_exit_value = move_loop_predicates(entry, new_exit_value);
+ new_exit_value = move_loop_predicates(entry, new_exit_value, !counted_loop);
_igvn.hash_delete(head);
head->set_req(LoopNode::EntryControl, new_exit_value);
for (DUIterator_Fast jmax, j = head->fast_outs(jmax); j < jmax; j++) {
@@ -593,6 +593,12 @@
return false;
}
+ // Fully unroll a loop with few iterations regardless next
+ // conditions since following loop optimizations will split
+ // such loop anyway (pre-main-post).
+ if (trip_count <= 3)
+ return true;
+
// Take into account that after unroll conjoined heads and tails will fold,
// otherwise policy_unroll() may allow more unrolling than max unrolling.
uint new_body_size = EMPTY_LOOP_SIZE + (body_size - EMPTY_LOOP_SIZE) * trip_count;
@@ -605,15 +611,6 @@
return false;
}
- // Currently we don't have policy to optimize one iteration loops.
- // Maximally unrolling transformation is used for that:
- // it is peeled and the original loop become non reachable (dead).
- // Also fully unroll a loop with few iterations regardless next
- // conditions since following loop optimizations will split
- // such loop anyway (pre-main-post).
- if (trip_count <= 3)
- return true;
-
// Do not unroll a loop with String intrinsics code.
// String intrinsics are large and have loops.
for (uint k = 0; k < _body.size(); k++) {
@@ -632,6 +629,8 @@
}
+#define MAX_UNROLL 16 // maximum number of unrolls for main loop
+
//------------------------------policy_unroll----------------------------------
// Return TRUE or FALSE if the loop should be unrolled or not. Unroll if
// the loop is a CountedLoop and the body is small enough.
@@ -643,13 +642,15 @@
if (!cl->is_valid_counted_loop())
return false; // Malformed counted loop
- // protect against over-unrolling
- if (cl->trip_count() <= 1) return false;
-
- // Check for stride being a small enough constant
- if (abs(cl->stride_con()) > (1<<3)) return false;
+ // Protect against over-unrolling.
+ // After split at least one iteration will be executed in pre-loop.
+ if (cl->trip_count() <= (uint)(cl->is_normal_loop() ? 2 : 1)) return false;
int future_unroll_ct = cl->unrolled_count() * 2;
+ if (future_unroll_ct > MAX_UNROLL) return false;
+
+ // Check for initial stride being a small enough constant
+ if (abs(cl->stride_con()) > (1<<2)*future_unroll_ct) return false;
// Don't unroll if the next round of unrolling would push us
// over the expected trip count of the loop. One is subtracted
@@ -675,6 +676,7 @@
Node *init_n = cl->init_trip();
Node *limit_n = cl->limit();
+ int stride_con = cl->stride_con();
// Non-constant bounds.
// Protect against over-unrolling when init or/and limit are not constant
// (so that trip_count's init value is maxint) but iv range is known.
@@ -684,7 +686,7 @@
if (phi != NULL) {
assert(phi->is_Phi() && phi->in(0) == _head, "Counted loop should have iv phi.");
const TypeInt* iv_type = phase->_igvn.type(phi)->is_int();
- int next_stride = cl->stride_con() * 2; // stride after this unroll
+ int next_stride = stride_con * 2; // stride after this unroll
if (next_stride > 0) {
if (iv_type->_lo + next_stride <= iv_type->_lo || // overflow
iv_type->_lo + next_stride > iv_type->_hi) {
@@ -699,15 +701,19 @@
}
}
+ // After unroll limit will be adjusted: new_limit = limit-stride.
+ // Bailout if adjustment overflow.
+ const TypeInt* limit_type = phase->_igvn.type(limit_n)->is_int();
+ if (stride_con > 0 && ((limit_type->_hi - stride_con) >= limit_type->_hi) ||
+ stride_con < 0 && ((limit_type->_lo - stride_con) <= limit_type->_lo))
+ return false; // overflow
+
// Adjust body_size to determine if we unroll or not
uint body_size = _body.size();
- // Key test to unroll CaffeineMark's Logic test
- int xors_in_loop = 0;
// Also count ModL, DivL and MulL which expand mightly
for (uint k = 0; k < _body.size(); k++) {
Node* n = _body.at(k);
switch (n->Opcode()) {
- case Op_XorI: xors_in_loop++; break; // CaffeineMark's Logic test
case Op_ModL: body_size += 30; break;
case Op_DivL: body_size += 30; break;
case Op_MulL: body_size += 10; break;
@@ -724,8 +730,7 @@
// Check for being too big
if (body_size > (uint)LoopUnrollLimit) {
- if (xors_in_loop >= 4 && body_size < (uint)LoopUnrollLimit*4) return true;
- // Normal case: loop too big
+ // Normal case: loop too big
return false;
}
@@ -747,28 +752,31 @@
// Return TRUE or FALSE if the loop should be range-check-eliminated.
// Actually we do iteration-splitting, a more powerful form of RCE.
bool IdealLoopTree::policy_range_check( PhaseIdealLoop *phase ) const {
- if( !RangeCheckElimination ) return false;
+ if (!RangeCheckElimination) return false;
CountedLoopNode *cl = _head->as_CountedLoop();
// If we unrolled with no intention of doing RCE and we later
// changed our minds, we got no pre-loop. Either we need to
// make a new pre-loop, or we gotta disallow RCE.
- if( cl->is_main_no_pre_loop() ) return false; // Disallowed for now.
+ if (cl->is_main_no_pre_loop()) return false; // Disallowed for now.
Node *trip_counter = cl->phi();
// Check loop body for tests of trip-counter plus loop-invariant vs
// loop-invariant.
- for( uint i = 0; i < _body.size(); i++ ) {
+ for (uint i = 0; i < _body.size(); i++) {
Node *iff = _body[i];
- if( iff->Opcode() == Op_If ) { // Test?
+ if (iff->Opcode() == Op_If) { // Test?
// Comparing trip+off vs limit
Node *bol = iff->in(1);
- if( bol->req() != 2 ) continue; // dead constant test
+ if (bol->req() != 2) continue; // dead constant test
if (!bol->is_Bool()) {
assert(UseLoopPredicate && bol->Opcode() == Op_Conv2B, "predicate check only");
continue;
}
+ if (bol->as_Bool()->_test._test == BoolTest::ne)
+ continue; // not RC
+
Node *cmp = bol->in(1);
Node *rc_exp = cmp->in(1);
@@ -1064,6 +1072,7 @@
// negative stride use >
if (pre_end->in(CountedLoopEndNode::TestValue)->as_Bool()->_test._test == BoolTest::ne) {
+ assert(!LoopLimitCheck, "only canonical tests (lt or gt) are expected");
BoolTest::mask new_test = (main_end->stride_con() > 0) ? BoolTest::lt : BoolTest::gt;
// Modify pre loop end condition
@@ -1090,6 +1099,9 @@
main_head->set_main_loop();
if( peel_only ) main_head->set_main_no_pre_loop();
+ // Subtract a trip count for the pre-loop.
+ main_head->set_trip_count(main_head->trip_count() - 1);
+
// It's difficult to be precise about the trip-counts
// for the pre/post loops. They are usually very short,
// so guess that 4 trips is a reasonable value.
@@ -1123,9 +1135,9 @@
loop->dump_head();
} else if (TraceLoopOpts) {
if (loop_head->trip_count() < (uint)LoopUnrollLimit) {
- tty->print("Unroll %d(%2d) ", loop_head->unrolled_count()*2, loop_head->trip_count());
+ tty->print("Unroll %d(%2d) ", loop_head->unrolled_count()*2, loop_head->trip_count());
} else {
- tty->print("Unroll %d ", loop_head->unrolled_count()*2);
+ tty->print("Unroll %d ", loop_head->unrolled_count()*2);
}
loop->dump_head();
}
@@ -1141,7 +1153,8 @@
Node *stride = loop_head->stride();
Node *opaq = NULL;
- if( adjust_min_trip ) { // If not maximally unrolling, need adjustment
+ if (adjust_min_trip) { // If not maximally unrolling, need adjustment
+ // Search for zero-trip guard.
assert( loop_head->is_main_loop(), "" );
assert( ctrl->Opcode() == Op_IfTrue || ctrl->Opcode() == Op_IfFalse, "" );
Node *iff = ctrl->in(0);
@@ -1151,63 +1164,210 @@
Node *cmp = bol->in(1);
assert( cmp->Opcode() == Op_CmpI, "" );
opaq = cmp->in(2);
- // Occasionally it's possible for a pre-loop Opaque1 node to be
+ // Occasionally it's possible for a zero-trip guard Opaque1 node to be
// optimized away and then another round of loop opts attempted.
// We can not optimize this particular loop in that case.
- if( opaq->Opcode() != Op_Opaque1 )
- return; // Cannot find pre-loop! Bail out!
+ if (opaq->Opcode() != Op_Opaque1)
+ return; // Cannot find zero-trip guard! Bail out!
+ // Zero-trip test uses an 'opaque' node which is not shared.
+ assert(opaq->outcnt() == 1 && opaq->in(1) == limit, "");
}
C->set_major_progress();
- // Adjust max trip count. The trip count is intentionally rounded
- // down here (e.g. 15-> 7-> 3-> 1) because if we unwittingly over-unroll,
- // the main, unrolled, part of the loop will never execute as it is protected
- // by the min-trip test. See bug 4834191 for a case where we over-unrolled
- // and later determined that part of the unrolled loop was dead.
- loop_head->set_trip_count(loop_head->trip_count() / 2);
+ Node* new_limit = NULL;
+ if (UnrollLimitCheck) {
+ int stride_con = stride->get_int();
+ int stride_p = (stride_con > 0) ? stride_con : -stride_con;
+ uint old_trip_count = loop_head->trip_count();
+ // Verify that unroll policy result is still valid.
+ assert(old_trip_count > 1 &&
+ (!adjust_min_trip || stride_p <= (1<<3)*loop_head->unrolled_count()), "sanity");
- // Double the count of original iterations in the unrolled loop body.
- loop_head->double_unrolled_count();
+ // Adjust loop limit to keep valid iterations number after unroll.
+ // Use (limit - stride) instead of (((limit - init)/stride) & (-2))*stride
+ // which may overflow.
+ if (!adjust_min_trip) {
+ assert(old_trip_count > 1 && (old_trip_count & 1) == 0,
+ "odd trip count for maximally unroll");
+ // Don't need to adjust limit for maximally unroll since trip count is even.
+ } else if (loop_head->has_exact_trip_count() && init->is_Con()) {
+ // Loop's limit is constant. Loop's init could be constant when pre-loop
+ // become peeled iteration.
+ long init_con = init->get_int();
+ // We can keep old loop limit if iterations count stays the same:
+ // old_trip_count == new_trip_count * 2
+ // Note: since old_trip_count >= 2 then new_trip_count >= 1
+ // so we also don't need to adjust zero trip test.
+ long limit_con = limit->get_int();
+ // (stride_con*2) not overflow since stride_con <= 8.
+ int new_stride_con = stride_con * 2;
+ int stride_m = new_stride_con - (stride_con > 0 ? 1 : -1);
+ long trip_count = (limit_con - init_con + stride_m)/new_stride_con;
+ // New trip count should satisfy next conditions.
+ assert(trip_count > 0 && (julong)trip_count < (julong)max_juint/2, "sanity");
+ uint new_trip_count = (uint)trip_count;
+ adjust_min_trip = (old_trip_count != new_trip_count*2);
+ }
+
+ if (adjust_min_trip) {
+ // Step 2: Adjust the trip limit if it is called for.
+ // The adjustment amount is -stride. Need to make sure if the
+ // adjustment underflows or overflows, then the main loop is skipped.
+ Node* cmp = loop_end->cmp_node();
+ assert(cmp->in(2) == limit, "sanity");
+ assert(opaq != NULL && opaq->in(1) == limit, "sanity");
+
+ // Verify that policy_unroll result is still valid.
+ const TypeInt* limit_type = _igvn.type(limit)->is_int();
+ assert(stride_con > 0 && ((limit_type->_hi - stride_con) < limit_type->_hi) ||
+ stride_con < 0 && ((limit_type->_lo - stride_con) > limit_type->_lo), "sanity");
- // -----------
- // Step 2: Cut back the trip counter for an unroll amount of 2.
- // Loop will normally trip (limit - init)/stride_con. Since it's a
- // CountedLoop this is exact (stride divides limit-init exactly).
- // We are going to double the loop body, so we want to knock off any
- // odd iteration: (trip_cnt & ~1). Then back compute a new limit.
- Node *span = new (C, 3) SubINode( limit, init );
- register_new_node( span, ctrl );
- Node *trip = new (C, 3) DivINode( 0, span, stride );
- register_new_node( trip, ctrl );
- Node *mtwo = _igvn.intcon(-2);
- set_ctrl(mtwo, C->root());
- Node *rond = new (C, 3) AndINode( trip, mtwo );
- register_new_node( rond, ctrl );
- Node *spn2 = new (C, 3) MulINode( rond, stride );
- register_new_node( spn2, ctrl );
- Node *lim2 = new (C, 3) AddINode( spn2, init );
- register_new_node( lim2, ctrl );
+ if (limit->is_Con()) {
+ // The check in policy_unroll and the assert above guarantee
+ // no underflow if limit is constant.
+ new_limit = _igvn.intcon(limit->get_int() - stride_con);
+ set_ctrl(new_limit, C->root());
+ } else {
+ // Limit is not constant.
+ {
+ // Separate limit by Opaque node in case it is an incremented
+ // variable from previous loop to avoid using pre-incremented
+ // value which could increase register pressure.
+ // Otherwise reorg_offsets() optimization will create a separate
+ // Opaque node for each use of trip-counter and as result
+ // zero trip guard limit will be different from loop limit.
+ assert(has_ctrl(opaq), "should have it");
+ Node* opaq_ctrl = get_ctrl(opaq);
+ limit = new (C, 2) Opaque2Node( C, limit );
+ register_new_node( limit, opaq_ctrl );
+ }
+ if (stride_con > 0 && ((limit_type->_lo - stride_con) < limit_type->_lo) ||
+ stride_con < 0 && ((limit_type->_hi - stride_con) > limit_type->_hi)) {
+ // No underflow.
+ new_limit = new (C, 3) SubINode(limit, stride);
+ } else {
+ // (limit - stride) may underflow.
+ // Clamp the adjustment value with MININT or MAXINT:
+ //
+ // new_limit = limit-stride
+ // if (stride > 0)
+ // new_limit = (limit < new_limit) ? MININT : new_limit;
+ // else
+ // new_limit = (limit > new_limit) ? MAXINT : new_limit;
+ //
+ BoolTest::mask bt = loop_end->test_trip();
+ assert(bt == BoolTest::lt || bt == BoolTest::gt, "canonical test is expected");
+ Node* adj_max = _igvn.intcon((stride_con > 0) ? min_jint : max_jint);
+ set_ctrl(adj_max, C->root());
+ Node* old_limit = NULL;
+ Node* adj_limit = NULL;
+ Node* bol = limit->is_CMove() ? limit->in(CMoveNode::Condition) : NULL;
+ if (loop_head->unrolled_count() > 1 &&
+ limit->is_CMove() && limit->Opcode() == Op_CMoveI &&
+ limit->in(CMoveNode::IfTrue) == adj_max &&
+ bol->as_Bool()->_test._test == bt &&
+ bol->in(1)->Opcode() == Op_CmpI &&
+ bol->in(1)->in(2) == limit->in(CMoveNode::IfFalse)) {
+ // Loop was unrolled before.
+ // Optimize the limit to avoid nested CMove:
+ // use original limit as old limit.
+ old_limit = bol->in(1)->in(1);
+ // Adjust previous adjusted limit.
+ adj_limit = limit->in(CMoveNode::IfFalse);
+ adj_limit = new (C, 3) SubINode(adj_limit, stride);
+ } else {
+ old_limit = limit;
+ adj_limit = new (C, 3) SubINode(limit, stride);
+ }
+ assert(old_limit != NULL && adj_limit != NULL, "");
+ register_new_node( adj_limit, ctrl ); // adjust amount
+ Node* adj_cmp = new (C, 3) CmpINode(old_limit, adj_limit);
+ register_new_node( adj_cmp, ctrl );
+ Node* adj_bool = new (C, 2) BoolNode(adj_cmp, bt);
+ register_new_node( adj_bool, ctrl );
+ new_limit = new (C, 4) CMoveINode(adj_bool, adj_limit, adj_max, TypeInt::INT);
+ }
+ register_new_node(new_limit, ctrl);
+ }
+ assert(new_limit != NULL, "");
+ // Replace in loop test.
+ _igvn.hash_delete(cmp);
+ cmp->set_req(2, new_limit);
- // Hammer in the new limit
- Node *ctrl2 = loop_end->in(0);
- Node *cmp2 = new (C, 3) CmpINode( loop_head->incr(), lim2 );
- register_new_node( cmp2, ctrl2 );
- Node *bol2 = new (C, 2) BoolNode( cmp2, loop_end->test_trip() );
- register_new_node( bol2, ctrl2 );
- _igvn.hash_delete(loop_end);
- loop_end->set_req(CountedLoopEndNode::TestValue, bol2);
+ // Step 3: Find the min-trip test guaranteed before a 'main' loop.
+ // Make it a 1-trip test (means at least 2 trips).
+
+ // Guard test uses an 'opaque' node which is not shared. Hence I
+ // can edit it's inputs directly. Hammer in the new limit for the
+ // minimum-trip guard.
+ assert(opaq->outcnt() == 1, "");
+ _igvn.hash_delete(opaq);
+ opaq->set_req(1, new_limit);
+ }
+
+ // Adjust max trip count. The trip count is intentionally rounded
+ // down here (e.g. 15-> 7-> 3-> 1) because if we unwittingly over-unroll,
+ // the main, unrolled, part of the loop will never execute as it is protected
+ // by the min-trip test. See bug 4834191 for a case where we over-unrolled
+ // and later determined that part of the unrolled loop was dead.
+ loop_head->set_trip_count(old_trip_count / 2);
+
+ // Double the count of original iterations in the unrolled loop body.
+ loop_head->double_unrolled_count();
+
+ } else { // LoopLimitCheck
+
+ // Adjust max trip count. The trip count is intentionally rounded
+ // down here (e.g. 15-> 7-> 3-> 1) because if we unwittingly over-unroll,
+ // the main, unrolled, part of the loop will never execute as it is protected
+ // by the min-trip test. See bug 4834191 for a case where we over-unrolled
+ // and later determined that part of the unrolled loop was dead.
+ loop_head->set_trip_count(loop_head->trip_count() / 2);
+
+ // Double the count of original iterations in the unrolled loop body.
+ loop_head->double_unrolled_count();
- // Step 3: Find the min-trip test guaranteed before a 'main' loop.
- // Make it a 1-trip test (means at least 2 trips).
- if( adjust_min_trip ) {
- // Guard test uses an 'opaque' node which is not shared. Hence I
- // can edit it's inputs directly. Hammer in the new limit for the
- // minimum-trip guard.
- assert( opaq->outcnt() == 1, "" );
- _igvn.hash_delete(opaq);
- opaq->set_req(1, lim2);
- }
+ // -----------
+ // Step 2: Cut back the trip counter for an unroll amount of 2.
+ // Loop will normally trip (limit - init)/stride_con. Since it's a
+ // CountedLoop this is exact (stride divides limit-init exactly).
+ // We are going to double the loop body, so we want to knock off any
+ // odd iteration: (trip_cnt & ~1). Then back compute a new limit.
+ Node *span = new (C, 3) SubINode( limit, init );
+ register_new_node( span, ctrl );
+ Node *trip = new (C, 3) DivINode( 0, span, stride );
+ register_new_node( trip, ctrl );
+ Node *mtwo = _igvn.intcon(-2);
+ set_ctrl(mtwo, C->root());
+ Node *rond = new (C, 3) AndINode( trip, mtwo );
+ register_new_node( rond, ctrl );
+ Node *spn2 = new (C, 3) MulINode( rond, stride );
+ register_new_node( spn2, ctrl );
+ new_limit = new (C, 3) AddINode( spn2, init );
+ register_new_node( new_limit, ctrl );
+
+ // Hammer in the new limit
+ Node *ctrl2 = loop_end->in(0);
+ Node *cmp2 = new (C, 3) CmpINode( loop_head->incr(), new_limit );
+ register_new_node( cmp2, ctrl2 );
+ Node *bol2 = new (C, 2) BoolNode( cmp2, loop_end->test_trip() );
+ register_new_node( bol2, ctrl2 );
+ _igvn.hash_delete(loop_end);
+ loop_end->set_req(CountedLoopEndNode::TestValue, bol2);
+
+ // Step 3: Find the min-trip test guaranteed before a 'main' loop.
+ // Make it a 1-trip test (means at least 2 trips).
+ if( adjust_min_trip ) {
+ assert( new_limit != NULL, "" );
+ // Guard test uses an 'opaque' node which is not shared. Hence I
+ // can edit it's inputs directly. Hammer in the new limit for the
+ // minimum-trip guard.
+ assert( opaq->outcnt() == 1, "" );
+ _igvn.hash_delete(opaq);
+ opaq->set_req(1, new_limit);
+ }
+ } // LoopLimitCheck
// ---------
// Step 4: Clone the loop body. Move it inside the loop. This loop body
@@ -1263,6 +1423,7 @@
void PhaseIdealLoop::do_maximally_unroll( IdealLoopTree *loop, Node_List &old_new ) {
CountedLoopNode *cl = loop->_head->as_CountedLoop();
+ assert(cl->has_exact_trip_count(), "trip count is not exact");
assert(cl->trip_count() > 0, "");
#ifndef PRODUCT
if (TraceLoopOpts) {
@@ -1279,6 +1440,7 @@
// Now its tripping an even number of times remaining. Double loop body.
// Do not adjust pre-guards; they are not needed and do not exist.
if (cl->trip_count() > 0) {
+ assert((cl->trip_count() & 1) == 0, "missed peeling");
do_unroll(loop, old_new, false);
}
}
@@ -1292,22 +1454,13 @@
}
//------------------------------add_constraint---------------------------------
-// Constrain the main loop iterations so the condition:
-// scale_con * I + offset < limit
+// Constrain the main loop iterations so the conditions:
+// low_limit <= scale_con * I + offset < upper_limit
// always holds true. That is, either increase the number of iterations in
// the pre-loop or the post-loop until the condition holds true in the main
// loop. Stride, scale, offset and limit are all loop invariant. Further,
// stride and scale are constants (offset and limit often are).
-void PhaseIdealLoop::add_constraint( int stride_con, int scale_con, Node *offset, Node *limit, Node *pre_ctrl, Node **pre_limit, Node **main_limit ) {
-
- // Compute "I :: (limit-offset)/scale_con"
- Node *con = new (C, 3) SubINode( limit, offset );
- register_new_node( con, pre_ctrl );
- Node *scale = _igvn.intcon(scale_con);
- set_ctrl(scale, C->root());
- Node *X = new (C, 3) DivINode( 0, con, scale );
- register_new_node( X, pre_ctrl );
-
+void PhaseIdealLoop::add_constraint( int stride_con, int scale_con, Node *offset, Node *low_limit, Node *upper_limit, Node *pre_ctrl, Node **pre_limit, Node **main_limit ) {
// For positive stride, the pre-loop limit always uses a MAX function
// and the main loop a MIN function. For negative stride these are
// reversed.
@@ -1316,48 +1469,143 @@
// pre-loop must check for underflow and the post-loop for overflow.
// Negative stride*scale reverses this; pre-loop checks for overflow and
// post-loop for underflow.
- if( stride_con*scale_con > 0 ) {
- // Compute I < (limit-offset)/scale_con
- // Adjust main-loop last iteration to be MIN/MAX(main_loop,X)
- *main_limit = (stride_con > 0)
- ? (Node*)(new (C, 3) MinINode( *main_limit, X ))
- : (Node*)(new (C, 3) MaxINode( *main_limit, X ));
- register_new_node( *main_limit, pre_ctrl );
+ if (stride_con*scale_con > 0) {
+ // The overflow limit: scale*I+offset < upper_limit
+ // For main-loop compute
+ // ( if (scale > 0) /* and stride > 0 */
+ // I < (upper_limit-offset)/scale
+ // else /* scale < 0 and stride < 0 */
+ // I > (upper_limit-offset)/scale
+ // )
+ //
+ // (upper_limit-offset) may overflow when offset < 0.
+ // But it is fine since main loop will either have
+ // less iterations or will be skipped in such case.
+ Node *con = new (C, 3) SubINode(upper_limit, offset);
+ register_new_node(con, pre_ctrl);
+ Node *scale = _igvn.intcon(scale_con);
+ set_ctrl(scale, C->root());
+ Node *X = new (C, 3) DivINode(0, con, scale);
+ register_new_node(X, pre_ctrl);
+
+ // Adjust main-loop last iteration
+ Node *loop_limit = *main_limit;
+ loop_limit = (stride_con > 0) // scale > 0
+ ? (Node*)(new (C, 3) MinINode(loop_limit, X))
+ : (Node*)(new (C, 3) MaxINode(loop_limit, X));
+ register_new_node(loop_limit, pre_ctrl);
+ *main_limit = loop_limit;
- } else {
- // Compute (limit-offset)/scale_con + SGN(-scale_con) <= I
- // Add the negation of the main-loop constraint to the pre-loop.
- // See footnote [++] below for a derivation of the limit expression.
- Node *incr = _igvn.intcon(scale_con > 0 ? -1 : 1);
- set_ctrl(incr, C->root());
- Node *adj = new (C, 3) AddINode( X, incr );
- register_new_node( adj, pre_ctrl );
- *pre_limit = (scale_con > 0)
- ? (Node*)new (C, 3) MinINode( *pre_limit, adj )
- : (Node*)new (C, 3) MaxINode( *pre_limit, adj );
- register_new_node( *pre_limit, pre_ctrl );
+ // The underflow limit: low_limit <= scale*I+offset.
+ // For pre-loop compute
+ // NOT(scale*I+offset >= low_limit)
+ // scale*I+offset < low_limit
+ // ( if (scale > 0) /* and stride > 0 */
+ // I < (low_limit-offset)/scale
+ // else /* scale < 0 and stride < 0 */
+ // I > (low_limit-offset)/scale
+ // )
+
+ if (low_limit->get_int() == -max_jint) {
+ if (!RangeLimitCheck) return;
+ // We need this guard when scale*pre_limit+offset >= limit
+ // due to underflow so we need execute pre-loop until
+ // scale*I+offset >= min_int. But (low_limit-offset) will
+ // underflow when offset > 0 and X will be > original_limit.
+ // To avoid it we replace offset = offset > 0 ? 0 : offset
+ // and add min(pre_limit, original_limit).
+ Node* shift = _igvn.intcon(31);
+ set_ctrl(shift, C->root());
+ Node *neg_off = new (C, 3) RShiftINode(offset, shift);
+ register_new_node(neg_off, pre_ctrl);
+ offset = new (C, 3) AndINode(offset, neg_off);
+ register_new_node(offset, pre_ctrl);
+ } else {
+ assert(low_limit->get_int() == 0, "wrong low limit for range check");
+ // The only problem we have here when offset == min_int
+ // since (0-min_int) == min_int. It may be fine for scale > 0
+ // but for scale < 0 X will be < original_limit.
+ }
+ con = new (C, 3) SubINode(low_limit, offset);
+ register_new_node(con, pre_ctrl);
+ scale = _igvn.intcon(scale_con);
+ set_ctrl(scale, C->root());
+ X = new (C, 3) DivINode(0, con, scale);
+ register_new_node(X, pre_ctrl);
-// [++] Here's the algebra that justifies the pre-loop limit expression:
-//
-// NOT( scale_con * I + offset < limit )
-// ==
-// scale_con * I + offset >= limit
-// ==
-// SGN(scale_con) * I >= (limit-offset)/|scale_con|
-// ==
-// (limit-offset)/|scale_con| <= I * SGN(scale_con)
-// ==
-// (limit-offset)/|scale_con|-1 < I * SGN(scale_con)
-// ==
-// ( if (scale_con > 0) /*common case*/
-// (limit-offset)/scale_con - 1 < I
-// else
-// (limit-offset)/scale_con + 1 > I
-// )
-// ( if (scale_con > 0) /*common case*/
-// (limit-offset)/scale_con + SGN(-scale_con) < I
-// else
-// (limit-offset)/scale_con + SGN(-scale_con) > I
+ // Adjust pre-loop last iteration
+ loop_limit = *pre_limit;
+ loop_limit = (stride_con > 0) // scale > 0
+ ? (Node*)(new (C, 3) MaxINode(loop_limit, X))
+ : (Node*)(new (C, 3) MinINode(loop_limit, X));
+ register_new_node( loop_limit, pre_ctrl );
+ *pre_limit = loop_limit;
+
+ } else { // stride_con*scale_con < 0
+ // For negative stride*scale pre-loop checks for overflow and
+ // post-loop for underflow.
+ //
+ // The underflow limit: low_limit <= scale*I+offset.
+ // For main-loop compute
+ // scale*I+offset+1 > low_limit
+ // ( if (scale < 0) /* and stride > 0 */
+ // I < (low_limit-(offset+1))/scale
+ // else /* scale < 0 and stride < 0 */
+ // I > (low_limit-(offset+1))/scale
+ // )
+
+ if (low_limit->get_int() == -max_jint) {
+ if (!RangeLimitCheck) return;
+ } else {
+ assert(low_limit->get_int() == 0, "wrong low limit for range check");
+ }
+
+ Node *one = _igvn.intcon(1);
+ set_ctrl(one, C->root());
+ Node *plus_one = new (C, 3) AddINode(offset, one);
+ register_new_node( plus_one, pre_ctrl );
+ Node *con = new (C, 3) SubINode(low_limit, plus_one);
+ register_new_node(con, pre_ctrl);
+ Node *scale = _igvn.intcon(scale_con);
+ set_ctrl(scale, C->root());
+ Node *X = new (C, 3) DivINode(0, con, scale);
+ register_new_node(X, pre_ctrl);
+
+ // Adjust main-loop last iteration
+ Node *loop_limit = *main_limit;
+ loop_limit = (stride_con > 0) // scale < 0
+ ? (Node*)(new (C, 3) MinINode(loop_limit, X))
+ : (Node*)(new (C, 3) MaxINode(loop_limit, X));
+ register_new_node(loop_limit, pre_ctrl);
+ *main_limit = loop_limit;
+
+ // The overflow limit: scale*I+offset < upper_limit
+ // For pre-loop compute
+ // NOT(scale*I+offset < upper_limit)
+ // scale*I+offset >= upper_limit
+ // scale*I+offset+1 > upper_limit
+ // ( if (scale < 0) /* and stride > 0 */
+ // I < (upper_limit-(offset+1))/scale
+ // else /* scale < 0 and stride < 0 */
+ // I > (upper_limit-(offset+1))/scale
+ // )
+ plus_one = new (C, 3) AddINode(offset, one);
+ register_new_node( plus_one, pre_ctrl );
+ con = new (C, 3) SubINode(upper_limit, plus_one);
+ register_new_node(con, pre_ctrl);
+ scale = _igvn.intcon(scale_con);
+ set_ctrl(scale, C->root());
+ X = new (C, 3) DivINode(0, con, scale);
+ register_new_node(X, pre_ctrl);
+
+ // Adjust pre-loop last iteration
+ loop_limit = *pre_limit;
+ loop_limit = (stride_con > 0) // scale < 0
+ ? (Node*)(new (C, 3) MaxINode(loop_limit, X))
+ : (Node*)(new (C, 3) MinINode(loop_limit, X));
+ register_new_node( loop_limit, pre_ctrl );
+ *pre_limit = loop_limit;
+
}
}
@@ -1488,7 +1736,7 @@
Node *cmpzm = bolzm->in(1);
assert(cmpzm->is_Cmp(), "");
Node *opqzm = cmpzm->in(2);
- // Can not optimize a loop if pre-loop Opaque1 node is optimized
+ // Can not optimize a loop if zero-trip Opaque1 node is optimized
// away and then another round of loop opts attempted.
if (opqzm->Opcode() != Op_Opaque1)
return;
@@ -1523,8 +1771,11 @@
int stride_con = cl->stride_con();
Node *zero = _igvn.intcon(0);
Node *one = _igvn.intcon(1);
+ // Use symmetrical int range [-max_jint,max_jint]
+ Node *mini = _igvn.intcon(-max_jint);
set_ctrl(zero, C->root());
set_ctrl(one, C->root());
+ set_ctrl(mini, C->root());
// Range checks that do not dominate the loop backedge (ie.
// conditionally executed) can lengthen the pre loop limit beyond
@@ -1599,7 +1850,12 @@
if( offset_c == ctrl ) {
continue; // Don't rce this check but continue looking for other candidates.
}
-
+#ifdef ASSERT
+ if (TraceRangeLimitCheck) {
+ tty->print_cr("RC bool node%s", flip ? " flipped:" : ":");
+ bol->dump(2);
+ }
+#endif
// At this point we have the expression as:
// scale_con * trip_counter + offset :: limit
// where scale_con, offset and limit are loop invariant. Trip_counter
@@ -1610,17 +1866,16 @@
// Adjust pre and main loop limits to guard the correct iteration set
if( cmp->Opcode() == Op_CmpU ) {// Unsigned compare is really 2 tests
if( b_test._test == BoolTest::lt ) { // Range checks always use lt
- // The overflow limit: scale*I+offset < limit
- add_constraint( stride_con, scale_con, offset, limit, pre_ctrl, &pre_limit, &main_limit );
- // The underflow limit: 0 <= scale*I+offset.
- // Some math yields: -scale*I-(offset+1) < 0
- Node *plus_one = new (C, 3) AddINode( offset, one );
- register_new_node( plus_one, pre_ctrl );
- Node *neg_offset = new (C, 3) SubINode( zero, plus_one );
- register_new_node( neg_offset, pre_ctrl );
- add_constraint( stride_con, -scale_con, neg_offset, zero, pre_ctrl, &pre_limit, &main_limit );
+ // The underflow and overflow limits: 0 <= scale*I+offset < limit
+ add_constraint( stride_con, scale_con, offset, zero, limit, pre_ctrl, &pre_limit, &main_limit );
if (!conditional_rc) {
conditional_rc = !loop->dominates_backedge(iff);
+ // It is also needed if offset->_lo == min_int since
+ // (0-min_int) == min_int. It may be fine for stride > 0
+ // but for stride < 0 pre_limit will be < original_limit.
+ const TypeInt* offset_t = _igvn.type(offset)->is_int();
+ conditional_rc |= RangeLimitCheck && (offset_t->_lo == min_jint) &&
+ (scale_con<0) && (stride_con<0);
}
} else {
#ifndef PRODUCT
@@ -1631,21 +1886,35 @@
}
} else { // Otherwise work on normal compares
switch( b_test._test ) {
- case BoolTest::ge: // Convert X >= Y to -X <= -Y
+ case BoolTest::gt:
+ // Fall into GE case
+ case BoolTest::ge:
+ // Convert (I*scale+offset) >= Limit to (I*(-scale)+(-offset)) <= -Limit
scale_con = -scale_con;
offset = new (C, 3) SubINode( zero, offset );
register_new_node( offset, pre_ctrl );
limit = new (C, 3) SubINode( zero, limit );
register_new_node( limit, pre_ctrl );
// Fall into LE case
- case BoolTest::le: // Convert X <= Y to X < Y+1
- limit = new (C, 3) AddINode( limit, one );
- register_new_node( limit, pre_ctrl );
+ case BoolTest::le:
+ if (b_test._test != BoolTest::gt) {
+ // Convert X <= Y to X < Y+1
+ limit = new (C, 3) AddINode( limit, one );
+ register_new_node( limit, pre_ctrl );
+ }
// Fall into LT case
case BoolTest::lt:
- add_constraint( stride_con, scale_con, offset, limit, pre_ctrl, &pre_limit, &main_limit );
+ // The underflow and overflow limits: MIN_INT <= scale*I+offset < limit
+ add_constraint( stride_con, scale_con, offset, mini, limit, pre_ctrl, &pre_limit, &main_limit );
if (!conditional_rc) {
conditional_rc = !loop->dominates_backedge(iff);
+ // It is also needed if scale*pre_limit+offset >= limit
+ // due to underflow so we need execute pre-loop until
+ // scale*I+offset >= min_int. But (low_limit-offset) will
+ // underflow when offset > 0 and X will be > original_limit.
+ const TypeInt* offset_t = _igvn.type(offset)->is_int();
+ conditional_rc |= RangeLimitCheck && (offset_t->_hi > 0) &&
+ (scale_con>0) && (stride_con>0);
}
break;
default:
@@ -1696,7 +1965,8 @@
// Note:: we are making the main loop limit no longer precise;
// need to round up based on stride.
- if( stride_con != 1 && stride_con != -1 ) { // Cutout for common case
+ cl->set_nonexact_trip_count();
+ if (!LoopLimitCheck && stride_con != 1 && stride_con != -1) { // Cutout for common case
// "Standard" round-up logic: ([main_limit-init+(y-1)]/y)*y+init
// Hopefully, compiler will optimize for powers of 2.
Node *ctrl = get_ctrl(main_limit);
@@ -1876,7 +2146,19 @@
// iteration. Then the CountedLoopEnd will collapse (backedge never
// taken) and all loop-invariant uses of the exit values will be correct.
Node *phi = cl->phi();
- Node *final = new (phase->C, 3) SubINode( cl->limit(), cl->stride() );
+ Node *exact_limit = phase->exact_limit(this);
+ if (exact_limit != cl->limit()) {
+ // We also need to replace the original limit to collapse loop exit.
+ Node* cmp = cl->loopexit()->cmp_node();
+ assert(cl->limit() == cmp->in(2), "sanity");
+ phase->_igvn._worklist.push(cmp->in(2)); // put limit on worklist
+ phase->_igvn.hash_delete(cmp);
+ cmp->set_req(2, exact_limit);
+ phase->_igvn._worklist.push(cmp); // put cmp on worklist
+ }
+ // Note: the final value after increment should not overflow since
+ // counted loop has limit check predicate.
+ Node *final = new (phase->C, 3) SubINode( exact_limit, cl->stride() );
phase->register_new_node(final,cl->in(LoopNode::EntryControl));
phase->_igvn.replace_node(phi,final);
phase->C->set_major_progress();
--- a/hotspot/src/share/vm/opto/loopUnswitch.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/loopUnswitch.cpp Thu May 12 07:28:52 2011 -0700
@@ -130,6 +130,11 @@
Node* uniqc = proj_true->unique_ctrl_out();
Node* entry = head->in(LoopNode::EntryControl);
Node* predicate = find_predicate(entry);
+ if (predicate != NULL && LoopLimitCheck && UseLoopPredicate) {
+ // We may have two predicates, find first.
+ entry = find_predicate(entry->in(0)->in(0));
+ if (entry != NULL) predicate = entry;
+ }
if (predicate != NULL) predicate = predicate->in(0);
assert(proj_true->is_IfTrue() &&
(predicate == NULL && uniqc == head ||
@@ -217,6 +222,7 @@
ProjNode* PhaseIdealLoop::create_slow_version_of_loop(IdealLoopTree *loop,
Node_List &old_new) {
LoopNode* head = loop->_head->as_Loop();
+ bool counted_loop = head->is_CountedLoop();
Node* entry = head->in(LoopNode::EntryControl);
_igvn.hash_delete(entry);
_igvn._worklist.push(entry);
@@ -242,14 +248,14 @@
assert(old_new[head->_idx]->is_Loop(), "" );
// Fast (true) control
- Node* iffast_pred = clone_loop_predicates(entry, iffast);
+ Node* iffast_pred = clone_loop_predicates(entry, iffast, !counted_loop);
_igvn.hash_delete(head);
head->set_req(LoopNode::EntryControl, iffast_pred);
set_idom(head, iffast_pred, dom_depth(head));
_igvn._worklist.push(head);
// Slow (false) control
- Node* ifslow_pred = move_loop_predicates(entry, ifslow);
+ Node* ifslow_pred = move_loop_predicates(entry, ifslow, !counted_loop);
LoopNode* slow_head = old_new[head->_idx]->as_Loop();
_igvn.hash_delete(slow_head);
slow_head->set_req(LoopNode::EntryControl, ifslow_pred);
--- a/hotspot/src/share/vm/opto/loopnode.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/loopnode.cpp Thu May 12 07:28:52 2011 -0700
@@ -206,7 +206,7 @@
// Get backedge compare
Node *cmp = test->in(1);
int cmp_op = cmp->Opcode();
- if( cmp_op != Op_CmpI )
+ if (cmp_op != Op_CmpI)
return false; // Avoid pointer & float compares
// Find the trip-counter increment & limit. Limit must be loop invariant.
@@ -259,7 +259,8 @@
}
// Stride must be constant
int stride_con = stride->get_int();
- assert(stride_con != 0, "missed some peephole opt");
+ if (stride_con == 0)
+ return false; // missed some peephole opt
if (!xphi->is_Phi())
return false; // Too much math on the trip counter
@@ -319,7 +320,7 @@
// Count down loop rolls through MAXINT
(bt == BoolTest::le || bt == BoolTest::lt) && stride_con < 0 ||
// Count up loop rolls through MININT
- (bt == BoolTest::ge || bt == BoolTest::gt) && stride_con > 0 ) {
+ (bt == BoolTest::ge || bt == BoolTest::gt) && stride_con > 0) {
return false; // Bail out
}
@@ -341,12 +342,137 @@
//
assert(x->Opcode() == Op_Loop, "regular loops only");
C->print_method("Before CountedLoop", 3);
+
+ Node *hook = new (C, 6) Node(6);
+
+ if (LoopLimitCheck) {
+
+ // ===================================================
+ // Generate loop limit check to avoid integer overflow
+ // in cases like next (cyclic loops):
+ //
+ // for (i=0; i <= max_jint; i++) {}
+ // for (i=0; i < max_jint; i+=2) {}
+ //
+ //
+ // Limit check predicate depends on the loop test:
+ //
+ // for(;i != limit; i++) --> limit <= (max_jint)
+ // for(;i < limit; i+=stride) --> limit <= (max_jint - stride + 1)
+ // for(;i <= limit; i+=stride) --> limit <= (max_jint - stride )
+ //
+
+ // Check if limit is excluded to do more precise int overflow check.
+ bool incl_limit = (bt == BoolTest::le || bt == BoolTest::ge);
+ int stride_m = stride_con - (incl_limit ? 0 : (stride_con > 0 ? 1 : -1));
+
+ // If compare points directly to the phi we need to adjust
+ // the compare so that it points to the incr. Limit have
+ // to be adjusted to keep trip count the same and the
+ // adjusted limit should be checked for int overflow.
+ if (phi_incr != NULL) {
+ stride_m += stride_con;
+ }
+
+ if (limit->is_Con()) {
+ int limit_con = limit->get_int();
+ if ((stride_con > 0 && limit_con > (max_jint - stride_m)) ||
+ (stride_con < 0 && limit_con < (min_jint - stride_m))) {
+ // Bailout: it could be integer overflow.
+ return false;
+ }
+ } else if ((stride_con > 0 && limit_t->_hi <= (max_jint - stride_m)) ||
+ (stride_con < 0 && limit_t->_lo >= (min_jint - stride_m))) {
+ // Limit's type may satisfy the condition, for example,
+ // when it is an array length.
+ } else {
+ // Generate loop's limit check.
+ // Loop limit check predicate should be near the loop.
+ ProjNode *limit_check_proj = find_predicate_insertion_point(init_control, Deoptimization::Reason_loop_limit_check);
+ if (!limit_check_proj) {
+ // The limit check predicate is not generated if this method trapped here before.
+#ifdef ASSERT
+ if (TraceLoopLimitCheck) {
+ tty->print("missing loop limit check:");
+ loop->dump_head();
+ x->dump(1);
+ }
+#endif
+ return false;
+ }
+
+ IfNode* check_iff = limit_check_proj->in(0)->as_If();
+ Node* cmp_limit;
+ Node* bol;
+
+ if (stride_con > 0) {
+ cmp_limit = new (C, 3) CmpINode(limit, _igvn.intcon(max_jint - stride_m));
+ bol = new (C, 2) BoolNode(cmp_limit, BoolTest::le);
+ } else {
+ cmp_limit = new (C, 3) CmpINode(limit, _igvn.intcon(min_jint - stride_m));
+ bol = new (C, 2) BoolNode(cmp_limit, BoolTest::ge);
+ }
+ cmp_limit = _igvn.register_new_node_with_optimizer(cmp_limit);
+ bol = _igvn.register_new_node_with_optimizer(bol);
+ set_subtree_ctrl(bol);
+
+ // Replace condition in original predicate but preserve Opaque node
+ // so that previous predicates could be found.
+ assert(check_iff->in(1)->Opcode() == Op_Conv2B &&
+ check_iff->in(1)->in(1)->Opcode() == Op_Opaque1, "");
+ Node* opq = check_iff->in(1)->in(1);
+ _igvn.hash_delete(opq);
+ opq->set_req(1, bol);
+ // Update ctrl.
+ set_ctrl(opq, check_iff->in(0));
+ set_ctrl(check_iff->in(1), check_iff->in(0));
+
#ifndef PRODUCT
- if (TraceLoopOpts) {
- tty->print("Counted ");
- loop->dump_head();
+ // report that the loop predication has been actually performed
+ // for this loop
+ if (TraceLoopLimitCheck) {
+ tty->print_cr("Counted Loop Limit Check generated:");
+ debug_only( bol->dump(2); )
+ }
+#endif
+ }
+
+ if (phi_incr != NULL) {
+ // If compare points directly to the phi we need to adjust
+ // the compare so that it points to the incr. Limit have
+ // to be adjusted to keep trip count the same and we
+ // should avoid int overflow.
+ //
+ // i = init; do {} while(i++ < limit);
+ // is converted to
+ // i = init; do {} while(++i < limit+1);
+ //
+ limit = gvn->transform(new (C, 3) AddINode(limit, stride));
}
-#endif
+
+ // Now we need to canonicalize loop condition.
+ if (bt == BoolTest::ne) {
+ assert(stride_con == 1 || stride_con == -1, "simple increment only");
+ bt = (stride_con > 0) ? BoolTest::lt : BoolTest::gt;
+ }
+
+ if (incl_limit) {
+ // The limit check guaranties that 'limit <= (max_jint - stride)' so
+ // we can convert 'i <= limit' to 'i < limit+1' since stride != 0.
+ //
+ Node* one = (stride_con > 0) ? gvn->intcon( 1) : gvn->intcon(-1);
+ limit = gvn->transform(new (C, 3) AddINode(limit, one));
+ if (bt == BoolTest::le)
+ bt = BoolTest::lt;
+ else if (bt == BoolTest::ge)
+ bt = BoolTest::gt;
+ else
+ ShouldNotReachHere();
+ }
+ set_subtree_ctrl( limit );
+
+ } else { // LoopLimitCheck
+
// If compare points to incr, we are ok. Otherwise the compare
// can directly point to the phi; in this case adjust the compare so that
// it points to the incr by adjusting the limit.
@@ -359,7 +485,6 @@
Node *one_m = gvn->intcon(-1);
Node *trip_count = NULL;
- Node *hook = new (C, 6) Node(6);
switch( bt ) {
case BoolTest::eq:
ShouldNotReachHere();
@@ -441,6 +566,8 @@
limit = gvn->transform(new (C, 3) AddINode(span,init_trip));
set_subtree_ctrl( limit );
+ } // LoopLimitCheck
+
// Check for SafePoint on backedge and remove
Node *sfpt = x->in(LoopNode::LoopBackControl);
if (sfpt->Opcode() == Op_SafePoint && is_deleteable_safept(sfpt)) {
@@ -531,7 +658,7 @@
// Check for immediately preceding SafePoint and remove
Node *sfpt2 = le->in(0);
- if( sfpt2->Opcode() == Op_SafePoint && is_deleteable_safept(sfpt2))
+ if (sfpt2->Opcode() == Op_SafePoint && is_deleteable_safept(sfpt2))
lazy_replace( sfpt2, sfpt2->in(TypeFunc::Control));
// Free up intermediate goo
@@ -541,12 +668,56 @@
assert(l->is_valid_counted_loop(), "counted loop shape is messed up");
assert(l == loop->_head && l->phi() == phi && l->loopexit() == lex, "" );
#endif
+#ifndef PRODUCT
+ if (TraceLoopOpts) {
+ tty->print("Counted ");
+ loop->dump_head();
+ }
+#endif
C->print_method("After CountedLoop", 3);
return true;
}
+//----------------------exact_limit-------------------------------------------
+Node* PhaseIdealLoop::exact_limit( IdealLoopTree *loop ) {
+ assert(loop->_head->is_CountedLoop(), "");
+ CountedLoopNode *cl = loop->_head->as_CountedLoop();
+
+ if (!LoopLimitCheck || ABS(cl->stride_con()) == 1 ||
+ cl->limit()->Opcode() == Op_LoopLimit) {
+ // Old code has exact limit (it could be incorrect in case of int overflow).
+ // Loop limit is exact with stride == 1. And loop may already have exact limit.
+ return cl->limit();
+ }
+ Node *limit = NULL;
+#ifdef ASSERT
+ BoolTest::mask bt = cl->loopexit()->test_trip();
+ assert(bt == BoolTest::lt || bt == BoolTest::gt, "canonical test is expected");
+#endif
+ if (cl->has_exact_trip_count()) {
+ // Simple case: loop has constant boundaries.
+ // Use longs to avoid integer overflow.
+ int stride_con = cl->stride_con();
+ long init_con = cl->init_trip()->get_int();
+ long limit_con = cl->limit()->get_int();
+ julong trip_cnt = cl->trip_count();
+ long final_con = init_con + trip_cnt*stride_con;
+ final_con -= stride_con;
+ int final_int = (int)final_con;
+ // The final value should be in integer range since the loop
+ // is counted and the limit was checked for overflow.
+ assert(final_con == (long)final_int, "final value should be integer");
+ limit = _igvn.intcon(final_int);
+ } else {
+ // Create new LoopLimit node to get exact limit (final iv value).
+ limit = new (C, 4) LoopLimitNode(C, cl->init_trip(), cl->limit(), cl->stride());
+ register_new_node(limit, cl->in(LoopNode::EntryControl));
+ }
+ assert(limit != NULL, "sanity");
+ return limit;
+}
//------------------------------Ideal------------------------------------------
// Return a node which is more "ideal" than the current node.
@@ -572,14 +743,12 @@
#ifndef PRODUCT
void CountedLoopNode::dump_spec(outputStream *st) const {
LoopNode::dump_spec(st);
- if( stride_is_con() ) {
+ if (stride_is_con()) {
st->print("stride: %d ",stride_con());
- } else {
- st->print("stride: not constant ");
}
- if( is_pre_loop () ) st->print("pre of N%d" , _main_idx );
- if( is_main_loop() ) st->print("main of N%d", _idx );
- if( is_post_loop() ) st->print("post of N%d", _main_idx );
+ if (is_pre_loop ()) st->print("pre of N%d" , _main_idx);
+ if (is_main_loop()) st->print("main of N%d", _idx);
+ if (is_post_loop()) st->print("post of N%d", _main_idx);
}
#endif
@@ -588,7 +757,130 @@
return stride()->bottom_type()->is_int()->get_con();
}
-
+//=============================================================================
+//------------------------------Value-----------------------------------------
+const Type *LoopLimitNode::Value( PhaseTransform *phase ) const {
+ const Type* init_t = phase->type(in(Init));
+ const Type* limit_t = phase->type(in(Limit));
+ const Type* stride_t = phase->type(in(Stride));
+ // Either input is TOP ==> the result is TOP
+ if (init_t == Type::TOP) return Type::TOP;
+ if (limit_t == Type::TOP) return Type::TOP;
+ if (stride_t == Type::TOP) return Type::TOP;
+
+ int stride_con = stride_t->is_int()->get_con();
+ if (stride_con == 1)
+ return NULL; // Identity
+
+ if (init_t->is_int()->is_con() && limit_t->is_int()->is_con()) {
+ // Use longs to avoid integer overflow.
+ long init_con = init_t->is_int()->get_con();
+ long limit_con = limit_t->is_int()->get_con();
+ int stride_m = stride_con - (stride_con > 0 ? 1 : -1);
+ long trip_count = (limit_con - init_con + stride_m)/stride_con;
+ long final_con = init_con + stride_con*trip_count;
+ int final_int = (int)final_con;
+ // The final value should be in integer range since the loop
+ // is counted and the limit was checked for overflow.
+ assert(final_con == (long)final_int, "final value should be integer");
+ return TypeInt::make(final_int);
+ }
+
+ return bottom_type(); // TypeInt::INT
+}
+
+//------------------------------Ideal------------------------------------------
+// Return a node which is more "ideal" than the current node.
+Node *LoopLimitNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+ if (phase->type(in(Init)) == Type::TOP ||
+ phase->type(in(Limit)) == Type::TOP ||
+ phase->type(in(Stride)) == Type::TOP)
+ return NULL; // Dead
+
+ int stride_con = phase->type(in(Stride))->is_int()->get_con();
+ if (stride_con == 1)
+ return NULL; // Identity
+
+ if (in(Init)->is_Con() && in(Limit)->is_Con())
+ return NULL; // Value
+
+ // Delay following optimizations until all loop optimizations
+ // done to keep Ideal graph simple.
+ if (!can_reshape || phase->C->major_progress())
+ return NULL;
+
+ const TypeInt* init_t = phase->type(in(Init) )->is_int();
+ const TypeInt* limit_t = phase->type(in(Limit))->is_int();
+ int stride_p;
+ long lim, ini;
+ julong max;
+ if (stride_con > 0) {
+ stride_p = stride_con;
+ lim = limit_t->_hi;
+ ini = init_t->_lo;
+ max = (julong)max_jint;
+ } else {
+ stride_p = -stride_con;
+ lim = init_t->_hi;
+ ini = limit_t->_lo;
+ max = (julong)min_jint;
+ }
+ julong range = lim - ini + stride_p;
+ if (range <= max) {
+ // Convert to integer expression if it is not overflow.
+ Node* stride_m = phase->intcon(stride_con - (stride_con > 0 ? 1 : -1));
+ Node *range = phase->transform(new (phase->C, 3) SubINode(in(Limit), in(Init)));
+ Node *bias = phase->transform(new (phase->C, 3) AddINode(range, stride_m));
+ Node *trip = phase->transform(new (phase->C, 3) DivINode(0, bias, in(Stride)));
+ Node *span = phase->transform(new (phase->C, 3) MulINode(trip, in(Stride)));
+ return new (phase->C, 3) AddINode(span, in(Init)); // exact limit
+ }
+
+ if (is_power_of_2(stride_p) || // divisor is 2^n
+ !Matcher::has_match_rule(Op_LoopLimit)) { // or no specialized Mach node?
+ // Convert to long expression to avoid integer overflow
+ // and let igvn optimizer convert this division.
+ //
+ Node* init = phase->transform( new (phase->C, 2) ConvI2LNode(in(Init)));
+ Node* limit = phase->transform( new (phase->C, 2) ConvI2LNode(in(Limit)));
+ Node* stride = phase->longcon(stride_con);
+ Node* stride_m = phase->longcon(stride_con - (stride_con > 0 ? 1 : -1));
+
+ Node *range = phase->transform(new (phase->C, 3) SubLNode(limit, init));
+ Node *bias = phase->transform(new (phase->C, 3) AddLNode(range, stride_m));
+ Node *span;
+ if (stride_con > 0 && is_power_of_2(stride_p)) {
+ // bias >= 0 if stride >0, so if stride is 2^n we can use &(-stride)
+ // and avoid generating rounding for division. Zero trip guard should
+ // guarantee that init < limit but sometimes the guard is missing and
+ // we can get situation when init > limit. Note, for the empty loop
+ // optimization zero trip guard is generated explicitly which leaves
+ // only RCE predicate where exact limit is used and the predicate
+ // will simply fail forcing recompilation.
+ Node* neg_stride = phase->longcon(-stride_con);
+ span = phase->transform(new (phase->C, 3) AndLNode(bias, neg_stride));
+ } else {
+ Node *trip = phase->transform(new (phase->C, 3) DivLNode(0, bias, stride));
+ span = phase->transform(new (phase->C, 3) MulLNode(trip, stride));
+ }
+ // Convert back to int
+ Node *span_int = phase->transform(new (phase->C, 2) ConvL2INode(span));
+ return new (phase->C, 3) AddINode(span_int, in(Init)); // exact limit
+ }
+
+ return NULL; // No progress
+}
+
+//------------------------------Identity---------------------------------------
+// If stride == 1 return limit node.
+Node *LoopLimitNode::Identity( PhaseTransform *phase ) {
+ int stride_con = phase->type(in(Stride))->is_int()->get_con();
+ if (stride_con == 1 || stride_con == -1)
+ return in(Limit);
+ return this;
+}
+
+//=============================================================================
//----------------------match_incr_with_optional_truncation--------------------
// Match increment with optional truncation:
// CHAR: (i+1)&0x7fff, BYTE: ((i+1)<<8)>>8, or SHORT: ((i+1)<<16)>>16
@@ -870,7 +1162,7 @@
outer = igvn.register_new_node_with_optimizer(outer, _head);
phase->set_created_loop_node();
- Node* pred = phase->clone_loop_predicates(ctl, outer);
+ Node* pred = phase->clone_loop_predicates(ctl, outer, true);
// Outermost loop falls into '_head' loop
_head->set_req(LoopNode::EntryControl, pred);
_head->del_req(outer_idx);
@@ -1440,9 +1732,16 @@
tty->print(" ");
tty->print("Loop: N%d/N%d ",_head->_idx,_tail->_idx);
if (_irreducible) tty->print(" IRREDUCIBLE");
+ Node* entry = _head->in(LoopNode::EntryControl);
+ if (LoopLimitCheck) {
+ Node* predicate = PhaseIdealLoop::find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
+ if (predicate != NULL ) {
+ tty->print(" limit_check");
+ entry = entry->in(0)->in(0);
+ }
+ }
if (UseLoopPredicate) {
- Node* entry = PhaseIdealLoop::find_predicate_insertion_point(_head->in(LoopNode::EntryControl),
- Deoptimization::Reason_predicate);
+ entry = PhaseIdealLoop::find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (entry != NULL) {
tty->print(" predicated");
}
@@ -1528,10 +1827,15 @@
!loop->tail()->is_top()) {
LoopNode* lpn = loop->_head->as_Loop();
Node* entry = lpn->in(LoopNode::EntryControl);
- Node* predicate_proj = find_predicate(entry);
+ Node* predicate_proj = find_predicate(entry); // loop_limit_check first
if (predicate_proj != NULL ) { // right pattern that can be used by loop predication
assert(entry->in(0)->in(1)->in(1)->Opcode() == Op_Opaque1, "must be");
useful_predicates.push(entry->in(0)->in(1)->in(1)); // good one
+ entry = entry->in(0)->in(0);
+ }
+ predicate_proj = find_predicate(entry); // Predicate
+ if (predicate_proj != NULL ) {
+ useful_predicates.push(entry->in(0)->in(1)->in(1)); // good one
}
}
@@ -1542,6 +1846,8 @@
//------------------------eliminate_useless_predicates-----------------------------
// Eliminate all inserted predicates if they could not be used by loop predication.
+// Note: it will also eliminates loop limits check predicate since it also uses
+// Opaque1 node (see Parse::add_predicate()).
void PhaseIdealLoop::eliminate_useless_predicates() {
if (C->predicate_count() == 0)
return; // no predicate left
@@ -1731,7 +2037,7 @@
// Some parser-inserted loop predicates could never be used by loop
// predication or they were moved away from loop during some optimizations.
// For example, peeling. Eliminate them before next loop optimizations.
- if (UseLoopPredicate) {
+ if (UseLoopPredicate || LoopLimitCheck) {
eliminate_useless_predicates();
}
--- a/hotspot/src/share/vm/opto/loopnode.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/loopnode.hpp Thu May 12 07:28:52 2011 -0700
@@ -289,6 +289,28 @@
inline Node *CountedLoopNode::incr() const { return loopexit() ? loopexit()->incr() : NULL; }
inline Node *CountedLoopNode::phi() const { return loopexit() ? loopexit()->phi() : NULL; }
+//------------------------------LoopLimitNode-----------------------------
+// Counted Loop limit node which represents exact final iterator value:
+// trip_count = (limit - init_trip + stride - 1)/stride
+// final_value= trip_count * stride + init_trip.
+// Use HW instructions to calculate it when it can overflow in integer.
+// Note, final_value should fit into integer since counted loop has
+// limit check: limit <= max_int-stride.
+class LoopLimitNode : public Node {
+ enum { Init=1, Limit=2, Stride=3 };
+ public:
+ LoopLimitNode( Compile* C, Node *init, Node *limit, Node *stride ) : Node(0,init,limit,stride) {
+ // Put it on the Macro nodes list to optimize during macro nodes expansion.
+ init_flags(Flag_is_macro);
+ C->add_macro_node(this);
+ }
+ virtual int Opcode() const;
+ virtual const Type *bottom_type() const { return TypeInt::INT; }
+ virtual uint ideal_reg() const { return Op_RegI; }
+ virtual const Type *Value( PhaseTransform *phase ) const;
+ virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual Node *Identity( PhaseTransform *phase );
+};
// -----------------------------IdealLoopTree----------------------------------
class IdealLoopTree : public ResourceObj {
@@ -775,6 +797,8 @@
bool is_counted_loop( Node *x, IdealLoopTree *loop );
+ Node* exact_limit( IdealLoopTree *loop );
+
// Return a post-walked LoopNode
IdealLoopTree *get_loop( Node *n ) const {
// Dead nodes have no loop, so return the top level loop instead
@@ -837,7 +861,6 @@
bool is_scaled_iv_plus_offset(Node* exp, Node* iv, int* p_scale, Node** p_offset, int depth = 0);
// Return true if proj is for "proj->[region->..]call_uct"
- // Return true if proj is for "proj->[region->..]call_uct"
static bool is_uncommon_trap_proj(ProjNode* proj, Deoptimization::DeoptReason reason);
// Return true for "if(test)-> proj -> ...
// |
@@ -860,10 +883,11 @@
PhaseIterGVN* igvn);
static Node* clone_loop_predicates(Node* old_entry, Node* new_entry,
bool move_predicates,
+ bool clone_limit_check,
PhaseIdealLoop* loop_phase,
PhaseIterGVN* igvn);
- Node* clone_loop_predicates(Node* old_entry, Node* new_entry);
- Node* move_loop_predicates(Node* old_entry, Node* new_entry);
+ Node* clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
+ Node* move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
void eliminate_loop_predicates(Node* entry);
static Node* skip_loop_predicates(Node* entry);
@@ -873,7 +897,7 @@
// Find a predicate
static Node* find_predicate(Node* entry);
// Construct a range check for a predicate if
- BoolNode* rc_predicate(Node* ctrl,
+ BoolNode* rc_predicate(IdealLoopTree *loop, Node* ctrl,
int scale, Node* offset,
Node* init, Node* limit, Node* stride,
Node* range, bool upper);
@@ -903,11 +927,11 @@
// Range Check Elimination uses this function!
// Constrain the main loop iterations so the affine function:
- // scale_con * I + offset < limit
+ // low_limit <= scale_con * I + offset < upper_limit
// always holds true. That is, either increase the number of iterations in
// the pre-loop or the post-loop until the condition holds true in the main
// loop. Scale_con, offset and limit are all loop invariant.
- void add_constraint( int stride_con, int scale_con, Node *offset, Node *limit, Node *pre_ctrl, Node **pre_limit, Node **main_limit );
+ void add_constraint( int stride_con, int scale_con, Node *offset, Node *low_limit, Node *upper_limit, Node *pre_ctrl, Node **pre_limit, Node **main_limit );
// Partially peel loop up through last_peel node.
bool partial_peel( IdealLoopTree *loop, Node_List &old_new );
--- a/hotspot/src/share/vm/opto/macro.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/macro.cpp Thu May 12 07:28:52 2011 -0700
@@ -2154,6 +2154,11 @@
debug_only(int old_macro_count = C->macro_count(););
if (n->is_AbstractLock()) {
success = eliminate_locking_node(n->as_AbstractLock());
+ } else if (n->Opcode() == Op_LoopLimit) {
+ // Remove it from macro list and put on IGVN worklist to optimize.
+ C->remove_macro_node(n);
+ _igvn._worklist.push(n);
+ success = true;
} else if (n->Opcode() == Op_Opaque1 || n->Opcode() == Op_Opaque2) {
_igvn.replace_node(n, n->in(1));
success = true;
--- a/hotspot/src/share/vm/opto/matcher.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/matcher.cpp Thu May 12 07:28:52 2011 -0700
@@ -2086,6 +2086,13 @@
n->del_req(3);
break;
}
+ case Op_LoopLimit: {
+ Node *pair1 = new (C, 3) BinaryNode(n->in(1),n->in(2));
+ n->set_req(1,pair1);
+ n->set_req(2,n->in(3));
+ n->del_req(3);
+ break;
+ }
case Op_StrEquals: {
Node *pair1 = new (C, 3) BinaryNode(n->in(2),n->in(3));
n->set_req(2,pair1);
--- a/hotspot/src/share/vm/opto/parse.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/parse.hpp Thu May 12 07:28:52 2011 -0700
@@ -70,7 +70,7 @@
const char* try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result);
const char* shouldInline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) const;
const char* shouldNotInline(ciMethod* callee_method, ciMethod* caller_method, WarmCallInfo* wci_result) const;
- void print_inlining(ciMethod *callee_method, int caller_bci, const char *failure_msg) const PRODUCT_RETURN;
+ void print_inlining(ciMethod *callee_method, int caller_bci, const char *failure_msg) const;
InlineTree *caller_tree() const { return _caller_tree; }
InlineTree* callee_at(int bci, ciMethod* m) const;
--- a/hotspot/src/share/vm/opto/parse1.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/parse1.cpp Thu May 12 07:28:52 2011 -0700
@@ -638,7 +638,7 @@
ensure_phis_everywhere();
if (block->is_SEL_head() &&
- UseLoopPredicate) {
+ (UseLoopPredicate || LoopLimitCheck)) {
// Add predicate to single entry (not irreducible) loop head.
assert(!block->has_merged_backedge(), "only entry paths should be merged for now");
// Need correct bci for predicate.
--- a/hotspot/src/share/vm/opto/phaseX.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/phaseX.hpp Thu May 12 07:28:52 2011 -0700
@@ -472,8 +472,8 @@
}
// Clone loop predicates. Defined in loopTransform.cpp.
- Node* clone_loop_predicates(Node* old_entry, Node* new_entry);
- Node* move_loop_predicates(Node* old_entry, Node* new_entry);
+ Node* clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
+ Node* move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
// Create a new if below new_entry for the predicate to be cloned
ProjNode* create_new_if_for_predicate(ProjNode* cont_proj, Node* new_entry,
Deoptimization::DeoptReason reason);
--- a/hotspot/src/share/vm/opto/subnode.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/subnode.cpp Thu May 12 07:28:52 2011 -0700
@@ -1223,21 +1223,6 @@
}
//=============================================================================
-//------------------------------NegNode----------------------------------------
-Node *NegFNode::Ideal(PhaseGVN *phase, bool can_reshape) {
- if( in(1)->Opcode() == Op_SubF )
- return new (phase->C, 3) SubFNode( in(1)->in(2), in(1)->in(1) );
- return NULL;
-}
-
-Node *NegDNode::Ideal(PhaseGVN *phase, bool can_reshape) {
- if( in(1)->Opcode() == Op_SubD )
- return new (phase->C, 3) SubDNode( in(1)->in(2), in(1)->in(1) );
- return NULL;
-}
-
-
-//=============================================================================
//------------------------------Value------------------------------------------
// Compute sqrt
const Type *SqrtDNode::Value( PhaseTransform *phase ) const {
--- a/hotspot/src/share/vm/opto/subnode.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/opto/subnode.hpp Thu May 12 07:28:52 2011 -0700
@@ -377,7 +377,6 @@
public:
NegFNode( Node *in1 ) : NegNode(in1) {}
virtual int Opcode() const;
- virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
const Type *bottom_type() const { return Type::FLOAT; }
virtual uint ideal_reg() const { return Op_RegF; }
};
@@ -391,7 +390,6 @@
public:
NegDNode( Node *in1 ) : NegNode(in1) {}
virtual int Opcode() const;
- virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
const Type *bottom_type() const { return Type::DOUBLE; }
virtual uint ideal_reg() const { return Op_RegD; }
};
--- a/hotspot/src/share/vm/prims/jvmti.xml Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/prims/jvmti.xml Thu May 12 07:28:52 2011 -0700
@@ -280,10 +280,8 @@
<!ELEMENT externallink (#PCDATA|jvmti|code|i|b|tm)*>
<!ATTLIST externallink id CDATA #REQUIRED>
- <!ELEMENT vmspeclink EMPTY>
- <!ATTLIST vmspeclink id CDATA #IMPLIED>
- <!ATTLIST vmspeclink name CDATA #IMPLIED>
- <!ATTLIST vmspeclink preposition CDATA #IMPLIED>
+ <!ELEMENT vmspec EMPTY>
+ <!ATTLIST vmspec chapter CDATA #IMPLIED>
<!ELEMENT internallink (#PCDATA|jvmti|code|i|b)*>
<!ATTLIST internallink id CDATA #REQUIRED>
@@ -2285,9 +2283,8 @@
Stack frames are referenced by depth.
The frame at depth zero is the current frame.
<p/>
- Stack frames are as described in the
- <vmspeclink id="Overview.doc.html#17257"
- name="Frames section"/>.
+ Stack frames are as described in
+ <vmspec chapter="3.6"/>,
That is, they correspond to method
invocations (including native methods) but do not correspond to platform native or
VM internal frames.
@@ -2627,7 +2624,7 @@
<param id="use_java_stack">
<jboolean/>
<description>
- Return the stack showing the <vmspeclink/>
+ Return the stack showing <vmspec/>
model of the stack;
otherwise, show the internal representation of the stack with
inlined and optimized methods missing. If the virtual machine
@@ -2707,7 +2704,7 @@
When the thread is resumed, the execution
state of the thread is reset to the state
immediately before the called method was invoked.
- That is (using the <vmspeclink/> terminology):
+ That is (using <vmspec/> terminology):
<ul>
<li>the current frame is discarded as the previous frame becomes the current one</li>
<li>the operand stack is restored--the argument values are added back
@@ -2868,9 +2865,8 @@
to return at any point during its execution.
The method which will return early is referred to as the <i>called method</i>.
The called method is the current method
- (as defined by the
- <vmspeclink id="Overview.doc.html#17257"
- name="Frames section"/>)
+ (as defined by
+ <vmspec chapter="3.6"/>)
for the specified thread at
the time the function is called.
<p/>
@@ -3576,10 +3572,8 @@
<field id="index">
<jint/>
<description>
- The index into the constant pool of the class. See the
- <vmspeclink id="ClassFile.doc.html#20080"
- name="Constant Pool section"/>
- description.
+ The index into the constant pool of the class. See the description in
+ <vmspec chapter="4.4"/>.
</description>
</field>
</typedef>
@@ -5006,9 +5000,8 @@
For references of this kind the <code>referrer_index</code>
parameter to the <internallink id="jvmtiObjectReferenceCallback">
jvmtiObjectReferenceCallback</internallink> is the index into
- constant pool table of the class, starting at 1. See the
- <vmspeclink id="ClassFile.doc.html#20080"
- name="Constant Pool section"/>
+ constant pool table of the class, starting at 1. See
+ <vmspec chapter="4.4"/>.
</constant>
</constants>
@@ -6441,9 +6434,7 @@
been recorded as an initiating loader. Each
class in the returned array was created by this class loader,
either by defining it directly or by delegation to another class loader.
- See the
- <vmspeclink id="ConstantPool.doc.html#72007"
- name="Creation and Loading section"/>.
+ See <vmspec chapter="5.3"/>.
<p/>
For JDK version 1.1 implementations that don't
recognize the distinction between initiating and defining class loaders,
@@ -6626,9 +6617,7 @@
For the class indicated by <code>klass</code>, return the access
flags
via <code>modifiers_ptr</code>.
- Access flags are defined in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format chapter"/>.
+ Access flags are defined in <vmspec chapter="4"/>.
<p/>
If the class is an array class, then its public, private, and protected
modifiers are the same as those of its component type. For arrays of
@@ -6794,9 +6783,8 @@
<description>
For the class indicated by <code>klass</code>,
return the minor and major version numbers,
- as defined in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format chapter"/>.
+ as defined in
+ <vmspec chapter="4"/>.
</description>
<origin>new</origin>
<capabilities>
@@ -6839,10 +6827,8 @@
<description>
For the class indicated by <code>klass</code>,
return the raw bytes of the constant pool in the format of the
- <code>constant_pool</code> item of the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format"
- preposition="in"/>.
+ <code>constant_pool</code> item of
+ <vmspec chapter="4"/>.
The format of the constant pool may differ between versions
of the Class File Format, so, the
<functionlink id="GetClassVersionNumbers">minor and major
@@ -7286,9 +7272,7 @@
<field id="class_bytes">
<inbuf incount="class_byte_count"><uchar/></inbuf>
<description>
- Bytes defining class (in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format"/>)
+ Bytes defining class (in <vmspec chapter="4"/>)
</description>
</field>
</typedef>
@@ -7611,10 +7595,8 @@
<paramlink id="signature_ptr"/>.
<p/>
Field signatures are defined in the JNI Specification and
- are referred to as
- <vmspeclink id="ClassFile.doc.html#14152"
- name="field descriptors"
- preposition="in"/>.
+ are referred to as <code>field descriptors</code> in
+ <vmspec chapter="4.3.2"/>.
</description>
<origin>jvmdiClone</origin>
<capabilities>
@@ -7709,9 +7691,7 @@
<description>
For the field indicated by <code>klass</code> and <code>field</code>
return the access flags via <code>modifiers_ptr</code>.
- Access flags are defined in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format chapter"/>.
+ Access flags are defined in <vmspec chapter="4"/>.
</description>
<origin>jvmdi</origin>
<capabilities>
@@ -7810,10 +7790,9 @@
return the method name via <code>name_ptr</code> and method signature via
<code>signature_ptr</code>.
<p/>
- Method signatures are defined in the JNI Specification and are referred to as
- <vmspeclink id="ClassFile.doc.html#7035"
- name="method descriptors"
- preposition="in"/>.
+ Method signatures are defined in the JNI Specification and are
+ referred to as <code>method descriptors</code> in
+ <vmspec chapter="4.3.3"/>.
Note this is different
than method signatures as defined in the <i>Java Language Specification</i>.
</description>
@@ -7902,9 +7881,7 @@
<description>
For the method indicated by <code>method</code>,
return the access flags via <code>modifiers_ptr</code>.
- Access flags are defined in the
- <vmspeclink id="ClassFile.doc.html"
- name="Class File Format chapter"/>.
+ Access flags are defined in <vmspec chapter="4"/>.
</description>
<origin>jvmdi</origin>
<capabilities>
@@ -7941,9 +7918,7 @@
including the local variables used to pass parameters to the
method on its invocation.
<p/>
- See <code>max_locals</code> in the
- <vmspeclink id="ClassFile.doc.html#1546"
- name="Code Attribute section"/>.
+ See <code>max_locals</code> in <vmspec chapter="4.7.3"/>.
</description>
<origin>jvmdi</origin>
<capabilities>
@@ -8150,8 +8125,7 @@
The local variable's type signature, encoded as a
<internallink id="mUTF">modified UTF-8</internallink> string.
The signature format is the same as that defined in
- <vmspeclink id="ClassFile.doc.html#14152"
- name="Field Descriptors section"/>
+ <vmspec chapter="4.3.2"/>.
</description>
</field>
<field id="generic_signature">
@@ -10460,10 +10434,7 @@
<synopsis>Add To Bootstrap Class Loader Search</synopsis>
<description>
This function can be used to cause instrumentation classes to be defined by the
- bootstrap class loader. See
- <vmspeclink id="ConstantPool.doc.html#79383"
- name="Loading Using the Bootstrap Class Loader"
- preposition="in"/>.
+ bootstrap class loader. See <vmspec chapter="5.3.1"/>.
After the bootstrap
class loader unsuccessfully searches for a class, the specified platform-dependent
search path <paramlink id="segment"/> will be searched as well. Only one segment may be specified in
@@ -10480,7 +10451,7 @@
contain any classes or resources other than those to be defined by the bootstrap
class loader for the purposes of instrumentation.
<p/>
- The <vmspeclink/> specifies that a subsequent attempt to resolve a symbolic
+ <vmspec/> specifies that a subsequent attempt to resolve a symbolic
reference that the Java virtual machine has previously unsuccessfully attempted
to resolve always fails with the same error that was thrown as a result of the
initial resolution attempt. Consequently, if the JAR file contains an entry
@@ -10512,10 +10483,7 @@
<synopsis>Add To System Class Loader Search</synopsis>
<description>
This function can be used to cause instrumentation classes to be
- defined by the system class loader. See
- <vmspeclink id="ConstantPool.doc.html#79441"
- name="Loading Using a User-defined Class Loader"
- preposition="in"/>.
+ defined by the system class loader. See <vmspec chapter="5.3.2"/>.
After the class loader unsuccessfully searches for a class, the specified platform-dependent search
path <paramlink id="segment"/> will be searched as well. Only one segment may be specified in the
<paramlink id="segment"/>. This function may be called multiple times to add multiple segments, the
@@ -10536,7 +10504,7 @@
which takes a single parameter of type <code>java.lang.String</code>. The method is not required
to have <code>public</code> access.
<p/>
- The <vmspeclink/> specifies that a subsequent attempt to resolve a symbolic
+ <vmspec/> specifies that a subsequent attempt to resolve a symbolic
reference that the Java virtual machine has previously unsuccessfully attempted
to resolve always fails with the same error that was thrown as a result of the
initial resolution attempt. Consequently, if the JAR file contains an entry
@@ -11438,7 +11406,7 @@
at the finest granularity allowed by the VM. A single step event is
generated whenever a thread reaches a new location.
Typically, single step events represent the completion of one VM
- instruction as defined in the <vmspeclink/>. However, some implementations
+ instruction as defined in <vmspec/>. However, some implementations
may define locations differently. In any case the
<code>method</code> and <code>location</code>
parameters uniquely identify the current location and allow
@@ -13841,7 +13809,7 @@
and can_get_source_debug_extension.
PopFrame cannot have a native calling method.
Removed incorrect statement in GetClassloaderClasses
- (see http://java.sun.com/docs/books/vmspec/2nd-edition/html/ConstantPool.doc.html#79383).
+ (see <vmspec chapter="4.4"/>).
</change>
<change date="24 July 2003" version="v79">
XML and text fixes.
--- a/hotspot/src/share/vm/prims/jvmti.xsl Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/prims/jvmti.xsl Thu May 12 07:28:52 2011 -0700
@@ -1039,34 +1039,14 @@
</a>
</xsl:template>
-<xsl:template match="vmspeclink">
- <xsl:if test="count(@id)=1">
- <a>
- <xsl:attribute name="href">
- <xsl:text>http://java.sun.com/docs/books/vmspec/2nd-edition/html/</xsl:text>
- <xsl:value-of select="@id"/>
- </xsl:attribute>
- <xsl:value-of select="@name"/>
- </a>
- <xsl:text> </xsl:text>
- <xsl:choose>
- <xsl:when test="count(@preposition)=1">
- <xsl:value-of select="@preposition"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>of</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text> the </xsl:text>
- </xsl:if>
- <a>
- <xsl:attribute name="href">
- <xsl:text>http://java.sun.com/docs/books/vmspec/</xsl:text>
- </xsl:attribute>
- <i>
- <xsl:text>Java Virtual Machine Specification</xsl:text>
- </i>
- </a>
+<xsl:template match="vmspec">
+ <cite>
+ <xsl:text>The Java™ Virtual Machine Specification</xsl:text>
+ <xsl:if test="count(@chapter)=1">
+ <xsl:text>, Chapter </xsl:text>
+ <xsl:value-of select="@chapter"/>
+ </xsl:if>
+ </cite>
</xsl:template>
<xsl:template match="internallink">
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp Thu May 12 07:28:52 2011 -0700
@@ -1804,6 +1804,8 @@
}
void JvmtiExport::post_dynamic_code_generated_internal(const char *name, const void *code_begin, const void *code_end) {
+ assert(name != NULL && name[0] != '\0', "sanity check");
+
JavaThread* thread = JavaThread::current();
// In theory everyone coming thru here is in_vm but we need to be certain
// because a callee will do a vm->native transition
--- a/hotspot/src/share/vm/prims/jvmtiImpl.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.cpp Thu May 12 07:28:52 2011 -0700
@@ -38,6 +38,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/javaCalls.hpp"
+#include "runtime/os.hpp"
#include "runtime/serviceThread.hpp"
#include "runtime/signature.hpp"
#include "runtime/vframe.hpp"
@@ -939,10 +940,15 @@
nmethodLocker::lock_nmethod(nm, true /* zombie_ok */);
return event;
}
+
JvmtiDeferredEvent JvmtiDeferredEvent::dynamic_code_generated_event(
const char* name, const void* code_begin, const void* code_end) {
JvmtiDeferredEvent event = JvmtiDeferredEvent(TYPE_DYNAMIC_CODE_GENERATED);
- event._event_data.dynamic_code_generated.name = name;
+ // Need to make a copy of the name since we don't know how long
+ // the event poster will keep it around after we enqueue the
+ // deferred event and return. strdup() failure is handled in
+ // the post() routine below.
+ event._event_data.dynamic_code_generated.name = os::strdup(name);
event._event_data.dynamic_code_generated.code_begin = code_begin;
event._event_data.dynamic_code_generated.code_end = code_end;
return event;
@@ -968,12 +974,19 @@
nmethodLocker::unlock_nmethod(nm);
break;
}
- case TYPE_DYNAMIC_CODE_GENERATED:
+ case TYPE_DYNAMIC_CODE_GENERATED: {
JvmtiExport::post_dynamic_code_generated_internal(
- _event_data.dynamic_code_generated.name,
+ // if strdup failed give the event a default name
+ (_event_data.dynamic_code_generated.name == NULL)
+ ? "unknown_code" : _event_data.dynamic_code_generated.name,
_event_data.dynamic_code_generated.code_begin,
_event_data.dynamic_code_generated.code_end);
+ if (_event_data.dynamic_code_generated.name != NULL) {
+ // release our copy
+ os::free((void *)_event_data.dynamic_code_generated.name);
+ }
break;
+ }
default:
ShouldNotReachHere();
}
--- a/hotspot/src/share/vm/runtime/arguments.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Thu May 12 07:28:52 2011 -0700
@@ -960,7 +960,7 @@
// Ensure Agent_OnLoad has the correct initial values.
// This may not be the final mode; mode may change later in onload phase.
PropertyList_unique_add(&_system_properties, "java.vm.info",
- (char*)Abstract_VM_Version::vm_info_string(), false);
+ (char*)VM_Version::vm_info_string(), false);
UseInterpreter = true;
UseCompiler = true;
@@ -969,10 +969,10 @@
#ifndef ZERO
// Turn these off for mixed and comp. Leave them on for Zero.
if (FLAG_IS_DEFAULT(UseFastAccessorMethods)) {
- UseFastAccessorMethods = mode == _int;
+ UseFastAccessorMethods = (mode == _int);
}
if (FLAG_IS_DEFAULT(UseFastEmptyMethods)) {
- UseFastEmptyMethods = mode == _int;
+ UseFastEmptyMethods = (mode == _int);
}
#endif
@@ -1423,6 +1423,11 @@
}
}
}
+ if (UseNUMA) {
+ if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
+ FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
+ }
+ }
}
void Arguments::set_g1_gc_flags() {
@@ -1987,6 +1992,9 @@
Arguments::_ClipInlining = ClipInlining;
Arguments::_BackgroundCompilation = BackgroundCompilation;
+ // Setup flags for mixed which is the default
+ set_mode_flags(_mixed);
+
// Parse JAVA_TOOL_OPTIONS environment variable (if present)
jint result = parse_java_tool_options_environment_variable(&scp, &scp_assembly_required);
if (result != JNI_OK) {
@@ -2376,7 +2384,6 @@
_gc_log_filename = strdup(tail);
FLAG_SET_CMDLINE(bool, PrintGC, true);
FLAG_SET_CMDLINE(bool, PrintGCTimeStamps, true);
- FLAG_SET_CMDLINE(bool, TraceClassUnloading, true);
// JNI hooks
} else if (match_option(option, "-Xcheck", &tail)) {
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp Thu May 12 07:28:52 2011 -0700
@@ -189,6 +189,10 @@
assert(thread->deopt_nmethod() == NULL, "Pending deopt!");
thread->set_deopt_nmethod(deoptee.cb()->as_nmethod_or_null());
+ if (VerifyStack) {
+ thread->validate_frame_layout();
+ }
+
// Create a growable array of VFrames where each VFrame represents an inlined
// Java frame. This storage is allocated with the usual system arena.
assert(deoptee.is_compiled_frame(), "Wrong frame type");
@@ -421,6 +425,21 @@
frame deopt_sender = stub_frame.sender(&dummy_map); // First is the deoptee frame
deopt_sender = deopt_sender.sender(&dummy_map); // Now deoptee caller
+ // It's possible that the number of paramters at the call site is
+ // different than number of arguments in the callee when method
+ // handles are used. If the caller is interpreted get the real
+ // value so that the proper amount of space can be added to it's
+ // frame.
+ int sender_callee_parameters = callee_parameters;
+ if (deopt_sender.is_interpreted_frame()) {
+ methodHandle method = deopt_sender.interpreter_frame_method();
+ Bytecode_invoke cur = Bytecode_invoke_check(method,
+ deopt_sender.interpreter_frame_bci());
+ Symbol* signature = method->constants()->signature_ref_at(cur.index());
+ ArgumentSizeComputer asc(signature);
+ sender_callee_parameters = asc.size() + (cur.has_receiver() ? 1 : 0);
+ }
+
// Compute the amount the oldest interpreter frame will have to adjust
// its caller's stack by. If the caller is a compiled frame then
// we pretend that the callee has no parameters so that the
@@ -435,14 +454,13 @@
if (deopt_sender.is_compiled_frame()) {
caller_adjustment = last_frame_adjust(0, callee_locals);
- } else if (callee_locals > callee_parameters) {
+ } else if (callee_locals > sender_callee_parameters) {
// The caller frame may need extending to accommodate
// non-parameter locals of the first unpacked interpreted frame.
// Compute that adjustment.
- caller_adjustment = last_frame_adjust(callee_parameters, callee_locals);
+ caller_adjustment = last_frame_adjust(sender_callee_parameters, callee_locals);
}
-
// If the sender is deoptimized the we must retrieve the address of the handler
// since the frame will "magically" show the original pc before the deopt
// and we'd undo the deopt.
@@ -569,6 +587,8 @@
if (VerifyStack) {
ResourceMark res_mark;
+ thread->validate_frame_layout();
+
// Verify that the just-unpacked frames match the interpreter's
// notions of expression stack and locals
vframeArray* cur_array = thread->vframe_array_last();
@@ -1753,7 +1773,8 @@
"constraint",
"div0_check",
"age",
- "predicate"
+ "predicate",
+ "loop_limit_check"
};
const char* Deoptimization::_trap_action_name[Action_LIMIT] = {
// Note: Keep this in sync. with enum DeoptAction.
--- a/hotspot/src/share/vm/runtime/deoptimization.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/deoptimization.hpp Thu May 12 07:28:52 2011 -0700
@@ -56,6 +56,7 @@
Reason_div0_check, // a null_check due to division by zero
Reason_age, // nmethod too old; tier threshold reached
Reason_predicate, // compiler generated predicate failed
+ Reason_loop_limit_check, // compiler generated loop limits check failed
Reason_LIMIT,
// Note: Keep this enum in sync. with _trap_reason_name.
Reason_RECORDED_LIMIT = Reason_bimorphic // some are not recorded per bc
@@ -78,7 +79,7 @@
enum {
_action_bits = 3,
- _reason_bits = 4,
+ _reason_bits = 5,
_action_shift = 0,
_reason_shift = _action_shift+_action_bits,
BC_CASE_LIMIT = PRODUCT_ONLY(1) NOT_PRODUCT(4) // for _deoptimization_hist
--- a/hotspot/src/share/vm/runtime/frame.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/frame.cpp Thu May 12 07:28:52 2011 -0700
@@ -1308,6 +1308,72 @@
guarantee((current - low_mark) % monitor_size == 0 , "Misaligned bottom of BasicObjectLock*");
guarantee( current >= low_mark , "Current BasicObjectLock* below than low_mark");
}
+
+
+void frame::describe(FrameValues& values, int frame_no) {
+ if (is_entry_frame() || is_compiled_frame() || is_interpreted_frame() || is_native_frame()) {
+ // Label values common to most frames
+ values.describe(-1, unextended_sp(), err_msg("unextended_sp for #%d", frame_no));
+ values.describe(-1, sp(), err_msg("sp for #%d", frame_no));
+ values.describe(-1, fp(), err_msg("fp for #%d", frame_no));
+ }
+ if (is_interpreted_frame()) {
+ methodOop m = interpreter_frame_method();
+ int bci = interpreter_frame_bci();
+
+ // Label the method and current bci
+ values.describe(-1, MAX2(sp(), fp()),
+ FormatBuffer<1024>("#%d method %s @ %d", frame_no, m->name_and_sig_as_C_string(), bci), 2);
+ values.describe(-1, MAX2(sp(), fp()),
+ err_msg("- %d locals %d max stack", m->max_locals(), m->max_stack()), 1);
+ if (m->max_locals() > 0) {
+ intptr_t* l0 = interpreter_frame_local_at(0);
+ intptr_t* ln = interpreter_frame_local_at(m->max_locals() - 1);
+ values.describe(-1, MAX2(l0, ln), err_msg("locals for #%d", frame_no), 1);
+ // Report each local and mark as owned by this frame
+ for (int l = 0; l < m->max_locals(); l++) {
+ intptr_t* l0 = interpreter_frame_local_at(l);
+ values.describe(frame_no, l0, err_msg("local %d", l));
+ }
+ }
+
+ // Compute the actual expression stack size
+ InterpreterOopMap mask;
+ OopMapCache::compute_one_oop_map(m, bci, &mask);
+ intptr_t* tos = NULL;
+ // Report each stack element and mark as owned by this frame
+ for (int e = 0; e < mask.expression_stack_size(); e++) {
+ tos = MAX2(tos, interpreter_frame_expression_stack_at(e));
+ values.describe(frame_no, interpreter_frame_expression_stack_at(e),
+ err_msg("stack %d", e));
+ }
+ if (tos != NULL) {
+ values.describe(-1, tos, err_msg("expression stack for #%d", frame_no), 1);
+ }
+ if (interpreter_frame_monitor_begin() != interpreter_frame_monitor_end()) {
+ values.describe(frame_no, (intptr_t*)interpreter_frame_monitor_begin(), "monitors begin");
+ values.describe(frame_no, (intptr_t*)interpreter_frame_monitor_end(), "monitors end");
+ }
+ } else if (is_entry_frame()) {
+ // For now just label the frame
+ values.describe(-1, MAX2(sp(), fp()), err_msg("#%d entry frame", frame_no), 2);
+ } else if (is_compiled_frame()) {
+ // For now just label the frame
+ nmethod* nm = cb()->as_nmethod_or_null();
+ values.describe(-1, MAX2(sp(), fp()),
+ FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for method %s%s", frame_no,
+ nm, nm->method()->name_and_sig_as_C_string(),
+ is_deoptimized_frame() ? " (deoptimized" : ""), 2);
+ } else if (is_native_frame()) {
+ // For now just label the frame
+ nmethod* nm = cb()->as_nmethod_or_null();
+ values.describe(-1, MAX2(sp(), fp()),
+ FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for native method %s", frame_no,
+ nm, nm->method()->name_and_sig_as_C_string()), 2);
+ }
+ describe_pd(values, frame_no);
+}
+
#endif
@@ -1319,3 +1385,71 @@
_fr = thread->last_frame();
_is_done = false;
}
+
+
+#ifdef ASSERT
+
+void FrameValues::describe(int owner, intptr_t* location, const char* description, int priority) {
+ FrameValue fv;
+ fv.location = location;
+ fv.owner = owner;
+ fv.priority = priority;
+ fv.description = NEW_RESOURCE_ARRAY(char, strlen(description) + 1);
+ strcpy(fv.description, description);
+ _values.append(fv);
+}
+
+
+bool FrameValues::validate() {
+ _values.sort(compare);
+ bool error = false;
+ FrameValue prev;
+ prev.owner = -1;
+ for (int i = _values.length() - 1; i >= 0; i--) {
+ FrameValue fv = _values.at(i);
+ if (fv.owner == -1) continue;
+ if (prev.owner == -1) {
+ prev = fv;
+ continue;
+ }
+ if (prev.location == fv.location) {
+ if (fv.owner != prev.owner) {
+ tty->print_cr("overlapping storage");
+ tty->print_cr(" " INTPTR_FORMAT ": " INTPTR_FORMAT " %s", prev.location, *prev.location, prev.description);
+ tty->print_cr(" " INTPTR_FORMAT ": " INTPTR_FORMAT " %s", fv.location, *fv.location, fv.description);
+ error = true;
+ }
+ } else {
+ prev = fv;
+ }
+ }
+ return error;
+}
+
+
+void FrameValues::print() {
+ _values.sort(compare);
+ intptr_t* v0 = _values.at(0).location;
+ intptr_t* v1 = _values.at(_values.length() - 1).location;
+ intptr_t* min = MIN2(v0, v1);
+ intptr_t* max = MAX2(v0, v1);
+ intptr_t* cur = max;
+ intptr_t* last = NULL;
+ for (int i = _values.length() - 1; i >= 0; i--) {
+ FrameValue fv = _values.at(i);
+ while (cur > fv.location) {
+ tty->print_cr(" " INTPTR_FORMAT ": " INTPTR_FORMAT, cur, *cur);
+ cur--;
+ }
+ if (last == fv.location) {
+ const char* spacer = " " LP64_ONLY(" ");
+ tty->print_cr(" %s %s %s", spacer, spacer, fv.description);
+ } else {
+ tty->print_cr(" " INTPTR_FORMAT ": " INTPTR_FORMAT " %s", fv.location, *fv.location, fv.description);
+ last = fv.location;
+ cur--;
+ }
+ }
+}
+
+#endif
--- a/hotspot/src/share/vm/runtime/frame.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/frame.hpp Thu May 12 07:28:52 2011 -0700
@@ -60,6 +60,7 @@
typedef class BytecodeInterpreter* interpreterState;
class CodeBlob;
+class FrameValues;
class vframeArray;
@@ -381,6 +382,8 @@
private:
const char* print_name() const;
+ void describe_pd(FrameValues& values, int frame_no);
+
public:
void print_value() const { print_value_on(tty,NULL); }
void print_value_on(outputStream* st, JavaThread *thread) const;
@@ -388,6 +391,9 @@
void interpreter_frame_print_on(outputStream* st) const;
void print_on_error(outputStream* st, char* buf, int buflen, bool verbose = false) const;
+ // Add annotated descriptions of memory locations belonging to this frame to values
+ void describe(FrameValues& values, int frame_no);
+
// Conversion from an VMReg to physical stack location
oop* oopmapreg_to_location(VMReg reg, const RegisterMap* regmap) const;
@@ -472,6 +478,41 @@
};
+#ifdef ASSERT
+// A simple class to describe a location on the stack
+class FrameValue VALUE_OBJ_CLASS_SPEC {
+ public:
+ intptr_t* location;
+ char* description;
+ int owner;
+ int priority;
+};
+
+
+// A collection of described stack values that can print a symbolic
+// description of the stack memory. Interpreter frame values can be
+// in the caller frames so all the values are collected first and then
+// sorted before being printed.
+class FrameValues {
+ private:
+ GrowableArray<FrameValue> _values;
+
+ static int compare(FrameValue* a, FrameValue* b) {
+ if (a->location == b->location) {
+ return a->priority - b->priority;
+ }
+ return a->location - b->location;
+ }
+
+ public:
+ // Used by frame functions to describe locations.
+ void describe(int owner, intptr_t* location, const char* description, int priority = 0);
+
+ bool validate();
+ void print();
+};
+
+#endif
//
// StackFrameStream iterates through the frames of a thread starting from
--- a/hotspot/src/share/vm/runtime/globals.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp Thu May 12 07:28:52 2011 -0700
@@ -1827,7 +1827,7 @@
develop(bool, VerifyBlockOffsetArray, false, \
"Do (expensive!) block offset array verification") \
\
- product(bool, BlockOffsetArrayUseUnallocatedBlock, false, \
+ diagnostic(bool, BlockOffsetArrayUseUnallocatedBlock, false, \
"Maintain _unallocated_block in BlockOffsetArray" \
" (currently applicable only to CMS collector)") \
\
@@ -2882,7 +2882,7 @@
"Max. no. of lines in the stack trace for Java exceptions " \
"(0 means all)") \
\
- NOT_EMBEDDED(develop(intx, GuaranteedSafepointInterval, 1000, \
+ NOT_EMBEDDED(diagnostic(intx, GuaranteedSafepointInterval, 1000, \
"Guarantee a safepoint (at least) every so many milliseconds " \
"(0 means none)")) \
\
--- a/hotspot/src/share/vm/runtime/os.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/os.hpp Thu May 12 07:28:52 2011 -0700
@@ -274,7 +274,7 @@
static char* reserve_memory_special(size_t size, char* addr = NULL,
bool executable = false);
static bool release_memory_special(char* addr, size_t bytes);
- static bool large_page_init();
+ static void large_page_init();
static size_t large_page_size();
static bool can_commit_large_page_memory();
static bool can_execute_large_page_memory();
--- a/hotspot/src/share/vm/runtime/thread.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp Thu May 12 07:28:52 2011 -0700
@@ -31,6 +31,7 @@
#include "compiler/compileBroker.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/linkResolver.hpp"
+#include "interpreter/oopMapCache.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
@@ -2860,6 +2861,25 @@
}
+// Print or validate the layout of stack frames
+void JavaThread::print_frame_layout(int depth, bool validate_only) {
+ ResourceMark rm;
+ PRESERVE_EXCEPTION_MARK;
+ FrameValues values;
+ int frame_no = 0;
+ for(StackFrameStream fst(this, false); !fst.is_done(); fst.next()) {
+ fst.current()->describe(values, ++frame_no);
+ if (depth == frame_no) break;
+ }
+ if (validate_only) {
+ values.validate();
+ } else {
+ tty->print_cr("[Describe stack layout]");
+ values.print();
+ }
+}
+
+
void JavaThread::trace_stack_from(vframe* start_vf) {
ResourceMark rm;
int vframe_no = 1;
--- a/hotspot/src/share/vm/runtime/thread.hpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/runtime/thread.hpp Thu May 12 07:28:52 2011 -0700
@@ -1380,6 +1380,12 @@
void trace_stack_from(vframe* start_vf) PRODUCT_RETURN;
void trace_frames() PRODUCT_RETURN;
+ // Print an annotated view of the stack frames
+ void print_frame_layout(int depth = 0, bool validate_only = false) PRODUCT_RETURN;
+ void validate_frame_layout() {
+ print_frame_layout(0, true);
+ }
+
// Returns the number of stack frames on the stack
int depth() const;
--- a/hotspot/src/share/vm/utilities/debug.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/utilities/debug.cpp Thu May 12 07:28:52 2011 -0700
@@ -469,6 +469,7 @@
extern "C" void pp(void* p) {
Command c("pp");
FlagSetting fl(PrintVMMessages, true);
+ FlagSetting f2(DisplayVMOutput, true);
if (Universe::heap()->is_in(p)) {
oop obj = oop(p);
obj->print();
@@ -507,6 +508,17 @@
}
+extern "C" void pfl() {
+ // print frame layout
+ Command c("pfl");
+ JavaThread* p = JavaThread::active();
+ tty->print(" for thread: ");
+ p->print();
+ tty->cr();
+ if (p->has_last_Java_frame()) {
+ p->print_frame_layout();
+ }
+}
extern "C" void psf() { // print stack frames
{
--- a/hotspot/src/share/vm/utilities/elfFile.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/utilities/elfFile.cpp Thu May 12 07:28:52 2011 -0700
@@ -29,6 +29,7 @@
#include <string.h>
#include <stdio.h>
#include <limits.h>
+#include <new>
#include "memory/allocation.inline.hpp"
#include "utilities/decoder.hpp"
@@ -46,7 +47,7 @@
m_status = Decoder::no_error;
int len = strlen(filepath) + 1;
- m_filepath = NEW_C_HEAP_ARRAY(char, len);
+ m_filepath = (const char*)os::malloc(len * sizeof(char));
if (m_filepath != NULL) {
strcpy((char*)m_filepath, filepath);
m_file = fopen(filepath, "r");
@@ -74,7 +75,7 @@
}
if (m_filepath != NULL) {
- FREE_C_HEAP_ARRAY(char, m_filepath);
+ os::free((void*)m_filepath);
}
if (m_next != NULL) {
@@ -120,14 +121,14 @@
}
// string table
if (shdr.sh_type == SHT_STRTAB) {
- ElfStringTable* table = new ElfStringTable(m_file, shdr, index);
+ ElfStringTable* table = new (std::nothrow) ElfStringTable(m_file, shdr, index);
if (table == NULL) {
m_status = Decoder::out_of_memory;
return false;
}
add_string_table(table);
} else if (shdr.sh_type == SHT_SYMTAB || shdr.sh_type == SHT_DYNSYM) {
- ElfSymbolTable* table = new ElfSymbolTable(m_file, shdr);
+ ElfSymbolTable* table = new (std::nothrow) ElfSymbolTable(m_file, shdr);
if (table == NULL) {
m_status = Decoder::out_of_memory;
return false;
--- a/hotspot/src/share/vm/utilities/elfStringTable.cpp Thu May 12 07:24:37 2011 -0700
+++ b/hotspot/src/share/vm/utilities/elfStringTable.cpp Thu May 12 07:28:52 2011 -0700
@@ -27,6 +27,7 @@
#ifndef _WINDOWS
#include "memory/allocation.inline.hpp"
+#include "runtime/os.hpp"
#include "utilities/elfStringTable.hpp"
// We will try to load whole string table into memory if we can.
@@ -41,14 +42,14 @@
// try to load the string table
long cur_offset = ftell(file);
- m_table = (char*)NEW_C_HEAP_ARRAY(char, shdr.sh_size);
+ m_table = (char*)os::malloc(sizeof(char) * shdr.sh_size);
if (m_table != NULL) {
// if there is an error, mark the error
if (fseek(file, shdr.sh_offset, SEEK_SET) ||
fread((void*)m_table, shdr.sh_size, 1, file) != 1 ||
fseek(file, cur_offset, SEEK_SET)) {
m_status = Decoder::file_invalid;
- FREE_C_HEAP_ARRAY(char, m_table);
+ os::free((void*)m_table);
m_table = NULL;
}
} else {
@@ -58,7 +59,7 @@
ElfStringTable::~ElfStringTable() {
if (m_table != NULL) {
- FREE_C_HEAP_ARRAY(char, m_table);
+ os::free((void*)m_table);
}
if (m_next != NULL) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test5091921.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2011 Hewlett-Packard Company. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 5091921
+ * @summary Sign flip issues in loop optimizer
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test5091921 -XX:MaxInlineSize=1 Test5091921
+ */
+
+public class Test5091921 {
+ private static int result = 0;
+
+
+ /* Test for the bug of transforming indx >= MININT to indx > MININT-1 */
+ public static int test_ge1(int limit) {
+ int indx;
+ int sum = 0;
+ for (indx = 500; indx >= limit; indx -= 2) {
+ sum += 2000 / indx;
+ result = sum;
+ }
+ return sum;
+ }
+
+ /* Test for the bug of transforming indx <= MAXINT to indx < MAXINT+1 */
+ public static int test_le1(int limit) {
+ int indx;
+ int sum = 0;
+ for (indx = -500; indx <= limit; indx += 2)
+ {
+ sum += 3000 / indx;
+ result = sum;
+ }
+ return sum;
+ }
+
+ /* Run with -Xcomp -XX:CompileOnly=wrap1.test1 -XX:MaxInlineSize=1 */
+ /* limit reset to ((limit-init+stride-1)/stride)*stride+init */
+ /* Calculation may overflow */
+ public static volatile int c = 1;
+ public static int test_wrap1(int limit)
+ {
+ int indx;
+ int sum = 0;
+ for (indx = 0xffffffff; indx < limit; indx += 0x20000000)
+ {
+ sum += c;
+ }
+ return sum;
+ }
+
+ /* Test for range check elimination with bit flip issue for
+ scale*i+offset<limit where offset is not 0 */
+ static int[] box5 = {1,2,3,4,5,6,7,8,9};
+ public static int test_rce5(int[] b, int limit)
+ {
+ int indx;
+ int sum = b[1];
+ result = sum;
+ for (indx = 0x80000000; indx < limit; ++indx)
+ {
+ if (indx > 0x80000000)
+ {
+ // this test is not issued in pre-loop but issued in main loop
+ // trick rce into thinking expression is false when indx >= 0
+ // in fact it is false when indx==0x80000001
+ if (indx - 9 < -9)
+ {
+ sum += indx;
+ result = sum;
+ sum ^= b[indx & 7];
+ result = sum;
+ }
+ else
+ break;
+ }
+ else
+ {
+ sum += b[indx & 3];
+ result = sum;
+ }
+ }
+ return sum;
+ }
+
+ /* Test for range check elimination with bit flip issue for
+ scale*i<limit where scale > 1 */
+ static int[] box6 = {1,2,3,4,5,6,7,8,9};
+ public static int test_rce6(int[] b, int limit)
+ {
+ int indx;
+ int sum = b[1];
+ result = sum;
+ for (indx = 0x80000000; indx < limit; ++indx)
+ {
+ if (indx > 0x80000000)
+ {
+ // harmless rce target
+ if (indx < 0)
+ {
+ sum += result;
+ result = sum;
+ }
+ else
+ break;
+ // this test is not issued in pre-loop but issued in main loop
+ // trick rce into thinking expression is false when indx >= 0
+ // in fact it is false when indx==0x80000001
+ // In compilers that transform mulI to shiftI may mask this issue.
+ if (indx * 28 + 1 < 0)
+ {
+ sum += indx;
+ result = sum;
+ sum ^= b[indx & 7];
+ result = sum;
+ }
+ else
+ break;
+ }
+ else
+ {
+ sum += b[indx & 3];
+ result = sum;
+ }
+ }
+ return sum;
+ }
+
+ /* Test for range check elimination with i <= limit */
+ static int[] box7 = {1,2,3,4,5,6,7,8,9,0x7fffffff};
+ public static int test_rce7(int[] b)
+ {
+ int indx;
+ int max = b[9];
+ int sum = b[7];
+ result = sum;
+ for (indx = 0; indx < b.length; ++indx)
+ {
+ if (indx <= max)
+ {
+ sum += (indx ^ 15) + ((result != 0) ? 0 : sum);
+ result = sum;
+ }
+ else
+ throw new RuntimeException();
+ }
+ for (indx = -7; indx < b.length; ++indx)
+ {
+ if (indx <= 9)
+ {
+ sum += (sum ^ 15) + ((result != 0) ? 0 : sum);
+ result = sum;
+ }
+ else
+ throw new RuntimeException();
+ }
+ return sum;
+ }
+
+ /* Test for range check elimination with i >= limit */
+ static int[] box8 = {-1,0,1,2,3,4,5,6,7,8,0x80000000};
+ public static int test_rce8(int[] b)
+ {
+ int indx;
+ int sum = b[5];
+ int min = b[10];
+ result = sum;
+ for (indx = b.length-1; indx >= 0; --indx)
+ {
+ if (indx >= min)
+ {
+ sum += (sum ^ 9) + ((result != 0) ? 0 :sum);
+ result = sum;
+ }
+ else
+ throw new RuntimeException();
+ }
+ return sum;
+ }
+
+ public static void main(String[] args)
+ {
+ result=1;
+ int r = 0;
+ try {
+ r = test_ge1(0x80000000);
+ System.out.println(result);
+ System.out.println("test_ge1 FAILED");
+ System.exit(1);
+ }
+ catch (ArithmeticException e1) {
+ System.out.println("test_ge1: Expected exception caught");
+ if (result != 5986) {
+ System.out.println(result);
+ System.out.println("test_ge1 FAILED");
+ System.exit(97);
+ }
+ }
+ System.out.println("test_ge1 WORKED");
+
+ result=0;
+ try
+ {
+ r = test_le1(0x7fffffff);
+ System.out.println(result);
+ System.out.println("test_le1 FAILED");
+ System.exit(1);
+ }
+ catch (ArithmeticException e1)
+ {
+ System.out.println("test_le1: Expected exception caught");
+ if (result != -9039)
+ {
+ System.out.println(result);
+ System.out.println("test_le1 FAILED");
+ System.exit(97);
+ }
+ }
+ System.out.println("test_le1 WORKED");
+
+ result=0;
+ r = test_wrap1(0x7fffffff);
+ if (r != 4)
+ {
+ System.out.println(result);
+ System.out.println("test_wrap1 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_wrap1 WORKED");
+ }
+
+ result=0;
+ r = test_rce5(box5,0x80000100);
+ if (result != 3)
+ {
+ System.out.println(result);
+ System.out.println("test_rce5 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_rce5 WORKED");
+ }
+
+ result=0;
+ r = test_rce6(box6,0x80000100);
+ if (result != 6)
+ {
+ System.out.println(result);
+ System.out.println("test_rce6 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_rce6 WORKED");
+ }
+
+ result=0;
+ r = test_rce7(box7);
+ if (result != 14680079)
+ {
+ System.out.println(result);
+ System.out.println("test_rce7 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_rce7 WORKED");
+ }
+
+ result=0;
+ r = test_rce8(box8);
+ if (result != 16393)
+ {
+ System.out.println(result);
+ System.out.println("test_rce8 FAILED");
+ System.exit(97);
+ }
+ else
+ {
+ System.out.println("test_rce8 WORKED");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6186134.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6186134
+ * @summary Server virtual machine produces/exeutes incorrect code.
+ *
+ * @run main Test6186134 100000
+ */
+import java.util.ArrayList;
+
+public class Test6186134 {
+
+ int num = 0;
+
+ public Test6186134(int n) {
+ num = n;
+ }
+
+ public boolean more() {
+ return num-- > 0;
+ }
+
+ public ArrayList test1() {
+ ArrayList res = new ArrayList();
+ int maxResults = Integer.MAX_VALUE;
+ int n = 0;
+ boolean more = more();
+ while ((n++ < maxResults) && more) {
+ res.add(new Object());
+ more = more();
+ }
+ return res;
+ }
+
+ public static void main(String[] pars) {
+ int n = Integer.parseInt(pars[0]);
+ for (int i=0; i<n; i++) {
+ Test6186134 t = new Test6186134(10);
+ int size = t.test1().size();
+ if (size != 10) {
+ System.out.println("wrong size: " + size +", should be 10");
+ System.exit(97);
+ }
+ }
+ System.out.println("Passed");
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6196102.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6196102
+ * @summary Integer seems to be greater than Integer.MAX_VALUE
+ *
+ * @run main Test6196102
+ */
+
+public class Test6196102 {
+ static public void main(String[] args) {
+ int i1 = 0;
+ int i2 = Integer.MAX_VALUE;
+
+ while (i1 >= 0) {
+ i1++;
+ if (i1 > i2) {
+ System.out.println("E R R O R: " + i1);
+ System.exit(97);
+ }
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6357214.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6357214
+ * @summary Hotspot server compiler gets integer comparison wrong
+ *
+ * @run main/othervm/timeout=60 -DshowAll=ffo -DeventID=444 Test6357214
+ */
+
+// The test hangs after few iterations before the fix. So it fails if timeout.
+class MyResult {
+ public boolean next() {
+ return true;
+ }
+
+ public String getString(String in) {
+ if (in.equals("id"))
+ return "idFoo";
+ if (in.equals("contentKey"))
+ return "ckFoo";
+ return "Foo";
+ }
+
+ public int getInt(String in) {
+ if (in.equals("processingComplete"))
+ return 0;
+ return 1;
+ }
+
+ public byte[] getBytes(String in) {
+ byte[] arr = null;
+ if (in.equals("content")) {
+ arr = new byte[65536];
+ byte j = 32;
+ for (int i=0; i<65536; i++) {
+ arr[i] = j;
+ if (++j == 127)
+ j=32;
+ }
+ }
+ return arr;
+ }
+}
+
+public class Test6357214 {
+ public static volatile boolean bollocks = true;
+ public String create(String context) throws Exception {
+
+ //
+ // Extract HTTP parameters
+ //
+
+ boolean showAll = System.getProperty("showAll") != null;
+ String eventID = System.getProperty("eventID");
+ String eventContentKey = System.getProperty("cKey");
+ //
+ // Build ContentStaging query based on eventID or eventContentKey
+ //
+
+ String sql = "select id, processingComplete, contentKey, content "
+ + "from ContentStaging cs, ContentStagingKey csk "
+ + "where cs.eventContentKey = csk.eventContentKey ";
+
+ if (eventID != null) {
+ sql += "and id = " + eventID;
+ }
+ else if (eventContentKey != null) {
+ sql += "and cs.eventContentKey = '"
+ + eventContentKey
+ + "' having id = max(id)";
+ }
+ else {
+ throw new Exception("Need eventID or eventContentKey");
+ }
+
+ //
+ // This factory builds a static panel, there is no JSP
+ //
+
+ StringBuffer html = new StringBuffer();
+
+ try {
+
+ MyResult result = new MyResult();
+ if (result.next()) {
+
+ eventID = result.getString("id");
+ int processingComplete = result.getInt("processingComplete");
+ String contentKey = result.getString("contentKey");
+ byte[] bytes = result.getBytes("content");
+
+ //
+ // Print content status and associated controls
+ //
+
+ html.append("<br/><font class=\"small\">");
+ html.append("Status: ");
+ switch (processingComplete) {
+ case 0 :
+ case 1 : html.append("PENDING"); break;
+ case 2 : html.append(contentKey); break;
+ case 3 : html.append(eventID); break;
+ default : html.append("UNKNONW");
+ }
+ html.append("</font><br/>");
+
+ //
+ // Print at most 20Kb of content unless "showAll" is set
+ //
+
+ int limit = showAll ? Integer.MAX_VALUE : 1024 * 20;
+ System.out.println(limit);
+ html.append("<pre>");
+ for (int i = 0; bytes != null && i < bytes.length; i++) {
+ char c = (char) bytes[i];
+ switch (c) {
+ case '<' : html.append("<"); break;
+ case '>' : html.append(">"); break;
+ case '&' : html.append("&"); break;
+ default : html.append(c);
+ }
+
+ if (i > limit) {
+ while (bollocks);
+ // System.out.println("i is " + i);
+ // System.out.println("limit is " + limit);
+ html.append("...\n</pre>");
+ html.append(eventID);
+ html.append("<pre>");
+ break;
+ }
+ }
+ html.append("</pre>");
+ }
+ }
+ catch (Exception exception) {
+ throw exception;
+ }
+ finally {
+ html.append("Oof!!");
+ }
+ String ret = html.toString();
+ System.out.println("Returning string length = "+ ret.length());
+ return ret;
+ }
+
+ public static void main(String[] args) throws Exception {
+ int length=0;
+
+ for (int i = 0; i < 100; i++) {
+ length = new Test6357214().create("boo").length();
+ System.out.println(length);
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6559156.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6559156
+ * @summary Server compiler generates bad code for "<= Integer.MAX_VALUE" expression
+ *
+ * @run main Test6559156
+ */
+
+public class Test6559156 {
+
+ static final int N_TESTS = 1000000;
+
+ public static void main(String[] args) throws Exception {
+
+ /*
+ * If MAX_VALUE is changed to MAX_VALUE - 1 below, the test passes
+ * because (apparently) bad code is only generated when comparing
+ * <= MAX_VALUE in the doTest method.
+ */
+ Test6559156 test = new Test6559156();
+ for (int i = 0; i < N_TESTS; i += 1) {
+ test.doTest1(10, Integer.MAX_VALUE, i);
+ test.doTest2(10, Integer.MAX_VALUE, i);
+ }
+ System.out.println("No failure");
+ }
+
+ void doTest1(int expected, int max, int i) {
+ int counted;
+ for (counted = 0;
+ (counted <= max) && (counted < expected);
+ counted += 1) {
+ }
+ if (counted != expected) {
+ throw new RuntimeException("Failed test1 iteration=" + i +
+ " max=" + max +
+ " counted=" + counted +
+ " expected=" + expected);
+ }
+ }
+
+ void doTest2(int expected, int max, int i) {
+ int counted;
+ for (counted = 0;
+ // change test sequence.
+ (counted < expected) && (counted <= max);
+ counted += 1) {
+ }
+ if (counted != expected) {
+ throw new RuntimeException("Failed test1 iteration=" + i +
+ " max=" + max +
+ " counted=" + counted +
+ " expected=" + expected);
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6753639.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6753639
+ * @summary Strange optimisation in for loop with cyclic integer condition
+ *
+ * @run main/othervm -Xbatch Test6753639
+ */
+
+public class Test6753639 {
+ public static void main(String[] args) throws InterruptedException {
+ int END = Integer.MAX_VALUE;
+ int count = 0;
+ for(int i = Integer.MAX_VALUE - 5; i <= END; i++) {
+ count++;
+ if (count > 100000) {
+ System.out.println("Passed");
+ System.exit(95);
+ }
+ }
+ System.out.println("broken " + count);
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6850611.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6850611
+ * @summary int / long arithmetic seems to be broken in 1.6.0_14 HotSpot Server VM (Win XP)
+ *
+ * @run main Test6850611
+ */
+
+public class Test6850611 {
+
+ public static void main(String[] args) {
+ test();
+ }
+
+ private static void test() {
+ for (int j = 0; j < 5; ++j) {
+ long x = 0;
+ for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; ++i) {
+ x += i;
+ }
+ System.out.println("sum: " + x);
+ if (x != -4294967295l) {
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6890943.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6890943
+ * @summary JVM mysteriously gives wrong result on 64-bit 1.6 VMs in hotspot mode.
+ *
+ * @run shell Test6890943.sh
+ */
+import java.util.*;
+import java.io.*;
+import java.util.regex.*;
+
+public class Test6890943 {
+ public static final boolean AIR = true, ROCK = false;
+ public static void main(String[] args) {
+ new Test6890943().go();
+ }
+
+ int r, c, f, t;
+ boolean[][] grid;
+
+ public void go() {
+ Scanner s = new Scanner(System.in);
+ s.useDelimiter("\\s+");
+ int T = s.nextInt();
+ for (t = 0 ; t < T ; t++) {
+ r = s.nextInt(); c = s.nextInt(); f = s.nextInt();
+ grid = new boolean[r][c];
+ for (int x = 0 ; x < r ; x++) {
+ String line = s.next();
+ for (int y = 0 ; y < c ; y++) grid[x][y] = line.charAt(y) == '.';
+ }
+ int digs = solve();
+ String res = digs == -1 ? "No" : "Yes " + digs;
+ System.out.printf("Case #%d: %s\n", t+1, res);
+ }
+ }
+
+ Map<Integer, Integer> M = new HashMap<Integer, Integer>();
+
+ private int solve() {
+ M = new HashMap<Integer, Integer>();
+ M.put(calcWalkingRange(0, 0), 0);
+ for (int digDown = 0 ; digDown < r ; digDown++) {
+ Map<Integer, Integer> tries = new HashMap<Integer, Integer>();
+ for (Map.Entry<Integer, Integer> m : M.entrySet()) {
+ int q = m.getKey();
+ if (depth(q) != (digDown)) continue;
+ if (stuck(q)) continue;
+ tries.put(q, m.getValue());
+ }
+
+ for (Map.Entry<Integer, Integer> m : tries.entrySet()) {
+ int q = m.getKey();
+ int fallLeftDelta = 0, fallRightDelta = 0;
+ //fall left
+ int fallLeft = fall(digDown, start(q));
+ if (fallLeft > 0) {
+ fallLeftDelta = 1;
+ if (fallLeft <= f) addToM(calcWalkingRange(digDown+fallLeft, start(q)), m.getValue());
+ }
+
+ //fall right
+ int fallRight = fall(digDown, end(q));
+ if (fallRight > 0) {
+ fallRightDelta = 1;
+
+ if (fallRight <= f) addToM(calcWalkingRange(digDown+fallRight, end(q)), m.getValue());
+ }
+
+ for (int p = start(q) + fallLeftDelta ; p <= end(q) - fallRightDelta ; p++) {
+ //goLeft
+ for (int digSpot = p ; digSpot > start(q) +fallLeftDelta ; digSpot--) {
+ int fallDown = 1+fall(digDown+1, digSpot);
+ if (fallDown <= f) {
+ if (fallDown == 1) {
+ addToM(calcWalkingRange(digDown + 1, digSpot, digSpot, p), m.getValue() + Math.abs(digSpot-p)+1);
+ } else {
+ addToM(calcWalkingRange(digDown + fallDown, digSpot), m.getValue() + Math.abs(digSpot-p)+1);
+ }
+ }
+ }
+
+ //goRight
+ for (int digSpot = p ; digSpot < end(q)-fallRightDelta ;digSpot++) {
+ int fallDown = 1+fall(digDown+1, digSpot);
+ if (fallDown <= f) {
+ if (fallDown == 1) {
+ addToM(calcWalkingRange(digDown + 1, digSpot, p, digSpot), m.getValue() + Math.abs(digSpot-p)+1);
+ } else {
+ addToM(calcWalkingRange(digDown + fallDown, digSpot), m.getValue() + Math.abs(digSpot-p)+1);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ int result = Integer.MAX_VALUE;
+ for (Map.Entry<Integer, Integer> m : M.entrySet()) {
+ if (depth(m.getKey()) == r-1) result = Math.min(m.getValue(), result);
+ }
+
+ if (result == Integer.MAX_VALUE) return -1;
+ return result;
+ }
+
+ private void addToM(int q, int i) {
+ Integer original = M.get(q);
+ if ( original == null ) M.put(q, i);
+ else M.put(q, Math.min(original, i));
+ }
+
+ private int fall(int row, int column) {
+ int res = 0;
+ for ( int p = row+1 ; p < r ; p++) {
+ if (grid[p][column] == AIR) res++;
+ else break;
+ }
+ return res;
+ }
+
+ private boolean stuck(int q) {
+ return start(q) == end(q);
+ }
+
+ private int depth(int q) {
+ return q % 50;
+ }
+
+ private int start(int q) {
+ return q / (50*50);
+ }
+
+ private int end(int q) {
+ return (q / 50) % 50;
+ }
+
+ private int calcWalkingRange(int depth, int pos) {
+ return calcWalkingRange(depth, pos, Integer.MAX_VALUE, Integer.MIN_VALUE);
+ }
+
+ private int calcWalkingRange(int depth, int pos, int airOverrideStart, int airOverrideEnd) {
+ int left = pos, right = pos;
+ if (depth >= r) return (c-1)*50 + depth;
+
+ while (left > 0) {
+ if (grid[depth][left-1] == ROCK && (left-1 < airOverrideStart || left-1 > airOverrideEnd)) break;
+ if (depth < r-1 && grid[depth+1][left-1] == AIR) {
+ left--;
+ break;
+ }
+ left--;
+ }
+ while (right < c-1) {
+ if (grid[depth][right+1] == ROCK && (right+1 < airOverrideStart || right+1 > airOverrideEnd)) break;
+ if (depth < r-1 && grid[depth+1][right+1] == AIR) {
+ right++;
+ break;
+ }
+ right++;
+ }
+
+ return left *50*50 + right*50 + depth;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6890943.sh Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+if [ "${TESTSRC}" = "" ]
+then
+ echo "TESTSRC not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTSRC=${TESTSRC}"
+if [ "${TESTJAVA}" = "" ]
+then
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTJAVA=${TESTJAVA}"
+if [ "${TESTCLASSES}" = "" ]
+then
+ echo "TESTCLASSES not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTCLASSES=${TESTCLASSES}"
+echo "CLASSPATH=${CLASSPATH}"
+
+set -x
+
+cp ${TESTSRC}/Test6890943.java .
+cp ${TESTSRC}/input6890943.txt .
+cp ${TESTSRC}/output6890943.txt .
+cp ${TESTSRC}/Test6890943.sh .
+
+${TESTJAVA}/bin/javac -d . Test6890943.java
+
+${TESTJAVA}/bin/java ${TESTVMOPTS} Test6890943 < input6890943.txt > test.out 2>&1
+
+diff output6890943.txt test.out
+
+result=$?
+if [ $result -eq 0 ]
+then
+ echo "Passed"
+ exit 0
+else
+ echo "Failed"
+ exit 1
+fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6897150.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6897150
+ * @summary Hotspot optimises away a valid loop
+ *
+ * @run main Test6897150
+ */
+
+// Should be compiled with javac from JDK1.3 to get bytecode which shows the problem.
+public class Test6897150 {
+ public static void main(String[] args) {
+ // This works
+ loopAndPrint(Integer.MAX_VALUE -1);
+ // This doesn't
+ loopAndPrint(Integer.MAX_VALUE);
+ }
+
+ static void verify(int max, int a) {
+ if ( a != (max - 1)) {
+ System.out.println("Expected: " + (max - 1));
+ System.out.println("Actual : " + a);
+ System.exit(97);
+ }
+ }
+ static void loopAndPrint(int max) {
+ int a = -1;
+ int i = 1;
+ for (; i < max; i++) {
+ a = i;
+ }
+ verify(max, a);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6905845.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6905845
+ * @summary Server VM improperly optimizing away loop.
+ *
+ * @run main Test6905845
+ */
+
+public class Test6905845 {
+
+ public static void main(String[] args){
+ for (int asdf = 0; asdf < 5; asdf++){
+ //test block
+ {
+ StringBuilder strBuf1 = new StringBuilder(65);
+ long start = System.currentTimeMillis();
+ int count = 0;
+
+ for (int i = Integer.MIN_VALUE; i < (Integer.MAX_VALUE - 80); i += 79){
+ strBuf1.append(i);
+ count++;
+ strBuf1.delete(0, 65);
+ }
+
+ System.out.println(count);
+ if (count != 54366674) {
+ System.out.println("wrong count: " + count +", should be 54366674");
+ System.exit(97);
+ }
+ }
+ //test block
+ {
+ StringBuilder strBuf1 = new StringBuilder(65);
+ long start = System.currentTimeMillis();
+ int count = 0;
+
+ for (int i = Integer.MIN_VALUE; i < (Integer.MAX_VALUE - 80); i += 79){
+ strBuf1.append(i);
+ count++;
+ strBuf1.delete(0, 65);
+ }
+
+ System.out.println(count);
+ if (count != 54366674) {
+ System.out.println("wrong count: " + count +", should be 54366674");
+ System.exit(97);
+ }
+ }
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6931567.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6931567
+ * @summary JIT Error (on class file compiled with eclipse) on JVM x64 (but not on x32!).
+ *
+ * @run main Test6931567
+ */
+
+// Should be compiled with javac from JDK1.3 to get bytecode which shows the problem.
+public class Test6931567 {
+
+ public static void main(final String[] args) {
+ booleanInvert(Integer.MAX_VALUE);
+ booleanInvert(Integer.MAX_VALUE - 1);
+ }
+
+ private static void booleanInvert(final int max) {
+ boolean test1 = false;
+ boolean test2 = false;
+
+ for (int i = 0; i < max; i++) {
+ test1 = !test1;
+ }
+
+ for (int i = 0; i < max; i++) {
+ test2 ^= true;
+ }
+
+ if (test1 != test2) {
+ System.out.println("ERROR: Boolean invert\n\ttest1=" + test1
+ + "\n\ttest2=" + test2);
+ System.exit(97);
+ } else {
+ System.out.println("Passed!");
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6935022.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6935022
+ * @summary Server VM incorrectly breaks out of while loop
+ *
+ * @run main Test6935022
+ */
+
+public class Test6935022 {
+ public static final void main(String[] args) throws Exception {
+ Test6935022 test = new Test6935022();
+
+ int cnt = 0;
+
+ while (cnt < 10000) {
+ try {
+ ++cnt;
+ if ((cnt&1023) == 0)
+ System.out.println("Thread="+Thread.currentThread().getName() + " iteration: " + cnt);
+ test.loop(2147483647, (cnt&1023));
+ }
+
+ catch (Exception e) {
+ System.out.println("Caught on iteration " + cnt);
+ e.printStackTrace();
+ System.exit(97);
+ }
+ }
+ }
+
+ private void loop(int endingRow, int mask) throws Exception {
+ int rows = 1;
+ boolean next = true;
+
+ while(rows <= endingRow && next) {
+ rows++;
+ if (rows == mask)
+ System.out.println("Rows="+rows+", end="+endingRow+", next="+next);
+ next = next(rows);
+ }
+
+ if (next)
+ throw new Exception("Ended on rows(no rs): " + rows);
+ }
+
+ private boolean next(int rows) {
+ return rows < 12;
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6959129.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6959129
+ * @summary COMPARISON WITH INTEGER.MAX_INT DOES NOT WORK CORRECTLY IN THE CLIENT VM.
+ *
+ * @run main/othervm -ea Test6959129
+ */
+
+public class Test6959129 {
+
+ public static void main(String[] args) {
+ long start = System.currentTimeMillis();
+ int min = Integer.MAX_VALUE-30000;
+ int max = Integer.MAX_VALUE;
+ long maxmoves = 0;
+ try {
+ maxmoves = maxMoves(min, max);
+ } catch (AssertionError e) {
+ System.out.println("Passed");
+ System.exit(95);
+ }
+ System.out.println("maxMove:" + maxmoves);
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+ /**
+ * Imperative implementation that returns the length hailstone moves
+ * for a given number.
+ */
+ public static long hailstoneLengthImp(long n) {
+ long moves = 0;
+ while (n != 1) {
+ assert n > 1;
+ if (isEven(n)) {
+ n = n / 2;
+ } else {
+ n = 3 * n + 1;
+ }
+ ++moves;
+ }
+ return moves;
+ }
+
+ private static boolean isEven(long n) {
+ return n % 2 == 0;
+ }
+
+ /**
+ * Returns the maximum length of the hailstone sequence for numbers
+ * between min to max.
+ *
+ * For rec1 - Assume that min is bigger than max.
+ */
+ public static long maxMoves(int min, int max) {
+ long maxmoves = 0;
+ for (int n = min; n <= max; n++) {
+ if ((n & 1023) == 0) System.out.println(n);
+ long moves = hailstoneLengthImp(n);
+ if (moves > maxmoves) {
+ maxmoves = moves;
+ }
+ }
+ return maxmoves;
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6985295.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6985295
+ * @summary JVM fails to evaluate condition randomly
+ *
+ * @run main/othervm -Xbatch Test6985295
+ */
+
+public class Test6985295 {
+
+ public static void main(String[] args) {
+ int min = Integer.MAX_VALUE-50000;
+ int max = Integer.MAX_VALUE;
+ System.out.println("max = " + max);
+ long counter = 0;
+ int i;
+ for(i = min; i <= max; i++) {
+ counter++;
+ if (counter > 1000000) {
+ System.out.println("Passed");
+ System.exit(95);
+ }
+ }
+ System.out.println("iteration went " + counter + " times (" + i + ")");
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test6992759.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6992759
+ * @summary Bad code generated for integer <= comparison, fails for Integer.MAX_VALUE
+ *
+ * @run main Test6992759
+ */
+
+public class Test6992759 {
+
+ static final int N_TESTS = 1000000000;
+
+ public static void main(String[] args) throws Exception {
+
+ /*
+ * If MAX_VALUE is changed to MAX_VALUE - 1 below, the test passes
+ * because (apparently) bad code is only generated when comparing
+ * <= MAX_VALUE in the doTest method.
+ */
+ Test6992759 test = new Test6992759();
+ for (int i = 0; i < N_TESTS; i += 1) {
+ test.doTest(10, Integer.MAX_VALUE, i);
+ //test.doTest(10, Integer.MAX_VALUE - 1, i);
+ }
+ System.out.println("No failure");
+ }
+
+ void doTest(int expected, int max, int i) {
+ int counted;
+ for (counted = 0;
+ (counted <= max) && (counted < expected);
+ counted += 1) {
+ }
+ if (counted != expected) {
+ throw new RuntimeException("Failed test iteration=" + i +
+ " max=" + max +
+ " counted=" + counted +
+ " expected=" + expected);
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test7005594.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 7005594
+ * @summary Array overflow not handled correctly with loop optimzations
+ *
+ * @run main/othervm -Xms2048m -Xcomp -XX:CompileOnly=Test7005594.test Test7005594
+ */
+
+public class Test7005594 {
+
+ static int test(byte a[]){
+ int result=0;
+ for( int i=0; i<a.length; i+=((0x7fffffff>>1)+1) ){
+ result += a[i];
+ }
+ return result;
+ }
+
+ public static void main(String [] args){
+ byte a[]=new byte[(0x7fffffff>>1)+2];
+ int result = 0;
+ try {
+ result = test(a);
+ } catch (ArrayIndexOutOfBoundsException e) {
+ e.printStackTrace(System.out);
+ System.out.println("Passed");
+ System.exit(95);
+ }
+ System.out.println(result);
+ System.out.println("FAILED");
+ System.exit(97);
+ }
+
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/Test7020614.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 7020614
+ * @summary "-server" mode optimizer makes code hang
+ *
+ * @run main/othervm/timeout=30 -Xbatch Test7020614
+ */
+
+public class Test7020614 {
+
+ private static final int ITERATIONS = 1000;
+ private static int doNotOptimizeOut = 0;
+
+ public static long bitCountShort() {
+ long t0 = System.currentTimeMillis();
+ int sum = 0;
+ for (int it = 0; it < ITERATIONS; ++it) {
+ short value = 0;
+ do {
+ sum += Integer.bitCount(value);
+ } while (++value != 0);
+ }
+ doNotOptimizeOut += sum;
+ return System.currentTimeMillis() - t0;
+ }
+
+ public static void main(String[] args) {
+ for (int i = 0; i < 4; ++i) {
+ System.out.println((i + 1) + ": " + bitCountShort());
+ }
+ System.out.println("doNotOptimizeOut value: " + doNotOptimizeOut);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/input6890943.txt Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,1543 @@
+50
+4 5 1
+.....
+#####
+..###
+.#...
+4 5 1
+.....
+#####
+###..
+...#.
+5 4 2
+....
+####
+..##
+.###
+.#.#
+6 10 5
+..........
+####.#####
+####.#####
+####.#####
+####.#####
+####.#####
+6 10 4
+..........
+#....#####
+#....#####
+#....#####
+#....#####
+#....#####
+6 10 1
+..........
+####.#####
+####.#####
+####.#####
+####.#####
+####.#####
+6 10 2
+..........
+####.#####
+####.#####
+####.#####
+####.#####
+####.#####
+6 11 2
+.....######
+###########
+###.......#
+###.#.#...#
+###.#.##..#
+###.#.###.#
+6 11 1
+.....######
+###########
+###.......#
+###.#.#...#
+###.#.##..#
+###.#.###.#
+6 11 2
+.......####
+###########
+###.......#
+###.#.#...#
+###.#.##..#
+###.#.###.#
+7 11 1
+..#........
+##.#.......
+###.#......
+####.#.....
+#####.#....
+######.#...
+#########..
+13 16 2
+................
+#.#.#.#.#.#.#.#.
+................
+.#.#.#.#.#.#.#.#
+................
+#.#.#.#.#.#.#.#.
+................
+.#.#.#.#.#.#.#.#
+................
+#.#.#.#.#.#.#.#.
+................
+.#.#.#.#.#.#.#.#
+................
+4 16 3
+................
+#.#.#.#.#.#.#.#.
+.#.#.#.#.#.#.#.#
+................
+50 50 1
+..................................................
+################################################.#
+.#............#....#.......................#....##
+..#.....#......#....#.....................#....#..
+...#.......#....#....#...................#....#...
+#...#....#.......#....#.................#....#....
+##...#.......#....#....#...............#....#.....
+###...#....#.......#....#.............#....#......
+####...#.......#....#....#...........#....#.......
+.####...#....#.......#....#.........#....#........
+..####...#.......#....#....#.......#....#.........
+...####...#....#.......#....#.....#....#..........
+....####...#.......#....#....#...#....#...###.....
+.....####...#....#.......#....#.#....#..##..###...
+......####...#.......#....#....#.............##...
+.......####...#....#.......#...............##.....
+........####...#.......#....#............##.......
+.........####...#....#.......#.........#######....
+..###.....####...#.......#....#...................
+.#..###....####...#....#.......#.........####.....
+##...###....####...#.......#....#.......##..##....
+##...........####...#....#.......#......##..##....
+##..####......####...#.......#....##....##..##....
+##....##.......####...#....#......##....##..##....
+.###.##.........####.............##.....##..##....
+..###............#######........##.......####.....
+.........###......######.......##.................
+.......##..##..........#......##.........####.....
+......##....##........#......##.........##..##....
+......##.............#......##..........##..##....
+......##............#......##...........##..##....
+......##....#......#......##............##..##....
+.......##..##.....#....########.........##..##....
+........####.....#.....###.#...#.........####.....
+.#####..........#.....#..##.#...#.................
+...##..........#.....#....##.#...#.........####...
+...##.........#.....#..#...##.#...#.......##..##..
+...##........#.....#..##....##.#...#......##..##..
+...##.......#.....#....##....##.#...#.....##..##..
+##.##......#.....#...###......##.#...#.....#####..
+.###......#.....#..##..........##.#...#.......##..
+.........#.....#...##..####.....##.#...#.....##...
+........#.....#...###..#.##......##.#...#...##....
+.......#.....#....##.....###......##.#...#........
+......#.....#..#.##...###..........##.#...#.......
+.....#.....#...##..#..#..##.##.#....##.#...#......
+....#.....#........###.....##........##.#...#.....
+...#.....#.......##...####..###.......##.#...#....
+..#.....#......##.#.#..#.#..##.........##.#...#...
+.#..............#.#.#.#.#.#.#...........##.#...#..
+50 50 13
+..................................................
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+##################################################
+20 49 5
+.................................................
+#################################################
+#################################################
+##################################.##############
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+############################.####################
+#################################################
+######.##########################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+49 49 48
+.................................................
+#################################################
+################################################.
+#################################################
+####################################.############
+#################################################
+##########.######################################
+#######.#########################################
+#################################################
+#################################################
+#################################################
+#######################################.#########
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+###########################################.#####
+#################################################
+#################################################
+###.#############################################
+###############.#################################
+#################################################
+##.##############################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#####################################.###########
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#####.###########################################
+#####################.###########################
+#################################################
+###.#############################################
+#################################################
+#################################################
+#################################################
+#############.###########.#######################
+###.##############.####.#########################
+#########################################.#######
+#################################################
+########################################.########
+40 49 10
+.................................................
+#################################################
+..#..............#...............................
+.......................#.......................#.
+..#....#...................#.................#...
+..........#...............................#......
+............#..................#.......#.........
+........#............#............#..............
+...................#.....#.......................
+....#..........#........................#........
+....#.................................#......#...
+...........#.....................................
+....................#............................
+.##........#................#....................
+..............#..................................
+........#......................................#.
+.................................#....#........#.
+.................................................
+.............................#..##...............
+...........................................#.#...
+........#..........#........#.............#.....#
+..........#.#....................................
+.............................#............#......
+.......#.......................#.........#.......
+..............................#..................
+......#..........................................
+.............#................#..................
+......#.............................#............
+#.................#..................#......#....
+..............#..................................
+...........#...........................#.....#...
+............#............#...#...................
+.......................#.......................#.
+............................#....................
+..........................#......................
+...........................#.............#...#...
+.#...............................................
+..................#..............................
+...#..............................#..............
+.....#..................#........................
+49 49 20
+.........................................##..#..#
+########################################.##...#.#
+#.##..#....#####..####...#..#.##.###.#..#..#.....
+..#...#.##...##.#....#...##..#.#..###...###......
+..#..##.#.###......#.....##.....#.......##.#.#.#.
+..##......###.#.##.....##.#..#.##.###..##.#.#####
+#.#.##....#..#..#.....#.#.##.#.#.##.#.....###.#.#
+..###.#..#..###...###..#.#.....#..######.#.#....#
+..#...#...##.#..##.#.#.#..###.#..#..#...#....##..
+.#..#.#..##.#...##........##.##..#..........#.#..
+#.#.###.####...#.#...#..###..#.##....#...........
+#..#.#######.#....#.#.##...#.#.............##....
+###..###....#..#....#.#.###...#..##.#.#..##.#####
+....####...#.#...........##.#.#.#..#.#.#.##.#.#..
+##.#...##..#..#...#..##..####.##.#...#.....#...#.
+...###.##.#..##.....#.#.##..#..###.#.###.#.#..#.#
+###....##...#.#.##.##..#.#...#...##....#.###.....
+##..#....###..#.....#..#....#.#.#.##.......##.###
+.#.#....#.....####..##....##...##...#.##..##.#...
+##....#....#.#.###.##...#..##.##...##....#.######
+..#....#..##.....##.##.#.........##..##...#.#....
+#..#..#.#....##.#.#...#.###..#...#..#.##.#.#....#
+.....#..#...###.....##...###....###.##.....#...#.
+#..#.#...###..#....#..####....#.#......#..##....#
+.....#.#...###...###.#..#.#.#.........#.#.#..#.##
+.#..##..##..#..#.#....##.........#..#.##.#..##...
+##.#.#.....##.##..###...#.#.#..#.#.####.#.###.#..
+..#.#.......#.#.#...#####..#.##.#....#...#.#.....
+..########.####.....#..#.........#..#####.##.#...
+.#......##.####..###..#.####........#....#....#.#
+#.....#....#...#...#..###......#.##..#..#...#.###
+...#..###.....#....#..#..#......#.....#.#.#.#..##
+....#.##..####.#..###...#...#...#######..#..#....
+.#..#...##...#...#......##...#####.##...#..##....
+..#.#.#######.#....#.#.###....#.##...#..#.##..#..
+#..#.##.#.#.##..###....#.##.#..#..#...##....##..#
+.###.#.#..##.###...#..##.#.#...#.#.####....#..###
+#.#......#...##.##...#.#.....##..#..##....#.##...
+#.#...#.#.##...##.###.#..##..##..####..##.#.#...#
+....#....#..####.##.....#.#....#..##..##....#..#.
+....#...###.....##..#..###....#........###..##..#
+.###....##...........#....#........####.#.####..#
+.#........##...#.###..###.#...##.##..###..###..##
+#.#######.#....###...#..##..#...#....##....#....#
+#....#..#......#..#...##.....##.#.#.#..#......##.
+#.##.##.#.#.##..#..##..######.##.###.#.#..#....#.
+.###.##.....#.##.#..###....###..##....#.#..#.....
+#####..#.#....#.#......##..##.#...........####.#.
+..#..#.#..#...##....###.##.#.#...#..#..#....#..##
+49 49 5
+.........................................#....###
+#########################################..#.....
+.....#.###...#...#...........##...#...#....#...#.
+....#.....#..#....#....##...#..###.#...#..##.#.##
+....#...###.##...........#.#.##.......#.#.#.#..#.
+...........#..###..#..##.....#.........#.....#...
+.....#......#.##.#..##.###.....#...###.#....#...#
+.#......##.#.......##...##.....###..#......#.##..
+#.....#.#..#.#...#####...#.###.##.....#..#.......
+........##....#....#....#.#.#....####....#.##.###
+....#.#......#.##.....#..........##.............#
+#..##....#.#....#..#.....#.#.#....#.#.#....##...#
+...#..##..#...#....#.#....#..#....#..#..#.......#
+......#...##.#.####.....####.###.#..#........####
+##..........#...........#..#.##......##......#.##
+....###....##...#.####.....#............#..#.....
+...#....#....##.....##.....#.#.....#..#.#..#..#..
+...........#...#.##..##..##.#......#..#.#..##....
+.#........##......#.........##..#..........#.#...
+#....##.#.##..#.....#.....##.....##....#.........
+.#.......###.......#..#.....#.....#..##.##...#..#
+###......##.....##...##..#.#....#...####.##......
+....#..#....##...#.##.##.#.#...#...#.#..#.##.#..#
+..........#.#..#####..####....##..#.#.#.........#
+........##.#.###..###....#...#........##.#......#
+...........##.##..#.....#.#.#..#....#.###..#.###.
+#.#....#.#...##............#.#.....#....#...#.#..
+..###.#.##...#....#..##.##...#........#..........
+...........#...##...#..#..##.....#..#.......#..#.
+#.#.#......##.#.....#...#.#.#.#...#..#######.#.##
+...##..#.......###..#..#.##....#......####.#.....
+....##......#.#......#....##..#...##.......#..#..
+#..###.##....##..##.#..#.###.##.....#...#........
+#......#....####....#.........#.........#.##.##..
+.#.#..###......#...##.#.##..#.#.....#...#.#......
+......#.#...##.#....#..#.#.......#.#.....#.#.###.
+###..#.....#....#.#...##..#.#.....#.#.....#.#.#..
+..........#........#....#...#..#...#...#.#.#.#...
+#..##..#...###....#.#..#....##....#...#..##....#.
+.#.#.#....#..##.#...#.....#.##..#....##........#.
+..#.##....###...#...#..#..#.....#..#..###..#...#.
+##....#........#..#..#..#......#...#.##....#.#.##
+....#.............#..#...#...#.#.#...##....#..#.#
+...#.........#....###.....#.#..#..#...#..#...#...
+.#.#.###..###..##.#.##...#...#..#................
+.#......#..#..#.#.#...#.....................#..#.
+..#.....#.......#..##.......#...#...##.#.....#.#.
+#..####.#....#......#.........#.#...###...#....#.
+#.#.#.#....#......#..#.#........###..#....##.....
+31 47 7
+.........................#.#..##.#..#...#.#...#
+#########################.#.#...#...#.#........
+...#...........#...#...#...##...#..#.#.#...#.##
+.#........#.......#.#.....#......#........#....
+#.#....###...#...#....#....#......##...#.......
+#.#......##..##...#.....#.##.#.........#.......
+.......#.....##........#..#.......#.##...#.....
+..#.......##.#...#.#..#.#..#....#......#......#
+#.##.........#####..###.......#........#......#
+.#..#.#.#...#....####...#...........#....#.....
+##..##..#..###..###....##......#....#..##...#.#
+#......#........##...#.#.#..#..#....#..#...##.#
+.#.#.##..........#.#..#...##.##................
+##.##.#...#....#.............#.#.....###...#.#.
+..#..#.#..#..#.#....#....#............#.##..#..
+......###......#..##..#.#...##.........#.#.###.
+..#.##.#..#......##....#.#........#....##..#..#
+.........#.#.#.....##...#.#...#.##.....##.##...
+.#........#...#.###.........#.#.#..............
+....##........#.....#....###....###.#..#....##.
+..#..#....#....#.#.......#.#.#..........###....
+.#..###.#...#.###...##...#....#...#............
+##.....#..##.#.##.##.......#.##.....###...##.#.
+.###.......#...#.....#.....###.........#...#...
+#.....#..####.....##...#........####..........#
+#..#...........##.#.#.#..............#....##...
+..#.#..........#..##.#.##...##..##.#.#..##..#..
+#..........................###......#....##....
+.....#..........#..#......#...#.#..#....#...#..
+#......#....##.........#..#.......#..#.......#.
+.#......#...###...##....##.#..........#...#..#.
+44 35 13
+...........................##..####
+############################.....##
+..###.#.##.#...#.##.####.###.###.##
+#.##.#.#.#.#..###.#..#...###.##..##
+.#.##.#.##..#.###.###.##.#.#...#.#.
+##....##.#..#####.#.####..##.##...#
+####.##..##.###.##.#.#...#.##.###.#
+#.#######.#.#.#..#.#..#..#...###.#.
+##.###.#..#.####.##.#.#########.##.
+#.##.#######..#.#.####.#..#..######
+.#.##..########...##.###..#..##.##.
+#.#######.###...##.#...#.####.#..#.
+.###..###....#.#.##.###..##.##.##.#
+...#.###.#.##.#.####.##.####.#.#...
+#..#......##....#.##.#.#.###.#..#..
+...##.###.###.#.####..#.#.#..###.#.
+.#####.#..#..##.#.#...##.#.#.##...#
+..##..#.#....##.#.#.###.##.##...#..
+###.#..###....#######..#.#.###.##.#
+##.##.#.#.##..#.#.#.#.#..##.####...
+##.###...#.###.#.#.#..#####.###.#..
+...#.#...##......#.##..##.##.#.#.##
+##..#..####..###...###.#........###
+##..#....#..#.#..##.#####..###.#...
+##...#.#####.###.##....###...####..
+#.####.#..#.##.#.#...#.###.#...##..
+####.#####.###.#.##...##...#...#.##
+#..##.##....###..#..####.##..#.#.##
+..#.###.##....####.##.#..###.#....#
+#.#.###.#..#.##.##...###.##..######
+##.#.##.###.#..#...###.####..##.###
+.########.#....#..#........#..##..#
+####..#.##.#.##.####..#.###...#####
+#..##..#..##.###....####.#.#...#.#.
+.#...##.##.###.###...##..##..###...
+###.##...#.##...####.#.#.##..#.####
+##.###..##.#....#.###..##.#...###.#
+##..##.###..#..#.####.#.....##.####
+.#....##...#####.....####...#.##.#.
+##.#.#.....##...#..#...#....#....##
+#..#.#..#####.##..###.#.###########
+.#.###.#..###.##.###.#.###.##.#.###
+.###..####.#..##......#..##.######.
+...##..###.#.....##.#.#..##......#.
+6 10 2
+.......#..
+##########
+##.#...#..
+.#..###...
+#.##.#####
+.####..#.#
+7 9 4
+......##.
+#########
+.#.###.##
+..#...#..
+.....##.#
+####...##
+.#..#.#.#
+10 9 2
+.........
+#########
+..###.###
+#..###.##
+.....#.#.
+..##.....
+###.#....
+.##..#...
+##...#..#
+#..##..##
+10 7 1
+....#..
+####..#
+####..#
+..#.#..
+...##.#
+#....##
+..#..##
+#.#....
+.##.#..
+###...#
+6 10 2
+.......#..
+#######.#.
+..##.#.##.
+..#..#....
+.#.#....##
+..#....#..
+40 40 5
+........................................
+###############################..#######
+#..##############.....##################
+........................................
+...........................##########...
+#####...################..##############
+##################.#####################
+.............................#####......
+#.............................##########
+...............................####.....
+.........#################..............
+..........................###...........
+........................................
+....................#####...............
+##########....................##########
+.......##################...............
+########........###############..#######
+........................................
+..........#########################.....
+#####...................................
+.........................####...........
+......................#####...######....
+######..................################
+........#########.......................
+############.........................###
+........####################............
+......................##################
+....................######......#.......
+............################............
+........................................
+......................#########.........
+#######............#####################
+........###############.................
+........................................
+.........###################............
+.............................#..........
+######................................##
+........................#############...
+......##................................
+........................................
+30 20 11
+....................
+####################
+......##.##.........
+#.....####....######
+...##...............
+........#######.###.
+.......##...........
+....#####..##.......
+........##.#........
+.....###...........#
+..##########.....##.
+..#........#.#......
+......##...##.......
+....##...###..###...
+.####...#####...####
+###.................
+.......##...........
+..........###..####.
+..####..#####.#####.
+..###....#.......##.
+......##....##......
+....##.###..........
+.##.....#####..#....
+....................
+......###...........
+####..###.#########.
+.......#######......
+....###.............
+.........###.#####..
+................####
+50 20 17
+....................
+###################.
+#..##...............
+....................
+............####....
+........#####.......
+..............#..#..
+.........####...####
+.............####...
+.....#....###.......
+####...............#
+....................
+.....######.........
+......#.............
+.####......#####....
+.............##.....
+#####....#####......
+..#####.............
+##..####....###..###
+....................
+....................
+........######.###..
+....####....#####...
+....########........
+...#####............
+.###................
+...............###..
+.......#########....
+..................##
+.......####.........
+..#####.............
+...####.............
+.##..........#####..
+....................
+...#.##.......###...
+######.....##......#
+......####..........
+......#.............
+....................
+....................
+....................
+.....#..............
+.....####....###....
+......#.........####
+.......######...###.
+....................
+....................
+##...........###...#
+.###................
+......#######.......
+45 25 10
+.........................
+#########################
+#...................#..##
+....................#....
+.........................
+.........................
+...................#####.
+##.....................##
+.#.....................#.
+##.....................##
+.........................
+.....####................
+.....##.#................
+.....##.#................
+.....##.#............####
+.....##.#.......###..####
+.....##.#.......#.#......
+.....##.######..#.#......
+.....####....#..#.#..###.
+........#....#..#.#..###.
+...##...#....#..#.#......
+...##...#....#..#.#......
+...##...#....#..#.#......
+...##...#....#..#.#......
+...########..#..###......
+##.##...#....#........###
+.#.##...######..#####.#..
+.#.##...........#...#.#..
+.#.##...........#...#.#..
+.#..............#...#.#..
+.#..............#...#.#..
+.#.####.........#...#.#..
+.#.#..#.........#...#.#..
+.#.#..#.........#####.#..
+##.#.##########.......###
+...#.####.....#..........
+..#####.#.....#..####....
+..#####.#.....#..#..#....
+..#..#..#.....#..#..#....
+..#..#..#.....#..#..#....
+#.#..#..#.....#..#..#..##
+#.#..#..#######..#..#..#.
+#.####.......#####..#..#.
+#............#..##..#..#.
+#............########..#.
+25 45 5
+.............................................
+#############################################
+..........#...###################.#...#......
+#########.#....##############################
+#########.#.............##################...
+####################....#####################
+#########..........#........#################
+####################........#################
+..................####################.....#.
+####..............#...........###############
+######################################.######
+#########################.....#...###########
+###.###################.......#.....#########
+#####.#.........#.....#.....#################
+#############################################
+###.#############...####............#########
+......############################...#....#..
+....#########....................#...######..
+##########.##..............##################
+#####################......##################
+#############################################
+#############################################
+#######################################...###
+#############################################
+##########....###############################
+40 40 5
+...............................#########
+########################################
+########################################
+########################################
+#########....###########################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+..#######.######################........
+########################################
+########################################
+########################################
+...........#####################........
+####.................###################
+########################################
+########################################
+########################################
+########################################
+#####................###################
+###################...........##########
+########################################
+########################################
+.......##############################...
+########################################
+########################################
+########################################
+##############..............############
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+########################################
+30 20 2
+....................
+####################
+#############.....##
+##...###############
+####################
+####################
+####################
+....##.....#...#....
+####################
+##########.#########
+###....#############
+#########....#######
+###....#############
+####################
+....#######.....###.
+####################
+########.###########
+####################
+#############.....##
+....#####..#########
+####################
+##..########.##.####
+########.###########
+#########..#########
+#........###########
+#########..######.##
+###.################
+####################
+####################
+##############...###
+50 20 7
+...................#
+####################
+#####...############
+####################
+####################
+####################
+####################
+####################
+####################
+.....##############.
+####################
+####################
+.........########...
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+#########.##########
+####################
+####################
+####################
+....###########.....
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+##........##########
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+####################
+....##########......
+####################
+49 49 3
+.................................................
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+.................................................
+.................................................
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+........##########...............................
+#################################################
+###########..................####################
+#################################################
+#################################################
+#################################################
+#################################################
+.................................................
+#################################################
+#################################################
+#################################################
+#################################################
+#################################################
+.......#####.....................................
+.................................................
+#################################################
+................................################.
+..................................###########....
+#################################################
+#################################################
+#################################################
+#################################################
+45 25 4
+.........................
+#########################
+########............#####
+#########################
+.........................
+###############.#######.#
+###############.#######.#
+############....#######.#
+.........................
+############.#.##########
+############...##########
+#########################
+.................######..
+################.######.#
+.........................
+....................##...
+.........................
+#########################
+#########################
+#########################
+#########################
+#########################
+#########################
+..........####...........
+##.......................
+##.......................
+#########.####.##########
+..........####...........
+#########################
+#########################
+#########################
+#########################
+#########################
+#########################
+.........................
+##################.######
+##################.######
+##################.######
+.........................
+#########################
+#########################
+#########################
+.........................
+.........................
+.........................
+25 45 5
+.............................................
+#############################################
+####################################.########
+###########.#################################
+###########.#################################
+###########.#################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################################
+#############################...#############
+#############################.#.#############
+#############################...#############
+#############################################
+#############################################
+#############################################
+###..########################################
+###..########################################
+#########################################....
+####################################.####.##.
+50 50 18
+..................................................
+##################################################
+..##..##..##..##..##..##..##..##..##..##..##..##..
+.###.###.###.###.###.###.###.###.###.###.###.###.#
+....####....####....####....####....####....####..
+.#.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+..######..######..######..######..######..######..
+.#######.#######.#######.#######.#######.#######.#
+........########........########........########..
+.#.#.#.#########.#.#.#.#########.#.#.#.#########.#
+..##..##########..##..##########..##..##########..
+.###.###########.###.###########.###.###########.#
+....############....############....############..
+.#.#############.#.#############.#.#############.#
+..##############..##############..##############..
+.###############.###############.###############.#
+................################................##
+.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#.###
+..##..##..##..##################..##..##..##..####
+.###.###.###.###################.###.###.###.#####
+....####....####################....####....######
+.#.#####.#.#####################.#.#####.#.#######
+..######..######################..######..########
+.#######.#######################.#######.#########
+........########################........##########
+.#.#.#.#########################.#.#.#.###########
+..##..##########################..##..############
+.###.###########################.###.#############
+....############################....##############
+.#.#############################.#.###############
+..##############################..################
+.###############################.#################
+................................##################
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.###################
+..##..##..##..##..##..##..##..####################
+.###.###.###.###.###.###.###.#####################
+....####....####....####....######################
+.#.#####.#.#####.#.#####.#.#######################
+..######..######..######..########################
+.#######.#######.#######.#########################
+........########........##########################
+.#.#.#.#########.#.#.#.###########################
+..##..##########..##..############################
+.###.###########.###.#############################
+....############....##############################
+.#.#############.#.###############################
+..##############..################################
+.###############.#################################
+................##################################
+.#.#.#.#.#.#.#.###################################
+50 50 19
+..................................................
+##################################################
+..##..##..##..##..##..##..##..##..##..##..##..##..
+.###.###.###.###.###.###.###.###.###.###.###.###.#
+....####....####....####....####....####....####..
+.#.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+..######..######..######..######..######..######..
+.#######.#######.#######.#######.#######.#######.#
+........########........########........########..
+.#.#.#.#########.#.#.#.#########.#.#.#.#########.#
+..##..##########..##..##########..##..##########..
+.###.###########.###.###########.###.###########.#
+....############....############....############..
+.#.#############.#.#############.#.#############.#
+..##############..##############..##############..
+.###############.###############.###############.#
+................################................##
+.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#.###
+..##..##..##..##################..##..##..##..####
+.###.###.###.###################.###.###.###.#####
+....####....####################....####....######
+.#.#####.#.#####################.#.#####.#.#######
+..######..######################..######..########
+.#######.#######################.#######.#########
+........########################........##########
+.#.#.#.#########################.#.#.#.###########
+..##..##########################..##..############
+.###.###########################.###.#############
+....############################....##############
+.#.#############################.#.###############
+..##############################..################
+.###############################.#################
+................................##################
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.###################
+..##..##..##..##..##..##..##..####################
+.###.###.###.###.###.###.###.#####################
+....####....####....####....######################
+.#.#####.#.#####.#.#####.#.#######################
+..######..######..######..########################
+.#######.#######.#######.#########################
+........########........##########################
+.#.#.#.#########.#.#.#.###########################
+..##..##########..##..############################
+.###.###########.###.#############################
+....############....##############################
+.#.#############.#.###############################
+..##############..################################
+.###############.#################################
+................##################################
+.#.#.#.#.#.#.#.###################################
+50 50 20
+..................................................
+##################################################
+..##..##..##..##..##..##..##..##..##..##..##..##..
+.###.###.###.###.###.###.###.###.###.###.###.###.#
+....####....####....####....####....####....####..
+.#.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+..######..######..######..######..######..######..
+.#######.#######.#######.#######.#######.#######.#
+........########........########........########..
+.#.#.#.#########.#.#.#.#########.#.#.#.#########.#
+..##..##########..##..##########..##..##########..
+.###.###########.###.###########.###.###########.#
+....############....############....############..
+.#.#############.#.#############.#.#############.#
+..##############..##############..##############..
+.###############.###############.###############.#
+................################................##
+.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#.###
+..##..##..##..##################..##..##..##..####
+.###.###.###.###################.###.###.###.#####
+....####....####################....####....######
+.#.#####.#.#####################.#.#####.#.#######
+..######..######################..######..########
+.#######.#######################.#######.#########
+........########################........##########
+.#.#.#.#########################.#.#.#.###########
+..##..##########################..##..############
+.###.###########################.###.#############
+....############################....##############
+.#.#############################.#.###############
+..##############################..################
+.###############################.#################
+................................##################
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.###################
+..##..##..##..##..##..##..##..####################
+.###.###.###.###.###.###.###.#####################
+....####....####....####....######################
+.#.#####.#.#####.#.#####.#.#######################
+..######..######..######..########################
+.#######.#######.#######.#########################
+........########........##########################
+.#.#.#.#########.#.#.#.###########################
+..##..##########..##..############################
+.###.###########.###.#############################
+....############....##############################
+.#.#############.#.###############################
+..##############..################################
+.###############.#################################
+................##################################
+.#.#.#.#.#.#.#.###################################
+49 48 5
+................................................
+################################################
+################################.###############
+###############################..##############.
+##############################.#.#############.#
+#############################....############...
+############################.###.###########.###
+###########################..##..##########..##.
+##########################.#.#.#.#########.#.#.#
+#########################........########.......
+########################.#######.#######.#######
+#######################..######..######..######.
+######################.#.#####.#.#####.#.#####.#
+#####################....####....####....####...
+####################.###.###.###.###.###.###.###
+###################..##..##..##..##..##..##..##.
+##################.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+#################...............................
+################.###############################
+###############..##############################.
+##############.#.#############################.#
+#############....############################...
+############.###.###########################.###
+###########..##..##########################..##.
+##########.#.#.#.#########################.#.#.#
+#########........########################.......
+########.#######.#######################.#######
+#######..######..######################..######.
+######.#.#####.#.#####################.#.#####.#
+#####....####....####################....####...
+####.###.###.###.###################.###.###.###
+###..##..##..##..##################..##..##..##.
+##.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#
+#................################...............
+.###############.###############.###############
+.##############..##############..##############.
+.#############.#.#############.#.#############.#
+.############....############....############...
+.###########.###.###########.###.###########.###
+.##########..##..##########..##..##########..##.
+.#########.#.#.#.#########.#.#.#.#########.#.#.#
+.########........########........########.......
+.#######.#######.#######.#######.#######.#######
+.######..######..######..######..######..######.
+.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+.####....####....####....####....####....####...
+.###.###.###.###.###.###.###.###.###.###.###.###
+.##..##..##..##..##..##..##..##..##..##..##..##.
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+49 48 11
+................................................
+################################################
+################################.###############
+###############################..##############.
+##############################.#.#############.#
+#############################....############...
+############################.###.###########.###
+###########################..##..##########..##.
+##########################.#.#.#.#########.#.#.#
+#########################........########.......
+########################.#######.#######.#######
+#######################..######..######..######.
+######################.#.#####.#.#####.#.#####.#
+#####################....####....####....####...
+####################.###.###.###.###.###.###.###
+###################..##..##..##..##..##..##..##.
+##################.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+#################...............................
+################.###############################
+###############..##############################.
+##############.#.#############################.#
+#############....############################...
+############.###.###########################.###
+###########..##..##########################..##.
+##########.#.#.#.#########################.#.#.#
+#########........########################.......
+########.#######.#######################.#######
+#######..######..######################..######.
+######.#.#####.#.#####################.#.#####.#
+#####....####....####################....####...
+####.###.###.###.###################.###.###.###
+###..##..##..##..##################..##..##..##.
+##.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#
+#................################...............
+.###############.###############.###############
+.##############..##############..##############.
+.#############.#.#############.#.#############.#
+.############....############....############...
+.###########.###.###########.###.###########.###
+.##########..##..##########..##..##########..##.
+.#########.#.#.#.#########.#.#.#.#########.#.#.#
+.########........########........########.......
+.#######.#######.#######.#######.#######.#######
+.######..######..######..######..######..######.
+.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+.####....####....####....####....####....####...
+.###.###.###.###.###.###.###.###.###.###.###.###
+.##..##..##..##..##..##..##..##..##..##..##..##.
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+49 48 30
+................................................
+################################################
+################################.###############
+###############################..##############.
+##############################.#.#############.#
+#############################....############...
+############################.###.###########.###
+###########################..##..##########..##.
+##########################.#.#.#.#########.#.#.#
+#########################........########.......
+########################.#######.#######.#######
+#######################..######..######..######.
+######################.#.#####.#.#####.#.#####.#
+#####################....####....####....####...
+####################.###.###.###.###.###.###.###
+###################..##..##..##..##..##..##..##.
+##################.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+#################...............................
+################.###############################
+###############..##############################.
+##############.#.#############################.#
+#############....############################...
+############.###.###########################.###
+###########..##..##########################..##.
+##########.#.#.#.#########################.#.#.#
+#########........########################.......
+########.#######.#######################.#######
+#######..######..######################..######.
+######.#.#####.#.#####################.#.#####.#
+#####....####....####################....####...
+####.###.###.###.###################.###.###.###
+###..##..##..##..##################..##..##..##.
+##.#.#.#.#.#.#.#.#################.#.#.#.#.#.#.#
+#................################...............
+.###############.###############.###############
+.##############..##############..##############.
+.#############.#.#############.#.#############.#
+.############....############....############...
+.###########.###.###########.###.###########.###
+.##########..##..##########..##..##########..##.
+.#########.#.#.#.#########.#.#.#.#########.#.#.#
+.########........########........########.......
+.#######.#######.#######.#######.#######.#######
+.######..######..######..######..######..######.
+.#####.#.#####.#.#####.#.#####.#.#####.#.#####.#
+.####....####....####....####....####....####...
+.###.###.###.###.###.###.###.###.###.###.###.###
+.##..##..##..##..##..##..##..##..##..##..##..##.
+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#
+50 10 4
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#.........
+.#........
+..#.......
+...#......
+..........
+....#.....
+...#......
+..#.......
+.#........
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+#####.....
+50 10 5
+..........
+#####.....
+...##.....
+..........
+..........
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#.........
+.#........
+..#.......
+...#......
+..........
+....#.....
+...#......
+..#.......
+.#........
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#.........
+.#........
+..#.......
+...#......
+..........
+....#.....
+...#......
+..#.......
+.#........
+..........
+50 10 4
+..........
+#####.....
+#.........
+.#........
+..#.......
+...#......
+..........
+....#.....
+...#......
+..#.......
+.#........
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+50 10 5
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+##........
+..........
+..........
+..........
+#####.....
+#####.....
+.####.....
+#.###.....
+##.##.....
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+...##.....
+..........
+..........
+..........
+#####.....
+#####.....
+#####.....
+#####.....
+#####.....
+..........
+#####.....
+#####.....
+####......
+###.#.....
+##.##.....
+..........
+#####.....
+#.........
+.#........
+..#.......
+35 41 11
+........................................#
+#########################################
+##.......####.#..######.##.###...#####.##
+.##.#.#...#.###...##...#..#.#..##..######
+.#...##....#.###...##.#.##.#.###...####..
+.###...##.##..####..##.#.#####.#...#.#...
+..#...#.##..#...##..###..##...###...#.#..
+.#.####.##.##.###.....#..#..##.###..#.##.
+##..##..#...##.###.#...####...#..##....#.
+#....#..##.#.#.#......####.#.....#...#.#.
+#.##.#####......####......###.###..###.#.
+##..######...######.##.#.##.......#...#..
+.#.....###......#####...#..#.#.###...##.#
+...##.##.##..##...####.#.###...#..#.##..#
+....###.#.#..#...###..###.###..#####...##
+....##.##..#.#.#.#.#####...##..######....
+#.#.##.##.#...#####....##.#.#...#.##.#..#
+#.##.##.##.#...#.#.####...#..#.......##.#
+.##.#..###..####.#..###...#...###.##.##..
+.####.#.#######.#......##....#######..##.
+.#..#...#.#.####..#.######.#.#..##.#.####
+...#.###..#.##.#.###.#.#....#.###.#.#...#
+..#.#.####....###...#..##..#####.#.######
+#......####.#..##.....#####.##...###.....
+##..##..####......#.#.##..##...###.#.....
+#.#.####.####.......##......####.###..###
+##...###.#...#.####.##.#........##..#.###
+....#..#####.#....#.##...###..#####.#.###
+####.#.###.........####..###.#..######.##
+.#..########..###..#####.######.###.#...#
+.##..#.##..#....####...#.###.....##.#...#
+##.#..##.##..##.##...##.##.##.#.##.######
+..#..#..####..##...###.#...#.....###..#..
+####.#..####.###...##..#.#.###.#..#..####
+#...#..#..#.#...#...#.#.##.##.#...###.#.#
+31 41 12
+.........................................
+#################################.....#..
+.#..........#.......#....##....#...#.....
+.........#......#.#...#...#..#........#..
+#......#.#......#...#.........#.........#
+.................#....#...#...##.........
+.......#.#..#.....#..#.....##........#..#
+.....#..#..#......................#..#...
+..............#....##....#...#..#..#....#
+...#.#.#........##.#..#..........#......#
+...#......#..#......#....#....#....#.....
+......##.#...#.##..........#.............
+.......##.#.#..#...#.....#.#..#..........
+.........#..........#.................#..
+.#....#..#......#.......#.#..#..####.##..
+#...#................##...#..........#...
+..........#...#.#..#..###..#...#.........
+........##.......#.....##.#......#...#.#.
+.#.....#.#..#.....#.#..##.#.#...........#
+.......####...#.#.........#...#.#........
+.##.................#.#.#................
+.....###.#...#..#.#..............#.......
+.....#...#.....#........#....##.......#..
+.........#...........##.#..#.....##......
+...#....#.........#...#...#.#............
+.....#..............#..............#....#
+#.##...#.............#....#.#..#......#..
+........#...#...##.............#.#.......
+.......#.......#..............#..........
+.....#.........#.........#..#...#..#....#
+####..#...#.#.....##...........#.#.#.#.#.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5091921/output6890943.txt Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,50 @@
+Case #1: Yes 2
+Case #2: Yes 2
+Case #3: Yes 1
+Case #4: Yes 0
+Case #5: No
+Case #6: No
+Case #7: Yes 6
+Case #8: Yes 6
+Case #9: No
+Case #10: Yes 1
+Case #11: Yes 6
+Case #12: Yes 0
+Case #13: No
+Case #14: Yes 22
+Case #15: Yes 1225
+Case #16: Yes 178
+Case #17: No
+Case #18: Yes 1
+Case #19: Yes 7
+Case #20: Yes 2
+Case #21: Yes 1
+Case #22: No
+Case #23: Yes 3
+Case #24: Yes 1
+Case #25: Yes 7
+Case #26: No
+Case #27: Yes 2
+Case #28: Yes 4
+Case #29: Yes 2
+Case #30: Yes 1
+Case #31: Yes 2
+Case #32: Yes 20
+Case #33: Yes 161
+Case #34: Yes 48
+Case #35: No
+Case #36: Yes 218
+Case #37: Yes 51
+Case #38: Yes 247
+Case #39: Yes 32
+Case #40: Yes 31
+Case #41: Yes 31
+Case #42: Yes 25
+Case #43: Yes 17
+Case #44: Yes 2
+Case #45: Yes 61
+Case #46: Yes 25
+Case #47: No
+Case #48: No
+Case #49: Yes 8
+Case #50: Yes 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6796786/Test6796786.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6796786
+ * @summary invalid FP identity transform - (a - b) -> b - a
+ *
+ * @run main/othervm -Xbatch Test6796786
+ */
+
+public class Test6796786 {
+ static volatile float d1;
+ static volatile float d2;
+
+ public static void main(String[] args) {
+ int total = 0;
+ for (int i = 0; i < 100000; i++) {
+ if (Float.floatToRawIntBits(- (d1 - d2)) == Float.floatToRawIntBits(-0.0f)) {
+ total++;
+ }
+ }
+ if (total != 100000) {
+ throw new InternalError();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/7041100/Test7041100.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 7041100
+ * @summary The load in String.equals intrinsic executed before null check
+ *
+ * @run main/othervm -Xbatch Test7041100 abc def
+ */
+
+public class Test7041100 {
+
+ static String n = null;
+ public static void main(String[] args) throws Exception {
+ for (int i = 0; i < 10000; i++) {
+ stringEQ(args[0], args[1]);
+ stringEQ(args[0], args[0]);
+ stringEQ(args[0], n);
+ stringEQ(n, args[0]);
+ }
+ }
+
+ public static boolean stringEQ(String a, String b) {
+ if (a == b)
+ return true;
+ if (a == null || b == null)
+ return false;
+ else
+ return a.equals(b);
+ }
+}
--- a/jaxp/.hgtags Thu May 12 07:24:37 2011 -0700
+++ b/jaxp/.hgtags Thu May 12 07:28:52 2011 -0700
@@ -115,3 +115,4 @@
be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
c8136fd161c83917f87e93b14fa2ba3483f9be83 jdk7-b140
+e1b5ef243445bf836d095fd44866e1771ef99374 jdk7-b141
--- a/jaxp/jaxp.properties Thu May 12 07:24:37 2011 -0700
+++ b/jaxp/jaxp.properties Thu May 12 07:28:52 2011 -0700
@@ -25,13 +25,13 @@
drops.master.copy.base=${drops.dir}
-jaxp_src.bundle.name=jaxp-1_4_5-dev1.zip
-jaxp_src.bundle.md5.checksum=53c95613c29852a12b93e7249f1aa227
+jaxp_src.bundle.name=jaxp-1_4_5.zip
+jaxp_src.bundle.md5.checksum=485e731f26f35d4efe05a63c57104374
jaxp_src.master.bundle.dir=${drops.master.copy.base}
-jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5/dev
+jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
-jaxp_tests.bundle.name=jaxp-1_4_5-dev1-unittests.zip
-jaxp_tests.bundle.md5.checksum=754aaba2f4944f69bfea91dec11daf4c
+jaxp_tests.bundle.name=jaxp-1_4_5-unittests.zip
+jaxp_tests.bundle.md5.checksum=fda9b9ad17c459880c077df6ecc7df80
jaxp_tests.master.bundle.dir=${drops.master.copy.base}
-jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5/dev
+jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
--- a/jaxws/.hgtags Thu May 12 07:24:37 2011 -0700
+++ b/jaxws/.hgtags Thu May 12 07:28:52 2011 -0700
@@ -115,3 +115,4 @@
cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138
c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139
82a9022c4f21b1313023c8303b557a17c4106701 jdk7-b140
+66826b0aec5a1834da3821c35cf85ac154e9b04d jdk7-b141
--- a/jdk/make/java/management/Makefile Thu May 12 07:24:37 2011 -0700
+++ b/jdk/make/java/management/Makefile Thu May 12 07:28:52 2011 -0700
@@ -63,6 +63,20 @@
FILES_c += UnixOperatingSystem_md.c
FILES_export += com/sun/management/UnixOperatingSystem.java
+
+ifeq ($(PLATFORM),solaris)
+
+FILES_c += SolarisOperatingSystem.c
+OTHER_LDLIBS += -lkstat
+
+endif # PLATFORM solaris
+
+ifeq ($(PLATFORM),linux)
+
+FILES_c += LinuxOperatingSystem.c
+
+endif # PLATFORM linux
+
endif # PLATFORM
#
--- a/jdk/make/java/management/mapfile-vers Thu May 12 07:24:37 2011 -0700
+++ b/jdk/make/java/management/mapfile-vers Thu May 12 07:28:52 2011 -0700
@@ -32,7 +32,9 @@
Java_com_sun_management_UnixOperatingSystem_getFreeSwapSpaceSize;
Java_com_sun_management_UnixOperatingSystem_getMaxFileDescriptorCount;
Java_com_sun_management_UnixOperatingSystem_getOpenFileDescriptorCount;
+ Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad;
Java_com_sun_management_UnixOperatingSystem_getProcessCpuTime;
+ Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad;
Java_com_sun_management_UnixOperatingSystem_getTotalPhysicalMemorySize;
Java_com_sun_management_UnixOperatingSystem_getTotalSwapSpaceSize;
Java_com_sun_management_UnixOperatingSystem_initialize;
--- a/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java Thu May 12 07:24:37 2011 -0700
+++ b/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java Thu May 12 07:28:52 2011 -0700
@@ -92,4 +92,39 @@
* @return the total amount of physical memory in bytes.
*/
public long getTotalPhysicalMemorySize();
+
+ /**
+ * Returns the "recent cpu usage" for the whole system. This value is a
+ * double in the [0.0,1.0] interval. A value of 0.0 means that all CPUs
+ * were idle during the recent period of time observed, while a value
+ * of 1.0 means that all CPUs were actively running 100% of the time
+ * during the recent period being observed. All values betweens 0.0 and
+ * 1.0 are possible depending of the activities going on in the system.
+ * If the system recent cpu usage is not available, the method returns a
+ * negative value.
+ *
+ * @return the "recent cpu usage" for the whole system; a negative
+ * value if not available.
+ * @since 1.7
+ */
+ public double getSystemCpuLoad();
+
+ /**
+ * Returns the "recent cpu usage" for the Java Virtual Machine process.
+ * This value is a double in the [0.0,1.0] interval. A value of 0.0 means
+ * that none of the CPUs were running threads from the JVM process during
+ * the recent period of time observed, while a value of 1.0 means that all
+ * CPUs were actively running threads from the JVM 100% of the time
+ * during the recent period being observed. Threads from the JVM include
+ * the application threads as well as the JVM internal threads. All values
+ * betweens 0.0 and 1.0 are possible depending of the activities going on
+ * in the JVM process and the whole system. If the Java Virtual Machine
+ * recent CPU usage is not available, the method returns a negative value.
+ *
+ * @return the "recent cpu usage" for the Java Virtual Machine process;
+ * a negative value if not available.
+ * @since 1.7
+ */
+ public double getProcessCpuLoad();
+
}
--- a/jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java Thu May 12 07:24:37 2011 -0700
+++ b/jdk/src/solaris/classes/com/sun/management/UnixOperatingSystem.java Thu May 12 07:28:52 2011 -0700
@@ -50,6 +50,8 @@
public native long getTotalPhysicalMemorySize();
public native long getOpenFileDescriptorCount();
public native long getMaxFileDescriptorCount();
+ public native double getSystemCpuLoad();
+ public native double getProcessCpuLoad();
static {
initialize();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/native/com/sun/management/LinuxOperatingSystem.c Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <pthread.h>
+#include "com_sun_management_UnixOperatingSystem.h"
+
+struct ticks {
+ uint64_t used;
+ uint64_t usedKernel;
+ uint64_t total;
+};
+
+typedef struct ticks ticks;
+
+typedef enum {
+ CPU_LOAD_VM_ONLY,
+ CPU_LOAD_GLOBAL,
+} CpuLoadTarget;
+
+static struct perfbuf {
+ int nProcs;
+ ticks jvmTicks;
+ ticks cpuTicks;
+ ticks *cpus;
+} counters;
+
+#define DEC_64 "%lld"
+
+static void next_line(FILE *f) {
+ while (fgetc(f) != '\n');
+}
+
+/**
+ * Return the total number of ticks since the system was booted.
+ * If the usedTicks parameter is not NULL, it will be filled with
+ * the number of ticks spent on actual processes (user, system or
+ * nice processes) since system boot. Note that this is the total number
+ * of "executed" ticks on _all_ CPU:s, that is on a n-way system it is
+ * n times the number of ticks that has passed in clock time.
+ *
+ * Returns a negative value if the reading of the ticks failed.
+ */
+static int get_totalticks(int which, ticks *pticks) {
+ FILE *fh;
+ uint64_t userTicks, niceTicks, systemTicks, idleTicks;
+ int n;
+
+ if((fh = fopen("/proc/stat", "r")) == NULL) {
+ return -1;
+ }
+
+ n = fscanf(fh, "cpu " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64,
+ &userTicks, &niceTicks, &systemTicks, &idleTicks);
+
+ // Move to next line
+ next_line(fh);
+
+ //find the line for requested cpu faster to just iterate linefeeds?
+ if (which != -1) {
+ int i;
+ for (i = 0; i < which; i++) {
+ if (fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64, &userTicks, &niceTicks, &systemTicks, &idleTicks) != 4) {
+ fclose(fh);
+ return -2;
+ }
+ next_line(fh);
+ }
+ n = fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64 "\n",
+ &userTicks, &niceTicks, &systemTicks, &idleTicks);
+ }
+
+ fclose(fh);
+ if (n != 4) {
+ return -2;
+ }
+
+ pticks->used = userTicks + niceTicks;
+ pticks->usedKernel = systemTicks;
+ pticks->total = userTicks + niceTicks + systemTicks + idleTicks;
+
+ return 0;
+}
+
+static int vread_statdata(const char *procfile, const char *fmt, va_list args) {
+ FILE *f;
+ int n;
+ char buf[2048];
+
+ if ((f = fopen(procfile, "r")) == NULL) {
+ return -1;
+ }
+
+ if ((n = fread(buf, 1, sizeof(buf), f)) != -1) {
+ char *tmp;
+
+ buf[n-1] = '\0';
+ /** skip through pid and exec name. the exec name _could be wacky_ (renamed) and
+ * make scanf go mupp.
+ */
+ if ((tmp = strrchr(buf, ')')) != NULL) {
+ // skip the ')' and the following space but check that the buffer is long enough
+ tmp += 2;
+ if (tmp < buf + n) {
+ n = vsscanf(tmp, fmt, args);
+ }
+ }
+ }
+
+ fclose(f);
+
+ return n;
+}
+
+static int read_statdata(const char *procfile, const char *fmt, ...) {
+ int n;
+ va_list args;
+
+ va_start(args, fmt);
+ n = vread_statdata(procfile, fmt, args);
+ va_end(args);
+ return n;
+}
+
+/** read user and system ticks from a named procfile, assumed to be in 'stat' format then. */
+static int read_ticks(const char *procfile, uint64_t *userTicks, uint64_t *systemTicks) {
+ return read_statdata(procfile, "%*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u "DEC_64" "DEC_64,
+ userTicks, systemTicks
+ );
+}
+
+/**
+ * Return the number of ticks spent in any of the processes belonging
+ * to the JVM on any CPU.
+ */
+static int get_jvmticks(ticks *pticks) {
+ uint64_t userTicks;
+ uint64_t systemTicks;
+
+ if (read_ticks("/proc/self/stat", &userTicks, &systemTicks) < 0) {
+ return -1;
+ }
+
+ // get the total
+ if (get_totalticks(-1, pticks) < 0) {
+ return -1;
+ }
+
+ pticks->used = userTicks;
+ pticks->usedKernel = systemTicks;
+
+ return 0;
+}
+
+/**
+ * This method must be called first, before any data can be gathererd.
+ */
+int perfInit() {
+ static int initialized=1;
+
+ if (!initialized) {
+ int i;
+
+ int n = sysconf(_SC_NPROCESSORS_ONLN);
+ if (n <= 0) {
+ n = 1;
+ }
+
+ counters.cpus = calloc(n,sizeof(ticks));
+ if (counters.cpus != NULL) {
+ // For the CPU load
+ get_totalticks(-1, &counters.cpuTicks);
+
+ for (i = 0; i < n; i++) {
+ get_totalticks(i, &counters.cpus[i]);
+ }
+ // For JVM load
+ get_jvmticks(&counters.jvmTicks);
+ initialized = 1;
+ }
+ }
+
+ return initialized ? 0 : -1;
+}
+
+#define MAX(a,b) (a>b?a:b)
+#define MIN(a,b) (a<b?a:b)
+
+static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+
+/**
+ * Return the load of the CPU as a double. 1.0 means the CPU process uses all
+ * available time for user or system processes, 0.0 means the CPU uses all time
+ * being idle.
+ *
+ * Returns a negative value if there is a problem in determining the CPU load.
+ */
+
+static double get_cpuload_internal(int which, double *pkernelLoad, CpuLoadTarget target) {
+ uint64_t udiff, kdiff, tdiff;
+ ticks *pticks, tmp;
+ double user_load = -1.0;
+ int failed = 0;
+
+ *pkernelLoad = 0.0;
+
+ pthread_mutex_lock(&lock);
+
+ if(perfInit() == 0) {
+
+ if (target == CPU_LOAD_VM_ONLY) {
+ pticks = &counters.jvmTicks;
+ } else if (which == -1) {
+ pticks = &counters.cpuTicks;
+ } else {
+ pticks = &counters.cpus[which];
+ }
+
+ tmp = *pticks;
+
+ if (target == CPU_LOAD_VM_ONLY) {
+ if (get_jvmticks(pticks) != 0) {
+ failed = 1;
+ }
+ } else if (get_totalticks(which, pticks) < 0) {
+ failed = 1;
+ }
+
+ if(!failed) {
+ // seems like we sometimes end up with less kernel ticks when
+ // reading /proc/self/stat a second time, timing issue between cpus?
+ if (pticks->usedKernel < tmp.usedKernel) {
+ kdiff = 0;
+ } else {
+ kdiff = pticks->usedKernel - tmp.usedKernel;
+ }
+ tdiff = pticks->total - tmp.total;
+ udiff = pticks->used - tmp.used;
+
+ if (tdiff == 0) {
+ user_load = 0;
+ } else {
+ if (tdiff < (udiff + kdiff)) {
+ tdiff = udiff + kdiff;
+ }
+ *pkernelLoad = (kdiff / (double)tdiff);
+ // BUG9044876, normalize return values to sane values
+ *pkernelLoad = MAX(*pkernelLoad, 0.0);
+ *pkernelLoad = MIN(*pkernelLoad, 1.0);
+
+ user_load = (udiff / (double)tdiff);
+ user_load = MAX(user_load, 0.0);
+ user_load = MIN(user_load, 1.0);
+ }
+ }
+ }
+ pthread_mutex_unlock(&lock);
+ return user_load;
+}
+
+double get_cpu_load(int which) {
+ double u, s;
+ u = get_cpuload_internal(which, &s, CPU_LOAD_GLOBAL);
+ if (u < 0) {
+ return -1.0;
+ }
+ // Cap total systemload to 1.0
+ return MIN((u + s), 1.0);
+}
+
+double get_process_load() {
+ double u, s;
+ u = get_cpuload_internal(-1, &s, CPU_LOAD_VM_ONLY);
+ if (u < 0) {
+ return -1.0;
+ }
+ return u + s;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ if(perfInit() == 0) {
+ return get_cpu_load(-1);
+ } else {
+ return -1.0;
+ }
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ if(perfInit() == 0) {
+ return get_process_load();
+ } else {
+ return -1.0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/native/com/sun/management/SolarisOperatingSystem.c Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <fcntl.h>
+#include <kstat.h>
+#include <procfs.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/sysinfo.h>
+#include <sys/lwp.h>
+#include <pthread.h>
+#include <utmpx.h>
+#include <dlfcn.h>
+#include <sys/loadavg.h>
+#include <jni.h>
+#include "jvm.h"
+#include "com_sun_management_UnixOperatingSystem.h"
+
+typedef struct {
+ kstat_t *kstat;
+ uint64_t last_idle;
+ uint64_t last_total;
+ double last_ratio;
+} cpuload_t;
+
+static cpuload_t *cpu_loads = NULL;
+static unsigned int num_cpus;
+static kstat_ctl_t *kstat_ctrl = NULL;
+
+static void map_cpu_kstat_counters() {
+ kstat_t *kstat;
+ int i;
+
+ // Get number of CPU(s)
+ if ((num_cpus = sysconf(_SC_NPROCESSORS_ONLN)) == -1) {
+ num_cpus = 1;
+ }
+
+ // Data structure for saving CPU load
+ if ((cpu_loads = calloc(num_cpus,sizeof(cpuload_t))) == NULL) {
+ return;
+ }
+
+ // Get kstat cpu_stat counters for every CPU
+ // (loop over kstat to find our cpu_stat(s)
+ i = 0;
+ for (kstat = kstat_ctrl->kc_chain; kstat != NULL; kstat = kstat->ks_next) {
+ if (strncmp(kstat->ks_module, "cpu_stat", 8) == 0) {
+
+ if (kstat_read(kstat_ctrl, kstat, NULL) == -1) {
+ // Failed to initialize kstat for this CPU so ignore it
+ continue;
+ }
+
+ if (i == num_cpus) {
+ // Found more cpu_stats than reported CPUs
+ break;
+ }
+
+ cpu_loads[i++].kstat = kstat;
+ }
+ }
+}
+
+static int init_cpu_kstat_counters() {
+ static int initialized = 0;
+
+ // Concurrence in this method is prevented by the lock in
+ // the calling method get_cpu_load();
+ if(!initialized) {
+ if ((kstat_ctrl = kstat_open()) != NULL) {
+ map_cpu_kstat_counters();
+ initialized = 1;
+ }
+ }
+ return initialized ? 0 : -1;
+}
+
+static void update_cpu_kstat_counters() {
+ if(kstat_chain_update(kstat_ctrl) != 0) {
+ free(cpu_loads);
+ map_cpu_kstat_counters();
+ }
+}
+
+int read_cpustat(cpuload_t *load, cpu_stat_t *cpu_stat) {
+ if (load->kstat == NULL) {
+ // no handle.
+ return -1;
+ }
+ if (kstat_read(kstat_ctrl, load->kstat, cpu_stat) == -1) {
+ // disabling for now, a kstat chain update is likely to happen next time
+ load->kstat = NULL;
+ return -1;
+ }
+ return 0;
+}
+
+double get_single_cpu_load(unsigned int n) {
+ cpuload_t *load;
+ cpu_stat_t cpu_stat;
+ uint_t *usage;
+ uint64_t c_idle;
+ uint64_t c_total;
+ uint64_t d_idle;
+ uint64_t d_total;
+ int i;
+
+ if (n >= num_cpus) {
+ return -1.0;
+ }
+
+ load = &cpu_loads[n];
+ if (read_cpustat(load, &cpu_stat) < 0) {
+ return -1.0;
+ }
+
+ usage = cpu_stat.cpu_sysinfo.cpu;
+ c_idle = usage[CPU_IDLE];
+
+ for (c_total = 0, i = 0; i < CPU_STATES; i++) {
+ c_total += usage[i];
+ }
+
+ // Calculate diff against previous snapshot
+ d_idle = c_idle - load->last_idle;
+ d_total = c_total - load->last_total;
+
+ /** update if weve moved */
+ if (d_total > 0) {
+ // Save current values for next time around
+ load->last_idle = c_idle;
+ load->last_total = c_total;
+ load->last_ratio = (double) (d_total - d_idle) / d_total;
+ }
+
+ return load->last_ratio;
+}
+
+int get_info(const char *path, void *info, size_t s, off_t o) {
+ int fd;
+ int ret = 0;
+ if ((fd = open(path, O_RDONLY)) < 0) {
+ return -1;
+ }
+ if (pread(fd, info, s, o) != s) {
+ ret = -1;
+ }
+ close(fd);
+ return ret;
+}
+
+#define MIN(a, b) ((a < b) ? a : b)
+
+static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+
+/**
+ * Return the cpu load (0-1) for proc number 'which' (or average all if which == -1)
+ */
+double get_cpu_load(int which) {
+ double load =.0;
+
+ pthread_mutex_lock(&lock);
+ if(init_cpu_kstat_counters()==0) {
+
+ update_cpu_kstat_counters();
+
+ if (which == -1) {
+ unsigned int i;
+ double t;
+
+ for (t = .0, i = 0; i < num_cpus; i++) {
+ t += get_single_cpu_load(i);
+ }
+
+ // Cap total systemload to 1.0
+ load = MIN((t / num_cpus), 1.0);
+ } else {
+ load = MIN(get_single_cpu_load(which), 1.0);
+ }
+ } else {
+ load = -1.0;
+ }
+ pthread_mutex_unlock(&lock);
+
+ return load;
+}
+
+/**
+ * Return the cpu load (0-1) for the current process (i.e the JVM)
+ * or -1.0 if the get_info() call failed
+ */
+double get_process_load(void) {
+ psinfo_t info;
+
+ // Get the percentage of "recent cpu usage" from all the lwp:s in the JVM:s
+ // process. This is returned as a value between 0.0 and 1.0 multiplied by 0x8000.
+ if (get_info("/proc/self/psinfo",&info.pr_pctcpu, sizeof(info.pr_pctcpu), offsetof(psinfo_t, pr_pctcpu)) == 0) {
+ return (double) info.pr_pctcpu / 0x8000;
+ }
+ return -1.0;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ return get_cpu_load(-1);
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ return get_process_load();
+}
+
--- a/jdk/src/windows/classes/com/sun/management/OperatingSystem.java Thu May 12 07:24:37 2011 -0700
+++ b/jdk/src/windows/classes/com/sun/management/OperatingSystem.java Thu May 12 07:28:52 2011 -0700
@@ -58,6 +58,8 @@
public native long getProcessCpuTime();
public native long getFreePhysicalMemorySize();
public native long getTotalPhysicalMemorySize();
+ public native double getSystemCpuLoad();
+ public native double getProcessCpuLoad();
static {
initialize();
--- a/jdk/src/windows/native/com/sun/management/OperatingSystem_md.c Thu May 12 07:24:37 2011 -0700
+++ b/jdk/src/windows/native/com/sun/management/OperatingSystem_md.c Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -34,9 +34,27 @@
#include <errno.h>
#include <stdlib.h>
+#include <malloc.h>
+#pragma warning (push,0)
+#include <windows.h>
+#pragma warning (pop)
+#include <stdio.h>
+#include <time.h>
+#include <stdint.h>
+#include <assert.h>
+
+/* Disable warnings due to broken header files from Microsoft... */
+#pragma warning(push, 3)
+#include <pdh.h>
+#include <pdhmsg.h>
+#include <process.h>
+#pragma warning(pop)
+
typedef unsigned __int32 juint;
typedef unsigned __int64 julong;
+typedef enum boolean_values { false=0, true=1};
+
static void set_low(jlong* value, jint low) {
*value &= (jlong)0xffffffff << 32;
*value |= (jlong)(julong)(juint)low;
@@ -56,11 +74,14 @@
static HANDLE main_process;
+int perfiInit(void);
+
JNIEXPORT void JNICALL
Java_com_sun_management_OperatingSystem_initialize
(JNIEnv *env, jclass cls)
{
main_process = GetCurrentProcess();
+ perfiInit();
}
JNIEXPORT jlong JNICALL
@@ -132,3 +153,788 @@
GlobalMemoryStatus(&ms);
return ms.dwTotalPhys;
}
+
+// Seems WinXP PDH returns PDH_MORE_DATA whenever we send in a NULL buffer.
+// Let's just ignore it, since we make sure we have enough buffer anyway.
+static int
+pdh_fail(PDH_STATUS pdhStat) {
+ return pdhStat != ERROR_SUCCESS && pdhStat != PDH_MORE_DATA;
+}
+
+// INFO: Using PDH APIs Correctly in a Localized Language (Q287159)
+// http://support.microsoft.com/default.aspx?scid=kb;EN-US;q287159
+// The index value for the base system counters and objects like processor,
+// process, thread, memory, and so forth are always the same irrespective
+// of the localized version of the operating system or service pack installed.
+#define PDH_PROCESSOR_IDX ((DWORD) 238)
+#define PDH_PROCESSOR_TIME_IDX ((DWORD) 6)
+#define PDH_PRIV_PROCESSOR_TIME_IDX ((DWORD) 144)
+#define PDH_PROCESS_IDX ((DWORD) 230)
+#define PDH_ID_PROCESS_IDX ((DWORD) 784)
+#define PDH_CONTEXT_SWITCH_RATE_IDX ((DWORD) 146)
+#define PDH_SYSTEM_IDX ((DWORD) 2)
+#define PDH_VIRTUAL_BYTES_IDX ((DWORD) 174)
+
+typedef PDH_STATUS (WINAPI *PdhAddCounterFunc)(
+ HQUERY hQuery,
+ LPCSTR szFullCounterPath,
+ DWORD dwUserData,
+ HCOUNTER *phCounter
+ );
+typedef PDH_STATUS (WINAPI *PdhOpenQueryFunc)(
+ LPCWSTR szDataSource,
+ DWORD dwUserData,
+ HQUERY *phQuery
+ );
+typedef DWORD (WINAPI *PdhCloseQueryFunc)(
+ HQUERY hQuery
+ );
+typedef PDH_STATUS (WINAPI *PdhCollectQueryDataFunc)(
+ HQUERY hQuery
+ );
+typedef DWORD (WINAPI *PdhGetFormattedCounterValueFunc)(
+ HCOUNTER hCounter,
+ DWORD dwFormat,
+ LPDWORD lpdwType,
+ PPDH_FMT_COUNTERVALUE pValue
+ );
+typedef PDH_STATUS (WINAPI *PdhEnumObjectItemsFunc)(
+ LPCTSTR szDataSource,
+ LPCTSTR szMachineName,
+ LPCTSTR szObjectName,
+ LPTSTR mszCounterList,
+ LPDWORD pcchCounterListLength,
+ LPTSTR mszInstanceList,
+ LPDWORD pcchInstanceListLength,
+ DWORD dwDetailLevel,
+ DWORD dwFlags
+ );
+typedef PDH_STATUS (WINAPI *PdhRemoveCounterFunc)(
+ HCOUNTER hCounter
+ );
+typedef PDH_STATUS (WINAPI *PdhLookupPerfNameByIndexFunc)(
+ LPCSTR szMachineName,
+ DWORD dwNameIndex,
+ LPSTR szNameBuffer,
+ LPDWORD pcchNameBufferSize
+ );
+typedef PDH_STATUS (WINAPI *PdhMakeCounterPathFunc)(
+ PDH_COUNTER_PATH_ELEMENTS *pCounterPathElements,
+ LPTSTR szFullPathBuffer,
+ LPDWORD pcchBufferSize,
+ DWORD dwFlags
+ );
+
+static PdhAddCounterFunc PdhAddCounter_i;
+static PdhOpenQueryFunc PdhOpenQuery_i;
+static PdhCloseQueryFunc PdhCloseQuery_i;
+static PdhCollectQueryDataFunc PdhCollectQueryData_i;
+static PdhGetFormattedCounterValueFunc PdhGetFormattedCounterValue_i;
+static PdhEnumObjectItemsFunc PdhEnumObjectItems_i;
+static PdhRemoveCounterFunc PdhRemoveCounter_i;
+static PdhLookupPerfNameByIndexFunc PdhLookupPerfNameByIndex_i;
+static PdhMakeCounterPathFunc PdhMakeCounterPath_i;
+
+static HANDLE thisProcess;
+static double cpuFactor;
+static DWORD num_cpus;
+
+#define FT2JLONG(X) ((((jlong)X.dwHighDateTime) << 32) | ((jlong)X.dwLowDateTime))
+#define COUNTER_BUF_SIZE 256
+// Min time between query updates.
+#define MIN_UPDATE_INTERVAL 500
+#define CONFIG_SUCCESSFUL 0
+
+/**
+ * Struct for PDH queries.
+ */
+typedef struct {
+ HQUERY query;
+ uint64_t lastUpdate; // Last time query was updated (current millis).
+} UpdateQueryS, *UpdateQueryP;
+
+/**
+ * Struct for the processor load counters.
+ */
+typedef struct {
+ UpdateQueryS query;
+ HCOUNTER* counters;
+ int noOfCounters;
+} MultipleCounterQueryS, *MultipleCounterQueryP;
+
+/**
+ * Struct for the jvm process load counter.
+ */
+typedef struct {
+ UpdateQueryS query;
+ HCOUNTER counter;
+} SingleCounterQueryS, *SingleCounterQueryP;
+
+static char* getProcessPDHHeader(void);
+
+/**
+ * Currently available counters.
+ */
+static SingleCounterQueryS cntCtxtSwitchRate;
+static SingleCounterQueryS cntVirtualSize;
+static SingleCounterQueryS cntProcLoad;
+static SingleCounterQueryS cntProcSystemLoad;
+static MultipleCounterQueryS multiCounterCPULoad;
+
+static CRITICAL_SECTION processHeaderLock;
+static CRITICAL_SECTION initializationLock;
+
+/**
+ * Initialize the perf module at startup.
+ */
+int
+perfiInit(void)
+{
+ InitializeCriticalSection(&processHeaderLock);
+ InitializeCriticalSection(&initializationLock);
+ return 0;
+}
+
+/**
+ * Dynamically sets up function pointers to the PDH library.
+ *
+ * @return CONFIG_SUCCESSFUL on success, negative on failure.
+ */
+static int
+get_functions(HMODULE h, char *ebuf, size_t elen) {
+ // The 'A' at the end means the ANSI (not the UNICODE) vesions of the methods
+ PdhAddCounter_i = (PdhAddCounterFunc)GetProcAddress(h, "PdhAddCounterA");
+ PdhOpenQuery_i = (PdhOpenQueryFunc)GetProcAddress(h, "PdhOpenQueryA");
+ PdhCloseQuery_i = (PdhCloseQueryFunc)GetProcAddress(h, "PdhCloseQuery");
+ PdhCollectQueryData_i = (PdhCollectQueryDataFunc)GetProcAddress(h, "PdhCollectQueryData");
+ PdhGetFormattedCounterValue_i = (PdhGetFormattedCounterValueFunc)GetProcAddress(h, "PdhGetFormattedCounterValue");
+ PdhEnumObjectItems_i = (PdhEnumObjectItemsFunc)GetProcAddress(h, "PdhEnumObjectItemsA");
+ PdhRemoveCounter_i = (PdhRemoveCounterFunc)GetProcAddress(h, "PdhRemoveCounter");
+ PdhLookupPerfNameByIndex_i = (PdhLookupPerfNameByIndexFunc)GetProcAddress(h, "PdhLookupPerfNameByIndexA");
+ PdhMakeCounterPath_i = (PdhMakeCounterPathFunc)GetProcAddress(h, "PdhMakeCounterPathA");
+
+ if (PdhAddCounter_i == NULL || PdhOpenQuery_i == NULL ||
+ PdhCloseQuery_i == NULL || PdhCollectQueryData_i == NULL ||
+ PdhGetFormattedCounterValue_i == NULL || PdhEnumObjectItems_i == NULL ||
+ PdhRemoveCounter_i == NULL || PdhLookupPerfNameByIndex_i == NULL || PdhMakeCounterPath_i == NULL)
+ {
+ _snprintf(ebuf, elen, "Required method could not be found.");
+ return -1;
+ }
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Returns the counter value as a double for the specified query.
+ * Will collect the query data and update the counter values as necessary.
+ *
+ * @param query the query to update (if needed).
+ * @param c the counter to read.
+ * @param value where to store the formatted value.
+ * @param format the format to use (i.e. PDH_FMT_DOUBLE, PDH_FMT_LONG etc)
+ * @return CONFIG_SUCCESSFUL if no error
+ * -1 if PdhCollectQueryData fails
+ * -2 if PdhGetFormattedCounterValue fails
+ */
+static int
+getPerformanceData(UpdateQueryP query, HCOUNTER c, PDH_FMT_COUNTERVALUE* value, DWORD format) {
+ clock_t now;
+ now = clock();
+
+ // Need to limit how often we update the query
+ // to mimise the heisenberg effect.
+ // (PDH behaves erratically if the counters are
+ // queried too often, especially counters that
+ // store and use values from two consecutive updates,
+ // like cpu load.)
+ if (now - query->lastUpdate > MIN_UPDATE_INTERVAL) {
+ if (PdhCollectQueryData_i(query->query) != ERROR_SUCCESS) {
+ return -1;
+ }
+ query->lastUpdate = now;
+ }
+
+ if (PdhGetFormattedCounterValue_i(c, format, NULL, value) != ERROR_SUCCESS) {
+ return -2;
+ }
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Places the resolved counter name of the counter at the specified index in the
+ * supplied buffer. There must be enough space in the buffer to hold the counter name.
+ *
+ * @param index the counter index as specified in the registry.
+ * @param buf the buffer in which to place the counter name.
+ * @param size the size of the counter name buffer.
+ * @param ebuf the error message buffer.
+ * @param elen the length of the error buffer.
+ * @return CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+static int
+find_name(DWORD index, char *buf, DWORD size) {
+ PDH_STATUS res;
+
+ if ((res = PdhLookupPerfNameByIndex_i(NULL, index, buf, &size)) != ERROR_SUCCESS) {
+
+ /* printf("Could not open counter %d: error=0x%08x", index, res); */
+ /* if (res == PDH_CSTATUS_NO_MACHINE) { */
+ /* printf("User probably does not have sufficient privileges to use"); */
+ /* printf("performance counters. If you are running on Windows 2003"); */
+ /* printf("or Windows Vista, make sure the user is in the"); */
+ /* printf("Performance Logs user group."); */
+ /* } */
+ return -1;
+ }
+
+ if (size == 0) {
+ /* printf("Failed to get counter name for %d: empty string", index); */
+ return -1;
+ }
+
+ // windows vista does not null-terminate the string (allthough the docs says it will)
+ buf[size - 1] = '\0';
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Sets up the supplied SingleCounterQuery to listen for the specified counter.
+ * initPDH() must have been run prior to calling this function!
+ *
+ * @param counterQuery the counter query to set up.
+ * @param counterString the string specifying the path to the counter.
+ * @param ebuf the error buffer.
+ * @param elen the length of the error buffer.
+ * @returns CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+static int
+initSingleCounterQuery(SingleCounterQueryP counterQuery, char *counterString) {
+ if (PdhOpenQuery_i(NULL, 0, &counterQuery->query.query) != ERROR_SUCCESS) {
+ /* printf("Could not open query for %s", counterString); */
+ return -1;
+ }
+ if (PdhAddCounter_i(counterQuery->query.query, counterString, 0, &counterQuery->counter) != ERROR_SUCCESS) {
+ /* printf("Could not add counter %s for query", counterString); */
+ if (counterQuery->counter != NULL) {
+ PdhRemoveCounter_i(counterQuery->counter);
+ }
+ if (counterQuery->query.query != NULL) {
+ PdhCloseQuery_i(counterQuery->query.query);
+ }
+ memset(counterQuery, 0, sizeof(SingleCounterQueryS));
+ return -1;
+ }
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Sets up the supplied SingleCounterQuery to listen for the time spent
+ * by the HotSpot process.
+ *
+ * @param counterQuery the counter query to set up as a process counter.
+ * @param ebuf the error buffer.
+ * @param elen the length of the error buffer.
+ * @returns CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+static int
+initProcLoadCounter(void) {
+ char time[COUNTER_BUF_SIZE];
+ char counter[COUNTER_BUF_SIZE*2];
+
+ if (find_name(PDH_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) {
+ return -1;
+ }
+ _snprintf(counter, sizeof(counter)-1, "%s\\%s", getProcessPDHHeader(), time);
+ return initSingleCounterQuery(&cntProcLoad, counter);
+}
+
+static int
+initProcSystemLoadCounter(void) {
+ char time[COUNTER_BUF_SIZE];
+ char counter[COUNTER_BUF_SIZE*2];
+
+ if (find_name(PDH_PRIV_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) {
+ return -1;
+ }
+ _snprintf(counter, sizeof(counter)-1, "%s\\%s", getProcessPDHHeader(), time);
+ return initSingleCounterQuery(&cntProcSystemLoad, counter);
+}
+
+/**
+ * Sets up the supplied MultipleCounterQuery to check on the processors.
+ * (Comment: Refactor and prettify as with the the SingleCounter queries
+ * if more MultipleCounterQueries are discovered.)
+ *
+ * initPDH() must have been run prior to calling this function.
+ *
+ * @param multiQuery a pointer to a MultipleCounterQueryS, will be filled in with
+ * the necessary info to check the PDH processor counters.
+ * @return CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+static int
+initProcessorCounters(void) {
+ char processor[COUNTER_BUF_SIZE]; //'Processor' == #238
+ char time[COUNTER_BUF_SIZE]; //'Time' == 6
+ DWORD c_size, i_size;
+ HQUERY tmpQuery;
+ DWORD i, p_count;
+ BOOL error;
+ char *instances, *tmp;
+ PDH_STATUS pdhStat;
+
+ c_size = i_size = 0;
+ tmpQuery = NULL;
+ error = false;
+
+ // This __try / __except stuff is there since Windows 2000 beta (or so) sometimes triggered
+ // an access violation when the user had insufficient privileges to use the performance
+ // counters. This was previously guarded by a very ugly piece of code which disabled the
+ // global trap handling in JRockit. Don't know if this really is needed anymore, but otoh,
+ // if we keep it we don't crash on Win2k beta. /Ihse, 2005-05-30
+ __try {
+ if (find_name(PDH_PROCESSOR_IDX, processor, sizeof(processor)-1) < 0) {
+ return -1;
+ }
+ } __except (EXCEPTION_EXECUTE_HANDLER) { // We'll catch all exceptions here.
+ /* printf("User does not have sufficient privileges to use performance counters"); */
+ return -1;
+ }
+
+ if (find_name(PDH_PROCESSOR_TIME_IDX, time, sizeof(time)-1) < 0) {
+ return -1;
+ }
+ //ok, now we have enough to enumerate all processors.
+ pdhStat = PdhEnumObjectItems_i (
+ NULL, // reserved
+ NULL, // local machine
+ processor, // object to enumerate
+ NULL, // pass in NULL buffers
+ &c_size, // and 0 length to get
+ NULL, // required size
+ &i_size, // of the buffers in chars
+ PERF_DETAIL_WIZARD, // counter detail level
+ 0);
+ if (pdh_fail(pdhStat)) {
+ /* printf("could not enumerate processors (1) error=%d", pdhStat); */
+ return -1;
+ }
+
+ // use calloc because windows vista does not null terminate the instance names (allthough the docs says it will)
+ instances = calloc(i_size, 1);
+ if (instances == NULL) {
+ /* printf("could not allocate memory (1) %d bytes", i_size); */
+ error = true;
+ goto end;
+ }
+
+ c_size = 0;
+ pdhStat = PdhEnumObjectItems_i (
+ NULL, // reserved
+ NULL, // local machine
+ processor, // object to enumerate
+ NULL, // pass in NULL buffers
+ &c_size, // and 0 length to get
+ instances, // required size
+ &i_size, // of the buffers in chars
+ PERF_DETAIL_WIZARD, // counter detail level
+ 0);
+
+ if (pdh_fail(pdhStat)) {
+ /* printf("could not enumerate processors (2) error=%d", pdhStat); */
+ error = true;
+ goto end;
+ }
+ //count perf count instances.
+ for (p_count = 0, tmp = instances; *tmp != 0; tmp = &tmp[lstrlen(tmp)+1], p_count++);
+
+ //is this correct for HT?
+ assert(p_count == num_cpus+1);
+
+ //ok, have number of perf counters.
+ multiCounterCPULoad.counters = calloc(p_count, sizeof(HCOUNTER));
+ if (multiCounterCPULoad.counters == NULL) {
+ /* printf("could not allocate memory (2) count=%d", p_count); */
+ error = true;
+ goto end;
+ }
+
+ multiCounterCPULoad.noOfCounters = p_count;
+
+ if (PdhOpenQuery_i(NULL, 0, &multiCounterCPULoad.query.query) != ERROR_SUCCESS) {
+ /* printf("could not create query"); */
+ error = true;
+ goto end;
+ }
+ //now, fetch the counters.
+ for (i = 0, tmp = instances; *tmp != '\0'; tmp = &tmp[lstrlen(tmp)+1], i++) {
+ char counter[2*COUNTER_BUF_SIZE];
+
+ _snprintf(counter, sizeof(counter)-1, "\\%s(%s)\\%s", processor, tmp, time);
+
+ if (PdhAddCounter_i(multiCounterCPULoad.query.query, counter, 0, &multiCounterCPULoad.counters[i]) != ERROR_SUCCESS) {
+ /* printf("error adding processor counter %s", counter); */
+ error = true;
+ goto end;
+ }
+ }
+
+ free(instances);
+ instances = NULL;
+
+ // Query once to initialize the counters needing at least two queries
+ // (like the % CPU usage) to calculate correctly.
+ if (PdhCollectQueryData_i(multiCounterCPULoad.query.query) != ERROR_SUCCESS)
+ error = true;
+
+ end:
+ if (instances != NULL) {
+ free(instances);
+ }
+ if (tmpQuery != NULL) {
+ PdhCloseQuery_i(tmpQuery);
+ }
+ if (error) {
+ int i;
+
+ if (multiCounterCPULoad.counters != NULL) {
+ for (i = 0; i < multiCounterCPULoad.noOfCounters; i++) {
+ if (multiCounterCPULoad.counters[i] != NULL) {
+ PdhRemoveCounter_i(multiCounterCPULoad.counters[i]);
+ }
+ }
+ free(multiCounterCPULoad.counters[i]);
+ }
+ if (multiCounterCPULoad.query.query != NULL) {
+ PdhCloseQuery_i(multiCounterCPULoad.query.query);
+ }
+ memset(&multiCounterCPULoad, 0, sizeof(MultipleCounterQueryS));
+ return -1;
+ }
+ return CONFIG_SUCCESSFUL;
+}
+
+/**
+ * Help function that initializes the PDH process header for the JRockit process.
+ * (You should probably use getProcessPDHHeader() instead!)
+ *
+ * initPDH() must have been run prior to calling this function.
+ *
+ * @param ebuf the error buffer.
+ * @param elen the length of the error buffer.
+ *
+ * @return the PDH instance description corresponding to the JVM process.
+ */
+static char*
+initProcessPDHHeader(void) {
+ static char hotspotheader[2*COUNTER_BUF_SIZE];
+
+ char counter[2*COUNTER_BUF_SIZE];
+ char processes[COUNTER_BUF_SIZE]; //'Process' == #230
+ char pid[COUNTER_BUF_SIZE]; //'ID Process' == 784
+ char module_name[MAX_PATH];
+ PDH_STATUS pdhStat;
+ DWORD c_size = 0, i_size = 0;
+ HQUERY tmpQuery = NULL;
+ int i, myPid = _getpid();
+ BOOL error = false;
+ char *instances, *tmp, *instance_name, *dot_pos;
+
+ tmpQuery = NULL;
+ myPid = _getpid();
+ error = false;
+
+ if (find_name(PDH_PROCESS_IDX, processes, sizeof(processes) - 1) < 0) {
+ return NULL;
+ }
+
+ if (find_name(PDH_ID_PROCESS_IDX, pid, sizeof(pid) - 1) < 0) {
+ return NULL;
+ }
+ //time is same.
+
+ c_size = 0;
+ i_size = 0;
+
+ pdhStat = PdhEnumObjectItems_i (
+ NULL, // reserved
+ NULL, // local machine
+ processes, // object to enumerate
+ NULL, // pass in NULL buffers
+ &c_size, // and 0 length to get
+ NULL, // required size
+ &i_size, // of the buffers in chars
+ PERF_DETAIL_WIZARD, // counter detail level
+ 0);
+
+ //ok, now we have enough to enumerate all processes
+ if (pdh_fail(pdhStat)) {
+ /* printf("Could not enumerate processes (1) error=%d", pdhStat); */
+ return NULL;
+ }
+
+ // use calloc because windows vista does not null terminate the instance names (allthough the docs says it will)
+ if ((instances = calloc(i_size, 1)) == NULL) {
+ /* printf("Could not allocate memory %d bytes", i_size); */
+ error = true;
+ goto end;
+ }
+
+ c_size = 0;
+
+ pdhStat = PdhEnumObjectItems_i (
+ NULL, // reserved
+ NULL, // local machine
+ processes, // object to enumerate
+ NULL, // pass in NULL buffers
+ &c_size, // and 0 length to get
+ instances, // required size
+ &i_size, // of the buffers in chars
+ PERF_DETAIL_WIZARD, // counter detail level
+ 0);
+
+ // ok, now we have enough to enumerate all processes
+ if (pdh_fail(pdhStat)) {
+ /* printf("Could not enumerate processes (2) error=%d", pdhStat); */
+ error = true;
+ goto end;
+ }
+
+ if (PdhOpenQuery_i(NULL, 0, &tmpQuery) != ERROR_SUCCESS) {
+ /* printf("Could not create temporary query"); */
+ error = true;
+ goto end;
+ }
+
+ // Find our module name and use it to extract the instance name used by PDH
+ if (GetModuleFileName(NULL, module_name, MAX_PATH) >= MAX_PATH-1) {
+ /* printf("Module name truncated"); */
+ error = true;
+ goto end;
+ }
+ instance_name = strrchr(module_name, '\\'); //drop path
+ instance_name++; //skip slash
+ dot_pos = strchr(instance_name, '.'); //drop .exe
+ dot_pos[0] = '\0';
+
+ //now, fetch the counters.
+ for (tmp = instances; *tmp != 0 && !error; tmp = &tmp[lstrlen(tmp)+1]) {
+ HCOUNTER hc = NULL;
+ BOOL done = false;
+
+ // Skip until we find our own process name
+ if (strcmp(tmp, instance_name) != 0) {
+ continue;
+ }
+
+ // iterate over all instance indexes and try to find our own pid
+ for (i = 0; !done && !error; i++){
+ PDH_STATUS res;
+ _snprintf(counter, sizeof(counter)-1, "\\%s(%s#%d)\\%s", processes, tmp, i, pid);
+
+ if (PdhAddCounter_i(tmpQuery, counter, 0, &hc) != ERROR_SUCCESS) {
+ /* printf("Failed to create process id query"); */
+ error = true;
+ goto end;
+ }
+
+ res = PdhCollectQueryData_i(tmpQuery);
+
+ if (res == PDH_INVALID_HANDLE) {
+ /* printf("Failed to query process id"); */
+ res = -1;
+ done = true;
+ } else if (res == PDH_NO_DATA) {
+ done = true;
+ } else {
+ PDH_FMT_COUNTERVALUE cv;
+
+ PdhGetFormattedCounterValue_i(hc, PDH_FMT_LONG, NULL, &cv);
+ /*
+ * This check seems to be needed for Win2k SMP boxes, since
+ * they for some reason don't return PDH_NO_DATA for non existing
+ * counters.
+ */
+ if (cv.CStatus != PDH_CSTATUS_VALID_DATA) {
+ done = true;
+ } else if (cv.longValue == myPid) {
+ _snprintf(hotspotheader, sizeof(hotspotheader)-1, "\\%s(%s#%d)\0", processes, tmp, i);
+ PdhRemoveCounter_i(hc);
+ goto end;
+ }
+ }
+ PdhRemoveCounter_i(hc);
+ }
+ }
+ end:
+ if (instances != NULL) {
+ free(instances);
+ }
+ if (tmpQuery != NULL) {
+ PdhCloseQuery_i(tmpQuery);
+ }
+ if (error) {
+ return NULL;
+ }
+ return hotspotheader;
+}
+
+/**
+ * Returns the PDH string prefix identifying the HotSpot process. Use this prefix when getting
+ * counters from the PDH process object representing HotSpot.
+ *
+ * Note: this call may take some time to complete.
+ *
+ * @param ebuf error buffer.
+ * @param elen error buffer length.
+ *
+ * @return the header to be used when retrieving PDH counters from the HotSpot process.
+ * Will return NULL if the call failed.
+ */
+static char *
+getProcessPDHHeader(void) {
+ static char *processHeader = NULL;
+
+ EnterCriticalSection(&processHeaderLock); {
+ if (processHeader == NULL) {
+ processHeader = initProcessPDHHeader();
+ }
+ } LeaveCriticalSection(&processHeaderLock);
+ return processHeader;
+}
+
+int perfInit(void);
+
+double
+perfGetCPULoad(int which)
+{
+ PDH_FMT_COUNTERVALUE cv;
+ HCOUNTER c;
+
+ if (perfInit() < 0) {
+ // warn?
+ return -1.0;
+ }
+
+ if (multiCounterCPULoad.query.query == NULL) {
+ // warn?
+ return -1.0;
+ }
+
+ if (which == -1) {
+ c = multiCounterCPULoad.counters[multiCounterCPULoad.noOfCounters - 1];
+ } else {
+ if (which < multiCounterCPULoad.noOfCounters) {
+ c = multiCounterCPULoad.counters[which];
+ } else {
+ return -1.0;
+ }
+ }
+ if (getPerformanceData(&multiCounterCPULoad.query, c, &cv, PDH_FMT_DOUBLE ) == CONFIG_SUCCESSFUL) {
+ return cv.doubleValue / 100;
+ }
+ return -1.0;
+}
+
+double
+perfGetProcessLoad(void)
+{
+ PDH_FMT_COUNTERVALUE cv;
+
+ if (perfInit() < 0) {
+ // warn?
+ return -1.0;
+ }
+
+ if (cntProcLoad.query.query == NULL) {
+ // warn?
+ return -1.0;
+ }
+
+ if (getPerformanceData(&cntProcLoad.query, cntProcLoad.counter, &cv, PDH_FMT_DOUBLE | PDH_FMT_NOCAP100) == CONFIG_SUCCESSFUL) {
+ double d = cv.doubleValue / cpuFactor;
+ d = min(1, d);
+ d = max(0, d);
+ return d;
+ }
+ return -1.0;
+}
+
+/**
+ * Helper to initialize the PDH library. Loads the library and sets up the functions.
+ * Note that once loaded, we will never unload the PDH library.
+ *
+ * @return CONFIG_SUCCESSFUL if successful, negative on failure.
+ */
+int
+perfInit(void) {
+ static HMODULE h;
+ static BOOL running, inited;
+
+ int error;
+
+ if (running) {
+ return CONFIG_SUCCESSFUL;
+ }
+
+ error = CONFIG_SUCCESSFUL;
+
+ // this is double checked locking again, but we try to bypass the worst by
+ // implicit membar at end of lock.
+ EnterCriticalSection(&initializationLock); {
+ if (!inited) {
+ char buf[64] = "";
+ SYSTEM_INFO si;
+
+ // CMH. But windows will not care about our affinity when giving
+ // us measurements. Need the real, raw num cpus.
+
+ GetSystemInfo(&si);
+ num_cpus = si.dwNumberOfProcessors;
+ // Initialize the denominator for the jvm load calculations
+ cpuFactor = num_cpus * 100;
+
+ /**
+ * Do this dynamically, so we don't fail to start on systems without pdh.
+ */
+ if ((h = LoadLibrary("pdh.dll")) == NULL) {
+ /* printf("Could not load pdh.dll (%d)", GetLastError()); */
+ error = -2;
+ } else if (get_functions(h, buf, sizeof(buf)) < 0) {
+ FreeLibrary(h);
+ h = NULL;
+ error = -2;
+ /* printf("Failed to init pdh functions: %s.\n", buf); */
+ } else {
+ if (initProcessorCounters() != 0) {
+ /* printf("Failed to init system load counters.\n"); */
+ } else if (initProcLoadCounter() != 0) {
+ /* printf("Failed to init process load counter.\n"); */
+ } else if (initProcSystemLoadCounter() != 0) {
+ /* printf("Failed to init process system load counter.\n"); */
+ } else {
+ inited = true;
+ }
+ }
+ }
+ } LeaveCriticalSection(&initializationLock);
+
+ if (inited && error == CONFIG_SUCCESSFUL) {
+ running = true;
+ }
+
+ return error;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_OperatingSystem_getSystemCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ return perfGetCPULoad(-1);
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_OperatingSystem_getProcessCpuLoad
+(JNIEnv *env, jobject dummy)
+{
+ return perfGetProcessLoad();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7028071
+ * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
+ *
+ * @run main GetProcessCpuLoad
+ */
+
+import java.lang.management.*;
+import com.sun.management.OperatingSystemMXBean;
+
+public class GetProcessCpuLoad {
+ public static void main(String[] argv) throws Exception {
+ OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean)
+ ManagementFactory.getOperatingSystemMXBean();
+ double load;
+ for(int i=0; i<10; i++) {
+ load = mbean.getProcessCpuLoad();
+ if((load<0.0 || load>1.0) && load != -1.0) {
+ throw new RuntimeException("getProcessCpuLoad() returns " + load
+ + " which is not in the [0.0,1.0] interval");
+ }
+ try {
+ Thread.sleep(200);
+ } catch(InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7028071
+ * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
+ *
+ * @run main GetSystemCpuLoad
+ */
+
+import java.lang.management.*;
+import com.sun.management.OperatingSystemMXBean;
+
+public class GetSystemCpuLoad {
+ public static void main(String[] argv) throws Exception {
+ OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean)
+ ManagementFactory.getOperatingSystemMXBean();
+ double load;
+ for(int i=0; i<10; i++) {
+ load = mbean.getSystemCpuLoad();
+ if((load<0.0 || load>1.0) && load != -1.0) {
+ throw new RuntimeException("getSystemCpuLoad() returns " + load
+ + " which is not in the [0.0,1.0] interval");
+ }
+ try {
+ Thread.sleep(200);
+ } catch(InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
--- a/langtools/.hgtags Thu May 12 07:24:37 2011 -0700
+++ b/langtools/.hgtags Thu May 12 07:28:52 2011 -0700
@@ -115,3 +115,4 @@
53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
258e6654aba25aab91c9ba3b4c53d05bc895a86c jdk7-b140
+90adb5d6adc7d99d27c8b142a31ac8921070274f jdk7-b141
--- a/langtools/src/share/classes/com/sun/source/util/Trees.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/source/util/Trees.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -38,6 +38,7 @@
import javax.tools.Diagnostic;
import javax.tools.JavaCompiler.CompilationTask;
+import com.sun.source.tree.CatchTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.MethodTree;
@@ -207,4 +208,11 @@
public abstract void printMessage(Diagnostic.Kind kind, CharSequence msg,
com.sun.source.tree.Tree t,
com.sun.source.tree.CompilationUnitTree root);
+
+ /**
+ * Gets the lub of an exception parameter declared in a catch clause.
+ * @param tree the tree for the catch clause
+ * @return The lub of the exception parameter
+ */
+ public abstract TypeMirror getLub(CatchTree tree);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Thu May 12 07:28:52 2011 -0700
@@ -149,11 +149,20 @@
ClassUseMapper mapper = new ClassUseMapper(configuration.root, classtree);
ClassDoc[] classes = configuration.root.classes();
for (int i = 0; i < classes.length; i++) {
- ClassUseWriter.generate(configuration, mapper, classes[i]);
+ // If -nodeprecated option is set and the containing package is marked
+ // as deprecated, do not generate the class-use page. We will still generate
+ // the class-use page if the class is marked as deprecated but the containing
+ // package is not since it could still be linked from that package-use page.
+ if (!(configuration.nodeprecated &&
+ Util.isDeprecated(classes[i].containingPackage())))
+ ClassUseWriter.generate(configuration, mapper, classes[i]);
}
PackageDoc[] pkgs = configuration.packages;
for (int i = 0; i < pkgs.length; i++) {
- PackageUseWriter.generate(configuration, mapper, pkgs[i]);
+ // If -nodeprecated option is set and the package is marked
+ // as deprecated, do not generate the package-use page.
+ if (!(configuration.nodeprecated && Util.isDeprecated(pkgs[i])))
+ PackageUseWriter.generate(configuration, mapper, pkgs[i]);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -31,6 +31,7 @@
import com.sun.javadoc.*;
import java.util.*;
import java.io.*;
+import java.net.*;
/**
* Configure the output based on the command line options.
@@ -48,6 +49,7 @@
* @author Robert Field.
* @author Atul Dambalkar.
* @author Jamie Ho
+ * @author Bhavesh Patel (Modified)
*/
public class ConfigurationImpl extends Configuration {
@@ -110,6 +112,11 @@
public String stylesheetfile = "";
/**
+ * Argument for command line option "-Xdocrootparent".
+ */
+ public String docrootparent = "";
+
+ /**
* True if command line option "-nohelp" is used. Default value is false.
*/
public boolean nohelp = false;
@@ -239,6 +246,8 @@
stylesheetfile = os[1];
} else if (opt.equals("-charset")) {
charset = os[1];
+ } else if (opt.equals("-xdocrootparent")) {
+ docrootparent = os[1];
} else if (opt.equals("-nohelp")) {
nohelp = true;
} else if (opt.equals("-splitindex")) {
@@ -322,7 +331,8 @@
option.equals("-helpfile") ||
option.equals("-stylesheetfile") ||
option.equals("-charset") ||
- option.equals("-overview")) {
+ option.equals("-overview") ||
+ option.equals("-xdocrootparent")) {
return 2;
} else {
return 0;
@@ -372,6 +382,13 @@
return false;
}
nohelp = true;
+ } else if (opt.equals("-xdocrootparent")) {
+ try {
+ new URL(os[1]);
+ } catch (MalformedURLException e) {
+ reporter.printError(getText("doclet.MalformedURL", os[1]));
+ return false;
+ }
} else if (opt.equals("-overview")) {
if (nooverview == true) {
reporter.printError(getText("doclet.Option_conflict",
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -42,15 +42,15 @@
public class DeprecatedListWriter extends SubWriterHolderWriter {
private static final String[] ANCHORS = new String[] {
- "interface", "class", "enum", "exception", "error", "annotation_type",
- "field", "method", "constructor", "enum_constant",
+ "package", "interface", "class", "enum", "exception", "error",
+ "annotation_type", "field", "method", "constructor", "enum_constant",
"annotation_type_member"
};
private static final String[] HEADING_KEYS = new String[] {
- "doclet.Deprecated_Interfaces", "doclet.Deprecated_Classes",
- "doclet.Deprecated_Enums", "doclet.Deprecated_Exceptions",
- "doclet.Deprecated_Errors",
+ "doclet.Deprecated_Packages", "doclet.Deprecated_Interfaces",
+ "doclet.Deprecated_Classes", "doclet.Deprecated_Enums",
+ "doclet.Deprecated_Exceptions", "doclet.Deprecated_Errors",
"doclet.Deprecated_Annotation_Types",
"doclet.Deprecated_Fields",
"doclet.Deprecated_Methods", "doclet.Deprecated_Constructors",
@@ -59,9 +59,9 @@
};
private static final String[] SUMMARY_KEYS = new String[] {
- "doclet.deprecated_interfaces", "doclet.deprecated_classes",
- "doclet.deprecated_enums", "doclet.deprecated_exceptions",
- "doclet.deprecated_errors",
+ "doclet.deprecated_packages", "doclet.deprecated_interfaces",
+ "doclet.deprecated_classes", "doclet.deprecated_enums",
+ "doclet.deprecated_exceptions", "doclet.deprecated_errors",
"doclet.deprecated_annotation_types",
"doclet.deprecated_fields",
"doclet.deprecated_methods", "doclet.deprecated_constructors",
@@ -70,7 +70,7 @@
};
private static final String[] HEADER_KEYS = new String[] {
- "doclet.Interface", "doclet.Class",
+ "doclet.Package", "doclet.Interface", "doclet.Class",
"doclet.Enum", "doclet.Exceptions",
"doclet.Errors",
"doclet.AnnotationType",
@@ -116,7 +116,7 @@
DeprecatedListWriter depr =
new DeprecatedListWriter(configuration, filename);
depr.generateDeprecatedListFile(
- new DeprecatedAPIListBuilder(configuration.root));
+ new DeprecatedAPIListBuilder(configuration));
depr.close();
} catch (IOException exc) {
configuration.standardmessage.error(
@@ -149,8 +149,14 @@
memberTableHeader[0] = configuration.getText("doclet.0_and_1",
configuration.getText(HEADER_KEYS[i]),
configuration.getText("doclet.Description"));
- writers[i].addDeprecatedAPI(deprapi.getList(i),
- HEADING_KEYS[i], memberTableSummary, memberTableHeader, div);
+ // DeprecatedAPIListBuilder.PACKAGE == 0, so if i == 0, it is
+ // a PackageDoc.
+ if (i == DeprecatedAPIListBuilder.PACKAGE)
+ addPackageDeprecatedAPI(deprapi.getList(i),
+ HEADING_KEYS[i], memberTableSummary, memberTableHeader, div);
+ else
+ writers[i - 1].addDeprecatedAPI(deprapi.getList(i),
+ HEADING_KEYS[i], memberTableSummary, memberTableHeader, div);
}
}
body.addContent(div);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -198,23 +198,27 @@
PackageIndexFrameWriter.generate(configuration);
}
PackageDoc prev = null, next;
- for(int i = 0; i < packages.length; i++) {
- PackageFrameWriter.generate(configuration, packages[i]);
- next = (i + 1 < packages.length && packages[i+1].name().length() > 0) ?
- packages[i+1] : null;
- //If the next package is unnamed package, skip 2 ahead if possible
- next = (i + 2 < packages.length && next == null) ?
- packages[i+2]: next;
- AbstractBuilder packageSummaryBuilder = configuration.
- getBuilderFactory().getPackageSummaryBuilder(
- packages[i], prev, next);
- packageSummaryBuilder.build();
- if (configuration.createtree) {
- PackageTreeWriter.generate(configuration,
- packages[i], prev, next,
- configuration.nodeprecated);
+ for (int i = 0; i < packages.length; i++) {
+ // if -nodeprecated option is set and the package is marked as
+ // deprecated, do not generate the package-summary.html, package-frame.html
+ // and package-tree.html pages for that package.
+ if (!(configuration.nodeprecated && Util.isDeprecated(packages[i]))) {
+ PackageFrameWriter.generate(configuration, packages[i]);
+ next = (i + 1 < packages.length &&
+ packages[i + 1].name().length() > 0) ? packages[i + 1] : null;
+ //If the next package is unnamed package, skip 2 ahead if possible
+ next = (i + 2 < packages.length && next == null) ? packages[i + 2] : next;
+ AbstractBuilder packageSummaryBuilder =
+ configuration.getBuilderFactory().getPackageSummaryBuilder(
+ packages[i], prev, next);
+ packageSummaryBuilder.build();
+ if (configuration.createtree) {
+ PackageTreeWriter.generate(configuration,
+ packages[i], prev, next,
+ configuration.nodeprecated);
+ }
+ prev = packages[i];
}
- prev = packages[i];
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu May 12 07:28:52 2011 -0700
@@ -159,22 +159,42 @@
StringBuilder buf = new StringBuilder();
int previndex = 0;
while (true) {
- // Search for lowercase version of {@docRoot}
- index = lowerHtml.indexOf("{@docroot}", previndex);
- // If next {@docRoot} tag not found, append rest of htmlstr and exit loop
- if (index < 0) {
- buf.append(htmlstr.substring(previndex));
- break;
- }
- // If next {@docroot} tag found, append htmlstr up to start of tag
- buf.append(htmlstr.substring(previndex, index));
- previndex = index + 10; // length for {@docroot} string
- // Insert relative path where {@docRoot} was located
- buf.append(relativepathNoSlash);
- // Append slash if next character is not a slash
- if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length()
- && htmlstr.charAt(previndex) != '/') {
- buf.append(DirectoryManager.URL_FILE_SEPARATOR);
+ if (configuration.docrootparent.length() > 0) {
+ // Search for lowercase version of {@docRoot}/..
+ index = lowerHtml.indexOf("{@docroot}/..", previndex);
+ // If next {@docRoot}/.. pattern not found, append rest of htmlstr and exit loop
+ if (index < 0) {
+ buf.append(htmlstr.substring(previndex));
+ break;
+ }
+ // If next {@docroot}/.. pattern found, append htmlstr up to start of tag
+ buf.append(htmlstr.substring(previndex, index));
+ previndex = index + 13; // length for {@docroot}/.. string
+ // Insert docrootparent absolute path where {@docRoot}/.. was located
+
+ buf.append(configuration.docrootparent);
+ // Append slash if next character is not a slash
+ if (previndex < htmlstr.length() && htmlstr.charAt(previndex) != '/') {
+ buf.append(DirectoryManager.URL_FILE_SEPARATOR);
+ }
+ } else {
+ // Search for lowercase version of {@docRoot}
+ index = lowerHtml.indexOf("{@docroot}", previndex);
+ // If next {@docRoot} tag not found, append rest of htmlstr and exit loop
+ if (index < 0) {
+ buf.append(htmlstr.substring(previndex));
+ break;
+ }
+ // If next {@docroot} tag found, append htmlstr up to start of tag
+ buf.append(htmlstr.substring(previndex, index));
+ previndex = index + 10; // length for {@docroot} string
+ // Insert relative path where {@docRoot} was located
+ buf.append(relativepathNoSlash);
+ // Append slash if next character is not a slash
+ if (relativepathNoSlash.length() > 0 && previndex < htmlstr.length() &&
+ htmlstr.charAt(previndex) != '/') {
+ buf.append(DirectoryManager.URL_FILE_SEPARATOR);
+ }
}
}
return buf.toString();
@@ -1395,6 +1415,44 @@
}
/**
+ * Add package deprecation information to the documentation tree
+ *
+ * @param deprPkgs list of deprecated packages
+ * @param headingKey the caption for the deprecated package table
+ * @param tableSummary the summary for the deprecated package table
+ * @param tableHeader table headers for the deprecated package table
+ * @param contentTree the content tree to which the deprecated package table will be added
+ */
+ protected void addPackageDeprecatedAPI(List<Doc> deprPkgs, String headingKey,
+ String tableSummary, String[] tableHeader, Content contentTree) {
+ if (deprPkgs.size() > 0) {
+ Content table = HtmlTree.TABLE(0, 3, 0, tableSummary,
+ getTableCaption(configuration().getText(headingKey)));
+ table.addContent(getSummaryTableHeader(tableHeader, "col"));
+ Content tbody = new HtmlTree(HtmlTag.TBODY);
+ for (int i = 0; i < deprPkgs.size(); i++) {
+ PackageDoc pkg = (PackageDoc) deprPkgs.get(i);
+ HtmlTree td = HtmlTree.TD(HtmlStyle.colOne,
+ getPackageLink(pkg, getPackageName(pkg)));
+ if (pkg.tags("deprecated").length > 0) {
+ addInlineDeprecatedComment(pkg, pkg.tags("deprecated")[0], td);
+ }
+ HtmlTree tr = HtmlTree.TR(td);
+ if (i % 2 == 0) {
+ tr.addStyle(HtmlStyle.altColor);
+ } else {
+ tr.addStyle(HtmlStyle.rowColor);
+ }
+ tbody.addContent(tr);
+ }
+ table.addContent(tbody);
+ Content li = HtmlTree.LI(HtmlStyle.blockList, table);
+ Content ul = HtmlTree.UL(HtmlStyle.blockList, li);
+ contentTree.addContent(ul);
+ }
+ }
+
+ /**
* Prine table header information about color, column span and the font.
*
* @param color Background color.
@@ -2120,7 +2178,7 @@
}
}
text = (isplaintext) ?
- refMemName : getCode() + refMemName + getCodeEnd();
+ refMemName : getCode() + Util.escapeHtmlChars(refMemName) + getCodeEnd();
result.append(getDocLink(LinkInfoImpl.CONTEXT_SEE_TAG, containing,
refMem, (label.length() == 0)? text: label, false));
@@ -2280,6 +2338,7 @@
public String commentTagsToString(Tag holderTag, Doc doc, Tag[] tags,
boolean isFirstSentence) {
StringBuilder result = new StringBuilder();
+ boolean textTagChange = false;
// Array of all possible inline tags for this javadoc run
configuration.tagletManager.checkTags(doc, tags, true);
for (int i = 0; i < tags.length; i++) {
@@ -2295,13 +2354,26 @@
result.append(output == null ? "" : output.toString());
if (originalLength == 0 && isFirstSentence && tagelem.name().equals("@inheritDoc") && result.length() > 0) {
break;
+ } else if (configuration.docrootparent.length() > 0 &&
+ tagelem.name().equals("@docRoot") &&
+ ((tags[i + 1]).text()).startsWith("/..")) {
+ //If Xdocrootparent switch ON, set the flag to remove the /.. occurance after
+ //{@docRoot} tag in the very next Text tag.
+ textTagChange = true;
+ continue;
} else {
- continue;
+ continue;
}
} else {
+ String text = tagelem.text();
+ //If Xdocrootparent switch ON, remove the /.. occurance after {@docRoot} tag.
+ if (textTagChange) {
+ text = text.replaceFirst("/..", "");
+ textTagChange = false;
+ }
//This is just a regular text tag. The text may contain html links (<a>)
//or inline tag {@docRoot}, which will be handled as special cases.
- String text = redirectRelativeLinks(tagelem.holder(), tagelem.text());
+ text = redirectRelativeLinks(tagelem.holder(), text);
// Replace @docRoot only if not represented by an instance of DocRootTaglet,
// that is, only if it was not present in a source file doc comment.
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -93,7 +93,7 @@
packgen = new PackageFrameWriter(configuration, packageDoc);
String pkgName = Util.getPackageName(packageDoc);
Content body = packgen.getBody(false, packgen.getWindowTitle(pkgName));
- Content pkgNameContent = new StringContent(pkgName);
+ Content pkgNameContent = new RawHtml(pkgName);
Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, HtmlStyle.bar,
packgen.getTargetPackageLink(packageDoc, "classFrame", pkgNameContent));
body.addContent(heading);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -80,7 +80,10 @@
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.addAttr(HtmlAttr.TITLE, packagesLabel.toString());
for(int i = 0; i < packages.length; i++) {
- if (packages[i] != null) {
+ // Do not list the package if -nodeprecated option is set and the
+ // package is marked as deprecated.
+ if (packages[i] != null &&
+ (!(configuration.nodeprecated && Util.isDeprecated(packages[i])))) {
ul.addContent(getPackage(packages[i]));
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Thu May 12 07:28:52 2011 -0700
@@ -137,6 +137,8 @@
protected void addPackagesList(PackageDoc[] packages, Content tbody) {
for (int i = 0; i < packages.length; i++) {
if (packages[i] != null && packages[i].name().length() > 0) {
+ if (configuration.nodeprecated && Util.isDeprecated(packages[i]))
+ continue;
Content packageLinkContent = getPackageLink(packages[i],
getPackageName(packages[i]));
Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, packageLinkContent);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Thu May 12 07:28:52 2011 -0700
@@ -242,11 +242,16 @@
*/
protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException {
Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
- getHyperLink("", pkg.name(), new StringContent(Util.getPackageName(pkg))));
+ getHyperLink("", Util.getPackageName(pkg),
+ new RawHtml(Util.getPackageName(pkg))));
contentTree.addContent(tdFirst);
HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
tdLast.addStyle(HtmlStyle.colLast);
- addSummaryComment(pkg, tdLast);
+ if (pkg != null && pkg.name().length() != 0) {
+ addSummaryComment(pkg, tdLast);
+ } else {
+ tdLast.addContent(getSpace());
+ }
contentTree.addContent(tdLast);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Thu May 12 07:28:52 2011 -0700
@@ -114,11 +114,12 @@
Content packageHead = new RawHtml(heading);
tHeading.addContent(packageHead);
div.addContent(tHeading);
+ addDeprecationInfo(div);
if (packageDoc.inlineTags().length > 0 && ! configuration.nocomment) {
- HtmlTree subTitleDiv = new HtmlTree(HtmlTag.DIV);
- subTitleDiv.addStyle(HtmlStyle.subTitle);
- addSummaryComment(packageDoc, subTitleDiv);
- div.addContent(subTitleDiv);
+ HtmlTree docSummaryDiv = new HtmlTree(HtmlTag.DIV);
+ docSummaryDiv.addStyle(HtmlStyle.docSummary);
+ addSummaryComment(packageDoc, docSummaryDiv);
+ div.addContent(docSummaryDiv);
Content space = getSpace();
Content descLink = getHyperLink("", "package_description",
descriptionLabel, "", "");
@@ -139,6 +140,28 @@
}
/**
+ * Add the package deprecation information to the documentation tree.
+ *
+ * @param div the content tree to which the deprecation information will be added
+ */
+ public void addDeprecationInfo(Content div) {
+ Tag[] deprs = packageDoc.tags("deprecated");
+ if (Util.isDeprecated(packageDoc)) {
+ HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
+ deprDiv.addStyle(HtmlStyle.deprecatedContent);
+ Content deprPhrase = HtmlTree.SPAN(HtmlStyle.strong, deprecatedPhrase);
+ deprDiv.addContent(deprPhrase);
+ if (deprs.length > 0) {
+ Tag[] commentTags = deprs[0].inlineTags();
+ if (commentTags.length > 0) {
+ addInlineDeprecatedComment(packageDoc, deprs[0], deprDiv);
+ }
+ }
+ div.addContent(deprDiv);
+ }
+ }
+
+ /**
* {@inheritDoc}
*/
public Content getSummaryHeader() {
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java Thu May 12 07:28:52 2011 -0700
@@ -82,12 +82,20 @@
}
PackageDoc[] pds = rd.specifiedPackages();
for (int i = 0; i < pds.length; i++) {
- convertPackage(configuration, pds[i], outputdir);
+ // If -nodeprecated option is set and the package is marked as deprecated,
+ // do not convert the package files to HTML.
+ if (!(configuration.nodeprecated && Util.isDeprecated(pds[i])))
+ convertPackage(configuration, pds[i], outputdir);
}
ClassDoc[] cds = rd.specifiedClasses();
for (int i = 0; i < cds.length; i++) {
- convertClass(configuration, cds[i],
- getPackageOutputDir(outputdir, cds[i].containingPackage()));
+ // If -nodeprecated option is set and the class is marked as deprecated
+ // or the containing package is deprecated, do not convert the
+ // package files to HTML.
+ if (!(configuration.nodeprecated &&
+ (Util.isDeprecated(cds[i]) || Util.isDeprecated(cds[i].containingPackage()))))
+ convertClass(configuration, cds[i],
+ getPackageOutputDir(outputdir, cds[i].containingPackage()));
}
}
@@ -106,7 +114,12 @@
String classOutputdir = getPackageOutputDir(outputdir, pd);
ClassDoc[] cds = pd.allClasses();
for (int i = 0; i < cds.length; i++) {
- convertClass(configuration, cds[i], classOutputdir);
+ // If -nodeprecated option is set and the class is marked as deprecated,
+ // do not convert the package files to HTML. We do not check for
+ // containing package deprecation since it is already check in
+ // the calling method above.
+ if (!(configuration.nodeprecated && Util.isDeprecated(cds[i])))
+ convertClass(configuration, cds[i], classOutputdir);
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -59,7 +59,10 @@
* {@inheritDoc}
*/
public TagletOutput getDocRootOutput() {
- return new TagletOutputImpl(htmlWriter.relativepathNoSlash);
+ if (htmlWriter.configuration.docrootparent.length() > 0)
+ return new TagletOutputImpl(htmlWriter.configuration.docrootparent);
+ else
+ return new TagletOutputImpl(htmlWriter.relativepathNoSlash);
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -132,7 +132,11 @@
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.addStyle(HtmlStyle.horizontal);
for (int i = 0; i < packages.length; i++) {
- if (packages[i].name().length() == 0) {
+ // If the package name length is 0 or if -nodeprecated option
+ // is set and the package is marked as deprecated, do not include
+ // the page in the list of package hierarchies.
+ if (packages[i].name().length() == 0 ||
+ (configuration.nodeprecated && Util.isDeprecated(packages[i]))) {
continue;
}
String link = pathString(packages[i], "package-tree.html");
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -46,6 +46,7 @@
contentContainer,
description,
details,
+ docSummary,
header,
horizontal,
footer,
@@ -67,6 +68,7 @@
subNavList,
subTitle,
summary,
+ deprecatedContent,
tabEnd,
title,
topNav;
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Thu May 12 07:28:52 2011 -0700
@@ -68,6 +68,7 @@
doclet.see.malformed_tag=Tag {0}: Malformed: {1}
doclet.Inherited_API_Summary=Inherited API Summary
doclet.Deprecated_API=Deprecated API
+doclet.Deprecated_Packages=Deprecated Packages
doclet.Deprecated_Classes=Deprecated Classes
doclet.Deprecated_Enums=Deprecated Enums
doclet.Deprecated_Interfaces=Deprecated Interfaces
@@ -79,6 +80,7 @@
doclet.Deprecated_Methods=Deprecated Methods
doclet.Deprecated_Enum_Constants=Deprecated Enum Constants
doclet.Deprecated_Annotation_Type_Members=Deprecated Annotation Type Elements
+doclet.deprecated_packages=deprecated packages
doclet.deprecated_classes=deprecated classes
doclet.deprecated_enums=deprecated enums
doclet.deprecated_interfaces=deprecated interfaces
@@ -245,6 +247,7 @@
-tag <name>:<locations>:<header> Specify single argument custom tags\n\
-taglet The fully qualified name of Taglet to register\n\
-tagletpath The path to Taglets\n\
+ -Xdocrootparent <url> Replaces all appearances of @docRoot followed by /.. in doc comments with <url>\n\
-charset <charset> Charset for cross-platform viewing of generated documentation.\n\
-helpfile <file> Include file that help link links to\n\
-linksource Generate source in HTML\n\
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Thu May 12 07:28:52 2011 -0700
@@ -11,54 +11,30 @@
doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64
doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64
-# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc.
doclet.Prev=\u524D
-# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc.
doclet.Next=\u6B21
-# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc.
-doclet.Prev_Class=PREV CLASS
-# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc.
-doclet.Next_Class=NEXT CLASS
-# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc.
-doclet.Prev_Package=PREV PACKAGE
-# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc.
-doclet.Next_Package=NEXT PACKAGE
-# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index.
-doclet.Prev_Letter=PREV LETTER
-# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index.
-doclet.Next_Letter=NEXT LETTER
-# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc.
-doclet.Show_Lists=SHOW LISTS
-# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc.
-doclet.Hide_Lists=HIDE LISTS
+doclet.Prev_Class=\u524D\u306E\u30AF\u30E9\u30B9
+doclet.Next_Class=\u6B21\u306E\u30AF\u30E9\u30B9
+doclet.Prev_Package=\u524D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.Next_Package=\u6B21\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.Prev_Letter=\u524D\u306E\u6587\u5B57
+doclet.Next_Letter=\u6B21\u306E\u6587\u5B57
doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9
doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8
doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary.
-doclet.Summary=SUMMARY:
-# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail.
-doclet.Detail=DETAIL:
-# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc.
-doclet.navNested=NESTED
-# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc.
-doclet.navAnnotationTypeOptionalMember=OPTIONAL
-# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc.
-doclet.navAnnotationTypeRequiredMember=REQUIRED
-# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc.
-doclet.navAnnotationTypeMember=ELEMENT
-# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc.
-doclet.navField=FIELD
-# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc.
-doclet.navEnum=ENUM CONSTANTS
-# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc.
-doclet.navConstructor=CONSTR
-# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc.
-doclet.navMethod=METHOD
-# The following resource does not seem to be used anymore.
-doclet.navFactoryMethod=FACTORY
+doclet.Summary=\u6982\u8981:
+doclet.Detail=\u8A73\u7D30:
+doclet.navNested=\u30CD\u30B9\u30C8
+doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3
+doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808
+doclet.navAnnotationTypeMember=\u8981\u7D20
+doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.navEnum=\u5217\u6319\u5B9A\u6570
+doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
+doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
doclet.Index=\u7D22\u5F15
doclet.Window_Single_Index=\u7D22\u5F15
doclet.Window_Split_Index={0}\u306E\u7D22\u5F15
@@ -66,12 +42,6 @@
doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
doclet.New_Page=NewPage
doclet.None=\u306A\u3057
-# The following resource does not seem to be used anymore
-doclet.CLASSES=CLASSES
-# The following resource does not seem to be used anymore
-doclet.MEMBERS=MEMBERS
-# The following resource does not seem to be used anymore
-doclet.NONE=\u306A\u3057
doclet.Factory_Method_Detail=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
doclet.navDeprecated=\u975E\u63A8\u5968
doclet.Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
@@ -136,10 +106,7 @@
doclet.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
doclet.Or=\u307E\u305F\u306F
doclet.Frames=\u30D5\u30EC\u30FC\u30E0
-# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames.
-doclet.FRAMES=FRAMES
-# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames.
-doclet.NO_FRAMES=NO FRAMES
+doclet.No_Frames=\u30D5\u30EC\u30FC\u30E0\u306A\u3057
doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64:
doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64
doclet.Source_Code=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9:
@@ -147,11 +114,10 @@
doclet.Cannot_handle_no_packages=\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002
doclet.Frame_Alert=\u30D5\u30EC\u30FC\u30E0\u95A2\u9023\u306E\u30A2\u30E9\u30FC\u30C8
doclet.Overview-Member-Frame=\u6982\u8981\u30E1\u30F3\u30D0\u30FC\u30FB\u30D5\u30EC\u30FC\u30E0
-doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.Frame_Warning_Message=\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306F\u30D5\u30EC\u30FC\u30E0\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D5\u30EC\u30FC\u30E0\u3092\u8868\u793A\u3067\u304D\u306A\u3044Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306E\u5834\u5408\u306B\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002{0}\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059\u3002
doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3002
+doclet.Non_Frame_Version=\u30D5\u30EC\u30FC\u30E0\u306B\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30F3
doclet.Frame_Version=\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
-doclet.Link_To=\u30EA\u30F3\u30AF\u5148
doclet.Following_From_Class=\u30AF\u30E9\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0:
doclet.Following_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u30BF\u30B0:
doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
@@ -167,7 +133,7 @@
doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F4\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
@@ -190,16 +156,16 @@
doclet.Help_line_24=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306B\u3088\u308A\u3001\u524D\u307E\u305F\u306F\u6B21\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u95A2\u9023\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\u3067\u304D\u307E\u3059\u3002
doclet.Help_line_25=\u30D5\u30EC\u30FC\u30E0/\u30D5\u30EC\u30FC\u30E0\u306A\u3057
doclet.Help_line_26=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306FHTML\u30D5\u30EC\u30FC\u30E0\u306E\u8868\u793A\u3068\u975E\u8868\u793A\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30DA\u30FC\u30B8\u306F\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u3067\u3082\u3001\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u3067\u3082\u8868\u793A\u3067\u304D\u307E\u3059\u3002
-doclet.Help_line_27=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
-doclet.Help_line_28=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.Help_line_29=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_27={0}\u30EA\u30F3\u30AF\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_28=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
+doclet.Help_line_29=<a href="constant-values.html">\u300C\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u300D</a> \u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.Help_line_30=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
doclet.Help_enum_line_1=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
doclet.Help_enum_line_2=\u5217\u6319\u578B\u306E\u5BA3\u8A00
doclet.Help_enum_line_3=\u5217\u6319\u578B\u306E\u8AAC\u660E
doclet.Help_annotation_type_line_1=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
doclet.Help_annotation_type_line_2=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00
doclet.Help_annotation_type_line_3=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E
-doclet.The=The
doclet.Style_line_1=javadoc\u30B9\u30BF\u30A4\u30EB\u30FB\u30B7\u30FC\u30C8
doclet.Style_line_2=\u8272\u3084\u30D5\u30A9\u30F3\u30C8\u306A\u3069\u306E\u30B9\u30BF\u30A4\u30EB\u5C5E\u6027\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306F\u3001\u3053\u3053\u3067\u5B9A\u7FA9\u3057\u307E\u3059
doclet.Style_line_3=\u30DA\u30FC\u30B8\u306E\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u8272
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Thu May 12 07:28:52 2011 -0700
@@ -11,54 +11,30 @@
doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784
doclet.Annotation_Type_Hierarchy=\u6CE8\u91CA\u7C7B\u578B\u5206\u5C42\u7ED3\u6784
-# The following ALL CAPS words should be translated. It is used as "Previous" link on javadoc.
doclet.Prev=\u4E0A\u4E00\u4E2A
-# The following ALL CAPS words should be translated. It is used as "Next" link on javadoc.
doclet.Next=\u4E0B\u4E00\u4E2A
-# The following ALL CAPS words should be translated. It is used as "Previous Class" link on javadoc.
-doclet.Prev_Class=PREV CLASS
-# The following ALL CAPS words should be translated. It is used as "Next Class" link on javadoc.
-doclet.Next_Class=NEXT CLASS
-# The following ALL CAPS words should be translated. It is used as "Previous Package" link on javadoc.
-doclet.Prev_Package=PREV PACKAGE
-# The following ALL CAPS words should be translated. It is used as "Next Package" link on javadoc.
-doclet.Next_Package=NEXT PACKAGE
-# The following ALL CAPS words should be translated. It is used as "Previous Letter" link on javadoc alphabetical index.
-doclet.Prev_Letter=PREV LETTER
-# The following ALL CAPS words should be translated. It is used as "Next Letter" link on javadoc alphabetical index.
-doclet.Next_Letter=NEXT LETTER
-# The following ALL CAPS words should be translated. It is used as "Show List" link on javadoc.
-doclet.Show_Lists=SHOW LISTS
-# The following ALL CAPS words should be translated. It is used as "Hide List" link on javadoc.
-doclet.Hide_Lists=HIDE LISTS
+doclet.Prev_Class=\u4E0A\u4E00\u4E2A\u7C7B
+doclet.Next_Class=\u4E0B\u4E00\u4E2A\u7C7B
+doclet.Prev_Package=\u4E0A\u4E00\u4E2A\u7A0B\u5E8F\u5305
+doclet.Next_Package=\u4E0B\u4E00\u4E2A\u7A0B\u5E8F\u5305
+doclet.Prev_Letter=\u4E0A\u4E00\u4E2A\u5B57\u6BCD
+doclet.Next_Letter=\u4E0B\u4E00\u4E2A\u5B57\u6BCD
doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B
doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3
doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6CE8\u91CA
doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E
doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570
doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3
-# The following ALL CAPS words should be translated. It's used as SUMMARY: NESTED | FIELD | CONSTR | METHOD, meaning Nested Class Summary, Field Summary, Constructor Summary, or Method Summary.
-doclet.Summary=SUMMARY:
-# The following ALL CAPS words should be translated. It is used as DETAIL: FIELD | CONSTR | METHOD, meaning Field Detail, Constructor Detail, or Method Detail.
-doclet.Detail=DETAIL:
-# The following ALL CAPS words should be translated. It is used as "Nested" (Nested Class Summary) link on javadoc.
-doclet.navNested=NESTED
-# The following ALL CAPS words should be translated. It is used as "Optional" (Optional Element Summary) link on javadoc.
-doclet.navAnnotationTypeOptionalMember=OPTIONAL
-# The following ALL CAPS words should be translated. It is used as "Required" (Required Element Summary) link on javadoc.
-doclet.navAnnotationTypeRequiredMember=REQUIRED
-# The following ALL CAPS words should be translated. It is used as "Element" (Required Element Summary) link on javadoc.
-doclet.navAnnotationTypeMember=ELEMENT
-# The following ALL CAPS words should be translated. It is used as "Field" (Field Detail) link on javadoc.
-doclet.navField=FIELD
-# The following ALL CAPS words should be translated. It is used as "Enum Constants" link on javadoc.
-doclet.navEnum=ENUM CONSTANTS
-# The following ALL CAPS words should be translated. It is used as "Constructor" (Constructor Detail) link on javadoc.
-doclet.navConstructor=CONSTR
-# The following ALL CAPS words should be translated. It is used as "Method" (Method Detail) link on javadoc.
-doclet.navMethod=METHOD
-# The following resource does not seem to be used anymore.
-doclet.navFactoryMethod=FACTORY
+doclet.Summary=\u6982\u8981:
+doclet.Detail=\u8BE6\u7EC6\u8D44\u6599:
+doclet.navNested=\u5D4C\u5957
+doclet.navAnnotationTypeOptionalMember=\u53EF\u9009
+doclet.navAnnotationTypeRequiredMember=\u5FC5\u9700
+doclet.navAnnotationTypeMember=\u5143\u7D20
+doclet.navField=\u5B57\u6BB5
+doclet.navEnum=\u679A\u4E3E\u5E38\u91CF
+doclet.navConstructor=\u6784\u9020\u5668
+doclet.navMethod=\u65B9\u6CD5
doclet.Index=\u7D22\u5F15
doclet.Window_Single_Index=\u7D22\u5F15
doclet.Window_Split_Index={0} - \u7D22\u5F15
@@ -66,12 +42,6 @@
doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
doclet.New_Page=NewPage
doclet.None=\u65E0
-# The following resource does not seem to be used anymore
-doclet.CLASSES=CLASSES
-# The following resource does not seem to be used anymore
-doclet.MEMBERS=MEMBERS
-# The following resource does not seem to be used anymore
-doclet.NONE=\u65E0
doclet.Factory_Method_Detail=\u9759\u6001\u5DE5\u5382\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
doclet.navDeprecated=\u5DF2\u8FC7\u65F6
doclet.Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
@@ -136,10 +106,7 @@
doclet.Option=\u9009\u9879
doclet.Or=\u6216
doclet.Frames=\u6846\u67B6
-# The following ALL CAPS words should be translated. It is used as "FRAMES" javadoc navigation link to indicate displaying the page with HTML frames.
-doclet.FRAMES=FRAMES
-# The following ALL CAPS words should be translated. It is used as "NO FRAMES" javadoc navigation link to indicate displaying the page without HTML frames.
-doclet.NO_FRAMES=NO FRAMES
+doclet.No_Frames=\u65E0\u6846\u67B6
doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784:
doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784
doclet.Source_Code=\u6E90\u4EE3\u7801:
@@ -147,11 +114,10 @@
doclet.Cannot_handle_no_packages=\u65E0\u6CD5\u5904\u7406\u6CA1\u6709\u7A0B\u5E8F\u5305\u7684\u60C5\u51B5\u3002
doclet.Frame_Alert=\u6846\u67B6\u9884\u8B66
doclet.Overview-Member-Frame=\u6210\u5458\u6846\u67B6\u6982\u89C8
-doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002
+doclet.Frame_Warning_Message=\u8BF7\u4F7F\u7528\u6846\u67B6\u529F\u80FD\u67E5\u770B\u6B64\u6587\u6863\u3002\u5982\u679C\u770B\u5230\u6B64\u6D88\u606F, \u5219\u8868\u660E\u60A8\u4F7F\u7528\u7684\u662F\u4E0D\u652F\u6301\u6846\u67B6\u7684 Web \u5BA2\u6237\u673A\u3002\u94FE\u63A5\u5230{0}\u3002
doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002
-doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C\u3002
+doclet.Non_Frame_Version=\u975E\u6846\u67B6\u7248\u672C
doclet.Frame_Version=\u6846\u67B6\u7248\u672C
-doclet.Link_To=\u94FE\u63A5\u5230
doclet.Following_From_Class=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u7C7B{0}\u590D\u5236\u7684
doclet.Following_From_Interface=\u4EE5\u4E0B\u5185\u5BB9\u662F\u4ECE\u63A5\u53E3{0}\u590D\u5236\u7684
doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E:
@@ -167,7 +133,7 @@
doclet.Help_line_1=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F
doclet.Help_line_2=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002
doclet.Help_line_3={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002
-doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u56DB\u4E2A\u7C7B\u522B:
+doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u516D\u4E2A\u7C7B\u522B:
doclet.Help_line_5=\u7C7B/\u63A5\u53E3
doclet.Help_line_6=\u6BCF\u4E2A\u7C7B, \u63A5\u53E3, \u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\u3002\u5176\u4E2D\u6BCF\u4E2A\u9875\u9762\u90FD\u7531\u4E09\u90E8\u5206 (\u7C7B/\u63A5\u53E3\u8BF4\u660E, \u6982\u8981\u8868, \u4EE5\u53CA\u8BE6\u7EC6\u7684\u6210\u5458\u8BF4\u660E) \u7EC4\u6210:
doclet.Help_line_7=\u7C7B\u7EE7\u627F\u56FE
@@ -190,16 +156,16 @@
doclet.Help_line_24=\u8FD9\u4E9B\u94FE\u63A5\u4F7F\u60A8\u53EF\u4EE5\u8F6C\u81F3\u4E0B\u4E00\u4E2A\u6216\u4E0A\u4E00\u4E2A\u7C7B, \u63A5\u53E3, \u7A0B\u5E8F\u5305\u6216\u76F8\u5173\u9875\u9762\u3002
doclet.Help_line_25=\u6846\u67B6/\u65E0\u6846\u67B6
doclet.Help_line_26=\u8FD9\u4E9B\u94FE\u63A5\u7528\u4E8E\u663E\u793A\u548C\u9690\u85CF HTML \u6846\u67B6\u3002\u6240\u6709\u9875\u9762\u5747\u5177\u6709\u6709\u6846\u67B6\u548C\u65E0\u6846\u67B6\u4E24\u79CD\u663E\u793A\u65B9\u5F0F\u3002
-doclet.Help_line_27=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002
-doclet.Help_line_28=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
-doclet.Help_line_29=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
+doclet.Help_line_27={0}\u94FE\u63A5\u663E\u793A\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)\u3002
+doclet.Help_line_28=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002
+doclet.Help_line_29=<a href="constant-values.html">\u5E38\u91CF\u5B57\u6BB5\u503C</a>\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
+doclet.Help_line_30=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
doclet.Help_enum_line_1=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
doclet.Help_enum_line_2=\u679A\u4E3E\u58F0\u660E
doclet.Help_enum_line_3=\u679A\u4E3E\u8BF4\u660E
doclet.Help_annotation_type_line_1=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
doclet.Help_annotation_type_line_2=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
doclet.Help_annotation_type_line_3=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E
-doclet.The=\u8BE5
doclet.Style_line_1=Javadoc \u6837\u5F0F\u8868
doclet.Style_line_2=\u5728\u6B64\u5904\u5B9A\u4E49\u989C\u8272, \u5B57\u4F53\u548C\u5176\u4ED6\u6837\u5F0F\u5C5E\u6027\u4EE5\u8986\u76D6\u9ED8\u8BA4\u503C
doclet.Style_line_3=\u9875\u9762\u80CC\u666F\u989C\u8272
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -419,7 +419,7 @@
docencoding = encoding;
}
- classDocCatalog = new ClassDocCatalog(root.specifiedClasses());
+ classDocCatalog = new ClassDocCatalog(root.specifiedClasses(), this);
initTagletManager(customTagStrs);
}
@@ -677,15 +677,18 @@
}
/**
- * Return true if the doc element is getting documented, depending upon
- * -nodeprecated option and @deprecated tag used. Return true if
- * -nodeprecated is not used or @deprecated tag is not used.
+ * Return true if the ClassDoc element is getting documented, depending upon
+ * -nodeprecated option and the deprecation information. Return true if
+ * -nodeprecated is not used. Return false if -nodeprecated is used and if
+ * either ClassDoc element is deprecated or the containing package is deprecated.
+ *
+ * @param cd the ClassDoc for which the page generation is checked
*/
- public boolean isGeneratedDoc(Doc doc) {
+ public boolean isGeneratedDoc(ClassDoc cd) {
if (!nodeprecated) {
return true;
}
- return (doc.tags("deprecated")).length == 0;
+ return !(Util.isDeprecated(cd) || Util.isDeprecated(cd.containingPackage()));
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Thu May 12 07:28:52 2011 -0700
@@ -2,17 +2,10 @@
/*
Overall document style
*/
-* {
- margin:0;
- padding:0;
-}
body {
font-family:Helvetica, Arial, sans-serif;
color:#000000;
}
-p {
- margin:20px 0;
-}
pre {
font-size:1.0em;
}
@@ -30,35 +23,18 @@
}
ul {
margin:10px 0 10px 20px;
-}
-li {
- list-style:disc;
-}
-dl dt {
- font-size:0.95em;
- font-weight:bold;
- margin:10px 0 0 0;
-}
-dl dd {
- margin:10px 0 10px 20px;
-}
-dl dd ul {
- margin-left:0;
-}
-dl dd ul li {
- list-style:none;
- margin:10px 0 10px 0;
+ list-style-type:disc;
}
caption {
background: #CCCCFF;
color:#000000;
- text-align: left;
- font-size: 150%;
- font-weight: bold;
- border-left: 2px ridge;
- border-right: 2px ridge;
- border-top: 2px ridge;
- padding-left: 5px;
+ text-align:left;
+ font-size:150%;
+ font-weight:bold;
+ border-left:2px ridge;
+ border-right:2px ridge;
+ border-top:2px ridge;
+ padding-left:5px;
width:auto;
}
/*
@@ -70,11 +46,11 @@
color:#000000;
}
.legalCopy {
- margin:7px;
+ margin:7px 0;
}
.bar {
font-size:1em;
- margin:10px 0 0 10px;
+ margin:10px 0 0 2px;
}
.bar a {
font-weight:normal;
@@ -84,24 +60,21 @@
*/
.topNav {
border-top:2px solid #C0C0C0;
- margin:7px;
padding:7px 0;
height:2.8em;
- width:99%;
+ width:100%;
min-width:600px;
}
.bottomNav {
border-top:2px solid #C0C0C0;
- margin:7px;
padding:7px 0;
height:2.8em;
- width:99%;
+ width:100%;
}
.subNav {
border-bottom:2px solid #C0C0C0;
float:left;
- width:99%;
- margin:7px;
+ width:100%;
min-width:600px;
}
.subNav div {
@@ -120,7 +93,7 @@
/* Navigation bar list styles */
.topNav ul.navList, .bottomNav ul.navList {
background-color:#EEEEFF;
- padding:7px 5px;
+ padding:4px 4px;
margin:0;
float:left;
width:80%;
@@ -128,7 +101,7 @@
ul.navList li{
list-style:none;
float:left;
- padding:3px 4px;
+ padding:0 4px;
color:#000000;
font-size:0.98em;
}
@@ -142,14 +115,16 @@
.subNav ul.navList {
float:left;
margin:0;
+ padding:0;
font-size:0.8em;
width:350px;
}
ul.subNavList {
float:left;
- margin:0;
font-size:0.8em;
width:350px;
+ margin:0;
+ padding:0;
}
ul.subNavList li{
list-style:none;
@@ -161,16 +136,16 @@
*/
.header, .footer {
clear:both;
- margin:0 7px;
+ padding:10px 0;
}
.indexHeader {
font-size:0.9em;
- margin:10px 0 7px 10px;
+ margin:10px 0 0 2px;
}
.header ul {
padding-left:20px;
}
-/* Header and footer title styles */
+/* Header and footer title styles */
.header h1.title {
font-size:1.4em;
text-align:center;
@@ -181,7 +156,16 @@
margin:0;
}
.subTitle {
+ padding-top:10px;
+}
+/*
+Content styles
+*/
+.deprecatedContent {
margin:0;
+ padding:10px 0;
+}
+.docSummary {
padding-top:10px;
}
/*
@@ -190,11 +174,11 @@
.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer,
.constantValuesContainer {
clear:both;
- padding:10px 10px;
position:relative;
+ padding-bottom:20px;
}
.indexContainer {
- padding:0 0 10px 10px;
+ padding:0 0 0 2px;
font-size:0.9em;
}
/*
@@ -221,7 +205,8 @@
.indexContainer h2 {
font-weight:normal;
font-size:1.0em;
- padding:10px 0 0 0;
+ padding:5px 0 0 0;
+ margin:10px 0 0 0;
}
.contentContainer h2 {
margin:10px 0;
@@ -263,7 +248,7 @@
background:#CCCCFF;
border:0;
border:2px ridge;
- padding-left:5px;
+ margin:0;
}
div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 {
background:#EEEEFF;
@@ -274,23 +259,22 @@
div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
font-size:1.15em;
font-weight:bold;
- padding:0 0 10px 0;
+ padding:0 0 5px 0;
+ margin:0;
}
/*
Table styles
*/
.contentContainer table {
- border-collapse: collapse ;
+ border-collapse:collapse ;
width:100%;
}
.contentContainer table td, .contentContainer table th {
border:2px ridge;
- padding:3px;
}
/* Constant values page table styles */
.constantValuesContainer table {
- border-collapse: collapse ;
- margin:0 0 10px 0;
+ border-collapse:collapse;
}
.constantValuesContainer table caption{
font-size:0.95em;
@@ -303,12 +287,9 @@
}
/* Class-use/Package-use page table styles */
.classUseContainer table {
- border-collapse: collapse ;
+ border-collapse:collapse ;
width:100%;
- margin:0 0 15px 0;
-}
-.classUseContainer ul li ul li table {
- margin-bottom:30px;
+ margin:0 0 10px 0;
}
.classUseContainer ul li ul li table caption{
font-size:0.95em;
@@ -365,6 +346,7 @@
/* Container specific list styles */
.indexContainer ul {
margin:0;
+ padding:0;
}
.indexContainer ul li {
list-style:none;
@@ -376,6 +358,7 @@
list-style:none;
border:0;
border-bottom:2px ridge;
+ height:1%;
}
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast {
list-style:none;
@@ -395,6 +378,7 @@
div.details ul.blockList ul.blockList ul.blockList li.blockList {
border:0;
border-bottom:2px ridge;
+ height:1%;
}
/* Definition list styles */
ul.blockList li.blockList dl{
@@ -413,9 +397,17 @@
ul.blockList li.blockList pre{
margin:0 0 15px 0;
}
+.description dl dt {
+ font-size:0.95em;
+ font-weight:bold;
+ margin:5px 0 0 0;
+}
+.description dl dd {
+ margin:10px 0 10px 20px;
+}
/* List content styles */
ul.blockList li.blockList ul.blockList li.blockList pre{
- margin:10px 0 15px 0;
+ margin:10px 0 10px 0;
}
ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList pre,
ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -47,13 +47,6 @@
/**
* {@inheritDoc}
*/
- public boolean inPackage() {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
public TagletOutput getTagletOutput(Doc holder, TagletWriter writer) {
return writer.deprecatedTagOutput(holder);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -25,8 +25,9 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
import com.sun.javadoc.*;
-import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.Configuration;
/**
* This class acts as an artificial PackageDoc for classes specified
@@ -88,13 +89,16 @@
*/
private Map<String,Set<ClassDoc>> interfaces;
+ private Configuration configuration;
+
/**
* Construct a new ClassDocCatalog.
*
* @param classdocs the array of ClassDocs to catalog
*/
- public ClassDocCatalog (ClassDoc[] classdocs) {
+ public ClassDocCatalog (ClassDoc[] classdocs, Configuration config) {
init();
+ this.configuration = config;
for (int i = 0; i < classdocs.length; i++) {
addClassDoc(classdocs[i]);
}
@@ -151,9 +155,10 @@
private void addClass(ClassDoc classdoc, Map<String,Set<ClassDoc>> map) {
PackageDoc pkg = classdoc.containingPackage();
- if (pkg.isIncluded()) {
- //No need to catalog this class since it's package is
- //included on the command line
+ if (pkg.isIncluded() || (configuration.nodeprecated && Util.isDeprecated(pkg))) {
+ //No need to catalog this class if it's package is
+ //included on the command line or if -nodeprecated option is set
+ // and the containing package is marked as deprecated.
return;
}
String key = Util.getPackageName(pkg);
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -122,8 +122,12 @@
*/
private void buildTree(ClassDoc[] classes, Configuration configuration) {
for (int i = 0; i < classes.length; i++) {
+ // In the tree page (e.g overview-tree.html) do not include
+ // information of classes which are deprecated or are a part of a
+ // deprecated package.
if (configuration.nodeprecated &&
- classes[i].tags("deprecated").length > 0) {
+ (Util.isDeprecated(classes[i]) ||
+ Util.isDeprecated(classes[i].containingPackage()))) {
continue;
}
if (classes[i].isEnum()) {
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -27,27 +27,29 @@
import com.sun.javadoc.*;
import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.Configuration;
/**
- * Build list of all the deprecated classes, constructors, fields and methods.
+ * Build list of all the deprecated packages, classes, constructors, fields and methods.
*
* @author Atul M Dambalkar
*/
public class DeprecatedAPIListBuilder {
- public static final int NUM_TYPES = 11;
+ public static final int NUM_TYPES = 12;
- public static final int INTERFACE = 0;
- public static final int CLASS = 1;
- public static final int ENUM = 2;
- public static final int EXCEPTION = 3;
- public static final int ERROR = 4;
- public static final int ANNOTATION_TYPE = 5;
- public static final int FIELD = 6;
- public static final int METHOD = 7;
- public static final int CONSTRUCTOR = 8;
- public static final int ENUM_CONSTANT = 9;
- public static final int ANNOTATION_TYPE_MEMBER = 10;
+ public static final int PACKAGE = 0;
+ public static final int INTERFACE = 1;
+ public static final int CLASS = 2;
+ public static final int ENUM = 3;
+ public static final int EXCEPTION = 4;
+ public static final int ERROR = 5;
+ public static final int ANNOTATION_TYPE = 6;
+ public static final int FIELD = 7;
+ public static final int METHOD = 8;
+ public static final int CONSTRUCTOR = 9;
+ public static final int ENUM_CONSTANT = 10;
+ public static final int ANNOTATION_TYPE_MEMBER = 11;
/**
* List of deprecated type Lists.
@@ -58,25 +60,33 @@
/**
* Constructor.
*
- * @param root Root of the tree.
+ * @param configuration the current configuration of the doclet
*/
- public DeprecatedAPIListBuilder(RootDoc root) {
+ public DeprecatedAPIListBuilder(Configuration configuration) {
deprecatedLists = new ArrayList<List<Doc>>();
for (int i = 0; i < NUM_TYPES; i++) {
deprecatedLists.add(i, new ArrayList<Doc>());
}
- buildDeprecatedAPIInfo(root);
+ buildDeprecatedAPIInfo(configuration);
}
/**
* Build the sorted list of all the deprecated APIs in this run.
- * Build separate lists for deprecated classes, constructors, methods and
- * fields.
+ * Build separate lists for deprecated packages, classes, constructors,
+ * methods and fields.
*
- * @param root Root of the tree.
+ * @param configuration the current configuration of the doclet.
*/
- private void buildDeprecatedAPIInfo(RootDoc root) {
- ClassDoc[] classes = root.classes();
+ private void buildDeprecatedAPIInfo(Configuration configuration) {
+ PackageDoc[] packages = configuration.packages;
+ PackageDoc pkg;
+ for (int c = 0; c < packages.length; c++) {
+ pkg = packages[c];
+ if (Util.isDeprecated(pkg)) {
+ getList(PACKAGE).add(pkg);
+ }
+ }
+ ClassDoc[] classes = configuration.root.classes();
for (int i = 0; i < classes.length; i++) {
ClassDoc cd = classes[i];
if (Util.isDeprecated(cd)) {
@@ -90,7 +100,7 @@
getList(ENUM).add(cd);
} else if (cd.isError()) {
getList(ERROR).add(cd);
- }else if (cd.isAnnotationType()) {
+ } else if (cd.isAnnotationType()) {
getList(ANNOTATION_TYPE).add(cd);
}
}
@@ -102,7 +112,7 @@
}
if (cd.isAnnotationType()) {
composeDeprecatedList(getList(ANNOTATION_TYPE_MEMBER),
- ((AnnotationTypeDoc) cd).elements());
+ ((AnnotationTypeDoc) cd).elements());
}
}
sortDeprecatedLists();
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -207,7 +207,17 @@
* Should this doc element be added to the index map?
*/
protected boolean shouldAddToIndexMap(Doc element) {
- return !(noDeprecated && element.tags("deprecated").length > 0);
+ if (element instanceof PackageDoc)
+ // Do not add to index map if -nodeprecated option is set and the
+ // package is marked as deprecated.
+ return !(noDeprecated && Util.isDeprecated(element));
+ else
+ // Do not add to index map if -nodeprecated option is set and if the
+ // Doc is marked as deprecated or the containing package is marked as
+ // deprecated.
+ return !(noDeprecated &&
+ (Util.isDeprecated(element) ||
+ Util.isDeprecated(((ProgramElementDoc)element).containingPackage())));
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -76,13 +76,16 @@
protected void generatePackageListFile(RootDoc root) {
PackageDoc[] packages = configuration.packages;
- String[] names = new String[packages.length];
+ ArrayList<String> names = new ArrayList<String>();
for (int i = 0; i < packages.length; i++) {
- names[i] = packages[i].name();
+ // if the -nodeprecated option is set and the package is marked as
+ // deprecated, do not include it in the packages list.
+ if (!(configuration.nodeprecated && Util.isDeprecated(packages[i])))
+ names.add(packages[i].name());
}
- Arrays.sort(names);
- for (int i = 0; i < packages.length; i++) {
- println(names[i]);
+ Collections.sort(names);
+ for (int i = 0; i < names.size(); i++) {
+ println(names.get(i));
}
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Thu May 12 07:28:52 2011 -0700
@@ -861,11 +861,15 @@
* @param doc the Doc to check.
* @return true if the given Doc is deprecated.
*/
- public static boolean isDeprecated(ProgramElementDoc doc) {
+ public static boolean isDeprecated(Doc doc) {
if (doc.tags("deprecated").length > 0) {
return true;
}
- AnnotationDesc[] annotationDescList = doc.annotations();
+ AnnotationDesc[] annotationDescList;
+ if (doc instanceof PackageDoc)
+ annotationDescList = ((PackageDoc)doc).annotations();
+ else
+ annotationDescList = ((ProgramElementDoc)doc).annotations();
for (int i = 0; i < annotationDescList.length; i++) {
if (annotationDescList[i].annotationType().qualifiedName().equals(
java.lang.Deprecated.class.getName())){
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -34,11 +34,13 @@
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
+import com.sun.source.tree.CatchTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.Scope;
import com.sun.source.tree.Tree;
@@ -49,7 +51,7 @@
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.TypeSymbol;
import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.Type.UnionClassType;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Enter;
@@ -430,4 +432,16 @@
log.useSource(oldSource);
}
}
+
+ @Override
+ public TypeMirror getLub(CatchTree tree) {
+ JCCatch ct = (JCCatch) tree;
+ JCVariableDecl v = ct.param;
+ if (v.type != null && v.type.getKind() == TypeKind.UNION) {
+ UnionClassType ut = (UnionClassType) v.type;
+ return ut.getLub();
+ } else {
+ return v.type;
+ }
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Thu May 12 07:28:52 2011 -0700
@@ -649,7 +649,7 @@
public Iterator<Symbol> iterator() {
return new CompoundScopeIterator(subScopes) {
Iterator<Symbol> nextIterator(Scope s) {
- return s.getElements().iterator();
+ return s.getElements(sf).iterator();
}
};
}
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Thu May 12 07:28:52 2011 -0700
@@ -186,6 +186,9 @@
public boolean allowSimplifiedVarargs() {
return compareTo(JDK1_7) >= 0;
}
+ public boolean allowObjectToPrimitiveCast() {
+ return compareTo(JDK1_7) >= 0;
+ }
public static SourceVersion toSourceVersion(Source source) {
switch(source) {
case JDK1_2:
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Thu May 12 07:28:52 2011 -0700
@@ -25,6 +25,8 @@
package com.sun.tools.javac.code;
+import java.util.Collections;
+
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.code.Symbol.*;
@@ -741,6 +743,38 @@
}
}
+ // a clone of a ClassType that knows about the alternatives of a union type.
+ public static class UnionClassType extends ClassType implements UnionType {
+ final List<? extends Type> alternatives_field;
+
+ public UnionClassType(ClassType ct, List<? extends Type> alternatives) {
+ super(ct.outer_field, ct.typarams_field, ct.tsym);
+ allparams_field = ct.allparams_field;
+ supertype_field = ct.supertype_field;
+ interfaces_field = ct.interfaces_field;
+ all_interfaces_field = ct.interfaces_field;
+ alternatives_field = alternatives;
+ }
+
+ public Type getLub() {
+ return tsym.type;
+ }
+
+ public java.util.List<? extends TypeMirror> getAlternatives() {
+ return Collections.unmodifiableList(alternatives_field);
+ }
+
+ @Override
+ public TypeKind getKind() {
+ return TypeKind.UNION;
+ }
+
+ @Override
+ public <R, P> R accept(TypeVisitor<R, P> v, P p) {
+ return v.visitUnion(this, p);
+ }
+ }
+
public static class ArrayType extends Type
implements javax.lang.model.type.ArrayType {
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Thu May 12 07:28:52 2011 -0700
@@ -74,8 +74,9 @@
final JavacMessages messages;
final Names names;
final boolean allowBoxing;
+ final boolean allowCovariantReturns;
+ final boolean allowObjectToPrimitiveCast;
final ClassReader reader;
- final Source source;
final Check chk;
List<Warner> warnStack = List.nil();
final Name capturedName;
@@ -92,9 +93,11 @@
context.put(typesKey, this);
syms = Symtab.instance(context);
names = Names.instance(context);
- allowBoxing = Source.instance(context).allowBoxing();
+ Source source = Source.instance(context);
+ allowBoxing = source.allowBoxing();
+ allowCovariantReturns = source.allowCovariantReturns();
+ allowObjectToPrimitiveCast = source.allowObjectToPrimitiveCast();
reader = ClassReader.instance(context);
- source = Source.instance(context);
chk = Check.instance(context);
capturedName = names.fromString("<captured wildcard>");
messages = JavacMessages.instance(context);
@@ -409,6 +412,7 @@
return
s.tag == BOT || s.tag == CLASS ||
s.tag == ARRAY || s.tag == TYPEVAR;
+ case WILDCARD: //we shouldn't be here - avoids crash (see 7034495)
case NONE:
return false;
default:
@@ -949,8 +953,9 @@
return true;
if (t.isPrimitive() != s.isPrimitive())
- return allowBoxing && (isConvertible(t, s, warn) || isConvertible(s, t, warn));
-
+ return allowBoxing && (
+ isConvertible(t, s, warn)
+ || (allowObjectToPrimitiveCast && isConvertible(s, t, warn)));
if (warn != warnStack.head) {
try {
warnStack = warnStack.prepend(warn);
@@ -2309,7 +2314,7 @@
if (elemtype == t.elemtype)
return t;
else
- return new ArrayType(elemtype, t.tsym);
+ return new ArrayType(upperBound(elemtype), t.tsym);
}
@Override
@@ -3070,7 +3075,7 @@
if (hasSameArgs(r1, r2))
return covariantReturnType(r1.getReturnType(), r2res, warner);
- if (!source.allowCovariantReturns())
+ if (!allowCovariantReturns)
return false;
if (isSubtypeUnchecked(r1.getReturnType(), r2res, warner))
return true;
@@ -3087,7 +3092,7 @@
public boolean covariantReturnType(Type t, Type s, Warner warner) {
return
isSameType(t, s) ||
- source.allowCovariantReturns() &&
+ allowCovariantReturns &&
!t.isPrimitive() &&
!s.isPrimitive() &&
isAssignable(t, s, warner);
@@ -3293,7 +3298,7 @@
}
if (giveWarning && !isReifiable(reverse ? from : to))
warn.warn(LintCategory.UNCHECKED);
- if (!source.allowCovariantReturns())
+ if (!allowCovariantReturns)
// reject if there is a common method signature with
// incompatible return types.
chk.checkCompatibleAbstracts(warn.pos(), from, to);
@@ -3320,7 +3325,7 @@
Type t2 = to;
if (disjointTypes(t1.getTypeArguments(), t2.getTypeArguments()))
return false;
- if (!source.allowCovariantReturns())
+ if (!allowCovariantReturns)
// reject if there is a common method signature with
// incompatible return types.
chk.checkCompatibleAbstracts(warn.pos(), from, to);
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Thu May 12 07:28:52 2011 -0700
@@ -168,11 +168,11 @@
}
JCIdent left = (JCIdent)assign.lhs;
Symbol method = rs.resolveQualifiedMethod(left.pos(),
- env,
- a.type,
- left.name,
- List.<Type>nil(),
- null);
+ env,
+ a.type,
+ left.name,
+ List.<Type>nil(),
+ null);
left.sym = method;
left.type = method.type;
if (method.owner != a.type.tsym)
@@ -190,6 +190,15 @@
Attribute enterAttributeValue(Type expected,
JCExpression tree,
Env<AttrContext> env) {
+ //first, try completing the attribution value sym - if a completion
+ //error is thrown, we should recover gracefully, and display an
+ //ordinary resolution diagnostic.
+ try {
+ expected.tsym.complete();
+ } catch(CompletionFailure e) {
+ log.error(tree.pos(), "cant.resolve", Kinds.kindName(e.sym), e.sym);
+ return new Attribute.Error(expected);
+ }
if (expected.isPrimitive() || types.isSameType(expected, syms.stringType)) {
Type result = attr.attribExpr(tree, env, expected);
if (result.isErroneous())
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu May 12 07:28:52 2011 -0700
@@ -2910,6 +2910,7 @@
public void visitTypeUnion(JCTypeUnion tree) {
ListBuffer<Type> multicatchTypes = ListBuffer.lb();
+ ListBuffer<Type> all_multicatchTypes = null; // lazy, only if needed
for (JCExpression typeTree : tree.alternatives) {
Type ctype = attribType(typeTree, env);
ctype = chk.checkType(typeTree.pos(),
@@ -2931,9 +2932,23 @@
}
}
multicatchTypes.append(ctype);
+ if (all_multicatchTypes != null)
+ all_multicatchTypes.append(ctype);
+ } else {
+ if (all_multicatchTypes == null) {
+ all_multicatchTypes = ListBuffer.lb();
+ all_multicatchTypes.appendList(multicatchTypes);
+ }
+ all_multicatchTypes.append(ctype);
}
}
- tree.type = result = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt);
+ Type t = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt);
+ if (t.tag == CLASS) {
+ List<Type> alternatives =
+ ((all_multicatchTypes == null) ? multicatchTypes : all_multicatchTypes).toList();
+ t = new UnionClassType((ClassType) t, alternatives);
+ }
+ tree.type = result = t;
}
public void visitTypeParameter(JCTypeParameter tree) {
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Thu May 12 07:28:52 2011 -0700
@@ -681,6 +681,12 @@
"cant.apply.diamond.1",
t, diags.fragment("diamond.non.generic", t));
return types.createErrorType(t);
+ } else if (tree.typeargs != null &&
+ tree.typeargs.nonEmpty()) {
+ log.error(tree.clazz.pos(),
+ "cant.apply.diamond.1",
+ t, diags.fragment("diamond.and.explicit.params", t));
+ return types.createErrorType(t);
} else {
return t;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Thu May 12 07:28:52 2011 -0700
@@ -1153,8 +1153,7 @@
if (chk.subset(exc, caughtInTry)) {
log.error(pos, "except.already.caught", exc);
} else if (!chk.isUnchecked(pos, exc) &&
- exc.tsym != syms.throwableType.tsym &&
- exc.tsym != syms.exceptionType.tsym &&
+ !isExceptionOrThrowable(exc) &&
!chk.intersects(exc, thrownInTry)) {
log.error(pos, "except.never.thrown.in.try", exc);
} else if (allowImprovedCatchAnalysis) {
@@ -1163,7 +1162,8 @@
// unchecked exception, the result list would not be empty, as the augmented
// thrown set includes { RuntimeException, Error }; if 'exc' was a checked
// exception, that would have been covered in the branch above
- if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty()) {
+ if (chk.diff(catchableThrownTypes, caughtInTry).isEmpty() &&
+ !isExceptionOrThrowable(exc)) {
String key = catchableThrownTypes.length() == 1 ?
"unreachable.catch" :
"unreachable.catch.1";
@@ -1171,6 +1171,12 @@
}
}
}
+ //where
+ private boolean isExceptionOrThrowable(Type exc) {
+ return exc.tsym == syms.throwableType.tsym ||
+ exc.tsym == syms.exceptionType.tsym;
+ }
+
public void visitConditional(JCConditional tree) {
scanCond(tree.cond);
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu May 12 07:28:52 2011 -0700
@@ -1609,18 +1609,31 @@
// type.tsym.flatName() should == proxy.enumFlatName
TypeSymbol enumTypeSym = proxy.enumType.tsym;
VarSymbol enumerator = null;
- for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator);
- e.scope != null;
- e = e.next()) {
- if (e.sym.kind == VAR) {
- enumerator = (VarSymbol)e.sym;
- break;
+ CompletionFailure failure = null;
+ try {
+ for (Scope.Entry e = enumTypeSym.members().lookup(proxy.enumerator);
+ e.scope != null;
+ e = e.next()) {
+ if (e.sym.kind == VAR) {
+ enumerator = (VarSymbol)e.sym;
+ break;
+ }
}
}
+ catch (CompletionFailure ex) {
+ failure = ex;
+ }
if (enumerator == null) {
- log.error("unknown.enum.constant",
- currentClassFile, enumTypeSym, proxy.enumerator);
- result = new Attribute.Error(enumTypeSym.type);
+ if (failure != null) {
+ log.warning("unknown.enum.constant.reason",
+ currentClassFile, enumTypeSym, proxy.enumerator,
+ failure.getDiagnostic());
+ } else {
+ log.warning("unknown.enum.constant",
+ currentClassFile, enumTypeSym, proxy.enumerator);
+ }
+ result = new Attribute.Enum(enumTypeSym.type,
+ new VarSymbol(0, proxy.enumerator, syms.botType, enumTypeSym));
} else {
result = new Attribute.Enum(enumTypeSym.type, enumerator);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Thu May 12 07:28:52 2011 -0700
@@ -479,7 +479,12 @@
state.pop(1);// index
Type a = state.stack[state.stacksize-1];
state.pop(1);
- state.push(types.erasure(types.elemtype(a))); }
+ //sometimes 'null type' is treated as a one-dimensional array type
+ //see Gen.visitLiteral - we should handle this case accordingly
+ Type stackType = a.tag == BOT ?
+ syms.objectType :
+ types.erasure(types.elemtype(a));
+ state.push(stackType); }
break;
case goto_:
markDead();
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Thu May 12 07:28:52 2011 -0700
@@ -72,11 +72,11 @@
}
public Element asElement(TypeMirror t) {
- Type type = cast(Type.class, t);
- switch (type.tag) {
- case TypeTags.CLASS:
- case TypeTags.ERROR:
- case TypeTags.TYPEVAR:
+ switch (t.getKind()) {
+ case DECLARED:
+ case ERROR:
+ case TYPEVAR:
+ Type type = cast(Type.class, t);
return type.asElement();
default:
return null;
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu May 12 07:28:52 2011 -0700
@@ -762,9 +762,6 @@
compiler.err.unclosed.str.lit=\
unclosed string literal
-compiler.err.unknown.enum.constant=\
- in class file {0}: unknown enum constant {1}.{2}
-
# 0: name
compiler.err.unsupported.encoding=\
unsupported encoding: {0}
@@ -1307,6 +1304,15 @@
compiler.warn.annotation.method.not.found.reason=\
Cannot find annotation method ''{1}()'' in type ''{0}'': {2}
+# 0: symbol, 1: name
+compiler.warn.unknown.enum.constant=\
+ unknown enum constant {1}.{2}
+
+# 0: symbol, 1: name, 2: message segment
+compiler.warn.unknown.enum.constant.reason=\
+ unknown enum constant {1}.{2}\n\
+ reason: {3}
+
# 0: type, 1: type
compiler.warn.raw.class.use=\
found raw type: {0}\n\
@@ -1618,6 +1624,9 @@
compiler.misc.diamond.non.generic=\
cannot use ''<>'' with non-generic class {0}
+compiler.misc.diamond.and.explicit.params=\
+ cannot use ''<>'' with explicit type parameters for constructor
+
# 0: type, 1: list of type
compiler.misc.explicit.param.do.not.conform.to.bounds=\
explicit type argument {0} does not conform to declared bound(s) {1}
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Thu May 12 07:28:52 2011 -0700
@@ -228,6 +228,9 @@
# 0: symbol
compiler.err.multicatch.parameter.may.not.be.assigned=\u8907\u6570catch\u30D1\u30E9\u30E1\u30FC\u30BF{0}\u306B\u5024\u3092\u4EE3\u5165\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+# 0: type, 1: type
+compiler.err.multicatch.types.must.be.disjoint=\u8907\u6570catch\u6587\u306E\u4EE3\u66FF\u3092\u30B5\u30D6\u30AF\u30E9\u30B9\u5316\u306B\u3088\u3063\u3066\u95A2\u9023\u4ED8\u3051\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\n\u4EE3\u66FF{0}\u306F\u4EE3\u66FF{1}\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3067\u3059
+
compiler.err.finally.without.try=''finally''\u3078\u306E''try''\u304C\u3042\u308A\u307E\u305B\u3093
# 0: type, 1: message segment
@@ -436,8 +439,12 @@
# Errors related to annotation processing
+# 0: symbol, 1: string, 2: stack-trace
compiler.err.proc.cant.access={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n{2}
+# 0: symbol, 1: string
+compiler.err.proc.cant.access.1={0}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n{1}
+
# 0: string
compiler.err.proc.cant.find.class=''{0}''\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
@@ -535,8 +542,6 @@
compiler.err.unclosed.str.lit=\u6587\u5B57\u5217\u30EA\u30C6\u30E9\u30EB\u304C\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093
-compiler.err.unknown.enum.constant=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u5185: \u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}
-
# 0: name
compiler.err.unsupported.encoding=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3059: {0}
@@ -686,6 +691,7 @@
# 0: file name
compiler.note.sunapi.filename={0}\u306F\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5185\u90E8\u6240\u6709\u306EAPI\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
+
compiler.note.sunapi.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u5185\u90E8\u6240\u6709\u306EAPI\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
# The following string may appear after one of the above sunapi messages.
@@ -796,6 +802,12 @@
# 0: type, 1: type
compiler.warn.inexact.non-varargs.call=\u6700\u7D42\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u4E0D\u6B63\u78BA\u306A\u5F15\u6570\u578B\u3092\u6301\u3063\u305F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306E\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u3002\n\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{0}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u307E\u3059\u3002\n\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059
+# 0: list of type
+compiler.warn.unreachable.catch=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059
+
+# 0: list of type
+compiler.warn.unreachable.catch.1=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\n\u30B9\u30ED\u30FC\u3055\u308C\u305F\u30BF\u30A4\u30D7{0}\u306F\u3059\u3067\u306B\u6355\u6349\u3055\u308C\u3066\u3044\u307E\u3059
+
# 0: symbol
compiler.warn.long.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Elong\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
@@ -888,6 +900,9 @@
# 0: symbol
compiler.warn.try.resource.not.referenced=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306F\u5BFE\u5FDC\u3059\u308Btry\u6587\u306E\u672C\u4F53\u3067\u306F\u53C2\u7167\u3055\u308C\u307E\u305B\u3093
+# 0: type
+compiler.warn.try.resource.throws.interrupted.exc=\u81EA\u52D5\u30AF\u30ED\u30FC\u30BA\u53EF\u80FD\u306A\u30EA\u30BD\u30FC\u30B9{0}\u306B\u3001InterruptedException\u3092\u30B9\u30ED\u30FC\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u30E1\u30F3\u30D0\u30FC\u30FB\u30E1\u30BD\u30C3\u30C9close()\u304C\u3042\u308A\u307E\u3059
+
compiler.warn.unchecked.assign={0}\u304B\u3089{1}\u3078\u306E\u7121\u691C\u67FB\u4EE3\u5165\u3067\u3059
# 0: symbol, 1: type
@@ -924,6 +939,12 @@
compiler.warn.annotation.method.not.found.reason=\u30BF\u30A4\u30D7''{0}''\u5185\u306B\u6CE8\u91C8\u30E1\u30BD\u30C3\u30C9''{1}()''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {2}
+# 0: symbol, 1: name
+compiler.warn.unknown.enum.constant=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}
+
+# 0: symbol, 1: name, 2: message segment
+compiler.warn.unknown.enum.constant.reason=\u4E0D\u660E\u306A\u5217\u6319\u578B\u5B9A\u6570\u3067\u3059{1}.{2}\n\u7406\u7531: {3}
+
# 0: type, 1: type
compiler.warn.raw.class.use=raw\u578B\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {0}\n\u6C4E\u7528\u30AF\u30E9\u30B9{1}\u306E\u578B\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093
@@ -1011,7 +1032,11 @@
## above strings.
compiler.misc.bad.class.signature=\u30AF\u30E9\u30B9{0}\u306E\u30B7\u30B0\u30CB\u30C1\u30E3\u304C\u4E0D\u6B63\u3067\u3059
-compiler.misc.bad.enclosing.method=\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0}
+#0: symbol, 1: symbol
+compiler.misc.bad.enclosing.class={0}\u306E\u5185\u90E8\u30AF\u30E9\u30B9\u304C\u4E0D\u6B63\u3067\u3059: {1}
+
+# 0: symbol
+compiler.misc.bad.enclosing.method=\u30AF\u30E9\u30B9{0}\u306E\u56F2\u3093\u3067\u3044\u308B\u30E1\u30BD\u30C3\u30C9\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059
compiler.misc.bad.runtime.invisible.param.annotations=RuntimeInvisibleParameterAnnotations\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059: {0}
@@ -1140,11 +1165,7 @@
# 0: type
compiler.misc.diamond.non.generic=\u975E\u6C4E\u7528\u30AF\u30E9\u30B9{0}\u3067''<>''\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.arg={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
-
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.args={1}\u306B\u3064\u3044\u3066\u63A8\u5B9A\u3055\u308C\u305F\u578B\u5F15\u6570{0}\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.misc.diamond.and.explicit.params=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u660E\u793A\u7684\u306A\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
# 0: type, 1: list of type
compiler.misc.explicit.param.do.not.conform.to.bounds=\u660E\u793A\u7684\u306A\u578B\u5F15\u6570{0}\u306F\u3001\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C{1}\u306B\u9069\u5408\u3057\u307E\u305B\u3093
@@ -1291,7 +1312,7 @@
# 0: symbol, 1: symbol, 2: symbol, 3: symbol
compiler.misc.varargs.clash.with={1}\u306E{0}\u306F{3}\u306E{2}\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059
-compiler.misc.non.denotable.type=\u3053\u3053\u3067\u975E\u578B\u6307\u5B9A\u578B{0}\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+compiler.misc.diamond.and.anon.class=\u533F\u540D\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u306F''<>''\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
# 0: symbol kind, 1: symbol, 2: symbol, 3: message segment
compiler.misc.inapplicable.method={0} {1}.{2}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\n({3})
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Thu May 12 07:28:52 2011 -0700
@@ -228,6 +228,9 @@
# 0: symbol
compiler.err.multicatch.parameter.may.not.be.assigned=\u53EF\u80FD\u672A\u5206\u914D multi-catch \u53C2\u6570{0}
+# 0: type, 1: type
+compiler.err.multicatch.types.must.be.disjoint=multi-catch \u8BED\u53E5\u4E2D\u7684\u66FF\u4EE3\u65E0\u6CD5\u901A\u8FC7\u5B50\u7C7B\u5316\u5173\u8054\n\u66FF\u4EE3{0}\u662F\u66FF\u4EE3{1}\u7684\u5B50\u7C7B
+
compiler.err.finally.without.try=\u6709 ''finally'', \u4F46\u662F\u6CA1\u6709 ''try''
# 0: type, 1: message segment
@@ -436,8 +439,12 @@
# Errors related to annotation processing
+# 0: symbol, 1: string, 2: stack-trace
compiler.err.proc.cant.access=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4EE5\u4E0B\u5806\u6808\u8DDF\u8E2A\u3002\n{2}
+# 0: symbol, 1: string
+compiler.err.proc.cant.access.1=\u65E0\u6CD5\u8BBF\u95EE{0}\n{1}
+
# 0: string
compiler.err.proc.cant.find.class=\u627E\u4E0D\u5230 ''{0}'' \u7684\u7C7B\u6587\u4EF6\u3002
@@ -535,8 +542,6 @@
compiler.err.unclosed.str.lit=\u672A\u7ED3\u675F\u7684\u5B57\u7B26\u4E32\u6587\u5B57
-compiler.err.unknown.enum.constant=\u5728\u7C7B\u6587\u4EF6{0}\u4E2D: \u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}
-
# 0: name
compiler.err.unsupported.encoding=\u4E0D\u652F\u6301\u7684\u7F16\u7801: {0}
@@ -686,6 +691,7 @@
# 0: file name
compiler.note.sunapi.filename={0}\u4F7F\u7528\u4E86\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5185\u90E8\u4E13\u7528 API\u3002
+
compiler.note.sunapi.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u4E86\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u7684\u5185\u90E8\u4E13\u7528 API\u3002
# The following string may appear after one of the above sunapi messages.
@@ -796,6 +802,12 @@
# 0: type, 1: type
compiler.warn.inexact.non-varargs.call=\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u4F7F\u7528\u4E86\u4E0D\u51C6\u786E\u7684\u53D8\u91CF\u7C7B\u578B\u7684 varargs \u65B9\u6CD5\u7684\u975E varargs \u8C03\u7528; \n\u5BF9\u4E8E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {0}\n\u5BF9\u4E8E\u975E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {1}, \u8FD9\u6837\u4E5F\u53EF\u4EE5\u6291\u5236\u6B64\u8B66\u544A
+# 0: list of type
+compiler.warn.unreachable.catch=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0}
+
+# 0: list of type
+compiler.warn.unreachable.catch.1=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u5DF2\u6355\u83B7\u5230\u629B\u51FA\u7684\u7C7B\u578B{0}
+
# 0: symbol
compiler.warn.long.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F long \u7C7B\u578B
@@ -888,6 +900,9 @@
# 0: symbol
compiler.warn.try.resource.not.referenced=\u4E0D\u80FD\u5728\u76F8\u5E94\u7684 try \u8BED\u53E5\u7684\u6B63\u6587\u4E2D\u5F15\u7528\u53EF\u81EA\u52A8\u7ED3\u675F\u7684\u8D44\u6E90{0}
+# 0: type
+compiler.warn.try.resource.throws.interrupted.exc=\u53EF\u81EA\u52A8\u5173\u95ED\u7684\u8D44\u6E90{0}\u5305\u542B\u7684\u6210\u5458\u65B9\u6CD5 close() \u53EF\u80FD\u629B\u51FA InterruptedException
+
compiler.warn.unchecked.assign=\u672A\u7ECF\u68C0\u67E5\u7684\u5206\u914D: \u5C06{0}\u5206\u914D\u7ED9{1}
# 0: symbol, 1: type
@@ -924,6 +939,12 @@
compiler.warn.annotation.method.not.found.reason=\u65E0\u6CD5\u627E\u5230\u7C7B\u578B ''{0}'' \u7684\u6CE8\u91CA\u65B9\u6CD5 ''{1}()'': {2}
+# 0: symbol, 1: name
+compiler.warn.unknown.enum.constant=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}
+
+# 0: symbol, 1: name, 2: message segment
+compiler.warn.unknown.enum.constant.reason=\u672A\u77E5\u7684\u679A\u4E3E\u5E38\u91CF {1}.{2}\n\u539F\u56E0: {3}
+
# 0: type, 1: type
compiler.warn.raw.class.use=\u627E\u5230\u539F\u59CB\u7C7B\u578B: {0}\n\u7F3A\u5C11\u6CDB\u578B\u7C7B{1}\u7684\u7C7B\u578B\u53C2\u6570
@@ -1011,7 +1032,11 @@
## above strings.
compiler.misc.bad.class.signature=\u9519\u8BEF\u7684\u7C7B\u7B7E\u540D: {0}
-compiler.misc.bad.enclosing.method=\u9519\u8BEF\u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027: {0}
+#0: symbol, 1: symbol
+compiler.misc.bad.enclosing.class={0}\u7684\u5C01\u95ED\u7C7B\u9519\u8BEF: {1}
+
+# 0: symbol
+compiler.misc.bad.enclosing.method=\u7C7B {0} \u7684\u5C01\u95ED\u65B9\u6CD5\u5C5E\u6027\u9519\u8BEF
compiler.misc.bad.runtime.invisible.param.annotations=\u9519\u8BEF\u7684 RuntimeInvisibleParameterAnnotations \u5C5E\u6027: {0}
@@ -1140,11 +1165,7 @@
# 0: type
compiler.misc.diamond.non.generic=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u975E\u6CDB\u578B\u7C7B{0}\u4E00\u8D77\u4F7F\u7528
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.arg=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0}
-
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.args=\u6B64\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E3A{1}\u63A8\u65AD\u7684\u7C7B\u578B\u53C2\u6570{0}
+compiler.misc.diamond.and.explicit.params=\u4E0D\u80FD\u5C06 ''<>'' \u4E0E\u6784\u9020\u5668\u7684\u663E\u5F0F\u7C7B\u578B\u53C2\u6570\u4E00\u8D77\u4F7F\u7528
# 0: type, 1: list of type
compiler.misc.explicit.param.do.not.conform.to.bounds=\u663E\u5F0F\u7C7B\u578B\u53C2\u6570{0}\u4E0D\u7B26\u5408\u58F0\u660E\u7684\u8303\u56F4{1}
@@ -1291,7 +1312,7 @@
# 0: symbol, 1: symbol, 2: symbol, 3: symbol
compiler.misc.varargs.clash.with={1}\u4E2D\u7684{0}\u8986\u76D6\u4E86{3}\u4E2D\u7684{2}
-compiler.misc.non.denotable.type=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u4E0D\u53EF\u6307\u793A\u7684\u7C7B\u578B{0}
+compiler.misc.diamond.and.anon.class=\u65E0\u6CD5\u5C06 ''<>'' \u4E0E\u533F\u540D\u5185\u90E8\u7C7B\u4E00\u8D77\u4F7F\u7528
# 0: symbol kind, 1: symbol, 2: symbol, 3: message segment
compiler.misc.inapplicable.method={0} {1}.{2}\u4E0D\u9002\u7528\n({3})
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Thu May 12 07:28:52 2011 -0700
@@ -87,6 +87,7 @@
javac.opt.printRounds=\u6CE8\u91C8\u51E6\u7406\u306E\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
javac.opt.printProcessorInfo=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
javac.opt.prefer=\u6697\u9ED9\u7684\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u308B\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u3001\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3068\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u4E21\u65B9\u304C\u898B\u3064\u304B\u3063\u305F\u969B\u3069\u3061\u3089\u3092\u8AAD\u307F\u8FBC\u3080\u304B\u6307\u5B9A\u3059\u308B
+javac.opt.AT=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u540D
## errors
@@ -96,6 +97,7 @@
javac.err.invalid.flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059
javac.err.invalid.target={0}\u306F\u7121\u52B9\u306A\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059
javac.err.no.source.files=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093
+javac.err.no.source.files.classes=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30AF\u30E9\u30B9\u540D\u304C\u3042\u308A\u307E\u305B\u3093
javac.err.req.arg={0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059
javac.err.invalid.source={0}\u306F\u7121\u52B9\u306A\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u3059
javac.err.error.writing.file={0}\u306E\u66F8\u8FBC\u307F\u30A8\u30E9\u30FC\u3067\u3059\u3002{1}
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties Thu May 12 07:28:52 2011 -0700
@@ -87,6 +87,7 @@
javac.opt.printRounds=\u8F93\u51FA\u6709\u5173\u6CE8\u91CA\u5904\u7406\u5FAA\u73AF\u7684\u4FE1\u606F
javac.opt.printProcessorInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5904\u7406\u7A0B\u5E8F\u5904\u7406\u54EA\u4E9B\u6CE8\u91CA\u7684\u4FE1\u606F
javac.opt.prefer=\u6307\u5B9A\u8BFB\u53D6\u6587\u4EF6, \u5F53\u540C\u65F6\u627E\u5230\u9690\u5F0F\u7F16\u8BD1\u7C7B\u7684\u6E90\u6587\u4EF6\u548C\u7C7B\u6587\u4EF6\u65F6
+javac.opt.AT=\u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C\u6587\u4EF6\u540D
## errors
@@ -96,6 +97,7 @@
javac.err.invalid.flag=\u65E0\u6548\u7684\u6807\u8BB0: {0}
javac.err.invalid.target=\u65E0\u6548\u7684\u76EE\u6807\u53D1\u884C\u7248: {0}
javac.err.no.source.files=\u65E0\u6E90\u6587\u4EF6
+javac.err.no.source.files.classes=\u65E0\u6E90\u6587\u4EF6\u6216\u7C7B\u540D
javac.err.req.arg={0}\u9700\u8981\u53C2\u6570
javac.err.invalid.source=\u65E0\u6548\u7684\u6E90\u53D1\u884C\u7248: {0}
javac.err.error.writing.file=\u5199\u5165{0}\u65F6\u51FA\u9519; {1}
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Thu May 12 07:28:52 2011 -0700
@@ -266,6 +266,8 @@
com.sun.swing.internal.plaf.basic.resources = tiger legacy
com.sun.swing.internal.plaf.metal.resources = tiger legacy
com.sun.swing.internal.plaf.synth.resources = tiger legacy
+com.sun.tracing = tiger legacy
+com.sun.tracing.dtrace = tiger legacy
java.applet = tiger legacy
java.awt = tiger legacy
java.awt.color = tiger legacy
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Thu May 12 07:28:52 2011 -0700
@@ -75,7 +75,7 @@
tag.End_delimiter_missing_for_possible_SeeTag=\u30B3\u30E1\u30F3\u30C8\u6587\u5B57\u5217"{0}"\u3067\u3001\u6709\u52B9\u306Asee\u30BF\u30B0\u306B\u7D42\u7AEF\u30C7\u30EA\u30DF\u30BF}\u304C\u3042\u308A\u307E\u305B\u3093
tag.Improper_Use_Of_Link_Tag=\u30A4\u30F3\u30E9\u30A4\u30F3\u30FB\u30BF\u30B0"{0}"\u306B\u7D42\u4E86\u6587\u5B57''}''\u304C\u3042\u308A\u307E\u305B\u3093
javadoc.File_Read_Error=\u30D5\u30A1\u30A4\u30EB{0}\u306E\u8AAD\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-javadoc.Body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093
+javadoc.Body_missing_from_html_file=HTML\u306Bbody\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093
javadoc.End_body_missing_from_html_file=HTML\u30D5\u30A1\u30A4\u30EB\u306Bbody\u306E\u9589\u3058\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093
javadoc.Multiple_package_comments=\u30D1\u30C3\u30B1\u30FC\u30B8"{0}"\u306B\u8907\u6570\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B3\u30E1\u30F3\u30C8\u306E\u30BD\u30FC\u30B9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F
javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Thu May 12 07:24:37 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Thu May 12 07:28:52 2011 -0700
@@ -75,7 +75,7 @@
tag.End_delimiter_missing_for_possible_SeeTag=\u6CE8\u91CA\u5B57\u7B26\u4E32\u4E2D\u53EF\u80FD\u51FA\u73B0\u7684 See \u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F\u5206\u9694\u7B26 }: "{0}"
tag.Improper_Use_Of_Link_Tag=\u5185\u5D4C\u6807\u8BB0\u7F3A\u5C11\u7ED3\u675F ''}'' \u5B57\u7B26: "{0}"
javadoc.File_Read_Error=\u8BFB\u53D6\u6587\u4EF6{0}\u65F6\u51FA\u9519
-javadoc.Body_missing_from_html_file=HTML \u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0
+javadoc.Body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u6807\u8BB0
javadoc.End_body_missing_from_html_file=HTML \u6587\u4EF6\u4E2D\u7F3A\u5C11\u4E3B\u4F53\u7ED3\u675F\u6807\u8BB0
javadoc.Multiple_package_comments=\u627E\u5230\u7A0B\u5E8F\u5305 "{0}" \u7684\u591A\u4E2A\u7A0B\u5E8F\u5305\u6CE8\u91CA\u6E90
javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6553182
+ * @summary This test verifies the -Xdocrootparent option.
+ * @author Bhavesh Patel
+ * @library ../lib/
+ * @build JavadocTester TestDocRootLink
+ * @run main TestDocRootLink
+ */
+public class TestDocRootLink extends JavadocTester {
+
+ private static final String BUG_ID = "6553182";
+ private static final String[][] TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html",
+ "<a href=\"../../technotes/guides/index.html\">"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
+ "<a href=\"../../technotes/guides/index.html\">"
+ }
+ };
+ private static final String[][] NEGATED_TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html",
+ "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
+ "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+ }
+ };
+ private static final String[][] TEST2 = {
+ {BUG_ID + FS + "pkg2" + FS + "C2.html",
+ "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+ },
+ {BUG_ID + FS + "pkg2" + FS + "package-summary.html",
+ "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
+ }
+ };
+ private static final String[][] NEGATED_TEST2 = {
+ {BUG_ID + FS + "pkg2" + FS + "C2.html",
+ "<a href=\"../../technotes/guides/index.html\">"
+ },
+ {BUG_ID + FS + "pkg2" + FS + "package-summary.html",
+ "<a href=\"../../technotes/guides/index.html\">"
+ }
+ };
+ private static final String[] ARGS1 =
+ new String[]{
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"
+ };
+ private static final String[] ARGS2 =
+ new String[]{
+ "-d", BUG_ID, "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg2"
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestDocRootLink tester = new TestDocRootLink();
+ run(tester, ARGS1, TEST1, NEGATED_TEST1);
+ run(tester, ARGS2, TEST2, NEGATED_TEST2);
+ 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/testDocRootLink/pkg1/C1.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+/**
+ * Class 1. This is a test.
+ * Refer <a href="{@docRoot}/../technotes/guides/index.html">Here</a>. Lets see if this works
+ * or not.
+ */
+public class C1 {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,18 @@
+<html>
+<head>
+<title>javax.management package</title>
+</head>
+<body bgcolor="white">
+This is a test.
+ <p id="spec">
+ @see <a href="{@docRoot}/../technotes/guides/index.html">
+ Test document 1</a>
+ in particular the
+ <a href="{@docRoot}/../technotes/guides/index.html">
+
+ Test document 2.</a>
+
+ @since 1.5
+
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg2;
+
+/**
+ * Class 1. This is a test.
+ * Refer <a href="{@docRoot}/../technotes/guides/index.html">Here</a>. Lets see if this works
+ * or not.
+ */
+public class C2 {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,18 @@
+<html>
+<head>
+<title>javax.management package</title>
+</head>
+<body bgcolor="white">
+This is a test.
+ <p id="spec">
+ @see <a href="{@docRoot}/../technotes/guides/index.html">
+ Test document 1</a>
+ in particular the
+ <a href="{@docRoot}/../technotes/guides/index.html">
+
+ Test document 2.</a>
+
+ @since 1.5
+
+</body>
+</html>
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,20 +23,19 @@
/*
* @test
- * @bug 4934778 4777599
+ * @bug 4934778 4777599 6553182
* @summary Make sure that the -help option works properly. Make sure
* the help link appears in the documentation.
* @author jamieh
* @library ../lib/
- * @build JavadocTester
- * @build TestHelpOption
+ * @build JavadocTester TestHelpOption
* @run main TestHelpOption
*/
public class TestHelpOption extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4934778-4777599";
+ private static final String BUG_ID = "4934778-4777599-6553182";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -79,6 +78,7 @@
{STANDARD_OUTPUT, "-tag "},
{STANDARD_OUTPUT, "-taglet "},
{STANDARD_OUTPUT, "-tagletpath "},
+ {STANDARD_OUTPUT, "-Xdocrootparent "},
{STANDARD_OUTPUT, "-charset "},
{STANDARD_OUTPUT, "-helpfile "},
{STANDARD_OUTPUT, "-linksource "},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6758050
+ * @summary Test HTML output for nested generic types.
+ * @author bpatel
+ * @library ../lib/
+ * @build JavadocTester TestNestedGenerics
+ * @run main TestNestedGenerics
+ */
+
+public class TestNestedGenerics extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "6758050";
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[]{
+ "-d", BUG_ID, "-source", "1.5", "-sourcepath", SRC_DIR,
+ "pkg"
+ };
+
+ //Input for string search tests.
+ private static final String[][] TEST = {
+ {BUG_ID + FS + "pkg" + FS + "NestedGenerics.html",
+ "<div class=\"block\">Contains <a " +
+ "href=\"../pkg/NestedGenerics.html#foo(java.util.Map)\"><code>foo" +
+ "(java.util.Map<A, java.util.Map<A, A>>)</code></a></div>"
+ }
+ };
+ 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) {
+ TestNestedGenerics tester = new TestNestedGenerics();
+ 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/testNestedGenerics/pkg/NestedGenerics.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+import java.util.Map;
+
+/** Contains {@link #foo} */
+public class NestedGenerics {
+ public static <A> void foo(Map<A, Map<A, A>> map) {}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Another test class.
+ *
+ * @author Bhavesh Patel
+ */
+public class C2 {
+
+ public static enum ModalExclusionType {
+ /**
+ * Test comment.
+ */
+ NO_EXCLUDE,
+ /**
+ * Another comment.
+ */
+ APPLICATION_EXCLUDE
+ };
+
+ /**
+ * A string constant.
+ */
+ public static final String CONSTANT1 = "C2";
+
+ /**
+ * A sample method.
+ *
+ * @param param some parameter.
+ */
+ public void method(String param) {
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.*;
+
+/**
+* Test Deprecated class
+* @deprecated This class is Deprecated.
+*/
+public class FooDepr {
+
+ public void method(Vector<Object> o){}
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6492694
+ * @summary Test package deprecation.
+ * @author bpatel
+ * @library ../lib/
+ * @build JavadocTester TestPackageDeprecation
+ * @run main TestPackageDeprecation
+ */
+
+public class TestPackageDeprecation extends JavadocTester {
+
+ //Test information.
+ private static final String BUG_ID = "6492694";
+
+ //Javadoc arguments.
+ private static final String[] ARGS1 = new String[]{
+ "-d", BUG_ID + "-1", "-source", "1.5", "-sourcepath", SRC_DIR, "-use", "pkg", "pkg1",
+ SRC_DIR + FS + "C2.java", SRC_DIR + FS + "FooDepr.java"
+ };
+ private static final String[] ARGS2 = new String[]{
+ "-d", BUG_ID + "-2", "-source", "1.5", "-sourcepath", SRC_DIR, "-use", "-nodeprecated",
+ "pkg", "pkg1", SRC_DIR + FS + "C2.java", SRC_DIR + FS + "FooDepr.java"
+ };
+
+ //Input for string search tests.
+ private static final String[][] TEST1 = {
+ {BUG_ID + "-1" + FS + "pkg1" + FS + "package-summary.html",
+ "<div class=\"deprecatedContent\"><span class=\"strong\">Deprecated.</span>" + NL +
+ "<div class=\"block\"><i>This package is Deprecated.</i></div>"
+ },
+ {BUG_ID + "-1" + FS + "deprecated-list.html",
+ "<li><a href=\"#package\">Deprecated Packages</a></li>"
+ }
+ };
+ private static final String[][] TEST2 = NO_TEST;
+ private static final String[][] NEGATED_TEST1 = NO_TEST;
+ private static final String[][] NEGATED_TEST2 = {
+ {BUG_ID + "-2" + FS + "overview-summary.html", "pkg1"},
+ {BUG_ID + "-2" + FS + "allclasses-frame.html", "FooDepr"}
+ };
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestPackageDeprecation tester = new TestPackageDeprecation();
+ run(tester, ARGS1, TEST1, NEGATED_TEST1);
+ run(tester, ARGS2, TEST2, NEGATED_TEST2);
+ if ((new java.io.File(BUG_ID + "-2" + FS + "pkg1" + FS +
+ "package-summary.html")).exists()) {
+ throw new Error("Test Fails: packages summary should not be" +
+ "generated for deprecated package.");
+ } else {
+ System.out.println("Test passes: package-summary.html not found.");
+ }
+ if ((new java.io.File(BUG_ID + "-2" + FS + "FooDepr.html")).exists()) {
+ throw new Error("Test Fails: FooDepr should not be" +
+ "generated as it is deprecated.");
+ } else {
+ System.out.println("Test passes: FooDepr.html not found.");
+ }
+ 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/testPackageDeprecation/pkg/A.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+public class A {
+ /** Test constant. */
+ public static final String DEMO= "y";
+ public static final String THIS_IS_OK= "(x)";
+
+ public String DEMO_STRING = "<Hello World>";
+
+ public A() {
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+public class ClassUseTest1 <T extends Foo & Foo2> {
+
+ public <T extends Foo & Foo2> T method(T t) {
+ return null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+import java.util.*;
+
+/**
+* Test Deprecated class
+* @deprecated This class is Deprecated.
+*/
+public class Foo {
+
+ public void method(Vector<Object> o){}
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+public interface Foo2 {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/package-info.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test pkg1 used.
+ * @deprecated This package is Deprecated.
+ */
+package pkg1;
--- a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -23,19 +23,18 @@
/*
* @test
- * @bug 4494033
+ * @bug 4494033 7028815
* @summary Run tests on doclet stylesheet.
* @author jamieh
* @library ../lib/
- * @build JavadocTester
- * @build TestStylesheet
+ * @build JavadocTester TestStylesheet
* @run main TestStylesheet
*/
public class TestStylesheet extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4494033";
+ private static final String BUG_ID = "4494033-7028815";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -56,15 +55,18 @@
"body {" + NL + " font-family:Helvetica, Arial, sans-serif;" + NL +
" color:#000000;" + NL + "}"},
{BUG_ID + FS + "stylesheet.css",
- "dl dd ul li {" + NL + " list-style:none;" + NL +
- " margin:10px 0 10px 0;" + NL + "}"},
+ "ul {" + NL + " margin:10px 0 10px 20px;" + NL +
+ " list-style-type:disc;" + NL + "}"},
// Test whether a link to the stylesheet file is inserted properly
// in the class documentation.
{BUG_ID + FS + "pkg" + FS + "A.html",
"<link rel=\"stylesheet\" type=\"text/css\" " +
"href=\"../stylesheet.css\" title=\"Style\">"}
};
- private static final String[][] NEGATED_TEST = NO_TEST;
+ private static final String[][] NEGATED_TEST = {
+ {BUG_ID + FS + "stylesheet.css",
+ "* {" + NL + " margin:0;" + NL + " padding:0;" + NL + "}"}
+ };
/**
* The entry point of the test.
--- a/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java Thu May 12 07:28:52 2011 -0700
@@ -37,8 +37,7 @@
private static final String BUG_ID = "7010342";
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
- "<div class=\"subTitle\">" + NL + "<div class=\"block\">This is the " +
- "description of package pkg.</div>" + NL + "</div>"
+ "<div class=\"block\">This is the description of package pkg.</div>"
},
{BUG_ID + FS + "pkg" + FS + "C.html",
"<div class=\"subTitle\">pkg</div>"
--- a/langtools/test/tools/javac/6558548/T6558548.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/6558548/T6558548.java Thu May 12 07:28:52 2011 -0700
@@ -1,9 +1,9 @@
/*
* @test /nodynamiccopyright/
- * @bug 6558548
+ * @bug 6558548 7039937
* @summary The compiler needs to be aligned with clarified specification of throws
* @compile/fail/ref=T6558548_latest.out -XDrawDiagnostics T6558548.java
- * @compile/fail/ref=T6558548_6.out -source 6 -XDrawDiagnostics T6558548.java
+ * @compile/fail/ref=T6558548_6.out -source 6 -Xlint:-options -XDrawDiagnostics T6558548.java
*/
class T6558548 {
@@ -12,7 +12,7 @@
void checked() throws InterruptedException {}
void runtime() throws IllegalArgumentException {}
- void m1() {
+ void m1a() {
try {
throw new java.io.FileNotFoundException();
}
@@ -20,7 +20,7 @@
catch(java.io.IOException exc) { } // 6: ok; latest: unreachable
}
- void m1a() {
+ void m1b() {
try {
throw new java.io.IOException();
}
@@ -28,11 +28,20 @@
catch(java.io.IOException exc) { } //ok
}
- void m2() {
+ void m1c() {
try {
- nothing();
+ throw new java.io.FileNotFoundException();
}
- catch(Exception exc) { } // ok
+ catch(java.io.FileNotFoundException exc) { }
+ catch(Exception ex) { } //ok (Exception/Throwable always allowed)
+ }
+
+ void m1d() {
+ try {
+ throw new java.io.FileNotFoundException();
+ }
+ catch(java.io.FileNotFoundException exc) { }
+ catch(Throwable ex) { } //ok (Exception/Throwable always allowed)
}
void m3() {
@@ -131,7 +140,7 @@
runtime();
}
catch(RuntimeException exc) { }
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m17() {
@@ -139,7 +148,7 @@
nothing();
}
catch(RuntimeException exc) { }
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m18() {
@@ -148,7 +157,7 @@
}
catch(RuntimeException exc) { }
catch(InterruptedException exc) { }
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m19() {
@@ -157,7 +166,7 @@
}
catch(RuntimeException exc) { }
catch(InterruptedException exc) { } //never thrown in try
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m20() {
@@ -166,7 +175,7 @@
}
catch(RuntimeException exc) { }
catch(InterruptedException exc) { } //never thrown in try
- catch(Exception exc) { } //6: ok; latest: unreachable
+ catch(Exception exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m21() {
@@ -182,7 +191,7 @@
runtime();
}
catch(RuntimeException exc) { }
- catch(Exception exc) { } // 6: ok; latest: unreachable
+ catch(Exception exc) { } // 6: ok; latest: ok (Exception/Throwable always allowed)
}
void m23() {
@@ -190,7 +199,7 @@
nothing();
}
catch(RuntimeException exc) { }
- catch(Exception exc) { } // 6: ok; latest: unreachable
+ catch(Exception exc) { } // 6: ok; latest: ok (Exception/Throwable always allowed)
}
void m24() {
@@ -208,7 +217,7 @@
}
catch(RuntimeException exc) { }
catch(Error exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m26() {
@@ -217,7 +226,7 @@
}
catch(RuntimeException exc) { }
catch(Error exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m27() {
@@ -227,7 +236,7 @@
catch(RuntimeException exc) { }
catch(Error exc) { }
catch(InterruptedException exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m28() {
@@ -237,7 +246,7 @@
catch(RuntimeException exc) { }
catch(Error exc) { }
catch(InterruptedException exc) { } //never thrown in try
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m29() {
@@ -247,7 +256,7 @@
catch(RuntimeException exc) { }
catch(Error exc) { }
catch(InterruptedException exc) { } //never thrown in try
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m30() {
@@ -265,7 +274,7 @@
}
catch(RuntimeException exc) { }
catch(Error exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m32() {
@@ -274,7 +283,7 @@
}
catch(RuntimeException exc) { }
catch(Error exc) { }
- catch(Throwable exc) { } //6: ok; latest: unreachable
+ catch(Throwable exc) { } //6: ok; latest: ok (Exception/Throwable always allowed)
}
void m33() {
--- a/langtools/test/tools/javac/6558548/T6558548_6.out Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/6558548/T6558548_6.out Thu May 12 07:28:52 2011 -0700
@@ -1,9 +1,7 @@
-- compiler.warn.source.no.bootclasspath: 1.6
-T6558548.java:159:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
T6558548.java:168:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:239:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:249:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:291:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:298:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:177:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:248:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:258:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:300:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:307:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
6 errors
-1 warning
--- a/langtools/test/tools/javac/6558548/T6558548_latest.out Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/6558548/T6558548_latest.out Thu May 12 07:28:52 2011 -0700
@@ -1,23 +1,9 @@
T6558548.java:20:9: compiler.warn.unreachable.catch: java.io.FileNotFoundException
-T6558548.java:134:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:142:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:151:9: compiler.warn.unreachable.catch.1: java.lang.InterruptedException,java.lang.RuntimeException
-T6558548.java:159:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:160:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
T6558548.java:168:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:169:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:185:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:193:9: compiler.warn.unreachable.catch: java.lang.RuntimeException
-T6558548.java:211:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:220:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:230:9: compiler.warn.unreachable.catch.1: java.lang.InterruptedException,java.lang.RuntimeException,java.lang.Error
-T6558548.java:239:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:240:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:249:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:250:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:268:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:277:9: compiler.warn.unreachable.catch.1: java.lang.RuntimeException,java.lang.Error
-T6558548.java:291:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
-T6558548.java:298:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:177:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:248:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:258:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:300:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
+T6558548.java:307:9: compiler.err.except.never.thrown.in.try: java.lang.InterruptedException
6 errors
-15 warnings
+1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T7040104.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7040104
+ * @summary javac NPE on Object a[]; Object o = (a=null)[0];
+ */
+
+public class T7040104 {
+ public static void main(String[] args) {
+ T7040104 t = new T7040104();
+ t.test1();
+ t.test2();
+ t.test3();
+ if (t.npeCount != 3) {
+ throw new AssertionError();
+ }
+ }
+
+ int npeCount = 0;
+
+ void test1() {
+ Object a[];
+ try {
+ Object o = (a = null)[0];
+ }
+ catch (NullPointerException npe) {
+ npeCount++;
+ }
+ }
+
+ void test2() {
+ Object a[][];
+ try {
+ Object o = (a = null)[0][0];
+ }
+ catch (NullPointerException npe) {
+ npeCount++;
+ }
+ }
+
+ void test3() {
+ Object a[][][];
+ try {
+ Object o = (a = null)[0][0][0];
+ }
+ catch (NullPointerException npe) {
+ npeCount++;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/6550655/T6550655.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 6550655
+ * @summary javac crashes when compiling against an annotated class
+ */
+
+import java.io.File;
+import java.net.URI;
+import java.util.Arrays;
+
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticListener;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class T6550655 {
+
+ JavaCompiler javacTool;
+ File testDir;
+ TestKind testKind;
+ EnumActionKind actionKind;
+
+ String testSource = "enum E { NORTH, SOUTH, WEST, EAST; }\n" +
+ "@I(val = E.NORTH)class A {}\n" +
+ "@interface I { E val(); }";
+
+ T6550655(JavaCompiler javacTool, File testDir, TestKind testKind, EnumActionKind actionKind) {
+ this.javacTool = javacTool;
+ this.testDir = testDir;
+ this.testKind = testKind;
+ this.actionKind = actionKind;
+ }
+
+ void test() {
+ testDir.mkdirs();
+ compile(null, new JavaSource("Test.java", testSource));
+ actionKind.doAction(this);
+ compile(new DiagnosticChecker(), testKind.source);
+ }
+
+ void compile(DiagnosticChecker dc, JavaSource... sources) {
+ try {
+ CompilationTask ct = javacTool.getTask(null, null, dc,
+ Arrays.asList("-d", testDir.getAbsolutePath(), "-cp", testDir.getAbsolutePath()),
+ null, Arrays.asList(sources));
+ ct.call();
+ }
+ catch (Exception e) {
+ error("Internal compilation error");
+ }
+ }
+
+ void replaceEnum(String newSource) {
+ compile(null, new JavaSource("Replace.java", newSource));
+ };
+
+ void removeEnum() {
+ File enumClass = new File(testDir, "E.class");
+ if (!enumClass.exists()) {
+ error("Expected file E.class does not exists in folder " + testDir);
+ }
+ enumClass.delete();
+ };
+
+ void error(String msg) {
+ System.err.println(msg);
+ nerrors++;
+ }
+
+ class DiagnosticChecker implements DiagnosticListener<JavaFileObject> {
+
+ String[][] expectedKeys = new String[][] {
+ // DIRECT, INDIRECT
+ {/*REPLACE1*/ "compiler.err.cant.resolve.location" , "compiler.warn.unknown.enum.constant" },
+ {/*REPLACE2*/ "compiler.err.cant.resolve.location.args", "compiler.warn.annotation.method.not.found" },
+ {/*REMOVE*/ "compiler.err.cant.resolve" , "compiler.warn.unknown.enum.constant.reason" } };
+
+ String keyToIgnore = "compiler.err.attribute.value.must.be.constant";
+
+ public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+ String expectedCode = expectedKeys[actionKind.ordinal()][testKind.ordinal()];
+ if (!diagnostic.getCode().equals(keyToIgnore) &&
+ !diagnostic.getCode().equals(expectedCode)) {
+ error("Unexpected diagnostic" +
+ "\nfound " + diagnostic.getCode() +
+ "\nexpected " + expectedCode +
+ "\ntestKind " + testKind +
+ "\nactionKind " + actionKind);
+ }
+ }
+ }
+
+ //global declarations
+
+ enum EnumActionKind {
+ REPLACE1("enum E { SOUTH, WEST, EAST; }") {
+ @Override
+ void doAction(T6550655 test) {
+ test.replaceEnum(optionalSource);
+ }
+ },
+ REPLACE2("@interface I { E valNew() default E.EAST; }") {
+ @Override
+ void doAction(T6550655 test) {
+ test.replaceEnum(optionalSource);
+ }
+ },
+ REMOVE(null) {
+ @Override
+ void doAction(T6550655 test) { test.removeEnum(); }
+ };
+
+ String optionalSource;
+
+ private EnumActionKind(String optionalSource) {
+ this.optionalSource = optionalSource;
+ }
+
+ abstract void doAction(T6550655 test);
+ }
+
+ enum TestKind {
+ DIRECT("@I(val = E.NORTH)class C1 {}"),
+ INDIRECT("class C2 { A a; }");
+
+ JavaSource source;
+
+ private TestKind(final String code) {
+ this.source = new JavaSource("Test.java", code);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ String SCRATCH_DIR = System.getProperty("user.dir");
+ JavaCompiler javacTool = ToolProvider.getSystemJavaCompiler();
+ int n = 0;
+ for (TestKind testKind : TestKind.values()) {
+ for (EnumActionKind actionKind : EnumActionKind.values()) {
+ File testDir = new File(SCRATCH_DIR, "test"+n);
+ new T6550655(javacTool, testDir, testKind, actionKind).test();
+ n++;
+ }
+ }
+ if (nerrors > 0) {
+ throw new AssertionError("Some errors have been detected");
+ }
+ }
+
+ static class JavaSource extends SimpleJavaFileObject {
+
+ String source;
+
+ public JavaSource(String filename, String source) {
+ super(URI.create("myfo:/" + filename), JavaFileObject.Kind.SOURCE);
+ this.source = source;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return source;
+ }
+ }
+
+ static int nerrors = 0;
+}
--- a/langtools/test/tools/javac/diags/examples.not-yet.txt Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/diags/examples.not-yet.txt Thu May 12 07:28:52 2011 -0700
@@ -41,7 +41,6 @@
compiler.err.type.var.more.than.once.in.result # UNUSED
compiler.err.undetermined.type
compiler.err.unexpected.type
-compiler.err.unknown.enum.constant # in bad class file
compiler.err.unsupported.cross.fp.lit # Scanner: host system dependent
compiler.err.wrong.target.for.polymorphic.signature.definition # Transitional 292
compiler.misc.assignment.from.super-bound
@@ -112,3 +111,5 @@
compiler.warn.unchecked.assign # DEAD, replaced by compiler.misc.unchecked.assign
compiler.warn.unchecked.cast.to.type # DEAD, replaced by compiler.misc.unchecked.cast.to.type
compiler.warn.unexpected.archive.file # Paths: zip file with unknown extn
+compiler.warn.unknown.enum.constant # in bad class file
+compiler.warn.unknown.enum.constant.reason # in bad class file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/DiamondAndExplicitParams.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.misc.diamond.and.explicit.params
+// key: compiler.err.cant.apply.diamond.1
+
+class DiamondAndAnonClass {
+ static class Foo<X> {
+ <Z> Foo() {}
+ }
+ void m() {
+ Foo<String> foo = new <Integer> Foo<>();
+ }
+}
--- a/langtools/test/tools/javac/diags/examples/UnreachableCatch1.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/diags/examples/UnreachableCatch1.java Thu May 12 07:28:52 2011 -0700
@@ -23,14 +23,21 @@
// key: compiler.warn.unreachable.catch.1
+import java.io.*;
+
class UnreachableCatch1 {
void test() {
try {
- throw new IllegalArgumentException();
+ if (true) {
+ throw new FileNotFoundException();
+ }
+ else {
+ throw new EOFException();
+ }
}
- catch(Error err) { }
- catch(RuntimeException rex) { }
- catch(Throwable t) { } //unreachable
+ catch(FileNotFoundException fnf) { }
+ catch(EOFException eof) { }
+ catch(IOException ex) { } //unreachable
}
}
--- a/langtools/test/tools/javac/generics/7034511/T7034511a.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/generics/7034511/T7034511a.java Thu May 12 07:28:52 2011 -0700
@@ -1,6 +1,7 @@
/*
* @test /nodynamiccopyright/
- * @bug 7034511
+ * @ignore backing out 7034511, see 7040883
+ * @bug 7034511 7040883
* @summary Loophole in typesafety
* @compile/fail/ref=T7034511a.out -XDrawDiagnostics T7034511a.java
*/
--- a/langtools/test/tools/javac/generics/7034511/T7034511b.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/generics/7034511/T7034511b.java Thu May 12 07:28:52 2011 -0700
@@ -1,6 +1,7 @@
/*
* @test /nodynamiccopyright/
- * @bug 7034511
+ * @ignore backing out 7034511, see 7040883
+ * @bug 7034511 7040883
* @summary Loophole in typesafety
* @compile/fail/ref=T7034511b.out -XDrawDiagnostics T7034511b.java
*/
--- a/langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java Thu May 12 07:28:52 2011 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7030150
+ * @bug 7030150 7039931
* @summary Type inference for generic instance creation failed for formal type parameter
*/
@@ -125,6 +125,14 @@
default: return false;
}
}
+
+ boolean matches(TypeArgumentKind other) {
+ switch (other) {
+ case STRING: return this != INTEGER;
+ case INTEGER: return this != STRING;
+ default: return true;
+ }
+ }
}
enum ArgumentKind {
@@ -149,9 +157,11 @@
for (TypeArgumentKind declArgKind : TypeArgumentKind.values()) {
for (TypeArgArity arity : TypeArgArity.values()) {
for (TypeArgumentKind useArgKind : TypeArgumentKind.values()) {
- for (ArgumentKind argKind : ArgumentKind.values()) {
- new GenericConstructorAndDiamondTest(boundKind, constructorKind,
- declArgKind, arity, useArgKind, argKind).run(comp, fm);
+ for (TypeArgumentKind diamondArgKind : TypeArgumentKind.values()) {
+ for (ArgumentKind argKind : ArgumentKind.values()) {
+ new GenericConstructorAndDiamondTest(boundKind, constructorKind,
+ declArgKind, arity, useArgKind, diamondArgKind, argKind).run(comp, fm);
+ }
}
}
}
@@ -165,18 +175,21 @@
TypeArgumentKind declTypeArgumentKind;
TypeArgArity useTypeArgArity;
TypeArgumentKind useTypeArgumentKind;
+ TypeArgumentKind diamondTypeArgumentKind;
ArgumentKind argumentKind;
JavaSource source;
DiagnosticChecker diagChecker;
GenericConstructorAndDiamondTest(BoundKind boundKind, ConstructorKind constructorKind,
TypeArgumentKind declTypeArgumentKind, TypeArgArity useTypeArgArity,
- TypeArgumentKind useTypeArgumentKind, ArgumentKind argumentKind) {
+ TypeArgumentKind useTypeArgumentKind, TypeArgumentKind diamondTypeArgumentKind,
+ ArgumentKind argumentKind) {
this.boundKind = boundKind;
this.constructorKind = constructorKind;
this.declTypeArgumentKind = declTypeArgumentKind;
this.useTypeArgArity = useTypeArgArity;
this.useTypeArgumentKind = useTypeArgumentKind;
+ this.diamondTypeArgumentKind = diamondTypeArgumentKind;
this.argumentKind = argumentKind;
this.source = new JavaSource();
this.diagChecker = new DiagnosticChecker();
@@ -189,7 +202,7 @@
"}\n" +
"class Test {\n" +
"void test() {\n" +
- "Foo#TA1 f = new #TA2 Foo<>(#A);\n" +
+ "Foo#TA1 f = new #TA2 Foo<#TA3>(#A);\n" +
"}\n" +
"}\n";
@@ -201,6 +214,7 @@
replace("#CK", constructorKind.constrStr)
.replace("#TA1", declTypeArgumentKind.getArgs(TypeArgArity.ONE))
.replace("#TA2", useTypeArgumentKind.getArgs(useTypeArgArity))
+ .replace("#TA3", diamondTypeArgumentKind.typeargStr)
.replace("#A", argumentKind.argStr);
}
@@ -227,9 +241,15 @@
boolean badMethodTypeArg = constructorKind != ConstructorKind.NON_GENERIC &&
!useTypeArgumentKind.matches(argumentKind);
- boolean badGenericType = !boundKind.matches(declTypeArgumentKind);
+ boolean badExplicitParams = (useTypeArgumentKind != TypeArgumentKind.NONE &&
+ diamondTypeArgumentKind == TypeArgumentKind.NONE) ||
+ !boundKind.matches(diamondTypeArgumentKind);
- boolean shouldFail = badActual || badArity || badMethodTypeArg || badGenericType;
+ boolean badGenericType = !boundKind.matches(declTypeArgumentKind) ||
+ !diamondTypeArgumentKind.matches(declTypeArgumentKind);
+
+ boolean shouldFail = badActual || badArity ||
+ badMethodTypeArg || badExplicitParams || badGenericType;
if (shouldFail != diagChecker.errorFound) {
throw new Error("invalid diagnostics for source:\n" +
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg01.java Thu May 12 07:24:37 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * @test /nodynamiccopyright/
- * @bug 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that explicit type-argument that causes resolution failure is rejected
- * @compile/fail/ref=Neg01.out -XDrawDiagnostics Neg01.java
- */
-
-class Neg01 {
-
- static class Foo<X> {
- <T> Foo(T t) {}
- }
-
- Foo<Integer> fi1 = new <String> Foo<>(1);
- Foo<Integer> fi2 = new <String> Foo<Integer>(1);
-}
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg01.out Thu May 12 07:24:37 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Neg01.java:15:24: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: Neg01.Foo), (compiler.misc.infer.no.conforming.assignment.exists: X, int, java.lang.String)
-Neg01.java:16:24: compiler.err.cant.apply.symbol.1: kindname.constructor, Foo, T, int, kindname.class, Neg01.Foo<X>, (compiler.misc.no.conforming.assignment.exists: int, java.lang.String)
-2 errors
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg02.java Thu May 12 07:24:37 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * @test /nodynamiccopyright/
- * @bug 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that compiler rejects bad number of explicit type-arguments
- * @compile/fail/ref=Neg02.out -XDrawDiagnostics Neg02.java
- */
-
-class Neg02 {
-
- static class Foo<X> {
- <T> Foo(T t) {}
- }
-
- Foo<Integer> fi1 = new <String, Integer> Foo<>("");
- Foo<Integer> fi2 = new <String, Integer> Foo<Integer>("");
-}
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg02.out Thu May 12 07:24:37 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Neg02.java:15:24: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: Neg02.Foo), (compiler.misc.arg.length.mismatch)
-Neg02.java:16:24: compiler.err.cant.apply.symbol.1: kindname.constructor, Foo, T, java.lang.String, kindname.class, Neg02.Foo<X>, (compiler.misc.arg.length.mismatch)
-2 errors
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg03.java Thu May 12 07:24:37 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * @test /nodynamiccopyright/
- * @bug 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that explicit type-argument that does not conform to bound is rejected
- * @compile/fail/ref=Neg03.out -XDrawDiagnostics Neg03.java
- */
-
-class Neg03 {
-
- static class Foo<X> {
- <T extends Integer> Foo(T t) {}
- }
-
- Foo<Integer> fi1 = new <String> Foo<>(1);
- Foo<Integer> fi2 = new <String> Foo<Integer>(1);
-}
--- a/langtools/test/tools/javac/generics/diamond/7030150/Neg03.out Thu May 12 07:24:37 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Neg03.java:15:24: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: Neg03.Foo), (compiler.misc.explicit.param.do.not.conform.to.bounds: java.lang.String, java.lang.Integer)
-Neg03.java:16:24: compiler.err.cant.apply.symbol.1: kindname.constructor, Foo, T, int, kindname.class, Neg03.Foo<X>, (compiler.misc.explicit.param.do.not.conform.to.bounds: java.lang.String, java.lang.Integer)
-2 errors
--- a/langtools/test/tools/javac/generics/diamond/7030150/Pos01.java Thu May 12 07:24:37 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that redundant type-arguments on non-generic constructor are accepted
- * @compile Pos01.java
- */
-
-class Pos01 {
-
- static class Foo<X> {
- Foo(X t) {}
- }
-
- Foo<Integer> fi1 = new Foo<>(1);
- Foo<Integer> fi2 = new Foo<Integer>(1);
- Foo<Integer> fi3 = new <String> Foo<>(1);
- Foo<Integer> fi4 = new <String> Foo<Integer>(1);
- Foo<Integer> fi5 = new <String, String> Foo<>(1);
- Foo<Integer> fi6 = new <String, String> Foo<Integer>(1);
-}
--- a/langtools/test/tools/javac/generics/diamond/7030150/Pos02.java Thu May 12 07:24:37 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7030150
- * @summary Type inference for generic instance creation failed for formal type parameter
- * check that diamond in return context works w/o problems
- * @compile Pos02.java
- */
-
-class Pos02<X> {
-
- Pos02(X x) {}
-
-
- Pos02<X> test(X x) {
- return new Pos02<>(x);
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/typevars/T7040883.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7040883 7034511
+ * @summary Compilation error: "length in Array is defined in an inaccessible class or interface"
+ * @compile T7040883.java
+ */
+
+public class T7040883 {
+
+ <Z> Z[] getListeners(Class<Z> z) { return null; }
+
+ void test(String s) {
+ int i = getListeners(s.getClass()).length;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/wildcards/7034495/T7034495.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7034495
+ * @summary Javac asserts on usage of wildcards in bounds
+ * @compile/fail/ref=T7034495.out -XDrawDiagnostics T7034495.java
+ */
+class T7034495 {
+
+ interface A<T> {
+ T foo();
+ }
+
+ interface B<T> {
+ T foo();
+ }
+
+ interface C<T extends A<?> & B<?>> { }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/wildcards/7034495/T7034495.out Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,2 @@
+T7034495.java:40:17: compiler.err.types.incompatible.diff.ret: T7034495.B<?>, T7034495.A<?>, foo()
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/multicatch/Neg07.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,50 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 7039822
+ * @summary Verify typing of lub of exception parameter w.r.t getClass
+ * @author Joseph D. Darcy
+ * @compile/fail/ref=Neg07.out -XDrawDiagnostics Neg07.java
+ */
+
+public class Neg07 {
+ private static void test(int i) {
+ try {
+ thrower(i);
+ } catch (SonException | DaughterException e) {
+ Class<? extends HasFoo> clazz2 = e.getClass(); // Rejected!
+ HasFoo m = e;
+ e.foo();
+ }
+ }
+
+ private static interface HasFoo {
+ void foo();
+ }
+
+ static void thrower(int i) throws SonException, DaughterException {
+ if (i == 0)
+ throw new SonException();
+ else
+ throw new DaughterException();
+ }
+
+ private static class ParentException extends RuntimeException {}
+
+ private static class SonException
+ extends ParentException
+ implements HasFoo {
+
+ public void foo() {
+ System.out.println("SonException.foo");
+ }
+ }
+
+ private static class DaughterException
+ extends ParentException
+ implements HasFoo {
+
+ public void foo() {
+ System.out.println("DaughterException.foo");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/multicatch/Neg07.out Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,2 @@
+Neg07.java:14:56: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Class<compiler.misc.type.captureof: 1, ? extends Neg07.ParentException>, java.lang.Class<? extends Neg07.HasFoo>
+1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/multicatch/Pos10.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7039822
+ * @summary Verify lub of an exception parameter can be an intersection type
+ * @author Joseph D. Darcy
+ */
+
+public class Pos10 {
+ public static void main(String... args) {
+ test(0);
+ test(1);
+
+ if (record != 0b11)
+ throw new RuntimeException("Unexpected exception execution: " +
+ record);
+ if (closeRecord != 0b11)
+ throw new RuntimeException("Unexpected close execution: " +
+ closeRecord);
+ }
+
+ private static int record = 0;
+ private static int closeRecord = 0;
+
+ private static void test(int i) {
+ try {
+ thrower(i);
+ } catch (SonException | DaughterException e) {
+ Class<? extends ParentException> clazz = e.getClass();
+ HasFoo m = e;
+ e.foo();
+
+ try (AutoCloseable ac = e) {
+ e.toString();
+ } catch(Exception except) {
+ throw new RuntimeException(except);
+ }
+ }
+ }
+
+ private static interface HasFoo {
+ void foo();
+ }
+
+ private static void thrower(int i) throws SonException, DaughterException {
+ if (i == 0)
+ throw new SonException();
+ else
+ throw new DaughterException();
+ }
+
+ private static class ParentException extends RuntimeException {}
+
+ private static class SonException
+ extends ParentException
+ implements HasFoo, AutoCloseable {
+
+ public void foo() {
+ record |= 0b01;
+ }
+
+ @Override
+ public void close() {
+ closeRecord |= 0b01;
+ }
+ }
+
+ private static class DaughterException
+ extends ParentException
+ implements HasFoo, AutoCloseable {
+
+ public void foo() {
+ record |= 0b10;
+ }
+
+ @Override
+ public void close() {
+ closeRecord |= 0b10;
+ }
+ }
+}
--- a/langtools/test/tools/javac/multicatch/model/Model01.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/multicatch/model/Model01.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -43,6 +43,6 @@
else
throw new B2();
}
- catch(B1 | B2 ex) { }
+ catch(@UnionTypeInfo({"Test.B1", "Test.B2"}) B1 | B2 ex) { }
}
}
--- a/langtools/test/tools/javac/multicatch/model/ModelChecker.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/multicatch/model/ModelChecker.java Thu May 12 07:28:52 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -30,7 +30,7 @@
* @compile -processor ModelChecker Model01.java
*/
-import com.sun.source.tree.VariableTree;
+import com.sun.source.tree.CatchTree;
import com.sun.source.util.TreePathScanner;
import com.sun.source.util.Trees;
import com.sun.source.util.TreePath;
@@ -41,6 +41,12 @@
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.UnionType;
+import javax.lang.model.type.UnknownTypeException;
+import javax.lang.model.util.SimpleTypeVisitor6;
+import javax.lang.model.util.SimpleTypeVisitor7;
@SupportedAnnotationTypes("Check")
public class ModelChecker extends JavacTestingAbstractProcessor {
@@ -69,20 +75,59 @@
}
@Override
- public Void visitVariable(VariableTree node, Void p) {
- Element ex = trees.getElement(getCurrentPath());
+ public Void visitCatch(CatchTree node, Void p) {
+ TreePath param = new TreePath(getCurrentPath(), node.getParameter());
+ Element ex = trees.getElement(param);
+ validateUnionTypeInfo(ex);
if (ex.getSimpleName().contentEquals("ex")) {
assertTrue(ex.getKind() == ElementKind.EXCEPTION_PARAMETER, "Expected EXCEPTION_PARAMETER - found " + ex.getKind());
- for (Element e : types.asElement(ex.asType()).getEnclosedElements()) {
+ for (Element e : types.asElement(trees.getLub(node)).getEnclosedElements()) {
Member m = e.getAnnotation(Member.class);
if (m != null) {
assertTrue(e.getKind() == m.value(), "Expected " + m.value() + " - found " + e.getKind());
}
}
- assertTrue(assertionCount == 3, "Expected 3 assertions - found " + assertionCount);
+ assertTrue(assertionCount == 9, "Expected 9 assertions - found " + assertionCount);
}
- return super.visitVariable(node, p);
+ return super.visitCatch(node, p);
+ }
+ }
+
+ private void validateUnionTypeInfo(Element ex) {
+ UnionTypeInfo ut = ex.getAnnotation(UnionTypeInfo.class);
+ assertTrue(ut != null, "UnionType annotation must be present");
+
+ TypeMirror expectedUnionType = ex.asType();
+ assertTrue(expectedUnionType.getKind() == TypeKind.UNION, "UNION kind expected");
+
+ try {
+ new SimpleTypeVisitor6<Void, Void>(){}.visit(expectedUnionType);
+ throw new RuntimeException("Expected UnknownTypeException not thrown.");
+ } catch (UnknownTypeException ute) {
+ ; // Expected
}
+
+ UnionType unionType = new SimpleTypeVisitor7<UnionType, Void>(){
+ @Override
+ protected UnionType defaultAction(TypeMirror e, Void p) {return null;}
+
+ @Override
+ public UnionType visitUnion(UnionType t, Void p) {return t;}
+ }.visit(expectedUnionType);
+ assertTrue(unionType != null, "Must get a non-null union type.");
+
+ assertTrue(ut.value().length == unionType.getAlternatives().size(), "Cardinalities do not match");
+
+ String[] typeNames = ut.value();
+ for(int i = 0; i < typeNames.length; i++) {
+ TypeMirror typeFromAnnotation = nameToType(typeNames[i]);
+ assertTrue(types.isSameType(typeFromAnnotation, unionType.getAlternatives().get(i)),
+ "Types were not equal.");
+ }
+ }
+
+ private TypeMirror nameToType(String name) {
+ return elements.getTypeElement(name).asType();
}
private static void assertTrue(boolean cond, String msg) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/multicatch/model/UnionTypeInfo.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Used by ModelChecker to validate the modeling information of a union type.
+ */
+@interface UnionTypeInfo {
+ String[] value();
+}
--- a/langtools/test/tools/javac/processing/model/TestSymtabItems.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/processing/model/TestSymtabItems.java Thu May 12 07:28:52 2011 -0700
@@ -44,6 +44,7 @@
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symtab;
import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.main.JavaCompiler;
import com.sun.tools.javac.model.JavacTypes;
import com.sun.tools.javac.util.Context;
@@ -62,6 +63,7 @@
JavacFileManager.preRegister(c);
Symtab syms = Symtab.instance(c);
JavacTypes types = JavacTypes.instance(c);
+ JavaCompiler.instance(c); // will init ClassReader.sourceCompleter
// print("noSymbol", syms.noSymbol);
// print("errSymbol", syms.errSymbol);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/model/type/TestUnionType.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7029150
+ * @summary Test support for union types
+ * @library ../../../lib
+ */
+
+import java.net.URI;
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import javax.lang.model.util.*;
+import javax.tools.*;
+
+import com.sun.source.tree.*;
+import com.sun.source.util.*;
+
+
+public class TestUnionType extends JavacTestingAbstractProcessor {
+ enum TestKind {
+ SingleType("E1", "E1",
+ "VariableTree: E1 e",
+ "VariableTree: elem EXCEPTION_PARAMETER e",
+ "VariableTree: elem.type DECLARED",
+ "VariableTree: elem.type.elem CLASS E1",
+ "VariableTree: type DECLARED",
+ "VariableTree: type.elem CLASS E1",
+ "VariableTree: type.elem.type DECLARED"),
+
+ ValidTypes("E1, E2", "E1 | E2",
+ "VariableTree: E1 | E2 e",
+ "VariableTree: elem EXCEPTION_PARAMETER e",
+ "VariableTree: elem.type UNION Test.E1,Test.E2",
+ "VariableTree: elem.type.elem null",
+ "VariableTree: type UNION Test.E1,Test.E2",
+ "VariableTree: type.elem null"),
+
+ InvalidTypes("E1, E2", "E1 | EMissing",
+ "VariableTree: E1 | EMissing e",
+ "VariableTree: elem EXCEPTION_PARAMETER e",
+ "VariableTree: elem.type UNION Test.E1,EMissing",
+ "VariableTree: elem.type.elem null",
+ "VariableTree: type UNION Test.E1,EMissing",
+ "VariableTree: type.elem null"),
+
+ Uncaught("E1", "E1 | E2",
+ "VariableTree: E1 | E2 e",
+ "VariableTree: elem EXCEPTION_PARAMETER e",
+ "VariableTree: elem.type UNION Test.E1,Test.E2",
+ "VariableTree: elem.type.elem null",
+ "VariableTree: type UNION Test.E1,Test.E2",
+ "VariableTree: type.elem null");
+
+ TestKind(String throwsTypes, String catchTypes, String... gold) {
+ this.throwsTypes = throwsTypes;
+ this.catchTypes = catchTypes;
+ this.gold = Arrays.asList(gold);
+ }
+
+ final String throwsTypes;
+ final String catchTypes;
+ final List<String> gold;
+ }
+
+ static class TestFileObject extends SimpleJavaFileObject {
+ public static final String template =
+ "class Test {\n"
+ + " class E1 extends Exception { }\n"
+ + " class E2 extends Exception { }\n"
+ + " void doSomething() throws #T { }\n"
+ + " void test() {\n"
+ + " try {\n"
+ + " doSomething();\n"
+ + " } catch (#C e) {\n"
+ + " }\n"
+ + " }\n"
+ + "}\n";
+
+ public TestFileObject(TestKind tk) {
+ super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+ this.tk = tk;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return template
+ .replace("#T", tk.throwsTypes)
+ .replace("#C", tk.catchTypes);
+ }
+ final TestKind tk;
+ }
+
+ public static void main(String... args) throws Exception {
+ JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+ List<String> options = Arrays.asList("-proc:only");
+ for (TestKind tk: TestKind.values()) {
+ System.err.println("Test: " + tk);
+ TestUnionType p = new TestUnionType();
+ JavaFileObject fo = new TestFileObject(tk);
+ JavaCompiler.CompilationTask task = comp.getTask(null, null, null, options, null, Arrays.asList(fo));
+ task.setProcessors(Arrays.asList(p));
+ boolean ok = task.call();
+ System.err.println("compilation " + (ok ? "passed" : "failed"));
+ if (!ok)
+ throw new Exception("compilation failed unexpectedly");
+ if (!p.log.equals(tk.gold)) {
+ System.err.println("Expected output:");
+ for (String g: tk.gold)
+ System.err.println(g);
+ throw new Exception("unexpected output from test");
+ }
+ System.err.println();
+ }
+ }
+
+ Trees trees;
+ List<String> log;
+
+ @Override
+ public void init(ProcessingEnvironment env) {
+ super.init(env);
+ trees = Trees.instance(env);
+ log = new ArrayList<String>();
+ }
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ if (!roundEnv.processingOver()) {
+ for (Element e: roundEnv.getRootElements()) {
+ scan(trees.getPath(e));
+ }
+ }
+ return true;
+ }
+
+ void scan(TreePath path) {
+ new Scanner().scan(path, null);
+ }
+
+ class Scanner extends TreePathScanner<Void,Void> {
+ @Override
+ public Void visitVariable(VariableTree tree, Void ignore) {
+ TreePath p = getCurrentPath();
+ Element e = trees.getElement(p);
+ if (e.getKind() == ElementKind.EXCEPTION_PARAMETER) {
+ log("VariableTree: " + tree);
+ log("VariableTree: elem " + print(e));
+ log("VariableTree: elem.type " + print(e.asType()));
+ log("VariableTree: elem.type.elem " + print(types.asElement(e.asType())));
+ TypeMirror tm = trees.getTypeMirror(p);
+ log("VariableTree: type " + print(tm));
+ log("VariableTree: type.elem " + print(types.asElement(tm)));
+ if (types.asElement(tm) != null)
+ log("VariableTree: type.elem.type " + print(types.asElement(tm).asType()));
+ }
+ return super.visitVariable(tree, null);
+ }
+
+ String print(TypeMirror tm) {
+ return (tm == null) ? null : new TypePrinter().visit(tm);
+ }
+
+ String print(Element e) {
+ return (e == null) ? null : (e.getKind() + " " + e.getSimpleName());
+ }
+
+ void log(String msg) {
+ System.err.println(msg);
+ log.add(msg);
+ }
+ }
+
+ class TypePrinter extends SimpleTypeVisitor7<String, Void> {
+ @Override
+ protected String defaultAction(TypeMirror tm, Void ignore) {
+ return String.valueOf(tm.getKind());
+ }
+
+ @Override
+ public String visitUnion(UnionType t, Void ignore) {
+ return (t.getKind() + " " + t.getAlternatives());
+ }
+ }
+}
--- a/langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java Thu May 12 07:24:37 2011 -0700
+++ b/langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java Thu May 12 07:28:52 2011 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7017664
+ * @bug 7017664 7036906
* @summary Basher for CompoundScopes
*/
@@ -127,8 +127,17 @@
}
}
log("testing scope: " + root);
- checkElems(root);
- checkShadowed(root);
+ checkElems(root, null);
+ checkElems(root, new OddFilter());
+ checkShadowed(root, null);
+ checkShadowed(root, new OddFilter());
+ }
+ }
+
+ class OddFilter implements Filter<Symbol> {
+ public boolean accepts(Symbol s) {
+ Name numPart = s.name.subName(1, s.name.length());
+ return Integer.parseInt(numPart.toString()) % 2 != 0;
}
}
@@ -165,15 +174,20 @@
* Check that CompoundScope.getElements() correctly visits all symbols
* in all subscopes (in the correct order)
*/
- void checkElems(CompoundScope cs) {
- List<Symbol> allSymbols = elems;
+ void checkElems(CompoundScope cs, Filter<Symbol> sf) {
int count = 0;
- for (Symbol s : cs.getElements()) {
+ ListBuffer<Symbol> found = ListBuffer.lb();
+ List<Symbol> allSymbols = sf == null ?
+ elems :
+ filter(elems, sf);
+ int expectedCount = allSymbols.length();
+ for (Symbol s : sf == null ? cs.getElements() : cs.getElements(sf)) {
checkSameSymbols(s, allSymbols.head);
allSymbols = allSymbols.tail;
+ found.append(s);
count++;
}
- if (count != elems.size()) {
+ if (count != expectedCount) {
error("CompoundScope.getElements() did not returned enough symbols");
}
}
@@ -182,22 +196,35 @@
* Check that CompoundScope.getElements() correctly visits all symbols
* with a given name in all subscopes (in the correct order)
*/
- void checkShadowed(CompoundScope cs) {
+ void checkShadowed(CompoundScope cs, Filter<Symbol> sf) {
for (Map.Entry<Name, List<Symbol>> shadowedEntry : shadowedMap.entrySet()) {
int count = 0;
- List<Symbol> shadowed = shadowedEntry.getValue();
+ List<Symbol> shadowed = sf == null ?
+ shadowedEntry.getValue() :
+ filter(shadowedEntry.getValue(), sf);
+ int expectedCount = shadowed.length();
Name name = shadowedEntry.getKey();
- for (Symbol s : cs.getElementsByName(name)) {
+ for (Symbol s : sf == null ? cs.getElementsByName(name) : cs.getElementsByName(name, sf)) {
checkSameSymbols(s, shadowed.head);
shadowed = shadowed.tail;
count++;
}
- if (count != shadowedEntry.getValue().size()) {
+ if (count != expectedCount) {
error("CompoundScope.lookup() did not returned enough symbols for name " + name);
}
}
}
+ List<Symbol> filter(List<Symbol> elems, Filter<Symbol> sf) {
+ ListBuffer<Symbol> res = ListBuffer.lb();
+ for (Symbol s : elems) {
+ if (sf.accepts(s)) {
+ res.append(s);
+ }
+ }
+ return res.toList();
+ }
+
void checkSameSymbols(Symbol found, Symbol req) {
if (found != req) {
error("Symbol mismatch - found : " + found + ":" + found.hashCode() + "\n" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/types/CastObjectToPrimitiveTest.java Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7038363
+ * @summary cast from object to primitive should be for source >= 1.7
+ * @compile/fail/ref=CastObjectToPrimitiveTest.out -XDrawDiagnostics -Xlint:-options -source 5 CastObjectToPrimitiveTest.java
+ * @compile/fail/ref=CastObjectToPrimitiveTest.out -XDrawDiagnostics -Xlint:-options -source 6 CastObjectToPrimitiveTest.java
+ * @compile CastObjectToPrimitiveTest.java
+ */
+
+class CastObjectToPrimitiveTest {
+ void m() {
+ Object o = 42;
+ int i = (int) o;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/types/CastObjectToPrimitiveTest.out Thu May 12 07:28:52 2011 -0700
@@ -0,0 +1,2 @@
+CastObjectToPrimitiveTest.java:36:23: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), java.lang.Object, int
+1 error